Fix by the PaX guys to remove executable stack markings.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 104 insertions, 2 deletions

diff --git a/sys-apps/modutils/ChangeLog b/sys-apps/modutils/ChangeLog
index 85c9a40cf2d5..a04adb950f09 100644
--- a/sys-apps/modutils/ChangeLog
+++ b/sys-apps/modutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/modutils
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.50 2005/07/14 02:59:09 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.51 2005/08/18 22:30:15 vapier Exp $
+
+*modutils-2.4.27-r1 (18 Aug 2005)
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/modutils-2.4.27-no-nested-function.patch,
+  +modutils-2.4.27-r1.ebuild:
+  Fix by the PaX guys to remove executable stack markings.
 
   14 Jul 2005; Mike Frysinger <vapier@gentoo.org>
   +files/modutils-2.4.27-alias.patch, +files/modutils-2.4.27-flex.patch,
diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest
index 27b11e83d7f6..2c4fb844ef8a 100644
--- a/sys-apps/modutils/Manifest
+++ b/sys-apps/modutils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 8fea62130720627999427a1f9c21cd82 modutils-2.4.27.ebuild 1034
 MD5 9607bc10d8f0a9ad4676f3fe95d08a47 ChangeLog 7754
@@ -12,3 +15,10 @@ MD5 123430bcca454dfee74acef6f3525a17 files/digest-modutils-2.4.27 68
 MD5 123430bcca454dfee74acef6f3525a17 files/digest-modutils-2.4.27-r1 68
 MD5 d5504b6d6ed1ef697275b3a48a1e49e7 files/2.4.27-gcc34.patch 231
 MD5 d836ad11c092b2c55cc5b398c2af485b files/digest-modutils-2.4.26 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDBQwPgIKl8Uu19MoRArCPAJ9im0fPdpY2hGYfmcpm+1rM0nWiZACcDpaw
+iqZTVvUfKSkd1kl8W4ik/FQ=
+=JT3O
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.27-r1 b/sys-apps/modutils/files/digest-modutils-2.4.27-r1
new file mode 100644
index 000000000000..cff8aa358b77
--- /dev/null
+++ b/sys-apps/modutils/files/digest-modutils-2.4.27-r1
@@ -0,0 +1 @@
+MD5 bac989c74ed10f3bf86177fc5b4b89b6 modutils-2.4.27.tar.bz2 234963
diff --git a/sys-apps/modutils/files/modutils-2.4.27-no-nested-function.patch b/sys-apps/modutils/files/modutils-2.4.27-no-nested-function.patch
new file mode 100644
index 000000000000..7af4599c7154
--- /dev/null
+++ b/sys-apps/modutils/files/modutils-2.4.27-no-nested-function.patch
@@ -0,0 +1,43 @@
+Patch by the PaX team to get rid of executable stacks.
+
+--- modutils/insmod/insmod.c
++++ modutils/insmod/insmod.c
+@@ -366,18 +366,21 @@ static void hide_special_symbols(struct 
+ 			sym->info = ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info));
+ }
+ 
++static struct obj_file *load_map_file;
++
++static int load_map_cmp(const void *a, const void *b) {
++	struct obj_symbol **as = (struct obj_symbol **) a;
++	struct obj_symbol **bs = (struct obj_symbol **) b;
++	unsigned long aa = obj_symbol_final_value(load_map_file, *as);
++	unsigned long ba = obj_symbol_final_value(load_map_file, *bs);
++	return aa < ba ? -1 : aa > ba ? 1 : 0;
++}
++
+ static void print_load_map(struct obj_file *f)
+ {
+ 	struct obj_symbol *sym;
+ 	struct obj_symbol **all, **p;
+ 	struct obj_section *sec;
+-	int load_map_cmp(const void *a, const void *b) {
+-		struct obj_symbol **as = (struct obj_symbol **) a;
+-		struct obj_symbol **bs = (struct obj_symbol **) b;
+-		unsigned long aa = obj_symbol_final_value(f, *as);
+-		unsigned long ba = obj_symbol_final_value(f, *bs);
+-		 return aa < ba ? -1 : aa > ba ? 1 : 0;
+-	}
+ 	int i, nsyms, *loaded;
+ 
+ 	/* Report on the section layout.  */
+@@ -425,7 +428,9 @@ static void print_load_map(struct obj_fi
+ 				*p++ = sym;
+ 
+ 	/* Sort them by final value.  */
++	load_map_file = f;
+ 	qsort(all, nsyms, sizeof(struct obj_file *), load_map_cmp);
++	load_map_file = NULL;
+ 
+ 	/* And list them.  */
+ 	lprintf("\nSymbols:");
diff --git a/sys-apps/modutils/modutils-2.4.27-r1.ebuild b/sys-apps/modutils/modutils-2.4.27-r1.ebuild
new file mode 100644
index 000000000000..b23b08d7b5f8
--- /dev/null
+++ b/sys-apps/modutils/modutils-2.4.27-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27-r1.ebuild,v 1.1 2005/08/18 22:30:15 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Standard kernel module utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
+SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="!virtual/modutils"
+PROVIDE="virtual/modutils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-alias.patch
+	epatch "${FILESDIR}"/${P}-gcc.patch
+	epatch "${FILESDIR}"/${P}-flex.patch
+	epatch "${FILESDIR}"/${P}-no-nested-function.patch
+}
+
+src_compile() {
+	econf \
+		--prefix=/ \
+		--disable-strip \
+		--enable-insmod-static \
+		--disable-zlib \
+		|| die "./configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall prefix="${D}" || die "make install failed"
+	dodoc CREDITS ChangeLog NEWS README TODO
+}