glibc 2.4 / gcc 4.1 compatibility, thanks to Mikko Tiihonen <mikko.tiihonen@hut.fi> wrt bug #126334

(Portage version: 2.1_pre7-r1)

5 files changed, 109 insertions, 13 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 7d7838d699ad..b1281ce3d22e 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/netperf
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.27 2005/05/30 17:02:54 strerror Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.28 2006/03/27 01:27:51 jokey Exp $
+
+*netperf-2.4.0-r1 (27 Mar 2006)
+
+  27 Mar 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/netperf-2.4.0-gcc41.patch, +netperf-2.4.0-r1.ebuild:
+  glibc 2.4 / gcc 4.1 compatibility, thanks to Mikko Tiihonen
+  <mikko.tiihonen@hut.fi> wrt bug #126334
 
 *netperf-2.4.0 (30 May 2005)
 
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 92ace1fd3862..1a80bf2476a5 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,25 +1,54 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 53719c1581da93658fec00eabf8b0427 ChangeLog 3412
+MD5 82ebab399278243ca9697082f41c8317 ChangeLog 3661
+RMD160 8e42a29fb718ad47da7f5745b8a17569e58ff7ba ChangeLog 3661
+SHA256 c5bf71303f4197dc50f9783edd5260bc3c1779cafe96df491aae77a9a45e8b0d ChangeLog 3661
 MD5 787949efbc227966fa6a5609799cbf97 files/digest-netperf-2.2.4 66
+RMD160 c67c5d19666c0449a18fca0166eb2948a502a4c6 files/digest-netperf-2.2.4 66
+SHA256 bd39d26a60096d50cefc9c20140ded836ec1eed0454daf59c1e18f151e6ee089 files/digest-netperf-2.2.4 66
 MD5 201084fb8da044398f8a0459f1e7c4b5 files/digest-netperf-2.3 63
+RMD160 30065117d78125403cdf1f4db0ef3ca6fa437a2b files/digest-netperf-2.3 63
+SHA256 df775fe33992b18abeadfaba067d98c9f9d7fab84a6d24dcc86ac19d70fbeb21 files/digest-netperf-2.3 63
 MD5 1ee55df152ab363e932c73e6155604b1 files/digest-netperf-2.4.0 66
+RMD160 317e77ce12c39f62d5d1de6ce8c511ca093421bd files/digest-netperf-2.4.0 66
+SHA256 d83975b734bdff8ffc0a79e87dafa5b0eaf633f19f64978be13633973e874bf4 files/digest-netperf-2.4.0 66
+MD5 d1003e470e50fab722c6c21548d94129 files/digest-netperf-2.4.0-r1 244
+RMD160 62c1fbb5af08d1aa4f5a54e04ef596b776794244 files/digest-netperf-2.4.0-r1 244
+SHA256 35ae70fdf9762d5204dc25235066cab5d1869c378ef21fd1ba61078d529fe3a6 files/digest-netperf-2.4.0-r1 244
 MD5 5b8fcf5721bc37329f6af346c347f2ba files/digest-netperf-2.4.0_rc2 70
+RMD160 8e4df5996f69b227e9b8337be6b38508b484ebf2 files/digest-netperf-2.4.0_rc2 70
+SHA256 932a676c1e1c9ea8348f1c8134e8706db2386cdf3f06f34ef1a6d00c31ecbc08 files/digest-netperf-2.4.0_rc2 70
 MD5 9c2b856854f3542c3e0a3595d4fb59ca files/digest-netperf-2.4.0_rc3 70
+RMD160 bc4639d5f208d54fbedaacd677afaeaf5fa4b9d2 files/digest-netperf-2.4.0_rc3 70
+SHA256 73637a40fc70d91afa1d9b307b51e8f3dd7c76b29376bcf56094b64cf6569401 files/digest-netperf-2.4.0_rc3 70
 MD5 f7a086a9cdee9e3d6ed0e8976b678dbf files/netperf-2.2-conf 103
+RMD160 3eb1f40f8547c15cf04f15670c47a5f3c24b9fab files/netperf-2.2-conf 103
+SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340 files/netperf-2.2-conf 103
 MD5 35791611e593b4e8cefdfd56031e759d files/netperf-2.2-init 434
+RMD160 6e4337b3d82103f722cbe8f347287f46edf0e2ff files/netperf-2.2-init 434
+SHA256 96e944e8f62d06abdc883b3ba34504c4320d9aa5a711c41fb552eb6c61565d0f files/netperf-2.2-init 434
 MD5 5b39a4d1bbad0a785afc512f8a35e87d files/netperf-2.2alpha.diff 686
+RMD160 203388398899846302e56e2eb61125927ac8bbfd files/netperf-2.2alpha.diff 686
+SHA256 fc813ca378e65c2f20337cad1a0312559eb880055cf9fb1a8c6d6d1b4aaadedf files/netperf-2.2alpha.diff 686
+MD5 9805e626f32fd2b450eff1b5176c75c8 files/netperf-2.4.0-gcc41.patch 538
+RMD160 06dab7d42752c93861049f1d2b0a879289c4ebd7 files/netperf-2.4.0-gcc41.patch 538
+SHA256 a4d74b9855b0e991b4353e8e7e18b4024cc0c46cec153db6db1f551ac2115705 files/netperf-2.4.0-gcc41.patch 538
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
+SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
 MD5 8cff92ac02087bc24cdebec08eb62a3a netperf-2.2.4.ebuild 1353
+RMD160 ec2c812d7a0f5301e92a3f946ccedc500f3af3a2 netperf-2.2.4.ebuild 1353
+SHA256 2a6ad0207d5d480e49b4995e8354f3bddb0396379ca6aea5a1f272eb02d55293 netperf-2.2.4.ebuild 1353
 MD5 6d14aac9d803bf952c9a70094e39495c netperf-2.3.ebuild 1351
+RMD160 c446eb4b2b293a595fe7e4eccb6005503034939e netperf-2.3.ebuild 1351
+SHA256 e62bc82cd00b7b15c6ed156dbeed32104da161dfa7e54eb5ffdc8270582d6697 netperf-2.3.ebuild 1351
+MD5 cb5deb511e13ff1732f8ccef4447b015 netperf-2.4.0-r1.ebuild 1344
+RMD160 f4e9f62f313ac2da4c0c8316767680d5e9862621 netperf-2.4.0-r1.ebuild 1344
+SHA256 6126a0061dd2697aca842eee06af7aa95c70427ae0777a144880984569489b6c netperf-2.4.0-r1.ebuild 1344
 MD5 906e80bd9cf0afb06622cd91dd59d9f8 netperf-2.4.0.ebuild 1246
+RMD160 43dce718aa2571c42f90206132b995fc8c2c6f98 netperf-2.4.0.ebuild 1246
+SHA256 69fcc67c208c0b2185dd1a47139aa804aa05e6845f784bcc5b1a35b0b6c74e82 netperf-2.4.0.ebuild 1246
 MD5 ab7b8d7bbb3c51fce8949fe3cfb2d6a4 netperf-2.4.0_rc2.ebuild 1273
+RMD160 155942a87f40ff5c0c1cba907495ea3d839972f1 netperf-2.4.0_rc2.ebuild 1273
+SHA256 69f35c384a247b3e0663f1f44941ce6d499aab0f6e60b5bca593631412c98e17 netperf-2.4.0_rc2.ebuild 1273
 MD5 4ef631e53d11899c995f7a35094d956f netperf-2.4.0_rc3.ebuild 1273
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC2WNAI1lqEGTUzyQRAjT2AJ0cmggXHqQt8aUZZC53i4uK9h7Z+wCgmKcC
-s7Mh5gnb00p97XC6jE2fwkM=
-=vXaC
------END PGP SIGNATURE-----
+RMD160 bd707cb2061088101a194624ded7d092d6a7dd9f netperf-2.4.0_rc3.ebuild 1273
+SHA256 2aa60eb83c93d0f78c728b0d5e0fa4b228c9289b8861e5501050a6f0e7825322 netperf-2.4.0_rc3.ebuild 1273
diff --git a/net-analyzer/netperf/files/digest-netperf-2.4.0-r1 b/net-analyzer/netperf/files/digest-netperf-2.4.0-r1
new file mode 100644
index 000000000000..7e957e9e25f6
--- /dev/null
+++ b/net-analyzer/netperf/files/digest-netperf-2.4.0-r1
@@ -0,0 +1,3 @@
+MD5 d43e757ca7fafcfac99274f046d46bca netperf-2.4.0.tar.gz 1511378
+RMD160 733cadf498a49267420d2648bfbaff56e4d54bbd netperf-2.4.0.tar.gz 1511378
+SHA256 7dcdd2b72f24a15a32f78525399a5be945b8aa2876b7546a39c1473c24d465e4 netperf-2.4.0.tar.gz 1511378
diff --git a/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch b/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch
new file mode 100644
index 000000000000..72da7e4cbcc2
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch
@@ -0,0 +1,11 @@
+--- aclocal.m4	2005-05-11 19:57:20.000000000 +0300
++++ aclocal.m4	2006-03-19 19:42:03.000000000 +0200
+@@ -906,7 +906,7 @@
+          # "void *" as the second argument to getpeername
+          curl_cv_socklen_t_equiv=
+          for arg2 in "struct sockaddr" void; do
+-            for t in int size_t unsigned long "unsigned long" socklen_t; do
++            for t in  socklen_t int size_t unsigned long "unsigned long"; do
+                AC_TRY_COMPILE([
+                   #ifdef HAVE_SYS_TYPES_H
+                   #include <sys/types.h>
diff --git a/net-analyzer/netperf/netperf-2.4.0-r1.ebuild b/net-analyzer/netperf/netperf-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..977463cbb467
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.4.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.0-r1.ebuild,v 1.1 2006/03/27 01:27:51 jokey Exp $
+
+inherit flag-o-matic autotools
+
+MY_P=${P/_rc/-rc}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
+if [[ ${PV} == *_* ]]; then
+	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/experimental/${MY_P}.tar.gz"
+else
+	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
+fi
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
+
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc41.patch
+	eautoconf
+}
+
+src_install () {
+	einstall || die
+
+	# move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv ${D}/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	newinitd ${FILESDIR}/${PN}-2.2-init netperf
+	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
+
+	# documentation and example scripts
+	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
+	dodir /usr/share/doc/${PF}/examples
+	mv ${D}/usr/bin/*_script ${D}/usr/share/doc/${PF}/examples
+}