diff --git a/.gitignore b/.gitignore index 777b33f..add4ed0 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,4 @@ libsemanage-2.0.42.tgz libsemanage-2.0.43.tgz libsemanage-2.0.44.tgz libsemanage-2.0.45.tgz +/libsemanage-2.0.46.tgz diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch index a1f53c5..bc31a6e 100644 --- a/libsemanage-rhat.patch +++ b/libsemanage-rhat.patch @@ -1,7 +1,8 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.44/src/genhomedircon.c ---- nsalibsemanage/src/genhomedircon.c 2009-09-17 08:59:43.000000000 -0400 -+++ libsemanage-2.0.44/src/genhomedircon.c 2010-02-24 14:57:23.000000000 -0500 -@@ -310,6 +310,10 @@ +diff --git a/libsemanage/src/genhomedircon.c b/libsemanage/src/genhomedircon.c +index 8a7d5e2..0c5c695 100644 +--- a/libsemanage/src/genhomedircon.c ++++ b/libsemanage/src/genhomedircon.c +@@ -310,6 +310,10 @@ static semanage_list_t *get_home_dirs(genhomedircon_settings_t * s) } if (strcmp(pwbuf->pw_dir, "/") == 0) continue; @@ -12,7 +13,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman if (semanage_str_count(pwbuf->pw_dir, '/') <= 1) continue; if (!(path = strdup(pwbuf->pw_dir))) { -@@ -803,6 +807,9 @@ +@@ -803,6 +807,9 @@ static genhomedircon_user_entry_t *get_users(genhomedircon_settings_t * s, * /root */ continue; } diff --git a/libsemanage.spec b/libsemanage.spec index 761fa26..3fac12c 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -9,8 +9,8 @@ Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 2.0.45 -Release: 6%{?dist} +Version: 2.0.46 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz @@ -89,7 +89,7 @@ SELinux management applications. %prep %setup -q -%patch -p1 -b .rhat +%patch -p2 -b .rhat %patch1 -p2 -b .support-multiple-python-builds %build @@ -179,6 +179,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Dec 21 2010 Dan Walsh - 2.0.46-1 +- Update to upstream + * Fix compliation under GCC 4.6 by Justin Mattock + * Wed Aug 25 2010 Thomas Spura - 2.0.45-6 - rebuild with python3.2 http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html diff --git a/sources b/sources index 5fbbfb8..f10d91f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a1b8cf612052daab7d5cb2676f2098a libsemanage-2.0.45.tgz +90dbdf1b8513d3230be6ac62f9511433 libsemanage-2.0.46.tgz