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: Tue, 24 Jul 2018 17:04:48
Message-Id: 1532451787.9beb27e040478d115f24e306b4d06fb5fcaf1806.williamh@gentoo
1 commit: 9beb27e040478d115f24e306b4d06fb5fcaf1806
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 24 17:03:07 2018 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 24 17:03:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9beb27e0
7
8 net-misc/dhcpcd: 7.0.7 bump
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 net-misc/dhcpcd/Manifest | 1 +
13 net-misc/dhcpcd/dhcpcd-7.0.7.ebuild | 149 ++++++++++++++++++++++++++++++++++++
14 2 files changed, 150 insertions(+)
15
16 diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
17 index 6c20ad4e09b..41053bf9d76 100644
18 --- a/net-misc/dhcpcd/Manifest
19 +++ b/net-misc/dhcpcd/Manifest
20 @@ -8,3 +8,4 @@ DIST dhcpcd-7.0.4.tar.xz 209860 BLAKE2B 12c9524d6cd012665479a91f2966ae8123cc38bd
21 DIST dhcpcd-7.0.5.tar.xz 210088 BLAKE2B bd10e09eb160e09067a3cf0472417a191f05216dbae5e5b65255a6e212fdff099b178a331dc44cf420830d1aaa581629d669f491d4acb099d646a5969d621dee SHA512 b9d5a1c9306ff86544f0a74a0e61f9a78a643087da8cbee2bf09155a745c6815a2078be7f7a400f31f760355eae2177c5760ce4ca55e83cee615a343671d9b41
22 DIST dhcpcd-7.0.5b.tar.xz 210024 BLAKE2B 38073a761d93b0cc1ece2f5a87791b50d40740796794852dfdba10a7e8e4264e77fa554c1a2e1192430dee791be7856b707889406bdb1e1d508c56187eb61348 SHA512 f2d9a6930a31e169ae63356c06ed7b6d642d03f13c555512a8cbac4e95430a8fdc7e5eecb2fffb795947e4f6a6e7a9db239fa85f12801833e553000a732879f6
23 DIST dhcpcd-7.0.6.tar.xz 210392 BLAKE2B c343ebfd42cfd0c76d3524cab799d05e3ec0c1735fde1703613a60cd4e3a656d4a1428ed8a84f7d66ef4d39ffb519ab7eabf4d7c765e6dec93386ccf7d84f363 SHA512 5885739e60d6eb4fded117cb87f59a073ae6e8da8454dee56d8e7c5d33778e413e121d28a22163ebf31e4508a21d3a21c1d17ee6d4551081db2ee8e5384d44c9
24 +DIST dhcpcd-7.0.7.tar.xz 210572 BLAKE2B 4ba70c32fe012930928a8c3363c8fe3f655943883ff521fcfb3b5b75950be2e7432ca79e52298a119fc70c1dd8095a28f59d4cabe62da3ad8179c0dc73af0aac SHA512 04c316f7b180bbbf48aa58273d3a28d659824e474d1ce48325f610ed2c5d2a01117f5b65b4a9697f3e8e1b85d4bdcc0b8ab75a928a8cd5723a865d8c0a065269
25
26 diff --git a/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild
27 new file mode 100644
28 index 00000000000..bca59ecd5d7
29 --- /dev/null
30 +++ b/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild
31 @@ -0,0 +1,149 @@
32 +# Copyright 1999-2018 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +
37 +if [[ ${PV} == "9999" ]]; then
38 + EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
39 + inherit git-r3
40 +else
41 + MY_P="${P/_alpha/-alpha}"
42 + MY_P="${MY_P/_beta/-beta}"
43 + MY_P="${MY_P/_rc/-rc}"
44 + SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
45 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
46 + S="${WORKDIR}/${MY_P}"
47 +fi
48 +
49 +inherit eutils systemd toolchain-funcs
50 +
51 +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
52 +HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
53 +LICENSE="BSD-2"
54 +SLOT="0"
55 +IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
56 +
57 +COMMON_DEPEND="udev? ( virtual/udev )"
58 +DEPEND="${COMMON_DEPEND}"
59 +RDEPEND="${COMMON_DEPEND}"
60 +
61 +src_configure()
62 +{
63 + local dev hooks rundir
64 + use udev || dev="--without-dev --without-udev"
65 + hooks="--with-hook=ntp.conf"
66 + use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
67 + use kernel_linux && rundir="--rundir=${EPREFIX}/run"
68 + econf \
69 + --prefix="${EPREFIX}" \
70 + --libexecdir="${EPREFIX}/lib/dhcpcd" \
71 + --dbdir="${EPREFIX}/var/lib/dhcpcd" \
72 + --localstatedir="${EPREFIX}/var" \
73 + ${rundir} \
74 + $(use_enable embedded) \
75 + $(use_enable ipv6) \
76 + ${dev} \
77 + CC="$(tc-getCC)" \
78 + ${hooks}
79 +}
80 +
81 +src_install()
82 +{
83 + default
84 + keepdir /var/lib/dhcpcd
85 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
86 + systemd_dounit "${FILESDIR}"/${PN}.service
87 +}
88 +
89 +pkg_postinst()
90 +{
91 + local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
92 +
93 + local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
94 + local old_duid="${EROOT%/}"/etc/dhcpcd.duid
95 + local new_duid="${dbdir}"/duid
96 + if [ -e "${old_old_duid}" ]; then
97 + # Upgrade the duid file to the new format if needed
98 + if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
99 + sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
100 + fi
101 +
102 + # Move the duid to /etc, a more sensible location
103 + if [ ! -e "${old_duid}" ]; then
104 + cp -p "${old_old_duid}" "${new_duid}"
105 + fi
106 + old_files="${old_files} ${old_old_duid}"
107 + fi
108 +
109 + # dhcpcd-7 moves the files out of /etc
110 + if [ -e "${old_duid}" ]; then
111 + if [ ! -e "${new_duid}" ]; then
112 + cp -p "${old_duid}" "${new_duid}"
113 + fi
114 + old_files="${old_files} ${old_duid}"
115 + fi
116 + local old_secret="${EROOT%/}"/etc/dhcpcd.secret
117 + local new_secret="${dbdir}"/secret
118 + if [ -e "${old_secret}" ]; then
119 + if [ ! -e "${new_secret}" ]; then
120 + cp -p "${old_secret}" "${new_secret}"
121 + fi
122 + old_files="${old_files} ${old_secret}"
123 + fi
124 +
125 + # dhcpcd-7 renames some files in /var/lib/dhcpcd
126 + local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
127 + local new_rdm="${dbdir}"/rdm_monotonic
128 + if [ -e "${old_rdm}" ]; then
129 + if [ ! -e "${new_rdm}" ]; then
130 + cp -p "${old_rdm}" "${new_rdm}"
131 + fi
132 + old_files="${old_files} ${old_rdm}"
133 + fi
134 + local lease=
135 + for lease in "${dbdir}"/dhcpcd-*.lease*; do
136 + [ -f "$lease" ] || continue
137 + old_files="${old_files} ${lease}"
138 + local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
139 + [ -e "${dbdir}/${new_lease}" ] && continue
140 + cp "${lease}" "${dbdir}/${new_lease}"
141 + done
142 +
143 + # Warn about removing stale files
144 + if [ -n "${old_files}" ]; then
145 + elog
146 + elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
147 + elog "${EROOT%/}/etc to ${dbdir}"
148 + elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
149 + elog "prefix dropped."
150 + elog
151 + elog "You should remove these files if you don't plan on reverting"
152 + elog "to an older version:"
153 + local old_file=
154 + for old_file in ${old_files}; do
155 + elog " ${old_file}"
156 + done
157 + fi
158 +
159 + if [ -z "$REPLACING_VERSIONS" ]; then
160 + elog
161 + elog "dhcpcd has zeroconf support active by default."
162 + elog "This means it will always obtain an IP address even if no"
163 + elog "DHCP server can be contacted, which will break any existing"
164 + elog "failover support you may have configured in your net configuration."
165 + elog "This behaviour can be controlled with the noipv4ll configuration"
166 + elog "file option or the -L command line switch."
167 + elog "See the dhcpcd and dhcpcd.conf man pages for more details."
168 +
169 + elog
170 + elog "Dhcpcd has duid enabled by default, and this may cause issues"
171 + elog "with some dhcp servers. For more information, see"
172 + elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
173 + fi
174 +
175 + if ! has_version net-dns/bind-tools; then
176 + elog
177 + elog "If you activate the lookup-hostname hook to look up your hostname"
178 + elog "using the dns, you need to install net-dns/bind-tools."
179 + fi
180 +}