diff options
author | William Hubbs <williamh@gentoo.org> | 2014-07-14 15:07:07 +0000 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2014-07-14 15:07:07 +0000 |
commit | 09c2e502cae3ad718c70f6c7d5bede89135ba4db (patch) | |
tree | 55dbd36e983c919bcc7c60283afec2fd846939fb /net-misc/dhcpcd | |
parent | Stable on arm, wrt bug #516344 (diff) | |
download | historical-09c2e502cae3ad718c70f6c7d5bede89135ba4db.tar.gz historical-09c2e502cae3ad718c70f6c7d5bede89135ba4db.tar.bz2 historical-09c2e502cae3ad718c70f6c7d5bede89135ba4db.zip |
remove old unstable versions
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538
Diffstat (limited to 'net-misc/dhcpcd')
-rw-r--r-- | net-misc/dhcpcd/ChangeLog | 7 | ||||
-rw-r--r-- | net-misc/dhcpcd/Manifest | 15 | ||||
-rw-r--r-- | net-misc/dhcpcd/dhcpcd-6.3.2.ebuild | 119 | ||||
-rw-r--r-- | net-misc/dhcpcd/dhcpcd-6.4.0.ebuild | 116 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-6.3.2-fix-cc-setting.patch | 109 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-6.3.2-fix-host.patch | 88 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-6.3.2-gettime-dlopen.patch | 90 |
7 files changed, 10 insertions, 534 deletions
diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog index 97cdd88de8fb..e82ff4e3711e 100644 --- a/net-misc/dhcpcd/ChangeLog +++ b/net-misc/dhcpcd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/dhcpcd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.405 2014/07/14 15:03:54 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.406 2014/07/14 15:07:06 williamh Exp $ + + 14 Jul 2014; William Hubbs <williamh@gentoo.org> -dhcpcd-6.3.2.ebuild, + -dhcpcd-6.4.0.ebuild, -files/dhcpcd-6.3.2-fix-cc-setting.patch, + -files/dhcpcd-6.3.2-fix-host.patch, -files/dhcpcd-6.3.2-gettime-dlopen.patch: + remove old unstable versions 14 Jul 2014; William Hubbs <williamh@gentoo.org> dhcpcd-9999.ebuild: sync live ebuild diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 375198d9eba9..4ebfe23c89e7 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -3,28 +3,21 @@ Hash: SHA256 AUX dhcpcd-6.2.0-dynamic-init.patch 6421 SHA256 5edeaf1322dab4dbc71efb4e7c4618561e606bdd2e71fb9230628c4208f35103 SHA512 e2aff69966c0fdd2b16bff1aef59e2c50068095a9afe8e9e634e1309e50d4c277734a2651078fc1bbac0b23a57187ecc46a557304e60b54e983aef65a8bfc84e WHIRLPOOL 6d9d97ce737b3cdbb41d608a4aebb1971ffd70c9fa08e3f0bc00c77ee15cef343fb0feed31a4bfeef0d8fd2be14deb6cbd70f1402f271170f849c073a4db4db3 AUX dhcpcd-6.2.0-no_ipv6_fix.patch 1269 SHA256 cd26e5d587a833d9826a86b2eae832c3ad371ce695b933ba8e03bdc1debf411d SHA512 90763d8a0d63949f53166609a702176217fce32a27125ef7f5c095d571d1a6a65fca5434e6ceded258773d80867a90609bc5af67727d7b06086c3a6b4ad8f632 WHIRLPOOL 9b3328e6db8304794ec2aeaec3cd883ed2cde975cda606ac2d3e03b3455a7fad495f88297f1cccea2a821972df2ee33bc88c2d3d57235d0cada2b443c1ba643f -AUX dhcpcd-6.3.2-fix-cc-setting.patch 2369 SHA256 52cf0e7af4f401004d9d52f138d4e215c4e7bedf2866128273d386b6e60e1406 SHA512 f80ca4bff961535f2701e78ae87fb7bc9ef44079cfb904a49fa3dc39818cdfa2a6ce6896c8b01721a6ce9f0dbfc930f9866ca0a7fcfbc2f3dc7c007b0ae837bf WHIRLPOOL 98579b8002868707fbfb7ab183de75dd54b9e72dd22ee305415c1b00a9e8c80d2d1001518b14eadbd367b1aff07f56e3dd2e829782f82983d15f451218fee8fe -AUX dhcpcd-6.3.2-fix-host.patch 1957 SHA256 4a292c09160802489b285261088146a48fa6b96aa93338c461ca06d448140ea9 SHA512 a1c550ec27f30cc8703663b8a5f5cf1950daad3c72c4a1aa5759ed04e54755515e1e7bb1f53a47653992d4fdc40981692d4280b0cd46d14c29d628f702d19744 WHIRLPOOL 8841efed908fff7b010010460e8342d7530406d94f174626650e812377e7330b61c60157aba3a8bf30cefba78a17cecb0e31dbb551f196af55a217ee5f7f1fb5 -AUX dhcpcd-6.3.2-gettime-dlopen.patch 2347 SHA256 a801da20f1baf5b16847fb8998c58fe5c6ad39d383ed6d3343812f7df51b3dc7 SHA512 4196917bf17cf9847f70ecd6ee39ae8c7e65ee6eeedff79d5cbcc228937d47a2b807618202448feab423aab3ba60d7d5b6dbfc62d4e89e9846adf192cea2d787 WHIRLPOOL 781e37252b9388d3ad9d8a6958d24dbdefa12f91a4ab3f1580fa876559c9857359fa028bf6423a3d02be0445f154e833f55a11528dd30ae330ecc20c0fbf6c8b AUX dhcpcd.initd 327 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492 SHA512 0a188b67f0641a480ac6d3cf6a634dddc4b72b1b9b47df33b05fba5d802693dd88e0cece0bfe9b641009c03022c620595b1ce35cd53d5024ee87f4c81e9acf63 WHIRLPOOL b97b0cd52b52561e6726d5decd094a02dd046107b0647833f00635e3fc126ab9679b2a7f883f4d880c1221cdbd91b0b52efaaccfdfa44a5048cb28d47d022351 AUX dhcpcd.service 183 SHA256 06aaf350b11b1cea6ced9e2b5c69011e1daf6eb0ac9b2a9f2c9f81a9be31f463 SHA512 9d4c99e984906fc80fca7f7dd436d2f12dfebec870e19cbc3c03c14b394ed81c664403c0ca3f3e3138572c54d1278c1a43d5495f963b442b1bbef229248b1dd4 WHIRLPOOL 1176c2d763f55a65a97a973bdfa907dfaa2e9b88e93013d749c1a492e06382a7f42fa23eb2bfe86f6eaabea6c65c34db138b6bf600e6c522336ec2d07f7d7044 DIST dhcpcd-5.6.4.tar.bz2 85671 SHA256 4072999704585c16ac45458d459eb50186c3de91c3c14c3288896963cc30b594 SHA512 eb3892604b2f889b4f34835f4d8e0bb2d129f7d0d91da39760eeaf3f75883a6db0e1397ac65084a3ddc4a2968a389fc723e9f031a844ef5333451527be8cb7a2 WHIRLPOOL f8fba52a6f6d4e1822175069f6a636e83b09a1532bd258a4ec9b610e9eb196d35f1cfa0e855521f5d37edb840fb2dd4d46bffc8bf86ded0b205367711f4484ff DIST dhcpcd-6.2.0.tar.bz2 121614 SHA256 16ef25e8b6b15dcc0e53ff97a131b09828723dffb12a885f0da91b275296b362 SHA512 bf9394aa23c1b2978ac4b3bad1c7774798e99b6d6b147f57b94b5c1fba7edf80ac769cb8cab7f66203ebc0e93f81d7a05a44dc52f08344b68e8141bbbf1c33a9 WHIRLPOOL bff258cd8a0d2eea14bbc8bac792d4ad69e36d72ffced448f6d6081750ec52d99cb3f1f0aaf1bca42135c2969b2c7defaafa7d0ce875b96db9bbf1277f6bd982 -DIST dhcpcd-6.3.2.tar.bz2 136924 SHA256 b69c1ef06a92f327993ee1cc4cfd9145c296aa1ac6070ba2f9ac74931b2f55ec SHA512 fa5d3287e658064df39c426eaa960567d916dd8241be6b69315f5fa39bdf51c97fbd306222b3e062fa83ec54acd63481bac4c3f52a2f2e5e2a077c76e0bb4326 WHIRLPOOL f318061510a527a28ef6793ae262f09c1276ac96c72e4d49d217509b17baf53ffb9a11b8ceeecd7535d0274a87521090e5fd54c176bbf9f2622c1fd6d36436df -DIST dhcpcd-6.4.0.tar.bz2 147288 SHA256 0413a9c8910cad4df2758402be88a9f1630361e1f5dd09926161461a1ea69013 SHA512 d2a1be0f26e1537756874ba476bfdb55e97e7cad336e13f35bc34bacb4f9be3c5b21b6eb428d5da1fcb2906a69d8e6f40653391186f663d5b4fbff0115dae204 WHIRLPOOL 1f0791cce950e53c177434732bda3a70b6de5fc0fe7f3cd69f865fd8437ec39d9b7c03d755dfacdd571af3516df89bdcec680caa4b1d95a8351dcfc8e095d20e DIST dhcpcd-6.4.2.tar.bz2 149510 SHA256 eebb9f9e13b40d47efbb56d8568e54f640bee3337ba45b30b3e47db5b14220b7 SHA512 079b5ad8559b8ee995e5fda12769bd9176253d4963b7904868a1ecea3dcd4759453882bdc57236e765ef53807a42d687c3ee4c727c33ed86e42e94d5bc0135cc WHIRLPOOL fa36d122efad1a3bdadf731c3b2303e933481748d2e44f57b1e9f5f3f5ba138cad6a541caf44e9b12f642a28c00e32c1b5aa968cffa96b63b55d39cbc0b5ecf7 EBUILD dhcpcd-5.6.4.ebuild 3431 SHA256 0210e4b9dd27d8334eb4cb5781ba10de8c084aeef740ccddb7d8ff2a228c303d SHA512 a0834bc94a795f059244b59b7f8abbaab73cdb79339a1bf14b9f62a0c5c2efdcbdfae42659810413a1c6ef963d40ef8c9defbf354d53208935dc6e392b79908f WHIRLPOOL b981b64477e43075c004a81471ccea70f1a0faa14a38f8a6cc70829cec15225f35c69f726a8cc635e2fe5c88eaf69b127afe2678ece7f31292cfae47df211036 EBUILD dhcpcd-6.2.0-r1.ebuild 2963 SHA256 aec0951a9741dd110cd2b905c5db63c76c53d51bee89e2a8f53deeed8a3b4f6d SHA512 d08cfee3ae2d155dbe31a0c486bed496e55f29951f19bdf7b96871e5e3f6e8bc52f27b76a9f7cee2e2fce3aa2d1a6ab7a0455530e6da668b483029af98e23f7a WHIRLPOOL 3364635fb951370cbefef12de963d27ee220f41b0dc27adc90e9e26647b7b2c7792de71a5b245237eccd1e0f8ef39fc1d396a0884dd02e809f2d57da25cdf0dc -EBUILD dhcpcd-6.3.2.ebuild 3471 SHA256 da98850800cf81b86ce482905b9d5aeeeaf2b7929d1e55e833f1a461729c6ad5 SHA512 01a52afedd6a3d31aacc25d5477f17b20342e2147b60454533716c345cda1029e96ce25c27b60d4083afda6630404cf3bef72ebab0fd130e11ff7dc6bff388dc WHIRLPOOL b1ef214731acf4c0c5601ded3c9e8850cd730724e4df74f08d3099895fcad646c1a4637c27ed9258bc61e4ca41119083f0fc84fc45fffabbc9d83016650925b5 -EBUILD dhcpcd-6.4.0.ebuild 3333 SHA256 5a3351d1317510768b0ba0f85c1ffebe47e3c10fcebdf2259f500836ae02bb9c SHA512 8300932a2fd84e29ae6333e0fb7b5a5fee35b8cc16e48c788ebec7300248261f504b48efb4c972b0fb5e02202fb3bf02f5144ae9a9911150ea346f4833ef704e WHIRLPOOL d6c4ca191b5f6dc68348319b84ef62b18fd051403b8134c8083bde3aefbec7f482c2bf1b8ae7b8ce208f08c0653f9226187210164132633ceb30771f7f82989d EBUILD dhcpcd-6.4.2.ebuild 3388 SHA256 94b502ff5d54142c3073cb4debb19350076c0a64b6f2c6600d9383e63b2b8cfd SHA512 6bf9f545c4e5f94ab00a8b99c963ed71bd5efa3bee04bd0a4ca215ef5fa3acdad37654ab6f230ae3f5dd6f25cda06279fa5ed3563e9222451d2a96a9545cc8b6 WHIRLPOOL 51be8ee9aa9e666200fe0d8436323ccd5d24e7ec645a125076ce6cee867d026ec33faad21febdc16851e27208d3c16694a49ad5f0324a995d0f98393600506a3 EBUILD dhcpcd-9999.ebuild 3388 SHA256 f825a3bfaada9525ec3e6aa58789752234cd3c07ccfb9f1310461091cee04fbd SHA512 4212c13c007e761df723ef8608f404e7d26bd31ce073e0f5c36e2a4bdd199b80400c8773a58791304ed113b40199de8ae0b8462d07835d1f8ec6dc32ce004690 WHIRLPOOL 464e4093620829ad39422d23d5babf99432c31f75f60a4beead9948a5cb6b5ca9ac82aa4add0358603c9810ba54afd284b8645121bcd2d6ce0a012b74466bae9 -MISC ChangeLog 56968 SHA256 c44bd01a9e3da630b8219398e04695d725b31ac5a9a8e8302c7a249e3c3d7c1b SHA512 e526df032eb29709978d0ea16a8728a3723cd8e65ee32ad636ea666977e60ec46ae6ad30c20ea8e8d9beedc19bc80b1ce2869306fb0a44768cb188a3282f0aa7 WHIRLPOOL 0afc04405e8f126e5e5cfc9958de7db8b0e3571d427e8263f49e7e3e2c99c2e2c0575ddf2fcfb54158d5457a470dcb4a444ba6f6c6650c3b00592556b9fcbec9 +MISC ChangeLog 57219 SHA256 97c380835735713db92e8d273777a5e239d446f9f2143ca6e1d6743cd3ea8e3b SHA512 b52b98a9f64968f79040473bf706467acc416b345b9916a8d968a0a33fa7a4186b7e32201f944913dbcdd3dd2387681e4fea4b465b0553b8a4a831967382718e WHIRLPOOL dd7c72924ba008870402e823a5e22b7a891a7eb69a285e8f100c8940de9d002929a3275004f1087828daa7e17070182a55dbaf8483520e3541ee82084a3e62ab MISC metadata.xml 358 SHA256 d2755afa7df7488d44b4904fd1922746bd9ecae448fd73496600e03fd0938707 SHA512 a592a6368f8dc90795b2972fff1c79775de8739d214a4c4403f0528aa1caf993f6e10eb374cb1a38accc915b5cd26c7fac723a712c4570f8a71848d3d9854eac WHIRLPOOL 481a14009c01f31e40ee09d81c273adc1da21b45b5976167cbada8a774775679de5b8233d3effc3f043794cc9f78b7a1705eaa59de4829c150ebe786c46097a6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPD8VwACgkQblQW9DDEZTj93gCgquzC4Ghy0fFtY/1kTGmkUVLC -pUQAn1HUzqforz6yw4GlY2YJ/ULsghNw -=SO2R +iEYEAREIAAYFAlPD8hsACgkQblQW9DDEZThrSACgu3MbB9i5xDuIAEKNBToM496u +pKoAniK+mGxazyS3Hsy1sfiVBsYk3agX +=8yhw -----END PGP SIGNATURE----- diff --git a/net-misc/dhcpcd/dhcpcd-6.3.2.ebuild b/net-misc/dhcpcd/dhcpcd-6.3.2.ebuild deleted file mode 100644 index 956ff9e63414..000000000000 --- a/net-misc/dhcpcd/dhcpcd-6.3.2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-6.3.2.ebuild,v 1.2 2014/04/20 23:21:06 williamh Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]]; then - FOSSIL_URI="http://roy.marples.name/projects/dhcpcd" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -inherit eutils systemd toolchain-funcs - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_glibc ipv6 kernel_linux +udev" - -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" dev-vcs/fossil" - - src_unpack() - { - local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} - local repo=${distdir}/fossil/${PN}.fossil - - addwrite "${distdir}" - - if [[ -e "${repo}" ]]; then - fossil pull "${FOSSIL_URI}" -R "${repo}" || die - else - mkdir -p "${distdir}/fossil" || die - fossil clone "${FOSSIL_URI}" "${repo}" || die - fi - - mkdir -p "${S}" || die - cd "${S}" || die - fossil open "${repo}" || die - } -fi - -src_prepare() -{ - epatch "${FILESDIR}"/${P}-gettime-dlopen.patch - epatch "${FILESDIR}"/${P}-fix-cc-setting.patch - epatch "${FILESDIR}"/${P}-fix-host.patch - epatch_user -} - -src_configure() -{ - local dev hooks rundir - use udev || dev="--without-dev --without-udev" - hooks="--with-hook=ntp.conf" - use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" - use kernel_linux && rundir="--rundir=${EPREFIX}/run" - econf \ - --prefix="${EPREFIX}" \ - --libexecdir="${EPREFIX}/lib/dhcpcd" \ - --dbdir="${EPREFIX}/var/lib/dhcpcd" \ - --localstatedir="${EPREFIX}/var" \ - ${rundir} \ - $(use_enable ipv6) \ - ${dev} \ - ${hooks} -} - -src_install() -{ - default - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -} - -pkg_postinst() -{ - # Upgrade the duid file to the new format if needed - local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid - local new_duid="${ROOT}"/etc/dhcpcd.duid - if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then - cp -p "${old_duid}" "${new_duid}" - fi - - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-6.4.0.ebuild b/net-misc/dhcpcd/dhcpcd-6.4.0.ebuild deleted file mode 100644 index 72cbfbaa1314..000000000000 --- a/net-misc/dhcpcd/dhcpcd-6.4.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-6.4.0.ebuild,v 1.1 2014/06/20 19:36:15 williamh Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]]; then - FOSSIL_URI="http://roy.marples.name/projects/dhcpcd" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -inherit eutils systemd toolchain-funcs - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="http://roy.marples.name/projects/dhcpcd/" -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_glibc ipv6 kernel_linux +udev" - -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" dev-vcs/fossil" - - src_unpack() - { - local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} - local repo=${distdir}/fossil/${PN}.fossil - - addwrite "${distdir}" - - if [[ -e "${repo}" ]]; then - fossil pull "${FOSSIL_URI}" -R "${repo}" || die - else - mkdir -p "${distdir}/fossil" || die - fossil clone "${FOSSIL_URI}" "${repo}" || die - fi - - mkdir -p "${S}" || die - cd "${S}" || die - fossil open "${repo}" || die - } -fi - -src_prepare() -{ - epatch_user -} - -src_configure() -{ - local dev hooks rundir - use udev || dev="--without-dev --without-udev" - hooks="--with-hook=ntp.conf" - use elibc_glibc && hooks="${hooks} --with-hook=yp.conf" - use kernel_linux && rundir="--rundir=${EPREFIX}/run" - econf \ - --prefix="${EPREFIX}" \ - --libexecdir="${EPREFIX}/lib/dhcpcd" \ - --dbdir="${EPREFIX}/var/lib/dhcpcd" \ - --localstatedir="${EPREFIX}/var" \ - ${rundir} \ - $(use_enable ipv6) \ - ${dev} \ - ${hooks} -} - -src_install() -{ - default - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -} - -pkg_postinst() -{ - # Upgrade the duid file to the new format if needed - local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid - local new_duid="${ROOT}"/etc/dhcpcd.duid - if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then - cp -p "${old_duid}" "${new_duid}" - fi - - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/files/dhcpcd-6.3.2-fix-cc-setting.patch b/net-misc/dhcpcd/files/dhcpcd-6.3.2-fix-cc-setting.patch deleted file mode 100644 index a1f6f7d3b74a..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-6.3.2-fix-cc-setting.patch +++ /dev/null @@ -1,109 +0,0 @@ -Index: configure -================================================================== ---- configure -+++ configure -@@ -14,10 +14,11 @@ - UDEV= - OS= - BUILD= - HOST= - TARGET= -+TARGETCC= - DEBUG= - FORK= - STATIC= - INCLUDEDIR= - DEVS= -@@ -49,10 +50,11 @@ - --statedir|--localstatedir) STATEDIR=$var;; - --dbdir) DBDIR=$var;; - --rundir) RUNDIR=$var;; - --mandir) MANDIR=$var;; - --with-ccopts|CFLAGS) CFLAGS=$var;; -+ CC) CC=$var;; - CPPFLAGS) CPPFLAGS=$var;; - --with-hook) HOOKSCRIPTS="$HOOKSCRIPTS${HOOKSCRIPTS:+ }$var";; - --with-hooks|HOOKSCRIPTS) HOOKSCRIPTS=$var; HOOKSET=true;; - --build) BUILD=$var;; - --host) HOST=$var;; -@@ -186,17 +188,19 @@ - CONFIG_MK=config.mk - - if [ -z "$BUILD" ]; then - # autoconf target triplet: cpu-vendor-os - BUILD=$(uname -m)-unknown-$(uname -s | tr '[:upper:]' '[:lower:]') -+else -+ TARGETCC=$BUILD- - fi --if [ -z "$HOST" ]; then -- [ -z "$TARGET" ] && TARGET=$BUILD -- HOST=$TARGET --fi --if [ -z "$TARGET" ]; then -- [ -z "$HOST" ] && HOST=$BUILD -+if [ -n "$TARGET" ]; then -+ TARGETCC=$TARGET- -+elif [ -n "$HOST" ]; then -+ TARGET=$HOST -+else -+ HOST=$BUILD - TARGET=$HOST - fi - - if [ -z "$OS" ]; then - echo "Deriving operating system from ... $TARGET" -@@ -243,20 +247,37 @@ - echo "#define $x$t \"$v\"" >>$CONFIG_H - done - echo "LIBDIR= $LIBDIR" >>$CONFIG_MK - echo "MANDIR= $MANDIR" >>$CONFIG_MK - --: ${CC:=cc} -+# Always obey CC. -+# However, if CC is not specified and we are given GNU style -+# --host or --build targets the expectation is we try and match that -+# to a compiler. -+if [ -n "$CC" ]; then -+ TARGETCC= -+else -+ CC=cc -+ _COMPILERS="cc clang gcc pcc icc" -+fi -+if [ -n "$TARGETCC" ]; then -+ for _CC in $_COMPILERS; do -+ _CC=$(_which "$TARGETCC$_CC") -+ if [ -x "$_CC" ]; then -+ CC=$_CC -+ break -+ fi -+ done -+fi - if ! type "$CC" >/dev/null 2>&1; then -- for _CC in clang gcc pcc icc; do -+ for _CC in $_COMPILERS; do - _CC=$(_which "$_CC") - if [ -x "$_CC" ]; then - CC=$_CC - break - fi - done -- - fi - - echo "Using compiler .. $CC" - if ! type "$CC" >/dev/null 2>&1; then - echo "$CC is not an executable" -@@ -415,11 +436,11 @@ - else - echo "no" - echo "libc support for clock_getttime is required - aborting" >&2 - abort=true - fi --rm -f _clock_gettime.c _clockgettime -+rm -f _clock_gettime.c _clock_gettime - $abort && exit 1 - - if [ -z "$ARC4RANDOM" ]; then - printf "Testing for arc4random ... " - cat <<EOF >_arc4random.c - diff --git a/net-misc/dhcpcd/files/dhcpcd-6.3.2-fix-host.patch b/net-misc/dhcpcd/files/dhcpcd-6.3.2-fix-host.patch deleted file mode 100644 index 5e2fbfcec916..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-6.3.2-fix-host.patch +++ /dev/null @@ -1,88 +0,0 @@ -Index: configure -================================================================== ---- configure -+++ configure -@@ -11,14 +11,13 @@ - CLOSEFROM= - GETLINE= - STRLCPY= - UDEV= - OS= --BUILD= -+BUILDCC= - HOST= - TARGET= --TARGETCC= - DEBUG= - FORK= - STATIC= - INCLUDEDIR= - DEVS= -@@ -55,11 +54,11 @@ - CC) CC=$var;; - CPPFLAGS) CPPFLAGS=$var;; - --with-hook) HOOKSCRIPTS="$HOOKSCRIPTS${HOOKSCRIPTS:+ }$var";; - --with-hooks|HOOKSCRIPTS) HOOKSCRIPTS=$var; HOOKSET=true;; - --build) BUILD=$var;; -- --host) HOST=$var;; -+ --host) HOST=$var; HOSTCC=$var-;; - --target) TARGET=$var;; - --libdir) LIBDIR=$var;; - --without-arc4random) ARC4RANDOM=no;; - --without-closefrom) CLOSEFROM=no;; - --without-getline) GETLINE=no;; -@@ -188,27 +187,18 @@ - CONFIG_MK=config.mk - - if [ -z "$BUILD" ]; then - # autoconf target triplet: cpu-vendor-os - BUILD=$(uname -m)-unknown-$(uname -s | tr '[:upper:]' '[:lower:]') --else -- TARGETCC=$BUILD- - fi --if [ -n "$TARGET" ]; then -- TARGETCC=$TARGET- --elif [ -n "$HOST" ]; then -- TARGET=$HOST --else -- HOST=$BUILD -- TARGET=$HOST --fi -+: ${HOST:=$BUILD} - - if [ -z "$OS" ]; then -- echo "Deriving operating system from ... $TARGET" -+ echo "Deriving operating system from ... $HOST" - # Derive OS from cpu-vendor-[kernel-]os -- CPU=${TARGET%%-*} -- REST=${TARGET#*-} -+ CPU=${HOST%%-*} -+ REST=${HOST#*-} - if [ "$CPU" != "$REST" ]; then - VENDOR=${REST%%-*} - REST=${REST#*-} - if [ "$VENDOR" != "$REST" ]; then - # Use kernel if given, otherwise os -@@ -252,18 +242,18 @@ - # Always obey CC. - # However, if CC is not specified and we are given GNU style - # --host or --build targets the expectation is we try and match that - # to a compiler. - if [ -n "$CC" ]; then -- TARGETCC= -+ HOSTCC= - else - CC=cc - _COMPILERS="cc clang gcc pcc icc" - fi --if [ -n "$TARGETCC" ]; then -+if [ -n "$HOSTCC" ]; then - for _CC in $_COMPILERS; do -- _CC=$(_which "$TARGETCC$_CC") -+ _CC=$(_which "$HOSTCC$_CC") - if [ -x "$_CC" ]; then - CC=$_CC - break - fi - done - diff --git a/net-misc/dhcpcd/files/dhcpcd-6.3.2-gettime-dlopen.patch b/net-misc/dhcpcd/files/dhcpcd-6.3.2-gettime-dlopen.patch deleted file mode 100644 index de29d11dfb46..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-6.3.2-gettime-dlopen.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: configure -================================================================== ---- configure -+++ configure -@@ -338,20 +338,18 @@ - if [ -z "$INET" -o "$INET" = yes ]; then - echo "DHCPCD_SRCS+= lpf.c" >>$CONFIG_MK - fi - echo "DHCPCD_SRCS+= if-linux.c if-linux-wireless.c" >>$CONFIG_MK - echo "DHCPCD_SRCS+= platform-linux.c" >>$CONFIG_MK -- echo "LDADD+= -lrt -ldl" >>$CONFIG_MK - ;; - kfreebsd*) - echo "CPPFLAGS+= -D_GNU_SOURCE" >>$CONFIG_MK - if [ -z "$INET" -o "$INET" = yes ]; then - echo "DHCPCD_SRCS+= bpf.c" >>$CONFIG_MK - fi - echo "DHCPCD_SRCS+= if-bsd.c platform-bsd.c" >>$CONFIG_MK - echo "COMPAT_SRCS+= compat/linkaddr.c" >>$CONFIG_MK -- echo "LDADD+= -lrt -ldl" >>$CONFIG_MK - ;; - *) - if [ -z "$INET" -o "$INET" = yes ]; then - echo "DHCPCD_SRCS+= bpf.c" >>$CONFIG_MK - fi -@@ -398,10 +396,31 @@ - echo "libc support for getifaddrs is required - aborting" >&2 - abort=true - fi - rm -f _getifaddrs.c _getifaddrs - $abort && exit 1 -+ -+printf "Testing for clock_gettime ... " -+cat <<EOF >_clock_gettime.c -+#include <time.h> -+int main(void) { -+ struct timespec ts; -+ return clock_gettime(CLOCK_MONOTONIC, &ts); -+} -+EOF -+if $XCC _clock_gettime.c -o _clock_gettime 2>/dev/null; then -+ echo "yes" -+elif $XCC _clock_gettime.c -lrt -o _clock_gettime 2>/dev/null; then -+ echo "yes (-lrt)" -+ echo "LDADD+= -lrt" >>$CONFIG_MK -+else -+ echo "no" -+ echo "libc support for clock_getttime is required - aborting" >&2 -+ abort=true -+fi -+rm -f _clock_gettime.c _clockgettime -+$abort && exit 1 - - if [ -z "$ARC4RANDOM" ]; then - printf "Testing for arc4random ... " - cat <<EOF >_arc4random.c - #include <stdlib.h> -@@ -749,10 +768,31 @@ - - if [ "$DEV" = yes ]; then - echo "DHCPCD_SRCS+= dev.c" >>$CONFIG_MK - echo "CPPFLAGS+= -DPLUGIN_DEV" >>$CONFIG_MK - echo "MKDIRS+= dev" >>$CONFIG_MK -+ -+ printf "Testing for dlopen ... " -+ cat <<EOF >_dlopen.c -+#include <dlfcn.h> -+#include <stdlib.h> -+int main(void) { -+ dlopen(NULL, 0); -+ return 0; -+} -+EOF -+ if $XCC _dlopen.c -o _dlopen 2>/dev/null; then -+ echo "yes" -+ elif $XCC _dlopen.c -ldl -o _dlopen 2>/dev/null; then -+ echo "yes (-ldl)" -+ echo "LDADD+= -ldl" >>$CONFIG_MK -+ else -+ echo "no" -+ echo "libc for dlopen is required - aborting" -+ fi -+ rm -f _dlopen.c _dlopen -+ $abort && exit 1 - fi - - # Transform for a make file - SERVICEEXISTS=$(echo "$SERVICEEXISTS" | $SED \ - -e 's:\\:\\\\:g' \ - |