diff --git a/.cvsignore b/.cvsignore index f8caf4a..92adf63 100644 --- a/.cvsignore +++ b/.cvsignore @@ -99,3 +99,4 @@ libsemanage-2.0.22.tgz libsemanage-2.0.23.tgz libsemanage-2.0.24.tgz libsemanage-2.0.25.tgz +libsemanage-2.0.26.tgz diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch index 535555e..f677692 100644 --- a/libsemanage-rhat.patch +++ b/libsemanage-rhat.patch @@ -1,19 +1,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.25/src/genhomedircon.c ---- nsalibsemanage/src/genhomedircon.c 2008-06-12 23:25:16.000000000 -0400 +--- nsalibsemanage/src/genhomedircon.c 2008-07-29 09:15:38.000000000 -0400 +++ libsemanage-2.0.25/src/genhomedircon.c 2008-07-17 14:32:45.000000000 -0400 -@@ -192,6 +193,11 @@ - goto done; - } - -+ if (ustr_cmp_suffix_cstr_eq(expr, "/")) { -+ if (!ustr_del(&expr, 1)) -+ goto done; -+ } -+ - /* Append pattern to eat up trailing slashes */ - if (!ustr_add_cstr(&expr, "/*$")) - goto done; -@@ -482,7 +488,6 @@ +@@ -487,7 +488,6 @@ const char *role_prefix) { replacement_pair_t repl[] = { @@ -21,7 +9,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman {.search_for = TEMPLATE_HOME_DIR,.replace_with = home}, {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, {NULL, NULL} -@@ -542,7 +547,6 @@ +@@ -547,7 +547,6 @@ replacement_pair_t repl[] = { {.search_for = TEMPLATE_USER,.replace_with = user}, {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, diff --git a/libsemanage.spec b/libsemanage.spec index 8cbc0c9..d3d2949 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -2,8 +2,8 @@ %define libselinuxver 2.0.0-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 2.0.25 -Release: 3%{?dist} +Version: 2.0.26 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz @@ -78,6 +78,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man3/* %changelog +* Wed Jul 29 2008 Dan Walsh - 2.0.26-1 +- Update to upstream + * Fix bug in genhomedircon fcontext matches logic from Dan Walsh. + Strip any trailing slash before appending /*$. + * Thu Jun 17 2008 Dan Walsh - 2.0.25-3 - Another fix for genhomedircon diff --git a/sources b/sources index ce38cda..27f123e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7fd8bb8e57bf22060d77ed2e97143e2 libsemanage-2.0.25.tgz +024d7285851295f989fcf93b336fccb9 libsemanage-2.0.26.tgz