bump(net-misc/dhcpcd): sync with upstream

This commit is contained in:
Michael Marineau 2014-05-21 15:31:26 -07:00
parent 88b3bc969e
commit d415538e06
15 changed files with 1161 additions and 164 deletions

View File

@ -1,6 +1,225 @@
# ChangeLog for net-misc/dhcpcd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.349 2013/01/03 16:50:25 williamh Exp $
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.399 2014/04/20 23:21:06 williamh Exp $
20 Apr 2014; William Hubbs <williamh@gentoo.org>
+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, dhcpcd-6.3.2.ebuild:
Add a patch to fix handling of the CC variable and a patch to fix handling of
--host, both for bug#505508. Also add a patch to make configure script test
for dlopen.
06 Apr 2014; Mike Frysinger <vapier@gentoo.org> dhcpcd-5.6.4.ebuild,
dhcpcd-6.2.0-r1.ebuild, dhcpcd-6.3.2.ebuild, dhcpcd-9999.ebuild:
Mark arm64/s390/sh stable.
24 Mar 2014; William Hubbs <williamh@gentoo.org> dhcpcd-9999.ebuild:
I am removing the tc-export call from the live ebuild per policy. The proper
fix should be upstream instead of us exporting a variable. It is being worked
now in bug #505508.
23 Mar 2014; William Hubbs <williamh@gentoo.org> -dhcpcd-6.3.1-r1.ebuild,
-files/dhcpcd-6.0.5-fix-build-without-ipv6.patch,
-files/dhcpcd-6.0.5-fix-segfault.patch, -files/dhcpcd-6.3.1-fix-udev.patch:
remove old unstable versions and patches
*dhcpcd-6.3.2 (23 Mar 2014)
23 Mar 2014; William Hubbs <williamh@gentoo.org> +dhcpcd-6.3.2.ebuild:
version bump
23 Mar 2014; William Hubbs <williamh@gentoo.org> dhcpcd-9999.ebuild:
convert live ebuild to use fossil for bug #505126, thanks to Mike Gilbert.
20 Mar 2014; Mike Gilbert <floppym@gentoo.org> dhcpcd-6.3.1-r1.ebuild,
dhcpcd-9999.ebuild:
Set CC before calling configure.
10 Mar 2014; William Hubbs <williamh@gentoo.org> -dhcpcd-6.0.5-r1.ebuild,
-dhcpcd-6.1.0.ebuild, -dhcpcd-6.2.1.ebuild, -dhcpcd-6.3.0.ebuild,
-dhcpcd-6.3.1.ebuild:
remove older unstable versions
*dhcpcd-6.3.1-r1 (09 Mar 2014)
09 Mar 2014; William Hubbs <williamh@gentoo.org> +dhcpcd-6.3.1-r1.ebuild,
+files/dhcpcd-6.3.1-fix-udev.patch:
rev bump for #503738
*dhcpcd-6.3.1 (08 Mar 2014)
08 Mar 2014; William Hubbs <williamh@gentoo.org> +dhcpcd-6.3.1.ebuild:
version bump for #503230
*dhcpcd-6.3.0 (26 Feb 2014)
26 Feb 2014; William Hubbs <williamh@gentoo.org> +dhcpcd-6.3.0.ebuild:
version bump
02 Feb 2014; Agostino Sarubbo <ago@gentoo.org> dhcpcd-6.2.0-r1.ebuild:
Stable for ppc, wrt bug #499262
30 Jan 2014; Markus Meier <maekke@gentoo.org> dhcpcd-6.2.0-r1.ebuild:
arm stable, bug #499262
26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> dhcpcd-6.2.0-r1.ebuild:
Stable for sparc, wrt bug #499262
26 Jan 2014; Jeroen Roovers <jer@gentoo.org> dhcpcd-6.2.0-r1.ebuild:
Stable for HPPA (bug #499262).
25 Jan 2014; William Hubbs <williamh@gentoo.org> dhcpcd-6.2.0-r1.ebuild:
Mark stable on amd64 and x86 wrt #499262
25 Jan 2014; William Hubbs <williamh@gentoo.org> -dhcpcd-6.2.0.ebuild:
remove broken version
*dhcpcd-6.2.1 (25 Jan 2014)
25 Jan 2014; William Hubbs <williamh@gentoo.org> +dhcpcd-6.2.1.ebuild:
version bump
18 Jan 2014; Mike Frysinger <vapier@gentoo.org> dhcpcd-5.6.4.ebuild,
dhcpcd-6.0.5-r1.ebuild, dhcpcd-6.1.0.ebuild, dhcpcd-6.2.0-r1.ebuild,
dhcpcd-6.2.0.ebuild, dhcpcd-9999.ebuild:
Add arm64 love.
*dhcpcd-6.2.0-r1 (09 Jan 2014)
09 Jan 2014; William Hubbs <williamh@gentoo.org> +dhcpcd-6.2.0-r1.ebuild,
+files/dhcpcd-6.2.0-dynamic-init.patch:
make the init system selection dynamic for bug #496870
05 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> dhcpcd-6.2.0.ebuild,
+files/dhcpcd-6.2.0-no_ipv6_fix.patch:
Fixed building without ipv6 support (bug #497098).
05 Jan 2014; Fabian Groffen <grobian@gentoo.org> dhcpcd-6.2.0.ebuild,
dhcpcd-9999.ebuild:
Use EPREFIX for rundir as well
*dhcpcd-6.2.0 (04 Jan 2014)
04 Jan 2014; William Hubbs <williamh@gentoo.org> +dhcpcd-6.2.0.ebuild:
version bump
23 Sep 2013; William Hubbs <williamh@gentoo.org> -dhcpcd-6.0.2.ebuild,
-dhcpcd-6.0.3.ebuild, -dhcpcd-6.0.5.ebuild:
remove old unstable versions
22 Sep 2013; William Hubbs <williamh@gentoo.org> dhcpcd-9999.ebuild:
add support for --rundir on Linux.
*dhcpcd-6.1.0 (20 Sep 2013)
20 Sep 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-6.1.0.ebuild:
version bump
16 Sep 2013; William Hubbs <williamh@gentoo.org> dhcpcd-9999.ebuild:
migrate to git-r3 eclass
13 Sep 2013; William Hubbs <williamh@gentoo.org> dhcpcd-9999.ebuild:
--with-udev and --with-dev are not valid switches to configure, so only use
--without-dev and --without-udev if the udev use flag is disabled.
09 Sep 2013; William Hubbs <williamh@gentoo.org> ChangeLog,
dhcpcd-9999.ebuild:
add udev use flag for bug #483970
22 Aug 2013; William Hubbs <williamh@gentoo.org> -dhcpcd-5.99.7-r1.ebuild,
-files/dhcpcd-5.99.7-fix-prefix.patch:
remove an old version
*dhcpcd-6.0.5-r1 (22 Aug 2013)
22 Aug 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-6.0.5-r1.ebuild,
+files/dhcpcd-6.0.5-fix-segfault.patch:
apply upstream patch to fix seg fault reported in bug #479922
17 Aug 2013; William Hubbs <williamh@gentoo.org>
+files/dhcpcd-6.0.5-fix-build-without-ipv6.patch, dhcpcd-6.0.5.ebuild:
apply upstream patch for bug #481330.
16 Aug 2013; William Hubbs <williamh@gentoo.org> dhcpcd-6.0.5.ebuild,
dhcpcd-9999.ebuild:
add support for ipv6 use flag for bug #481134 and sync live ebuild.
02 Aug 2013; William Hubbs <williamh@gentoo.org> dhcpcd-6.0.5.ebuild:
Add messages for bug #477356.
02 Aug 2013; William Hubbs <williamh@gentoo.org> dhcpcd-6.0.5.ebuild:
Add messages for bug #477536.
*dhcpcd-6.0.5 (02 Aug 2013)
02 Aug 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-6.0.5.ebuild:
version bump
*dhcpcd-6.0.3 (19 Jul 2013)
19 Jul 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-6.0.3.ebuild:
version bump
07 Jul 2013; William Hubbs <williamh@gentoo.org> -dhcpcd-5.6.7.ebuild,
-dhcpcd-5.6.8.ebuild, -dhcpcd-5.99.7.ebuild:
remove older unstable versions
*dhcpcd-6.0.2 (07 Jul 2013)
07 Jul 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-6.0.2.ebuild:
version bump
09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
Add upstream CPE tag (security info) from ChromiumOS.
*dhcpcd-5.99.7-r1 (07 Jun 2013)
07 Jun 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-5.99.7-r1.ebuild,
+files/dhcpcd-5.99.7-fix-prefix.patch:
revision bump for bug #358167
04 Jun 2013; William Hubbs <williamh@gentoo.org>
-files/dhcpcd-5.6.2-if-bsd.patch, -files/dhcpcd.initd-1:
remove old files
*dhcpcd-5.99.7 (04 Jun 2013)
04 Jun 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-5.99.7.ebuild,
-dhcpcd-5.99.6.ebuild:
version bump, 5.99.7 was just released
*dhcpcd-5.99.6 (04 Jun 2013)
04 Jun 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-5.99.6.ebuild,
dhcpcd-9999.ebuild:
version bump and sync live ebuild. Also drop the zeroconf use flag since I
was advised that use flags should not manipulate configuration files.
*dhcpcd-5.6.8 (23 Apr 2013)
23 Apr 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-5.6.8.ebuild,
dhcpcd-9999.ebuild:
version bump and sync live ebuild
22 Feb 2013; William Hubbs <williamh@gentoo.org> dhcpcd-5.6.7.ebuild,
dhcpcd-9999.ebuild:
remove outdated code for systemd and sync live ebuild
22 Feb 2013; William Hubbs <williamh@gentoo.org> -dhcpcd-5.6.6.ebuild:
remove old version
17 Feb 2013; Zac Medico <zmedico@gentoo.org> dhcpcd-5.6.7.ebuild:
Add ~arm-linux keyword.
*dhcpcd-9999 (17 Feb 2013)
17 Feb 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-9999.ebuild:
add live ebuild for bug #457762, thanks to Scott Bertilson.
*dhcpcd-5.6.7 (05 Feb 2013)
05 Feb 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-5.6.7.ebuild:
version bump for #454528
*dhcpcd-5.6.6 (03 Jan 2013)

View File

@ -1,20 +1,26 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
AUX dhcpcd-5.6.2-if-bsd.patch 1026 SHA256 35088882957386ef2b297ffca257f99388d53cc615bddfeda7c904003e9d0c99 SHA512 323d929a742c9174c2ea4f0c5fa247920db78b6b66825f42cfdc2e7bef893b5b9494619835405f51c9b580e192e93645210bf64df8fed0fb34de24c9d5b81b7b WHIRLPOOL 5aea77b3caa2e5937adfa7d1a11745cf993099dd35ae84061da76aaeee18b64cab1d4e4f9e780886f8b231b407e079c913909969e30cb9026baf3d2c06923672
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.initd-1 500 SHA256 96ea2b4110bcddb8a06690e9ecec42f55937cb5c6f5cf7ec59516df70ab8056e SHA512 0ced7e70ccfa33bb9628a1313724d6d7c18ba4abaa1ba0ecaf3e94ade3c6947530e27b8c2a3cb985f1906762096fb7c6c59b8e855e2d6c17203de2c32ffc5514 WHIRLPOOL b1c677177af3483694bb0b5bd76729f770f6e559eaf36f5d64c8e35da1716a714f311ef7d8993c9c2e2f985be447292e775fa501fea40962cb3b24aa0fa475b6
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-5.6.6.tar.bz2 85958 SHA256 dada838c4494864a901525dce9a0d204d94d830d9b7e4173b75692ce71c97e41 SHA512 55e5d8a818c421118c62fcea1cb259f15c8bafbb79f5d9b9d14c4099474fe25489189caa1025f2e07cd3a7446a794b4c757d9a28bea2c3e9bc1bc588d3d5e8dd WHIRLPOOL 0d2772216fbc964b0dc815c9e9a84eb5ca74bd690fc98b1eea0e1792a6e217311fcf407ff293a381c3875ad88a46eaaf446dcabf1d5e110ae9d2f5b5890155f4
EBUILD dhcpcd-5.6.4.ebuild 3426 SHA256 bb38c91f9bb8545bcd32ccb148d17adb25193a11e458eb14c55dc44707aa4ee4 SHA512 e9d3c05b44438dbf0ba491b7723e982c4d06d27181e629702e8dc2641f20cfed211959605c8e4ea9cc05e84c21a1ee3542ff4ec0bf8de407014176dc7564814d WHIRLPOOL a840f0c6d2feca17f6353ce7361047735875de4ee8dc2cb3544c0fa17095aaf70c0f0c67e65ec22fedf5b30f9cd7dcf7f007970d43aaf76bae0675f6339e8954
EBUILD dhcpcd-5.6.6.ebuild 2724 SHA256 62a26bbbf8e5afcf5fa88b5bddc8ab24a3a575c7c5303b709ece5231a23a7bc6 SHA512 8e2a7f766f79618893fc5128e2f19f2312dce5b6f2dfb284345b63cea89a4c502c869699110746516a7aaaf08da19a5723cfac43d50745ebc3335556d96c9c6a WHIRLPOOL c7b13905a215a6afd267c128be4f73ee5378a9ada77d2b3acbff1e2055863dc9a9504e99a13db9d921830b6fd7d12992a921ae2aea23b64a27a1741bd2b4a127
MISC ChangeLog 48742 SHA256 c94ea67180133bbdfbcfe1454e5b086fa07d321d4076fae1930feeea456bc2bb SHA512 804de78bb55157de1d51ac559ce56c7b80f2ff2b25d19dccf601df90694b014b06f3e062c6f11c7be5f450d4cee9a8e629998b733bd0c4734bf9a932da99cf45 WHIRLPOOL e25c330623dae23c743b33e328d02e6c0b6b9710cc8d9522fc854b5cc56e78ceb77ce38795693f4f12e290fbac68427cdb07e37d5855ab677306638da2d298de
MISC metadata.xml 267 SHA256 e49d3af922c81acd77a87c5432515be3bec34c7fd6646941acae7c5ea113a08e SHA512 f46e3eaac53a9ac66b00bb1eb071668d2c0b6086ba6b9da19d13442e58c3b4cffd424b3d160100d4a9e7160ca356af1fcb0f2ad75a27cbd5aaf12964191df2a9 WHIRLPOOL 409c00b28d63d076ef8a0ea26ece6a48405bcb5a4c72bb06eb412c8972f9ac9909613a82b415c3f8d7c0ebf34fcf6f953ac68c0976e9e8e5c01015caae15de5b
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
EBUILD dhcpcd-5.6.4.ebuild 3431 SHA256 0210e4b9dd27d8334eb4cb5781ba10de8c084aeef740ccddb7d8ff2a228c303d SHA512 a0834bc94a795f059244b59b7f8abbaab73cdb79339a1bf14b9f62a0c5c2efdcbdfae42659810413a1c6ef963d40ef8c9defbf354d53208935dc6e392b79908f WHIRLPOOL b981b64477e43075c004a81471ccea70f1a0faa14a38f8a6cc70829cec15225f35c69f726a8cc635e2fe5c88eaf69b127afe2678ece7f31292cfae47df211036
EBUILD dhcpcd-6.2.0-r1.ebuild 2964 SHA256 501cf08e4d24325a8f5d74abd5ea78b813c814a746253ebc399fc06e641e3e35 SHA512 cba3db39abcddace5e2a632151ec69455f65bd31402cd9a3baec65f56d3edda809341c54c3e83e49f3ffb0407b9d4742f190d5cadd21e02346e78d945eb05434 WHIRLPOOL a93c38313302f4453681ffa77fe94ec9f346f55b253fb135417681fcaa8909ba5d3a53192d41d562b538718e049184cb88fbd022bd8dd104db4e40f1d13aff20
EBUILD dhcpcd-6.3.2.ebuild 3471 SHA256 da98850800cf81b86ce482905b9d5aeeeaf2b7929d1e55e833f1a461729c6ad5 SHA512 01a52afedd6a3d31aacc25d5477f17b20342e2147b60454533716c345cda1029e96ce25c27b60d4083afda6630404cf3bef72ebab0fd130e11ff7dc6bff388dc WHIRLPOOL b1ef214731acf4c0c5601ded3c9e8850cd730724e4df74f08d3099895fcad646c1a4637c27ed9258bc61e4ca41119083f0fc84fc45fffabbc9d83016650925b5
EBUILD dhcpcd-9999.ebuild 3333 SHA256 3995da0eaaaf8fb7c79340a01dbfbf70e8459b2b30ad91856edc08a1d6a5b074 SHA512 4ca3b7aad47225d3a0a4e28baa70b34a5eb413aabcb1b8f510c699fe36d1aa6d621220334ed5190996dd216cd7897ca5e45666f4d583c337fdfdf8dda55a2062 WHIRLPOOL 8d167b02658ab7f2e808ed2778c03de340fb18e0a4130dce1b0200d62974b8f19300b8e8b68e7f9f25fc000525c57a5654ece9123ea82bccc1606fdc85d613d3
MISC ChangeLog 56285 SHA256 cb2878bb2052de6fa501430bdb309ffe283f183a99aa1d4e40311ab295f35810 SHA512 352d63a10864205bcf54c7f06cd5b7289e65b3cb8636ca173da54dd1e0b81fb70182e0c58858cc8b5fa74c712c8cfa3e8fbf4d802d3f5b32eaa992e84db9b595 WHIRLPOOL e053451bc755c8d113493aa3b54ed19739dd337cbb85e943fa8be6e84b4c08cd59a15e6b579ebe0b84bbc541572502439b34ab0035eb1c7f73b0b98cb65872c9
MISC metadata.xml 358 SHA256 d2755afa7df7488d44b4904fd1922746bd9ecae448fd73496600e03fd0938707 SHA512 a592a6368f8dc90795b2972fff1c79775de8739d214a4c4403f0528aa1caf993f6e10eb374cb1a38accc915b5cd26c7fac723a712c4570f8a71848d3d9854eac WHIRLPOOL 481a14009c01f31e40ee09d81c273adc1da21b45b5976167cbada8a774775679de5b8233d3effc3f043794cc9f78b7a1705eaa59de4829c150ebe786c46097a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Version: GnuPG v2.0.22 (GNU/Linux)
iEYEAREIAAYFAlDltz8ACgkQblQW9DDEZTiSogCcCH8kgJmROuf707AxQR8yqafK
yy0AnAsyTQPZ75qfTrrsRY1yQjEZQGAX
=Ex6N
iEYEAREIAAYFAlNUVmYACgkQblQW9DDEZThDfACeMLDrmuC3vdJj+ntnH3rBC5g9
WLMAn0BhDpjgQg/u96hRrWxVlx6KPoLS
=QCqG
-----END PGP SIGNATURE-----

View File

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# 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-5.6.4.ebuild,v 1.8 2012/12/15 17:36:38 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.4.ebuild,v 1.9 2014/01/18 10:25:23 vapier Exp $
EAPI=4
@ -16,7 +16,7 @@ HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
LICENSE="BSD-2"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="+zeroconf elibc_glibc"

View File

@ -1,91 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.6.ebuild,v 1.1 2013/01/03 16:50:25 williamh Exp $
EAPI=4
inherit eutils systemd
MY_P="${P/_alpha/-alpha}"
MY_P="${MY_P/_beta/-beta}"
MY_P="${MY_P/_rc/-rc}"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
LICENSE="BSD-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="+zeroconf elibc_glibc"
DEPEND=""
RDEPEND=""
src_prepare() {
epatch_user
if ! use zeroconf; then
elog "Disabling zeroconf support"
{
echo
echo "# dhcpcd ebuild requested no zeroconf"
echo "noipv4ll"
} >> dhcpcd.conf
fi
}
src_configure() {
local hooks="--with-hook=ntp.conf"
use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
econf \
--prefix="${EPREFIX}" \
--libexecdir="${EPREFIX}/lib/dhcpcd" \
--dbdir="${EPREFIX}/var/lib/dhcpcd" \
--localstatedir="${EPREFIX}/var" \
${hooks}
}
src_install() {
default
newinitd "${FILESDIR}"/${PN}.initd ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
}
pkg_preinst() {
has_version 'net-misc/dhcpcd[zeroconf]' && prev_zero=true || prev_zero=false
}
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
if use zeroconf && ! $prev_zero; then
elog "You have installed dhcpcd with zeroconf support."
elog "This means that 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 -L flag."
elog "See the dhcpcd man page for more details."
fi
# Mea culpa, feel free to remove that after some time --mgorny.
if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service ]]
then
ebegin "Moving ${PN}.service to multi-user.target"
mv "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service \
"${ROOT}"/etc/systemd/system/multi-user.target.wants/
eend ${?} \
"Please try to re-enable dhcpcd.service"
fi
}

View File

@ -0,0 +1,96 @@
# 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.2.0-r1.ebuild,v 1.8 2014/04/06 14:41:57 vapier Exp $
EAPI=5
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="git://roy.marples.name/${PN}.git"
inherit git-r3
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
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}"
src_prepare()
{
epatch "${FILESDIR}/${P}-dynamic-init.patch" #496870
epatch "${FILESDIR}/${P}-no_ipv6_fix.patch" #497098
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
}

View File

@ -0,0 +1,119 @@
# 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
}

View File

@ -0,0 +1,116 @@
# 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-9999.ebuild,v 1.14 2014/03/24 04:43:33 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
}

View File

@ -1,30 +0,0 @@
Fixes building on FreeBSD.
https://bugs.gentoo.org/show_bug.cgi?id=438942
From upstream:
http://roy.marples.name/projects/dhcpcd/changeset/4d6bbabd08d1a1696f5db67af60c9883c4c367f4
git-committer: Roy Marples <roy@marples.name> (10/24/12 13:59:20)
Message: Fix compile fr systems without RTF_CLONING such as FreeBSD-8
Index: if-bsd.c
===================================================================
--- if-bsd.c (revision 84ad87e1287453ca05a7cbd5775322374e07a7ee)
+++ if-bsd.c (revision 4d6bbabd08d1a1696f5db67af60c9883c4c367f4)
@@ -363,6 +363,8 @@
IN6_IS_ADDR_UNSPECIFIED(&rt->net))
rtm.hdr.rtm_flags |= RTF_GATEWAY;
+#ifdef RTF_CLONING
else
rtm.hdr.rtm_flags |= RTF_CLONING;
+#endif
rtm.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK;
@@ -371,5 +373,5 @@
ADDADDR(&rt->dest);
- if (rtm.hdr.rtm_flags & (RTF_HOST | RTF_CLONING)) {
+ if (!(rtm.hdr.rtm_flags & RTF_GATEWAY)) {
/* Make us a link layer socket for the host gateway */
memset(&su, 0, sizeof(su));

View File

@ -0,0 +1,242 @@
Index: configure
==================================================================
--- configure
+++ configure
@@ -681,94 +681,27 @@
echo "SRCS+= dev.c" >>$CONFIG_MK
echo "CPPFLAGS+= -DPLUGIN_DEV" >>$CONFIG_MK
echo "MKDIRS+= dev" >>$CONFIG_MK
fi
-if [ -z "$SERVICECMD" ]; then
- printf "Checking for OpenRC ... "
- if [ -x /sbin/rc-service ]; then
- SERVICEEXISTS="/sbin/rc-service -e \$1"
- SERVICECMD="/sbin/rc-service \$1 -- -D \$2"
- echo "yes"
- else
- echo "no"
- fi
-fi
-if [ -z "$SERVICECMD" ]; then
- printf "Checking for invoke-rc.d ... "
- if [ -x /usr/sbin/invoke-rc.d ]; then
- SERVICEEXISTS="/usr/sbin/invoke-rc.d --query --quiet \$1 start >/dev/null 2>&1 || [ \$? = 104 ]"
- SERVICECMD="/usr/sbin/invoke-rc.d \$1 \$2"
- echo "yes"
- else
- echo "no"
- fi
-fi
-if [ -z "$SERVICECMD" ]; then
- printf "Checking for service ... "
- if [ -x /sbin/service ]; then
- SERVICEEXISTS="/sbin/service \$1 >/dev/null 2>&1"
- SERVICECMD="/sbin/service \$1 \$2"
- echo "yes"
- else
- echo "no"
- fi
-fi
-if [ -z "$SERVICECMD" ]; then
- printf "Checking for Slackware ... "
- if [ -e /etc/slackware-version -a -d /etc/rc.d ]; then
- SERVICEEXISTS="[ -x /etc/rc.d/rc.\$1 ]"
- SERVICECMD="/etc/rc.d/rc.\$1 \$2"
- SERVICESTATUS="/etc/rc.d/rc.\$1 status 1>/dev/null 2>&1"
- echo "yes"
- else
- echo "no"
- fi
-fi
-if [ -z "$SERVICECMD" ]; then
- for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do
- printf "Checking for $x ... "
- if [ -d $x ]; then
- SERVICEEXISTS="[ -x $x/\$1 ]"
- SERVICECMD="$x/\$1 \$2"
- echo "yes"
- break
- else
- echo "no"
- fi
- done
-fi
-if [ -e /etc/arch-release ]; then
- echo "Overriding service status check for Arch Linux"
- SERVICESTATUS="[ -e /var/run/daemons/\$1 ]"
-fi
-
-if [ -z "$SERVICEEXISTS" -o -z "$SERVICECMD" ]; then
- echo "$0: WARNING: No means of interacting with system services detected!"
- SERVICEEXISTS="return 1"
- SERVICECMD="return 1"
-fi
-if [ -z "$SERVICESTATUS" ]; then
- SERVICESTATUS="service_command \$1 status >/dev/null 2>&1"
-fi
# Transform for a make file
SERVICEEXISTS=$(echo "$SERVICEEXISTS" | $SED \
-e 's:\\:\\\\:g' \
-e 's:\&:\\\&:g' \
- -e 's:\$:\$\$:g' \
+ -e 's:\$:\\\\\$\$:g' \
)
echo "SERVICEEXISTS= $SERVICEEXISTS" >>config.mk
SERVICECMD=$(echo "$SERVICECMD" | $SED \
-e 's:\\:\\\\:g' \
-e 's:\&:\\\&:g' \
- -e 's:\$:\$\$:g' \
+ -e 's:\$:\\\\\$\$:g' \
)
echo "SERVICECMD= $SERVICECMD" >>config.mk
SERVICESTATUS=$(echo "$SERVICESTATUS" | $SED \
-e 's:\\:\\\\:g' \
-e 's:\&:\\\&:g' \
- -e 's:\$:\$\$:g' \
+ -e 's:\$:\\\\\$\$:g' \
)
echo "SERVICESTATUS= $SERVICESTATUS" >>config.mk
HOOKS=
if ! $HOOKSET; then
Index: dhcpcd-run-hooks.in
==================================================================
--- dhcpcd-run-hooks.in
+++ dhcpcd-run-hooks.in
@@ -16,10 +16,11 @@
signature_base="# Generated by dhcpcd"
signature="$signature_base $from $ifname"
signature_base_end="# End of dhcpcd"
signature_end="$signature_base_end $from $ifname"
state_dir=@RUNDIR@/dhcpcd
+_detected_init=false
: ${if_up:=false}
: ${if_down:=false}
# Ensure that all arguments are unique
@@ -190,36 +191,118 @@
case "$@" in
*[![:alnum:]#%+-_:\.,@~\\/\[\]=\ ]*) return 1;;
esac
return 0
}
+
+# With the advent of alternative init systems, it's possible to have
+# more than one installed. So we need to try and guess what one we're
+# using unless overriden by configure.
+detect_init()
+{
+ _service_exists="@SERVICEEXISTS@"
+ _service_cmd="@SERVICECMD@"
+ _service_status="@SERVICESTATUS@"
+
+ [ -n "$_service_cmd" ] && return 0
+
+ if ${_detected_init}; then
+ [ -n "$_service_cmd" ]
+ return $?
+ fi
+
+ # Detect the running init system.
+ # As systemd and OpenRC can be installed on top of legacy init
+ # systems we try to detect them first.
+ _service_status=
+ if [ -x /bin/systemctl -a -S /run/systemd/private ]; then
+ _service_exists="/bin/systemctl --quiet is-enabled \$1.service"
+ _service_status="/bin/systemctl --quiet is-active \$1.service"
+ _service_cmd="/bin/systemctl \$2 \$1.service"
+ elif [ -x /usr/bin/systemctl -a -S /run/systemd/private ]; then
+ _service_exists="/usr/bin/systemctl --quiet is-enabled \$1.service"
+ _service_status="/usr/bin/systemctl --quiet is-active \$1.service"
+ _service_cmd="/usr/bin/systemctl \$2 \$1.service"
+ elif [ -x /sbin/rc-service -a \
+ -s /libexec/rc/init.d/softlevel -o -s /run/openrc/softlevel ]
+ then
+ _service_exists="/sbin/rc-service -e \$1"
+ _service_cmd="/sbin/rc-service \$1 -- -D \$2"
+ elif [ -x /usr/sbin/invoke-rc.d ]; then
+ _service_exists="/usr/sbin/invoke-rc.d --query --quiet \$1 start >/dev/null 2>&1 || [ \$? = 104 ]"
+ _service_cmd="/usr/sbin/invoke-rc.d \$1 \$2"
+ elif [ -x /sbin/service ]; then
+ _service_exists="/sbin/service \$1 >/dev/null 2>&1"
+ _service_cmd="/sbin/service \$1 \$2"
+ elif [ -e /etc/slackware-version -a -d /etc/rc.d ]; then
+ _service_exists="[ -x /etc/rc.d/rc.\$1 ]"
+ _service_cmd="/etc/rc.d/rc.\$1 \$2"
+ _service_status="/etc/rc.d/rc.\$1 status 1>/dev/null 2>&1"
+ else
+ for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do
+ if [ -d $x ]; then
+ _service_exists="[ -x $x/\$1 ]"
+ _service_cmd="$x/\$1 \$2"
+ break
+ fi
+ done
+ if [ -e /etc/arch-release ]; then
+ _service_status="[ -e /var/run/daemons/\$1 ]"
+ fi
+ fi
+
+ _detected_init=true
+ if [ -z "$_service_cmd" ]; then
+ syslog err "could not detect a useable init system"
+ return 1
+ fi
+ return 0
+}
# Check a system service exists
service_exists()
{
- @SERVICEEXISTS@
+
+ if [ -z "$_service_exists" ]; then
+ detect_init || return 1
+ fi
+ eval $_service_exists
}
# Send a command to a system service
service_cmd()
{
- @SERVICECMD@
+
+ if [ -z "$_service_cmd" ]; then
+ detect_init || return 1
+ fi
+ eval $_service_cmd
}
# Send a command to a system service if it is running
service_status()
{
- @SERVICESTATUS@
+
+ if [ -z "$_service_cmd" ]; then
+ detect_init || return 1
+ fi
+ if [ -n "$_service_status" ]; then
+ eval $_service_status
+ else
+ service_command $1 status >/dev/null 2>&1
+ fi
}
# Handy macros for our hooks
service_command()
{
+
service_exists $1 && service_cmd $1 $2
}
service_condcommand()
{
+
service_exists $1 && service_status $1 && service_cmd $1 $2
}
# We source each script into this one so that scripts run earlier can
# remove variables from the environment so later scripts don't see them.

View File

@ -0,0 +1,57 @@
Index: dhcp-common.c
==================================================================
--- dhcp-common.c
+++ dhcp-common.c
@@ -349,14 +349,20 @@
else
/* If we don't know the size, assume it's valid */
return dl;
return (dl < sz ? 0 : sz);
}
+
+#ifdef INET6
+#define PO_IFNAME
+#else
+#define PO_IFNAME __unused
+#endif
ssize_t
print_option(char *s, ssize_t len, int type, int dl, const uint8_t *data,
- const char *ifname)
+ PO_IFNAME const char *ifname)
{
const uint8_t *e, *t;
uint16_t u16;
int16_t s16;
uint32_t u32;
Index: if-options.c
==================================================================
--- if-options.c
+++ if-options.c
@@ -1550,10 +1550,11 @@
char *buf;
const char **e;
size_t buflen, ol;
#endif
#if !defined(INET) || !defined(INET6)
+ size_t i;
struct dhcp_opt *opt;
#endif
/* Seed our default options */
ifo = calloc(1, sizeof(*ifo));
@@ -1667,11 +1668,11 @@
#ifdef INET6
dhcp6_opts = ifo->dhcp6_override;
dhcp6_opts_len = ifo->dhcp6_override_len;
#else
for (i = 0, opt = ifo->dhcp6_override;
- i < ifo->dhcp_override6_len;
+ i < ifo->dhcp6_override_len;
i++, opt++)
free_dhcp_opt_embenc(opt);
free(ifo->dhcp6_override);
#endif
ifo->dhcp6_override = NULL;

View File

@ -0,0 +1,109 @@
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

View File

@ -0,0 +1,88 @@
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

View File

@ -0,0 +1,90 @@
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' \

View File

@ -1,27 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2011 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license.
command=/sbin/dhcpcd
pidfile=/var/run/dhcpcd.pid
command_args=-q
name="DHCP Client Daemon"
depend()
{
if [ "${RC_VERSION:-0}" != "0" ]; then
provide net
need localmount
use logger network
after bootmisc modules
before dns
fi
}
if [ "${RC_VERSION:-0}" = "0" ]; then
start()
{
eerror "This script cannot be used for baselayout-1."
return 1
}
fi

View File

@ -6,4 +6,7 @@
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:roy_marples:dhcpcd</remote-id>
</upstream>
</pkgmetadata>