Fix the linker script so that it handles the .gnu.hash section (thanks to Vapier...

Package-Manager: portage-2.1.2-r4

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 691af84ae720ace436fbc4a9f1a949872595f35b..f6ce3804b95a22dca4083c2b72ad38f1adf58db6 100644 (file)
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/memtest86+
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.34 2007/01/20 14:55:18 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.35 2007/01/27 14:44:43 spock Exp $
+
+  27 Jan 2007; Michał Januszewski <spock@gentoo.org>
+  +files/memtest86+-1.70-gnu_hash.patch,
+  +files/memtest86+-1.70-hardcoded_cc.patch, memtest86+-1.70.ebuild:
+  Fix the linker script so that it handles the .gnu.hash section (thanks to
+  Vapier for the patch) and remove hardcoded AS/CC settings (bug #163855).
 
 *memtest86+-1.70 (20 Jan 2007)
 

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index b53a1c703dd3bfcfcb8319242af8fbad7c501162..d0bdc8265925c359bdcab7d09e6256db32786d99 100644 (file)
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -5,20 +5,28 @@ AUX memtest86+-1.50-hardened.patch 802 RMD160 9bdf9ce73cc7ef48501d9330449dcee7d4
 MD5 c9888397f49a7e1d3df3a2f5acd5cfad files/memtest86+-1.50-hardened.patch 802
 RMD160 9bdf9ce73cc7ef48501d9330449dcee7d45baee9 files/memtest86+-1.50-hardened.patch 802
 SHA256 00a40459c5c0f7d85e8fb1e9d5d9508f343de4042a51257c911e9736baa70045 files/memtest86+-1.50-hardened.patch 802
+AUX memtest86+-1.70-gnu_hash.patch 485 RMD160 355648069f4b3f6234e770bbea30dcef10405376 SHA1 dd0d673b2fdee35b1522574b1499cd943820dca5 SHA256 07bb65affa496910f0c91457c5c21e31a0e523e0c360ebf602b47296748f4bac
+MD5 5cbb2dbb176c4f47c1032aba98e17c5b files/memtest86+-1.70-gnu_hash.patch 485
+RMD160 355648069f4b3f6234e770bbea30dcef10405376 files/memtest86+-1.70-gnu_hash.patch 485
+SHA256 07bb65affa496910f0c91457c5c21e31a0e523e0c360ebf602b47296748f4bac files/memtest86+-1.70-gnu_hash.patch 485
+AUX memtest86+-1.70-hardcoded_cc.patch 1850 RMD160 6f750ba065d8e59e5779e0eadf47fff146761a83 SHA1 a79dbbf5829b4651d73cb89c8a236359cc28c811 SHA256 031fa546942e8b5584f799efd6ef93d4d8fa9934f1cd6b6c01f7e8667a6d03c0
+MD5 89b1643cf031a211c6aa9227057fb48b files/memtest86+-1.70-hardcoded_cc.patch 1850
+RMD160 6f750ba065d8e59e5779e0eadf47fff146761a83 files/memtest86+-1.70-hardcoded_cc.patch 1850
+SHA256 031fa546942e8b5584f799efd6ef93d4d8fa9934f1cd6b6c01f7e8667a6d03c0 files/memtest86+-1.70-hardcoded_cc.patch 1850
 DIST memtest86+-1.65.tar.gz 146203 RMD160 629379f7660dbc6ab071a9d9839ce0528752dda8 SHA1 f9c27f813cc9ada7efe98e6dc587ab6d2c496ba1 SHA256 fb27b1e0b65128921c551096a2e0f8ec51ffa27a45b1e76a54ca6b6685d0e980
 DIST memtest86+-1.70.tar.gz 150198 RMD160 2320f50eb20d31f110103fd14136f92ade627df2 SHA1 d090699df558fc7f48604955c91fba1d06754661 SHA256 dc6d244572f2a030a74cfef78b6e4b58d5f230597b4f80e4581c1373182492eb
 EBUILD memtest86+-1.65.ebuild 1778 RMD160 e0de6dbf447a83667f2928d6fd2feefcd0009cd2 SHA1 c28f4e6a0b945a9133ee60e11d9cebdf089dadd4 SHA256 256d84564c3fcb4a462ee573d0cdaade3b964d5aa2204b395dd711028c751ed1
 MD5 5a9c2ae08bcb83cbb43e47ce1a8044af memtest86+-1.65.ebuild 1778
 RMD160 e0de6dbf447a83667f2928d6fd2feefcd0009cd2 memtest86+-1.65.ebuild 1778
 SHA256 256d84564c3fcb4a462ee573d0cdaade3b964d5aa2204b395dd711028c751ed1 memtest86+-1.65.ebuild 1778
-EBUILD memtest86+-1.70.ebuild 1780 RMD160 bf3714b32ada7dc48d179e794e06e94c9aa9ffe3 SHA1 f59736672e9e0b5e55d06a30883e158155990394 SHA256 f72c77246a594be2d2df471f9a7aed844c0f595ee342da8622bc68c87556aafb
-MD5 8a95ff49b27ad9ed1b0dce3fbfde2778 memtest86+-1.70.ebuild 1780
-RMD160 bf3714b32ada7dc48d179e794e06e94c9aa9ffe3 memtest86+-1.70.ebuild 1780
-SHA256 f72c77246a594be2d2df471f9a7aed844c0f595ee342da8622bc68c87556aafb memtest86+-1.70.ebuild 1780
-MISC ChangeLog 5567 RMD160 0d283d0ccf56b4eb307d88ba3172de46ed52c44f SHA1 080854c73144ff5356434cc3a1f6ec79f1735efc SHA256 89796d26a040564b0bdf255f6a465a8f37db2d86ae914e20b09491e2b37c6179
-MD5 908fa6dcd6e69f7066ccb0c598d583d6 ChangeLog 5567
-RMD160 0d283d0ccf56b4eb307d88ba3172de46ed52c44f ChangeLog 5567
-SHA256 89796d26a040564b0bdf255f6a465a8f37db2d86ae914e20b09491e2b37c6179 ChangeLog 5567
+EBUILD memtest86+-1.70.ebuild 1832 RMD160 08b2babe312704b115076289276b9f20116fc535 SHA1 894942d66936402b619facc9ccba030395fffd47 SHA256 4aa4213ed89e1f6612df87135615352fd2e45fe927b10639ef795366a4afad50
+MD5 1690f1cda8f43227a44804d366831aa8 memtest86+-1.70.ebuild 1832
+RMD160 08b2babe312704b115076289276b9f20116fc535 memtest86+-1.70.ebuild 1832
+SHA256 4aa4213ed89e1f6612df87135615352fd2e45fe927b10639ef795366a4afad50 memtest86+-1.70.ebuild 1832
+MISC ChangeLog 5883 RMD160 59a626547abaec1fb53ffb630d8f80594d5627b2 SHA1 eff1b7733fcc68ccae74a61a0f7f060c225c9793 SHA256 8d94e3ea6f5ea83ac7337722464892570a651ca084db1374f8cb136b0fb70bae
+MD5 f77bb533fdee0f0e22cdfa6e1d40a37d ChangeLog 5883
+RMD160 59a626547abaec1fb53ffb630d8f80594d5627b2 ChangeLog 5883
+SHA256 8d94e3ea6f5ea83ac7337722464892570a651ca084db1374f8cb136b0fb70bae ChangeLog 5883
 MISC metadata.xml 259 RMD160 be7d072f3714a6a642c308963bae944249555ad3 SHA1 6487899a29d9e7a4ef5db6b8f48328fa4a529c52 SHA256 80deea66f2205dd3b6e83b31be319f33eef281cd0864f881a58f22eb0916165c
 MD5 6e4a562860cd8556ea460ac4682d01e3 metadata.xml 259
 RMD160 be7d072f3714a6a642c308963bae944249555ad3 metadata.xml 259
@@ -32,7 +40,7 @@ SHA256 5ecc53f4756795da77ec878b3bb9bb73ce602f095579b34eaeac7389a42de935 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFsi1ichej4aZK9/cRAl/+AJ4rM6Y1lg+Vf562bEDEmbk77LDuIACdGSpp
-b+7Jq/S2NIw/yUv/dXMYXxo=
-=YhZO
+iD8DBQFFu2Vochej4aZK9/cRAqZzAJsFddRh/nm/5xjonAeCIDSPJpUxNgCeKUyH
+4D/xOAecFZP+qPJAxiJZxCs=
+=/x0l
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch b/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
new file mode 100644 (file)
index 0000000..5a9e06d
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
@@ -0,0 +1,11 @@
+diff -Naurp memtest86+-1.70-orig/memtest_shared.lds memtest86+-1.70/memtest_shared.lds
+--- memtest86+-1.70-orig/memtest_shared.lds    2007-01-27 13:34:16.000000000 +0100
++++ memtest86+-1.70/memtest_shared.lds 2007-01-27 13:41:30.000000000 +0100
+@@ -18,6 +18,7 @@ SECTIONS {\r
+       .dynsym     : { *(.dynsym) }\r
+       .dynstr     : { *(.dynstr) }\r
+       .hash       : { *(.hash) }\r
++      .gnu.hash   : { *(.gnu.hash) }\r
+       .dynamic    : { *(.dynamic) }\r
+ \r
+       .rel.text    : { *(.rel.text   .rel.text.*) }\r

diff --git a/sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch
new file mode 100644 (file)
index 0000000..aa6c9c3
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch
@@ -0,0 +1,61 @@
+diff -Naurp memtest86+-1.70-orig/Makefile memtest86+-1.70/Makefile
+--- memtest86+-1.70-orig/Makefile      2007-01-27 15:17:59.000000000 +0100
++++ memtest86+-1.70/Makefile   2007-01-27 15:31:43.000000000 +0100
+@@ -8,23 +8,21 @@
+ #
+ FDISK=/dev/fd0
+ 
+-CC=gcc
+ #
+ # gcc compiler options, these settings should suffice
+ #
+-CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding
+-
+-AS=as -32
++CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector
++ASFLAGS=-32
+ 
+ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o config.o linuxbios.o memsize.o pci.o controller.o extra.o random.o dmi.o
+ 
+ all: memtest.bin memtest
+ 
+ reloc.o: reloc.c
+-      $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c
++      $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing -fno-stack-protector reloc.c
+ 
+ test.o: test.c test.h defs.h config.h
+-      $(CC) -c $(CCFLAGS) test.c
++      $(CC) -c $(CCFLAGS) -fno-PIC test.c
+ 
+ main.o: main.c test.h defs.h
+       $(CC) -c $(CCFLAGS) -fPIC main.c
+@@ -69,9 +67,9 @@ head.s: head.S
+       $(CC) -E -m32 -traditional $< -o $@
+ 
+ head.o: head.s
+-      $(AS) -o $@ $<
++      $(AS) $(ASFLAGS) -o $@ $<
+ dmi.o:        dmi.c test.h
+-       $(CC) -c $(CCFLAGS) -fPIC dmi.c
++      $(CC) -c $(CCFLAGS) -fPIC dmi.c
+ 
+ makedefs: makedefs.c defs.h
+       $(CC) $(CCFLAGS) makedefs.c -o $@
+@@ -94,7 +92,7 @@ bootsect.s: bootsect.S defs.h
+       $(CC) -E -traditional $< -o $@
+ 
+ bootsect.o: bootsect.s
+-      $(AS) -o $@ $<
++      $(AS) $(ASFLAGS) -o $@ $<
+ 
+ bootsect: bootsect.o
+       $(LD) -Ttext 0x00 -s --oformat binary -e _main --just-symbols=memtest_shared.o -o $@ $<
+@@ -103,7 +101,7 @@ setup.s: setup.S config.h defs.h
+       $(CC) -E -traditional $< -o $@
+ 
+ setup.o: setup.s
+-      $(AS) -o $@ $<
++      $(AS) $(ASFLAGS) -o $@ $<
+ 
+ 
+ memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds

diff --git a/sys-apps/memtest86+/memtest86+-1.70.ebuild b/sys-apps/memtest86+/memtest86+-1.70.ebuild
index f1c460eeba0fb2d836f5e900efa3f81ffc642354..971bd8ac4bb0dfb9b2f500529b8753342b55f57d 100644 (file)
--- a/sys-apps/memtest86+/memtest86+-1.70.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.70.ebuild,v 1.1 2007/01/20 14:55:18 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.70.ebuild,v 1.2 2007/01/27 14:44:43 spock Exp $
 
 inherit mount-boot eutils
 
@@ -20,7 +20,8 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
 
-       epatch "${FILESDIR}"/${PN}-1.50-hardened.patch
+       epatch "${FILESDIR}"/${PN}-1.70-hardcoded_cc.patch
+       epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
        if use serial ; then
                sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
        fi