summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-11-10 07:24:38 +0000
committerTravis Tilley <lv@gentoo.org>2004-11-10 07:24:38 +0000
commitd75c13263c9ff0fa63dcedae73b6888a0536dddc (patch)
tree0dc5fd295ae8888f54f66610a90f9fde3ea582a4 /net-misc/dhcp
parentinitial commit of an experimental uclibc-hardened profile (diff)
downloadhistorical-d75c13263c9ff0fa63dcedae73b6888a0536dddc.tar.gz
historical-d75c13263c9ff0fa63dcedae73b6888a0536dddc.tar.bz2
historical-d75c13263c9ff0fa63dcedae73b6888a0536dddc.zip
fixed some invalid attributes in includes/dhcpd.h so that dhcp compiles using gcc 3.4 again. closes bug 69555
Diffstat (limited to 'net-misc/dhcp')
-rw-r--r--net-misc/dhcp/ChangeLog7
-rw-r--r--net-misc/dhcp/Manifest21
-rw-r--r--net-misc/dhcp/dhcp-3.0.1.ebuild3
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.1-fix-invalid-attribute.patch15
4 files changed, 29 insertions, 17 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 01e56dfac665..e7f053d30cea 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/dhcp
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.45 2004/10/17 12:42:14 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.46 2004/11/10 07:24:38 lv Exp $
+
+ 10 Nov 2004; Travis Tilley <lv@gentoo.org>
+ +files/dhcp-3.0.1-fix-invalid-attribute.patch, dhcp-3.0.1.ebuild:
+ fixed some invalid attributes in includes/dhcpd.h so that dhcp compiles
+ using gcc 3.4 again. closes bug 69555
17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> dhcp-3.0.1.ebuild:
keywords ~amd64.
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index efa0fb72ee54..bc8fdb69f4a1 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 82dc460a1bd400681e03fe80a7bcb00f ChangeLog 7375
-MD5 fc6fd08c31e500eab4e03de058c3d904 dhcp-3.0.1.ebuild 3930
+MD5 37dfb44d785e2277fd5a8859a311c424 ChangeLog 7597
MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
+MD5 7d50e4a39640d74b9a0bedf1c5b57705 dhcp-3.0.1.ebuild 3986
MD5 a4fc0a5a40c8ec22f3301945fc744516 files/conf.dhcpd 381
+MD5 66becf9870e0293bbd35d1fba770751a files/dhcp-3.0+paranoia.patch 5366
+MD5 d909d81a4d4ea39ddfc9898d33488c73 files/dhcp-3.0pl2-fix-perms.patch 485
MD5 0203f009ee3427c47c6962c1352e3de4 files/dhcp.conf 634
MD5 6fac614e84b5c2856503f0a62d10c1fa files/dhcp.rc6 1100
-MD5 7f1859e6517a23f87c8e83c68a15a537 files/digest-dhcp-3.0.1 62
-MD5 d909d81a4d4ea39ddfc9898d33488c73 files/dhcp-3.0pl2-fix-perms.patch 485
MD5 1a902e3332707119032d7bc229b91001 files/dhcrelay.conf 505
MD5 c2433edf6a800843b0d55c9086de1252 files/dhcrelay.rc6 564
-MD5 66becf9870e0293bbd35d1fba770751a files/dhcp-3.0+paranoia.patch 5366
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBiaaMHTu7gpaalycRAvH2AKDuLQu5+nrd3KAPU760AWOSjnEM7ACgtN4D
-lAPg0cyNDyDDmRkGq7AhRhI=
-=Yf9B
------END PGP SIGNATURE-----
+MD5 7f1859e6517a23f87c8e83c68a15a537 files/digest-dhcp-3.0.1 62
+MD5 ca45269300d74a3a8750e0e64e8d92ea files/dhcp-3.0.1-fix-invalid-attribute.patch 583
diff --git a/net-misc/dhcp/dhcp-3.0.1.ebuild b/net-misc/dhcp/dhcp-3.0.1.ebuild
index f633c6276440..b891034b12b0 100644
--- a/net-misc/dhcp/dhcp-3.0.1.ebuild
+++ b/net-misc/dhcp/dhcp-3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.1.ebuild,v 1.9 2004/11/04 03:47:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.1.ebuild,v 1.10 2004/11/10 07:24:38 lv Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -24,6 +24,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/dhcp-3.0+paranoia.patch
epatch ${FILESDIR}/dhcp-3.0pl2-fix-perms.patch
+ epatch ${FILESDIR}/dhcp-3.0.1-fix-invalid-attribute.patch
has noman ${FEATURES} && sed -i 's:nroff:echo:' */Makefile.dist
}
diff --git a/net-misc/dhcp/files/dhcp-3.0.1-fix-invalid-attribute.patch b/net-misc/dhcp/files/dhcp-3.0.1-fix-invalid-attribute.patch
new file mode 100644
index 000000000000..20efa532620a
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.1-fix-invalid-attribute.patch
@@ -0,0 +1,15 @@
+--- includes/dhcpd.h.old 2004-11-10 02:18:44.201012888 -0500
++++ includes/dhcpd.h 2004-11-10 02:19:11.411876208 -0500
+@@ -306,9 +306,9 @@
+ # define EPHEMERAL_FLAGS (MS_NULL_TERMINATION | \
+ UNICAST_BROADCAST_HACK)
+
+- binding_state_t __attribute__ ((mode (__byte__))) binding_state;
+- binding_state_t __attribute__ ((mode (__byte__))) next_binding_state;
+- binding_state_t __attribute__ ((mode (__byte__))) desired_binding_state;
++ binding_state_t binding_state;
++ binding_state_t next_binding_state;
++ binding_state_t desired_binding_state;
+
+ struct lease_state *state;
+