diff options
author | William Hubbs <william.hubbs@sony.com> | 2019-07-30 14:39:00 -0500 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2019-07-30 14:41:14 -0500 |
commit | 6d085720407f032e08f01c9e4bb3f576dc3d461c (patch) | |
tree | b4e3caf453854e1b1cc7de3c5a95b2e1bcfe7811 | |
parent | dev-python/rst-linker: keyword 1.11 on ~ppc64 (diff) | |
download | gentoo-6d085720407f032e08f01c9e4bb3f576dc3d461c.tar.gz gentoo-6d085720407f032e08f01c9e4bb3f576dc3d461c.tar.bz2 gentoo-6d085720407f032e08f01c9e4bb3f576dc3d461c.zip |
net-misc/dhcpcd: remove broken 8.0.1 release
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: William Hubbs <williamh@gentoo.org>
-rw-r--r-- | net-misc/dhcpcd/Manifest | 1 | ||||
-rw-r--r-- | net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild | 149 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-8.0.1-delete_tmpfiles.patch | 34 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch | 27 |
4 files changed, 0 insertions, 211 deletions
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index d1db7a60e3a6..d2ab3bc59ddf 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,3 +1,2 @@ DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f -DIST dhcpcd-8.0.1.tar.xz 221716 BLAKE2B 597831ed9a965170d0dc9ffdaa8ab34e209b14fa6183ed7a0b915f545d654db32d0994eb9e6f12953f5b81220abfc186ac72da1cd3e60f8b0cdee21da4be56dd SHA512 2931345fb50b63a49ee97b290dbb236895dd13a19ce17bf40b50797cf93ea959272de698718593f882ba0c35e2f733b5476135759f46bd04a8e8f11e81ba9f3f DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4 diff --git a/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild deleted file mode 100644 index 2c0d5a53ff00..000000000000 --- a/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git" -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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -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}" - -PATCHES=( - "${FILESDIR}/${P}-delete_tmpfiles.patch" - "${FILESDIR}/${P}-fix_check_for_open_memstream.patch" -) - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable embedded) - $(use_enable ipv6) - $(usex elibc_glibc '--with-hook=yp.conf' '') - $(usex kernel_linux '--rundir=${EPREFIX}/run' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -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_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_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_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_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - 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/files/dhcpcd-8.0.1-delete_tmpfiles.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.1-delete_tmpfiles.patch deleted file mode 100644 index 0bc625ac11d0..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-8.0.1-delete_tmpfiles.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 79846b358f6ea8d0a6027ee0ba38342a730065b0 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 28 Jul 2019 11:49:17 +0100 -Subject: script: ensure that tmp files are removed - -fopen creates a new stream which will use a new fd. -Why using fdopen, the new stream will use the same fd, so when -it's closed the tmp file will really unlink. ---- - src/script.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/script.c b/src/script.c -index 1863a661..74aef1b1 100644 ---- a/src/script.c -+++ b/src/script.c -@@ -213,10 +213,11 @@ make_env(const struct interface *ifp, const char *reason) - if (tmpfd == -1) - goto eexit; - unlink(tmpfile); -- fp = fopen(tmpfile, "w+"); -- close(tmpfd); -- if (fp == NULL) -+ fp = fdopen(tmpfd, "w+"); -+ if (fp == NULL) { -+ close(tmpfd); - goto eexit; -+ } - #endif - - #ifdef INET --- -cgit v1.2.1 - diff --git a/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch deleted file mode 100644 index 89ed2afa9871..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fa7f0d1e0a57bfaca49e1cfdc3d292ef1d68001a Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 28 Jul 2019 12:53:03 +0100 -Subject: configure: Fix test for open_memstream - -glibc-2.19 needs the return value testing.... ---- - configure | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure b/configure -index d25eec56..50058520 100755 ---- a/configure -+++ b/configure -@@ -747,8 +747,7 @@ if [ -z "$OPEN_MEMSTREAM" ]; then - cat <<EOF >_open_memstream.c - #include <stdio.h> - int main(void) { -- open_memstream(NULL, NULL); -- return 0; -+ return open_memstream(NULL, NULL) != NULL ? 0 : 1; - } - EOF - if $XCC _open_memstream.c -o _open_memstream 2>&3; then --- -cgit v1.2.1 - |