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