From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7976E138334 for ; Sat, 20 Apr 2019 23:20:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADC2BE086D; Sat, 20 Apr 2019 23:20:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EB04E0864 for ; Sat, 20 Apr 2019 23:20:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C9DB341F9E for ; Sat, 20 Apr 2019 08:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9E775B0 for ; Sat, 20 Apr 2019 08:21:34 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1555748490.e3d6440e6633a833bc64e06511cf06c4938eaf3a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcpcd/Manifest net-misc/dhcpcd/dhcpcd-6.11.3.ebuild net-misc/dhcpcd/dhcpcd-7.1.0.ebuild X-VCS-Directories: net-misc/dhcpcd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e3d6440e6633a833bc64e06511cf06c4938eaf3a X-VCS-Branch: master Date: Sat, 20 Apr 2019 08:21:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e81beda9-41f2-4abe-b418-6397e98566d1 X-Archives-Hash: 289509cb149d88e0ec215ceb4bf34508 commit: e3d6440e6633a833bc64e06511cf06c4938eaf3a Author: Lars Wendler gentoo org> AuthorDate: Sat Apr 20 08:20:59 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Apr 20 08:21:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d6440e net-misc/dhcpcd: Removed old. Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> net-misc/dhcpcd/Manifest | 2 - net-misc/dhcpcd/dhcpcd-6.11.3.ebuild | 114 --------------------------- net-misc/dhcpcd/dhcpcd-7.1.0.ebuild | 149 ----------------------------------- 3 files changed, 265 deletions(-) diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 417bde5e8fe..46dec13be6d 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,6 +1,4 @@ -DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34 DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953 -DIST dhcpcd-7.1.0.tar.xz 211496 BLAKE2B ca919723f8f205ad24e28751024ff68cb4d1e86d056d47b1390a8e81cbb62d61e6a09d50d95756968d43383420e479846a4527095532d2761e26c6f4d780988b SHA512 28d2b5ff8cb372df6432becdbfeedaea945608b14374b6af8938936efdaa73d8d8f1cb3f37d2f440137c2f6988f72ed8de6d1bda43d65d4fe22efdd0a1662c24 DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4 DIST dhcpcd-7.2.0.tar.xz 212532 BLAKE2B c8768df8006d517d0082f08c6ceebfe5a31695485d32d477acc1c4b9bfce8541110388f186c2ef94642e0692c279fc6d89239cbd8ac07d6ed248e67721c07db5 SHA512 2ab7df53ed42cd7a274bbc9cfb9dca43a8615d9044c0e9f460c41f064ad012b436bf2fe2648dd2738e66aaefc72412cad6c59444631b650f942cba168127a79d diff --git a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild deleted file mode 100644 index c355512e259..00000000000 --- a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild +++ /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.1.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild deleted file mode 100644 index a1f2efc1cab..00000000000 --- a/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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 -}