diff --git a/.cvsignore b/.cvsignore index 14ee0ee..936770c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -policycoreutils-1.15.3.tgz +policycoreutils-1.15.5.tgz diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index df002f1..93ae086 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,28 +1,10 @@ ---- policycoreutils-1.15.3/scripts/genhomedircon.rhat 2004-07-29 16:26:01.000000000 -0400 -+++ policycoreutils-1.15.3/scripts/genhomedircon 2004-08-02 10:11:05.698825964 -0400 -@@ -83,7 +83,7 @@ - if rc[0] == 0: - print rc[1] - else: -- errorExit(join("grep/sed error ", rc[1])) -+ errorExit(string.join("grep/sed error ", rc[1])) - return rc - - try: -@@ -128,7 +128,7 @@ - if rc[0] == 0: - print rc[1] - else: -- errorExit(join("sed error ", rc[1])) -+ errorExit(string.join("sed error ", rc[1])) - - users = getUsers() - print "\n#\n# User-specific file contexts\n#\n" +--- policycoreutils-1.15.4/scripts/genhomedircon.rhat 2004-08-08 10:33:41.000000000 -0400 ++++ policycoreutils-1.15.4/scripts/genhomedircon 2004-08-08 10:35:44.190013684 -0400 @@ -137,6 +137,6 @@ for u in users.keys(): update(sys.argv[2], u, users[u]) except ValueError, error: -- errorExit(join("ValueError ", error)) -+ errorExit(strin.join("ValueError ", error)) +- errorExit(strin.join("ValueError ", error)) ++ errorExit(string.join("ValueError ", error)) except IndexError, error: errorExit("IndexError") diff --git a/policycoreutils.spec b/policycoreutils.spec index 7eb070b..85a67dc 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,13 +1,14 @@ Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.15.3 -Release: 2 +Version: 1.15.5 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz Patch: policycoreutils-rhat.patch Prefix: %{_prefix} -BuildRequires: libselinux-devel pam-devel +BuildRequires: libselinux-devel >= 1.15.3 pam-devel libsepol-devel +Requires: libselinux >= 1.15.3 libsepol BuildRoot: %{_tmppath}/%{name}-buildroot @@ -74,6 +75,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Aug 10 2004 Dan Walsh 1.15.5-1 +- new version from NSA uses libsepol + * Mon Aug 2 2004 Dan Walsh 1.15.3-2 - Fix genhomedircon join command diff --git a/sources b/sources index 2ed9727..ab7d51c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbd8e954118adc7dbaba42ac0d7d3b05 policycoreutils-1.15.3.tgz +082bed41213a9e2540862c89bc4eabcf policycoreutils-1.15.5.tgz