Hello community, here is the log from the commit of package whois for openSUSE:Factory checked in at 2014-05-27 12:04:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/whois (Old) and /work/SRC/openSUSE:Factory/.whois.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "whois" Changes: -------- --- /work/SRC/openSUSE:Factory/whois/whois.changes 2014-05-06 14:03:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.whois.new/whois.changes 2014-05-27 12:04:07.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 26 23:22:58 UTC 2014 - andreas.stie...@gmx.de + +- whois 5.1.3: + * Use the IANA recovered address space list. + * Updated the list of new gTLDs. + * Support hiding disclaimers until the end of the output. + * Fix a disclaimer hiding string. + +------------------------------------------------------------------- Old: ---- whois_5.1.2.tar.xz New: ---- whois_5.1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ whois.spec ++++++ --- /var/tmp/diff_new_pack.sPKGg7/_old 2014-05-27 12:04:09.000000000 +0200 +++ /var/tmp/diff_new_pack.sPKGg7/_new 2014-05-27 12:04:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: whois -Version: 5.1.2 +Version: 5.1.3 Release: 0 Summary: Intelligent WHOIS client License: GPL-2.0+ ++++++ whois.asc ++++++ --- /var/tmp/diff_new_pack.sPKGg7/_old 2014-05-27 12:04:09.000000000 +0200 +++ /var/tmp/diff_new_pack.sPKGg7/_new 2014-05-27 12:04:09.000000000 +0200 @@ -5,7 +5,7 @@ Source: whois Binary: whois Architecture: any -Version: 5.1.2 +Version: 5.1.3 Maintainer: Marco d'Itri <m...@linux.it> Standards-Version: 3.9.5 Vcs-Browser: https://github.com/rfc1036/whois @@ -14,23 +14,23 @@ Package-List: whois deb net standard arch=any Checksums-Sha1: - 627c7437f663657db903e0cf4ee0cc1369f63e96 75696 whois_5.1.2.tar.xz + b730d36359b1d7d0767414da45c2e437697949f0 76472 whois_5.1.3.tar.xz Checksums-Sha256: - 021f76910e772fa569e299210b36e2eeb20b56dc9ca29edb7e83a21b560a5403 75696 whois_5.1.2.tar.xz + 65ad18fb369827aa12733b88006a0398c88f29ba2bd53732033a7668d70bd64a 76472 whois_5.1.3.tar.xz Files: - a103596a4da3f1795fccbd9432c59ec9 75696 whois_5.1.2.tar.xz + 2817d6065bbd8f274a3e5240e0bf7dd5 76472 whois_5.1.3.tar.xz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iQGcBAEBCAAGBQJTY40/AAoJECv1pcEixPek7q8MAIJmhRpmIEnv4WCdZahVyxmP -sWRaw3i/yNnTFTMbDxT96JhEdFLgwGgoCnwGiS3wol4O8VBT8m6yfCDocbyuVCUT -pGWCzShCPJuPQnoScsd99jzPWyF+lI5M6VB8NHm1ucuPWjneJNUynucLHa7YLiBn -OPsH9V02s71mPBMb5UchNdNk/H2dDE2Hag8fFq8eiuYJqghUBsR2q64tGhXOGiKA -to+Xz5B7CjAQdHUXKByT/RyMu79DNFpEDptQYADuMz4/DWeJGWCmxdstASGou327 -eSfEIPiqI7T/ZrrFPozeQ7anRmHYrwum2bBjTRVEWhMzf/ZBh0hUaUeAhsph3isG -fyv8AdAfF6b6xE5GhBj6VMuelym5PldDKHiTmyHbX1x+LQuUevIrmQ8EjYrA0wDc -sBelBBWSwqY/n4MyLE57wwLKJM7EgybwHuqTe5cdUQRlu2o99xurEebpm5su2A38 -xZSu5tQQgrptM15NU5SjYayLnoMiNxEhek1FnZ+RyA== -=rHvB +iQGcBAEBCAAGBQJTgqWIAAoJECv1pcEixPek3esL/1RqEjby9286iUUcCXwleP/r +/n66tXICDxEIu3MyJr5VX0JLXlKG3fYPISa/dQWqpNbG1+dBgi6LbHx3mg4qQOQl +BwWBDRm1CCiw6FGAiHNJ1cfuZvhyOgcReYzmp8Q+5aOHGSs61sPZRdnQcNVPv/nu +IdrVyhkz2V/bOnizVeMGjVO6QDooVxpbgXTZZEflLD3wJNmrkM6NS4tBrMFcGPGk +Gz7hQESZqRykCYR8cU+JKC5Oy/ljjKU3bLwkitVfRkX7+Yk3gQDQJOrdmeqKw5gv +xG8+ExDaB5ZDafYmIFmR3M7o0w0RXoWixrWYw7bloSicLfLVZUbGZLm8z+AZjnw7 +q+Y89vfSNInmg8Ur3im3cbAWCQQSAt/kckHhPDIUczR4pUq4bCUly49qQ/sjSSpd +NkwVvIRH1+1iZcBclpqP3DWXOOxRvWCWJSKGs/vHBQDWPfC4jW/P4S1Ql0xVYjyS +bONUCJQUHgpIGZxz+B8v1Wb/53VicqdYa+OruY386w== +=zw0o -----END PGP SIGNATURE----- ++++++ whois_5.1.2.tar.xz -> whois_5.1.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/data.h new/whois-5.1.3/data.h --- old/whois-5.1.2/data.h 2014-05-02 04:26:50.000000000 +0200 +++ new/whois-5.1.3/data.h 2014-05-21 16:24:13.000000000 +0200 @@ -40,7 +40,7 @@ "Access to America Online", "time. By accessing", /* AOL */ "# Access and use restricted", "", /* GANDI */ "% The data in the WHOIS database of 1&1 Internet", "", - "The data in this whois database is", "", /* enom */ + "The data in this whois database is", NULL, /* enom, activeregistrar.com */ "The Data in Moniker's WHOIS database", "of Moniker.", "The Data in OnlineNIC", " By starting this query", "Interdomain's WHOIS", "DOES NOT SIGNIFY", @@ -102,6 +102,7 @@ }; const struct ip_del ip_assign[] = { +#include "ip_del_recovered.h" #include "ip_del.h" { 0, 0, NULL } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/debian/changelog new/whois-5.1.3/debian/changelog --- old/whois-5.1.2/debian/changelog 2014-05-02 04:26:50.000000000 +0200 +++ new/whois-5.1.3/debian/changelog 2014-05-26 04:22:50.000000000 +0200 @@ -1,3 +1,12 @@ +whois (5.1.3) unstable; urgency=medium + + * Use the IANA recovered address space list. + * Updated the list of new gTLDs. + * Support hiding disclaimers until the end of the output. + * Fix a disclaimer hiding string. (Closes: #748363) + + -- Marco d'Itri <m...@linux.it> Mon, 26 May 2014 04:19:41 +0200 + whois (5.1.2) unstable; urgency=medium * Always query whois.nic.$TLD for the "new" gTLDs, because the ICANN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/ip_del_recovered.h new/whois-5.1.3/ip_del_recovered.h --- old/whois-5.1.2/ip_del_recovered.h 1970-01-01 01:00:00.000000000 +0100 +++ new/whois-5.1.3/ip_del_recovered.h 2014-05-21 15:49:06.000000000 +0200 @@ -0,0 +1,18 @@ +{ 736100352UL, 736624639UL, "whois.apnic.net" }, +{ 736886784UL, 737411071UL, "whois.apnic.net" }, +{ 737476608UL, 738000895UL, "whois.apnic.net" }, +{ 738066432UL, 738197503UL, "whois.apnic.net" }, +{ 757071872UL, 759169023UL, "whois.arin.net" }, +{ 759169024UL, 759238655UL, "whois.apnic.net" }, +{ 763363328UL, 765460479UL, "whois.ripe.net" }, +{ 765460480UL, 767557631UL, "whois.lacnic.net" }, +{ 767557632UL, 769589247UL, "whois.afrinic.net" }, +{ 2523594752UL, 2523660287UL, "whois.apnic.net" }, +{ 2525036544UL, 2525102079UL, "whois.apnic.net" }, +{ 2532442112UL, 2532507647UL, "whois.apnic.net" }, +{ 2584739840UL, 2584805375UL, "whois.afrinic.net" }, +{ 2737767424UL, 2737771263UL, "whois.apnic.net" }, +{ 2737771520UL, 2737772031UL, "whois.apnic.net" }, +{ 2737774592UL, 2737778175UL, "whois.apnic.net" }, +{ 2737778432UL, 2737831935UL, "whois.apnic.net" }, +{ 2738159616UL, 2738225151UL, "whois.apnic.net" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/make_ip_del_recovered.pl new/whois-5.1.3/make_ip_del_recovered.pl --- old/whois-5.1.2/make_ip_del_recovered.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/whois-5.1.3/make_ip_del_recovered.pl 2014-05-21 16:24:13.000000000 +0200 @@ -0,0 +1,31 @@ +#!/usr/bin/perl +# https://www.iana.org/assignments/ipv4-recovered-address-space/ipv4-recovered-address-space-2.csv + +use warnings; +use strict; +use autodie; + +use Text::CSV; + +my $csv = Text::CSV->new; + +open(my $in, '<', 'ipv4-recovered-address-space-2.csv'); +open(my $out, '<', 'ip_del_recovered.h'); + +while (my $row = $csv->getline($in)) { + next if $row->[0] eq 'Start address'; + next if $row->[5] ne 'ALLOCATED'; + + my ($b1, $b2, $b3, $b4) = split(/\./, $row->[0]); + my ($e1, $e2, $e3, $e4) = split(/\./, $row->[1]); + die if not defined $b4 or not defined $e4; + + print $out '{ ' . + (($b1 << 24) + ($b2 << 16) + ($b3 << 8) + $b4) . 'UL, ' . + (($e1 << 24) + ($e2 << 16) + ($e3 << 8) + $e4) . 'UL, ' . + '"' . $row->[4] . qq|" },\n|; +} + +close($in); +close($out); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/new_gtlds_list new/whois-5.1.3/new_gtlds_list --- old/whois-5.1.2/new_gtlds_list 2014-05-02 04:26:50.000000000 +0200 +++ new/whois-5.1.3/new_gtlds_list 2014-05-26 04:22:50.000000000 +0200 @@ -5,14 +5,19 @@ # be checked first. academy +accountants actor agency airforce archi associates +audio +autos axa bar bargains +bayern +beer berlin best bid @@ -38,7 +43,9 @@ ceo cheap christmas +church citic +claims cleaning clinic clothing @@ -58,6 +65,7 @@ cooking cool country +credit creditcard cruises dance @@ -66,6 +74,7 @@ dental desi diamonds +digital directory discount dnp @@ -101,15 +110,20 @@ gallery gift glass +globo +gmo gop graphics gratis gripe +guide guitars guru haus +hiphop holdings holiday +homes horse house immobilien @@ -121,6 +135,7 @@ international investments jetzt +juegos kaufen kim kitchen @@ -129,11 +144,14 @@ kred land lease +life lighting limited limo link +loans london +luxe luxury maison management @@ -147,6 +165,7 @@ moe monash moscow +motorcycles nagoya net neustar @@ -172,6 +191,7 @@ quebec recipes red +reise reisen ren rentals @@ -180,6 +200,7 @@ rest reviews rich +rio rocks rodeo ruhr @@ -218,6 +239,7 @@ vacations vegas ventures +versicherung viajes villas vision @@ -246,6 +268,7 @@ xn--80aswg xn--c1avg xn--cg4bki +xn--czr694b xn--czru2d xn--d1acj3b xn--fiq228c5hs @@ -262,5 +285,6 @@ xn--unup4y xn--zfr164b xyz +yachts yokohama zone diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/version.h new/whois-5.1.3/version.h --- old/whois-5.1.2/version.h 2014-05-02 04:21:08.000000000 +0200 +++ new/whois-5.1.3/version.h 2014-05-21 16:25:04.000000000 +0200 @@ -1 +1 @@ -#define VERSION "5.1.2" +#define VERSION "5.1.3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/whois.c new/whois-5.1.3/whois.c --- old/whois-5.1.2/whois.c 2014-05-02 04:26:50.000000000 +0200 +++ new/whois-5.1.3/whois.c 2014-05-21 16:24:13.000000000 +0200 @@ -614,12 +614,17 @@ { int i; - if (*hiding == HIDE_DISABLED) { + if (*hiding == HIDE_TO_THE_END) { + return 1; + } else if (*hiding == HIDE_DISABLED) { return 0; } else if (*hiding == HIDE_NOT_STARTED) { /* looking for smtng to hide */ for (i = 0; hide_strings[i] != NULL; i += 2) { if (strneq(line, hide_strings[i], strlen(hide_strings[i]))) { - *hiding = i; /* start hiding */ + if (hide_strings[i + 1] == NULL) + *hiding = HIDE_TO_THE_END; /* all the remaining output */ + else + *hiding = i; /* start hiding */ return 1; /* and hide this line */ } } @@ -699,7 +704,7 @@ err_sys("fgets"); fclose(fi); - if (hide > HIDE_NOT_STARTED) + if (hide > HIDE_NOT_STARTED && hide != HIDE_TO_THE_END) err_quit(_("Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n")); @@ -797,7 +802,7 @@ err_sys("fgets"); fclose(fi); - if (hide > HIDE_NOT_STARTED) + if (hide > HIDE_NOT_STARTED && hide != HIDE_TO_THE_END) err_quit(_("Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/whois.h new/whois-5.1.3/whois.h --- old/whois-5.1.2/whois.h 2014-05-02 04:26:50.000000000 +0200 +++ new/whois-5.1.3/whois.h 2014-05-21 16:24:13.000000000 +0200 @@ -5,7 +5,8 @@ /* Do *NOT* change it if you don't know what you are doing! */ #define IDSTRING "Md5.1" -#define HIDE_DISABLED -2 +#define HIDE_TO_THE_END -3 +#define HIDE_DISABLED -2 #define HIDE_NOT_STARTED -1 /* prototypes */ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
