commit: 9ae03c4637e33ac400f5ca15fac9b17a5b46eb41
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 24 17:37:34 2018 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 24 17:37:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae03c46
net-misc/dhcpcd: remove several unstable versions
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-misc/dhcpcd/Manifest | 6 --
net-misc/dhcpcd/dhcpcd-7.0.0.ebuild | 148 ----------------------------------
net-misc/dhcpcd/dhcpcd-7.0.2.ebuild | 149 -----------------------------------
net-misc/dhcpcd/dhcpcd-7.0.3.ebuild | 149 -----------------------------------
net-misc/dhcpcd/dhcpcd-7.0.4.ebuild | 149 -----------------------------------
net-misc/dhcpcd/dhcpcd-7.0.5.ebuild | 149 -----------------------------------
net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild | 149 -----------------------------------
7 files changed, 899 deletions(-)
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 41053bf9d76..bf33f9bf85e 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,11 +1,5 @@
DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B
08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440
SHA512
249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70
DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B
3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6ae0292bfedb3a96ce435a774b42fdc1a1e9d288edc786c544c17c21fd7d3c8c6e6a6832acdad7e1f5edfa8c0b
SHA512
a23d5dde66567c4addbc86c8b3fbf2c5d4dba3b463659729778a310306ab0e949be8998154ef15401ac2d289bde2f090d44492bba6a1becd2f01890d4efe7051
-DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B
bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d
SHA512
f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904
DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B
1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f
SHA512
d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
-DIST dhcpcd-7.0.2.tar.xz 208736 BLAKE2B
958118a7acdb6d55e06b88ec8b1fe342600e49caefc7e0e6745a20aafb9588f1c83af171c47e7b6ba1faa664290b052530271f5dd588f82db5933af315b8eea7
SHA512
f5b1407199163fb994519bc1b5a70ad043f00f263e3b254da5d519d1c6b689a4a5a8bcef3bf42401826984e273c2ead38249fcfe99129b87034f90de2fc46ecd
-DIST dhcpcd-7.0.3.tar.xz 208856 BLAKE2B
d11f1845cae74470cd9982f5957911ac5fd7cc284b455254fef5c462e516018d94d56f970d758e81cd86a7f918e5cf0d3bd6d2087bda701b299436c4253220f4
SHA512
a2d4e8ea6a310090c2795c596c80a76f0e42dc6654ba50d2900e2af4239dbc542e857d20b2983ea97675903b85cdbd0e9212424390a62081837821bbdaf7ce83
-DIST dhcpcd-7.0.4.tar.xz 209860 BLAKE2B
12c9524d6cd012665479a91f2966ae8123cc38bd3a47d81490f3dc0efecda2a787a0d55e883906e536c989054d25e00fa96d06d11062013d154de88882f31414
SHA512
32382b17a00e6ff7a80868a35424d1cc25410f012048ef099a90fbcb15a43ef6e73d2e65094ac90ccb18ecd92c6fc2c7e2116e19669ad0084ee39182b5cbd7db
-DIST dhcpcd-7.0.5.tar.xz 210088 BLAKE2B
bd10e09eb160e09067a3cf0472417a191f05216dbae5e5b65255a6e212fdff099b178a331dc44cf420830d1aaa581629d669f491d4acb099d646a5969d621dee
SHA512
b9d5a1c9306ff86544f0a74a0e61f9a78a643087da8cbee2bf09155a745c6815a2078be7f7a400f31f760355eae2177c5760ce4ca55e83cee615a343671d9b41
-DIST dhcpcd-7.0.5b.tar.xz 210024 BLAKE2B
38073a761d93b0cc1ece2f5a87791b50d40740796794852dfdba10a7e8e4264e77fa554c1a2e1192430dee791be7856b707889406bdb1e1d508c56187eb61348
SHA512
f2d9a6930a31e169ae63356c06ed7b6d642d03f13c555512a8cbac4e95430a8fdc7e5eecb2fffb795947e4f6a6e7a9db239fa85f12801833e553000a732879f6
DIST dhcpcd-7.0.6.tar.xz 210392 BLAKE2B
c343ebfd42cfd0c76d3524cab799d05e3ec0c1735fde1703613a60cd4e3a656d4a1428ed8a84f7d66ef4d39ffb519ab7eabf4d7c765e6dec93386ccf7d84f363
SHA512
5885739e60d6eb4fded117cb87f59a073ae6e8da8454dee56d8e7c5d33778e413e121d28a22163ebf31e4508a21d3a21c1d17ee6d4551081db2ee8e5384d44c9
DIST dhcpcd-7.0.7.tar.xz 210572 BLAKE2B
4ba70c32fe012930928a8c3363c8fe3f655943883ff521fcfb3b5b75950be2e7432ca79e52298a119fc70c1dd8095a28f59d4cabe62da3ad8179c0dc73af0aac
SHA512
04c316f7b180bbbf48aa58273d3a28d659824e474d1ce48325f610ed2c5d2a01117f5b65b4a9697f3e8e1b85d4bdcc0b8ab75a928a8cd5723a865d8c0a065269
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
b/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
deleted file mode 100644
index c77b8fed58c..00000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git";
- inherit git-r3
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd";
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure()
-{
- local dev hooks rundir
- use udev || dev="--without-dev --without-udev"
- hooks="--with-hook=ntp.conf"
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
- use kernel_linux && rundir="--rundir=${EPREFIX}/run"
- econf \
- --prefix="${EPREFIX}" \
- --libexecdir="${EPREFIX}/lib/dhcpcd" \
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \
- --localstatedir="${EPREFIX}/var" \
- ${rundir} \
- $(use_enable embedded) \
- $(use_enable ipv6) \
- ${dev} \
- CC="$(tc-getCC)" \
- ${hooks}
-}
-
-src_install()
-{
- default
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid
- local new_duid="${dbdir}"/duid
- if [ -e "${old_old_duid}" ]; then
- # Upgrade the duid file to the new format if needed
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ ! -e "${old_duid}" ]; then
- cp -p "${old_old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_old_duid}"
- fi
-
- # dhcpcd-7 moves the files out of /etc
- if [ -e "${old_duid}" ]; then
- if [ ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_duid}"
- fi
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret
- local new_secret="${dbdir}"/secret
- if [ -e "${old_secret}" ]; then
- if [ ! -e "${new_secret}" ]; then
- cp -p "${old_secret}" "${new_secret}"
- fi
- old_files="${old_files} ${old_secret}"
- fi
-
- # dhcpcd-7 renames some files in /var/lib/dhcpcd
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
- local new_rdm="${dbdir}"/rdm_monotonic
- if [ -e "${old_rdm}" ]; then
- if [ ! -e "${new_rdm}" ]; then
- cp -p "${old_rdm}" "${new_rdm}"
- fi
- old_files="${old_files} ${old_rdm}"
- fi
- local lease=
- for lease in "${dbdir}"/dhcpcd-*.lease*; do
- [ -f "$lease" ] || continue
- old_files="${old_files} ${lease}"
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
- [ -e "${dbdir}/${new_lease}" ] && continue
- cp "${lease}" "${dbdir}/${new_lease}"
- done
-
- # Warn about removing stale files
- if [ -n "${old_files}" ]; then
- elog
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
- elog "${EROOT%/}/etc to ${dbdir}"
- elog "and copied leases in ${dbdir} to new files with the
dhcpcd-"
- elog "prefix dropped."
- elog
- elog "You should remove these files if you don't plan on
reverting"
- elog "to an older version:"
- local old_file=
- for old_file in ${old_files}; do
- elog " ${old_file}"
- done
- fi
-
- if [ -z "$REPLACING_VERSIONS" ]; then
- elog
- elog "dhcpcd has zeroconf support active by default."
- elog "This means it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any
existing"
- elog "failover support you may have configured in your net
configuration."
- elog "This behaviour can be controlled with the noipv4ll
configuration"
- elog "file option or the -L command line switch."
- elog "See the dhcpcd and dhcpcd.conf man pages for more
details."
-
- elog
- elog "Dhcpcd has duid enabled by default, and this may cause
issues"
- elog "with some dhcp servers. For more information, see"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356";
- fi
-
- if ! has_version net-dns/bind-tools; then
- elog
- elog "If you activate the lookup-hostname hook to look up your
hostname"
- elog "using the dns, you need to install net-dns/bind-tools."
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
b/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
deleted file mode 100644
index bca59ecd5d7..00000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git";
- inherit git-r3
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd";
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure()
-{
- local dev hooks rundir
- use udev || dev="--without-dev --without-udev"
- hooks="--with-hook=ntp.conf"
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
- use kernel_linux && rundir="--rundir=${EPREFIX}/run"
- econf \
- --prefix="${EPREFIX}" \
- --libexecdir="${EPREFIX}/lib/dhcpcd" \
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \
- --localstatedir="${EPREFIX}/var" \
- ${rundir} \
- $(use_enable embedded) \
- $(use_enable ipv6) \
- ${dev} \
- CC="$(tc-getCC)" \
- ${hooks}
-}
-
-src_install()
-{
- default
- keepdir /var/lib/dhcpcd
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid
- local new_duid="${dbdir}"/duid
- if [ -e "${old_old_duid}" ]; then
- # Upgrade the duid file to the new format if needed
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ ! -e "${old_duid}" ]; then
- cp -p "${old_old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_old_duid}"
- fi
-
- # dhcpcd-7 moves the files out of /etc
- if [ -e "${old_duid}" ]; then
- if [ ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_duid}"
- fi
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret
- local new_secret="${dbdir}"/secret
- if [ -e "${old_secret}" ]; then
- if [ ! -e "${new_secret}" ]; then
- cp -p "${old_secret}" "${new_secret}"
- fi
- old_files="${old_files} ${old_secret}"
- fi
-
- # dhcpcd-7 renames some files in /var/lib/dhcpcd
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
- local new_rdm="${dbdir}"/rdm_monotonic
- if [ -e "${old_rdm}" ]; then
- if [ ! -e "${new_rdm}" ]; then
- cp -p "${old_rdm}" "${new_rdm}"
- fi
- old_files="${old_files} ${old_rdm}"
- fi
- local lease=
- for lease in "${dbdir}"/dhcpcd-*.lease*; do
- [ -f "$lease" ] || continue
- old_files="${old_files} ${lease}"
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
- [ -e "${dbdir}/${new_lease}" ] && continue
- cp "${lease}" "${dbdir}/${new_lease}"
- done
-
- # Warn about removing stale files
- if [ -n "${old_files}" ]; then
- elog
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
- elog "${EROOT%/}/etc to ${dbdir}"
- elog "and copied leases in ${dbdir} to new files with the
dhcpcd-"
- elog "prefix dropped."
- elog
- elog "You should remove these files if you don't plan on
reverting"
- elog "to an older version:"
- local old_file=
- for old_file in ${old_files}; do
- elog " ${old_file}"
- done
- fi
-
- if [ -z "$REPLACING_VERSIONS" ]; then
- elog
- elog "dhcpcd has zeroconf support active by default."
- elog "This means it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any
existing"
- elog "failover support you may have configured in your net
configuration."
- elog "This behaviour can be controlled with the noipv4ll
configuration"
- elog "file option or the -L command line switch."
- elog "See the dhcpcd and dhcpcd.conf man pages for more
details."
-
- elog
- elog "Dhcpcd has duid enabled by default, and this may cause
issues"
- elog "with some dhcp servers. For more information, see"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356";
- fi
-
- if ! has_version net-dns/bind-tools; then
- elog
- elog "If you activate the lookup-hostname hook to look up your
hostname"
- elog "using the dns, you need to install net-dns/bind-tools."
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
deleted file mode 100644
index bca59ecd5d7..00000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git";
- inherit git-r3
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd";
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure()
-{
- local dev hooks rundir
- use udev || dev="--without-dev --without-udev"
- hooks="--with-hook=ntp.conf"
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
- use kernel_linux && rundir="--rundir=${EPREFIX}/run"
- econf \
- --prefix="${EPREFIX}" \
- --libexecdir="${EPREFIX}/lib/dhcpcd" \
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \
- --localstatedir="${EPREFIX}/var" \
- ${rundir} \
- $(use_enable embedded) \
- $(use_enable ipv6) \
- ${dev} \
- CC="$(tc-getCC)" \
- ${hooks}
-}
-
-src_install()
-{
- default
- keepdir /var/lib/dhcpcd
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid
- local new_duid="${dbdir}"/duid
- if [ -e "${old_old_duid}" ]; then
- # Upgrade the duid file to the new format if needed
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ ! -e "${old_duid}" ]; then
- cp -p "${old_old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_old_duid}"
- fi
-
- # dhcpcd-7 moves the files out of /etc
- if [ -e "${old_duid}" ]; then
- if [ ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_duid}"
- fi
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret
- local new_secret="${dbdir}"/secret
- if [ -e "${old_secret}" ]; then
- if [ ! -e "${new_secret}" ]; then
- cp -p "${old_secret}" "${new_secret}"
- fi
- old_files="${old_files} ${old_secret}"
- fi
-
- # dhcpcd-7 renames some files in /var/lib/dhcpcd
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
- local new_rdm="${dbdir}"/rdm_monotonic
- if [ -e "${old_rdm}" ]; then
- if [ ! -e "${new_rdm}" ]; then
- cp -p "${old_rdm}" "${new_rdm}"
- fi
- old_files="${old_files} ${old_rdm}"
- fi
- local lease=
- for lease in "${dbdir}"/dhcpcd-*.lease*; do
- [ -f "$lease" ] || continue
- old_files="${old_files} ${lease}"
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
- [ -e "${dbdir}/${new_lease}" ] && continue
- cp "${lease}" "${dbdir}/${new_lease}"
- done
-
- # Warn about removing stale files
- if [ -n "${old_files}" ]; then
- elog
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
- elog "${EROOT%/}/etc to ${dbdir}"
- elog "and copied leases in ${dbdir} to new files with the
dhcpcd-"
- elog "prefix dropped."
- elog
- elog "You should remove these files if you don't plan on
reverting"
- elog "to an older version:"
- local old_file=
- for old_file in ${old_files}; do
- elog " ${old_file}"
- done
- fi
-
- if [ -z "$REPLACING_VERSIONS" ]; then
- elog
- elog "dhcpcd has zeroconf support active by default."
- elog "This means it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any
existing"
- elog "failover support you may have configured in your net
configuration."
- elog "This behaviour can be controlled with the noipv4ll
configuration"
- elog "file option or the -L command line switch."
- elog "See the dhcpcd and dhcpcd.conf man pages for more
details."
-
- elog
- elog "Dhcpcd has duid enabled by default, and this may cause
issues"
- elog "with some dhcp servers. For more information, see"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356";
- fi
-
- if ! has_version net-dns/bind-tools; then
- elog
- elog "If you activate the lookup-hostname hook to look up your
hostname"
- elog "using the dns, you need to install net-dns/bind-tools."
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
b/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
deleted file mode 100644
index bca59ecd5d7..00000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git";
- inherit git-r3
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd";
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure()
-{
- local dev hooks rundir
- use udev || dev="--without-dev --without-udev"
- hooks="--with-hook=ntp.conf"
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
- use kernel_linux && rundir="--rundir=${EPREFIX}/run"
- econf \
- --prefix="${EPREFIX}" \
- --libexecdir="${EPREFIX}/lib/dhcpcd" \
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \
- --localstatedir="${EPREFIX}/var" \
- ${rundir} \
- $(use_enable embedded) \
- $(use_enable ipv6) \
- ${dev} \
- CC="$(tc-getCC)" \
- ${hooks}
-}
-
-src_install()
-{
- default
- keepdir /var/lib/dhcpcd
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid
- local new_duid="${dbdir}"/duid
- if [ -e "${old_old_duid}" ]; then
- # Upgrade the duid file to the new format if needed
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ ! -e "${old_duid}" ]; then
- cp -p "${old_old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_old_duid}"
- fi
-
- # dhcpcd-7 moves the files out of /etc
- if [ -e "${old_duid}" ]; then
- if [ ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_duid}"
- fi
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret
- local new_secret="${dbdir}"/secret
- if [ -e "${old_secret}" ]; then
- if [ ! -e "${new_secret}" ]; then
- cp -p "${old_secret}" "${new_secret}"
- fi
- old_files="${old_files} ${old_secret}"
- fi
-
- # dhcpcd-7 renames some files in /var/lib/dhcpcd
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
- local new_rdm="${dbdir}"/rdm_monotonic
- if [ -e "${old_rdm}" ]; then
- if [ ! -e "${new_rdm}" ]; then
- cp -p "${old_rdm}" "${new_rdm}"
- fi
- old_files="${old_files} ${old_rdm}"
- fi
- local lease=
- for lease in "${dbdir}"/dhcpcd-*.lease*; do
- [ -f "$lease" ] || continue
- old_files="${old_files} ${lease}"
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
- [ -e "${dbdir}/${new_lease}" ] && continue
- cp "${lease}" "${dbdir}/${new_lease}"
- done
-
- # Warn about removing stale files
- if [ -n "${old_files}" ]; then
- elog
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
- elog "${EROOT%/}/etc to ${dbdir}"
- elog "and copied leases in ${dbdir} to new files with the
dhcpcd-"
- elog "prefix dropped."
- elog
- elog "You should remove these files if you don't plan on
reverting"
- elog "to an older version:"
- local old_file=
- for old_file in ${old_files}; do
- elog " ${old_file}"
- done
- fi
-
- if [ -z "$REPLACING_VERSIONS" ]; then
- elog
- elog "dhcpcd has zeroconf support active by default."
- elog "This means it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any
existing"
- elog "failover support you may have configured in your net
configuration."
- elog "This behaviour can be controlled with the noipv4ll
configuration"
- elog "file option or the -L command line switch."
- elog "See the dhcpcd and dhcpcd.conf man pages for more
details."
-
- elog
- elog "Dhcpcd has duid enabled by default, and this may cause
issues"
- elog "with some dhcp servers. For more information, see"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356";
- fi
-
- if ! has_version net-dns/bind-tools; then
- elog
- elog "If you activate the lookup-hostname hook to look up your
hostname"
- elog "using the dns, you need to install net-dns/bind-tools."
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
b/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
deleted file mode 100644
index bca59ecd5d7..00000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git";
- inherit git-r3
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd";
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure()
-{
- local dev hooks rundir
- use udev || dev="--without-dev --without-udev"
- hooks="--with-hook=ntp.conf"
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
- use kernel_linux && rundir="--rundir=${EPREFIX}/run"
- econf \
- --prefix="${EPREFIX}" \
- --libexecdir="${EPREFIX}/lib/dhcpcd" \
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \
- --localstatedir="${EPREFIX}/var" \
- ${rundir} \
- $(use_enable embedded) \
- $(use_enable ipv6) \
- ${dev} \
- CC="$(tc-getCC)" \
- ${hooks}
-}
-
-src_install()
-{
- default
- keepdir /var/lib/dhcpcd
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid
- local new_duid="${dbdir}"/duid
- if [ -e "${old_old_duid}" ]; then
- # Upgrade the duid file to the new format if needed
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ ! -e "${old_duid}" ]; then
- cp -p "${old_old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_old_duid}"
- fi
-
- # dhcpcd-7 moves the files out of /etc
- if [ -e "${old_duid}" ]; then
- if [ ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_duid}"
- fi
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret
- local new_secret="${dbdir}"/secret
- if [ -e "${old_secret}" ]; then
- if [ ! -e "${new_secret}" ]; then
- cp -p "${old_secret}" "${new_secret}"
- fi
- old_files="${old_files} ${old_secret}"
- fi
-
- # dhcpcd-7 renames some files in /var/lib/dhcpcd
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
- local new_rdm="${dbdir}"/rdm_monotonic
- if [ -e "${old_rdm}" ]; then
- if [ ! -e "${new_rdm}" ]; then
- cp -p "${old_rdm}" "${new_rdm}"
- fi
- old_files="${old_files} ${old_rdm}"
- fi
- local lease=
- for lease in "${dbdir}"/dhcpcd-*.lease*; do
- [ -f "$lease" ] || continue
- old_files="${old_files} ${lease}"
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
- [ -e "${dbdir}/${new_lease}" ] && continue
- cp "${lease}" "${dbdir}/${new_lease}"
- done
-
- # Warn about removing stale files
- if [ -n "${old_files}" ]; then
- elog
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
- elog "${EROOT%/}/etc to ${dbdir}"
- elog "and copied leases in ${dbdir} to new files with the
dhcpcd-"
- elog "prefix dropped."
- elog
- elog "You should remove these files if you don't plan on
reverting"
- elog "to an older version:"
- local old_file=
- for old_file in ${old_files}; do
- elog " ${old_file}"
- done
- fi
-
- if [ -z "$REPLACING_VERSIONS" ]; then
- elog
- elog "dhcpcd has zeroconf support active by default."
- elog "This means it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any
existing"
- elog "failover support you may have configured in your net
configuration."
- elog "This behaviour can be controlled with the noipv4ll
configuration"
- elog "file option or the -L command line switch."
- elog "See the dhcpcd and dhcpcd.conf man pages for more
details."
-
- elog
- elog "Dhcpcd has duid enabled by default, and this may cause
issues"
- elog "with some dhcp servers. For more information, see"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356";
- fi
-
- if ! has_version net-dns/bind-tools; then
- elog
- elog "If you activate the lookup-hostname hook to look up your
hostname"
- elog "using the dns, you need to install net-dns/bind-tools."
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
b/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
deleted file mode 100644
index bca59ecd5d7..00000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git";
- inherit git-r3
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd";
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure()
-{
- local dev hooks rundir
- use udev || dev="--without-dev --without-udev"
- hooks="--with-hook=ntp.conf"
- use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
- use kernel_linux && rundir="--rundir=${EPREFIX}/run"
- econf \
- --prefix="${EPREFIX}" \
- --libexecdir="${EPREFIX}/lib/dhcpcd" \
- --dbdir="${EPREFIX}/var/lib/dhcpcd" \
- --localstatedir="${EPREFIX}/var" \
- ${rundir} \
- $(use_enable embedded) \
- $(use_enable ipv6) \
- ${dev} \
- CC="$(tc-getCC)" \
- ${hooks}
-}
-
-src_install()
-{
- default
- keepdir /var/lib/dhcpcd
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid
- local new_duid="${dbdir}"/duid
- if [ -e "${old_old_duid}" ]; then
- # Upgrade the duid file to the new format if needed
- if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ ! -e "${old_duid}" ]; then
- cp -p "${old_old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_old_duid}"
- fi
-
- # dhcpcd-7 moves the files out of /etc
- if [ -e "${old_duid}" ]; then
- if [ ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
- old_files="${old_files} ${old_duid}"
- fi
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret
- local new_secret="${dbdir}"/secret
- if [ -e "${old_secret}" ]; then
- if [ ! -e "${new_secret}" ]; then
- cp -p "${old_secret}" "${new_secret}"
- fi
- old_files="${old_files} ${old_secret}"
- fi
-
- # dhcpcd-7 renames some files in /var/lib/dhcpcd
- local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
- local new_rdm="${dbdir}"/rdm_monotonic
- if [ -e "${old_rdm}" ]; then
- if [ ! -e "${new_rdm}" ]; then
- cp -p "${old_rdm}" "${new_rdm}"
- fi
- old_files="${old_files} ${old_rdm}"
- fi
- local lease=
- for lease in "${dbdir}"/dhcpcd-*.lease*; do
- [ -f "$lease" ] || continue
- old_files="${old_files} ${lease}"
- local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
- [ -e "${dbdir}/${new_lease}" ] && continue
- cp "${lease}" "${dbdir}/${new_lease}"
- done
-
- # Warn about removing stale files
- if [ -n "${old_files}" ]; then
- elog
- elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
- elog "${EROOT%/}/etc to ${dbdir}"
- elog "and copied leases in ${dbdir} to new files with the
dhcpcd-"
- elog "prefix dropped."
- elog
- elog "You should remove these files if you don't plan on
reverting"
- elog "to an older version:"
- local old_file=
- for old_file in ${old_files}; do
- elog " ${old_file}"
- done
- fi
-
- if [ -z "$REPLACING_VERSIONS" ]; then
- elog
- elog "dhcpcd has zeroconf support active by default."
- elog "This means it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any
existing"
- elog "failover support you may have configured in your net
configuration."
- elog "This behaviour can be controlled with the noipv4ll
configuration"
- elog "file option or the -L command line switch."
- elog "See the dhcpcd and dhcpcd.conf man pages for more
details."
-
- elog
- elog "Dhcpcd has duid enabled by default, and this may cause
issues"
- elog "with some dhcp servers. For more information, see"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=477356";
- fi
-
- if ! has_version net-dns/bind-tools; then
- elog
- elog "If you activate the lookup-hostname hook to look up your
hostname"
- elog "using the dns, you need to install net-dns/bind-tools."
- fi
-}
