svn commit: r531397 - in head/net/whois: . files
Kurt Jaeger
pi at FreeBSD.org
Sat Apr 11 05:49:26 UTC 2020
Author: pi
Date: Sat Apr 11 05:49:24 2020
New Revision: 531397
URL: https://svnweb.freebsd.org/changeset/ports/531397
Log:
net/whois: update 5.2.17 -> 5.5.6
PR: 243230
Submitted by: Juraj Lutter <juraj at lutter.sk>
Reviewed by: fernape
Approved by: coco at executive-computing.de (maintainer timeout)
Relnotes: https://github.com/rfc1036/whois/blob/next/debian/changelog
Modified:
head/net/whois/Makefile
head/net/whois/distinfo
head/net/whois/files/patch-Makefile
head/net/whois/files/patch-config.h
head/net/whois/files/patch-mkpasswd.c
head/net/whois/files/patch-po_Makefile
head/net/whois/files/patch-whois.1
head/net/whois/files/patch-whois.conf.5
head/net/whois/pkg-plist
Modified: head/net/whois/Makefile
==============================================================================
--- head/net/whois/Makefile Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/Makefile Sat Apr 11 05:49:24 2020 (r531397)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= whois
-PORTVERSION= 5.2.17
DISTVERSIONPREFIX= v
+DISTVERSION= 5.5.6
CATEGORIES= net
MAINTAINER= coco at executive-computing.de
@@ -12,7 +12,7 @@ COMMENT= Marco d'Itri whois client
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= iconv gmake perl5
+USES= iconv gmake perl5 pkgconfig
USE_PERL5= build
MAKE_ARGS= BASEDIR="${STAGEDIR}"
@@ -26,12 +26,15 @@ GH_ACCOUNT= rfc1036
post-patch:
@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.1
+ @${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/po/Makefile
@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.1
@${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.1
@${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.conf.5
@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.conf.5
@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.conf.5
@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/config.h
+ @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config.h
post-patch-NLS-off:
@${REINPLACE_CMD} -e "s| pos||" -e "s| install-pos||" \
Modified: head/net/whois/distinfo
==============================================================================
--- head/net/whois/distinfo Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/distinfo Sat Apr 11 05:49:24 2020 (r531397)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501341653
-SHA256 (rfc1036-whois-v5.2.17_GH0.tar.gz) = c3c47b139bafc4348d6794a0cca311e3adfb4aae0597f1279faa73b749ecf0d2
-SIZE (rfc1036-whois-v5.2.17_GH0.tar.gz) = 99134
+TIMESTAMP = 1586583966
+SHA256 (rfc1036-whois-v5.5.6_GH0.tar.gz) = fa86a9da4b6e79b6a04b0110f7f4f46214d038a051fef3d0767a09b44e49e8c8
+SIZE (rfc1036-whois-v5.5.6_GH0.tar.gz) = 103581
Modified: head/net/whois/files/patch-Makefile
==============================================================================
--- head/net/whois/files/patch-Makefile Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/files/patch-Makefile Sat Apr 11 05:49:24 2020 (r531397)
@@ -1,18 +1,47 @@
---- Makefile.orig 2014-05-21 16:24:13.000000000 +0200
-+++ Makefile 2014-06-08 18:14:09.000000000 +0200
-@@ -1,6 +1,8 @@
--prefix = /usr
-+prefix = ${PREFIX}
+--- Makefile.orig 2019-12-31 02:05:47 UTC
++++ Makefile
+@@ -1,5 +1,9 @@
+ prefix = /usr
- CFLAGS ?= -g -O2
-+LDFLAGS += -L${LOCALBASE}/lib -lintl
-+CFLAGS += -I${LOCALBASE}/include
++ifdef PREFIX
++prefix := $(PREFIX)
++endif
++
+ ifdef DESTDIR
+ BASEDIR := $(DESTDIR)
+ endif
+@@ -72,13 +76,13 @@ endif
+ CPPFLAGS += $(DEFS) $(INCLUDES)
- PERL = perl
- INSTALL = install
-@@ -98,17 +100,17 @@
+ ##############################################################################
+-all: Makefile.depend whois mkpasswd pos
++all: Makefile.depend %%MWHOIS%% mkpasswd pos
- install-whois: whois
+ ##############################################################################
+ %.o: %.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+
+-whois: $(whois_OBJECTS)
++%%MWHOIS%%: $(whois_OBJECTS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(whois_LDADD) $(LIBS)
+
+ mkpasswd: $(mkpasswd_OBJECTS)
+@@ -115,37 +119,37 @@ servers_charset.h: servers_charset_list make_servers_c
+ ##############################################################################
+ afl:
+ -rm -f Makefile.depend
+- DEFS=-DAFL_MODE=1 AFL_HARDEN=1 $(MAKE) whois CC=afl-gcc HAVE_ICONV=1
++ DEFS=-DAFL_MODE=1 AFL_HARDEN=1 $(MAKE) %%MWHOIS%% CC=afl-gcc HAVE_ICONV=1
+
+ afl-run:
+- nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois
++ nice afl-fuzz -i ../afl_in -o ../afl_out -- ./%%MWHOIS%%
+
+ ##############################################################################
+ install: install-whois install-mkpasswd install-pos
+
+-install-whois: whois
++install-whois: %%MWHOIS%%
$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
- $(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/
- $(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man5/
@@ -21,9 +50,9 @@
- $(INSTALL) -m 0644 whois.conf.5 $(BASEDIR)$(prefix)/share/man/man5/
+ $(INSTALL) -d $(BASEDIR)$(prefix)/man/man1/
+ $(INSTALL) -d $(BASEDIR)$(prefix)/man/man5/
-+ $(INSTALL) -m 0755 whois $(BASEDIR)$(prefix)/bin/mwhois
-+ $(INSTALL) -m 0644 whois.1 $(BASEDIR)$(prefix)/man/man1/mwhois.1
-+ $(INSTALL) -m 0644 whois.conf.5 $(BASEDIR)$(prefix)/man/man5/mwhois.conf.5
++ $(INSTALL) -m 0755 %%MWHOIS%% $(BASEDIR)$(prefix)/bin/
++ $(INSTALL) -m 0644 whois.1 $(BASEDIR)$(prefix)/man/man1/%%MWHOIS%%.1
++ $(INSTALL) -m 0644 whois.conf.5 $(BASEDIR)$(prefix)/man/man5/%%MWHOIS%%.conf.5
install-mkpasswd: mkpasswd
$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
@@ -33,5 +62,18 @@
- $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/
+ $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/man/man1/
- install-pos:
+-install-pos:
++install-pos: pos
cd po && $(MAKE) install
+
+ distclean: clean
+- rm -f po/whois.pot
++ rm -f po/%%MWHOIS%%.pot
+
+ clean:
+ rm -f Makefile.depend as_del.h as32_del.h ip_del.h ip6_del.h \
+- new_gtlds.h tld_serv.h servers_charset.h *.o whois mkpasswd
++ new_gtlds.h tld_serv.h servers_charset.h *.o %%MWHOIS%% mkpasswd
+ rm -f po/*.mo
+
+ pos:
Modified: head/net/whois/files/patch-config.h
==============================================================================
--- head/net/whois/files/patch-config.h Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/files/patch-config.h Sat Apr 11 05:49:24 2020 (r531397)
@@ -1,11 +1,41 @@
---- config.h.orig 2014-06-08 18:25:19.000000000 +0200
-+++ config.h 2014-06-08 18:25:39.000000000 +0200
-@@ -8,7 +8,7 @@
+--- config.h.orig 2020-01-09 21:40:46 UTC
++++ config.h
+@@ -7,9 +7,7 @@
+ #define DEFAULTSERVER "whois.arin.net"
/* Configuration file */
- /*
+-/*
-#define CONFIG_FILE "/etc/whois.conf"
+-*/
+#define CONFIG_FILE "%%MWHOISCONF%%"
- */
+ /* autoconf in cpp macros */
+@@ -17,17 +15,12 @@
+ # include <sys/param.h>
+ #endif
+
+-#ifdef __GLIBC__
+-# define ENABLE_NLS
+-#endif
+-
+ #ifdef __FreeBSD__
+ /* which versions? */
+ # define HAVE_GETOPT_LONG
+ # define HAVE_GETADDRINFO
+-# define ENABLE_NLS
+ # ifndef LOCALEDIR
+-# define LOCALEDIR "/usr/local/share/locale"
++# define LOCALEDIR "%%PREFIX%%/share/locale"
+ # endif
+ #endif
+
+@@ -116,7 +109,7 @@
+
+ #ifdef ENABLE_NLS
+ # ifndef NLS_CAT_NAME
+-# define NLS_CAT_NAME "whois"
++# define NLS_CAT_NAME "%%MWHOIS%%"
+ # endif
+ # ifndef LOCALEDIR
+ # define LOCALEDIR "/usr/share/locale"
Modified: head/net/whois/files/patch-mkpasswd.c
==============================================================================
--- head/net/whois/files/patch-mkpasswd.c Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/files/patch-mkpasswd.c Sat Apr 11 05:49:24 2020 (r531397)
@@ -1,12 +1,10 @@
---- mkpasswd.orig 2014-06-08 17:57:46.000000000 +0200
-+++ mkpasswd.c 2014-06-08 17:58:02.000000000 +0200
-@@ -17,7 +17,9 @@
+--- mkpasswd.c.orig 2020-01-09 21:08:11 UTC
++++ mkpasswd.c
+@@ -17,7 +17,6 @@
*/
/* for crypt, snprintf and strcasecmp */
-+#ifndef __FreeBSD__
- #define _XOPEN_SOURCE 500
-+#endif
+-#define _XOPEN_SOURCE 500
#define _BSD_SOURCE 1
+ #define _DEFAULT_SOURCE 1
#define __EXTENSIONS__ 1
-
Modified: head/net/whois/files/patch-po_Makefile
==============================================================================
--- head/net/whois/files/patch-po_Makefile Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/files/patch-po_Makefile Sat Apr 11 05:49:24 2020 (r531397)
@@ -1,13 +1,22 @@
---- po/Makefile.orig 2014-06-08 18:22:54.000000000 +0200
-+++ po/Makefile 2014-06-08 18:23:37.000000000 +0200
-@@ -1,4 +1,4 @@
--prefix = /usr
-+prefix = ${PREFIX}
+--- po/Makefile.orig 2019-12-31 02:05:47 UTC
++++ po/Makefile
+@@ -1,4 +1,7 @@
+ prefix = /usr
++ifdef PREFIX
++prefix := $(PREFIX)
++endif
- INSTALL= install
+ ifdef DESTDIR
+ BASEDIR := $(DESTDIR)
+@@ -8,12 +11,14 @@ INSTALL= install
-@@ -10,6 +10,8 @@
+ INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/locale
+-PACKAGE = whois
++PACKAGE = %%MWHOIS%%
+
+ CATALOGS = cs.mo da.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo nb.mo pl.mo pt_BR.mo ru.mo zh_CN.mo
+
POTFILES=../whois.c ../mkpasswd.c
+.SUFFIXES: .po .mo
@@ -15,12 +24,12 @@
all: $(PACKAGE).pot $(CATALOGS)
$(PACKAGE).pot: $(POTFILES)
-@@ -34,7 +36,7 @@
- fi; \
- done
+@@ -45,7 +50,7 @@ clean:
+ rm -f *.mo
--%.mo: %.po
-+.po.mo:
- msgfmt --statistics --check --verbose --output-file=$@ $<
+ distclean: clean
+- rm -f whois.pot
++ rm -f %%MWHOIS%%.pot
- clean:
+ install: $(CATALOGS)
+ for n in $(CATALOGS); do \
Modified: head/net/whois/files/patch-whois.1
==============================================================================
--- head/net/whois/files/patch-whois.1 Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/files/patch-whois.1 Sat Apr 11 05:49:24 2020 (r531397)
@@ -1,75 +1,73 @@
---- whois.1.orig 2013-12-26 07:48:10.000000000 +0100
-+++ whois.1 2014-06-08 18:34:54.000000000 +0200
+--- whois.1.orig 2019-12-31 02:05:47 UTC
++++ whois.1
@@ -1,8 +1,8 @@
--.TH "WHOIS" "1" "20 December 2009" "Marco d'Itri" "Debian GNU/Linux"
-+.TH "%%MWHOIST%%" "1" "20 December 2009" "Marco d'Itri" "Debian GNU/Linux"
- .SH "NAME"
+-.TH "WHOIS" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
++.TH "MWHOIS" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
+ .SH NAME
-whois \- client for the whois directory service
-+%%MWHOIS%% \- client for the whois directory service
- .SH "SYNOPSIS"
++mwhois \- client for the whois directory service
+ .SH SYNOPSIS
-.B whois
-+.B %%MWHOIS%%
- [\~{\~\fB\-h\fP | \fB\-\-host\fP\~}\~\fIHOST\fP\~]
- [\~{\~\fB\-p\fP | \fB\-\-port\fP\~}\~\fIPORT\fP\~]
- [\~\fB\-abBcdGHKlLmMrRx\fP\~]
-@@ -13,27 +13,27 @@
- [\~\fB\-\-verbose\fP\~]
++.B mwhois
+ [
+ .RB {\~ \-h \~|\~ \-\-host \~}
+ .I HOST
+@@ -25,25 +25,25 @@ whois \- client for the whois directory service
+ .RB [\~ \-\-verbose \~]
.I OBJECT
-.B whois
-+.B %%MWHOIS%%
++.B mwhois
.B \-q
.I KEYWORD
-.B whois
-+.B %%MWHOIS%%
++.B mwhois
.B \-t
.I TYPE
-.B whois
-+.B %%MWHOIS%%
++.B mwhois
.B \-v
.I TYPE
--.B whois
-+.B %%MWHOIS%%
- .B \-\-help
+-.B whois \-\-help
++.B mwhois \-\-help
--.B whois
-+.B %%MWHOIS%%
- .B \-\-version
+-.B whois \-\-version
++.B mwhois \-\-version
.PP
- .SH "DESCRIPTION"
--\fBwhois\fP searches for an object in a \fIRFC\ 3912\fP database.
-+\fB%%MWHOIS%%\fP searches for an object in a \fIRFC\ 3912\fP database.
-
- This version of the whois client tries to guess the right server to
- ask for the specified object. If no guess can be made it will connect
-@@ -171,7 +171,7 @@
- to be interpreted by the client should always follow the \fI\-\-\fP
+ .SH DESCRIPTION
+-.B whois
++.B mwhois
+ searches for an object in a
+ .I RFC 3912
+ database.
+@@ -243,7 +243,7 @@ which are not to be interpreted by the client must fol
separator (which marks the beginning of the query string).
.P
--If the \fI/etc/whois.conf\fR configuration file exists, it will be consulted
-+If the \fI%%MWHOISCONF%%\fR configuration file exists, it will be consulted
+ If the
+-.I /etc/whois.conf
++.I /usr/local/etc/mwhois.conf
+ configuration file exists, it will be consulted
to find a server before applying the normal rules. Each line of the
file should contain a regular expression to be matched against the query
- text and the whois server to use, separated by white space.
-@@ -186,7 +186,7 @@
+@@ -259,7 +259,7 @@ by the current system locale.
Command line arguments will always be interpreted accordingly to the
current system locale and converted to the IDN ASCII Compatible Encoding.
.SH "FILES"
-/etc/whois.conf
-+%%MWHOISCONF%%
++/usr/local/etc/mwhois.conf
.SH "ENVIRONMENT"
.IP LANG
- When querying \fIwhois.nic.ad.jp\fP and \fIwhois.jprs.jp\fP English text
-@@ -200,7 +200,7 @@
- of objects are located. If the variable does not exist then
- \fIwhois.arin.net\fP will be queried.
+ When querying
+@@ -280,7 +280,7 @@ of objects are located. If the variable does not exist
+ .I whois.arin.net
+ will be queried.
.SH "SEE ALSO"
--\fBwhois.conf\fP(5)
-+\fB%%MWHOISCONF%%\fP(5)
- .PP
- \fIRFC 3912\fP: WHOIS Protocol Specification
- .PP
+-.IR whois.conf (5).
++.IR /usr/local/etc/mwhois.conf (5).
+ .P
+ .IR "RFC 3912" :
+ WHOIS Protocol Specification.
Modified: head/net/whois/files/patch-whois.conf.5
==============================================================================
--- head/net/whois/files/patch-whois.conf.5 Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/files/patch-whois.conf.5 Sat Apr 11 05:49:24 2020 (r531397)
@@ -1,29 +1,38 @@
---- whois.conf.5.orig 2014-01-05 20:00:36.000000000 +0100
-+++ whois.conf.5 2014-06-08 18:42:59.000000000 +0200
+--- whois.conf.5.orig 2019-12-31 02:05:47 UTC
++++ whois.conf.5
@@ -1,10 +1,10 @@
--.TH "WHOIS.CONF" "5" "9 April 2013" "Petr PÃsaÅ" "Debian GNU/Linux"
-+.TH "%%MWHOIST%%.CONF" "5" "9 April 2013" "Petr PÃsaÅ" "Debian GNU/Linux"
+-.TH "WHOIS.CONF" "5" "2019-12-30" "Petr Písař" "Debian GNU/Linux"
++.TH "MWHOIS.CONF" "5" "2019-12-30" "Petr Písař" "Debian GNU/Linux"
- .SH "NAME"
+ .SH NAME
-whois.conf \- alternative WHOIS servers list for whois client
-+%%MWHOIS%%.conf \- alternative WHOIS servers list for whois client
++mwhois.conf \- alternative WHOIS servers list for mwhois client
- .SH "SYNOPSIS"
+ .SH SYNOPSIS
-.B /etc/whois.conf
-+.B %%MWHOISCONF%%
++.B /usr/local/etc/mwhois.conf
- .SH "DESCRIPTION"
+ .SH DESCRIPTION
This file contains a list of WHOIS servers which can augment or override
-@@ -37,10 +37,10 @@
+@@ -18,7 +18,7 @@ Fields are separated by non-empty sequence of space or
+ A line starting with a hash character is a free comment and it's not
+ considered.
+
+-The pattern is case-insensitive extended regular expression if whois client
++The pattern is case-insensitive extended regular expression if mwhois client
+ has been compiled with POSIX regular expressions support. Otherwise, simple
+ case-insensitive suffix comparison against WHOIS object identifier is used.
+
+@@ -37,10 +37,10 @@ encoding (ACE) format.
^as645(1[2-9]|2[0-9]|3[0-4])$ whois.example.net
- .SH "FILES"
+ .SH FILES
-/etc/whois.conf
-+%%MWHOISCONF%%
++/usr/local/etc/mwhois.conf
.SH "SEE ALSO"
--\fBwhois\fP(1)
-+\fB%%MWHOIS%%\fP(1)
+-.IR whois (1)
++.IR mwhois (1)
- .SH "AUTHOR"
- This manual page was written by Petr PÃsaÅ <\fIppisar at redhat.com\fP>
+ .SH AUTHOR
+ This manual page was written by Petr Písař
Modified: head/net/whois/pkg-plist
==============================================================================
--- head/net/whois/pkg-plist Sat Apr 11 05:04:40 2020 (r531396)
+++ head/net/whois/pkg-plist Sat Apr 11 05:49:24 2020 (r531397)
@@ -3,18 +3,18 @@ bin/mwhois
man/man1/mkpasswd.1.gz
man/man1/mwhois.1.gz
man/man5/mwhois.conf.5.gz
-%%NLS%%share/locale/cs/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/da/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/de/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/el/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/es/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/it/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/whois.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/da/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/de/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/el/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/es/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/it/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/mwhois.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/mwhois.mo
More information about the svn-ports-all
mailing list