Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/
Date: Fri, 08 Dec 2017 00:01:33
Message-Id: 1512691275.b0b59d002044fa946b5e7522f93c3742f2a40b68.williamh@gentoo
1 commit: b0b59d002044fa946b5e7522f93c3742f2a40b68
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 8 00:00:49 2017 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 8 00:01:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b59d00
7
8 net-misc/dhcpcd: 7.0.0_rc4 version bump
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.3
11
12 net-misc/dhcpcd/Manifest | 17 ++--
13 net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild | 148 ++++++++++++++++++++++++++++++++
14 2 files changed, 157 insertions(+), 8 deletions(-)
15
16 diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
17 index 4924985b3de..e33fb3d6fa9 100644
18 --- a/net-misc/dhcpcd/Manifest
19 +++ b/net-misc/dhcpcd/Manifest
20 @@ -1,8 +1,9 @@
21 -DIST dhcpcd-6.10.1.tar.xz 180112 SHA256 284abf8c3be0580bbac5eaca95359346ab0d78d4072317b6ce87cc68f2e8ae7b SHA512 f323c155cff47f21dde181c216408b79f10e6ed923aa3d1f3482feff47a1e88e02193ec82f831da4ef63d3703ca1837715c36a47cf3f5d09f117f6eb53bfcf67 WHIRLPOOL 805e8a1b4dad400825197dae7918a2172093d152986d5d97f4d1993f2c27cf3fbe097a5dc4f7a5292e98676b5d7fad6079ed64e4bffabeb7ccf9d91f4db80de9
22 -DIST dhcpcd-6.11.1.tar.xz 190956 SHA256 5c823d607ed1d7513d16ec51c54e21657f1324899e0ba333a497682d88a8c6ee SHA512 50ef755b13a96fe484623d9f2dbd91407fbea5ca728fd05dbf4259a61611a07cf3ffad7e8d20ecd513dbef80602074809abd1f5177daaa51ceccc2af5c88269f WHIRLPOOL a32350beee83184fc9d0dec5cd65f265a83aa95177b8ff700fcce2aaf2ac6c2600c322e3d8c65f1d2e9d3a2cbe71bc00b3a6efbf045fa9c805b76a3a1fca0de5
23 -DIST dhcpcd-6.11.3.tar.xz 194892 SHA256 5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f229b06 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70 WHIRLPOOL 66eebad0ceabf07324f41b7c5861b13f233d6cf3fb4f7c82804b6391594595cda8c981cec088aa75242a04614a7228be7400171d32c68ee6be354bf976a237d5
24 -DIST dhcpcd-6.11.5.tar.xz 198080 SHA256 6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e SHA512 a23d5dde66567c4addbc86c8b3fbf2c5d4dba3b463659729778a310306ab0e949be8998154ef15401ac2d289bde2f090d44492bba6a1becd2f01890d4efe7051 WHIRLPOOL 1b4bdd56112db20a0c6b0c843549f7c9cd8c534a9353df026d2c63a4b4bfd624f7fbc68282e04fd4f4c7c257d996e5019d3aa624f01b532074311d63b151164f
25 -DIST dhcpcd-7.0.0-beta3.tar.xz 203440 SHA256 ba8af748d0d1aa8daa8ba6813c1cf395f517bb51fe4274309170af9d2f1a89ef SHA512 b71154fa2596826e23820df984992e8786a6b89588648db60e9340a383b67fdb555307e9a47b7c33097ed4191fdb911e443c6bf9fc76b0194770e66e2de64b95 WHIRLPOOL 211564a4c218853bf3c6f219ffa36ef3d14fe3cc355bb5931bb98d5461717d0145145511540ab93ad4dcf99640c48ddcb1d82fc56361c329764c0756c12881a6
26 -DIST dhcpcd-7.0.0-rc1.tar.xz 204496 SHA256 8d4134596f1c8a647d94291fea0ed6f39dad648a4822472b481dfe48407b1cd3 SHA512 536ed4c09638a7a0fb16ad6a4a16fd74242ffbe2fe53e183c6756d2c62c94ce02869c95e828fbf3aa49aca06a129ab710195bf3d1dc9c9b52ac550ec51f68a1e WHIRLPOOL ec6898bbba3f4f2f42f9b8f16dd60f8b4b64170e4ad6c7e1326a80afd32241ad6b3ea941bfeb4e7113bd26ecb597fa04aebd1e1626c214ee10e48011251b065f
27 -DIST dhcpcd-7.0.0-rc2.tar.xz 206108 SHA256 ddae2ccf7c41a3ea5508e8adb2b7b9bbcd2b8a1ebe20871982243e513e83101a SHA512 a3e596c605c8ffe9f87f7113522f460d24a639b54dcc31182c70c3d0589d34d8c1cc765d5dfcfc6fd026697846866f7aa5714ef0d0d9eb049404973ef21f8ec7 WHIRLPOOL 46da14e26fb62320051e3457476d506847fa5630b898d01af14c7726175cfa9fcb01f505af5fe1668a89a2972f9ae40d46aad2918065c3f994c064a9b17dcb05
28 -DIST dhcpcd-7.0.0-rc3.tar.xz 207164 SHA256 14ba0873e6b67a8c85ed5bfb1428bbe887259d0477703e49d629e1a5d9e6300f SHA512 982c4c65ea45391e31170b592ce680c6cf5f4069b00decff3a299db23cede3e2521c66df7754a7a2379d5688f113553fe34e2fde825d6d9b83836a9e6d69fba9 WHIRLPOOL aeafeb61c783a0e3b99748ed465fe823678d1eb8f1068544e49e9d7dc3da31abad49944cb9aca8c3f469d960df26910ccfd3900cf683935d87d9b9026efbe5a7
29 +DIST dhcpcd-6.10.1.tar.xz 180112 BLAKE2B aa339c1d60cf2752cdfd0e75f788e9af193cc40a1968f5bb79583695cddbf1b0a3722e7add56759ef76326a25a3ff8cd861d59aecad3ba1ec2ba336031f5e60b SHA512 f323c155cff47f21dde181c216408b79f10e6ed923aa3d1f3482feff47a1e88e02193ec82f831da4ef63d3703ca1837715c36a47cf3f5d09f117f6eb53bfcf67
30 +DIST dhcpcd-6.11.1.tar.xz 190956 BLAKE2B 65f816e436b9a8370d459328997cadb82d1f70e3844cd6c7c52df52a58bf22d0b87b9480813f506b40ea85cef77c0f667ce97299819424e24cf186a41fdf69c9 SHA512 50ef755b13a96fe484623d9f2dbd91407fbea5ca728fd05dbf4259a61611a07cf3ffad7e8d20ecd513dbef80602074809abd1f5177daaa51ceccc2af5c88269f
31 +DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70
32 +DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6ae0292bfedb3a96ce435a774b42fdc1a1e9d288edc786c544c17c21fd7d3c8c6e6a6832acdad7e1f5edfa8c0b SHA512 a23d5dde66567c4addbc86c8b3fbf2c5d4dba3b463659729778a310306ab0e949be8998154ef15401ac2d289bde2f090d44492bba6a1becd2f01890d4efe7051
33 +DIST dhcpcd-7.0.0-beta3.tar.xz 203440 BLAKE2B 0b78ed09c487673d094c6f83de9497818fa50f57995348e6ecedd1537364b950b747270380e6d70e20905f9836b4fe2bfebc81c52e135f7110f6d376bf809447 SHA512 b71154fa2596826e23820df984992e8786a6b89588648db60e9340a383b67fdb555307e9a47b7c33097ed4191fdb911e443c6bf9fc76b0194770e66e2de64b95
34 +DIST dhcpcd-7.0.0-rc1.tar.xz 204496 BLAKE2B 59ecfbcd4a6713359d6bd46e451c8241cbb0069bf0ed736ae4c87898517efafe9bec0cfa5b491e6e6b4a9419e44f2488a2286a4496b568a2d3c3170ac6c2c91e SHA512 536ed4c09638a7a0fb16ad6a4a16fd74242ffbe2fe53e183c6756d2c62c94ce02869c95e828fbf3aa49aca06a129ab710195bf3d1dc9c9b52ac550ec51f68a1e
35 +DIST dhcpcd-7.0.0-rc2.tar.xz 206108 BLAKE2B e30acadab1e8084b0800b67f4609fa5c7fe4d11d8baee19d23247f00156ba710f7f820fd9af507d8710982f1ef94472daf6b8070193ba67ad1911f8ee7d22faa SHA512 a3e596c605c8ffe9f87f7113522f460d24a639b54dcc31182c70c3d0589d34d8c1cc765d5dfcfc6fd026697846866f7aa5714ef0d0d9eb049404973ef21f8ec7
36 +DIST dhcpcd-7.0.0-rc3.tar.xz 207164 BLAKE2B 2e8cb676979606dba22c5f304650679e5325cc691d8a3c2dd62a1776373df4a7c21d5e85ee8106299b2f73def4bb2862bbe8d396b37dcab9c1dcff93634a0b78 SHA512 982c4c65ea45391e31170b592ce680c6cf5f4069b00decff3a299db23cede3e2521c66df7754a7a2379d5688f113553fe34e2fde825d6d9b83836a9e6d69fba9
37 +DIST dhcpcd-7.0.0-rc4.tar.xz 207596 BLAKE2B 2ce28e6f171b0bcc0b5c9e2ba0e5c92c70e7e97a516ce170d24c77a9d9981662acc914cefa5cad1bda14d7129088c313069ebe956d3e79098f70c3a31e53499f SHA512 e4bbb7d52021b84510d2a4e634b6fb979c126a6828de55053df0d3c6aae67a5c9be3da008bd7c8606be3d6aa28b00bafed3188473adcf2f3bc1bbfe9b1f4adc3
38
39 diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild
40 new file mode 100644
41 index 00000000000..deffde72be0
42 --- /dev/null
43 +++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild
44 @@ -0,0 +1,148 @@
45 +# Copyright 1999-2017 Gentoo Foundation
46 +# Distributed under the terms of the GNU General Public License v2
47 +
48 +EAPI=6
49 +
50 +if [[ ${PV} == "9999" ]]; then
51 + EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
52 + inherit git-r3
53 +else
54 + MY_P="${P/_alpha/-alpha}"
55 + MY_P="${MY_P/_beta/-beta}"
56 + MY_P="${MY_P/_rc/-rc}"
57 + SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
58 + 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"
59 + S="${WORKDIR}/${MY_P}"
60 +fi
61 +
62 +inherit eutils systemd toolchain-funcs
63 +
64 +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
65 +HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
66 +LICENSE="BSD-2"
67 +SLOT="0"
68 +IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
69 +
70 +COMMON_DEPEND="udev? ( virtual/udev )"
71 +DEPEND="${COMMON_DEPEND}"
72 +RDEPEND="${COMMON_DEPEND}"
73 +
74 +src_configure()
75 +{
76 + local dev hooks rundir
77 + use udev || dev="--without-dev --without-udev"
78 + hooks="--with-hook=ntp.conf"
79 + use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
80 + use kernel_linux && rundir="--rundir=${EPREFIX}/run"
81 + econf \
82 + --prefix="${EPREFIX}" \
83 + --libexecdir="${EPREFIX}/lib/dhcpcd" \
84 + --dbdir="${EPREFIX}/var/lib/dhcpcd" \
85 + --localstatedir="${EPREFIX}/var" \
86 + ${rundir} \
87 + $(use_enable embedded) \
88 + $(use_enable ipv6) \
89 + ${dev} \
90 + CC="$(tc-getCC)" \
91 + ${hooks}
92 +}
93 +
94 +src_install()
95 +{
96 + default
97 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
98 + systemd_dounit "${FILESDIR}"/${PN}.service
99 +}
100 +
101 +pkg_postinst()
102 +{
103 + local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
104 +
105 + local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
106 + local old_duid="${EROOT%/}"/etc/dhcpcd.duid
107 + local new_duid="${dbdir}"/duid
108 + if [ -e "${old_old_duid}" ]; then
109 + # Upgrade the duid file to the new format if needed
110 + if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
111 + sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
112 + fi
113 +
114 + # Move the duid to /etc, a more sensible location
115 + if [ ! -e "${old_duid}" ]; then
116 + cp -p "${old_old_duid}" "${new_duid}"
117 + fi
118 + old_files="${old_files} ${old_old_duid}"
119 + fi
120 +
121 + # dhcpcd-7 moves the files out of /etc
122 + if [ -e "${old_duid}" ]; then
123 + if [ ! -e "${new_duid}" ]; then
124 + cp -p "${old_duid}" "${new_duid}"
125 + fi
126 + old_files="${old_files} ${old_duid}"
127 + fi
128 + local old_secret="${EROOT%/}"/etc/dhcpcd.secret
129 + local new_secret="${dbdir}"/secret
130 + if [ -e "${old_secret}" ]; then
131 + if [ ! -e "${new_secret}" ]; then
132 + cp -p "${old_secret}" "${new_secret}"
133 + fi
134 + old_files="${old_files} ${old_secret}"
135 + fi
136 +
137 + # dhcpcd-7 renames some files in /var/lib/dhcpcd
138 + local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
139 + local new_rdm="${dbdir}"/rdm_monotonic
140 + if [ -e "${old_rdm}" ]; then
141 + if [ ! -e "${new_rdm}" ]; then
142 + cp -p "${old_rdm}" "${new_rdm}"
143 + fi
144 + old_files="${old_files} ${old_rdm}"
145 + fi
146 + local lease=
147 + for lease in "${dbdir}"/dhcpcd-*.lease*; do
148 + [ -f "$lease" ] || continue
149 + old_files="${old_files} ${lease}"
150 + local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
151 + [ -e "${dbdir}/${new_lease}" ] && continue
152 + cp "${lease}" "${dbdir}/${new_lease}"
153 + done
154 +
155 + # Warn about removing stale files
156 + if [ -n "${old_files}" ]; then
157 + elog
158 + elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
159 + elog "${EROOT%/}/etc to ${dbdir}"
160 + elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
161 + elog "prefix dropped."
162 + elog
163 + elog "You should remove these files if you don't plan on reverting"
164 + elog "to an older version:"
165 + local old_file=
166 + for old_file in ${old_files}; do
167 + elog " ${old_file}"
168 + done
169 + fi
170 +
171 + if [ -z "$REPLACING_VERSIONS" ]; then
172 + elog
173 + elog "dhcpcd has zeroconf support active by default."
174 + elog "This means it will always obtain an IP address even if no"
175 + elog "DHCP server can be contacted, which will break any existing"
176 + elog "failover support you may have configured in your net configuration."
177 + elog "This behaviour can be controlled with the noipv4ll configuration"
178 + elog "file option or the -L command line switch."
179 + elog "See the dhcpcd and dhcpcd.conf man pages for more details."
180 +
181 + elog
182 + elog "Dhcpcd has duid enabled by default, and this may cause issues"
183 + elog "with some dhcp servers. For more information, see"
184 + elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
185 + fi
186 +
187 + if ! has_version net-dns/bind-tools; then
188 + elog
189 + elog "If you activate the lookup-hostname hook to look up your hostname"
190 + elog "using the dns, you need to install net-dns/bind-tools."
191 + fi
192 +}