pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/38500: net/jwhois 4.0
>Number: 38500
>Category: pkg
>Synopsis: net/jwhois 4.0
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Apr 24 18:45:00 +0000 2008
>Originator: Sergey Svishchev
>Release: 4.0
>Organization:
>Environment:
>Description:
Many WHOIS data updates, translation updates; also:
* Reset euid and egid to uid and gid before calling the user specified browser
* Added support for libidn
* Added patch to support conversion of whois server output to local charset.
* Changed to GNU GPL v3
>How-To-Repeat:
>Fix:
Index: net/jwhois/Makefile
===================================================================
RCS file: /vol/2/cvsup/pkgsrc/net/jwhois/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- net/jwhois/Makefile 6 Apr 2006 03:20:54 -0000 1.59
+++ net/jwhois/Makefile 20 Jan 2008 19:27:38 -0000
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.59 2006/04/06 03:20:54 jlam Exp $
#
-DISTNAME= jwhois-3.2.2
-PKGREVISION= 19
+DISTNAME= jwhois-4.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU:=jwhois/}
@@ -10,6 +9,8 @@
HOMEPAGE= http://www.gnu.org/software/jwhois/
COMMENT= Configurable WHOIS client
+LICENSE= gnu-gpl-v3
+
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -22,13 +23,15 @@
EGDIR= ${PREFIX}/share/examples/jwhois
CONF_FILES= ${EGDIR}/jwhois.conf.default \
${PKG_SYSCONFDIR}/jwhois.conf
-INFO_FILES= # PLIST
+INFO_FILES= YES
.include "../../devel/gettext-lib/buildlink3.mk"
+CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf \
${EGDIR}/jwhois.conf.default
+.include "../../devel/libidn/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: net/jwhois/PLIST
===================================================================
RCS file: /vol/2/cvsup/pkgsrc/net/jwhois/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- net/jwhois/PLIST 17 Apr 2006 07:07:31 -0000 1.10
+++ net/jwhois/PLIST 8 Jun 2007 17:52:30 -0000
@@ -12,8 +12,11 @@
share/locale/nl/LC_MESSAGES/jwhois.mo
share/locale/pl/LC_MESSAGES/jwhois.mo
share/locale/pt_BR/LC_MESSAGES/jwhois.mo
+share/locale/ro/LC_MESSAGES/jwhois.mo
share/locale/ru/LC_MESSAGES/jwhois.mo
+share/locale/rw/LC_MESSAGES/jwhois.mo
share/locale/sv/LC_MESSAGES/jwhois.mo
share/locale/tr/LC_MESSAGES/jwhois.mo
+share/locale/vi/LC_MESSAGES/jwhois.mo
share/locale/zh_TW/LC_MESSAGES/jwhois.mo
@dirrm share/examples/jwhois
Index: net/jwhois/distinfo
===================================================================
RCS file: /vol/2/cvsup/pkgsrc/net/jwhois/distinfo,v
retrieving revision 1.29
diff -u -r1.29 distinfo
--- net/jwhois/distinfo 24 May 2005 07:43:07 -0000 1.29
+++ net/jwhois/distinfo 18 Dec 2007 22:57:29 -0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.29 2005/05/24 07:43:07 kleink Exp $
+$NetBSD$
-SHA1 (jwhois-3.2.2.tar.gz) = ca69b017e19d378affd7cdc3a980f2209cb1caab
-RMD160 (jwhois-3.2.2.tar.gz) = 5fac4e9e03ded5618b5d58d38d72e8863518ba2f
-Size (jwhois-3.2.2.tar.gz) = 385390 bytes
-SHA1 (patch-aa) = dcb5603f555f34b13d17d4c036d53af499351dda
+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-ab) = e2b35b66adae6caba8a778194ff0238a31006b0b
-SHA1 (patch-ac) = 1ff97afeaab96982f52597216db449e86bbd0444
+SHA1 (patch-ac) = 3a23d56b9dfd3664d2a5e783f6f349bba1cbfa54
+SHA1 (patch-ad) = d72d60593c8168d2f49c545c6af2d4fafaebd88a
Index: net/jwhois/patches/patch-aa
===================================================================
RCS file: /vol/2/cvsup/pkgsrc/net/jwhois/patches/patch-aa,v
retrieving revision 1.11
diff -u -r1.11 patch-aa
--- net/jwhois/patches/patch-aa 24 May 2005 07:43:08 -0000 1.11
+++ net/jwhois/patches/patch-aa 18 Dec 2007 22:56:44 -0000
@@ -1,148 +1,45 @@
-$NetBSD: patch-aa,v 1.11 2005/05/24 07:43:08 kleink Exp $
+$NetBSD$
---- example/jwhois.conf.orig 2003-06-30 19:16:45.000000000 +0200
-+++ example/jwhois.conf 2005-05-24 09:40:34.000000000 +0200
-@@ -55,7 +55,54 @@
- "^[0-9]+\\.[0-9]+\\.[0-9]+/[0-9]+-[0-9]+$" = "whois.nic.br";
-
- #
-- # Redirect IPv6 numbers to the correct host
-+ # Sub-TLA Assignments
-+ # see http://www.iana.org/assignments/ipv6-tla-assignments
-+ #
-+ "^2001:0?[01][A-F0-9][A-F0-9]:.+" = "whois.iana.org";
-+ "^2001:0?[23][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+ "^2001:0?[45][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+ "^2001:0?[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:0?[89][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:0?[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:0?[CD][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+ "^2001:0?[EF][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+ "^2001:1[23][A-F0-9][A-F0-9]:.+" = "whois.lacnic.net";
-+ "^2001:1[45][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:1[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:1[89][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+ "^2001:1[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:1[CD][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:1[EF][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:2[A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:3[A-B0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:4[01][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:4[23][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+ "^2001:4[45][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+ "^2001:4[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:4[89][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+ "^2001:4[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ "^2001:4[CD][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ # ...
-+ "^2001:5[A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ # ...
-+ "^2001:[89][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+ # ...
-+ "^2003:[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+ # ...
-+ "^2400:[0?1][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+ # ...
-+ "^2600:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+ # ...
-+ "^2604:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+ # ...
-+ "^2608:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+ # ...
-+ "^260C:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+ # ...
-+ "^2A00:0[0-7][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+
-+ #
-+ # Historical IPv6 catch-all
- #
- ".*:.*" = "whois.6bone.net";
-
-@@ -147,7 +194,7 @@
- "\\.ee$" = "whois.eenet.ee";
- "\\.eg$" = "whois.ripe.net";
- "\\.es$" = "www.nic.es";
-- "\\.fi$" = "cgi.ficora.fi";
-+ "\\.fi$" = "whois.ficora.fi";
- "\\.fj$" = "whois.usp.ac.fj";
- "\\.fm$" = "www.dot.fm";
- "\\.fo$" = "whois.ripe.net";
-@@ -176,7 +223,7 @@
- "\\.it$" = "whois.nic.it";
- "\\.je$" = "whois.isles.net";
- "\\.jp$" {
-- whois-server = "whois.nic.ad.jp";
-+ whois-server = "whois.jprs.jp";
- query-format = "$* /e";
- }
- "\\.kg$" = "whois.domain.kg";
-@@ -242,7 +289,7 @@
- "\\.to$" = "whois.tonic.to";
- "\\.tr$" = "whois.metu.edu.tr";
- "\\.tt$" = "www.nic.tt";
-- "\\.tv$" = "whois.tv";
-+ "\\.tv$" = "whois.nic.tv";
- "\\.tw$" = "whois.twnic.net";
- "\\.ua$" = "whois.com.ua";
- "\\.ug$" = "whois.co.ug";
-@@ -365,12 +412,25 @@
- "211.192.0.0/13" = "whois.nic.or.kr";
-
- "24.232.0.0/16" = "whois.lacnic.net";
-+ "41.0.0.0/8" = "whois.afrinic.net";
- "43.0.0.0/8" = "whois.v6nic.net";
-+ "58.0.0.0/8" = "whois.apnic.net";
-+ "59.0.0.0/8" = "whois.apnic.net";
-+ "60.0.0.0/8" = "whois.apnic.net";
- "61.0.0.0/8" = "whois.apnic.net";
- "62.0.0.0/8" = "whois.ripe.net";
- "80.0.0.0/8" = "whois.ripe.net";
- "81.0.0.0/8" = "whois.ripe.net";
- "82.0.0.0/8" = "whois.ripe.net";
-+ "83.0.0.0/8" = "whois.ripe.net";
-+ "84.0.0.0/8" = "whois.ripe.net";
-+ "85.0.0.0/8" = "whois.ripe.net";
-+ "86.0.0.0/8" = "whois.ripe.net";
-+ "87.0.0.0/8" = "whois.ripe.net";
-+ "88.0.0.0/8" = "whois.ripe.net";
-+ "124.0.0.0/8" = "whois.apnic.net";
-+ "125.0.0.0/8" = "whois.apnic.net";
-+ "126.0.0.0/8" = "whois.apnic.net";
- "150.217.0.0/16" = "whois.ripe.net";
- "151.3.0.0/16" = "whois.ripe.net";
- "151.4.0.0/15" = "whois.ripe.net";
-@@ -491,6 +551,10 @@
- whois-redirect = ".*Whois Server: \\(.*\\)";
- }
-
-+ "whois\\.nic\\.tv" {
-+ whois-redirect = ".*Whois Server: \\(.*\\)";
-+ }
-+
- "whois\\.apnic\\.net" {
- whois-redirect = ".*http://\\(whois\\.nic\\.or\\.kr\\)/";
- whois-redirect = ".*at
\\([Ww][Hh][Oo][Ii][Ss]\\.[A-Za-z]*\\.[Nn][Ee][Tt]\\)";
-@@ -693,14 +757,6 @@
- form-element = "whois";
- }
-
-- "cgi\\.ficora\\.fi" {
-- http = "true";
-- http-method = "GET";
-- http-action = "/wwwbin/domains.pl";
-- form-element = "search";
-- form-extra = "language=eng";
-- }
--
- "whois\\.lacnic\\.net" {
- whois-redirect = ".*\\(whois.nic.br\\)";
- whois-redirect = ".*\\(whois.registro.br\\)";
-@@ -724,10 +780,10 @@
-
- #
- # The cache feature is used to provide a local cache with Whois information.
--# By default, the location of the database is /usr/local/var/jwhois.db and the
-+# By default, the location of the database is /var/db/jwhois.db and the
+--- example/jwhois.conf.orig 2007-03-26 09:12:08.000000000 +0000
++++ example/jwhois.conf
+@@ -94,6 +96,7 @@ whois-servers {
+ "\\.no\\.com$" = "whois.centralnic.net";
+ "\\.qc\\.com$" = "whois.centralnic.net";
+ "\\.ru\\.com$" = "whois.centralnic.net";
++ "\\.ru\\.net$" = "whois.relcom.ru";
+ "\\.sa\\.com$" = "whois.centralnic.net";
+ "\\.se\\.com$" = "whois.centralnic.net";
+ "\\.se\\.net$" = "whois.centralnic.net";
+@@ -244,6 +256,9 @@ whois-servers {
+ "\\.pw$" = "whois.nic.pw";
+ "\\.re$" = "whois.nic.re";
+ "\\.ro$" = "whois.rotld.ro";
++ "\\.int.ru$" = "whois.int.ru";
++ "\\.msk.ru$" = "whois.relcom.ru";
++ "\\.spb.ru$" = "whois.relcom.ru";
+ "\\.ru$" = "whois.ripn.net";
+ "\\.rw$" = "www.nic.rw";
+ "\\.sa$" = "saudinic.net.sa";
+@@ -256,6 +271,8 @@ whois-servers {
+ "\\.sm$" = "whois.ripe.net";
+ "\\.sr$" = "whois.register.sr";
+ "\\.st$" = "whois.nic.st";
++ "\\.msk.su$" = "whois.relcom.ru";
++ "\\.spb.su$" = "whois.relcom.ru";
+ "\\.su$" = "whois.ripn.net";
+ "\\.tc$" = "whois.adamsnames.tc";
+ "\\.tf$" = "whois.afnic.fr";
+@@ -490,6 +507,8 @@ cidr-blocks {
+ "158.190.0.0/15" = "whois.ripe.net";
+ "158.192.0.0/14" = "whois.ripe.net";
+ "158.196.0.0/15" = "whois.ripe.net";
++ "158.248.0.0/15" = "whois.ripe.net";
++ "158.250.0.0/16" = "whois.ripe.net";
+ "159.147.0.0/16" = "whois.ripe.net";
+ "159.148.0.0/15" = "whois.ripe.net";
+ "160.216.0.0/14" = "whois.ripe.net";
+@@ -947,7 +970,7 @@ server-options {
+ # By default, the location of the database is /usr/local/var/jwhois.db and the
# default expire time is 7 days, but you can change those below.
#
-#cachefile = "/var/lib/jwhois.db";
@@ -150,7 +47,7 @@
#
# This is the time after which an entry expires from the cache in hours.
-@@ -743,7 +799,7 @@
+@@ -963,7 +986,7 @@ server-options {
#
# Path to the browser to use for HTTP servers.
#
Index: net/jwhois/patches/patch-ac
===================================================================
RCS file: /vol/2/cvsup/pkgsrc/net/jwhois/patches/patch-ac,v
retrieving revision 1.11
diff -u -r1.11 patch-ac
--- net/jwhois/patches/patch-ac 19 Jan 2005 16:40:05 -0000 1.11
+++ net/jwhois/patches/patch-ac 18 Dec 2007 22:30:16 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.11 2005/01/19 16:40:05 tv Exp $
+$NetBSD$
---- src/regex.c.orig 2005-01-19 11:19:56.000000000 -0500
+--- src/regex.c.orig 2007-02-17 18:33:56.000000000 +0000
+++ src/regex.c
@@ -3771,8 +3771,7 @@ re_match_2 (bufp, string1, size1, string
regstart[r] = old_regstart[r];
/* xx why this test? */
-- if ((uintptr_t) old_regend[r] >=
-- (uintptr_t) regstart[r])
+- if ((unsigned long int) old_regend[r] >=
+- (unsigned long int) regstart[r])
+ if (old_regend[r] >= regstart[r])
regend[r] = old_regend[r];
}
Index: net/jwhois/patches/patch-ad
===================================================================
RCS file: net/jwhois/patches/patch-ad
diff -N net/jwhois/patches/patch-ad
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/jwhois/patches/patch-ad 8 Jun 2007 17:49:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/Makefile.in.orig 2007-06-08 17:46:00.000000000 +0000
++++ src/Makefile.in
+@@ -241,7 +241,7 @@ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ jwhois$(EXEEXT): $(jwhois_OBJECTS) $(jwhois_DEPENDENCIES)
+ @rm -f jwhois$(EXEEXT)
+- $(LINK) $(jwhois_LDFLAGS) $(jwhois_OBJECTS) $(jwhois_LDADD) $(LIBS)
++ $(LINK) $(jwhois_LDFLAGS) $(jwhois_OBJECTS) $(jwhois_LDADD)
$(jwhois_LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
Home |
Main Index |
Thread Index |
Old Index