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