From 634084fef4dc9fa49228a269ed5d41ebeb16d306 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 10:37:46 +0000 Subject: [PATCH] auto-import changelog data from policycoreutils-1.15.3-2.src.rpm * Mon Aug 02 2004 Dan Walsh 1.15.3-2 - Fix genhomedircon join command --- policycoreutils-rhat.patch | 28 ++++++++++++++++++++++++++++ policycoreutils.spec | 8 ++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 policycoreutils-rhat.patch diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch new file mode 100644 index 0000000..df002f1 --- /dev/null +++ b/policycoreutils-rhat.patch @@ -0,0 +1,28 @@ +--- 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" +@@ -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)) + except IndexError, error: + errorExit("IndexError") diff --git a/policycoreutils.spec b/policycoreutils.spec index 68c08cf..7eb070b 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,11 +1,11 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.15.3 -Release: 1 +Release: 2 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 @@ -30,6 +30,7 @@ context. %prep %setup -q +%patch -p1 -b .rhat %build make all @@ -73,6 +74,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Aug 2 2004 Dan Walsh 1.15.3-2 +- Fix genhomedircon join command + * Thu Jul 29 2004 Dan Walsh 1.15.3-1 - Latest from NSA