diff options
author | shattered <shattered@pkgsrc.org> | 2012-10-23 20:49:38 +0000 |
---|---|---|
committer | shattered <shattered@pkgsrc.org> | 2012-10-23 20:49:38 +0000 |
commit | 2b0ec1892cd0cc93c06c9493f8f1c70f6b78ab91 (patch) | |
tree | 4236dc57dd03741c4c489d1cc9cafaa690e9243a /net | |
parent | ee7215b2e5ad6cce13f32863aa5c01727bb4ce4b (diff) | |
download | pkgsrc-2b0ec1892cd0cc93c06c9493f8f1c70f6b78ab91.tar.gz |
Fix connection failures to WHOIS servers with IPv6 addresses from hosts
without IPv6 connectivity. Patch taken from Debian bug report 542148.
Also delint.
Diffstat (limited to 'net')
-rw-r--r-- | net/jwhois/Makefile | 11 | ||||
-rw-r--r-- | net/jwhois/distinfo | 5 | ||||
-rw-r--r-- | net/jwhois/options.mk | 6 | ||||
-rw-r--r-- | net/jwhois/patches/patch-aa | 4 | ||||
-rw-r--r-- | net/jwhois/patches/patch-src_utils.c | 13 |
5 files changed, 30 insertions, 9 deletions
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile index de8839f6623..a1059ca0776 100644 --- a/net/jwhois/Makefile +++ b/net/jwhois/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.65 2012/10/23 17:18:30 asau Exp $ +# $NetBSD: Makefile,v 1.66 2012/10/23 20:49:38 shattered Exp $ # DISTNAME= jwhois-4.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNU:=jwhois/} @@ -11,6 +11,8 @@ HOMEPAGE= http://www.gnu.org/software/jwhois/ COMMENT= Configurable WHOIS client LICENSE= gnu-gpl-v3 +BUILD_DEFS+= VARBASE + USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -25,6 +27,11 @@ CONF_FILES= ${EGDIR}/jwhois.conf.default \ ${PKG_SYSCONFDIR}/jwhois.conf INFO_FILES= YES +SUBST_CLASSES+= paths +SUBST_STAGE.paths= pre-install +SUBST_FILES.paths= example/jwhois.conf +SUBST_VARS.paths= PREFIX + .include "../../devel/gettext-lib/buildlink3.mk" CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext} diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo index 0bc25a1e222..d4aa48aab97 100644 --- a/net/jwhois/distinfo +++ b/net/jwhois/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.30 2009/01/09 16:20:20 shattered Exp $ +$NetBSD: distinfo,v 1.31 2012/10/23 20:49:38 shattered Exp $ SHA1 (jwhois-4.0.tar.gz) = 4bd4a35cb0c2593284e7ef161f533a8184645174 RMD160 (jwhois-4.0.tar.gz) = 552a61a17c2c4af8c1a5e7cd12e2e0f40d9f7dc8 Size (jwhois-4.0.tar.gz) = 493007 bytes -SHA1 (patch-aa) = 40c3b4711bbc7a5b2ef62262a72b98e345f5e292 +SHA1 (patch-aa) = 65b75e9808a7e7f92fa1f4dece3fd89efb6c5201 SHA1 (patch-ab) = e2b35b66adae6caba8a778194ff0238a31006b0b SHA1 (patch-ac) = 3a23d56b9dfd3664d2a5e783f6f349bba1cbfa54 SHA1 (patch-ad) = d72d60593c8168d2f49c545c6af2d4fafaebd88a +SHA1 (patch-src_utils.c) = 43cb9ff7f423b7a35577eb53a5bded83d8d21ec9 diff --git a/net/jwhois/options.mk b/net/jwhois/options.mk index 8ef16aa3839..a506208415c 100644 --- a/net/jwhois/options.mk +++ b/net/jwhois/options.mk @@ -1,14 +1,14 @@ -# $NetBSD: options.mk,v 1.1 2005/10/03 21:18:55 agc Exp $ +# $NetBSD: options.mk,v 1.2 2012/10/23 20:49:38 shattered Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.jwhois PKG_SUPPORTED_OPTIONS= jwhois-enable-cache -PKG_OPTIONS_LEGACY_VARS=JWHOIS_ENABLE_CACHE:jwhois-enable-cache +PKG_OPTIONS_LEGACY_VARS+= JWHOIS_ENABLE_CACHE:jwhois-enable-cache .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mjwhois-enable-cache) CONFIGURE_ARGS+= --with-cache -CONF_FILES_PERMS= /dev/null /${VARBASE}/db/jwhois.db \ +CONF_FILES_PERMS+= /dev/null /${VARBASE}/db/jwhois.db \ ${ROOT_USER} nogroup 0666 .else CONFIGURE_ARGS+= --without-cache diff --git a/net/jwhois/patches/patch-aa b/net/jwhois/patches/patch-aa index dee46181494..11c2a8ff3f6 100644 --- a/net/jwhois/patches/patch-aa +++ b/net/jwhois/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.12 2009/01/09 16:20:20 shattered Exp $ +$NetBSD: patch-aa,v 1.13 2012/10/23 20:49:38 shattered Exp $ --- example/jwhois.conf.orig 2007-03-26 09:12:08.000000000 +0000 +++ example/jwhois.conf @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.12 2009/01/09 16:20:20 shattered Exp $ # Path to the browser to use for HTTP servers. # -browser-pathname = "/usr/bin/lynx"; -+browser-pathname = "/usr/pkg/bin/lynx"; ++browser-pathname = "@PREFIX@/bin/lynx"; # # Command line argument to browser to get output on stdout. diff --git a/net/jwhois/patches/patch-src_utils.c b/net/jwhois/patches/patch-src_utils.c new file mode 100644 index 00000000000..8c09880945e --- /dev/null +++ b/net/jwhois/patches/patch-src_utils.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_utils.c,v 1.1 2012/10/23 20:49:38 shattered Exp $ + +--- src/utils.c.orig 2007-06-26 07:00:20.000000000 +0000 ++++ src/utils.c +@@ -288,7 +288,7 @@ make_connect(const char *host, int port) + + retlen = sizeof(retval); + error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen); +- if (error < 0 || retval) ++ if (error < 0 || !retval) + { + break; + } |