- corrected compile problems when using pie or ssp while building this package

Package-Manager: portage-2.0.51.19

8 files changed, 54 insertions, 19 deletions

diff --git a/net-misc/mknbi/ChangeLog b/net-misc/mknbi/ChangeLog
index 24113960c04d..06e205438883 100644
--- a/net-misc/mknbi/ChangeLog
+++ b/net-misc/mknbi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mknbi
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.11 2004/09/23 16:06:07 sekretarz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.12 2005/04/17 20:39:14 solar Exp $
+
+  17 Apr 2005; <solar@gentoo.org> +files/mknbi-1.4.3-nossp.patch,
+  mknbi-1.4.3.ebuild:
+  - corrected compile problems when using pie or ssp while building this package
 
   23 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org> mknbi-1.4.3.ebuild:
   Fixed gcc-3.4 compile issues. Thanks to Mark Loeser <halcyon@whiterapid.com>
diff --git a/net-misc/mknbi/Manifest b/net-misc/mknbi/Manifest
index debae7ed5272..00163d4ec87a 100644
--- a/net-misc/mknbi/Manifest
+++ b/net-misc/mknbi/Manifest
@@ -1,11 +1,24 @@
-MD5 49aa5c173854f255f8783cf162ff0b15 mknbi-1.4.1.ebuild 714
-MD5 1df87972be6f6fa00be9245527ed24bb mknbi-1.2.11.ebuild 873
-MD5 39ba184b07ed4720c4a54761d277e4c3 mknbi-1.4.3.ebuild 979
-MD5 77718418b6f49034178ede281576d364 mknbi-1.4.0.ebuild 736
-MD5 3cd9c840f7a960b77776c33fd09b712d ChangeLog 1488
-MD5 1f6980122e0cd2316ce019ad067083b9 mknbi-1.2.12.ebuild 874
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7ed4ecca75cd040c4d6766a28c666cf8 mknbi-1.4.1.ebuild 711
+MD5 0cefd24cbde09be9558582aa580b5e92 mknbi-1.2.11.ebuild 870
+MD5 03b3e8c231b2f87b6bcca4590f1ee3cd mknbi-1.4.3.ebuild 1067
+MD5 0018b82355f92f489a46c370c7f99034 mknbi-1.4.0.ebuild 733
+MD5 d5e7d46f505e4fd6c75cb842ab622141 ChangeLog 1654
+MD5 a3a1403ba800b2b1ff9cee7d56af7347 mknbi-1.2.12.ebuild 871
+MD5 dc84e8754114dacfcab0eb3615b5caad files/mknbi-1.4.3-nossp.patch 511
 MD5 febff7af7446b0484f11f6a4274e6590 files/digest-mknbi-1.2.11 61
 MD5 febff7af7446b0484f11f6a4274e6590 files/digest-mknbi-1.2.12 61
 MD5 5907f8ed1ed6b036f9ce50c8e0d09636 files/digest-mknbi-1.4.0 63
 MD5 aa0982b30b1c97a47e4ac96ef0031ad1 files/digest-mknbi-1.4.1 63
 MD5 1835145d0916ad9628e9341502071873 files/digest-mknbi-1.4.3 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQmLJW54WFLgrx1GWAQIG9AQAuD3EebUbx6r1IY4z3JAHYvRn3jDUHwr1
+L8lQsBz5DS5sF4YDguqJ6ab9OSVlbOEWDrZbnwcmFNvF4cQodMIKKvM0hGF4+5Y8
+PPcR9q+WONq+0zVe2ntUQfp2zOUnyd57cXZqYVNHoqF9neEOLESZpspdMCZIRKaV
+zjZvvsvrlPA=
+=iWBS
+-----END PGP SIGNATURE-----
diff --git a/net-misc/mknbi/files/mknbi-1.4.3-nossp.patch b/net-misc/mknbi/files/mknbi-1.4.3-nossp.patch
new file mode 100644
index 000000000000..71289a336c4c
--- /dev/null
+++ b/net-misc/mknbi/files/mknbi-1.4.3-nossp.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2005-04-17 10:50:53.000000000 -0400
++++ Makefile	2005-04-17 10:51:17.000000000 -0400
+@@ -18,7 +18,7 @@
+ FIRSTRELOCS=	0x92800 0x82800
+ OLDGAS:=	$(shell $(AS) --version | grep -q '2\.9\.1' && echo -DGAS291)
+ CFLAGS=		-I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \
+-		-mcpu=i386 \
++		-mcpu=i386 -fno-stack-protector -fno-stack-protector-all -fno-pie \
+ 		-Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"
+ LDBINARYFLAG=	--oformat binary
+ FIRST32SIZE=	6144
diff --git a/net-misc/mknbi/mknbi-1.2.11.ebuild b/net-misc/mknbi/mknbi-1.2.11.ebuild
index 666fc3adf43b..2f26665f9d8e 100644
--- a/net-misc/mknbi/mknbi-1.2.11.ebuild
+++ b/net-misc/mknbi/mknbi-1.2.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.11.ebuild,v 1.7 2004/07/15 03:04:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.11.ebuild,v 1.8 2005/04/17 20:39:14 solar Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 HOMEPAGE="http://etherboot.sourceforge.net"
diff --git a/net-misc/mknbi/mknbi-1.2.12.ebuild b/net-misc/mknbi/mknbi-1.2.12.ebuild
index 793a6db78c48..69b5e4566cb4 100644
--- a/net-misc/mknbi/mknbi-1.2.12.ebuild
+++ b/net-misc/mknbi/mknbi-1.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.12.ebuild,v 1.5 2004/07/15 03:04:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.12.ebuild,v 1.6 2005/04/17 20:39:14 solar Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 HOMEPAGE="http://etherboot.sourceforge.net"
diff --git a/net-misc/mknbi/mknbi-1.4.0.ebuild b/net-misc/mknbi/mknbi-1.4.0.ebuild
index c9cf87c7dfac..fa0bfd25e75c 100644
--- a/net-misc/mknbi/mknbi-1.4.0.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.0.ebuild,v 1.6 2004/07/15 03:04:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.0.ebuild,v 1.7 2005/04/17 20:39:14 solar Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
diff --git a/net-misc/mknbi/mknbi-1.4.1.ebuild b/net-misc/mknbi/mknbi-1.4.1.ebuild
index bd9d12737682..2f0803f4ae37 100644
--- a/net-misc/mknbi/mknbi-1.4.1.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.1.ebuild,v 1.7 2004/07/15 03:04:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.1.ebuild,v 1.8 2005/04/17 20:39:14 solar Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
diff --git a/net-misc/mknbi/mknbi-1.4.3.ebuild b/net-misc/mknbi/mknbi-1.4.3.ebuild
index f06f3e12eb76..e09830a3f9a7 100644
--- a/net-misc/mknbi/mknbi-1.4.3.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.3.ebuild,v 1.6 2004/09/23 16:06:07 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.3.ebuild,v 1.7 2005/04/17 20:39:14 solar Exp $
 
-inherit gcc
+inherit gcc eutils
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
@@ -17,6 +17,12 @@ IUSE=""
 DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/mknbi-1.4.3-nossp.patch
+}
+
 src_compile()
 {
 	sed -i -e "s:\/usr\/local:\/usr:"  Makefile
@@ -27,6 +33,7 @@ src_compile()
 		sed -i -e "s:\-mcpu:\-mtune:" Makefile
 		sed -i -e "s:CFLAGS=:CFLAGS= -minline-all-stringops:" Makefile
 	fi
+
 	emake || die "Compile failed"
 }