commit: 5870586a8e70d00fa5d5f6831ee77bbb0ec8e252 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jan 15 22:35:08 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 15 22:40:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5870586a
net-misc/netifrc: drop 0.7.1-r1, 0.7.1-r2, 0.7.2 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/netifrc/Manifest | 3 - .../files/netifrc-0.7.1-dhcpcd_args_tempfile.patch | 65 ------------------- .../netifrc-0.7.1-dhcpcd_pidfile_location.patch | 50 --------------- net-misc/netifrc/netifrc-0.7.1-r1.ebuild | 75 ---------------------- net-misc/netifrc/netifrc-0.7.1-r2.ebuild | 73 --------------------- net-misc/netifrc/netifrc-0.7.2.ebuild | 70 -------------------- 6 files changed, 336 deletions(-) diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest index 9ca3a9ffe611..8fc1d881195e 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -1,4 +1 @@ -DIST netifrc-0.7.1-patches-01.tar.xz 3356 BLAKE2B 35d34456af5fcb8ac35c80db13484b7b4712543e95441e6be4274934627216879ae6c8421ca2ef0b67a92ab39befb03a4b171a51a54e0e14c10bb6323cfaa4e9 SHA512 340cf6184196ee9648565cd2c652cd56eaab4f3f765baff889f736cca05a5ca12a63de5d864c0f9fedc9337f88fd25dac0224118dab39ce7542cd0977f40db6f -DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057 -DIST netifrc-0.7.2.tar.gz 84332 BLAKE2B ba379f34a7986f75f73f291ad69dff2b58036eb439ba8610f5fbddc3d1df9430e0560683477544f11bcd4fb2dd662ed09ab0797a9ce9f734f4b5dcf5db8006c8 SHA512 1d588b638331b3822e9c7ff7f6118a540f20366a662ebf4d05c4c1794536fcb5ee25b57e8cf7b631d90788883c3b405d5b9ac460443d5184216d805f956df07e DIST netifrc-0.7.3.tar.gz 84770 BLAKE2B 075440bfd81e4dedd406d9555a18f530b07a47f9268130ebcca6d43d35e9cc5f01105a3eb0ddc084a16e17912aa10e378833b1eef1defd2fc6b22f817cd220bd SHA512 a82ac6835c15763becb5845a8c8d90dfd8d6c289ea5e00b0d7ae332d3e7ad6797f0fdcbf27bb9f44ff345c98884cdfa13210c76089585b8dd9970ded5f6236d8 diff --git a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch b/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch deleted file mode 100644 index 6ad40c860f96..000000000000 --- a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 586579d5c9fad63eb8780c556f34b80d0302e6b9 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Fri, 22 May 2020 10:09:22 +0200 -Subject: [PATCH] net/dhcpcd.sh: Put user args into a temp file - -So we still use the correct PID even if the user has changed his -configuration between start and stop. - -Signed-off-by: Lars Wendler <[email protected]> ---- - net/dhcpcd.sh | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh -index c0639e0..dcc6817 100644 ---- a/net/dhcpcd.sh -+++ b/net/dhcpcd.sh -@@ -16,11 +16,14 @@ _config_vars="$_config_vars dhcp dhcpcd" - - dhcpcd_start() - { -- # check for pidfile after we gathered the user's opts because they can -+ # check for pidfile after we gathered the user's args because they can - # alter the pidfile's name (#718114) -- local args= opt= pidfile= opts= new=true -+ # Save the args into a file so dhcpcd_stop can later re-use the very -+ # same args later. -+ local args= opt= pidfile= opts= new=true argsfile=/run/netifrc_dhcpcd_${IFACE}_args - eval args=\$dhcpcd_${IFVAR} - [ -z "${args}" ] && args=${dhcpcd} -+ echo "${args}" > ${argsfile} - pidfile="$(dhcpcd -P ${args} ${IFACE})" - - # Get our options -@@ -78,12 +81,16 @@ dhcpcd_start() - - dhcpcd_stop() - { -- local args= pidfile= opts= sig=SIGTERM -+ local args= pidfile= opts= sig=SIGTERM argsfile=/run/netifrc_dhcpcd_${IFACE}_args - -- # check for pidfile after we gathered the user's opts because they can -+ # check for pidfile after we gathered the user's args because they can - # alter the pidfile's name (#718114) -- eval args=\$dhcpcd_${IFVAR} -- [ -z "${args}" ] && args=${dhcpcd} -+ if [ -f "${argsfile}" ] ; then -+ args="$(cat ${argsfile})" -+ else -+ eval args=\$dhcpcd_${IFVAR} -+ [ -z "${args}" ] && args=${dhcpcd} -+ fi - pidfile="$(dhcpcd -P ${args} ${IFACE})" - [ ! -f "${pidfile}" ] && return 0 - -@@ -94,5 +101,6 @@ dhcpcd_stop() - *" release "*) dhcpcd -k "${IFACE}" ;; - *) dhcpcd -x "${IFACE}" ;; - esac -+ [ -f "${argsfile}" ] && rm -f "${argsfile}" - eend $? - } --- -2.27.0.rc0 - diff --git a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch b/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch deleted file mode 100644 index 154e7a7696a0..000000000000 --- a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c29dffb14e321d927196a9b39b545004e632d3c4 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Thu, 21 May 2020 18:35:32 +0200 -Subject: [PATCH] net/dhcpcd.sh: fetch pidfile location from dhcpcd - -There's a -P switch for this but we also need to take into account the --4 and -6 switches as they both alter the pidfile's name. - -Bug: https://bugs.gentoo.org/718114 -Signed-off-by: Lars Wendler <[email protected]> ---- - net/dhcpcd.sh | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh -index 0a306b8..c0639e0 100644 ---- a/net/dhcpcd.sh -+++ b/net/dhcpcd.sh -@@ -16,9 +16,12 @@ _config_vars="$_config_vars dhcp dhcpcd" - - dhcpcd_start() - { -- local args= opt= opts= pidfile="/run/dhcpcd-${IFACE}.pid" new=true -+ # check for pidfile after we gathered the user's opts because they can -+ # alter the pidfile's name (#718114) -+ local args= opt= pidfile= opts= new=true - eval args=\$dhcpcd_${IFVAR} - [ -z "${args}" ] && args=${dhcpcd} -+ pidfile="$(dhcpcd -P ${args} ${IFACE})" - - # Get our options - eval opts=\$dhcp_${IFVAR} -@@ -75,7 +78,13 @@ dhcpcd_start() - - dhcpcd_stop() - { -- local pidfile="/run/dhcpcd-${IFACE}.pid" opts= sig=SIGTERM -+ local args= pidfile= opts= sig=SIGTERM -+ -+ # check for pidfile after we gathered the user's opts because they can -+ # alter the pidfile's name (#718114) -+ eval args=\$dhcpcd_${IFVAR} -+ [ -z "${args}" ] && args=${dhcpcd} -+ pidfile="$(dhcpcd -P ${args} ${IFACE})" - [ ! -f "${pidfile}" ] && return 0 - - ebegin "Stopping dhcpcd on ${IFACE}" --- -2.27.0.rc0 - diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild deleted file mode 100644 index 8e7932308d7c..000000000000 --- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd udev - -DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"; - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git"; - #EGIT_REPO_URI="https://github.com/gentoo/${PN}"; # Alternate - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="" - -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}/${PN}-0.7.1-dhcpcd_pidfile_location.patch" - "${FILESDIR}/${PN}-0.7.1-dhcpcd_args_tempfile.patch" -) - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - einfo "Producing ChangeLog from Git history" - GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog - fi - - default -} - -src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" - - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO - - # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" - sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die - systemd_newunit "${T}/net_at.service" '[email protected]' - dosym "${UNIT_DIR#${EPREFIX}}/[email protected]" "${UNIT_DIR#${EPREFIX}}/[email protected]" -} - -pkg_postinst() { - if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then - elog "The network configuration scripts will use dhcp by" - elog "default to set up your interfaces." - elog "If you need to set up something more complete, see" - elog "${EROOT}/usr/share/doc/${P}/README" - fi -} diff --git a/net-misc/netifrc/netifrc-0.7.1-r2.ebuild b/net-misc/netifrc/netifrc-0.7.1-r2.ebuild deleted file mode 100644 index a4939169d562..000000000000 --- a/net-misc/netifrc/netifrc-0.7.1-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd udev - -DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"; - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git"; - #EGIT_REPO_URI="https://github.com/gentoo/${PN}"; # Alternate - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"; - SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="" - -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - einfo "Producing ChangeLog from Git history" - GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog - fi - - eapply "${WORKDIR}"/patches - - default -} - -src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" - - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO - - # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" - sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die - systemd_newunit "${T}/net_at.service" '[email protected]' - dosym "${UNIT_DIR#${EPREFIX}}/[email protected]" "${UNIT_DIR#${EPREFIX}}/[email protected]" -} - -pkg_postinst() { - if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then - elog "The network configuration scripts will use dhcp by" - elog "default to set up your interfaces." - elog "If you need to set up something more complete, see" - elog "${EROOT}/usr/share/doc/${P}/README" - fi -} diff --git a/net-misc/netifrc/netifrc-0.7.2.ebuild b/net-misc/netifrc/netifrc-0.7.2.ebuild deleted file mode 100644 index 0e9cf97453c8..000000000000 --- a/net-misc/netifrc/netifrc-0.7.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd udev - -DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"; - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git"; - #EGIT_REPO_URI="https://github.com/gentoo/${PN}"; # Alternate - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="" - -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - einfo "Producing ChangeLog from Git history" - GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog - fi - - default -} - -src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" - - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO - - # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" - sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die - systemd_newunit "${T}/net_at.service" '[email protected]' - dosym "${UNIT_DIR#${EPREFIX}}/[email protected]" "${UNIT_DIR#${EPREFIX}}/[email protected]" -} - -pkg_postinst() { - if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then - elog "The network configuration scripts will use dhcp by" - elog "default to set up your interfaces." - elog "If you need to set up something more complete, see" - elog "${EROOT}/usr/share/doc/${P}/README" - fi -}
