summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2006-03-27 04:14:32 +0000
committerChris PeBenito <pebenito@gentoo.org>2006-03-27 04:14:32 +0000
commit972238d166a5dfbaac356b9b301ed10e3f4caab0 (patch)
treec92e554e92207092a4ed4bdc7920f63b60fb1184 /sys-libs/libsepol
parentMono bindings fix. New Initscript (diff)
downloadgentoo-2-972238d166a5dfbaac356b9b301ed10e3f4caab0.tar.gz
gentoo-2-972238d166a5dfbaac356b9b301ed10e3f4caab0.tar.bz2
gentoo-2-972238d166a5dfbaac356b9b301ed10e3f4caab0.zip
bugfix release for big endian machines.
(Portage version: 2.1_pre6-r6)
Diffstat (limited to 'sys-libs/libsepol')
-rw-r--r--sys-libs/libsepol/ChangeLog11
-rw-r--r--sys-libs/libsepol/files/digest-libsepol-1.12-r1 (renamed from sys-libs/libsepol/files/digest-libsepol-1.12)0
-rw-r--r--sys-libs/libsepol/files/libsepol-1.12.2.diff24
-rw-r--r--sys-libs/libsepol/libsepol-1.12-r1.ebuild (renamed from sys-libs/libsepol/libsepol-1.12.ebuild)9
4 files changed, 39 insertions, 5 deletions
diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
index 26b82d79f641..16289971770b 100644
--- a/sys-libs/libsepol/ChangeLog
+++ b/sys-libs/libsepol/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sys-libs/libsepol
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.16 2006/03/18 14:43:16 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.17 2006/03/27 04:14:29 pebenito Exp $
+
+*libsepol-1.12-r1 (27 Mar 2006)
+
+ 27 Mar 2006; Chris PeBenito <pebenito@gentoo.org>
+ +files/libsepol-1.12.2.diff, -libsepol-1.12.ebuild,
+ +libsepol-1.12-r1.ebuild:
+ Uptream bugfix patch, including a fix for big endian machines. Users of big
+ endian systems should remerge checkpolicy as it statically links against
+ libsepol.
*libsepol-1.12 (18 Mar 2006)
diff --git a/sys-libs/libsepol/files/digest-libsepol-1.12 b/sys-libs/libsepol/files/digest-libsepol-1.12-r1
index 0a968d5aa0f8..0a968d5aa0f8 100644
--- a/sys-libs/libsepol/files/digest-libsepol-1.12
+++ b/sys-libs/libsepol/files/digest-libsepol-1.12-r1
diff --git a/sys-libs/libsepol/files/libsepol-1.12.2.diff b/sys-libs/libsepol/files/libsepol-1.12.2.diff
new file mode 100644
index 000000000000..631f7ab6ba1f
--- /dev/null
+++ b/sys-libs/libsepol/files/libsepol-1.12.2.diff
@@ -0,0 +1,24 @@
+diff --exclude CVS -urN libsepol-1.12/src/module.c libsepol/src/module.c
+--- libsepol-1.12/src/module.c 2006-02-07 09:04:43.000000000 -0500
++++ libsepol/src/module.c 2006-03-26 16:27:24.000000000 -0500
+@@ -661,7 +661,7 @@
+ {
+ struct policy_file *file = &spf->pf;
+ policy_file_t polfile;
+- uint32_t buf[3], offsets[5], len, nsec = 0;
++ uint32_t buf[5], offsets[5], len, nsec = 0;
+ int i;
+
+ if (p->policy) {
+diff --exclude CVS -urN libsepol-1.12/src/write.c libsepol/src/write.c
+--- libsepol-1.12/src/write.c 2005-11-15 08:05:58.000000000 -0500
++++ libsepol/src/write.c 2006-03-26 16:27:25.000000000 -0500
+@@ -1340,7 +1340,7 @@
+ for (decl = cur->branch_list; decl != NULL; decl = decl->next) {
+ num_decls++;
+ }
+- buf[0] = num_decls;
++ buf[0] = cpu_to_le32(num_decls);
+ if (put_entry(buf, sizeof(uint32_t), 1, fp) != 1) {
+ return -1;
+ }
diff --git a/sys-libs/libsepol/libsepol-1.12.ebuild b/sys-libs/libsepol/libsepol-1.12-r1.ebuild
index c3749d9f4f7c..03317163b263 100644
--- a/sys-libs/libsepol/libsepol-1.12.ebuild
+++ b/sys-libs/libsepol/libsepol-1.12-r1.ebuild
@@ -1,18 +1,17 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-1.12.ebuild,v 1.1 2006/03/18 14:43:16 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-1.12-r1.ebuild,v 1.1 2006/03/27 04:14:32 pebenito Exp $
IUSE=""
-inherit multilib
+inherit multilib eutils
DESCRIPTION="SELinux binary policy representation library"
HOMEPAGE="http://www.nsa.gov/selinux"
SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
DEPEND="virtual/libc"
@@ -20,6 +19,8 @@ src_unpack() {
unpack ${A}
cd ${S}
+ epatch ${FILESDIR}/libsepol-1.12.2.diff
+
sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" src/Makefile \
|| die "src Makefile CFLAGS fix failed."
sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" utils/Makefile \