summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2004-09-04 00:33:24 +0000
committerDaniel Goller <morfic@gentoo.org>2004-09-04 00:33:24 +0000
commit52459dcab489858a863e49208cab283369700f7d (patch)
tree1669a165581a787e9320ccdc327b470c1f09ae03 /net-misc
parentx11-plugins/wmcoincoin-2.5.0c stable for x86. (diff)
downloadhistorical-52459dcab489858a863e49208cab283369700f7d.tar.gz
historical-52459dcab489858a863e49208cab283369700f7d.tar.bz2
historical-52459dcab489858a863e49208cab283369700f7d.zip
applying gcc3.4 patch fixing bug #62714
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/udhcp/ChangeLog5
-rw-r--r--net-misc/udhcp/Manifest5
-rw-r--r--net-misc/udhcp/files/udhcp-gcc-3.4.patch11
-rw-r--r--net-misc/udhcp/udhcp-0.9.8-r3.ebuild15
4 files changed, 31 insertions, 5 deletions
diff --git a/net-misc/udhcp/ChangeLog b/net-misc/udhcp/ChangeLog
index b2b676e33f46..89f634ac2759 100644
--- a/net-misc/udhcp/ChangeLog
+++ b/net-misc/udhcp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/udhcp
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/ChangeLog,v 1.13 2004/07/01 22:06:12 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/ChangeLog,v 1.14 2004/09/04 00:33:24 morfic Exp $
+
+ 03 Sep 2004; Daniel Goller <morfic@gentoo.org> udhcp-0.9.8-r3.ebuild:
+ applying gcc3.4 patch, closing bug 62714
01 Jul 2004; Jon Hood <squinky86@gentoo.org> udhcp-0.9.8-r2.ebuild,
udhcp-0.9.8-r3.ebuild:
diff --git a/net-misc/udhcp/Manifest b/net-misc/udhcp/Manifest
index 6df43ad57924..31b827106e5d 100644
--- a/net-misc/udhcp/Manifest
+++ b/net-misc/udhcp/Manifest
@@ -1,6 +1,7 @@
MD5 95f641eac6ffcf9606184be86bfdb860 udhcp-0.9.8-r2.ebuild 843
-MD5 ef5b951d02cd07ce64e8e32234173c42 ChangeLog 1658
-MD5 c03a0c4ab6b74cd6112e61f84456c822 udhcp-0.9.8-r3.ebuild 1029
+MD5 778cfdd98edd45a1713c8f579d0dc58b ChangeLog 1771
+MD5 ea3db35450a2ef73be2dded5cac41969 udhcp-0.9.8-r3.ebuild 1228
MD5 83ca9ef49068eb2140999999f245f486 files/digest-udhcp-0.9.8-r2 62
MD5 83ca9ef49068eb2140999999f245f486 files/digest-udhcp-0.9.8-r3 62
+MD5 841852ac59a61a1940dd9d509821f231 files/udhcp-gcc-3.4.patch 261
MD5 516540b5ee269ebd9ff8aa7aa648b51f files/udhcp.init 994
diff --git a/net-misc/udhcp/files/udhcp-gcc-3.4.patch b/net-misc/udhcp/files/udhcp-gcc-3.4.patch
new file mode 100644
index 000000000000..141435c8cf9a
--- /dev/null
+++ b/net-misc/udhcp/files/udhcp-gcc-3.4.patch
@@ -0,0 +1,11 @@
+diff -Naur old/dhcpc.c new/dhcpc.c
+--- old/dhcpc.c 2004-09-04 01:13:55.325759257 +0200
++++ new/dhcpc.c 2004-09-04 01:13:36.004144921 +0200
+@@ -132,6 +132,7 @@
+ state = INIT_SELECTING;
+ break;
+ case INIT_SELECTING:
++ break;
+ }
+
+ /* start things over */
diff --git a/net-misc/udhcp/udhcp-0.9.8-r3.ebuild b/net-misc/udhcp/udhcp-0.9.8-r3.ebuild
index 29bf15bde2a0..992182daba2a 100644
--- a/net-misc/udhcp/udhcp-0.9.8-r3.ebuild
+++ b/net-misc/udhcp/udhcp-0.9.8-r3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/udhcp-0.9.8-r3.ebuild,v 1.9 2004/07/01 22:06:12 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/udhcp-0.9.8-r3.ebuild,v 1.10 2004/09/04 00:33:24 morfic Exp $
-inherit eutils
+inherit eutils gcc
DESCRIPTION="udhcp Server/Client Package"
HOMEPAGE="http://udhcp.busybox.net/"
@@ -21,6 +21,17 @@ pkg_setup() {
enewuser dhcp -1 /bin/false /var/lib/dhcp dhcp
}
+src_unpack() {
+
+ unpack ${A}
+ cd ${S}
+ #fixes #62714, thanks GurliGebis
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+ then
+ epatch ${FILESDIR}/udhcp-gcc-3.4.patch
+ fi
+}
+
src_compile() {
emake CROSS_COMPILE=${CHOST}- STRIP=true SYSLOG=1 || die
}