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 2FF57139085 for ; Sat, 14 Jan 2017 21:54:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EF4C23421C; Sat, 14 Jan 2017 21:54:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E9F223421C for ; Sat, 14 Jan 2017 21:54:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE717341016 for ; Sat, 14 Jan 2017 21:54:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DFCA2735 for ; Sat, 14 Jan 2017 21:54:33 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1484430774.5cadafb0174f267b92e5ea9e2cc90c57352e14e7.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/updatedd/, net-dns/updatedd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/updatedd/files/set-socket-timeouts-for-ipserv.patch net-dns/updatedd/updatedd-2.6-r5.ebuild X-VCS-Directories: net-dns/updatedd/ net-dns/updatedd/files/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 5cadafb0174f267b92e5ea9e2cc90c57352e14e7 X-VCS-Branch: master Date: Sat, 14 Jan 2017 21:54:33 +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-Archives-Salt: 91adce77-af81-4190-bcef-37f56a8c174a X-Archives-Hash: cc00c62dd29125fce3f32ee068d75afb commit: 5cadafb0174f267b92e5ea9e2cc90c57352e14e7 Author: Michael Orlitzky gentoo org> AuthorDate: Sat Jan 14 21:16:26 2017 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Sat Jan 14 21:52:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cadafb0 net-dns/updatedd: new revision to set timeouts for ipserv.pl. This new revision adds a patch by Maciej S. Szmigiero that sets timeouts on the socket used by ipserv.pl. Doing so prevents updatedd from hanging when the other end of the socket goes AWOL. As a consequence, dev-perl/IO-Socket-Timeout was added to RDEPEND. The "~arm" and "~ppc" keywords had to be dropped to satisfy that new dependency. Gentoo-Bug: 605626 Package-Manager: portage-2.3.0 .../files/set-socket-timeouts-for-ipserv.patch | 36 ++++++++++++++++++++++ net-dns/updatedd/updatedd-2.6-r5.ebuild | 29 +++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/net-dns/updatedd/files/set-socket-timeouts-for-ipserv.patch b/net-dns/updatedd/files/set-socket-timeouts-for-ipserv.patch new file mode 100644 index 00000000..dbcf4c7 --- /dev/null +++ b/net-dns/updatedd/files/set-socket-timeouts-for-ipserv.patch @@ -0,0 +1,36 @@ +Patch by Maciej S. Szmigiero to prevent ipserv from hanging when the +other end of the connection goes AWOL. + +Gentoo-Bug: 602216 + +--- a/scripts/ipserv.pl.in 2005-03-06 22:21:36.000000000 +0100 ++++ b/scripts/ipserv.pl.in 2017-01-14 19:39:25.583277538 +0100 +@@ -20,6 +20,7 @@ + + use strict; + use IO::Socket; ++use IO::Socket::Timeout qw(IO::Socket::INET); + + my $ipv4_rex = qr/(?:\d{1,3}\.){3}\d{1,3}/imosx; + +@@ -128,7 +129,8 @@ + $socket = IO::Socket::INET->new(PeerAddr => $target->{url}, + PeerPort => $target->{port}, + Proto => "tcp", +- Type => SOCK_STREAM) ++ Type => SOCK_STREAM, ++ Timeout => 2 * 60) + or $retries--; + + } while(!defined($socket) && $retries != 0); +@@ -137,6 +139,10 @@ + die "could not connect to $target->{url}: $!"; + } + ++ IO::Socket::Timeout->enable_timeouts_on($socket); ++ $socket->read_timeout(2 * 60); ++ $socket->write_timeout(2 * 60); ++ + if(defined($target->{request})) { + print($socket $target->{request}); + } diff --git a/net-dns/updatedd/updatedd-2.6-r5.ebuild b/net-dns/updatedd/updatedd-2.6-r5.ebuild new file mode 100644 index 00000000..24685ac --- /dev/null +++ b/net-dns/updatedd/updatedd-2.6-r5.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="Dynamic DNS client with plugins for several dynamic dns services" +HOMEPAGE="https://savannah.nongnu.org/projects/updatedd/" +SRC_URI="https://savannah.nongnu.org/download/updatedd/${PN}_${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="dev-lang/perl + dev-perl/IO-Socket-Timeout" + +PATCHES=( + "${FILESDIR}/${P}-options.patch" + "${FILESDIR}/fix-ovh-DYNDNSHOST.patch" + "${FILESDIR}/respect-docdir.patch" + "${FILESDIR}/set-socket-timeouts-for-ipserv.patch" +) + +src_configure() { + econf --disable-static --docdir="/usr/share/doc/${PF}" +}