From 5e8c73e68322445f1268aaddfe69cd7b07122e39 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 15 Feb 2007 17:15:25 +0000 Subject: [PATCH] - Fix permissions on shared libraries --- setools-rhat.patch | 32 +++++++++++++++++++++++++++----- setools.spec | 4 ++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/setools-rhat.patch b/setools-rhat.patch index 5f22e1f..388a93c 100644 --- a/setools-rhat.patch +++ b/setools-rhat.patch @@ -1,5 +1,27 @@ ---- setools-3.1/libqpol/src/policy_parse.y.rhat 2007-02-13 07:06:55.000000000 -0500 -+++ setools-3.1/libqpol/src/policy_parse.y 2007-02-13 07:11:30.000000000 -0500 +--- setools-3.1/packages/Makefile.am.rhat 2007-02-06 15:43:29.000000000 -0500 ++++ setools-3.1/packages/Makefile.am 2007-02-15 11:20:09.000000000 -0500 +@@ -8,7 +8,7 @@ + tar jxf BWidget-1.8.0.tar.bz2 + test -z "$(bwidget_destdir)" || $(mkdir_p) "$(bwidget_destdir)" + cd BWidget-1.8.0 && find . -type d -exec $(mkdir_p) "$(bwidget_destdir)/{}" \; +- cd BWidget-1.8.0 && find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir) \; ++ cd BWidget-1.8.0 && find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir)/'{}'\; + + uninstall-local: + -rm -rf $(bwidget_destdir)/BWidget-1.8.0 +--- setools-3.1/packages/Makefile.in.rhat 2007-02-15 11:21:11.000000000 -0500 ++++ setools-3.1/packages/Makefile.in 2007-02-15 11:21:24.000000000 -0500 +@@ -381,7 +381,7 @@ + tar jxf BWidget-1.8.0.tar.bz2 + test -z "$(bwidget_destdir)" || $(mkdir_p) "$(bwidget_destdir)" + cd BWidget-1.8.0 && find . -type d -exec $(mkdir_p) "$(bwidget_destdir)/{}" \; +- cd BWidget-1.8.0 && find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir) \; ++ cd BWidget-1.8.0 && find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir)/'{}' \; + + uninstall-local: + -rm -rf $(bwidget_destdir)/BWidget-1.8.0 +--- setools-3.1/libqpol/src/policy_parse.y.rhat 2007-02-06 15:43:26.000000000 -0500 ++++ setools-3.1/libqpol/src/policy_parse.y 2007-02-15 11:19:06.000000000 -0500 @@ -1098,11 +1098,11 @@ ret = hashtab_insert(policydbp->p_commons.table, (hashtab_key_t) id, (hashtab_datum_t) comdatum); @@ -47,7 +69,7 @@ goto bad; } --- setools-3.1/libqpol/src/policy_extend.c.rhat 2007-02-07 14:16:52.000000000 -0500 -+++ setools-3.1/libqpol/src/policy_extend.c 2007-02-13 07:09:29.000000000 -0500 ++++ setools-3.1/libqpol/src/policy_extend.c 2007-02-15 11:19:06.000000000 -0500 @@ -167,7 +167,7 @@ retv = hashtab_insert(db->p_types.table, (hashtab_key_t) tmp_name, (hashtab_datum_t) tmp_type); @@ -67,7 +89,7 @@ else error = EEXIST; --- setools-3.1/configure.ac.rhat 2007-02-07 10:48:44.000000000 -0500 -+++ setools-3.1/configure.ac 2007-02-13 07:00:41.000000000 -0500 ++++ setools-3.1/configure.ac 2007-02-15 11:19:06.000000000 -0500 @@ -20,7 +20,7 @@ libseaudit_version=4.0.0 libseaudit_soname=libseaudit.so.4 @@ -91,7 +113,7 @@ else - copy_bwidget=no + -+ BWIDGET_DESTDIR="\$(DESTDIR)/\${datadir}/tcl8.4/" ++ BWIDGET_DESTDIR="\$(DESTDIR)/\${datadir}/tcl8.4/BWidget-1.8.0" + AC_SUBST(BWIDGET_DESTDIR) + copy_bwidget=yes bwidget_ver=1.8 diff --git a/setools.spec b/setools.spec index 7027a0f..de0ba54 100644 --- a/setools.spec +++ b/setools.spec @@ -131,8 +131,8 @@ rm -rf ${RPM_BUILD_ROOT} %files gui %defattr(-,root,root) -%dir /usr/share/tcl8.4 -/usr/share/tcl8.4/* +%dir /usr/share/tcl8.4/BWidget-1.8.0 +/usr/share/tcl8.4/BWidget-1.8.0/* %{_bindir}/apol %{_bindir}/sediffx %{_bindir}/awish