[gentoo-commits] repo/gentoo:master commit in: net-dns/ddclient/, net-dns/ddclient/files/

[Aaron W. Swenson]

commit:     6b82ba22d3824a3e3b4068bb19dad94c71e5a48b
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 12:55:54 2019 +0000
Commit:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 12:56:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b82ba22

net-dns/ddclient: Cleanup

Closes: https://bugs.gentoo.org/664826
Closes: https://bugs.gentoo.org/650406
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>

 net-dns/ddclient/Manifest                 |  1 -
 net-dns/ddclient/ddclient-3.8.1-r5.ebuild | 55 ---------------------------
 net-dns/ddclient/ddclient-3.9.0-r1.ebuild | 63 -------------------------------
 net-dns/ddclient/files/cmd-over-cfg.patch | 11 ------
 net-dns/ddclient/files/ddclient.confd-r1  |  2 -
 net-dns/ddclient/files/ddclient.initd-r3  | 57 ----------------------------
 net-dns/ddclient/files/ddclient.initd-r5  | 21 -----------
 net-dns/ddclient/files/ddclient.service   | 12 ------
 net-dns/ddclient/files/iproute2.patch     | 30 ---------------
 net-dns/ddclient/metadata.xml             |  1 -
 10 files changed, 253 deletions(-)

diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index f48954925d5..65a72add02c 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -1,2 +1 @@
-DIST ddclient-3.8.1.tar.gz 48600 BLAKE2B a945adcb42bd298422c71c0eea6bea36c6b266ce39e97ebfd833b29819a2f30f2651d7f7b17dbfc0720b6209d0c0ed94bf2673624777f07e6de83a7081471995 SHA512 d6722582dffe0c5a806176f24bd3d9117bc1210ea0137aa92138390be16e67d47b746777dc431282a664849c91626969a5e267777126bac03304c7aa34a9dad7
 DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e115edc27a1d5950a929670d67d5c703b09f51e7e82e977ccfb544d115da177b0ac8dc06a76a800aa207cde5a42d SHA512 ae314c96a37dd90256d6acf62f4a4523b72f540194131e351a032239b00b4520351f6549d3b20a9209fe49ccc6de7ce158ffa8635d341066ea71b789dc667438

diff --git a/net-dns/ddclient/ddclient-3.8.1-r5.ebuild b/net-dns/ddclient/ddclient-3.8.1-r5.ebuild
deleted file mode 100644
index f4c2cb5db01..00000000000
--- a/net-dns/ddclient/ddclient-3.8.1-r5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils systemd user
-
-DESCRIPTION="Perl updater client for dynamic DNS services"
-HOMEPAGE="http://ddclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="hardened"
-
-RDEPEND=">=dev-lang/perl-5.1
-		 dev-perl/Digest-SHA1
-		 dev-perl/IO-Socket-SSL
-		 hardened? ( sys-apps/iproute2 )
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	# Remove pid line, because it is specified in /etc/init.d/ddclient
-	ebegin "Removing PID setup from ${PN}.conf"
-	if ! sed '/^pid/d' -i "sample-etc_${PN}.conf"; then
-		eerror "Failed to remove pid from /etc/${PN}/${PN}.conf"
-	fi
-	eend $?
-
-	use hardened && epatch "${FILESDIR}/iproute2.patch"
-
-	epatch "${FILESDIR}/cmd-over-cfg.patch"
-}
-
-src_install() {
-	dosbin ${PN}
-	dodoc Change* COPYRIGHT README* RELEASENOTE sample*
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	keepdir /var/cache/${PN}
-	fowners -R ${PN}:${PN} /var/cache/${PN}
-
-	insinto /etc/${PN}
-	insopts -m 0600 -o ${PN} -g ${PN}
-	newins sample-etc_${PN}.conf ${PN}.conf
-	newins sample-etc_${PN}.conf ${PN}.conf.sample
-	fowners -R ${PN}:${PN} /etc/${PN}
-}

diff --git a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
deleted file mode 100644
index 5176c0ebc34..00000000000
--- a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd user
-
-DESCRIPTION="Perl client used to update dynamic DNS entries"
-HOMEPAGE="https://sourceforge.net/projects/ddclient/"
-SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples iproute2"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Data-Validate-IP
-	dev-perl/Digest-SHA1
-	dev-perl/IO-Socket-INET6
-	dev-perl/IO-Socket-SSL
-	virtual/perl-Digest-SHA
-	virtual/perl-JSON-PP
-	iproute2? ( sys-apps/iproute2 )"
-
-pkg_setup() {
-	enewgroup ddclient
-	enewuser ddclient -1 -1 -1 ddclient
-}
-
-src_prepare() {
-	# Remove PID setting, to reliably setup the environment for the init script
-	sed -e '/^pid/d' -i sample-etc_ddclient.conf || die
-
-	# Remove windows executable
-	if use examples; then
-		rm sample-etc_dhcpc_dhcpcd-eth0.exe || die
-	fi
-
-	# Use sys-apps/iproute2 instead of sys-apps/net-tools
-	use iproute2 && eapply "${FILESDIR}"/${P}-use_iproute2.patch
-
-	default
-}
-
-src_install() {
-	dobin ddclient
-
-	insinto /etc/ddclient
-	insopts -m 0600 -o ddclient -g ddclient
-	newins sample-etc_ddclient.conf ddclient.conf
-
-	newinitd "${FILESDIR}"/ddclient.initd-r5 ddclient
-	systemd_newunit "${FILESDIR}"/ddclient.service-r1 ddclient.service
-	systemd_newtmpfilesd "${FILESDIR}"/ddclient.tmpfiles ddclient.conf
-
-	dodoc Change* README* RELEASENOTE TODO UPGRADE
-
-	if use examples; then
-		docinto examples
-		dodoc sample-*
-	fi
-}

diff --git a/net-dns/ddclient/files/cmd-over-cfg.patch b/net-dns/ddclient/files/cmd-over-cfg.patch
deleted file mode 100644
index 9033873fde7..00000000000
--- a/net-dns/ddclient/files/cmd-over-cfg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ddclient.old	2011-11-13 10:14:59.957846596 -0500
-+++ ddclient	2011-11-13 10:18:33.864245944 -0500
-@@ -773,7 +773,7 @@
- 		foreach my $h (sort keys %config) {
- 			next if $config{$h}{'protocol'} ne lc($s);
- 			$examined{$h} = 1;
--			my $use = $config{$h}{'use'} || opt('use');
-+			my $use = opt('use') || $config{$h}{'use'};
- 			local $opt{$use} = $config{$h}{$use} if $config{$h}{$use};
- 			# bug #13: we should only do this once
- 			# use isn't enough, we have to save the origin to.

diff --git a/net-dns/ddclient/files/ddclient.confd-r1 b/net-dns/ddclient/files/ddclient.confd-r1
deleted file mode 100644
index 69ad0eeff87..00000000000
--- a/net-dns/ddclient/files/ddclient.confd-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-# No need to specify a pid in /etc/ddclient/ddclient.conf
-#PIDFILE=/var/run/ddclient/ddclient.pid

diff --git a/net-dns/ddclient/files/ddclient.initd-r3 b/net-dns/ddclient/files/ddclient.initd-r3
deleted file mode 100644
index e0606a60b11..00000000000
--- a/net-dns/ddclient/files/ddclient.initd-r3
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ -d /run ] ; then
-	PIDFILE=${PIDFILE:-/run/ddclient/ddclient.pid}
-else
-	PIDFILE=${PIDFILE:-/var/run/ddclient/ddclient.pid}
-fi
-
-depend() {
-	before cron
-	need net
-	use dns logger squid
-}
-
-checkconfig() {
-	local conf="/etc/ddclient/ddclient.conf"
-
-	if [ -e "${conf}" ] ; then
-		if [ -n "$(find /etc/ddclient -maxdepth 1 -name ddclient.conf -perm +0044)" ] ; then
-			eerror "${conf} must not be world or group readable. Try:"
-			eerror "    chmod 600 ${conf}"
-			eerror "    chown ddclient:ddclient ${conf}"
-			return 1
-		fi
-	else
-		eerror "${conf} is needed to run ddclient"
-		eerror "There is a sample file in /etc/ddclient/"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	local piddir=$(dirname ${PIDFILE})
-	if [ ! -d ${piddir} ] ; then
-		ebegin "Making ${piddir}"
-		mkdir -p ${piddir}
-		eend $?
-		ebegin "Changing permissions of ${piddir}"
-		chown ddclient:ddclient ${piddir}
-		eend $?
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --user ddclient --exec /usr/sbin/ddclient \
-		--name ddclient --pidfile ${PIDFILE} -- -pid=${PIDFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --signal USR1 --pidfile ${PIDFILE}
-	eend $?
-}

diff --git a/net-dns/ddclient/files/ddclient.initd-r5 b/net-dns/ddclient/files/ddclient.initd-r5
deleted file mode 100644
index a2284a27c1f..00000000000
--- a/net-dns/ddclient/files/ddclient.initd-r5
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="DDclient"
-pidfile="/run/ddclient/${RC_SVCNAME}.pid"
-
-command="/usr/bin/ddclient"
-command_args="-pid ${pidfile}"
-command_group="ddclient"
-command_user="ddclient"
-
-depend() {
-	use dns logger
-}
-
-start_pre() {
-	checkpath -f -m 0600 -o ${command_user}:${command_group} /etc/ddclient/ddclient.conf
-	checkpath -d -m 0700 -o ${command_user}:${command_group} /run/ddclient
-	checkpath -d -m 0700 -o ${command_user}:${command_group} /var/cache/ddclient
-}

diff --git a/net-dns/ddclient/files/ddclient.service b/net-dns/ddclient/files/ddclient.service
deleted file mode 100644
index e2d3608d44d..00000000000
--- a/net-dns/ddclient/files/ddclient.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Dynamic DNS Update Client
-After=network.target
-ConditionPathExists=/etc/ddclient/ddclient.conf
-
-[Service]
-ExecStart=/usr/sbin/ddclient --foreground
-User=ddclient
-Group=ddclient
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-dns/ddclient/files/iproute2.patch b/net-dns/ddclient/files/iproute2.patch
deleted file mode 100644
index f81dd8c00d8..00000000000
--- a/net-dns/ddclient/files/iproute2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u a/ddclient b/ddclient
---- a/ddclient	2011-07-11 17:04:21.000000000 -0400
-+++ b/ddclient	2011-08-12 20:13:15.980466303 -0400
-@@ -588,7 +588,7 @@
-     [ "ip",          "=s", "-ip address           : set the IP address to 'address'" ],
-     "",			     
-     [ "if",          "=s", "-if interface         : obtain IP address from 'interface'" ],
--    [ "if-skip",     "=s", "-if-skip pattern      : skip any IP addresses before 'pattern' in the output of ifconfig {if}" ],
-+    [ "if-skip",     "=s", "-if-skip pattern      : skip any IP addresses before 'pattern' in the output of ip addr show {if}" ],
-     "",
-     [ "web",         "=s", "-web provider|url     : obtain IP address from provider's IP checking page" ],
-     [ "web-skip",    "=s", "-web-skip pattern     : skip any IP addresses before 'pattern' on the web provider|url" ],
-@@ -1316,7 +1316,7 @@
- 
-     {
- 	local $opt{'use'} = 'if';
--	foreach my $if (grep {/^[a-zA-Z]/} `ifconfig -a`) {
-+	foreach my $if (grep {/^[a-zA-Z]/} `ip addr show`) {
- 	    $if =~ s/:?\s.*//is;
- 	    local $opt{'if'} = $if;
- 	    printf "use=if, if=%s address is %s\n", opt('if'), define(get_ip('if'), 'NOT FOUND');
-@@ -1937,7 +1937,7 @@
- 
-     } elsif ($use eq 'if') {
- 	$skip  = opt('if-skip', $h)  || '';
--	$reply = `ifconfig $arg 2> /dev/null`;
-+	$reply = `ip addr show $arg 2> /dev/null`;
- 	$reply = '' if $?;
- 
-     } elsif ($use eq 'cmd') {

diff --git a/net-dns/ddclient/metadata.xml b/net-dns/ddclient/metadata.xml
index 2d82a2acf9c..a65cccd3f08 100644
--- a/net-dns/ddclient/metadata.xml
+++ b/net-dns/ddclient/metadata.xml
@@ -21,7 +21,6 @@
 	</longdescription>
 	<use>
 		<flag name="examples">Install various example files, like for cron.</flag>
-		<flag name="hardened">Use iproute2 instead of ifconfig to grab an IP address</flag>
 		<flag name="iproute2">Use <pkg>sys-apps/iproute2</pkg> instead of <pkg>sys-apps/net-tools</pkg> for interaction.</flag>
 	</use>
 	<upstream>