From: Roy Marples Date: Wed, 21 Feb 2007 13:10:56 +0000 (+0000) Subject: Punt old versions X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9354d5d73a25b667ecadb3b787d97129147c4ddb;p=gentoo.git Punt old versions Package-Manager: portage-2.1.2-r10 --- diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 4c66460ca649..16310fc3ba92 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -2,25 +2,13 @@ AUX dhcpcd-2.0.0-alwaysup.patch 269 RMD160 32639a49176d07495704da4c9cae6237fe123 MD5 5fa92b345c6326fcec19f2476422070b files/dhcpcd-2.0.0-alwaysup.patch 269 RMD160 32639a49176d07495704da4c9cae6237fe12333a files/dhcpcd-2.0.0-alwaysup.patch 269 SHA256 6c8bb55db74b400cd98d406c6f96e18956f33efb2e814f12d974a43799f0f902 files/dhcpcd-2.0.0-alwaysup.patch 269 -AUX dhcpcd-3.0.8-static-routes.patch 5441 RMD160 ed6fb34dd8abb95d6536f1fb1bbc39a604ca1f26 SHA1 56df68f104782a2e20da91ce1ee1ace4c338f233 SHA256 0e50343a2533ad6178838eddc2ce583a133c7b043fd012bacfe506a2b887cde1 -MD5 91f5126cc33d18f343c4fd85a009c838 files/dhcpcd-3.0.8-static-routes.patch 5441 -RMD160 ed6fb34dd8abb95d6536f1fb1bbc39a604ca1f26 files/dhcpcd-3.0.8-static-routes.patch 5441 -SHA256 0e50343a2533ad6178838eddc2ce583a133c7b043fd012bacfe506a2b887cde1 files/dhcpcd-3.0.8-static-routes.patch 5441 DIST dhcpcd-2.0.5.tar.bz2 124838 RMD160 205632ea754c51d39827cfbdb9839368a4f17a78 SHA1 f2480d142dfce4128b13d434497ad933f4c337d1 SHA256 0b3acf8306f5ad1fb036703c9ede302c416d9f118950903306c647357113a411 -DIST dhcpcd-3.0.10.tar.bz2 30096 RMD160 3103f987c9a85f2e678a1e3e43b2c519df2620e4 SHA1 9325611f4950890008899696a965896419067d4e SHA256 2cf4703ca04540fd6f9dd430796f333bd59028117dfdef9f235a4c7ee93b3f8d DIST dhcpcd-3.0.11.tar.bz2 30168 RMD160 e102057dface09048971ba6dea19174a2e57768b SHA1 81871b192eafe414e5d1dd3c45de3939cc546c46 SHA256 bf4b5789fc23e193dbe2989664847a2c761f5ca3dc250d53f2df2aec4d74f3e7 DIST dhcpcd-3.0.12.tar.bz2 31883 RMD160 4cfb048c7b652e911d3e10c4b4510e1bfdc1ffc4 SHA1 8c3deabd5b4c005451475b7147ba87255163c211 SHA256 7e3e5baa2714538571dae538445853f2fb086ac05874fbd62feeb64cf7bde453 -DIST dhcpcd-3.0.6.tar.bz2 28246 RMD160 d7287e29a59c9e2fe37ebd98e2c250fa5ebd3cf6 SHA1 27d4089a08e3373255f5936c968194cb68e5cba5 SHA256 4b935a13347e9271f60dbf2f290d9f648f0455bea4bf0c0bd57f58bc227ea81d -DIST dhcpcd-3.0.8.tar.bz2 29305 RMD160 f19545ebd98aabd60512f3c482d9a30ce0f554ab SHA1 d2d3613159bc9e36f3ef39b8244280030369fff0 SHA256 c878e32bb149c17a455ba13f370ea2bc2c69e0da3a41ed5ad58b2d0ca51ec09a -DIST dhcpcd-3.0.9.tar.bz2 29504 RMD160 31cbe972c9b5a897193a3fece5fe2021d1fff8bb SHA1 0e88926a44257e2e6394cbdbb93f1937abbdcfec SHA256 e739bb17c955ecc924579b78588abdf696b039c1c02bb1ebbec50599fe3f7370 EBUILD dhcpcd-2.0.5-r1.ebuild 1434 RMD160 ffca09a219770fcb582a751c490b8d1bcc1e3088 SHA1 55369d38f91511db3b652a6019f070506541bf27 SHA256 f821d6557b76a3f493032c4d8e0ca1b789a1d65f7e23fc5873c8c0476d62bcb1 MD5 3bffdff1e1faf0c40ad7f2dc1ae4129d dhcpcd-2.0.5-r1.ebuild 1434 RMD160 ffca09a219770fcb582a751c490b8d1bcc1e3088 dhcpcd-2.0.5-r1.ebuild 1434 SHA256 f821d6557b76a3f493032c4d8e0ca1b789a1d65f7e23fc5873c8c0476d62bcb1 dhcpcd-2.0.5-r1.ebuild 1434 -EBUILD dhcpcd-3.0.10.ebuild 897 RMD160 35e294896685fae928dd59a7bc7a6654717841bf SHA1 2f11e9e01cc49b40bbc084f10535916c114decaa SHA256 82cfa8d3c92004d474ce67aeaa9d31641b253d1f967189360dd35ffb2ed8c2c0 -MD5 70aa98775ae61c9c95fee3848fa22634 dhcpcd-3.0.10.ebuild 897 -RMD160 35e294896685fae928dd59a7bc7a6654717841bf dhcpcd-3.0.10.ebuild 897 -SHA256 82cfa8d3c92004d474ce67aeaa9d31641b253d1f967189360dd35ffb2ed8c2c0 dhcpcd-3.0.10.ebuild 897 EBUILD dhcpcd-3.0.11.ebuild 912 RMD160 e7421253a86764ea502618e0357456c5ab246dcd SHA1 d4573972995150006a7730412d492e0862613d2e SHA256 ecf92aa94684f54151dd15a5c5c14ce04aaf1ef12093fdeb1332d38525658828 MD5 14eca46224121bce7b374a3f304254da dhcpcd-3.0.11.ebuild 912 RMD160 e7421253a86764ea502618e0357456c5ab246dcd dhcpcd-3.0.11.ebuild 912 @@ -29,22 +17,6 @@ EBUILD dhcpcd-3.0.12.ebuild 912 RMD160 7155756d40cab7e8bff5eab0be9fa902e823febf MD5 ca8d21eaba65e9fedaacedc13234df2e dhcpcd-3.0.12.ebuild 912 RMD160 7155756d40cab7e8bff5eab0be9fa902e823febf dhcpcd-3.0.12.ebuild 912 SHA256 b5c0dd1a462a58bf8aa9bbc524b9c047d2cd041346a981552efd5ca2ea369fec dhcpcd-3.0.12.ebuild 912 -EBUILD dhcpcd-3.0.6.ebuild 900 RMD160 595dce91edb5075c465b52cc43721684e551cc0d SHA1 1c554033deb25d48003df07702be6903659140be SHA256 de07c316f2b1eff459341e8cd79461b6913a76c9948315fc539d0948acd69337 -MD5 b84f288b02709c1c60ec8b6f5579ac5b dhcpcd-3.0.6.ebuild 900 -RMD160 595dce91edb5075c465b52cc43721684e551cc0d dhcpcd-3.0.6.ebuild 900 -SHA256 de07c316f2b1eff459341e8cd79461b6913a76c9948315fc539d0948acd69337 dhcpcd-3.0.6.ebuild 900 -EBUILD dhcpcd-3.0.8-r1.ebuild 947 RMD160 036fa3e5ff936bbbb32b834b8efe578c28746071 SHA1 d7b0f0ec41d3c464f5b89e5fefe044bc0ddc1567 SHA256 d41ca97dbb88959f91926d47c05bd77d81806125095750d04d6d255a0e4c4ac7 -MD5 bc6db3dc8e11a950aceb774de052dfe3 dhcpcd-3.0.8-r1.ebuild 947 -RMD160 036fa3e5ff936bbbb32b834b8efe578c28746071 dhcpcd-3.0.8-r1.ebuild 947 -SHA256 d41ca97dbb88959f91926d47c05bd77d81806125095750d04d6d255a0e4c4ac7 dhcpcd-3.0.8-r1.ebuild 947 -EBUILD dhcpcd-3.0.8.ebuild 896 RMD160 779193a90d3238bc4327d387296272af99497fbf SHA1 d1ea1b37186d466097a014c11ef5917ab450eb1b SHA256 43eb453540f9036b4aa70a3759fe12f3260ce128e5574c6cbb4890d984146a1e -MD5 5445175c2336301acd1df3ffbf7cd1c7 dhcpcd-3.0.8.ebuild 896 -RMD160 779193a90d3238bc4327d387296272af99497fbf dhcpcd-3.0.8.ebuild 896 -SHA256 43eb453540f9036b4aa70a3759fe12f3260ce128e5574c6cbb4890d984146a1e dhcpcd-3.0.8.ebuild 896 -EBUILD dhcpcd-3.0.9.ebuild 909 RMD160 d14544ac63c15bc393cc1efac9c51bcea04f35b5 SHA1 1d9dbe19ea6665ff170f91929a21327b95d158f7 SHA256 2a49894ed0ca4a4717e44862aa3b06b0898ca90275569f608a8678836ce67072 -MD5 931ab2c99f5213743a0b7a5d732b0cac dhcpcd-3.0.9.ebuild 909 -RMD160 d14544ac63c15bc393cc1efac9c51bcea04f35b5 dhcpcd-3.0.9.ebuild 909 -SHA256 2a49894ed0ca4a4717e44862aa3b06b0898ca90275569f608a8678836ce67072 dhcpcd-3.0.9.ebuild 909 MISC ChangeLog 19420 RMD160 d5adb6513b4c45227f89ecd63849bcb46bec446e SHA1 586c1d55279fd63bb93702c2ab3f49094fb1c353 SHA256 63cfea1f4a46b96a7e262cbfcff36427c5a8db7dca431e1c31ae9a7c896da7a6 MD5 b59e11e5b0b433f4269ea78aecc07c8c ChangeLog 19420 RMD160 d5adb6513b4c45227f89ecd63849bcb46bec446e ChangeLog 19420 @@ -56,24 +28,9 @@ SHA256 1a92884e5ea54c2b54b068a428431fb720e9456a62b0a2506700c80c43e94c18 metadata MD5 e302690a02b48d94f0f229616bcbf4ea files/digest-dhcpcd-2.0.5-r1 241 RMD160 fdd0efa71d82c39880c012b4ed4b81f4ddb9af1c files/digest-dhcpcd-2.0.5-r1 241 SHA256 379f8a760e80c6558d3e1fd33de08af21284bcc0bbe9b19498af0b5a1c1ab696 files/digest-dhcpcd-2.0.5-r1 241 -MD5 5ba2b2f134f2c7d5a8572e9003135401 files/digest-dhcpcd-3.0.10 241 -RMD160 2b6781848f6121346131c3f4f67e143c68ec247d files/digest-dhcpcd-3.0.10 241 -SHA256 6fa16ab5ce56ce708086fac23325588af21177f92a51124e77fac0e36ba35fb5 files/digest-dhcpcd-3.0.10 241 MD5 579b0224b929744126b994e4c45841f8 files/digest-dhcpcd-3.0.11 241 RMD160 9b9255db6006bffe29590e092c3e5ffe419342f2 files/digest-dhcpcd-3.0.11 241 SHA256 c3a60ace11b08e099dc47776a921a2ca3b0b4d5f1b577115c189f7b1fda2cc86 files/digest-dhcpcd-3.0.11 241 MD5 3169d00f37e5c213fea6db24453125bc files/digest-dhcpcd-3.0.12 241 RMD160 71d302476a35fcf5e87bcc448d78c181d92f6465 files/digest-dhcpcd-3.0.12 241 SHA256 8bd08d80a34137da2fd383f6ce827fa18c15d369587e03d382e54b012ac361b4 files/digest-dhcpcd-3.0.12 241 -MD5 02d3a73433c03fbdb5251c8c3a50fad9 files/digest-dhcpcd-3.0.6 238 -RMD160 8467d52195c81f1714067b36f7904b876bbfe268 files/digest-dhcpcd-3.0.6 238 -SHA256 cedfdc0331b7741691290793f95dce40a479fe2e5c866d249699d58788a96f20 files/digest-dhcpcd-3.0.6 238 -MD5 78dd7672e06f61034b9a768fc8bbedf5 files/digest-dhcpcd-3.0.8 238 -RMD160 28b0a2850cec3240a478b4796a115e6755ecc739 files/digest-dhcpcd-3.0.8 238 -SHA256 638911f2fa29097c207720e132e773b55b66a838f79a90131dad2bf923a9c824 files/digest-dhcpcd-3.0.8 238 -MD5 78dd7672e06f61034b9a768fc8bbedf5 files/digest-dhcpcd-3.0.8-r1 238 -RMD160 28b0a2850cec3240a478b4796a115e6755ecc739 files/digest-dhcpcd-3.0.8-r1 238 -SHA256 638911f2fa29097c207720e132e773b55b66a838f79a90131dad2bf923a9c824 files/digest-dhcpcd-3.0.8-r1 238 -MD5 2a1225f96ef23d04fb7d143eabeca1c5 files/digest-dhcpcd-3.0.9 238 -RMD160 f6e74026339312b89a06afe71eb60db38989d5ab files/digest-dhcpcd-3.0.9 238 -SHA256 b0da1b0fb379b88665534518c2e3742a2a9b0342c7ef5a92a59f9d55602c4adb files/digest-dhcpcd-3.0.9 238 diff --git a/net-misc/dhcpcd/dhcpcd-3.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-3.0.10.ebuild deleted file mode 100644 index 9d8127b777dd..000000000000 --- a/net-misc/dhcpcd/dhcpcd-3.0.10.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.10.ebuild,v 1.1 2007/01/27 16:29:39 uberlord Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="A DHCP client" -HOMEPAGE="http://dhcpcd.berlios.de" -SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -PROVIDE="virtual/dhcpc" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Redefine the location of ntp.drift - sed -i -e 's,#define NTPDRIFTFILE\t.*,#define NTPDRIFTFILE\t\t\"/var/lib/ntp/ntp.drift\",' \ - pathnames.h || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog -} diff --git a/net-misc/dhcpcd/dhcpcd-3.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-3.0.6.ebuild deleted file mode 100644 index de68ba3a69ca..000000000000 --- a/net-misc/dhcpcd/dhcpcd-3.0.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.6.ebuild,v 1.2 2006/12/17 19:30:34 stefaan Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="A DHCP client only" -HOMEPAGE="http://dhcpcd.berlios.de" -SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -PROVIDE="virtual/dhcpc" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Redefine the location of ntp.drift - sed -i -e 's,#define NTPDRIFTFILE\t.*,#define NTPDRIFTFILE\t\t\"/var/lib/ntp/ntp.drift\",' \ - pathnames.h || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog -} diff --git a/net-misc/dhcpcd/dhcpcd-3.0.8-r1.ebuild b/net-misc/dhcpcd/dhcpcd-3.0.8-r1.ebuild deleted file mode 100644 index 449446c061c4..000000000000 --- a/net-misc/dhcpcd/dhcpcd-3.0.8-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.8-r1.ebuild,v 1.1 2006/12/29 10:16:12 uberlord Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="A DHCP client" -HOMEPAGE="http://dhcpcd.berlios.de" -SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -PROVIDE="virtual/dhcpc" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-static-routes.patch" - - # Redefine the location of ntp.drift - sed -i -e 's,#define NTPDRIFTFILE\t.*,#define NTPDRIFTFILE\t\t\"/var/lib/ntp/ntp.drift\",' \ - pathnames.h || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog -} diff --git a/net-misc/dhcpcd/dhcpcd-3.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-3.0.8.ebuild deleted file mode 100644 index 8630c000f498..000000000000 --- a/net-misc/dhcpcd/dhcpcd-3.0.8.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.8.ebuild,v 1.1 2006/12/21 21:21:40 uberlord Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="A DHCP client" -HOMEPAGE="http://dhcpcd.berlios.de" -SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -PROVIDE="virtual/dhcpc" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Redefine the location of ntp.drift - sed -i -e 's,#define NTPDRIFTFILE\t.*,#define NTPDRIFTFILE\t\t\"/var/lib/ntp/ntp.drift\",' \ - pathnames.h || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog -} diff --git a/net-misc/dhcpcd/dhcpcd-3.0.9.ebuild b/net-misc/dhcpcd/dhcpcd-3.0.9.ebuild deleted file mode 100644 index e0def2283b92..000000000000 --- a/net-misc/dhcpcd/dhcpcd-3.0.9.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.9.ebuild,v 1.2 2007/02/11 10:14:30 vapier Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="A DHCP client" -HOMEPAGE="http://dhcpcd.berlios.de" -SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -PROVIDE="virtual/dhcpc" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Redefine the location of ntp.drift - sed -i -e 's,#define NTPDRIFTFILE\t.*,#define NTPDRIFTFILE\t\t\"/var/lib/ntp/ntp.drift\",' \ - pathnames.h || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog -} diff --git a/net-misc/dhcpcd/files/dhcpcd-3.0.8-static-routes.patch b/net-misc/dhcpcd/files/dhcpcd-3.0.8-static-routes.patch deleted file mode 100644 index bbc987224cb4..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-3.0.8-static-routes.patch +++ /dev/null @@ -1,177 +0,0 @@ -Index: interface.c -=================================================================== -@@ -278,13 +278,19 @@ - int change, int del) - { - int s; -- char *destd; -+ char *dstd; - char *gend; - struct rtm - { - struct rt_msghdr hdr; - struct sockaddr_in destination; -- struct sockaddr_in gateway; -+ union -+ { -+ struct sockaddr sa; -+ struct sockaddr_in sin; -+ struct sockaddr_dl sdl; -+ struct sockaddr_storage sss; /* added to avoid memory overrun */ -+ } gateway; - struct sockaddr_in netmask; - } rtm; - static int seq; -@@ -295,13 +301,22 @@ - /* Do something with metric to satisfy compiler warnings */ - metric = 0; - -- destd = strdup (inet_ntoa (destination)); -+ dstd = strdup (inet_ntoa (destination)); - gend = strdup (inet_ntoa (netmask)); -- logger (LOG_INFO, "%s route to %s (%s) via %s", -- change ? "changing" : del ? "removing" : "adding", -- destd, gend, inet_ntoa(gateway)); -- if (destd) -- free (destd); -+ if (gateway.s_addr == destination.s_addr) -+ logger (LOG_INFO, "%s route to %s (%s)", -+ change ? "changing" : del ? "removing" : "adding", -+ dstd, gend); -+ else if (destination.s_addr == INADDR_ANY && netmask.s_addr == INADDR_ANY) -+ logger (LOG_INFO, "%s default route via %s", -+ change ? "changing" : del ? "removing" : "adding", -+ inet_ntoa (gateway)); -+ else -+ logger (LOG_INFO, "%s route to %s (%s) via %s", -+ change ? "changing" : del ? "removing" : "adding", -+ dstd, gend, inet_ntoa (gateway)); -+ if (dstd) -+ free (dstd); - if (gend) - free (gend); - -@@ -317,9 +332,11 @@ - rtm.hdr.rtm_seq = ++seq; - rtm.hdr.rtm_type = change ? RTM_CHANGE : del ? RTM_DELETE : RTM_ADD; - -- rtm.hdr.rtm_flags = RTF_UP | RTF_GATEWAY | RTF_STATIC; -- if (netmask.s_addr == 0xffffffff) -+ rtm.hdr.rtm_flags = RTF_UP | RTF_STATIC; -+ if (netmask.s_addr == INADDR_BROADCAST) - rtm.hdr.rtm_flags |= RTF_HOST; -+ else -+ rtm.hdr.rtm_flags |= RTF_GATEWAY; - - rtm.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK; - -@@ -329,7 +346,40 @@ - memcpy (&_var.sin_addr, &_addr, sizeof (struct in_addr)); - - ADDADDR (rtm.destination, destination); -- ADDADDR (rtm.gateway, gateway); -+ if (netmask.s_addr == INADDR_BROADCAST) -+ { -+ struct ifaddrs *ifap, *ifa; -+ union -+ { -+ struct sockaddr *sa; -+ struct sockaddr_dl *sdl; -+ } us; -+ -+ if (getifaddrs (&ifap)) -+ { -+ logger (LOG_ERR, "getifaddrs: %s", strerror (errno)); -+ return -1; -+ } -+ -+ for (ifa = ifap; ifa; ifa = ifa->ifa_next) -+ { -+ if (ifa->ifa_addr->sa_family != AF_LINK) -+ continue; -+ -+ if (strcmp (ifname, ifa->ifa_name)) -+ continue; -+ -+ us.sa = ifa->ifa_addr; -+ memcpy (&rtm.gateway.sdl, us.sdl, us.sdl->sdl_len); -+ break; -+ } -+ freeifaddrs (ifap); -+ } -+ else -+ { -+ ADDADDR (rtm.gateway.sin, gateway); -+ } -+ - ADDADDR (rtm.netmask, netmask); - - #undef ADDADDR -@@ -610,9 +660,18 @@ - - dstd = strdup (inet_ntoa (destination)); - gend = strdup (inet_ntoa (netmask)); -- logger (LOG_INFO, "%s route to %s (%s) via %s, metric %d", -- change ? "changing" : del ? "removing" : "adding", -- dstd, gend, inet_ntoa (gateway), metric); -+ if (gateway.s_addr == destination.s_addr) -+ logger (LOG_INFO, "%s route to %s (%s) metric %d", -+ change ? "changing" : del ? "removing" : "adding", -+ dstd, gend, metric); -+ else if (destination.s_addr == INADDR_ANY && netmask.s_addr == INADDR_ANY) -+ logger (LOG_INFO, "%s default route via %s metric %d", -+ change ? "changing" : del ? "removing" : "adding", -+ inet_ntoa (gateway), metric); -+ else -+ logger (LOG_INFO, "%s route to %s (%s) via %s metric %d", -+ change ? "changing" : del ? "removing" : "adding", -+ dstd, gend, inet_ntoa (gateway), metric); - if (dstd) - free (dstd); - if (gend) -@@ -636,7 +695,8 @@ - { - nlm.hdr.nlmsg_flags |= NLM_F_CREATE | NLM_F_EXCL; - nlm.rt.rtm_protocol = RTPROT_BOOT; -- if (gateway.s_addr == 0) -+ if (gateway.s_addr == INADDR_ANY || -+ netmask.s_addr == INADDR_BROADCAST) - nlm.rt.rtm_scope = RT_SCOPE_LINK; - else - nlm.rt.rtm_scope = RT_SCOPE_UNIVERSE; -@@ -652,7 +712,7 @@ - - add_attr_l (&nlm.hdr, sizeof (nlm), RTA_DST, &destination.s_addr, - sizeof (destination.s_addr)); -- if (gateway.s_addr != 0) -+ if (gateway.s_addr != INADDR_ANY && gateway.s_addr != destination.s_addr) - add_attr_l (&nlm.hdr, sizeof (nlm), RTA_GATEWAY, &gateway.s_addr, - sizeof (gateway.s_addr)); - -Index: dhcp.c -=================================================================== ---- dhcp.c (revision 134) -+++ dhcp.c (working copy) -@@ -165,8 +165,8 @@ - *p++ = DHCP_CSR; - /* RFC 3442 states classless static routes should be before routers - * and static routes as classless static routes override them both */ -+ *p++ = DHCP_STATICROUTE; - *p++ = DHCP_ROUTERS; -- *p++ = DHCP_STATICROUTE; - *p++ = DHCP_HOSTNAME; - *p++ = DHCP_DNSSEARCH; - *p++ = DHCP_DNSDOMAIN; -Index: configure.c -=================================================================== ---- configure.c (revision 134) -+++ configure.c (working copy) -@@ -426,7 +426,7 @@ - #ifdef __linux__ - /* On linux, we need to change the subnet route to have our metric. */ - if (iface->previous_address.s_addr != dhcp->address.s_addr -- && options->metric > 0) -+ && options->metric > 0 && dhcp->netmask.s_addr != INADDR_BROADCAST) - { - struct in_addr td; - struct in_addr tg; diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.10 b/net-misc/dhcpcd/files/digest-dhcpcd-3.0.10 deleted file mode 100644 index be4b9e12ace7..000000000000 --- a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.10 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b61c176447e5988294ec8a36cdf00f04 dhcpcd-3.0.10.tar.bz2 30096 -RMD160 3103f987c9a85f2e678a1e3e43b2c519df2620e4 dhcpcd-3.0.10.tar.bz2 30096 -SHA256 2cf4703ca04540fd6f9dd430796f333bd59028117dfdef9f235a4c7ee93b3f8d dhcpcd-3.0.10.tar.bz2 30096 diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.6 b/net-misc/dhcpcd/files/digest-dhcpcd-3.0.6 deleted file mode 100644 index 7de5984e0ab2..000000000000 --- a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.6 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a71476407efd56cf13df5adf224e1d7f dhcpcd-3.0.6.tar.bz2 28246 -RMD160 d7287e29a59c9e2fe37ebd98e2c250fa5ebd3cf6 dhcpcd-3.0.6.tar.bz2 28246 -SHA256 4b935a13347e9271f60dbf2f290d9f648f0455bea4bf0c0bd57f58bc227ea81d dhcpcd-3.0.6.tar.bz2 28246 diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.8 b/net-misc/dhcpcd/files/digest-dhcpcd-3.0.8 deleted file mode 100644 index 49701a90cb02..000000000000 --- a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.8 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7c41756a7cfef60bdd8ef2f12216f367 dhcpcd-3.0.8.tar.bz2 29305 -RMD160 f19545ebd98aabd60512f3c482d9a30ce0f554ab dhcpcd-3.0.8.tar.bz2 29305 -SHA256 c878e32bb149c17a455ba13f370ea2bc2c69e0da3a41ed5ad58b2d0ca51ec09a dhcpcd-3.0.8.tar.bz2 29305 diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.8-r1 b/net-misc/dhcpcd/files/digest-dhcpcd-3.0.8-r1 deleted file mode 100644 index 49701a90cb02..000000000000 --- a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.8-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7c41756a7cfef60bdd8ef2f12216f367 dhcpcd-3.0.8.tar.bz2 29305 -RMD160 f19545ebd98aabd60512f3c482d9a30ce0f554ab dhcpcd-3.0.8.tar.bz2 29305 -SHA256 c878e32bb149c17a455ba13f370ea2bc2c69e0da3a41ed5ad58b2d0ca51ec09a dhcpcd-3.0.8.tar.bz2 29305 diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.9 b/net-misc/dhcpcd/files/digest-dhcpcd-3.0.9 deleted file mode 100644 index 97e44c0d7917..000000000000 --- a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 1e540247340ca2a59c48fa2afcc3b6d9 dhcpcd-3.0.9.tar.bz2 29504 -RMD160 31cbe972c9b5a897193a3fece5fe2021d1fff8bb dhcpcd-3.0.9.tar.bz2 29504 -SHA256 e739bb17c955ecc924579b78588abdf696b039c1c02bb1ebbec50599fe3f7370 dhcpcd-3.0.9.tar.bz2 29504