diff --git a/.cvsignore b/.cvsignore index 7e097be..261319b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -82,3 +82,4 @@ libsemanage-2.0.0.tgz libsemanage-2.0.1.tgz libsemanage-2.0.2.tgz libsemanage-2.0.3.tgz +libsemanage-2.0.4.tgz diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch index 38486bf..81a85d9 100644 --- a/libsemanage-rhat.patch +++ b/libsemanage-rhat.patch @@ -1,7 +1,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.3/include/semanage/handle.h ---- nsalibsemanage/include/semanage/handle.h 2007-07-16 14:20:37.000000000 -0400 +--- nsalibsemanage/include/semanage/handle.h 2007-08-20 19:15:36.000000000 -0400 +++ libsemanage-2.0.3/include/semanage/handle.h 2007-08-11 06:41:11.000000000 -0400 -@@ -69,6 +69,13 @@ +@@ -69,6 +69,10 @@ * 1 for yes, 0 for no (default) */ void semanage_set_create_store(semanage_handle_t * handle, int create_store); @@ -9,12 +9,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h li + * 1 for yes (default), 0 for no */ +void semanage_set_rebuild_file_context(semanage_handle_t * handle, int do_rebuild_file_context); + -+/* Set whether or not to disable dontaudits upon commit */ -+void semanage_set_disable_dontaudit(semanage_handle_t * handle, int disable_dontaudit); -+ - /* Check whether policy is managed via libsemanage on this system. - * Must be called prior to trying to connect. - * Return 1 if policy is managed via libsemanage on this system, + /* Set whether or not to disable dontaudits upon commit */ + void semanage_set_disable_dontaudit(semanage_handle_t * handle, int disable_dontaudit); + diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.3/Makefile --- nsalibsemanage/Makefile 2007-07-16 14:20:39.000000000 -0400 +++ libsemanage-2.0.3/Makefile 2007-08-11 06:40:28.000000000 -0400 @@ -29,7 +26,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.3/M $(MAKE) -C src pywrap diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.3/src/handle.c ---- nsalibsemanage/src/handle.c 2007-07-16 14:20:38.000000000 -0400 +--- nsalibsemanage/src/handle.c 2007-08-20 19:15:37.000000000 -0400 +++ libsemanage-2.0.3/src/handle.c 2007-08-11 06:41:31.000000000 -0400 @@ -68,6 +68,7 @@ /* By default do not create store */ @@ -55,21 +52,6 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0 void semanage_set_create_store(semanage_handle_t * sh, int create_store) { -@@ -109,6 +119,14 @@ - return; - } - -+void semanage_set_disable_dontaudit(semanage_handle_t * sh, int disable_dontaudit) -+{ -+ assert(sh != NULL); -+ -+ sepol_set_disable_dontaudit(sh->sepolh, disable_dontaudit); -+ return; -+} -+ - int semanage_is_connected(semanage_handle_t * sh) - { - assert(sh != NULL); diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.3/src/handle.h --- nsalibsemanage/src/handle.h 2007-07-16 14:20:38.000000000 -0400 +++ libsemanage-2.0.3/src/handle.h 2007-08-11 06:40:28.000000000 -0400 @@ -82,9 +64,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0 int modules_modified; int create_store; /* whether to create the store if it does not exist diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.3/src/libsemanage.map ---- nsalibsemanage/src/libsemanage.map 2007-07-16 14:20:38.000000000 -0400 +--- nsalibsemanage/src/libsemanage.map 2007-08-20 19:15:37.000000000 -0400 +++ libsemanage-2.0.3/src/libsemanage.map 2007-08-11 06:40:28.000000000 -0400 -@@ -9,10 +9,11 @@ +@@ -9,6 +9,7 @@ semanage_module_list_nth; semanage_module_get_name; semanage_module_get_version; semanage_select_store; semanage_reload_policy; semanage_set_reload; semanage_set_rebuild; @@ -92,11 +74,6 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libseman semanage_user_*; semanage_bool_*; semanage_seuser_*; semanage_iface_*; semanage_port_*; semanage_context_*; semanage_node_*; - semanage_fcontext_*; semanage_access_check; semanage_set_create_store; -- semanage_is_connected; -+ semanage_is_connected; semanage_set_disable_dontaudit; - local: *; - }; diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c --- nsalibsemanage/src/semanage_store.c 2007-07-16 14:20:38.000000000 -0400 +++ libsemanage-2.0.3/src/semanage_store.c 2007-08-11 06:40:28.000000000 -0400 diff --git a/libsemanage.spec b/libsemanage.spec index 86aa641..af00603 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -1,9 +1,9 @@ -%define libsepolver 2.0.5-1 +%define libsepolver 2.0.6-1 %define libselinuxver 2.0.0-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 2.0.3 -Release: 5%{?dist} +Version: 2.0.4 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz @@ -63,7 +63,6 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root) %config(noreplace) /etc/selinux/semanage.conf /%{_lib}/libsemanage.so.1 -%{_libdir}/libsemanage.so %{_libdir}/python*/site-packages/* %post -p /sbin/ldconfig @@ -73,11 +72,17 @@ rm -rf ${RPM_BUILD_ROOT} %files devel %defattr(-,root,root) %{_libdir}/libsemanage.a +%{_libdir}/libsemanage.so %dir %{_includedir}/semanage %{_includedir}/semanage/*.h %{_mandir}/man3/* %changelog +* Mon Aug 20 2007 Dan Walsh - 2.0.4-1 +- Upgrade to latest from NSA + * Allow dontaudits to be turned off via semanage interface when + updating policy + * Sat Aug 11 2007 Dan Walsh - 2.0.3-5 - Add ability to load a policy without dontaudit rules - diff --git a/sources b/sources index 08b714e..6793192 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c3e8b1008132a061461c441ffd13f0a libsemanage-2.0.3.tgz +947b51b687e2fe0b5b591df8f2994ff1 libsemanage-2.0.4.tgz