Fix free() error in runscript_selinux.so.

5 files changed, 102 insertions, 5 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index bdec5b07f5a7..269cd22c8ce6 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.30 2004/07/04 02:23:30 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.31 2004/07/06 21:34:02 pebenito Exp $
+
+*policycoreutils-1.12-r2 (06 Jul 2004)
+
+  06 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/runscript-selinux.diff, +policycoreutils-1.12-r2.ebuild:
+  Fix free() error in runscript_selinux.so.
 
   03 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
   policycoreutils-1.14.ebuild:
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 4af230ad1b2d..64c5adaf7d73 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,10 +3,13 @@ Hash: SHA1
 
 MD5 317388ccae91e4122159d3496a499383 policycoreutils-1.12-r1.ebuild 1598
 MD5 69ae1b2448d0e2cf99893a5e9ac1a5e0 policycoreutils-1.4-r1.ebuild 1555
-MD5 3fc927758c78ef95569e01bbfd548a34 ChangeLog 4630
+MD5 689510a25db9863d184cc99d5f882ce5 ChangeLog 4833
 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836
 MD5 ba623a78ac61a6df1cdea4cafb9bc823 policycoreutils-1.14.ebuild 1641
+MD5 0d81072d7c1e9f59ba14ed172b1a3a4a policycoreutils-1.12-r2.ebuild 1652
+MD5 01f1dcbb3909023b95a6ff521874fc61 files/runscript-selinux.diff 633
 MD5 b9c41decc251443bb9535f415b9b1896 files/digest-policycoreutils-1.4-r1 143
+MD5 2873e1b7a7e78c17527934e8daa919e3 files/digest-policycoreutils-1.12-r2 144
 MD5 440f1bd6fdf23f39dde7bd50aefc5731 files/policycoreutils-1.10-genhomedircon-reverse.diff 3459
 MD5 50fd778919f191e7676e8c5da5ce0ec7 files/selinux-init 915
 MD5 e47cf908e58118d4b1416a736155d658 files/digest-policycoreutils-1.14 144
@@ -15,7 +18,7 @@ MD5 2873e1b7a7e78c17527934e8daa919e3 files/digest-policycoreutils-1.12-r1 144
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFA52oxGFJQsIJWJy4RApjpAJ4vvvef5m16i/mAZTXEMQ430IJXfwCeNVJ/
-3c+3Y1x2lfrgK/6aHI4qIS0=
-=u7Cn
+iD8DBQFA6xrXGFJQsIJWJy4RArVJAJ9RUtU2whQOYhJvYvJN7myUgYLbgQCfafdX
+HvhHx0n7Lm6Dl8FYF/oexas=
+=zUrf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r2 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r2
new file mode 100644
index 000000000000..7dac90c32def
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r2
@@ -0,0 +1,2 @@
+MD5 db69756ca36d460ebe2fc0fd7cdbf2b9 policycoreutils-1.12.tgz 40518
+MD5 9a0de2580023c53d04aab04e96b420a8 policycoreutils-extra-1.5.tar.bz2 8704
diff --git a/sys-apps/policycoreutils/files/runscript-selinux.diff b/sys-apps/policycoreutils/files/runscript-selinux.diff
new file mode 100644
index 000000000000..a8f696ba1076
--- /dev/null
+++ b/sys-apps/policycoreutils/files/runscript-selinux.diff
@@ -0,0 +1,20 @@
+Index: src/runscript_selinux.c
+===================================================================
+RCS file: /var/cvsroot/gentoo-projects/hardened/policycoreutils-extra/src/runscript_selinux.c,v
+retrieving revision 1.6
+diff -u -r1.6 runscript_selinux.c
+--- src/runscript_selinux.c	4 Jul 2004 02:15:35 -0000	1.6
++++ src/runscript_selinux.c	6 Jul 2004 21:28:18 -0000
+@@ -378,10 +378,11 @@
+        fprintf(stderr, "Could not set exec context to %s.\n", new_context);
+        exit(1);
+     }
++
++    freecon(new_context);
+   }
+ 
+   context_free(curr_con);
+-  freecon(new_context);
+   freecon(curr_context);
+ 
+ } /* selinux_runscript() */
diff --git a/sys-apps/policycoreutils/policycoreutils-1.12-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-1.12-r2.ebuild
new file mode 100644
index 000000000000..8810c3e23607
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-1.12-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.12-r2.ebuild,v 1.1 2004/07/06 21:34:02 pebenito Exp $
+
+IUSE="build"
+
+inherit eutils
+
+EXTRAS_VER="1.5"
+
+DESCRIPTION="SELinux core utilites"
+HOMEPAGE="http://www.nsa.gov/selinux"
+SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
+	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
+
+DEPEND=">=sys-libs/libselinux-${PV}
+	sys-devel/gettext
+	!build? ( sys-libs/pam )"
+
+S2=${WORKDIR}/policycoreutils-extra
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S2}
+	epatch ${FILESDIR}/runscript-selinux.diff
+
+	cd ${S}
+	epatch ${FILESDIR}/policycoreutils-1.10-genhomedircon-reverse.diff
+
+	# Change script paths POLICYDIR
+	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/genhomedircon
+
+	# fix up to accept Gentoo CFLAGS
+	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
+	for i in ${SUBDIRS}; do
+		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/${i}/Makefile \
+			|| die "${i} Makefile CFLAGS fix failed."
+	done
+}
+
+src_compile() {
+	if use build; then
+		einfo "Compiling setfiles"
+		emake -C ${S}/setfiles || die
+	else
+		einfo "Compiling policycoreutils"
+		emake -C ${S} || die
+		einfo "Compiling policycoreutils-extra"
+		emake -C ${S2} || die
+	fi
+}
+
+src_install() {
+	if use build; then
+		dosbin ${S}/setfiles/setfiles
+	else
+		einfo "Installing policycoreutils"
+		make DESTDIR="${D}" -C ${S} install || die
+		einfo "Installing policycoreutils-extra"
+		make DESTDIR="${D}" -C ${S2} install || die
+	fi
+}