* [gentoo-commits] repo/gentoo:master commit in: net-dns/updatedd/, net-dns/updatedd/files/
@ 2017-01-14 6:32 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2017-01-14 6:32 UTC (permalink / raw
To: gentoo-commits
commit: 4929eb7a122bb8d6479d8f603a38ac16ffbc8f51
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 06:15:51 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 06:32:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4929eb7a
net-dns/updatedd: add another patch to respect --docdir.
Package-Manager: portage-2.3.0
net-dns/updatedd/files/respect-docdir.patch | 33 ++++++++++++++++++++++
...datedd-2.6-r2.ebuild => updatedd-2.6-r3.ebuild} | 6 ++--
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/net-dns/updatedd/files/respect-docdir.patch b/net-dns/updatedd/files/respect-docdir.patch
new file mode 100644
index 00000000..504220a
--- /dev/null
+++ b/net-dns/updatedd/files/respect-docdir.patch
@@ -0,0 +1,33 @@
+From 8e484c4b0ceac8e7c37492fdf5e5b89f18451277 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 14 Jan 2017 01:06:48 -0500
+Subject: [PATCH 1/1] Use the autotools "docdir" in Documentation/Makefile.in.
+
+---
+ Documentation/Makefile.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
+index 8c87281..c213c09 100644
+--- a/Documentation/Makefile.in
++++ b/Documentation/Makefile.in
+@@ -325,12 +325,12 @@ uninstall-am: uninstall-info-am uninstall-local
+
+
+ install-data-local:
+- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/updatedd
+- $(INSTALL) $(srcdir)/updatedd-*.pdf $(DESTDIR)$(datadir)/doc/updatedd
+- $(INSTALL) $(srcdir)/updatedd-pppd-rc $(DESTDIR)$(datadir)/doc/updatedd
++ $(INSTALL) -d $(DESTDIR)$(docdir)
++ $(INSTALL) $(srcdir)/updatedd-*.pdf $(DESTDIR)$(docdir)
++ $(INSTALL) $(srcdir)/updatedd-pppd-rc $(DESTDIR)$(docdir)
+
+ uninstall-local:
+- $(RM) -r $(DESTDIR)$(datadir)/doc/updatedd
++ $(RM) -r $(DESTDIR)$(docdir)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--
+2.10.2
+
diff --git a/net-dns/updatedd/updatedd-2.6-r2.ebuild b/net-dns/updatedd/updatedd-2.6-r3.ebuild
similarity index 83%
rename from net-dns/updatedd/updatedd-2.6-r2.ebuild
rename to net-dns/updatedd/updatedd-2.6-r3.ebuild
index 1553365..fbbc113 100644
--- a/net-dns/updatedd/updatedd-2.6-r2.ebuild
+++ b/net-dns/updatedd/updatedd-2.6-r3.ebuild
@@ -14,20 +14,20 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE=""
-RDEPEND=""
DEPEND=""
+RDEPEND="dev-lang/perl"
PATCHES=(
"${FILESDIR}/${P}-options.patch"
"${FILESDIR}/fix-ovh-DYNDNSHOST.patch"
+ "${FILESDIR}/respect-docdir.patch"
)
src_configure() {
- econf --disable-static
+ econf --disable-static --docdir="/usr/share/doc/${PF}"
}
src_install() {
default
- mv "${D}/usr/share/doc/updatedd" "${D}/usr/share/doc/${PF}" || die
prune_libtool_files
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/updatedd/, net-dns/updatedd/files/
@ 2017-01-14 21:54 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2017-01-14 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 5cadafb0174f267b92e5ea9e2cc90c57352e14e7
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 21:16:26 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> 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}"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/updatedd/, net-dns/updatedd/files/
@ 2021-03-30 2:18 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2021-03-30 2:18 UTC (permalink / raw
To: gentoo-commits
commit: 2b3b0bac1a60894fe8d1d5b2d19b0c14bdc6d692
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 02:16:13 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 02:16:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3b0bac
net-dns/updatedd: new revision to fix OVH support.
Closes: https://bugs.gentoo.org/777423
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
net-dns/updatedd/files/fix-ovh-support.patch | 70 ++++++++++++++++++++++++++++
net-dns/updatedd/updatedd-2.6-r6.ebuild | 29 ++++++++++++
2 files changed, 99 insertions(+)
diff --git a/net-dns/updatedd/files/fix-ovh-support.patch b/net-dns/updatedd/files/fix-ovh-support.patch
new file mode 100644
index 00000000000..da9e64d9085
--- /dev/null
+++ b/net-dns/updatedd/files/fix-ovh-support.patch
@@ -0,0 +1,70 @@
+https://bugs.gentoo.org/777423
+
+--- a/src/plugins/libovh.c
++++ b/src/plugins/libovh.c
+@@ -181,6 +181,7 @@
+
+ char *b64user;
+ char message[BUFLEN];
++ size_t pos, towrite;
+
+ if(strlen(args->login) > 128) {
+ ret_msg(NONE, "username is too long");
+@@ -220,10 +221,18 @@
+ "\n--------------------------------------\n"
+ "%s--------------------------------------\n\n",
+ message);
+-
+- if(write(s, message, strlen(message)) == -1) {
+- ret_msg(PERR, "write() failed");
+- return RET_WARNING;
++
++ for (pos = 0, towrite = strlen(message); towrite > 0; ) {
++ ssize_t ret;
++
++ ret = write(s, message + pos, towrite - pos);
++ if(ret <= 0) {
++ ret_msg(PERR, "write() failed");
++ return RET_WARNING;
++ }
++
++ pos += ret;
++ towrite -= ret;
+ }
+
+ free(b64user);
+@@ -236,13 +245,22 @@
+ {
+
+ int n;
+- char server_msg[BUFSIZE], *ptr;
++ char server_msg[BUFLEN], *ptr;
+
+ /* get server_msg */
+ (void)memset(server_msg, 0, sizeof(server_msg));
+- if(read(s, server_msg, sizeof(server_msg) - 1) < 0) {
+- ret_msg(PERR, "read() failed");
+- return RET_WARNING;
++
++ for (ptr = server_msg; ptr < &server_msg[BUFLEN]; ) {
++ ssize_t ret;
++
++ ret = read(s, ptr, &server_msg[BUFLEN] - ptr);
++ if (ret < 0) {
++ ret_msg(PERR, "read() failed");
++ return RET_WARNING;
++ } else if (ret == 0)
++ break;
++
++ ptr += ret;
+ }
+
+ print_debug("\n\nServer message:"
+@@ -267,6 +285,7 @@
+ }
+ }
+ }
++ ret_msg(NONE, "unknown server response");
+ } else if(strstr(server_msg, "401 Authorization Required")) {
+ ret_msg(NONE, "wrong username or password");
+ } else {
diff --git a/net-dns/updatedd/updatedd-2.6-r6.ebuild b/net-dns/updatedd/updatedd-2.6-r6.ebuild
new file mode 100644
index 00000000000..d352c43644a
--- /dev/null
+++ b/net-dns/updatedd/updatedd-2.6-r6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~arm ~ppc ~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"
+ "${FILESDIR}/fix-ovh-support.patch"
+)
+
+src_configure() {
+ econf --disable-static
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-30 2:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-30 2:18 [gentoo-commits] repo/gentoo:master commit in: net-dns/updatedd/, net-dns/updatedd/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2017-01-14 21:54 Michael Orlitzky
2017-01-14 6:32 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox