summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-10 23:42:39 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-10 23:42:39 +0000
commitd8c269431d470c462e8c330072db0e3d858f84a1 (patch)
tree29b4c8278e628e9f21e4173c60b2d5a4eca014f4 /sys-apps
parentAdd modular X dependencies (bug #124177). (diff)
downloadhistorical-d8c269431d470c462e8c330072db0e3d858f84a1.tar.gz
historical-d8c269431d470c462e8c330072db0e3d858f84a1.tar.bz2
historical-d8c269431d470c462e8c330072db0e3d858f84a1.zip
Fix building with glibc-2.4 and newer.
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/busybox/ChangeLog6
-rw-r--r--sys-apps/busybox/Manifest21
-rw-r--r--sys-apps/busybox/busybox-1.1.0.ebuild3
-rw-r--r--sys-apps/busybox/files/1.1.0/glibc.patch21
4 files changed, 40 insertions, 11 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index c56a24d42ff2..b2f08dcde4e5 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/busybox
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.76 2006/02/18 06:16:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.77 2006/03/10 23:42:39 vapier Exp $
+
+ 10 Mar 2006; Mike Frysinger <vapier@gentoo.org> +files/1.1.0/glibc.patch,
+ busybox-1.1.0.ebuild:
+ Fix building with glibc-2.4 and newer.
18 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+files/1.1.0/ppc64-insmod.patch, busybox-1.1.0.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 6f0785f4d025..065e3c8783c1 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,18 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 881125e9b071c0caf3b9f67d70d0ffcd ChangeLog 14036
-RMD160 02ccba4b4b59c04ea20d465c2eb717cd641b9ce6 ChangeLog 14036
-SHA256 4b8157a4b4ff355bf640e5ca3a9cd3475ec333d48f7b1c1d10933a21fb5673de ChangeLog 14036
+MD5 92c121da4a1743c5e7b2d834f2d85900 ChangeLog 14178
+RMD160 85eeaebbd41b5397b804d559d6f9b9758a20620f ChangeLog 14178
+SHA256 f68e611a05784bbd7ae15cf0428a2efdf81e9894fd98ad3dacc1fc3ccf50f6d2 ChangeLog 14178
MD5 fe2861ddcc79aa407758c05886aee1e0 busybox-1.00-r4.ebuild 7084
RMD160 758cad996204484b90f30ec3f7a0f1b4bf757818 busybox-1.00-r4.ebuild 7084
SHA256 d011220b72214515e0d48c97ada66015ad2e0d823c997d6f08423d3323ab8c3a busybox-1.00-r4.ebuild 7084
MD5 b7b9bf756e20e87cf108d32aed5ec003 busybox-1.01.ebuild 6919
RMD160 bd9e1a667f120ac65d280308deae200d4227aca6 busybox-1.01.ebuild 6919
SHA256 a79aa3f0d8ecc4a4545296d1ea5dcfa2bc4d18f98f5f6d2ce68e432dd2b89b96 busybox-1.01.ebuild 6919
-MD5 1e7bd0ee313d3ffc2259ed7a2e504105 busybox-1.1.0.ebuild 6583
-RMD160 922e9fd171c7aaf8875614f429ee0c95bca9f0f5 busybox-1.1.0.ebuild 6583
-SHA256 e4db3bb54eb0e5f835e04f93d846b36133955b788e63848f5081519192bf4f5f busybox-1.1.0.ebuild 6583
+MD5 a71b8514f7a138ab1ff1221692d324f4 busybox-1.1.0.ebuild 6623
+RMD160 245ec1ce25b6e1e4f2bc41ab3ba0c59f38640c24 busybox-1.1.0.ebuild 6623
+SHA256 c6d3bb712c52cf67151544f07190110bdc7417ecbe349960fc0acabe70953697 busybox-1.1.0.ebuild 6623
MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
RMD160 01c16591ff5d5b339a605a4372c6e431270862ed files/1.00/bash-tests.patch 1474
SHA256 091f9aa2a5294cf9659ffaa2c6f995e9af2d0cdc2388ecab3620d06fd4ac4cb2 files/1.00/bash-tests.patch 1474
@@ -52,6 +52,9 @@ SHA256 f1b10d90fdcf0ee370ffb8a760dd3e82d3a6df4e213c03be99ed3803e7460a7d files/1.
MD5 9a2f1a6d14ff310ef48f55cc4841aa99 files/1.1.0/bb.patch 156
RMD160 7dea06b8cad20585129845980fe06eb6d27ed159 files/1.1.0/bb.patch 156
SHA256 094d7a95f64198666ea65bdd59f2ea93b7f489b9019bb045aa1c1d25e9f0ee53 files/1.1.0/bb.patch 156
+MD5 aca87da03c58ee5ef16cc423a40b2249 files/1.1.0/glibc.patch 605
+RMD160 537c9fd550d61aea7c1f2a05d44ce0a9af8060a0 files/1.1.0/glibc.patch 605
+SHA256 0a252b3a7da5265cf439300d9a98e2c39bf418acc29b4f113a53e2552098415f files/1.1.0/glibc.patch 605
MD5 09f8e41306220183f16a668aa9e3cc76 files/1.1.0/ppc64-insmod.patch 359
RMD160 4f423c216dbe5ba36e2589e51091775b21e398c2 files/1.1.0/ppc64-insmod.patch 359
SHA256 822f72925dbff554a1f4e8c34a979bf7fc192b5683b62a40f6d78316b80d8a8c files/1.1.0/ppc64-insmod.patch 359
@@ -73,7 +76,7 @@ SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
-iD8DBQFEEgtk2+ySkm8kpY0RAiTxAKCgb39P0pRsm05Ai3ZYFCAAS2R2CgCfTILg
-DJXWZr8F17cVlmj+f9Td29M=
-=EYqN
+iD8DBQFEEg9W2+ySkm8kpY0RAohuAKCh2VbNMY+nQ9xBOVHKTbVI425nQwCggEfd
+6+DIDTveKpnlaFpX8KLmG4Y=
+=tD0s
-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.1.0.ebuild b/sys-apps/busybox/busybox-1.1.0.ebuild
index 1bce392526d3..9428a7eda69a 100644
--- a/sys-apps/busybox/busybox-1.1.0.ebuild
+++ b/sys-apps/busybox/busybox-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.0.ebuild,v 1.4 2006/03/10 23:25:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.0.ebuild,v 1.5 2006/03/10 23:42:39 vapier Exp $
inherit eutils
@@ -58,6 +58,7 @@ src_unpack() {
# patches go here!
epatch "${FILESDIR}"/1.1.0/bb.patch
epatch "${FILESDIR}"/1.1.0/ppc64-insmod.patch
+ epatch "${FILESDIR}"/1.1.0/glibc.patch
# we'll let portage do the stripping
sed -i \
diff --git a/sys-apps/busybox/files/1.1.0/glibc.patch b/sys-apps/busybox/files/1.1.0/glibc.patch
new file mode 100644
index 000000000000..9025265a65d2
--- /dev/null
+++ b/sys-apps/busybox/files/1.1.0/glibc.patch
@@ -0,0 +1,21 @@
+Index: networking/ping6.c
+===================================================================
+--- networking/ping6.c (revision 14514)
++++ networking/ping6.c (working copy)
+@@ -236,6 +236,16 @@
+ }
+ }
+
++/* libc defines have changed around on us, whee ! */
++#ifndef ICMP6_MEMBERSHIP_QUERY
++# define ICMP6_MEMBERSHIP_QUERY MLD_LISTENER_QUERY
++#endif
++#ifndef ICMP6_MEMBERSHIP_REPORT
++# define ICMP6_MEMBERSHIP_REPORT MLD_LISTENER_REPORT
++#endif
++#ifndef ICMP6_MEMBERSHIP_REDUCTION
++# define ICMP6_MEMBERSHIP_REDUCTION MLD_LISTENER_REDUCTION
++#endif
+ static char *icmp6_type_name (int id)
+ {
+ switch (id) {