Add patch to fix #121689.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 95 insertions, 14 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 828e46347baf..af79d0ea2f8b 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.52 2006/01/17 01:11:34 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.53 2006/02/05 21:31:45 pebenito Exp $
+
+  05 Feb 2006; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-unsigned-char-ppc.diff,
+  policycoreutils-1.28.ebuild:
+  Add patch to fix #121689.
 
   17 Jan 2006; Chris PeBenito <pebenito@gentoo.org>
   policycoreutils-1.28.ebuild:
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 2f77c6ecced3..e290c79b89c0 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,21 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 30e96fe76f270d3d6090aee4249d865a ChangeLog 8374
+MD5 fcb4aa97af37894fd4ac99416539e863 ChangeLog 8535
+RMD160 d1d70fa9a1547bc67c83c53ac53dafe489c99ffb ChangeLog 8535
+SHA256 55318ddc117c7107b0120a6d7cde23e9e13b6aa2456b91eef5a98bbce4f6dab3 ChangeLog 8535
 MD5 7a74a3135f746668eccc7a1521bd11cb files/digest-policycoreutils-1.22 146
+RMD160 56739c7ae8a107d6454da24ad5f060dcff45be6a files/digest-policycoreutils-1.22 146
+SHA256 87f0d07fb1c61b4378ea209bb4e3899e7a49a34b6d5f42d56a15ad2959fad45c files/digest-policycoreutils-1.22 146
 MD5 888c48de2a246f60017c7d2f3b6eccd0 files/digest-policycoreutils-1.24-r2 146
+RMD160 0e4bd2a4073498abff025261f48562a0d03cb3e1 files/digest-policycoreutils-1.24-r2 146
+SHA256 21a3813fd81998c1e574c38fb530b9614799231d6712b2836dc4d80a99129cd1 files/digest-policycoreutils-1.24-r2 146
 MD5 8b17a28b65ab524d9d67e1933c22d12e files/digest-policycoreutils-1.28 146
+RMD160 648d684e043702076703b1cef6d0f4fa0643fec5 files/digest-policycoreutils-1.28 146
+SHA256 37f11cd1e1730957453ca06c7923ed66b948f03abede3f42f721321f5057f598 files/digest-policycoreutils-1.28 146
 MD5 e4fae02aa0cf1196385194111e1a482c files/policycoreutils-1.22-genhomedircon-quiet.diff 670
+RMD160 b31741293cab8cbf37c54b579642b82e3fdc3b4d files/policycoreutils-1.22-genhomedircon-quiet.diff 670
+SHA256 7da07bbac5384b57666dfdaa68813a203b6840b6b6214438428479e1631459aa files/policycoreutils-1.22-genhomedircon-quiet.diff 670
 MD5 2afb35c97fdfb93d2c5ee049f1f43b10 files/policycoreutils-1.24-genhomedircon-quiet.diff 1236
+RMD160 fcce281bb338debfe9164b78ed46630a40fb0542 files/policycoreutils-1.24-genhomedircon-quiet.diff 1236
+SHA256 0282369a5dce4ab119448dea6fb6c7b101872a4e2dca17ac5f9b821743a384e9 files/policycoreutils-1.24-genhomedircon-quiet.diff 1236
 MD5 b506c1ab31feeaa1394d45eedeaa2cc7 files/policycoreutils-1.28-quietlp.diff 817
+RMD160 cb467fd6bda873331c79163517008945010f1cde files/policycoreutils-1.28-quietlp.diff 817
+SHA256 c78d8f4fc65642c3287f951c6a25d6ad9f2fc5bfaf96f619edd3d1d72cb02d31 files/policycoreutils-1.28-quietlp.diff 817
+MD5 591fc7f4beea0a6a889cf257c21360d5 files/policycoreutils-unsigned-char-ppc.diff 2244
+RMD160 869bfeed038833946168a48fb1278bba0e09b5ab files/policycoreutils-unsigned-char-ppc.diff 2244
+SHA256 bb8a1e89a7b8a3765a2dc788f0635471831545c6d7a6480ddaf4b31d1121c6ea files/policycoreutils-unsigned-char-ppc.diff 2244
 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836
+RMD160 421e492e89112f8436f8c5535aa2340cc8795929 metadata.xml 836
+SHA256 1d14250f52ecf63b67bed2289833d6f1ff2eba3cad9a80794b356e747917cdb7 metadata.xml 836
 MD5 258910c124d547d1bf3945ed62bdf085 policycoreutils-1.22.ebuild 3374
+RMD160 a3f241fdbdbd9bea2b4aded555ad0b111cf1b4ca policycoreutils-1.22.ebuild 3374
+SHA256 abac0c5362e22e8955f880d8264a097598c24cfe9e6fc7c3817738cbcb1f8c20 policycoreutils-1.22.ebuild 3374
 MD5 6e5218a65a8155983ed7b93dfb30e4fd policycoreutils-1.24-r2.ebuild 3609
-MD5 a06e287fc7e03f44d6046f28dbd864c4 policycoreutils-1.28.ebuild 3514
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDzERRJ+ChZlpDtAoRAtO7AJwL00L7MRlgFaCI5TtICY6/dpYAbQCgi7hb
-X7zZ6oNi8KksUUO9y/qeTiY=
-=2MDO
------END PGP SIGNATURE-----
+RMD160 e0919de50adcc684d8d96dde5f4ce109d9679457 policycoreutils-1.24-r2.ebuild 3609
+SHA256 5016eb52a8c9937dd90377e9e1378b2809e45050e503045e27391ec298f1a2ad policycoreutils-1.24-r2.ebuild 3609
+MD5 65c75b087018e5432d23ecab687ce3b1 policycoreutils-1.28.ebuild 3573
+RMD160 4c81a6a63e4e33f47621198b8fa98da90d6354c3 policycoreutils-1.28.ebuild 3573
+SHA256 29fa8802fe67cfafaa2bcdd723525d67125e5679ecdc117c82fb522090bd7bb1 policycoreutils-1.28.ebuild 3573
diff --git a/sys-apps/policycoreutils/files/policycoreutils-unsigned-char-ppc.diff b/sys-apps/policycoreutils/files/policycoreutils-unsigned-char-ppc.diff
new file mode 100644
index 000000000000..61c3c4f85075
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-unsigned-char-ppc.diff
@@ -0,0 +1,60 @@
+? policy/policy.20
+? policy/policy.conf
+? policy/tmp
+? policy/file_contexts/file_contexts
+? policy/file_contexts/homedir_template
+? policy/file_contexts/misc
+Index: policycoreutils/semodule_expand/semodule_expand.c
+===================================================================
+RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/semodule_expand/semodule_expand.c,v
+retrieving revision 1.9
+diff -u -r1.9 semodule_expand.c
+--- policycoreutils/semodule_expand/semodule_expand.c	20 Oct 2005 16:37:23 -0000	1.9
++++ policycoreutils/semodule_expand/semodule_expand.c	5 Feb 2006 20:28:13 -0000
+@@ -36,8 +36,8 @@
+ 
+ int main(int argc, char **argv)
+ {
+-	char ch, *basename, *outname;
+-	int ret, show_version = 0, verbose = 0;
++	char *basename, *outname;
++	int ch, ret, show_version = 0, verbose = 0;
+ 	struct sepol_policy_file *pf;
+ 	sepol_module_package_t *base;
+ 	sepol_policydb_t *out;
+Index: policycoreutils/semodule_link/semodule_link.c
+===================================================================
+RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/semodule_link/semodule_link.c,v
+retrieving revision 1.7
+diff -u -r1.7 semodule_link.c
+--- policycoreutils/semodule_link/semodule_link.c	20 Oct 2005 16:37:23 -0000	1.7
++++ policycoreutils/semodule_link/semodule_link.c	5 Feb 2006 20:28:13 -0000
+@@ -73,8 +73,8 @@
+ 
+ int main(int argc, char **argv)
+ {
+-	int i, show_version = 0, verbose = 0, num_mods;
+-	char ch, *basename, *outname = NULL;
++	int ch, i, show_version = 0, verbose = 0, num_mods;
++	char *basename, *outname = NULL;
+ 	sepol_module_package_t *base, **mods;
+ 	FILE *outfile;
+ 	struct sepol_policy_file *pf;
+Index: policycoreutils/sestatus/sestatus.c
+===================================================================
+RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/sestatus/sestatus.c,v
+retrieving revision 1.9
+diff -u -r1.9 sestatus.c
+--- policycoreutils/sestatus/sestatus.c	29 Nov 2005 15:55:02 -0000	1.9
++++ policycoreutils/sestatus/sestatus.c	5 Feb 2006 20:28:13 -0000
+@@ -160,9 +160,8 @@
+ 
+ int main(int argc, char **argv) {
+ 	/* these vars are reused several times */
+-	int rc, i,c;
++	int rc,opt, i,c;
+ 	char *context;
+-	char opt;
+ 
+ 	/* files that need context checks */
+ 	char *fc[MAX_CHECK];
diff --git a/sys-apps/policycoreutils/policycoreutils-1.28.ebuild b/sys-apps/policycoreutils/policycoreutils-1.28.ebuild
index 829caeef7233..6b4e2a33f9b2 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.28.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.28.ebuild,v 1.4 2006/01/17 01:11:34 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.28.ebuild,v 1.5 2006/02/05 21:31:45 pebenito Exp $
 
 IUSE="build nls pam"
 
@@ -49,6 +49,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/policycoreutils-1.28-quietlp.diff
+	epatch ${FILESDIR}/policycoreutils-unsigned-char-ppc.diff
 
 	# This warning makes no sense, in this context
 	sed -i -e '/FILE/ s/;/=NULL;/' ${S}/audit2why/audit2why.c \