Gentoo Archives: gentoo-commits

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