diff options
| author | Marco d'Itri <md@linux.it> | 2008-07-17 00:54:55 +0200 |
|---|---|---|
| committer | Marco d'Itri <md@linux.it> | 2013-03-30 02:31:36 +0100 |
| commit | ce5e346d70ee7833cb356d9c6572970967c0321e (patch) | |
| tree | 643d52c965cb88bed55603fcf994ff28998c1fc8 | |
| parent | e90424d1793399c4615fd84952a226a681ae1181 (diff) | |
| download | whois-ce5e346d70ee7833cb356d9c6572970967c0321e.tar.gz | |
Imported Debian version 4.7.27v4.7.27
| -rw-r--r-- | Makefile | 50 | ||||
| -rw-r--r-- | as_del_list | 3 | ||||
| -rw-r--r-- | config.h | 14 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | ip_del_list | 7 | ||||
| -rw-r--r-- | mkpasswd.c | 3 | ||||
| -rw-r--r-- | po/cs.po | 36 | ||||
| -rw-r--r-- | po/pl.po | 29 | ||||
| -rw-r--r-- | tld_serv_list | 6 | ||||
| -rw-r--r-- | whois.c | 4 | ||||
| -rw-r--r-- | whois.conf | 4 | ||||
| -rw-r--r-- | whois.spec | 9 |
14 files changed, 103 insertions, 83 deletions
@@ -1,42 +1,50 @@ prefix = /usr/local -OPTS := -O2 +CFLAGS = -g -O2 + +PERL = perl # Solaris #whois_LDADD += -lnsl -lsocket # FreeBSD -#LDFLAGS=-L/usr/local/lib -lgnugetopt -lintl -#CFLAGS=-I/usr/local/include +#LIBS += -L/usr/local/lib -lintl +#INCLUDES += -I/usr/local/include # OS/2 EMX -#LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp +#whois_LDADD += -lsocket +#LDFLAGS += -Zexe -Dstrncasecmp=strnicmp + +ifdef CONFIG_FILE +DEFS += -DCONFIG_FILE=\"$(CONFIG_FILE)\" +endif ifdef HAVE_LIBIDN whois_LDADD += -lidn -CFLAGS += -DHAVE_LIBIDN +DEFS += -DHAVE_LIBIDN endif ifdef HAVE_XCRYPT mkpasswd_LDADD += -lxcrypt -CFLAGS += -DHAVE_XCRYPT +DEFS += -DHAVE_XCRYPT else mkpasswd_LDADD += -lcrypt endif -PERL := perl - all: Makefile.depend whois mkpasswd #pos +whois_OBJECTS := whois.o utils.o +mkpasswd_OBJECTS := mkpasswd.o utils.o + ############################################################################## %.o: %.c - $(CC) $(CFLAGS) $(OPTS) -c $< + $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -c $< -whois: whois.o utils.o - $(CC) $(LDFLAGS) $(whois_LDADD) -o $@ $^ +whois: $(whois_OBJECTS) + $(CC) $(LDFLAGS) -o $@ $^ $(whois_LDADD) $(LIBS) -mkpasswd: mkpasswd.o utils.o - $(CC) $(LDFLAGS) $(mkpasswd_LDADD) -o $@ $^ +mkpasswd: $(mkpasswd_OBJECTS) + $(CC) $(LDFLAGS) -o $@ $^ $(mkpasswd_LDADD) $(LIBS) ############################################################################## as_del.h: as_del_list make_as_del.pl @@ -55,12 +63,13 @@ tld_serv.h: tld_serv_list make_tld_serv.pl $(PERL) -w make_tld_serv.pl < tld_serv_list > $@ ############################################################################## -install: whois +install: install-whois install-mkpasswd install-pos + +install-whois: whois install -d $(BASEDIR)$(prefix)/bin/ install -d $(BASEDIR)$(prefix)/share/man/man1/ install -m 0755 whois $(BASEDIR)$(prefix)/bin/ install -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/ - cd po && $(MAKE) $@ install-mkpasswd: mkpasswd install -d $(BASEDIR)$(prefix)/bin/ @@ -68,6 +77,9 @@ install-mkpasswd: mkpasswd install -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/ install -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/ +install-pos: + cd po && $(MAKE) $@ + distclean: clean rm -f po/whois.pot @@ -76,17 +88,11 @@ clean: *.o whois mkpasswd rm -f po/*.mo -test: - open -- sh -c "while nc -l -p 43 127.0.0.1; do echo END; done" - -gnu: - tar czvvf gnu-whois.tgz Makefile* README *list *.h whois.* - pos: cd po && $(MAKE) depend: Makefile.depend Makefile.depend: - $(CC) $(CFLAGS) -MM -MG *.c > $@ + $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -MM -MG *.c > $@ -include Makefile.depend diff --git a/as_del_list b/as_del_list index 9d9ecde..02a2747 100644 --- a/as_del_list +++ b/as_del_list @@ -61,7 +61,8 @@ 38912 39935 ripe 40960 45055 ripe 45056 46079 apnic +47104 48127 ripe # catch all: everything else comes from ARIN -1 40959 arin +1 47103 arin @@ -1,6 +1,5 @@ /* Program version */ -/* not for the inetutils version */ -#define VERSION "4.7.26" +#define VERSION "4.7.27" /* Configurable features */ @@ -15,6 +14,7 @@ #define CONFIG_FILE "/etc/whois.conf" */ + /* autoconf in cpp macros */ #ifdef linux # define ENABLE_NLS @@ -34,6 +34,10 @@ # define HAVE_GETADDRINFO #endif +#if defined __APPLE__ && defined __MACH__ +# define HAVE_GETADDRINFO +#endif + #if defined __GLIBC__ # define HAVE_GETOPT_LONG # if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 @@ -44,17 +48,11 @@ # endif #endif -/* Linux, Solaris 5, FreeBSD 5.x. What else? */ -#if defined _POSIX_VERSION && _POSIX_VERSION >= 200112L -# define HAVE_WORDEXP -#endif - #if defined _POSIX2_VERSION # define HAVE_REGEXEC #endif -/* system features */ #ifdef ENABLE_NLS # ifndef NLS_CAT_NAME # define NLS_CAT_NAME "whois" diff --git a/debian/changelog b/debian/changelog index e79d977..22b56e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +whois (4.7.27) unstable; urgency=medium + + * Updated the .md and .me TLD servers. + * Added a new ASN allocation. + * Added a new IPv4 allocation. + * Updated the Polish and Czech translations. + + -- Marco d'Itri <md@linux.it> Thu, 17 Jul 2008 00:54:55 +0200 + whois (4.7.26) unstable; urgency=medium * Added support for passing command line options in the environment diff --git a/debian/control b/debian/control index 662f8e7..13879fc 100644 --- a/debian/control +++ b/debian/control @@ -2,18 +2,17 @@ Source: whois Section: net Priority: standard Maintainer: Marco d'Itri <md@linux.it> -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Build-Depends: debhelper (>= 4), gettext, libidn11-dev Package: whois Architecture: any Depends: ${shlibs:Depends} -Replaces: bsdmainutils (<= 4.5.1), bsdutils (<< 3.0-0) -Description: the GNU whois client +Description: an intelligent whois client This is a new whois (RFC 3912) client rewritten from scratch. It is inspired from and compatible with the usual BSD and RIPE whois(1) programs. It is intelligent and can automatically select the appropriate whois server for most queries. . - The package also contains mkpasswd, a simple front end to crypt(3). + The package also contains mkpasswd, a features-rich front end to crypt(3). diff --git a/debian/rules b/debian/rules index ea28461..09fceb8 100755 --- a/debian/rules +++ b/debian/rules @@ -9,9 +9,7 @@ VERSION := $(shell dpkg-parsechangelog | sed -n 's/\+.*$$//; /^Version/s/.* //p' build: dh_testdir - $(MAKE) \ - OPTS="-O2 -g -DCONFIG_FILE=\\\"/etc/whois.conf\\\"" \ - HAVE_LIBIDN=1 + $(MAKE) CONFIG_FILE="/etc/whois.conf" HAVE_LIBIDN=1 cd po && $(MAKE) whois.pot touch $@ @@ -40,6 +38,7 @@ binary-arch: checkroot build dh_shlibdeps dh_installdeb dh_gencontrol + dh_md5sums dh_builddeb binary: binary-arch diff --git a/ip_del_list b/ip_del_list index bd7aaa7..db19762 100644 --- a/ip_del_list +++ b/ip_del_list @@ -23,9 +23,8 @@ 77.0.0.0/8 ripe 78.0.0.0/7 ripe 80.0.0.0/4 ripe # => 95.255.255.255 -96.0.0.0/6 arin -114.0.0.0/7 apnic -116.0.0.0/6 apnic +96.0.0.0/6 arin # => 99.255.255.255 +112.0.0.0/5 apnic 121.128.0.0/10 whois.nic.or.kr 125.128.0.0/11 whois.nic.or.kr 120.0.0.0/6 apnic @@ -83,7 +82,7 @@ 169.208.0.0/12 apnic 171.16.0.0/12 ripe 171.32.0.0/15 ripe -# 173 -> 185 reserved +# 175 -> 185 reserved 186.0.0.0/7 lacnic 188.0.0.0/8 ripe # transferred from ARIN to to RIPE 189.0.0.0/8 lacnic @@ -31,7 +31,6 @@ #include <string.h> #include <time.h> #include <sys/types.h> -/*#define HAVE_XCRYPT 0*/ #ifdef HAVE_XCRYPT #include <xcrypt.h> #include <sys/stat.h> @@ -378,7 +377,7 @@ void display_help(void) void display_version(void) { - printf("GNU mkpasswd %s\n\n", VERSION); + printf("mkpasswd %s\n\n", VERSION); puts("Copyright (C) 2001-2008 Marco d'Itri\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."); @@ -3,10 +3,10 @@ # msgid "" msgstr "" -"Project-Id-Version: whois 4.7.24\n" +"Project-Id-Version: whois 4.7.26\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-03-23 22:06+0100\n" -"PO-Revision-Date: 2008-01-29 00:38+0100\n" +"PO-Revision-Date: 2008-07-01 09:40+0200\n" "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -170,7 +170,7 @@ msgstr "" "\n" "-l o jednu úroveň širší dotaz [jen RPSL]\n" "-L nalezne všechny širší shody\n" -"-m nalezne nejbližší širší shody\n" +"-m nalezne nejbližší užší shody\n" "-M nalezne všechny užší shody\n" "-c nalezne nejužší shodu obsahující atribut mnt-irt\n" "-x přesná shoda [jen RPSL]\n" @@ -189,8 +189,9 @@ msgstr "" "-t TYP požaduje šablonu pro objekt druhu TYP („all“ pro " "seznam)\n" "-v TYP požaduje podrobnou šablonu pro objekt druhu TYP\n" -"-q [verze|zdroje|typy]\n" +"-q [version|sources|types]\n" " dotáže se na zadané informace o serveru [jen RPSL]\n" +" („version“–verze, „sources“–zdroje, „types“–typy)\n" "-F rychlý neopracovaný výstup (implikuje -r)\n" "-h STROJ připojí se na server STROJ\n" "-p PORT připojí se na PORT\n" @@ -200,14 +201,13 @@ msgstr "" " --version vypíše informace o verzi a skončí\n" #: ../mkpasswd.c:65 -#, fuzzy msgid "standard 56 bit DES-based crypt(3)" -msgstr "\tstandardní crypt(3) založený na 56bitové šifře DES" +msgstr "standardní crypt(3) založený na 56bitové šifře DES" #: ../mkpasswd.c:134 -#, fuzzy, c-format +#, c-format msgid "Invalid method '%s'.\n" -msgstr "Neplatné číslo „%s“.\n" +msgstr "Neplatná metoda „%s“.\n" #: ../mkpasswd.c:143 ../mkpasswd.c:153 #, c-format @@ -242,7 +242,7 @@ msgstr "Zakázaný znak v hesle „0x%hhx“.\n" #: ../mkpasswd.c:297 #, c-format msgid "Method not supported by crypt(3).\n" -msgstr "" +msgstr "Metoda není podporována funkcí crypt(3).\n" #: ../mkpasswd.c:360 #, c-format @@ -256,7 +256,7 @@ msgstr "" "\n" #: ../mkpasswd.c:363 -#, fuzzy, c-format +#, c-format msgid "" " -m, --method=TYPE select method TYPE\n" " -S, --salt=SALT use the specified SALT\n" @@ -275,13 +275,14 @@ msgid "" msgstr "" " -H, --hash=DRUH vybere DRUH hashe\n" " -S, --salt=SŮL použije zadanou SŮL\n" +" -R, --rounds=POČET použije zadaný POČET kol\n" " -P, --password-fd=Č přečte heslo z deskriptoru souboru Č\n" " místo z /dev/tty\n" " -s, --stdin jako --password-fd=0\n" " -h, --help zobrazí tuto nápovědu a skončí\n" " -V, --version vypíše informace o verzi a skončí\n" "\n" -"Chybí-li HESLO, bude na něj požádáno interaktivně.\n" +"Chybí-li HESLO, bude o něj požádáno interaktivně.\n" "Nebude-li zadána SŮL, vygeneruje se náhodná.\n" "Bude-li DRUH „help“, vypíšou se dostupné algoritmy.\n" "\n" @@ -289,9 +290,18 @@ msgstr "" "<translation-team-cs@lists.sourceforge.net> (česky).\n" #: ../mkpasswd.c:391 -#, fuzzy, c-format +#, c-format msgid "Available methods:\n" -msgstr "Dostupné algoritmy:\n" +msgstr "Dostupné metody:\n" #~ msgid "Invalid hash type '%s'.\n" #~ msgstr "Neplatný druh hashe „%s“.\n" + +#~ msgid "Connecting to whois.crsnic.net." +#~ msgstr "Připojuji se k whois.crsnic.net." + +#~ msgid "Connecting to whois.publicinterestregistry.net." +#~ msgstr "Připojuji se k whois.publicinterestregistry.net." + +#~ msgid "Connecting to whois.nic.cc." +#~ msgstr "Připojuji se k whois.nic.cc." @@ -1,14 +1,14 @@ # Polish translation for whois. # Micha 'CeFeK' Nazarewicz <cefek@career.pl>, 1999 # Przemysaw Knycz <djrzulf@pld.org.pl>, 2003 -# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2007 +# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2008 # msgid "" msgstr "" -"Project-Id-Version: whois 4.7.21\n" +"Project-Id-Version: whois 4.7.26\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-03-23 22:06+0100\n" -"PO-Revision-Date: 2007-04-07 14:32+0200\n" +"PO-Revision-Date: 2008-05-18 19:40+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -205,14 +205,13 @@ msgstr "" "dziaania\n" #: ../mkpasswd.c:65 -#, fuzzy msgid "standard 56 bit DES-based crypt(3)" -msgstr "\tstandardowa 56-bitowa, oparta o DES funkcja crypt(3)" +msgstr "standardowa 56-bitowa, oparta o DES funkcja crypt(3)" #: ../mkpasswd.c:134 -#, fuzzy, c-format +#, c-format msgid "Invalid method '%s'.\n" -msgstr "Nieprawidowa liczba '%s'.\n" +msgstr "Nieprawidowa metoda '%s'.\n" #: ../mkpasswd.c:143 ../mkpasswd.c:153 #, c-format @@ -248,7 +247,7 @@ msgstr "Bdny znak w hale '0x%hhx'.\n" #: ../mkpasswd.c:297 #, c-format msgid "Method not supported by crypt(3).\n" -msgstr "" +msgstr "Metoda nie obsugiwana przez crypt(3).\n" #: ../mkpasswd.c:360 #, c-format @@ -262,7 +261,7 @@ msgstr "" "\n" #: ../mkpasswd.c:363 -#, fuzzy, c-format +#, c-format msgid "" " -m, --method=TYPE select method TYPE\n" " -S, --salt=SALT use the specified SALT\n" @@ -279,8 +278,9 @@ msgid "" "\n" "Report bugs to %s.\n" msgstr "" -" -H, --hash=TYP wybr skrtu TYP\n" +" -m, --method=TYP wybr metody TYP\n" " -S, --salt=ZARODEK uycie podanego ZARODKA\n" +" -R, --rounds=LICZBA uycie podanej LICZBY cykli\n" " -P, --password-fd=NUM odczyt hasa z deskryptora pliku NUM zamiast\n" " z /dev/tty\n" " -s, --stdin to samo co --password-fd=0\n" @@ -290,14 +290,11 @@ msgstr "" "\n" "Jeli nie podano HASA, pobierane jest interaktywnie.\n" "Jeli nie podano ZARODKA, generowany jest losowy.\n" -"Jeli podano TYP 'help', wypisywane s dostpne algorytmy.\n" +"Jeli podano TYP 'help', wypisywane s dostpne metody.\n" "\n" "Bdy prosz zgasza na adres %s.\n" #: ../mkpasswd.c:391 -#, fuzzy, c-format +#, c-format msgid "Available methods:\n" -msgstr "Dostpne algorytmy:\n" - -#~ msgid "Invalid hash type '%s'.\n" -#~ msgstr "Nieprawidowy rodzaj skrtu '%s'.\n" +msgstr "Dostpne metody:\n" diff --git a/tld_serv_list b/tld_serv_list index 3050cf1..d159f89 100644 --- a/tld_serv_list +++ b/tld_serv_list @@ -194,8 +194,8 @@ .ly WEB http://www.lydomains.com/ .ma whois.iam.net.ma # www.nic.ma .mc whois.ripe.net -.md WEB http://www.dns.md/whois.html -.me WEB http://whois.nic.me/ +.md WEB http://www.dns.md/wh1.php +.me whois.meregistry.net .mg NONE # www.nic.mg .mh NONE # www.nic.net.mh .mk NONE # NIC? http://www.mpt.com.mk @@ -205,7 +205,7 @@ .mo WEB http://www.monic.net.mo/ .mp NONE # www.nic.mp .mq whois.nic.mq -.mr NONE # http://www.univ-nkc.mr/nic_mr.html www.nic.mr ? +.mr NONE # www.nic.mr .ms whois.adamsnames.tc .mt WEB http://www.nic.org.mt/dir/home.html .mu WEB http://www.nic.mu/whois.jsp @@ -114,12 +114,8 @@ int main(int argc, char *argv[]) verb = 1; break; case 1: -#ifdef VERSION fprintf(stderr, _("Version %s.\n\nReport bugs to %s.\n"), VERSION, "<md+whois@linux.it>"); -#else - fprintf(stderr, "%s %s\n", inetutils_package, inetutils_version); -#endif exit(0); default: usage(); @@ -1,4 +1,4 @@ -# GNU whois configuration file +# whois configuration file # # This file can contain details of alternative whois servers to use if # the compiled in servers are not suitable. Each entry is a single @@ -6,5 +6,5 @@ # the whois server to be used for it, separated by blank space. # # Eg: -# .nz nz.whois-servers.net +# \.nz$ nz.whois-servers.net # @@ -1,6 +1,6 @@ Summary: Enhanced WHOIS client Name: whois -Version: 4.7.26 +Version: 4.7.27 Release: 1 License: GPL Vendor: Marco d'Itri <md@linux.it> @@ -35,14 +35,21 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %{prefix}/bin/whois +%{prefix}/bin/mkpasswd %doc %{prefix}/share/man/man1/whois.1.gz +%doc %{prefix}/share/man/man1/mkpasswd.1.gz +%lang(cs) %{prefix}/share/locale/cs/LC_MESSAGES/whois.mo %lang(de) %{prefix}/share/locale/de/LC_MESSAGES/whois.mo %lang(el) %{prefix}/share/locale/el/LC_MESSAGES/whois.mo %lang(es) %{prefix}/share/locale/es/LC_MESSAGES/whois.mo +%lang(eu) %{prefix}/share/locale/eu/LC_MESSAGES/whois.mo %lang(fr) %{prefix}/share/locale/fr/LC_MESSAGES/whois.mo %lang(it) %{prefix}/share/locale/it/LC_MESSAGES/whois.mo +%lang(ja) %{prefix}/share/locale/ja/LC_MESSAGES/whois.mo %lang(no) %{prefix}/share/locale/no/LC_MESSAGES/whois.mo %lang(pl) %{prefix}/share/locale/pl/LC_MESSAGES/whois.mo +%lang(pt_BR) %{prefix}/share/locale/pt_BR/LC_MESSAGES/whois.mo +%lang(ru) %{prefix}/share/locale/ru/LC_MESSAGES/whois.mo %changelog * Sun Jul 13 2003 Paul Mundt <lethal@linux-sh.org> |