From 345301d4d8c9e79f69aca93c973d6ada249b4c43 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 17 Feb 2007 17:11:00 +0000 Subject: [PATCH] Fix crash due to unaligned accesses #163430 by Gustavo Zacarias. Package-Manager: portage-2.1.2-r9 --- sys-apps/net-tools/ChangeLog | 10 ++- sys-apps/net-tools/Manifest | 24 ++++-- .../net-tools/files/digest-net-tools-1.60-r13 | 6 ++ sys-apps/net-tools/net-tools-1.60-r13.ebuild | 75 +++++++++++++++++++ 4 files changed, 105 insertions(+), 10 deletions(-) create mode 100644 sys-apps/net-tools/files/digest-net-tools-1.60-r13 create mode 100644 sys-apps/net-tools/net-tools-1.60-r13.ebuild diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog index 06bccd0b7fa4..c8cc4958fe21 100644 --- a/sys-apps/net-tools/ChangeLog +++ b/sys-apps/net-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/net-tools -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.62 2006/11/15 12:48:01 corsair Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.63 2007/02/17 17:11:00 vapier Exp $ + +*net-tools-1.60-r13 (17 Feb 2007) + + 17 Feb 2007; Mike Frysinger + +net-tools-1.60-r13.ebuild: + Fix crash due to unaligned accesses #163430 by Gustavo Zacarias. 15 Nov 2006; Markus Rothe net-tools-1.60-r12.ebuild: Stable on ppc64; bug #152837 diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest index 68ed6bf430c9..1c2c26a5d91d 100644 --- a/sys-apps/net-tools/Manifest +++ b/sys-apps/net-tools/Manifest @@ -3,6 +3,7 @@ Hash: SHA1 DIST net-tools-1.60-patches-1.1.tar.bz2 26847 RMD160 45854799e73c45699914e24b67aaee9af8aba9d0 SHA1 b33529db7dbe79660bb9357fe02eaeb7ae8c3006 SHA256 ba97d6853536bd0c8f450ea53ffaf53523f0a6a42518b91f8e82fd4a1449e49b DIST net-tools-1.60-patches-1.5.tar.bz2 105762 RMD160 c851b3a859bdf3febf3767010fe4b12696aab722 SHA1 8bff4bac61c78a603844cfd859d178b2e76a0e33 SHA256 df7d77454a5c2bad79559919359863334745ef319530bb063e1226d2dc1ef3be +DIST net-tools-1.60-patches-1.6.tar.bz2 106557 RMD160 1dce9fecbbab849bfdb8b832ee4baf5cead983d9 SHA1 709d1c8f611225f851ec6227b4928ae9f97edbb5 SHA256 61df3fca2bd30a752231285bd714edcadc0c5206a09954eb1861a68a0ef4bba9 DIST net-tools-1.60.tar.bz2 198520 RMD160 58376371a9383842640d2c4215cf771d522ee43e SHA1 944fb70641505d5d1139dba3aeb81ba124574b83 SHA256 7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b EBUILD net-tools-1.60-r11.ebuild 1933 RMD160 20b97f94baef955376da8a7f99233bed39fd8281 SHA1 5359610da045836f4618173480fcdc23063960ac SHA256 76cd1aa5be58d1a7dcc19cbb7cb6e2a86ed1e33f246fd093bf4a9082e000190c MD5 89b93cb8df63ffec2ad24ac8e30a5ea7 net-tools-1.60-r11.ebuild 1933 @@ -12,10 +13,14 @@ EBUILD net-tools-1.60-r12.ebuild 2166 RMD160 5bba395c80686dd826613222331ec844ccc MD5 ff85083272898e0840a7781f7fea9a24 net-tools-1.60-r12.ebuild 2166 RMD160 5bba395c80686dd826613222331ec844ccc0b97f net-tools-1.60-r12.ebuild 2166 SHA256 b3f8a6c4254a81017e701ed8f63c3aac6740e5472ab75c211820dc50ea6ac931 net-tools-1.60-r12.ebuild 2166 -MISC ChangeLog 9807 RMD160 baf9994cca69c83d71f5cc0cf97e2ab41bd5dac7 SHA1 48c5cd5db4b1bd650750709ee6b70e62a16474a7 SHA256 8827d5eac472f1a851d773fefde5d33a0c910b78a73007560d6de18a83f5e804 -MD5 b1363982ccd2f969b2c4da26512634a4 ChangeLog 9807 -RMD160 baf9994cca69c83d71f5cc0cf97e2ab41bd5dac7 ChangeLog 9807 -SHA256 8827d5eac472f1a851d773fefde5d33a0c910b78a73007560d6de18a83f5e804 ChangeLog 9807 +EBUILD net-tools-1.60-r13.ebuild 2177 RMD160 491d9fe6f6b23ccdafa959533cdbed5108ccc96c SHA1 7613629f7f3d9eb46f77facfcf192bd13a35ddf1 SHA256 fc094982fd362e1d34cbc4c576d15fbb3031c26eee1bce583b52db73173faf4f +MD5 ea145e5bda495a5852fe1f23688dc8e9 net-tools-1.60-r13.ebuild 2177 +RMD160 491d9fe6f6b23ccdafa959533cdbed5108ccc96c net-tools-1.60-r13.ebuild 2177 +SHA256 fc094982fd362e1d34cbc4c576d15fbb3031c26eee1bce583b52db73173faf4f net-tools-1.60-r13.ebuild 2177 +MISC ChangeLog 9989 RMD160 270ec223732168bcbe2131607ca1326ba95b44fa SHA1 041ec2a1d7ef14aa9fe413e1e1c5b30363060394 SHA256 4a8ce3b89b9c223b7d41bc64960a643b26e5ff6a3a760e473a86f52310f36a02 +MD5 4c09d48c348d64aa43cbcb72b8256076 ChangeLog 9989 +RMD160 270ec223732168bcbe2131607ca1326ba95b44fa ChangeLog 9989 +SHA256 4a8ce3b89b9c223b7d41bc64960a643b26e5ff6a3a760e473a86f52310f36a02 ChangeLog 9989 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -26,10 +31,13 @@ SHA256 8cfac90a52504ef8753f40fb09bdc188eed9349076b8e87c7b79e35ed1a0364c files/di MD5 9f0b42318c4dcc3c6c04f6389419c21e files/digest-net-tools-1.60-r12 530 RMD160 ba9d414e5044c3dd95fb417da30745f7fd17fcac files/digest-net-tools-1.60-r12 530 SHA256 78bdd7ac0d1345a6e13f8ccdebf71f90cc28d985a145986330ea9b34e0667d74 files/digest-net-tools-1.60-r12 530 +MD5 a9f54037512f4a4903a338081b3cfe23 files/digest-net-tools-1.60-r13 530 +RMD160 f142abc362ec3dc4b90e03db62591281be7d9a74 files/digest-net-tools-1.60-r13 530 +SHA256 e822364b727e44ce5037dfdca04bfc303c0bfafa3a819480c81ca69cfbbe9c86 files/digest-net-tools-1.60-r13 530 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFf4ZpamhnQswr0vIRAkXxAJ0cQ6OrdQwY7HWnc4DV3zY87JRXJACgiwTi -It8l7e3EbHP1773VCbXRAT8= -=6YIx +iD8DBQFF1zdT8bi6rjpTunYRAqtYAKCAj709XnsqDOEhECRn5qKYi4OUgwCcCdUs +CxCbndKQu6xytJhRnWnlXGk= +=vJrO -----END PGP SIGNATURE----- diff --git a/sys-apps/net-tools/files/digest-net-tools-1.60-r13 b/sys-apps/net-tools/files/digest-net-tools-1.60-r13 new file mode 100644 index 000000000000..de54b07940cd --- /dev/null +++ b/sys-apps/net-tools/files/digest-net-tools-1.60-r13 @@ -0,0 +1,6 @@ +MD5 b32bd55494eb53ccef0b433008dc2c23 net-tools-1.60-patches-1.6.tar.bz2 106557 +RMD160 1dce9fecbbab849bfdb8b832ee4baf5cead983d9 net-tools-1.60-patches-1.6.tar.bz2 106557 +SHA256 61df3fca2bd30a752231285bd714edcadc0c5206a09954eb1861a68a0ef4bba9 net-tools-1.60-patches-1.6.tar.bz2 106557 +MD5 888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 198520 +RMD160 58376371a9383842640d2c4215cf771d522ee43e net-tools-1.60.tar.bz2 198520 +SHA256 7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b net-tools-1.60.tar.bz2 198520 diff --git a/sys-apps/net-tools/net-tools-1.60-r13.ebuild b/sys-apps/net-tools/net-tools-1.60-r13.ebuild new file mode 100644 index 000000000000..eac0c84996f7 --- /dev/null +++ b/sys-apps/net-tools/net-tools-1.60-r13.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r13.ebuild,v 1.1 2007/02/17 17:11:00 vapier Exp $ + +inherit flag-o-matic toolchain-funcs eutils + +PVER="1.6" +DESCRIPTION="Standard Linux networking tools" +HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/" +SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2 + mirror://gentoo/${P}-patches-${PVER}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="nls static" + +RDEPEND="!sys-apps/mii-diag + !net-misc/etherwake + !sys-apps/nictools" +DEPEND="nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${WORKDIR}"/patch/*.patch + cp "${WORKDIR}"/extra/config.{h,make} . || die + mkdir include/linux + cp "${WORKDIR}"/extra/*.h include/linux/ + mv "${WORKDIR}"/extra/ethercard-diag/ "${S}"/ || die + + if use static ; then + append-flags -static + append-ldflags -static + fi + + sed -i \ + -e "/^COPTS =/s:=:=${CFLAGS}:" \ + -e "/^LOPTS =/s:=:=${LDFLAGS}:" \ + Makefile || die "sed FLAGS Makefile failed" + + if ! use nls ; then + sed -i \ + -e '/define I18N/s:1$:0:' config.h \ + || die "sed config.h failed" + sed -i \ + -e '/^I18N=/s:1$:0:' config.make \ + || die "sed config.make failed" + fi +} + +src_compile() { + tc-export CC + emake libdir || die "emake libdir failed" + emake || die "emake failed" + emake -C ethercard-diag || die "emake ethercard-diag failed" + + if use nls ; then + emake i18ndir || die "emake i18ndir failed" + fi +} + +src_install() { + make BASEDIR="${D}" install || die "make install failed" + make -C ethercard-diag DESTDIR="${D}" install || die "make install ethercard-diag failed" + mv "${D}"/usr/share/man/man8/ether{,-}wake.8 + mv "${D}"/usr/sbin/mii-diag "${D}"/sbin/ || die "mv mii-diag failed" + mv "${D}"/bin/* "${D}"/sbin/ || die "mv bin to sbin failed" + mv "${D}"/sbin/{hostname,domainname,netstat,dnsdomainname,ypdomainname,nisdomainname} "${D}"/bin/ \ + || die "mv sbin to bin failed" + dodir /usr/bin + dosym /bin/hostname /usr/bin/hostname + + dodoc README README.ipv6 TODO +} -- 2.26.2