net-misc/dhcpcd: Drop old
authorMikle Kolyada <zlogene@gentoo.org>
Fri, 25 Jan 2019 17:17:51 +0000 (20:17 +0300)
committerMikle Kolyada <zlogene@gentoo.org>
Fri, 25 Jan 2019 17:17:51 +0000 (20:17 +0300)
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

net-misc/dhcpcd/Manifest
net-misc/dhcpcd/dhcpcd-6.11.5.ebuild [deleted file]
net-misc/dhcpcd/dhcpcd-7.0.6.ebuild [deleted file]
net-misc/dhcpcd/dhcpcd-7.0.7.ebuild [deleted file]

index 4ccc0a2ffe18712f2ec3465c89374bc1c3283a47..45a78185d9296fec3f6cd8cfa2cafdf2abfdeff9 100644 (file)
@@ -1,7 +1,4 @@
 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.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
-DIST dhcpcd-7.0.6.tar.xz 210392 BLAKE2B c343ebfd42cfd0c76d3524cab799d05e3ec0c1735fde1703613a60cd4e3a656d4a1428ed8a84f7d66ef4d39ffb519ab7eabf4d7c765e6dec93386ccf7d84f363 SHA512 5885739e60d6eb4fded117cb87f59a073ae6e8da8454dee56d8e7c5d33778e413e121d28a22163ebf31e4508a21d3a21c1d17ee6d4551081db2ee8e5384d44c9
-DIST dhcpcd-7.0.7.tar.xz 210572 BLAKE2B 4ba70c32fe012930928a8c3363c8fe3f655943883ff521fcfb3b5b75950be2e7432ca79e52298a119fc70c1dd8095a28f59d4cabe62da3ad8179c0dc73af0aac SHA512 04c316f7b180bbbf48aa58273d3a28d659824e474d1ce48325f610ed2c5d2a01117f5b65b4a9697f3e8e1b85d4bdcc0b8ab75a928a8cd5723a865d8c0a065269
 DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953
 DIST dhcpcd-7.1.0.tar.xz 211496 BLAKE2B ca919723f8f205ad24e28751024ff68cb4d1e86d056d47b1390a8e81cbb62d61e6a09d50d95756968d43383420e479846a4527095532d2761e26c6f4d780988b SHA512 28d2b5ff8cb372df6432becdbfeedaea945608b14374b6af8938936efdaa73d8d8f1cb3f37d2f440137c2f6988f72ed8de6d1bda43d65d4fe22efdd0a1662c24
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
deleted file mode 100644 (file)
index 3880ad0..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
-       FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
-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 ~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}"
-
-if [[ ${PV} == "9999" ]]; then
-       DEPEND+=" dev-vcs/fossil"
-
-       src_unpack()
-       {
-               local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
-               local repo=${distdir}/fossil/${PN}.fossil
-
-               addwrite "${distdir}"
-
-               if [[ -e "${repo}" ]]; then
-                       fossil pull "${FOSSIL_URI}" -R "${repo}" || die
-               else
-                       mkdir -p "${distdir}/fossil" || die
-                       fossil clone "${FOSSIL_URI}" "${repo}" || die
-               fi
-
-               mkdir -p "${S}" || die
-               cd "${S}" || die
-               fossil open "${repo}" || die
-       }
-fi
-
-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()
-{
-       # Upgrade the duid file to the new format if needed
-       local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-       local new_duid="${ROOT}"/etc/dhcpcd.duid
-       if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-               sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-       fi
-
-       # Move the duid to /etc, a more sensible location
-       if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-               cp -p "${old_duid}" "${new_duid}"
-       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.6.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.6.ebuild
deleted file mode 100644 (file)
index a146481..0000000
+++ /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 ~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.7.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild
deleted file mode 100644 (file)
index a146481..0000000
+++ /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 ~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
-}