From 23c750a505b4279cb1e3c3cb3913bbf141317ec7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 17 Mar 2007 00:33:19 +0000 Subject: [PATCH] Version bump #169685 by ScytheMan. Package-Manager: portage-2.1.2.2 --- sys-apps/memtest86/ChangeLog | 11 ++- sys-apps/memtest86/Manifest | 34 ++++++++- sys-apps/memtest86/files/digest-memtest86-3.3 | 3 + .../files/memtest86-3.3-funky-test.patch | 15 ++++ .../files/memtest86-3.3-gnu-hash.patch | 12 +++ sys-apps/memtest86/memtest86-3.3.ebuild | 74 +++++++++++++++++++ 6 files changed, 143 insertions(+), 6 deletions(-) create mode 100644 sys-apps/memtest86/files/digest-memtest86-3.3 create mode 100644 sys-apps/memtest86/files/memtest86-3.3-funky-test.patch create mode 100644 sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch create mode 100644 sys-apps/memtest86/memtest86-3.3.ebuild diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog index e9ade4ce96f8..e384899e6695 100644 --- a/sys-apps/memtest86/ChangeLog +++ b/sys-apps/memtest86/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/memtest86 -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.28 2006/08/19 19:24:08 malc Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.29 2007/03/17 00:33:19 vapier Exp $ + +*memtest86-3.3 (17 Mar 2007) + + 17 Mar 2007; Mike Frysinger + +files/memtest86-3.3-funky-test.patch, + +files/memtest86-3.3-gnu-hash.patch, +memtest86-3.3.ebuild: + Version bump #169685 by ScytheMan. 19 Aug 2006; memtest86-3.2.ebuild: Stable on amd64 diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest index c11419ad45ce..ffa9b4dca922 100644 --- a/sys-apps/memtest86/Manifest +++ b/sys-apps/memtest86/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX memtest86-3.2-solar.patch 821 RMD160 ce955d5b0414e1f58758435e99d40a296893c280 SHA1 e16ef80795e76d28356cf33f10527a96d15d88fc SHA256 8004f3066fd4e332ccc9c217b6f62799fa15ec101fde9448f4aab1a2a2589019 MD5 93e1541e7b5f0da25dc394b281830ba1 files/memtest86-3.2-solar.patch 821 RMD160 ce955d5b0414e1f58758435e99d40a296893c280 files/memtest86-3.2-solar.patch 821 @@ -6,15 +9,28 @@ AUX memtest86-3.2-test-pic.patch 641 RMD160 043bf5611ee3ea1c1d9054b17eec5f192ff9 MD5 9b8f71a15e2d7236b658f1f9e0fb79df files/memtest86-3.2-test-pic.patch 641 RMD160 043bf5611ee3ea1c1d9054b17eec5f192ff96c82 files/memtest86-3.2-test-pic.patch 641 SHA256 f575c559b9f9b3ead5d2957524421f841596f3cec98f65de9764c29a2dc1d4db files/memtest86-3.2-test-pic.patch 641 +AUX memtest86-3.3-funky-test.patch 374 RMD160 43c5e8a66fc17ee2d8876d2a712ad113d2fed70a SHA1 c26df3e1c5e2f0ec3f143eb8b05c9555ac18a337 SHA256 9a8ecba4392eb80cf460acd51e51bc9de643730c82ba31a18801d686b3c58ebc +MD5 72a2d3b4cd7ec096fa4977e36d47dd43 files/memtest86-3.3-funky-test.patch 374 +RMD160 43c5e8a66fc17ee2d8876d2a712ad113d2fed70a files/memtest86-3.3-funky-test.patch 374 +SHA256 9a8ecba4392eb80cf460acd51e51bc9de643730c82ba31a18801d686b3c58ebc files/memtest86-3.3-funky-test.patch 374 +AUX memtest86-3.3-gnu-hash.patch 297 RMD160 b11789b6e1882da3b29f661843e819f76aee7167 SHA1 abc9a71fc613788662f98d5ad9efaccf831903e2 SHA256 9e7d99895087369b7492ebb03ad7a3e366215444f0d32155fa4dfb02464e1c05 +MD5 08c9ca38f0a5fead805b0f84ee53de6b files/memtest86-3.3-gnu-hash.patch 297 +RMD160 b11789b6e1882da3b29f661843e819f76aee7167 files/memtest86-3.3-gnu-hash.patch 297 +SHA256 9e7d99895087369b7492ebb03ad7a3e366215444f0d32155fa4dfb02464e1c05 files/memtest86-3.3-gnu-hash.patch 297 DIST memtest86-3.2.tar.gz 131309 RMD160 95477b0dea1a13fdcdd28e01f0a99109702b3ed3 SHA1 7df757d79e4cc4d8adfda78c7e46e0d9e0646a7f SHA256 e8a86e30946349b624d51efd73332ebdeeee28f74b882ae8086bb7831175b22a +DIST memtest86-3.3.tar.gz 137922 RMD160 dd390793b9e2601ceccc01671dc9aaf602a8590f SHA1 e4ae8c12e44a7f4bf7567e1601cff6b811819ee7 SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c EBUILD memtest86-3.2.ebuild 1965 RMD160 8fbd4a94063d393ec6ab326f83d83719d088270b SHA1 e2f0aabe5e800754d7e137dc73c0e0d5cb5a1629 SHA256 61cb68816ded4d8f31e71a2489e6b0bde7f9ca52834a756df6ab69d524960bd5 MD5 94113b3931c39ade8be33c0e48fc4272 memtest86-3.2.ebuild 1965 RMD160 8fbd4a94063d393ec6ab326f83d83719d088270b memtest86-3.2.ebuild 1965 SHA256 61cb68816ded4d8f31e71a2489e6b0bde7f9ca52834a756df6ab69d524960bd5 memtest86-3.2.ebuild 1965 -MISC ChangeLog 4278 RMD160 324822dd9acefa8a32d7b360a2c18f1e262b6667 SHA1 35b2a85834c210f525e7b897830ff61718b35fe1 SHA256 9196e1c80cd314f023780d693025235d107475a30e56a854f0367c971723ff72 -MD5 5e6ed0bbb5aef8ae36321936edf56fb0 ChangeLog 4278 -RMD160 324822dd9acefa8a32d7b360a2c18f1e262b6667 ChangeLog 4278 -SHA256 9196e1c80cd314f023780d693025235d107475a30e56a854f0367c971723ff72 ChangeLog 4278 +EBUILD memtest86-3.3.ebuild 1940 RMD160 d3bff4c4a14154d1437e251135760155c0f69b6e SHA1 c1be38ef227ccfd6554046b3cf0e0a493b13902f SHA256 1086c881914e4580abf0335b4a83355a697260051c2b0446b3a3100f9d461211 +MD5 d3886d9275678a15a8bd810875b47327 memtest86-3.3.ebuild 1940 +RMD160 d3bff4c4a14154d1437e251135760155c0f69b6e memtest86-3.3.ebuild 1940 +SHA256 1086c881914e4580abf0335b4a83355a697260051c2b0446b3a3100f9d461211 memtest86-3.3.ebuild 1940 +MISC ChangeLog 4501 RMD160 0bc28196ad43e41d0d5a8f09ce8cab2d314527d6 SHA1 fa268239c670a625c1b80ad33d569e4a3c77ab4a SHA256 564ff9d3ad80797bf097932577f63bab2d786a576ea8724a4345f047fb12b9c1 +MD5 1590e888b8a9e88bd047cc3d6c77aef4 ChangeLog 4501 +RMD160 0bc28196ad43e41d0d5a8f09ce8cab2d314527d6 ChangeLog 4501 +SHA256 564ff9d3ad80797bf097932577f63bab2d786a576ea8724a4345f047fb12b9c1 ChangeLog 4501 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -22,3 +38,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata MD5 dafd6c576aea2c0b360ed3d358744cf8 files/digest-memtest86-3.2 241 RMD160 20faa7014837adcf5aed0574289671f7acb4ae8c files/digest-memtest86-3.2 241 SHA256 ca11e9f5f4cdf452aea59e68387dff157b0aeed37328d549c9e29d8336a8848b files/digest-memtest86-3.2 241 +MD5 0750b32a9a62aa464faaeadb5d616b1a files/digest-memtest86-3.3 241 +RMD160 07d4bbbee59a83eb6b74c38b9ac848cc77c4674f files/digest-memtest86-3.3 241 +SHA256 e310495ee088c8ae3d38d174e4f24b380a5abf0c67cde726d2483c78a75f8e29 files/digest-memtest86-3.3 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFF+zdm8bi6rjpTunYRAomqAKCDkmyWeSze7vTOy7ggkw53b2dr/gCgq1Ia +yzShDPl3/b0eMRCXUkAMgo0= +=t2gK +-----END PGP SIGNATURE----- diff --git a/sys-apps/memtest86/files/digest-memtest86-3.3 b/sys-apps/memtest86/files/digest-memtest86-3.3 new file mode 100644 index 000000000000..dbdf14ca67c4 --- /dev/null +++ b/sys-apps/memtest86/files/digest-memtest86-3.3 @@ -0,0 +1,3 @@ +MD5 52e35228b60431ef474bbb5125ca1201 memtest86-3.3.tar.gz 137922 +RMD160 dd390793b9e2601ceccc01671dc9aaf602a8590f memtest86-3.3.tar.gz 137922 +SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c memtest86-3.3.tar.gz 137922 diff --git a/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch b/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch new file mode 100644 index 000000000000..68fd355b2e08 --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch @@ -0,0 +1,15 @@ +i can only guess at what this test was trying to accomplish ... + +ive submitted this upstream + +--- main.c ++++ main.c +@@ -465,7 +465,7 @@ + } + compute_segments(window); + window = 0; +- for (v->pass_ticks=0, i=0; ipass_ticks=0, i=0; itestsel >= 0) { diff --git a/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch b/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch new file mode 100644 index 000000000000..397b2c8bbee7 --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch @@ -0,0 +1,12 @@ +sent upstream already ... + +--- memtest_shared.lds ++++ memtest_shared.lds +@@ -19,6 +19,7 @@ + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .hash : { *(.hash) } ++ .gnu.hash : { *(.gnu.hash) } + .dynamic : { *(.dynamic) } + + .rel.text : { *(.rel.text .rel.text.*) } diff --git a/sys-apps/memtest86/memtest86-3.3.ebuild b/sys-apps/memtest86/memtest86-3.3.ebuild new file mode 100644 index 000000000000..1e4113f09a74 --- /dev/null +++ b/sys-apps/memtest86/memtest86-3.3.ebuild @@ -0,0 +1,74 @@ +# 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-3.3.ebuild,v 1.1 2007/03/17 00:33:19 vapier Exp $ + +inherit mount-boot eutils + +DESCRIPTION="A stand alone memory test for x86 computers" +HOMEPAGE="http://www.memtest86.com/" +SRC_URI="http://www.memtest86.com/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="serial" +RESTRICT="test" + +DEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-3.2-solar.patch #66630 + epatch "${FILESDIR}"/${P}-funky-test.patch + epatch "${FILESDIR}"/${P}-gnu-hash.patch + + if use serial ; then + sed -i \ + -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ + config.h \ + || die "sed failed" + fi +} + +src_install() { + insinto /boot/memtest86 + doins memtest.bin || die "doins failed" + dodoc README README.build-process +} + +pkg_postinst() { + einfo + einfo "memtest.bin has been installed in /boot/memtest86/" + einfo "You may wish to update your bootloader configs" + einfo "by adding these lines:" + einfo " - For grub:" + einfo " > title=Memtest86" + + # a little magic to make users' life as easy as possible ;) + bootpart=0 + root="(hd0,0)" + res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'` + if [ -n "${res}" ] ; then + bootpart=1 + else + res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'` + fi + + if [ -n "${res}" ] ; then + root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'` + fi + + einfo " > root ${root}" + if [ "${bootpart}" -eq 1 ] ; then + einfo " > kernel /memtest86/memtest.bin" + else + einfo " > kernel /boot/memtest86/memtest.bin" + fi + + einfo " - For lilo:" + einfo " > image = /boot/memtest86/memtest.bin" + einfo " > label = Memtest86" + einfo +} -- 2.26.2