December 2013 - openSUSE Commits - openSUSE Mailing Lists

commit xiphos for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package xiphos for openSUSE:Factory checked in at 2013-12-30 10:48:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xiphos (Old) and /work/SRC/openSUSE:Factory/.xiphos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xiphos" Changes: -------- --- /work/SRC/openSUSE:Factory/xiphos/xiphos.changes 2013-09-09 11:04:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xiphos.new/xiphos.changes 2013-12-30 10:48:19.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 16 01:22:55 UTC 2013 - zaitor(a)opensuse.org + +- Own %{_datadir}/omf: scrollkeeper used to own this, but with the + switch to rarian we have to care of it ourselves. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xiphos.spec ++++++ --- /var/tmp/diff_new_pack.86R8jT/_old 2013-12-30 10:48:20.000000000 +0100 +++ /var/tmp/diff_new_pack.86R8jT/_new 2013-12-30 10:48:20.000000000 +0100 @@ -220,6 +220,7 @@ %{_datadir}/icons/hicolor/scalable/apps/* %{_datadir}/applications/%{name}.desktop %{_mandir}/man1/* +%dir %{_datadir}/omf %if ( %{defined centos_version} || %{defined fedora} ) %{_defaultdocdir}/%{name}/* %{_datadir}/gnome/help/%{name}/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfce4-terminal for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package xfce4-terminal for openSUSE:Factory checked in at 2013-12-30 10:48:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-terminal (Old) and /work/SRC/openSUSE:Factory/.xfce4-terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-terminal" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-terminal/xfce4-terminal.changes 2013-10-24 14:41:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-terminal.new/xfce4-terminal.changes 2013-12-30 10:48:12.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Dec 27 10:50:14 UTC 2013 - gber(a)opensuse.org + +- update to version 0.6.3 + - improve URL matching (bxo#7959, bxo#9800) + - fix encoding menu creation (bxo#10395) + - added light solarized colorscheme (bxo#10286) + - fixed wrong foreground color in solarized dark (bxo#10285) + - fix terminal session restore (bxo#9732) + - translation updates +- drop obsolete + xfce4-terminal-fix-up-the-encoding-menu-creation.patch + +------------------------------------------------------------------- Old: ---- xfce4-terminal-0.6.2.tar.bz2 xfce4-terminal-fix-up-the-encoding-menu-creation.patch New: ---- xfce4-terminal-0.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-terminal.spec ++++++ --- /var/tmp/diff_new_pack.3e5ZT0/_old 2013-12-30 10:48:13.000000000 +0100 +++ /var/tmp/diff_new_pack.3e5ZT0/_new 2013-12-30 10:48:13.000000000 +0100 @@ -18,15 +18,13 @@ Name: xfce4-terminal -Version: 0.6.2 +Version: 0.6.3 Release: 0 Summary: Terminal Emulator for the Xfce Desktop Environment License: GPL-2.0+ Group: System/X11/Terminals Url: http://docs.xfce.org/apps/terminal/start Source0: http://archive.xfce.org/src/apps/xfce4-terminal/0.6/%{name}-%{version}.tar.… -# PATCH-FIX-UPSTREAM xfce4-terminal-fix-up-the-encoding-menu-creation.patch bxo#10395 a.j.buxton(a)gmail.com -- Fix up the encoding menu creation. -Patch0: xfce4-terminal-fix-up-the-encoding-menu-creation.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: update-desktop-files @@ -66,7 +64,6 @@ %prep %setup -q -%patch0 -p1 %build %configure ++++++ xfce4-terminal-0.6.2.tar.bz2 -> xfce4-terminal-0.6.3.tar.bz2 ++++++ ++++ 43018 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2013-12-30 10:47:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2013-12-18 08:00:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2013-12-30 10:47:46.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Dec 20 19:32:51 UTC 2013 - meissner(a)suse.com + +- Updated to 1.7.9 development snapshot + - Improved window moving/resizing in the Mac driver. + - Some DirectDraw palette fixes. + - Reduced code duplication between C++ runtime versions. + - Various bug fixes. + +------------------------------------------------------------------- Old: ---- wine-1.7.8.tar.bz2 wine-1.7.8.tar.bz2.sign New: ---- wine-1.7.9.tar.bz2 wine-1.7.9.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.7Ux2Fd/_old 2013-12-30 10:47:47.000000000 +0100 +++ /var/tmp/diff_new_pack.7Ux2Fd/_new 2013-12-30 10:47:47.000000000 +0100 @@ -55,7 +55,7 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.8 +Version: 1.7.9 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ ++++++ wine-1.7.8.tar.bz2 -> wine-1.7.9.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.7.8.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.7.9.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit whois for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package whois for openSUSE:Factory checked in at 2013-12-30 10:47:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-21 08:13:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.whois.new/whois.changes 2013-12-30 10:47:10.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Dec 27 21:14:48 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 5.1.0 + * Added the .ga, .ml, .pf, .xn--l1acc (.МОН, Mongolia) and + .xn--mgba3a4f16a (.ﺍیﺭﺎﻧ, Iran) TLD servers. + * Added the servers for 54 "new" gTLDs. + * Updated the .bw, .gd, .hn, .sb, .xn--j1amh and .xn--mgberp4a5d4ar + TLD servers. + * Added new RIPE and APNIC ASN allocations. + * Removed the .ck TLD server. + * Updated one or more translations. + * Applied multiple small fixes contributed by Petr Písař of Red Hat. + * Correctly hide the disclaimers for .be and .sx. + * Direct queries for private ASN blocks to RIPE. + +------------------------------------------------------------------- Old: ---- whois_5.0.26.tar.xz New: ---- whois_5.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ whois.spec ++++++ --- /var/tmp/diff_new_pack.Thex9I/_old 2013-12-30 10:47:11.000000000 +0100 +++ /var/tmp/diff_new_pack.Thex9I/_new 2013-12-30 10:47:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: whois -Version: 5.0.26 +Version: 5.1.0 Release: 0 Summary: Intelligent WHOIS client License: GPL-2.0+ ++++++ whois.asc ++++++ --- /var/tmp/diff_new_pack.Thex9I/_old 2013-12-30 10:47:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Thex9I/_new 2013-12-30 10:47:12.000000000 +0100 @@ -5,25 +5,25 @@ Source: whois Binary: whois Architecture: any -Version: 5.0.26 +Version: 5.1.0 Maintainer: Marco d'Itri <md(a)linux.it> -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Browser: https://github.com/rfc1036/whois Vcs-Git: git://github.com/rfc1036/whois.git Build-Depends: debhelper (>= 5), gettext, libidn11-dev Package-List: whois deb net standard Checksums-Sha1: - d89fb78a39a3d37986a2080220b7edddc1d4d092 72508 whois_5.0.26.tar.xz + 390fec4ccca71ac8077ccbd067672ebdc7f7a82c 73596 whois_5.1.0.tar.xz Checksums-Sha256: - 729625ef81425f4771e06492bb4f3e9f24bff75b8176044ce8d2f605f7ad6af5 72508 whois_5.0.26.tar.xz + f47ccaf2c4d2971a428f132416b332b5875000d0f9791626286c724316fd4e5e 73596 whois_5.1.0.tar.xz Files: - 236829eea77e85df2443a54815a1b41d 72508 whois_5.0.26.tar.xz + e16cc6ca56a6834ab60ace26215d6b0c 73596 whois_5.1.0.tar.xz -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) +Version: GnuPG v1.4.15 (GNU/Linux) -iEYEARECAAYFAlHl0k0ACgkQFGfw2OHuP7EP+gCfQoy1rnQrgQYOTh3DPfO9SdZc -6xYAn18kDBS0o5zLzBQYbmAZBI73Df6i -=jP+B +iEYEARECAAYFAlK8hjcACgkQFGfw2OHuP7EiFgCeOinEBqyrRq7BChEwDZ2M5Dcn +RjAAoJSMws5HM7yjD7V+QmQlDs86DZ2u +=XUqE -----END PGP SIGNATURE----- ++++++ whois.keyring ++++++ --- /var/tmp/diff_new_pack.Thex9I/_old 2013-12-30 10:47:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Thex9I/_new 2013-12-30 10:47:12.000000000 +0100 @@ -271,14 +271,25 @@ ag8EkiG2aUAngTxVay2G0oDbCn+yKN0J6mLtIuUU2oI2v6nDAHjE/uSmJneNuzcu 5vIAUuQTi6VBMbGgTrkLRRb9WuBvXpluijnPZSABmFZgo066gHPa8oIo8e8H4hV8 XxihUwOujagzXAGcqgYQF+o/GXZ2lrBEHLBR5fRGANzIMaAqJgkIlskQlCkvLJci -XmpCoYq/I7vGL1wBupMEZsIzG8fDXywPDKZaVyWBYUdCZARAJjPP2wfXvLkBDQQ1 -0vGrEAQAjtdmQUAFpZZ64k00igesbwnV/GSyDrudh0pecv594yCj13WqBDmTxaey -thTraJENxekXOGfE7RiqwJBCWYl50e8UhlMhOBFnHj79n208ib4YVzr57uV7mBQz -TTeodVbqiQCWMHCPsyyNHEC2UlEu692XUI+MWfQC43lsb47IMwMAAwUD/R3nZzYG -QiwchPeB0bsNJadkW8JDPL3QN91fgQNiLdijUSQHJp0KgHFUuyJpQ3OU9pOCg1dh -gaoutZTl3wPgzOYCkdw6E7B1FdUiWZMWPAji7UQmmG6GijlsdN7u8fgCdXQ6TVMH -GERO7br+OT/fDrDXhyWJXLdnEOACze/OnbzGiEYEGBECAAYFAjXS8asACgkQFGfw -2OHuP7GqBACglz1m1ZBrSuxvEVWi5E3XpN/zMW0AnjyyV30xlQ02F/MIh7HNYJVb -1+4u -=wCSj +XmpCoYq/I7vGL1wBupMEZsIzG8fDXywPDKZaVyWBYUdCZARAJjPP2wfXvIkCHAQQ +AQgABgUCUkEDygAKCRDm//HjjclosC+ED/4wONzV0ItLDyDIfzxKET8A6gbGdjW1 +qJPNobNTfWWHDdxjED2ah62NQoVDIc1e3M3THs3vhswjZe2J68KFf5VBmpyi5DVv +rRxT5NKrEnSzHVWVJMbjE77CcCj1SCBQVQk9+Jz/K+qwnvwe4twP5O31nQ0PdWRs +HkhsO5xIyyX3hZHycBqJAqG83i8ln0ua08IYjjbdA/2AbWrvGm4q0gLnwD+JQKVI +OdDv0YlLWymxJgPTGGP+4V2d9ZTmEKX2aJjXlww/OcejLldcSMF4dx8ShPraWSOV +GgnALp4AMtugcX7nvXnnj/uXiNRCXaUT3lGjHyVmut1VueA3Uuu0lfR/K3vBCttf +01OX6ycU3ZnRwtK/sySjMgCpR2jRpS45CsmWl79WJmtLvY9cnoI+xRUNfEBnLr6G +CQk3/1AW/EnEatGethyCkfnk4WH7TmwTnBIucovdU4x2tvQRm2Evb4JSTfOy3b9s +UaKw6nKwnREHSaDgK6nuc1X5HpJEWFRwXCezPbhnw7jf7f6sI4pS8kNZIcaKY3aP +aTgFBHINLIJpGQY4cZycsHIFa7UtjEdt1+1eYPbLGkrmONGVxAlPSrMEC7M9vDQ2 +irnsb8CK2M5ptrHM1Aq+uaDnnN4IGCnZELt8uRwMXCCQh8WrPVuA3VWT5Plg5UUh +hvj6jfk+9v+SOLkBDQQ10vGrEAQAjtdmQUAFpZZ64k00igesbwnV/GSyDrudh0pe +cv594yCj13WqBDmTxaeythTraJENxekXOGfE7RiqwJBCWYl50e8UhlMhOBFnHj79 +n208ib4YVzr57uV7mBQzTTeodVbqiQCWMHCPsyyNHEC2UlEu692XUI+MWfQC43ls +b47IMwMAAwUD/R3nZzYGQiwchPeB0bsNJadkW8JDPL3QN91fgQNiLdijUSQHJp0K +gHFUuyJpQ3OU9pOCg1dhgaoutZTl3wPgzOYCkdw6E7B1FdUiWZMWPAji7UQmmG6G +ijlsdN7u8fgCdXQ6TVMHGERO7br+OT/fDrDXhyWJXLdnEOACze/OnbzGiEYEGBEC +AAYFAjXS8asACgkQFGfw2OHuP7GqBACglz1m1ZBrSuxvEVWi5E3XpN/zMW0Anjyy +V30xlQ02F/MIh7HNYJVb1+4u +=8SRT -----END PGP PUBLIC KEY BLOCK----- ++++++ whois_5.0.26.tar.xz -> whois_5.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/as32_del_list new/whois-5.1.0/as32_del_list --- old/whois-5.0.26/as32_del_list 2013-03-30 02:31:35.000000000 +0100 +++ new/whois-5.1.0/as32_del_list 2013-12-26 09:36:13.000000000 +0100 @@ -8,3 +8,6 @@ 5.0 5.65535 afrinic 6.0 6.65535 arin +# private ASN block +4200000000 4294967294 ripe + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/as_del_list new/whois-5.1.0/as_del_list --- old/whois-5.0.26/as_del_list 2013-06-12 00:45:30.000000000 +0200 +++ new/whois-5.1.0/as_del_list 2013-12-26 09:36:13.000000000 +0100 @@ -69,6 +69,11 @@ 58368 59391 apnic 59392 61439 ripe 61440 61951 lacnic +61952 62463 ripe +63488 63999 apnic + +# private ASN block +64512 65534 ripe # catch all: everything else comes from ARIN 1 63487 arin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/config.h new/whois-5.1.0/config.h --- old/whois-5.0.26/config.h 2013-07-17 01:06:44.000000000 +0200 +++ new/whois-5.1.0/config.h 2013-12-26 10:04:19.000000000 +0100 @@ -1,5 +1,5 @@ /* Program version */ -#define VERSION "5.0.26" +#define VERSION "5.1.0" /* Configurable features */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/data.h new/whois-5.1.0/data.h --- old/whois-5.0.26/data.h 2013-03-31 08:10:29.000000000 +0200 +++ new/whois-5.1.0/data.h 2013-12-26 07:48:10.000000000 +0100 @@ -66,7 +66,9 @@ /* ccTLDs */ "Access to CCTLD WHOIS information is provided", "", /* Afilias */ "Access to ASNIC", "by this policy.", /* as */ - "% The WHOIS service offered", "% of the database", /* eu */ + "% The WHOIS service offered by DNS.be", "% protect the privacy", /* be */ + "% The WHOIS service offered by EURid", "% of the database", /* eu */ + "% WHOIS LEGAL STATEMENT AND TERMS & CONDITIONS", "", /* sx */ "NeuStar, Inc., the Registry", "OF THE AVAILABILITY", /* us */ NULL, NULL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/debian/changelog new/whois-5.1.0/debian/changelog --- old/whois-5.0.26/debian/changelog 2013-07-17 01:06:44.000000000 +0200 +++ new/whois-5.1.0/debian/changelog 2013-12-26 10:21:24.000000000 +0100 @@ -1,3 +1,19 @@ +whois (5.1.0) unstable; urgency=low + + * Added the .ga, .ml, .pf, .xn--l1acc (.МОН, Mongolia) and + .xn--mgba3a4f16a (.ﺍیﺭﺎﻧ, Iran) TLD servers. + * Added the servers for 54 "new" gTLDs. + * Updated the .bw, .gd, .hn, .sb, .xn--j1amh and .xn--mgberp4a5d4ar + TLD servers. + * Added new RIPE and APNIC ASN allocations. + * Removed the .ck TLD server. + * Updated one or more translations. + * Applied multiple small fixes contributed by Petr Písař of Red Hat. + * Correctly hide the disclaimers for .be and .sx. (Closes: #729366) + * Direct queries for private ASN blocks to RIPE. (Closes: #724661) + + -- Marco d'Itri <md(a)linux.it> Thu, 26 Dec 2013 10:05:43 +0100 + whois (5.0.26) unstable; urgency=low * Added the .cf TLD server. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/debian/control new/whois-5.1.0/debian/control --- old/whois-5.0.26/debian/control 2013-04-18 03:29:36.000000000 +0200 +++ new/whois-5.1.0/debian/control 2013-12-26 18:03:01.000000000 +0100 @@ -2,7 +2,7 @@ Section: net Priority: standard Maintainer: Marco d'Itri <md(a)linux.it> -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Build-Depends: debhelper (>= 5), gettext, libidn11-dev Vcs-Git: git://github.com/rfc1036/whois.git Vcs-Browser: https://github.com/rfc1036/whois diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/make_as32_del.pl new/whois-5.1.0/make_as32_del.pl --- old/whois-5.0.26/make_as32_del.pl 2013-03-30 02:31:35.000000000 +0100 +++ new/whois-5.1.0/make_as32_del.pl 2013-12-26 09:36:13.000000000 +0100 @@ -9,13 +9,19 @@ s/\s*#.*$//; next if /^$/; - my ($fh, $fl, $lh, $ll, $s) = /^(\d+)\.(\d+)\s+(\d+)\.(\d+)\s+([\w\.-]+)$/; - die "format error: $_" unless $s; + my ($fh, $fl, $lh, $ll, $s, $f, $l); + if (($fh, $fl, $lh, $ll, $s) = + /^(\d+)\.(\d+)\s+(\d+)\.(\d+)\s+([\w\.-]+)$/) { + $f = ($fh << 16) + $fl; + $l = ($lh << 16) + $ll; - my $f = ($fh << 16) + $fl; - my $l = ($lh << 16) + $ll; - my $server = ($s =~ /\./) ? $s : "whois.$s.net"; - - print qq({ $f, $l,\t"$server" },\t/* $fh.$fl $lh.$ll */\n); + my $server = ($s =~ /\./) ? $s : "whois.$s.net"; + print qq({ $f, $l,\t"$server" },\t/* $fh.$fl $lh.$ll */\n); + } elsif (($f, $l, $s) = /^(\d+)\s+(\d+)\s+([\w\.-]+)$/) { + my $server = ($s =~ /\./) ? $s : "whois.$s.net"; + print qq({ ${f}u, ${l}u,\t"$server" },\n); + } else { + die "format error: $_"; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/make_tld_serv.pl new/whois-5.1.0/make_tld_serv.pl --- old/whois-5.0.26/make_tld_serv.pl 2013-03-30 02:31:42.000000000 +0100 +++ new/whois-5.1.0/make_tld_serv.pl 2013-12-26 09:57:16.000000000 +0100 @@ -13,7 +13,7 @@ (my ($a, $b) = /^([\w\d\.-]+)\s+([\w\d\.:-]+|[A-Z]+\s+.*)$/); $b =~ s/^W(?:EB)?\s+/\\x01/; - $b =~ s/^VERISIGN\s+/\\x04/; + $b =~ s/^VERISIGN\s+/\\x04" "/; $b = "\\x03" if $b eq 'NONE'; $b = "\\x08" if $b eq 'AFILIAS'; $b = "\\x0C" if $b eq 'ARPA'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/po/zh_CN.po new/whois-5.1.0/po/zh_CN.po --- old/whois-5.0.26/po/zh_CN.po 2013-04-18 03:29:36.000000000 +0200 +++ new/whois-5.1.0/po/zh_CN.po 2013-12-26 09:36:13.000000000 +0100 @@ -8,15 +8,16 @@ "Project-Id-Version: whois\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-04-10 04:23+0200\n" -"PO-Revision-Date: 2009-10-24 03:59+0000\n" -"Last-Translator: Feng Liu (Maxim) <maximliu(a)googlemail.com>\n" +"PO-Revision-Date: 2013-12-25 17:40+0800\n" +"Last-Translator: Terence Ng <pheotiman(a)gmail.com>\n" "Language-Team: Chinese (China) <zh_CN(a)li.org>\n" -"Language: \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-11-10 02:44+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Generator: Poedit 1.5.7\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../whois.c:148 #, c-format @@ -27,7 +28,7 @@ msgstr "" "版本 %s。\n" "\n" -"将 bugs 提交到 %s。\n" +"向 %s 报告漏洞。\n" #: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291 #, c-format @@ -167,6 +168,38 @@ "-v TYPE request verbose template for object of TYPE\n" "-q [version|sources|types] query specified server info\n" msgstr "" +"用法： whois 【选项】 …… 对象 …… \n" +"\n" +"-h HOST, --host HOST 连接到服务器 HOST\n" +"-p PORT, --port PORT 连接到端口 PORT\n" +"-H 隐藏法律声明 \n" +" --verbose 解释正在做什么 \n" +" --help 显示帮助并退出 \n" +" --version 输出版本信息并退出 \n" +"\n" +"这些标志是由 whois.ript.net 和 RIPE-like 服务器支持的： \n" +" -l 寻找有更少具体匹配的一个级别 \n" +"-L 寻找所有更少具体匹配的级别 \n" +"-m 寻找有更加具体匹配的一个级别 \n" +"-M 寻找有更加具体的匹配的所有级别 \n" +"-c 寻找包含 mnt-irt 属性的最小匹配 \n" +"-x 精确匹配 \n" +"-b return brief IP address ranges with abuse contact\n" +"-B 关闭对象过滤（显示 email 地址） \n" +"-G 关闭相关联对象的分组 \n" +"-d 返回 DNS 反解授权对象 \n" +"-i ATTR[,ATTR]... 对特定的属性（ ATTR ）进行逆向查询 \n" +"-T TYPE[,TYPE]... 只寻找 TYPE 的对象 \n" +"-K 只返回主键 \n" +"-r 关闭联系信息的递归查询 \n" +"-R 强制显示域对象的本地副本，即使 \n" +" 它包含引用 \n" +"-a 一并搜索所有的数据库镜像 \n" +"-s SOURCE[,SOURCE]... 从 SOURCE 中搜索数据库镜像 \n" +"-g SOURCE:FIRST-LAST 从串行的 FIRST 到 LAST 的 SOURCE 中查找更新 \n" +"-t TYPE 请求 TYPE 对象的模板 \n" +"-v TYPE 请求 TYPE 对象的详细模板 \n" +"-q [version|sources|types] 询问制定服务器信息 \n" #: ../mkpasswd.c:84 msgid "standard 56 bit DES-based crypt(3)" @@ -188,22 +221,19 @@ msgstr "尝试用 '%s --help' 获取更多的信息。\n" #: ../mkpasswd.c:242 -#, fuzzy, c-format +#, c-format msgid "Wrong salt length: %d byte when %d expected.\n" msgid_plural "Wrong salt length: %d bytes when %d expected.\n" -msgstr[0] "错误的随机字符（salt）长度: 当前为 %d 字节，预期长度为 %d 字节。\n" -msgstr[1] "错误的随机字符（salt）长度: 当前为 %d 字节，预期长度为 %d 字节。\n" +msgstr[0] "" +"错误的随即字符 ( salt ) 长度：当前为 %d 字节，预期长度为 %d 字节。\n" #: ../mkpasswd.c:247 -#, fuzzy, c-format +#, c-format msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n" msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n" msgstr[0] "" "错误的随机字符（salt）长度: 当前为 %d 字节，预期长度范围为 %d <= n <= %d 字" "节。\n" -msgstr[1] "" -"错误的随机字符（salt）长度: 当前为 %d 字节，预期长度范围为 %d <= n <= %d 字" -"节。\n" #: ../mkpasswd.c:256 #, c-format @@ -213,7 +243,7 @@ #: ../mkpasswd.c:306 ../mkpasswd.c:322 #, c-format msgid "Password: " -msgstr "密码: " +msgstr "密码：" #: ../mkpasswd.c:340 #, c-format @@ -232,7 +262,7 @@ "\n" #: ../mkpasswd.c:422 -#, fuzzy, c-format +#, c-format msgid "" " -m, --method=TYPE select method TYPE\n" " -5 like --method=md5\n" @@ -252,7 +282,7 @@ msgstr "" " -m, --method=TYPE \t选择使用 TYPE 的方法\n" " -S, --salt=SALT \t\t使用指定随机字符\n" -" -R, --rounds=NUMBER \t使用指定的循环次数\n" +" -R, --rounds=NUMBER \t使用指定的循环次数 NUMBER \n" " -P, --password-fd=NUM \t从文件描述符 NUM 中读取密码来\n" "\t\t\t\t替代从 /dev/tty 中获取密码\n" " -s, --stdin \t\t同 --password-fd=0\n" @@ -269,73 +299,3 @@ #, c-format msgid "Available methods:\n" msgstr "可用方式：\n" - -#, fuzzy -#~ msgid "" -#~ "Usage: whois [OPTION]... OBJECT...\n" -#~ "\n" -#~ "-l one level less specific lookup [RPSL only]\n" -#~ "-L find all Less specific matches\n" -#~ "-m find first level more specific matches\n" -#~ "-M find all More specific matches\n" -#~ "-c find the smallest match containing a mnt-irt " -#~ "attribute\n" -#~ "-x exact match [RPSL only]\n" -#~ "-d return DNS reverse delegation objects too [RPSL " -#~ "only]\n" -#~ "-i ATTR[,ATTR]... do an inverse lookup for specified ATTRibutes\n" -#~ "-T TYPE[,TYPE]... only look for objects of TYPE\n" -#~ "-K only primary keys are returned [RPSL only]\n" -#~ "-r turn off recursive lookups for contact " -#~ "information\n" -#~ "-R force to show local copy of the domain object " -#~ "even\n" -#~ " if it contains referral\n" -#~ "-a search all databases\n" -#~ "-s SOURCE[,SOURCE]... search the database from SOURCE\n" -#~ "-g SOURCE:FIRST-LAST find updates from SOURCE from serial FIRST to " -#~ "LAST\n" -#~ "-t TYPE request template for object of TYPE\n" -#~ "-v TYPE request verbose template for object of TYPE\n" -#~ "-q [version|sources|types] query specified server info [RPSL only]\n" -#~ "-F fast raw output (implies -r)\n" -#~ "-h HOST connect to server HOST\n" -#~ "-p PORT connect to PORT\n" -#~ "-H hide legal disclaimers\n" -#~ " --verbose explain what is being done\n" -#~ " --help display this help and exit\n" -#~ " --version output version information and exit\n" -#~ msgstr "" -#~ "用法: whois [选项]... 对象...\n" -#~ "\n" -#~ "-l 将精确度降低一级的查询 [仅 RPSL]\n" -#~ "-L 找到所有低精确度匹配\n" -#~ "-m 找到第一级较高精确度匹配\n" -#~ "-M 找到所有较高精确度匹配\n" -#~ "-c 找到最小的包含一个 mnt-irt 属性的匹配\n" -#~ "-x 精确匹配 [仅 RPSL]\n" -#~ "-d 同时返回 DNS 反向查询的代理对象[仅 RPSL]\n" -#~ "-i ATTR[,ATTR]... 为指定的属性(ATTRibutes)进行一次反向查询\n" -#~ "-T TYPE[,TYPE]... 仅查找指定类型(TYPE)的对象\n" -#~ "-K 只返回主键(primary keys) [RPSL only]\n" -#~ "-r 查询联系信息(contact information)时关闭递归查询\n" -#~ "-R 强制显示本地域名对象(domain object)副本\n" -#~ " 即使它包含转介(referral)\n" -#~ "-a 搜寻所有数据库\n" -#~ "-s SOURCE[,SOURCE]... 从指定 SOURCE 中搜寻数据库\n" -#~ "-g SOURCE:FIRST-LAST 从 SOURCE 中查找更新，按照从开始到结束的序列\n" -#~ "-t TYPE 为指定类型(TYPE)对象请求模板(template) ('all'为一个" -#~ "列表)\n" -#~ "-v TYPE 为指定类型(TYPE)对象请求冗余信息模板(verbose " -#~ "template) \n" -#~ "-q [version|sources|types] 查询特定的服务器信息[仅 RPSL]\n" -#~ "-F 快速输出原始数据(raw) (隐含 -r)\n" -#~ "-h HOST 连接到指定 HOST 服务器\n" -#~ "-p PORT 连接到指定 PORT 端口\n" -#~ "-H 隐藏法律声明内容\n" -#~ " --verbose 输出冗余的处理信息\n" -#~ " --help 显示这个帮助并退出\n" -#~ " --version 输出版本信息并退出\n" - -#~ msgid "Illegal password character '0x%hhx'.\n" -#~ msgstr "非法的密码字符 '0x%hhx'。\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/servers_charset_list new/whois-5.1.0/servers_charset_list --- old/whois-5.0.26/servers_charset_list 2013-05-10 05:12:58.000000000 +0200 +++ new/whois-5.1.0/servers_charset_list 2013-12-26 20:38:15.000000000 +0100 @@ -1,11 +1,14 @@ # server name charset optional parameters -whois.corenic.net utf-8 -C UTF-8 whois.cat utf-8 -C UTF-8 +whois.conac.cn utf-8 +whois.corenic.net utf-8 -C UTF-8 +whois.online.rs.corenic.net utf-8 -C UTF-8 +whois.site.rs.corenic.net utf-8 -C UTF-8 whois.museum utf-8 -C UTF-8 whois.aeda.net.ae utf-8 whois.ax iso-8859-1 -whois.nic.br iso-8859-1 +whois.registro.br iso-8859-1 whois.cira.ca iso-8859-1 whois.nic.ch utf-8 whois.nic.cl iso-8859-1 @@ -17,7 +20,7 @@ whois.dk-hostmaster.dk utf-8 --charset=utf-8 whois.eenet.ee iso-8859-1 whois.eu utf-8 -whois.ficora.fi iso-8859-1 +whois.fi iso-8859-1 whois.nic.fo utf-8 whois.nic.fr utf-8 whois.hkirc.hk utf-8 @@ -38,18 +41,25 @@ whois.dns.lu iso-8859-1 whois.nic.mu utf-8 whois.norid.no iso-8859-1 -whois.nic.nu utf-8 +whois.iis.nu utf-8 +whois.registry.pf utf-8 whois.dns.pt iso-8859-1 whois.registry.qa utf-8 +whois.nic.re utf-8 whois.rnids.rs utf-8 +whois.nic.net.sa utf-8 whois.iis.se utf-8 -whois.nic.net.sg utf-8 +whois.sgnic.sg utf-8 whois.tld.sy utf-8 whois.thnic.co.th utf-8 -whois.nic.tr utf-8 +whois.ati.tn windows-1252 +whois.nic.tr iso-8859-9 whois.twnic.net.tw utf-8 +whois.biz.ua utf-8 +whois.co.ua utf-8 whois.pp.ua utf-8 -whois.tn windows-1252 whois.ua utf-8 whois.nic.org.uy utf-8 +whois.nic.wf utf-8 +whois.nic.yt utf-8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/simple_recode.c new/whois-5.1.0/simple_recode.c --- old/whois-5.0.26/simple_recode.c 2013-03-30 02:31:41.000000000 +0100 +++ new/whois-5.1.0/simple_recode.c 2013-12-26 07:48:10.000000000 +0100 @@ -94,6 +94,7 @@ { size_t used = outp - result; size_t newsize; + char *new_result; if (outbuf_size < SIMPLE_RECODE_BUFFER_SIZE_2) newsize = SIMPLE_RECODE_BUFFER_SIZE_2; @@ -103,13 +104,17 @@ /* check if the newsize variable has overflowed */ if (newsize <= outbuf_size) { + free(result); errno = ENOMEM; return NULL; } outbuf_size = newsize; - result = realloc(result, outbuf_size); - if (!result) + new_result = realloc(result, outbuf_size); + if (!new_result) { + free(result); return NULL; + } + result = new_result; /* update the position in the new output stream */ outp = result + used; @@ -119,6 +124,7 @@ } default: + free(result); return NULL; } } while (inbytes_remaining > 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/tld_serv_list new/whois-5.1.0/tld_serv_list --- old/whois-5.0.26/tld_serv_list 2013-07-17 01:06:44.000000000 +0200 +++ new/whois-5.1.0/tld_serv_list 2013-12-26 10:20:10.000000000 +0100 @@ -13,6 +13,7 @@ .gb.net whois.centralnic.net .gr.com whois.centralnic.net .hu.com whois.centralnic.net +.in.net whois.centralnic.net .no.com whois.centralnic.net .qc.com whois.centralnic.net .ru.com whois.centralnic.net @@ -27,17 +28,17 @@ .jpn.com whois.centralnic.net .web.com whois.centralnic.net -.com VERISIGN whois.crsnic.net +.com VERISIGN whois.verisign-grs.com .za.net whois.za.net -.net VERISIGN whois.crsnic.net +.net VERISIGN whois.verisign-grs.com .eu.org whois.eu.org .za.org whois.za.org .org whois.pir.org -.edu whois.educause.net -.gov whois.nic.gov +.edu whois.educause.edu +.gov whois.dotgov.gov .int whois.iana.org .mil NONE @@ -47,20 +48,76 @@ .aero whois.aero .asia whois.nic.asia -.biz whois.nic.biz +.biz whois.biz .cat whois.cat .coop whois.nic.coop -.info whois.afilias.info +.info whois.afilias.net .jobs VERISIGN jobswhois.verisign-grs.com .mobi whois.dotmobiregistry.net .museum whois.museum .name whois.nic.name .post whois.dotpostregistry.net -.pro whois.registrypro.pro +.pro whois.dotproregistry.net .tel whois.nic.tel .travel whois.nic.travel .xxx whois.nic.xxx +# "new" gTLDs +.academy whois.donuts.co +.bike whois.donuts.co +.buzz whois.nic.buzz +.cab whois.donuts.co +.camera whois.donuts.co +.camp whois.donuts.co +.careers whois.donuts.co +.center whois.donuts.co +.clothing whois.donuts.co +.company whois.donuts.co +.computer whois.donuts.co +.construction whois.donuts.co +.contractors whois.donuts.co +.diamonds whois.donuts.co +.directory whois.donuts.co +.domains whois.donuts.co +.enterprises whois.donuts.co +.equipment whois.donuts.co +.estate whois.donuts.co +.gallery whois.donuts.co +.graphics whois.donuts.co +.guru whois.donuts.co +.holdings whois.donuts.co +.kitchen whois.donuts.co +.land whois.donuts.co +.lighting whois.donuts.co +.limo whois.donuts.co +.management whois.donuts.co +.menu whois.nic.menu +.photography whois.donuts.co +.photos whois.donuts.co +.plumbing whois.donuts.co +.recipes whois.donuts.co +.ruhr whois.nic.ruhr +.sexy whois.uniregistry.net +.shoes whois.donuts.co +.singles whois.donuts.co +.support whois.donuts.co +.systems whois.donuts.co +.tattoo whois.uniregistry.net +.technology whois.donuts.co +.tips whois.donuts.co +.today whois.donuts.co +.uno whois.nic.uno +.ventures whois.donuts.co +.viajes whois.donuts.co +.voyage whois.donuts.co +.xn--55qw42g whois.conac.cn +.xn--80asehdb whois.online.rs.corenic.net +.xn--80aswg whois.site.rs.corenic.net +.xn--ngbc5azd whois.nic.xn--ngbc5azd +.xn--q9jyb4c domain-registry-whois.l.google.com +.xn--unup4y whois.donuts.co +.xn--zfr164b whois.conac.cn + .ac whois.nic.ac .ad NONE # www.nic.ad .ae whois.aeda.net.ae @@ -68,7 +125,7 @@ .ag whois.nic.ag .ai whois.ai .al NONE # http://www.akep.al/en/kerkoni-domain -.am whois.nic.am +.am whois.amnic.net .an NONE # being phased out. deletion planned for 2014-10-31 .ao NONE # www.dns.ao .aq NONE # 2day.com @@ -76,7 +133,7 @@ .as whois.nic.as .priv.at whois.nic.priv.at # "unofficial" SLD .at whois.nic.at -.au whois.ausregistry.net.au +.au whois.audns.net.au .aw NONE # http://setar.aw/internet/domain-registration.html .ax whois.ax # www.ax .az WEB http://www.nic.az/ @@ -94,22 +151,22 @@ .bn whois.bn # www.brunet.bn .bo whois.nic.bo #.bq -.br whois.nic.br +.br whois.registro.br .bs WEB http://www.nic.bs/cgi-bin/search.pl .bt WEB http://www.nic.bt/ .bv NONE # http://www.norid.no/domenenavnbaser/bv-sj.html .by whois.cctld.by -.bw WEB http://www.whois.bw/ +.bw whois.nic.net.bw .bz AFILIAS .co.ca whois.co.ca .ca whois.cira.ca -.cc VERISIGN whois.nic.cc +.cc VERISIGN ccwhois.verisign-grs.com .cd whois.nic.cd .cf whois.dot.cf .cg WEB http://www.nic.cg/cgi-bin/whois.pl .ch whois.nic.ch -.ci www.nic.ci -.ck whois.nic.ck +.ci whois.nic.ci +.ck NONE .cl whois.nic.cl .cm whois.netcom.cm .edu.cn whois.edu.cn @@ -137,15 +194,15 @@ .es WEB https://www.nic.es/ .et NONE # http://www.ethionet.et/ .eu whois.eu -.fi whois.ficora.fi +.fi whois.fi .fj whois.usp.ac.fj .fk NONE # http://www.fidc.co.fk/ .fm WEB http://dot.fm/whois.html .fo whois.nic.fo .fr whois.nic.fr -.ga NONE # whois.dot.ga NOT ACTIVE YET # www.nic.ga +.ga whois.dot.ga # www.my.ga .gb NONE -.gd whois.adamsnames.tc +.gd whois.nic.gd .ge WEB http://www.registration.ge/ .gf WEB https://www.dom-enic.com/whois.html .gg whois.gg @@ -164,7 +221,7 @@ .gy whois.registry.gy .hk whois.hkirc.hk .hm whois.registry.hm -.hn AFILIAS # www.nic.hn +.hn whois.nic.hn .hr whois.dns.hr .ht whois.nic.ht .hu whois.nic.hu @@ -172,7 +229,7 @@ .ie whois.domainregistry.ie .il whois.isoc.org.il .im whois.nic.im -.in whois.registry.in # afilias +.in whois.inregistry.net # afilias .io whois.nic.io .iq whois.cmc.iq # http://www.cmc.iq/en/iq.html .ir whois.nic.ir @@ -196,7 +253,7 @@ .la whois.nic.la .lb WEB http://www.aub.edu.lb/lbdr/ .lc AFILIAS -.li whois.nic.ch +.li whois.nic.li .lk whois.nic.lk .lr NONE # http://www.psg.com/dns/lr/ .ls WEB http://www.co.ls/co.asp @@ -207,14 +264,14 @@ .ma whois.iam.net.ma # www.nic.ma .mc NONE # www.nic.mc .md WEB http://www.dns.md/wh1.php # whois.nic.md is restricted -.me whois.meregistry.net # afilias +.me whois.nic.me # afilias #.mf .mg whois.nic.mg .mh NONE # www.nic.net.mh .mk WEB http://dns.marnet.net.mk/registar.php -.ml NONE # whois.dot.ml NOT ACTIVE YET # www.point.ml +.ml whois.dot.ml # www.point.ml .mm NONE # www.nic.mm -.mn AFILIAS +.mn whois.nic.mn .mo WEB http://www.monic.net.mo/ # whois.monic.mo is restricted .mp NONE # get.mp .mq WEB https://www.dom-enic.com/whois.html @@ -224,11 +281,11 @@ .mu whois.nic.mu .mv NONE # NIC? www.dhiraagu.com.mv .mw WEB http://www.registrar.mw/ -.mx whois.nic.mx +.mx whois.mx .my whois.domainregistry.my .mz NONE # NIC? www.uem.mz .na whois.na-nic.com.na -.nc whois.cctld.nc +.nc whois.nc .ne NONE # NIC? http://www.intnet.ne .nf whois.nic.nf .ng whois.nic.net.ng @@ -237,18 +294,18 @@ .no whois.norid.no .np WEB http://register.mos.com.np/userSearchInc.asp .nr WEB http://www.cenpac.net.nr/dns/whois.html -.nu whois.nic.nu +.nu whois.iis.nu .nz whois.srs.net.nz .om whois.registry.om .pa WEB http://www.nic.pa/ .pe kero.yachay.pe -.pf NONE # http://www.opt.pf/home/ +.pf whois.registry.pf .pg NONE # http://www.unitech.ac.pg/ .ph WEB http://www.dot.ph/whois .pk WEB http://www.pknic.net.pk/ .co.pl whois.co.pl # "unofficial" SLD .pl whois.dns.pl -.pm whois.nic.fr +.pm whois.nic.pm .pn WEB http://www.pitcairn.pn/PnRegistry/ .pr whois.nic.pr .ps whois.pnina.ps @@ -256,18 +313,18 @@ .pw whois.nic.pw .py WEB http://www.nic.py/consultas.html .qa whois.registry.qa -.re whois.nic.fr +.re whois.nic.re .ro whois.rotld.ro .rs whois.rnids.rs .edu.ru whois.informika.ru .ru whois.tcinet.ru .rw whois.ricta.org.rw # http://www.ricta.org.rw/ .sa whois.nic.net.sa -.sb whois.coccaregistry.net +.sb whois.nic.sb .sc AFILIAS # www.nic.sc .sd NONE # http://isoc.sd/sis/index.php/sd-domain .se whois.iis.se -.sg whois.nic.net.sg +.sg whois.sgnic.sg .sh whois.nic.sh .si whois.arnes.si .sj NONE # http://www.norid.no/domenenavnbaser/bv-sj.html @@ -293,12 +350,12 @@ .tk whois.dot.tk .tl whois.nic.tl .tm whois.nic.tm -.tn whois.tn +.tn whois.ati.tn .to whois.tonic.to .tp NONE # phase out in progress .tr whois.nic.tr .tt WEB http://www.nic.tt/cgi-bin/search.pl -.tv VERISIGN whois.nic.tv +.tv VERISIGN tvwhois.verisign-grs.com .tw whois.twnic.net.tw .tz whois.tznic.or.tz .biz.ua whois.biz.ua @@ -331,10 +388,10 @@ .vi WEB http://www.nic.vi/whoisform.htm .vn WEB http://www.vnnic.vn/en/domain .vu WEB http://www.vunic.vu/whois.html -.wf whois.nic.fr -.ws whois.samoanic.ws +.wf whois.nic.wf +.ws whois.website.ws .ye NONE # NIC? http://www.y.net.ye/services/domain_name.htm -.yt whois.nic.fr +.yt whois.nic.yt .ac.za whois.ac.za .alt.za whois.alt.za .co.za whois.registry.net.za @@ -349,38 +406,40 @@ # AW means that I had to guess the whois server name, but I was not able # to find any registered subdomains to verify it. .xn--3e0b707e whois.kr # Korea, Republic of -.xn--45brj9c whois.registry.in # India, Bengali AW +.xn--45brj9c whois.inregistry.net # India, Bengali AW .xn--80ao21a whois.nic.kz # Kazakhstan .xn--90a3ac whois.rnids.rs # Serbia -.xn--clchc0ea0b2g2a9gcd whois.nic.net.sg # Singapore, Tamil +.xn--clchc0ea0b2g2a9gcd whois.sgnic.sg # Singapore, Tamil .xn--fiqs8s cwhois.cnnic.cn # China, Simplified Chinese .xn--fiqz9s cwhois.cnnic.cn # China, Traditional Chinese -.xn--fpcrj9c3d whois.registry.in # India, Telugu AW +.xn--fpcrj9c3d whois.inregistry.net # India, Telugu AW .xn--fzc2c9e2c whois.nic.lk # Sri Lanka, Sinhala -.xn--gecrj9c whois.registry.in # India, Gujarati AW -.xn--h2brj9c whois.registry.in # India, Hindi AW -.xn--j1amh whois.ua # Ukraine AW +.xn--gecrj9c whois.inregistry.net # India, Gujarati AW +.xn--h2brj9c whois.inregistry.net # India, Hindi AW +.xn--j1amh whois.dotukr.com # Ukraine .xn--j6w193g whois.hkirc.hk # Hong Kong .xn--kprw13d whois.twnic.net.tw # Taiwan, Simplified Chinese .xn--kpry57d whois.twnic.net.tw # Taiwan, Traditional Chinese +.xn--l1acc whois.nic.mn # Mongolia AW .xn--lgbbat1ad8j whois.nic.dz # Algeria .xn--mgb9awbf whois.registry.om # Oman AW +.xn--mgba3a4f16a whois.nic.ir # Iran .xn--mgbaam7a8h whois.aeda.net.ae # United Arab Emirates .xn--mgbayh7gpa WEB http://idn.jo/whois_a.aspx # Jordan -.xn--mgbbh1a71e whois.registry.in # India, Urdu AW +.xn--mgbbh1a71e whois.inregistry.net # India, Urdu AW .xn--mgbc0a9azcg NONE # Morocco -.xn--mgberp4a5d4ar WEB http://nic.sa/view/whois # Saudi Arabia +.xn--mgberp4a5d4ar whois.nic.net.sa # Saudi Arabia .xn--mgbx4cd0ab whois.domainregistry.my # Malaysia AW .xn--o3cw4h whois.thnic.co.th # Thailand .xn--ogbpf8fl whois.tld.sy # Syria .xn--p1ai whois.tcinet.ru # Russian Federation .xn--pgbs0dh NONE # Tunisia -.xn--s9brj9c whois.registry.in # India, Punjabi AW +.xn--s9brj9c whois.inregistry.net # India, Punjabi AW .xn--wgbh1c whois.dotmasr.eg # Egypt .xn--wgbl6a whois.registry.qa # Qatar .xn--xkc2al3hye2a whois.nic.lk # Sri Lanka, Tamil -.xn--xkc2dl3a5ee0h whois.registry.in # India, Tamil AW -.xn--yfro4i67o whois.nic.net.sg # Singapore, Chinese +.xn--xkc2dl3a5ee0h whois.inregistry.net # India, Tamil AW +.xn--yfro4i67o whois.sgnic.sg # Singapore, Chinese .xn--ygbi2ammx whois.pnina.ps # Palestinian Territory -dom whois.networksolutions.com @@ -392,8 +451,7 @@ -lacnic whois.lacnic.net -afrinic whois.afrinic.net -ap whois.apnic.net --ar whois.aunic.net --cn whois.cnnic.net.cn +-cn whois.cnnic.cn -cz whois.nic.cz -dk whois.dk-hostmaster.dk -il whois.isoc.org.il @@ -402,18 +460,19 @@ -ti whois.telstra.net -tw whois.twnic.net.tw -coop whois.nic.coop --cknic whois.nic.ck -frnic whois.nic.fr -gandi whois.gandi.net -kenic whois.kenic.or.ke -lrms whois.afilias.info --metu whois.metu.edu.tr +-metu whois.nic.tr -nicat whois.nic.at +-nicci whois.nic.ci -nicir whois.nic.ir -norid whois.norid.no -rotld whois.rotld.ro --sgnic whois.nic.net.sg +-sgnic whois.sgnic.sg -tel whois.nic.tel -uanic whois.ua --uynic www.rau.edu.uy +-cunic whois.cunic.ua +-uynic whois.nic.org.uy -sixxs whois.sixxs.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/whois.1 new/whois-5.1.0/whois.1 --- old/whois-5.0.26/whois.1 2013-04-10 17:26:47.000000000 +0200 +++ new/whois-5.1.0/whois.1 2013-12-26 07:48:10.000000000 +0100 @@ -131,7 +131,7 @@ Return the template for a object of \fITYPE\fP. .TP 8 .B \-T TYPE[,TYPE]... -Restrict the search to objects of \fITYPE\fP. Multiple types are separeted by +Restrict the search to objects of \fITYPE\fP. Multiple types are separated by a comma. .TP 8 .B -v TYPE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/whois.c new/whois-5.1.0/whois.c --- old/whois-5.0.26/whois.c 2013-04-10 17:26:27.000000000 +0200 +++ new/whois-5.1.0/whois.c 2013-12-26 07:48:10.000000000 +0100 @@ -133,6 +133,7 @@ break; case 'V': client_tag = optarg; + break; case 'H': hide_discl = HIDE_NOT_STARTED; /* enable disclaimers hiding */ break; @@ -219,7 +220,7 @@ int handle_query(const char *hserver, const char *hport, const char *query, const char *flags) { - const char *server = NULL, *port = NULL; + char *server = NULL, *port = NULL; char *p, *query_string; if (hport) { @@ -234,7 +235,7 @@ switch (server[0]) { case 0: if (!(server = getenv("WHOIS_SERVER"))) - server = DEFAULTSERVER; + server = strdup(DEFAULTSERVER); break; case 1: puts(_("This TLD has no whois server, but you can access the " @@ -254,28 +255,33 @@ if (verb) printf(_("Using server %s.\n"), server + 1); sockfd = openconn(server + 1, NULL); + free(server); server = query_crsnic(sockfd, query); break; case 8: if (verb) printf(_("Using server %s.\n"), "whois.afilias-grs.info"); sockfd = openconn("whois.afilias-grs.info", NULL); + free(server); server = query_afilias(sockfd, query); break; case 0x0A: p = convert_6to4(query); printf(_("\nQuerying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n\n"), p); + free(server); server = guess_server(p); query = p; goto retry; case 0x0B: p = convert_teredo(query); printf(_("\nQuerying for the IPv4 endpoint %s of a Teredo IPv6 address.\n\n"), p); + free(server); server = guess_server(p); query = p; goto retry; case 0x0C: p = convert_inaddr(query); + free(server); server = guess_server(p); free(p); goto retry; @@ -379,9 +385,9 @@ #endif /* Parses an user-supplied string and tries to guess the right whois server. - * Returns a statically allocated buffer. + * Returns a dinamically allocated buffer. */ -const char *guess_server(const char *s) +char *guess_server(const char *s) { unsigned long ip, as32; unsigned int i; @@ -394,45 +400,45 @@ /* RPSL hierarchical objects */ if (strncaseeq(s, "as", 2)) { if (isasciidigit(s[2])) - return whereas(atol(s + 2)); + return strdup(whereas(atol(s + 2))); else - return ""; + return strdup(""); } v6prefix = strtol(s, NULL, 16); if (v6prefix == 0) - return "\x05"; /* unknown */ + return strdup("\x05"); /* unknown */ v6net = (v6prefix << 16) + strtol(colon + 1, NULL, 16);/* second u16 */ for (i = 0; ip6_assign[i].serv; i++) { if ((v6net & (~0UL << (32 - ip6_assign[i].masklen))) == ip6_assign[i].net) - return ip6_assign[i].serv; + return strdup(ip6_assign[i].serv); } - return "\x06"; /* unknown allocation */ + return strdup("\x06"); /* unknown allocation */ } /* email address */ if (strchr(s, '@')) - return "\x05"; + return strdup("\x05"); /* no dot and no hyphen means it's a NSI NIC handle or ASN (?) */ if (!strpbrk(s, ".-")) { if (strncaseeq(s, "as", 2) && /* it's an AS */ (isasciidigit(s[2]) || s[2] == ' ')) - return whereas(atol(s + 2)); + return strdup(whereas(atol(s + 2))); if (*s == '!') /* NSI NIC handle */ - return "whois.networksolutions.com"; + return strdup("whois.networksolutions.com"); else - return "\x05"; /* probably a unknown kind of nic handle */ + return strdup("\x05"); /* probably a unknown kind of nic handle */ } /* ASN32? */ if (strncaseeq(s, "as", 2) && s[2] && (as32 = asn32_to_long(s + 2)) != 0) - return whereas32(as32); + return strdup(whereas32(as32)); /* smells like an IP? */ #ifdef HAVE_INET_PTON @@ -443,28 +449,28 @@ #endif for (i = 0; ip_assign[i].serv; i++) if ((ip & ip_assign[i].mask) == ip_assign[i].net) - return ip_assign[i].serv; - return "\x05"; /* not in the unicast IPv4 space */ + return strdup(ip_assign[i].serv); + return strdup("\x05"); /* not in the unicast IPv4 space */ } /* check the TLDs list */ for (i = 0; tld_serv[i]; i += 2) if (domcmp(s, tld_serv[i])) - return tld_serv[i + 1]; + return strdup(tld_serv[i + 1]); /* no dot but hyphen */ if (!strchr(s, '.')) { /* search for strings at the start of the word */ for (i = 0; nic_handles[i]; i += 2) if (strncaseeq(s, nic_handles[i], strlen(nic_handles[i]))) - return nic_handles[i + 1]; + return strdup(nic_handles[i + 1]); /* it's probably a network name */ - return ""; + return strdup(""); } /* has dot and maybe a hyphen and it's not in tld_serv[], WTF is it? */ /* either a TLD or a NIC handle we don't know about yet */ - return "\x05"; + return strdup("\x05"); } const char *whereas32(const unsigned long asn) @@ -615,7 +621,7 @@ } /* returns a string which should be freed by the caller, or NULL */ -const char *do_query(const int sock, const char *query) +char *do_query(const int sock, const char *query) { char *temp, *p, buf[2000]; FILE *fi; @@ -678,7 +684,7 @@ return referral_server; } -const char *query_crsnic(const int sock, const char *query) +char *query_crsnic(const int sock, const char *query) { char *temp, *p, buf[2000]; FILE *fi; @@ -728,7 +734,7 @@ return referral_server; } -const char *query_afilias(const int sock, const char *query) +char *query_afilias(const int sock, const char *query) { char *temp, *p, buf[2000]; FILE *fi; @@ -1008,7 +1014,7 @@ /* server and port have to be freed by the caller */ void split_server_port(const char *const input, - const char **server, const char **port) { + char **server, char **port) { char *p; if (*input == '[' && (p = strchr(input, ']'))) { /* IPv6 */ @@ -1117,7 +1123,7 @@ { char *new; char *endptr; - unsigned int a, b = 0, c = 0; + long int a, b = 0, c = 0; errno = 0; @@ -1141,7 +1147,7 @@ } new = malloc(sizeof("255.255.255.255")); - sprintf(new, "%d.%d.%d.0", c, b, a); + sprintf(new, "%ld.%ld.%ld.0", c, b, a); return new; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/whois.h new/whois-5.1.0/whois.h --- old/whois-5.0.26/whois.h 2013-04-10 17:25:05.000000000 +0200 +++ new/whois-5.1.0/whois.h 2013-12-26 10:03:05.000000000 +0100 @@ -3,22 +3,21 @@ /* String sent to RIPE servers - MUST NOT BE LONGER THAN FIVE CHARACTERS! */ /* Do *NOT* change it if you don't know what you are doing! */ -#define IDSTRING "Md5.0" +#define IDSTRING "Md5.1" #define HIDE_DISABLED -2 #define HIDE_NOT_STARTED -1 /* prototypes */ -const char *guess_server(const char *); +char *guess_server(const char *); const char *match_config_file(const char *); const char *whereas(const unsigned long); const char *whereas32(const unsigned long); char *queryformat(const char *, const char *, const char *); int hide_line(int *hiding, const char *const line); -const char *do_query(const int, const char *); -const char *query_crsnic(const int, const char *); -const char *query_pir(const int, const char *); -const char *query_afilias(const int, const char *); +char *do_query(const int, const char *); +char *query_crsnic(const int, const char *); +char *query_afilias(const int, const char *); int openconn(const char *, const char *); int connect_with_timeout(int, const struct sockaddr *, socklen_t, int); void usage(int error); @@ -36,8 +35,7 @@ char *convert_inaddr(const char *); int handle_query(const char *server, const char *port, const char *qstring, const char *fstring); -void split_server_port(const char *const input, const char **server, - const char **port); +void split_server_port(const char *const input, char **server, char **port); /* flags for RIPE-like servers */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.26/whois.spec new/whois-5.1.0/whois.spec --- old/whois-5.0.26/whois.spec 2013-07-17 01:06:44.000000000 +0200 +++ new/whois-5.1.0/whois.spec 2013-12-26 10:04:57.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Enhanced WHOIS client Name: whois -Version: 5.0.26 +Version: 5.1.0 Release: 1 License: GPL Vendor: Marco d'Itri <md(a)linux.it> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tor for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package tor for openSUSE:Factory checked in at 2013-12-30 10:46:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tor (Old) and /work/SRC/openSUSE:Factory/.tor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tor" Changes: -------- --- /work/SRC/openSUSE:Factory/tor/tor.changes 2013-12-16 07:15:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tor.new/tor.changes 2013-12-30 10:46:56.000000000 +0100 @@ -1,0 +2,37 @@ +Fri Dec 27 20:55:26 UTC 2013 - andreas.stieger(a)gmx.de + +- tor 0.2.4.20 + fixes potentially poor random number generation for users who + 1) use OpenSSL 1.0.0 or later, + 2) set "HardwareAccel 1" in their torrc file, + 3) have "Sandy Bridge" or "Ivy Bridge" Intel processors + and + 4) have no state file in their DataDirectory (as would happen on + first start). + Users who generated relay or hidden service identity keys in such + a situation should discard them and generate new ones. + No 2 is not the default configuration for openSUSE. + This release also fixes a logic error that caused Tor clients to build + many more preemptive circuits than they actually need. +- Major bugfixes: + - Do not allow OpenSSL engines to replace the PRNG, even when + HardwareAccel is set. The only default builtin PRNG engine uses + the Intel RDRAND instruction to replace the entire PRNG, and + ignores all attempts to seed it with more entropy. That's + cryptographically stupid: the right response to a new alleged + entropy source is never to discard all previously used entropy + sources. Fixes bug 10402; works around behavior introduced in + OpenSSL 1.0.0. + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. + - Avoid launching spurious extra circuits when a stream is pending. + This fixes a bug where any circuit that _wasn't_ unusable for new + streams would be treated as if it were, causing extra circuits to + be launched. +- Minor bugfixes: + - Avoid a crash bug when starting with a corrupted microdescriptor + cache file. + - If we fail to dump a previously cached microdescriptor to disk, avoid + freeing duplicate data later on. + +------------------------------------------------------------------- Old: ---- tor-0.2.4.19.tar.gz tor-0.2.4.19.tar.gz.asc New: ---- tor-0.2.4.20.tar.gz tor-0.2.4.20.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tor.spec ++++++ --- /var/tmp/diff_new_pack.jl3hSf/_old 2013-12-30 10:46:57.000000000 +0100 +++ /var/tmp/diff_new_pack.jl3hSf/_new 2013-12-30 10:46:57.000000000 +0100 @@ -19,7 +19,7 @@ %define with_bufferevents 0%{?suse_version} > 1220 Name: tor -Version: 0.2.4.19 +Version: 0.2.4.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Anonymizing overlay network for TCP (The onion router) ++++++ tor-0.2.4.19.tar.gz -> tor-0.2.4.20.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/ChangeLog new/tor-0.2.4.20/ChangeLog --- old/tor-0.2.4.19/ChangeLog 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/ChangeLog 2013-12-23 06:35:55.000000000 +0100 @@ -1,3 +1,39 @@ +Changes in version 0.2.4.20 - 2013-12-22 + Tor 0.2.4.20 fixes potentially poor random number generation for users + who 1) use OpenSSL 1.0.0 or later, 2) set "HardwareAccel 1" in their + torrc file, 3) have "Sandy Bridge" or "Ivy Bridge" Intel processors, + and 4) have no state file in their DataDirectory (as would happen on + first start). Users who generated relay or hidden service identity + keys in such a situation should discard them and generate new ones. + + This release also fixes a logic error that caused Tor clients to build + many more preemptive circuits than they actually need. + + o Major bugfixes: + - Do not allow OpenSSL engines to replace the PRNG, even when + HardwareAccel is set. The only default builtin PRNG engine uses + the Intel RDRAND instruction to replace the entire PRNG, and + ignores all attempts to seed it with more entropy. That's + cryptographically stupid: the right response to a new alleged + entropy source is never to discard all previously used entropy + sources. Fixes bug 10402; works around behavior introduced in + OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman" + and "rl1987". + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. + - Avoid launching spurious extra circuits when a stream is pending. + This fixes a bug where any circuit that _wasn't_ unusable for new + streams would be treated as if it were, causing extra circuits to + be launched. Fixes bug 10456; bugfix on 0.2.4.12-alpha. + + o Minor bugfixes: + - Avoid a crash bug when starting with a corrupted microdescriptor + cache file. Fixes bug 10406; bugfix on 0.2.2.6-alpha. + - If we fail to dump a previously cached microdescriptor to disk, avoid + freeing duplicate data later on. Fixes bug 10423; bugfix on + 0.2.4.13-alpha. Spotted by "bobnomnom". + + Changes in version 0.2.4.19 - 2013-12-11 The Tor 0.2.4 release series is dedicated to the memory of Aaron Swartz (1986-2013). Aaron worked on diverse projects including helping to guide diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/ReleaseNotes new/tor-0.2.4.20/ReleaseNotes --- old/tor-0.2.4.19/ReleaseNotes 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/ReleaseNotes 2013-12-23 00:37:45.000000000 +0100 @@ -3,6 +3,42 @@ of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.4.20 - 2013-12-22 + Tor 0.2.4.20 fixes potentially poor random number generation for users + who 1) use OpenSSL 1.0.0 or later, 2) set "HardwareAccel 1" in their + torrc file, 3) have "Sandy Bridge" or "Ivy Bridge" Intel processors, + and 4) have no state file in their DataDirectory (as would happen on + first start). Users who generated relay or hidden service identity + keys in such a situation should discard them and generate new ones. + + This release also fixes a logic error that caused Tor clients to build + many more preemptive circuits than they actually need. + + o Major bugfixes: + - Do not allow OpenSSL engines to replace the PRNG, even when + HardwareAccel is set. The only default builtin PRNG engine uses + the Intel RDRAND instruction to replace the entire PRNG, and + ignores all attempts to seed it with more entropy. That's + cryptographically stupid: the right response to a new alleged + entropy source is never to discard all previously used entropy + sources. Fixes bug 10402; works around behavior introduced in + OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman" + and "rl1987". + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. + - Avoid launching spurious extra circuits when a stream is pending. + This fixes a bug where any circuit that _wasn't_ unusable for new + streams would be treated as if it were, causing extra circuits to + be launched. Fixes bug 10456; bugfix on 0.2.4.12-alpha. + + o Minor bugfixes: + - Avoid a crash bug when starting with a corrupted microdescriptor + cache file. Fixes bug 10406; bugfix on 0.2.2.6-alpha. + - If we fail to dump a previously cached microdescriptor to disk, avoid + freeing duplicate data later on. Fixes bug 10423; bugfix on + 0.2.4.13-alpha. Spotted by "bobnomnom". + + Changes in version 0.2.4.19 - 2013-12-11 The Tor 0.2.4 release series is dedicated to the memory of Aaron Swartz (1986-2013). Aaron worked on diverse projects including helping to guide diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/configure new/tor-0.2.4.20/configure --- old/tor-0.2.4.19/configure 2013-12-10 23:08:30.000000000 +0100 +++ new/tor-0.2.4.20/configure 2013-12-23 06:36:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for tor 0.2.4.19. +# Generated by GNU Autoconf 2.69 for tor 0.2.4.20. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='tor' PACKAGE_TARNAME='tor' -PACKAGE_VERSION='0.2.4.19' -PACKAGE_STRING='tor 0.2.4.19' +PACKAGE_VERSION='0.2.4.20' +PACKAGE_STRING='tor 0.2.4.20' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1357,7 +1357,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tor 0.2.4.19 to adapt to many kinds of systems. +\`configure' configures tor 0.2.4.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1427,7 +1427,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tor 0.2.4.19:";; + short | recursive ) echo "Configuration of tor 0.2.4.20:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tor configure 0.2.4.19 +tor configure 0.2.4.20 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2268,7 +2268,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tor $as_me 0.2.4.19, which was +It was created by tor $as_me 0.2.4.20, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3085,7 +3085,7 @@ # Define the identity of the package. PACKAGE='tor' - VERSION='0.2.4.19' + VERSION='0.2.4.20' cat >>confdefs.h <<_ACEOF @@ -12126,7 +12126,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tor $as_me 0.2.4.19, which was +This file was extended by tor $as_me 0.2.4.20, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12192,7 +12192,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -tor config.status 0.2.4.19 +tor config.status 0.2.4.20 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/configure.ac new/tor-0.2.4.20/configure.ac --- old/tor-0.2.4.19/configure.ac 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/configure.ac 2013-12-23 06:35:55.000000000 +0100 @@ -3,7 +3,7 @@ dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.19]) +AC_INIT([tor],[0.2.4.20]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/contrib/tor-mingw.nsi.in new/tor-0.2.4.20/contrib/tor-mingw.nsi.in --- old/tor-0.2.4.19/contrib/tor-mingw.nsi.in 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/contrib/tor-mingw.nsi.in 2013-12-23 06:35:55.000000000 +0100 @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.19" +!define VERSION "0.2.4.20" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/tor-fw-helper.1.in new/tor-0.2.4.20/doc/tor-fw-helper.1.in --- old/tor-0.2.4.19/doc/tor-fw-helper.1.in 2013-11-16 19:13:13.000000000 +0100 +++ new/tor-0.2.4.20/doc/tor-fw-helper.1.in 2013-07-14 02:27:29.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: tor-fw-helper .\" Author: Jacob Appelbaum .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 11/16/2013 +.\" Date: 07/13/2013 .\" Manual: Tor Manual .\" Source: Tor .\" Language: English .\" -.TH "TOR\-FW\-HELPER" "1" "11/16/2013" "Tor" "Tor Manual" +.TH "TOR\-FW\-HELPER" "1" "07/13/2013" "Tor" "Tor Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/tor-fw-helper.html.in new/tor-0.2.4.20/doc/tor-fw-helper.html.in --- old/tor-0.2.4.19/doc/tor-fw-helper.html.in 2013-11-16 19:13:12.000000000 +0100 +++ new/tor-0.2.4.20/doc/tor-fw-helper.html.in 2013-07-14 02:27:29.000000000 +0200 @@ -841,7 +841,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-10-09 15:29:52 EDT +Last updated 2013-07-06 18:11:10 EDT </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/tor-gencert.1.in new/tor-0.2.4.20/doc/tor-gencert.1.in --- old/tor-0.2.4.19/doc/tor-gencert.1.in 2013-09-05 05:41:41.000000000 +0200 +++ new/tor-0.2.4.20/doc/tor-gencert.1.in 2013-07-01 22:30:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: tor-gencert .\" Author: Nick Mathewson .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 09/04/2013 +.\" Date: 07/01/2013 .\" Manual: Tor Manual .\" Source: Tor .\" Language: English .\" -.TH "TOR\-GENCERT" "1" "09/04/2013" "Tor" "Tor Manual" +.TH "TOR\-GENCERT" "1" "07/01/2013" "Tor" "Tor Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/tor-gencert.html.in new/tor-0.2.4.20/doc/tor-gencert.html.in --- old/tor-0.2.4.19/doc/tor-gencert.html.in 2013-09-05 05:41:49.000000000 +0200 +++ new/tor-0.2.4.20/doc/tor-gencert.html.in 2013-07-01 22:30:13.000000000 +0200 @@ -896,7 +896,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-22 20:10:09 EDT +Last updated 2013-06-05 21:24:12 EDT </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/tor-resolve.1.in new/tor-0.2.4.20/doc/tor-resolve.1.in --- old/tor-0.2.4.19/doc/tor-resolve.1.in 2013-09-05 05:41:44.000000000 +0200 +++ new/tor-0.2.4.20/doc/tor-resolve.1.in 2013-07-01 22:30:08.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: tor-resolve .\" Author: Peter Palfrader .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 09/04/2013 +.\" Date: 07/01/2013 .\" Manual: Tor Manual .\" Source: Tor .\" Language: English .\" -.TH "TOR\-RESOLVE" "1" "09/04/2013" "Tor" "Tor Manual" +.TH "TOR\-RESOLVE" "1" "07/01/2013" "Tor" "Tor Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/tor-resolve.html.in new/tor-0.2.4.20/doc/tor-resolve.html.in --- old/tor-0.2.4.19/doc/tor-resolve.html.in 2013-09-05 05:41:49.000000000 +0200 +++ new/tor-0.2.4.20/doc/tor-resolve.html.in 2013-07-01 22:30:14.000000000 +0200 @@ -821,7 +821,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-22 20:10:09 EDT +Last updated 2013-06-05 21:24:12 EDT </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/tor.1.in new/tor-0.2.4.20/doc/tor.1.in --- old/tor-0.2.4.19/doc/tor.1.in 2013-12-10 23:10:01.000000000 +0100 +++ new/tor-0.2.4.20/doc/tor.1.in 2013-12-23 07:24:29.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: tor .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 12/10/2013 +.\" Date: 12/23/2013 .\" Manual: Tor Manual .\" Source: Tor .\" Language: English .\" -.TH "TOR" "1" "12/10/2013" "Tor" "Tor Manual" +.TH "TOR" "1" "12/23/2013" "Tor" "Tor Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/tor.html.in new/tor-0.2.4.20/doc/tor.html.in --- old/tor-0.2.4.19/doc/tor.html.in 2013-12-10 23:10:05.000000000 +0100 +++ new/tor-0.2.4.20/doc/tor.html.in 2013-12-23 07:24:55.000000000 +0100 @@ -4447,7 +4447,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-12-10 17:08:26 EST +Last updated 2013-12-23 00:35:55 EST </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/torify.1.in new/tor-0.2.4.20/doc/torify.1.in --- old/tor-0.2.4.19/doc/torify.1.in 2013-10-10 20:55:24.000000000 +0200 +++ new/tor-0.2.4.20/doc/torify.1.in 2013-07-07 00:39:32.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: torify .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 10/10/2013 +.\" Date: 07/06/2013 .\" Manual: Tor Manual .\" Source: Tor .\" Language: English .\" -.TH "TORIFY" "1" "10/10/2013" "Tor" "Tor Manual" +.TH "TORIFY" "1" "07/06/2013" "Tor" "Tor Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/doc/torify.html.in new/tor-0.2.4.20/doc/torify.html.in --- old/tor-0.2.4.19/doc/torify.html.in 2013-10-10 20:55:28.000000000 +0200 +++ new/tor-0.2.4.20/doc/torify.html.in 2013-07-07 00:39:36.000000000 +0200 @@ -789,7 +789,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-10-09 15:29:52 EDT +Last updated 2013-07-06 18:11:10 EDT </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/micro-revision.i new/tor-0.2.4.20/micro-revision.i --- old/tor-0.2.4.19/micro-revision.i 2013-12-10 23:09:33.000000000 +0100 +++ new/tor-0.2.4.20/micro-revision.i 2013-12-23 07:20:53.000000000 +0100 @@ -1 +1 @@ -"e719d05fd296a9dd" +"3cb5c70beec5bf46" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/common/common_sha1.i new/tor-0.2.4.20/src/common/common_sha1.i --- old/tor-0.2.4.19/src/common/common_sha1.i 2013-12-10 23:08:53.000000000 +0100 +++ new/tor-0.2.4.20/src/common/common_sha1.i 2013-12-23 07:16:29.000000000 +0100 @@ -1,5 +1,5 @@ "6df0654a8a4ec4df3dd8091424d2fbb4d795dc0b src/common/aes.c\n" -"48dd91d36656559ccafbad27946d68b16406bf6b src/common/crypto.c\n" +"2e4e078d95ba5772913d20915096388de95c9458 src/common/crypto.c\n" "e690691451ae42afdaff915313ead860b1d021d0 src/common/crypto_format.c\n" "02c1744d1e1db0967595bc6bd2d69432692d082f src/common/torgzip.c\n" "affb838c4670191cd5e021953f7876687b494166 src/common/tortls.c\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/common/crypto.c new/tor-0.2.4.20/src/common/crypto.c --- old/tor-0.2.4.19/src/common/crypto.c 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/src/common/crypto.c 2013-12-23 06:35:55.000000000 +0100 @@ -169,8 +169,8 @@ const char *name, *id; name = ENGINE_get_name(e); id = ENGINE_get_id(e); - log_notice(LD_CRYPTO, "Using OpenSSL engine %s [%s] for %s", - name?name:"?", id?id:"?", fn); + log_notice(LD_CRYPTO, "Default OpenSSL engine for %s is %s [%s]", + fn, name?name:"?", id?id:"?"); } else { log_info(LD_CRYPTO, "Using default implementation for %s", fn); } @@ -288,7 +288,7 @@ } log_engine("RSA", ENGINE_get_default_RSA()); log_engine("DH", ENGINE_get_default_DH()); - log_engine("RAND", ENGINE_get_default_RAND()); + log_engine("RAND (which we will not use)", ENGINE_get_default_RAND()); log_engine("SHA1", ENGINE_get_digest_engine(NID_sha1)); log_engine("3DES", ENGINE_get_cipher_engine(NID_des_ede3_ecb)); log_engine("AES", ENGINE_get_cipher_engine(NID_aes_128_ecb)); @@ -297,6 +297,13 @@ log_info(LD_CRYPTO, "NOT using OpenSSL engine support."); } + if (RAND_get_rand_method() != RAND_SSLeay()) { + log_notice(LD_CRYPTO, "It appears that one of our engines has provided " + "a replacement the OpenSSL RNG. Resetting it to the default " + "implementation."); + RAND_set_rand_method(RAND_SSLeay()); + } + evaluate_evp_for_aes(-1); evaluate_ctr_for_aes(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/or/circuituse.c new/tor-0.2.4.20/src/or/circuituse.c --- old/tor-0.2.4.19/src/or/circuituse.c 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/src/or/circuituse.c 2013-12-23 06:35:55.000000000 +0100 @@ -828,7 +828,7 @@ cpath_build_state_t *build_state = origin_circ->build_state; if (build_state->is_internal || build_state->onehop_tunnel) continue; - if (!origin_circ->unusable_for_new_conns) + if (origin_circ->unusable_for_new_conns) continue; exitnode = build_state_get_exit_node(build_state); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/or/connection_edge.c new/tor-0.2.4.20/src/or/connection_edge.c --- old/tor-0.2.4.19/src/or/connection_edge.c 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/src/or/connection_edge.c 2013-12-23 06:35:55.000000000 +0100 @@ -61,6 +61,11 @@ static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); +static void connection_ap_handshake_socks_resolved_addr( + entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires); /** An AP stream has failed/finished. If it hasn't already sent back * a socks reply, send one now (based on endreason). Also set @@ -1156,17 +1161,13 @@ } if (socks->command == SOCKS_COMMAND_RESOLVE) { - uint32_t answer; - struct in_addr in; + tor_addr_t answer; /* Reply to resolves immediately if we can. */ - if (tor_inet_aton(socks->address, &in)) { /* see if it's an IP already */ - /* leave it in network order */ - answer = in.s_addr; + if (tor_addr_parse(&answer, socks->address) >= 0) {/* is it an IP? */ /* remember _what_ is supposed to have been resolved. */ strlcpy(socks->address, orig_address, sizeof(socks->address)); - connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, - (uint8_t*)&answer, - -1,map_expires); + connection_ap_handshake_socks_resolved_addr(conn, &answer, -1, + map_expires); connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -2059,6 +2060,35 @@ } } +/** + * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send + * as the answer. + */ +static void +connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires) +{ + if (tor_addr_family(answer) == AF_INET) { + uint32_t a = tor_addr_to_ipv4n(answer); /* network order */ + connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, + (uint8_t*)&a, + ttl, expires); + } else if (tor_addr_family(answer) == AF_INET6) { + const uint8_t *a = tor_addr_to_in6_addr8(answer); + connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV6,16, + a, + ttl, expires); + } else { + log_warn(LD_BUG, "Got called with address of unexpected family %d", + tor_addr_family(answer)); + connection_ap_handshake_socks_resolved(conn, + RESOLVED_TYPE_ERROR,0,NULL,-1,-1); + } +} + + /** Send an answer to an AP connection that has requested a DNS lookup via * SOCKS. The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1 * for unreachable; the answer should be in the format specified in the socks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/or/dirvote.c new/tor-0.2.4.20/src/or/dirvote.c --- old/tor-0.2.4.19/src/or/dirvote.c 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/src/or/dirvote.c 2013-12-23 06:35:55.000000000 +0100 @@ -3585,7 +3585,8 @@ { smartlist_t *lst = microdescs_parse_from_string(output, - output+strlen(output), 0, 1); + output+strlen(output), 0, + SAVED_NOWHERE); if (smartlist_len(lst) != 1) { log_warn(LD_DIR, "We generated a microdescriptor we couldn't parse."); SMARTLIST_FOREACH(lst, microdesc_t *, md, microdesc_free(md)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/or/microdesc.c new/tor-0.2.4.20/src/or/microdesc.c --- old/tor-0.2.4.19/src/or/microdesc.c 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/src/or/microdesc.c 2013-12-23 06:35:55.000000000 +0100 @@ -154,11 +154,10 @@ { smartlist_t *descriptors, *added; const int allow_annotations = (where != SAVED_NOWHERE); - const int copy_body = (where != SAVED_IN_CACHE); descriptors = microdescs_parse_from_string(s, eos, allow_annotations, - copy_body); + where); if (listed_at > 0) { SMARTLIST_FOREACH(descriptors, microdesc_t *, md, md->last_listed = listed_at); @@ -407,6 +406,26 @@ return 0; } +/** + * Mark <b>md</b> as having no body, and release any storage previously held + * by its body. + */ +static void +microdesc_wipe_body(microdesc_t *md) +{ + if (!md) + return; + + if (md->saved_location != SAVED_IN_CACHE) + tor_free(md->body); + + md->off = 0; + md->saved_location = SAVED_NOWHERE; + md->body = NULL; + md->bodylen = 0; + md->no_save = 1; +} + /** Regenerate the main cache file for <b>cache</b>, clear the journal file, * and update every microdesc_t in the cache with pointers to its new * location. If <b>force</b> is true, do this unconditionally. If @@ -455,12 +474,7 @@ size = dump_microdescriptor(fd, md, &annotation_len); if (size < 0) { - if (md->saved_location != SAVED_IN_CACHE) - tor_free(md->body); - md->saved_location = SAVED_NOWHERE; - md->off = 0; - md->bodylen = 0; - md->no_save = 1; + microdesc_wipe_body(md); /* rewind, in case it was a partial write. */ tor_fd_setpos(fd, off); @@ -497,11 +511,7 @@ HT_FOREACH(mdp, microdesc_map, &cache->map) { microdesc_t *md = *mdp; if (md->saved_location == SAVED_IN_CACHE) { - md->off = 0; - md->saved_location = SAVED_NOWHERE; - md->body = NULL; - md->bodylen = 0; - md->no_save = 1; + microdesc_wipe_body(md); } } return -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/or/or_sha1.i new/tor-0.2.4.20/src/or/or_sha1.i --- old/tor-0.2.4.19/src/or/or_sha1.i 2013-12-10 23:09:33.000000000 +0100 +++ new/tor-0.2.4.20/src/or/or_sha1.i 2013-12-23 07:20:51.000000000 +0100 @@ -8,18 +8,18 @@ "db8e6e4e880a19999aa97663ae08c52972386563 src/or/circuitmux.c\n" "d4ad2888c3101581cf4544750370f2cd3cf94fdd src/or/circuitmux_ewma.c\n" "0d147a24797417d019592ee0f8dee3feccbf1318 src/or/circuitstats.c\n" -"86dfff9e8ac34bf9acbcb302d0e9a6a2a22d0a35 src/or/circuituse.c\n" +"eac62ce167b3dbaea1ee00a98a9f063d7614f4fc src/or/circuituse.c\n" "fb90791ead8ce4c952212372db0444f8940c8d5a src/or/command.c\n" "9a49da73907e8594264a69587d079903a4a33505 src/or/config.c\n" "36dc692c0ddd83463722eeca9016c730b5bc654e src/or/confparse.c\n" "db9dc5fcde8b68f45cd6b8ffcff4e83ef530d62c src/or/connection.c\n" -"989fa93d192f5d9b84c473cb48c1e8b70537d781 src/or/connection_edge.c\n" +"8f5c91d0ae62ab7aac23bc2f31139fdd8fdc4730 src/or/connection_edge.c\n" "45b23f791bbaae08deaa9adaa23f021cb056a732 src/or/connection_or.c\n" "dd37d24f3da34951f5aab7cf06ed7f0af720ae11 src/or/control.c\n" "a06da0534bf2653f0c919eeb12b45911372149d9 src/or/cpuworker.c\n" "36cba941a3af51e8b89604a1432a9cf4439533d9 src/or/directory.c\n" "0833ae16c55ccff2e947bd68254b37a76ada6cc4 src/or/dirserv.c\n" -"ebbef044d54ac1ed0b47fc03665c0d5da762a669 src/or/dirvote.c\n" +"e8964aa5e0d59a47291daca873a30c2e54ed570e src/or/dirvote.c\n" "58873f9472fbd3374bb8bedf8898cd610979759d src/or/dns.c\n" "7051649c91cbb08873693d147e4c6da7e1e043e5 src/or/dnsserv.c\n" "e5c6da5c0eb4b4214e6365b83fb5483d2d234cef src/or/fp_pair.c\n" @@ -27,7 +27,7 @@ "21c231afb35845cfc303614e8e976479b715ffdc src/or/entrynodes.c\n" "66f74cc610e925fa42eb4311f57d4db0ed60db49 src/or/hibernate.c\n" "18f5dea5f1b8dc6cb56eaa21e6c4fd0d38b10917 src/or/main.c\n" -"4c0b1401e2e267e6fb433e30be3d277982b05137 src/or/microdesc.c\n" +"0c5f95c1426ce13d5c633c30ba3a61d0a65b257d src/or/microdesc.c\n" "288cac7fd59e434bdc04158e48413e80499aad42 src/or/networkstatus.c\n" "9948d42c266b0c71a8faef363d0d77d0d5680341 src/or/nodelist.c\n" "6f437580030e374cdc059d48ce3f912ba0d56672 src/or/onion.c\n" @@ -45,7 +45,7 @@ "3654e3f8358f16bb04b24922706f2ea2b2b9b8c9 src/or/replaycache.c\n" "c278c0a175daf6639fed9731da6ef5a0cd4f3a58 src/or/router.c\n" "d4fee3f549913565df2e122847186695b76311d8 src/or/routerlist.c\n" -"56adf1ad5065f1b75d629f732f21fbb2b4683783 src/or/routerparse.c\n" +"cae8e4f9d879575e62b7f1884f16864d33da6890 src/or/routerparse.c\n" "a1d43f45a49918eb613e13121ef85cc4405c04ca src/or/routerset.c\n" "c3f3a207c09f4a889cd0cb311978de21cca3d5f8 src/or/statefile.c\n" "40b4d2e7810e5054cf52a45736423e580ca437d5 src/or/status.c\n" @@ -102,6 +102,6 @@ "30ed07fadbfc50eac024c415868f2e9ad6bc20fc src/or/router.h\n" "98fbe2beb9b694bd3bddc509a0430aebafcf9d2e src/or/routerlist.h\n" "ac098125b79f6fba41a58b498811f60c852d562b src/or/routerset.h\n" -"08128c087abb5778613fae5a991b3b913c76a314 src/or/routerparse.h\n" +"ee45bbe04fd8686a28901ee82c43ad6f42dccde8 src/or/routerparse.h\n" "00e61f581c3734b619af4fe1a95e940862a8f76f src/or/statefile.h\n" "1cec9dc4fff60b5569944a81db1b20e6d00066c0 src/or/status.h\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/or/routerparse.c new/tor-0.2.4.20/src/or/routerparse.c --- old/tor-0.2.4.19/src/or/routerparse.c 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/src/or/routerparse.c 2013-12-23 06:35:55.000000000 +0100 @@ -4245,12 +4245,17 @@ /** Parse as many microdescriptors as are found from the string starting at * <b>s</b> and ending at <b>eos</b>. If allow_annotations is set, read any - * annotations we recognize and ignore ones we don't. If <b>copy_body</b> is - * true, then strdup the bodies of the microdescriptors. Return all newly + * annotations we recognize and ignore ones we don't. + * + * If <b>saved_location</b> isn't SAVED_IN_CACHE, make a local copy of each + * descriptor in the body field of each microdesc_t. + * + * Return all newly * parsed microdescriptors in a newly allocated smartlist_t. */ smartlist_t * microdescs_parse_from_string(const char *s, const char *eos, - int allow_annotations, int copy_body) + int allow_annotations, + saved_location_t where) { smartlist_t *tokens; smartlist_t *result; @@ -4259,6 +4264,7 @@ const char *start = s; const char *start_of_next_microdesc; int flags = allow_annotations ? TS_ANNOTATIONS_OK : 0; + const int copy_body = (where != SAVED_IN_CACHE); directory_token_t *tok; @@ -4288,6 +4294,7 @@ tor_assert(cp); md->bodylen = start_of_next_microdesc - cp; + md->saved_location = where; if (copy_body) md->body = tor_memdup_nulterm(cp, md->bodylen); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/or/routerparse.h new/tor-0.2.4.20/src/or/routerparse.h --- old/tor-0.2.4.19/src/or/routerparse.h 2013-10-09 21:29:53.000000000 +0200 +++ new/tor-0.2.4.20/src/or/routerparse.h 2013-12-22 08:25:53.000000000 +0100 @@ -64,7 +64,7 @@ smartlist_t *microdescs_parse_from_string(const char *s, const char *eos, int allow_annotations, - int copy_body); + saved_location_t where); authority_cert_t *authority_cert_parse_from_string(const char *s, const char **end_of_string); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/test/test_microdesc.c new/tor-0.2.4.20/src/test/test_microdesc.c --- old/tor-0.2.4.19/src/test/test_microdesc.c 2013-10-09 21:29:53.000000000 +0200 +++ new/tor-0.2.4.20/src/test/test_microdesc.c 2013-12-22 08:25:53.000000000 +0100 @@ -240,8 +240,53 @@ tor_free(fn); } +static const char truncated_md[] = + "@last-listed 2013-08-08 19:02:59\n" + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" + "MIGJAoGBAM91vLFNaM+gGhnRIdz2Cm/Kl7Xz0cOobIdVzhS3cKUJfk867hCuTipS\n" + "NveLBzNopvgXKruAAzEj3cACxk6Q8lv5UWOGCD1UolkgsWSE62RBjap44g+oc9J1\n" + "RI9968xOTZw0VaBQg9giEILNXl0djoikQ+5tQRUvLDDa67gpa5Q1AgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n" + "family @\n"; + +static void +test_md_cache_broken(void *data) +{ + or_options_t *options; + char *fn=NULL; + microdesc_cache_t *mc = NULL; + + (void)data; + + options = get_options_mutable(); + tt_assert(options); + options->DataDirectory = tor_strdup(get_fname("md_datadir_test2")); + +#ifdef _WIN32 + tt_int_op(0, ==, mkdir(options->DataDirectory)); +#else + tt_int_op(0, ==, mkdir(options->DataDirectory, 0700)); +#endif + + tor_asprintf(&fn, "%s"PATH_SEPARATOR"cached-microdescs", + options->DataDirectory); + + write_str_to_file(fn, truncated_md, 1); + + mc = get_microdesc_cache(); + tt_assert(mc); + + done: + if (options) + tor_free(options->DataDirectory); + tor_free(fn); + microdesc_free_all(); +} + struct testcase_t microdesc_tests[] = { { "cache", test_md_cache, TT_FORK, NULL, NULL }, + { "broken_cache", test_md_cache_broken, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tor-0.2.4.19/src/win32/orconfig.h new/tor-0.2.4.20/src/win32/orconfig.h --- old/tor-0.2.4.19/src/win32/orconfig.h 2013-12-10 23:08:26.000000000 +0100 +++ new/tor-0.2.4.20/src/win32/orconfig.h 2013-12-23 06:35:55.000000000 +0100 @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.19" +#define VERSION "0.2.4.20" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tomboy for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package tomboy for openSUSE:Factory checked in at 2013-12-30 10:45:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomboy (Old) and /work/SRC/openSUSE:Factory/.tomboy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomboy" Changes: -------- --- /work/SRC/openSUSE:Factory/tomboy/tomboy.changes 2013-06-28 19:29:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomboy.new/tomboy.changes 2013-12-30 10:45:06.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Dec 20 19:43:31 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 1.15.3: + + Fix zombie processes when reading proxy settings. + + Better error reporting during note parse. + + Documentation: additional add-in pages, pinning, deleting + notes. + + Use xz compression for dist tarballs. + + Flush to disk on note save. + + Windows: GTK#, .NET installer improvements. + + Updated translations. + +------------------------------------------------------------------- Old: ---- tomboy-1.15.2.tar.xz New: ---- tomboy-1.15.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.FOzg1V/_old 2013-12-30 10:45:07.000000000 +0100 +++ /var/tmp/diff_new_pack.FOzg1V/_new 2013-12-30 10:45:07.000000000 +0100 @@ -19,7 +19,7 @@ %define build_applet 0 Name: tomboy -Version: 1.15.2 +Version: 1.15.3 Release: 0 Summary: GNOME Note Taking Application License: LGPL-2.1+ ++++++ tomboy-1.15.2.tar.xz -> tomboy-1.15.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/tomboy/tomboy-1.15.2.tar.xz /work/SRC/openSUSE:Factory/.tomboy.new/tomboy-1.15.3.tar.xz differ: char 8, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-12-30 10:44:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- systemd-rpm-macros.changes: same change --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2013-12-19 21:39:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2013-12-30 10:45:01.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Dec 20 12:06:18 UTC 2013 - werner(a)suse.de + +- Adapt patch + 1011-check-4-valid-kmsg-device.patch + to fit current upstream version maybe related to bnc#854884 +- Change patch + 1012-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch + to check if XDG_RUNTIME_DIR is set before the call of pam_putenv() + may fix bnc#855160 + +------------------------------------------------------------------- +Fri Dec 20 09:40:01 UTC 2013 - lbsousajr(a)gmail.com + +- Disable multi-seat-x build, since package xorg-x11-server + currently in Factory no longer needs it. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.fKsFOw/_old 2013-12-30 10:45:03.000000000 +0100 +++ /var/tmp/diff_new_pack.fKsFOw/_new 2013-12-30 10:45:03.000000000 +0100 @@ -588,6 +588,9 @@ --with-debug-shell=/bin/bash \ --disable-smack \ --disable-ima \ +%if 0%{?suse_version} > 1310 + --disable-multi-seat-x \ +%endif CFLAGS="%{optflags}" make %{?_smp_mflags} ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.fKsFOw/_old 2013-12-30 10:45:03.000000000 +0100 +++ /var/tmp/diff_new_pack.fKsFOw/_new 2013-12-30 10:45:03.000000000 +0100 @@ -583,6 +583,9 @@ --with-debug-shell=/bin/bash \ --disable-smack \ --disable-ima \ +%if 0%{?suse_version} > 1310 + --disable-multi-seat-x \ +%endif CFLAGS="%{optflags}" make %{?_smp_mflags} ++++++ 1011-check-4-valid-kmsg-device.patch ++++++ --- /var/tmp/diff_new_pack.fKsFOw/_old 2013-12-30 10:45:03.000000000 +0100 +++ /var/tmp/diff_new_pack.fKsFOw/_new 2013-12-30 10:45:03.000000000 +0100 @@ -6,65 +6,57 @@ environments. --- - journald-kmsg.c | 27 ++++++++++++++++++++++++++- - 1 file changed, 26 insertions(+), 1 deletion(-) + journald-kmsg.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) Index: systemd-208/src/journal/journald-kmsg.c =================================================================== --- systemd-208/src/journal/journald-kmsg.c -+++ systemd-208/src/journal/journald-kmsg.c 2013-11-21 13:30:22.930735683 +0000 -@@ -23,7 +23,9 @@ - #include <sys/epoll.h> - #include <fcntl.h> - #include <sys/mman.h> -+#include <sys/stat.h> - #include <sys/socket.h> -+#include <sys/types.h> - - #include <systemd/sd-messages.h> - #include <libudev.h> -@@ -377,20 +379,43 @@ int server_flush_dev_kmsg(Server *s) { ++++ systemd-208/src/journal/journald-kmsg.c 2013-12-20 11:34:39.762236175 +0000 +@@ -377,15 +377,18 @@ int server_flush_dev_kmsg(Server *s) { int server_open_dev_kmsg(Server *s) { struct epoll_event ev; -+ struct stat st; ++ int r; assert(s); s->dev_kmsg_fd = open("/dev/kmsg", O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY); if (s->dev_kmsg_fd < 0) { - log_warning("Failed to open /dev/kmsg, ignoring: %m"); -+ /* Do not warn as it may not exists in LXC environments */ -+ if (errno != ENOENT) -+ log_warning("Failed to open /dev/kmsg, ignoring: %m"); ++ log_full(errno == ENOENT ? LOG_DEBUG : LOG_WARNING, ++ "Failed to open /dev/kmsg, ignoring: %m"); return 0; } -+ if (fstat(s->dev_kmsg_fd, &st) < 0) { -+ log_error("Failed to stat /dev/kmsg fd, ignoring: %m"); -+ close_nointr_nofail(s->dev_kmsg_fd); -+ s->dev_kmsg_fd = -1; -+ return 0; -+ } -+ -+ if (!S_ISCHR(st.st_mode) || major(st.st_rdev) != 1 || minor(st.st_rdev) != 11) { -+ int old_errno = errno; -+ errno = ENODEV; -+ log_warning("Irregular device /dev/kmsg, ignoring: %m"); -+ errno = old_errno; -+ close_nointr_nofail(s->dev_kmsg_fd); -+ s->dev_kmsg_fd = -1; -+ return 0; -+ } -+ ++ r = 0; zero(ev); ev.events = EPOLLIN; ev.data.fd = s->dev_kmsg_fd; - if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->dev_kmsg_fd, &ev) < 0) { +@@ -394,15 +397,24 @@ int server_open_dev_kmsg(Server *s) { + /* This will fail with EPERM on older kernels where + * /dev/kmsg is not readable. */ + if (errno == EPERM) +- return 0; ++ goto fail; + + log_error("Failed to add /dev/kmsg fd to epoll object: %m"); +- return -errno; ++ r = -errno; ++ goto fail; + } + s->dev_kmsg_readable = true; + + return 0; ++ ++fail: ++ if (s->dev_kmsg_fd >= 0) { + close_nointr_nofail(s->dev_kmsg_fd); + s->dev_kmsg_fd = -1; ++ } + - /* This will fail with EPERM on older kernels where - * /dev/kmsg is not readable. */ - if (errno == EPERM) ++ return r; + } + + int server_open_kernel_seqnum(Server *s) { ++++++ 1012-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch ++++++ --- /var/tmp/diff_new_pack.fKsFOw/_old 2013-12-30 10:45:03.000000000 +0100 +++ /var/tmp/diff_new_pack.fKsFOw/_new 2013-12-30 10:45:03.000000000 +0100 @@ -157,12 +157,12 @@ + pam_syslog(handle, LOG_ERR, "Failed to set runtime dir."); + goto finish; + } -+ } else { -+ (void) unsetenv("XDG_RUNTIME_DIR"); ++ } else if (getenv("XDG_RUNTIME_DIR")) { + r = pam_putenv(handle, "XDG_RUNTIME_DIR"); + if (r != PAM_SUCCESS && r != PAM_BAD_ITEM) { + pam_syslog(handle, LOG_ERR, "Failed to unset runtime dir."); + } ++ (void) unsetenv("XDG_RUNTIME_DIR"); } if (!isempty(seat)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit SuSEfirewall2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package SuSEfirewall2 for openSUSE:Factory checked in at 2013-12-30 10:44:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SuSEfirewall2 (Old) and /work/SRC/openSUSE:Factory/.SuSEfirewall2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SuSEfirewall2" Changes: -------- --- /work/SRC/openSUSE:Factory/SuSEfirewall2/SuSEfirewall2.changes 2013-08-21 13:45:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.SuSEfirewall2.new/SuSEfirewall2.changes 2013-12-30 10:44:25.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 27 11:13:55 UTC 2013 - meissner(a)suse.com + +- add perl-Net-DNS requires for "SuSEfirewall2 log" (bnc#856705) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.df53IK/_old 2013-12-30 10:44:26.000000000 +0100 +++ /var/tmp/diff_new_pack.df53IK/_new 2013-12-30 10:44:26.000000000 +0100 @@ -25,6 +25,7 @@ Requires: coreutils Requires: iptables Requires: perl +Requires: perl-Net-DNS Requires: sysconfig Summary: Stateful Packet Filter Using iptables and netfilter License: GPL-2.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit squid for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2013-12-30 10:44:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "squid" Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2013-09-29 17:53:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2013-12-30 10:44:19.000000000 +0100 @@ -1,0 +2,41 @@ +Wed Dec 25 21:29:38 UTC 2013 - chris(a)computersalat.de + +- Changes to squid-3.3.11 (01 Dec 2013): + * Regression Bug 3936: error-details.txt parse error with OpenSSL since 3.3.9 + * Bug 3972: Segfault when getting the deny_info page ID after a reconfigure + * Bug 3970: max_filedescriptors disabled due to missing setrlimit + * Bug 3967: ipc/Kid.cc compilation failure: 'time' was not declared in this scope + * Bug 3960: DEAD cache_peer are not revived + * Bug 3956: xstrndup: tried to dup a NULL pointer + * Bug 3906: Filedescriptor leaks in SNMP + * Bug 3782: Digest authentication not obeying nonce_max_count + * HTTP/1.1: Make header parser obey relaxed_header_parser + * HTTP/1.1: Re-compute Range response content offset after an FTP response was adapted + * SMP: Replace blocking sleep(3) and close UDS socket on failures + * Windows: fix several compile errors +- Changes to squid-3.3.10 (03 Nov 2013): + * Bug 3929: request_header_add not working for tunnel requests + * Bug 3923: cbdata and undefined behavior due to dynamic runtime enumeration + * Bug 3918: Self Test Failures on Mac OS X 10.8 + * Bug 3887: tcp_outgoing_tos not working for IPv6 + * Bug 3836: Fix issues with automake 1.13+ and make check + * Bug 3480: StoreEntry::kickProducer() segfaults in store_client::copy() + * Fix pinning hierarchy log information + * Fix close idle client connections associated with closed idle pinned connections. + * Fix cbdata 'error: expression result unused' errors + * Avoid "hot idle": A series of rapid select() calls with zero timeout. + * Append Connection:close to OPTIONS requests when icap_persistent_connections is off + * ntlm_fake_auth: pass DOMAIN data to Squid in original case + * kerberos_ldap_group: fix LDAP string duplication + * Use IPv6 localhost nameserver on DNS configuration errors + * Add cache_miss_revalidate + * ... and several portability improvements +- modified patches: + * squid-compiled_without_RPM_OPT_FLAGS.patch + * squid-config.patch +- fix build for SLE (libxml2-devel vs pkgconfig(libxml2)) +- fix changed files + * bindir/purge + * bindir/squidclient + +------------------------------------------------------------------- Old: ---- squid-3.3.9.tar.bz2 squid-3.3.9.tar.bz2.asc New: ---- squid-3.3.11.tar.bz2 squid-3.3.11.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.tZFUQW/_old 2013-12-30 10:44:21.000000000 +0100 +++ /var/tmp/diff_new_pack.tZFUQW/_new 2013-12-30 10:44:21.000000000 +0100 @@ -23,7 +23,7 @@ Summary: Squid Version 3.3 WWW Proxy Server License: GPL-2.0+ Group: Productivity/Networking/Web/Proxy -Version: 3.3.9 +Version: 3.3.11 Release: 0 Url: http://www.squid-cache.org/Versions/v3/3.3 Source0: http://www.squid-cache.org/Versions/v3/3.3/%{name}-%{version}.tar.bz2 @@ -71,8 +71,10 @@ BuildRequires: cyrus-sasl-devel BuildRequires: ed BuildRequires: expat +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gpg-offline +BuildRequires: krb5-devel BuildRequires: libcap-devel BuildRequires: libexpat-devel BuildRequires: libtool @@ -82,21 +84,10 @@ BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: sharutils -# -%if 0%{?sles_version} == 9 -BuildRequires: heimdal-devel +%if 0%{?suse_version} < 1220 +BuildRequires: libxml2-devel %else -BuildRequires: krb5-devel -%endif -# -%if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8 -BuildRequires: fdupes -%endif -# -%if 0%{?suse_version} >= 1130 BuildRequires: pkgconfig(libxml-2.0) -%else -BuildRequires: libxml2-devel %endif %if 0%{?suse_version} > 1140 @@ -149,22 +140,14 @@ export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF" export CXXFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF" export LDFLAGS='-Wl,-z,relro,-z,now -pie' -./configure \ -%if 0%{?suse_version} == 1110 +%configure \ --disable-strict-error-checking \ -%endif - --prefix=/usr \ --sysconfdir=%{squidconfdir} \ - --bindir=/usr/sbin \ - --sbindir=/usr/sbin \ - --localstatedir=/var \ --libexecdir=/usr/sbin \ --datadir=/usr/share/squid \ - --mandir=%{_mandir} \ - --libdir=%{_libdir} \ --sharedstatedir=/var/squid \ --with-logdir=/var/log/squid \ - --with-pidfile=/var/run/squid.pid \ + --with-pidfile=/run/squid.pid \ --with-dl \ --enable-disk-io \ --enable-storeio \ @@ -315,9 +298,6 @@ %verifyscript %verify_permissions -e /usr/sbin/pam_auth -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc CONTRIBUTORS COPYING COPYRIGHT CREDITS ChangeLog @@ -353,6 +333,8 @@ %config %{_datadir}/%{name}/mib.txt %{_datadir}/%{name}/mime.conf %{_datadir}/%{name}/mime.conf.default +%{_bindir}/purge +%{_bindir}/squidclient %{_sbindir}/basic_db_auth %{_sbindir}/basic_fake_auth %{_sbindir}/basic_getpwnam_auth @@ -388,10 +370,8 @@ %{_sbindir}/ntlm_fake_auth %{_sbindir}/ntlm_smb_lm_auth %{_sbindir}/pinger -%{_sbindir}/purge %{_sbindir}/rc%{name} %{_sbindir}/%{name} -%{_sbindir}/squidclient %{_sbindir}/unlinkd %{_sbindir}/url_fake_rewrite %{_sbindir}/url_fake_rewrite.sh ++++++ RELEASENOTES.html ++++++ --- /var/tmp/diff_new_pack.tZFUQW/_old 2013-12-30 10:44:21.000000000 +0100 +++ /var/tmp/diff_new_pack.tZFUQW/_new 2013-12-30 10:44:21.000000000 +0100 @@ -2,10 +2,10 @@ <HTML> <HEAD> <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.69"> - <TITLE>Squid 3.3.9 release notes</TITLE> + <TITLE>Squid 3.3.11 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 3.3.9 release notes</H1> +<H1>Squid 3.3.11 release notes</H1> <H2>Squid Developers</H2> <HR> @@ -56,7 +56,7 @@ <HR> <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2> -<P>The Squid Team are pleased to announce the release of Squid-3.3.9.</P> +<P>The Squid Team are pleased to announce the release of Squid-3.3.11.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v3/3.3/">http://www.squid-cache.org/Versions/v3/3.3/</A> or the <A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P> @@ -246,6 +246,12 @@ <P> <DL> +<DT><B>cache_miss_revalidate</B><DD> +<P>Whether Squid is to pass-through If-Modified-Since and If-None-Match headers on cache MISS. +Revalidation requests can prevent cache gathering objects to HIT on.</P> +<P>Based on the Squid-2.7 <EM>ignore_ims_on_miss</EM> feature.</P> +<P><EM>IMPORTANT:</EM> the meaning for on/off values has changed along with the name since 2.7.</P> + <DT><B>request_header_add</B><DD> <P>New directive to add custom headers on HTTP traffic sent to upstream servers.</P> @@ -302,8 +308,8 @@ <P> <DL> - -<P><EM>There are no removed squid.conf options in Squid-3.3.</EM></P> +<DT><B>ignore_ims_on_miss</B><DD> +<P>This option has been replaced by the <EM>cache_miss_revalidate</EM> feature.</P> </DL> </P> @@ -403,9 +409,6 @@ <DT><B>external_refresh_check</B><DD> <P>Not yet ported from 2.7</P> -<DT><B>ignore_ims_on_miss</B><DD> -<P>Not yet ported from 2.7</P> - <DT><B>location_rewrite_access</B><DD> <P>Not yet ported from 2.6</P> ++++++ squid-3.3.9.tar.bz2 -> squid-3.3.11.tar.bz2 ++++++ ++++ 2229 lines of diff (skipped) ++++++ squid-3.3.9.tar.bz2.asc -> squid-3.3.11.tar.bz2.asc ++++++ --- /work/SRC/openSUSE:Factory/squid/squid-3.3.9.tar.bz2.asc 2013-09-29 17:53:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.squid.new/squid-3.3.11.tar.bz2.asc 2013-12-30 10:44:19.000000000 +0100 @@ -1,20 +1,20 @@ -File: squid-3.3.9.tar.bz2 -Date: Wed Sep 11 04:32:33 UTC 2013 -Size: 2988736 -MD5 : f08bffe795260cecca828331c579e0c4 -SHA1: ac75d1bef17988e3ad95ee6761d7785f5aca9cd7 +File: squid-3.3.11.tar.bz2 +Date: Sat Nov 30 14:12:34 UTC 2013 +Size: 2989941 +MD5 : abf2b0fe128f73f5dc157e7e917949e0 +SHA1: f99627f9f5c76cc2ddf6e14e4a3e955963801b6f Key : 0xFF5CF463 <squid3(a)treenet.co.nz> fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 keyring = http://www.squid-cache.org/pgp.asc keyserver = subkeys.pgp.net -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) +Version: GnuPG v1.4.15 (GNU/Linux) -iQEcBAABAgAGBQJSL/QNAAoJELJo5wb/XPRjZZwH/jVAL6QGnufPlSZ4oIZEga29 -YHMuLKkAmBt6lp67MoNLHTthSsISiSLb7VvmIfSiNZxbSrt69PP0B+aWnM9O0rK6 -F+9YqgcPkoCAcOzf/SbVb0wm7kM41aYu3SvIJIgQu784KX1AJ3dyUTlb//Sfa0l7 -dcztRGIAihSkx3spf/1ALXq6f3MwKncFMs0l84x989luAS/jSte2Z+27s6aCK2eU -4KvPPTmts5hpd6xvnX/Y1leye42c+MPpGc6XzsBzCJ2xlXOd75hZyrbOrSd5VR7t -+QVC98qVBW2QgQHHXlVG+TQCT75/go01mUpw3YeFMAf1HC6AATddGD2/6tN9roU= -=mvR8 +iQEcBAABAgAGBQJSmfXuAAoJELJo5wb/XPRjaqcIAKvTzz9frodyUOeuop5W2yZx +s3knaI5ZyM7dsXYdDUixto5Q1+a8wIUAvZzCp2sLij3QQTKZJAxgmQ8Tztl/sgKI +NbHJSJxAtibNOGKBfCqCDurcNfmn2kLZJPxJXx3gulEP5O7rTdKVoZq/1vyj/rvv +rnzZBP2HZ5fnXNRfs7UPrOzMLmg423zXzsDnRjj69xy6w0dXpObDP5tb32jNmOLg +zRvk3lw4mtpWJ5kGZ4BbwPpO9i2MT94M9YupjL/doNbbiAt2nutGfGuLgPcmsCwA +fpb74hKIM20ON8A7XypeyX6eNeYn4nkRBSuzEX/sPWQUyq0BMxheCEZRboGCnvo= +=rlWB -----END PGP SIGNATURE----- ++++++ squid-compiled_without_RPM_OPT_FLAGS.patch ++++++ --- /var/tmp/diff_new_pack.tZFUQW/_old 2013-12-30 10:44:23.000000000 +0100 +++ /var/tmp/diff_new_pack.tZFUQW/_new 2013-12-30 10:44:23.000000000 +0100 @@ -15,7 +15,7 @@ =================================================================== --- src/Makefile.in.orig +++ src/Makefile.in -@@ -7295,7 +7295,7 @@ cache_cf.o: cf_parser.cci +@@ -7306,7 +7306,7 @@ cache_cf.o: cf_parser.cci # cf_gen builds the configuration files. cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci ++++++ squid-config.patch ++++++ --- /var/tmp/diff_new_pack.tZFUQW/_old 2013-12-30 10:44:23.000000000 +0100 +++ /var/tmp/diff_new_pack.tZFUQW/_new 2013-12-30 10:44:23.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/cf.data.pre.orig +++ src/cf.data.pre -@@ -1195,6 +1195,8 @@ http_access deny manager +@@ -1196,6 +1196,8 @@ http_access deny manager # Adapt localnet in the ACL section to list your (internal) IP networks # from where browsing should be allowed http_access allow localnet @@ -11,7 +11,7 @@ http_access allow localhost # And finally deny all other access to this proxy -@@ -3143,6 +3145,10 @@ DOC_START +@@ -3144,6 +3146,10 @@ DOC_START Instead, if you want Squid to use the entire disk drive, subtract 20% and use that value. @@ -22,7 +22,7 @@ 'L1' is the number of first-level subdirectories which will be created under the 'Directory'. The default is 16. -@@ -3276,7 +3282,7 @@ DOC_START +@@ -3277,7 +3283,7 @@ DOC_START NOCOMMENT_START # Uncomment and adjust the following to add a disk cache directory. @@ -31,7 +31,7 @@ NOCOMMENT_END DOC_END -@@ -3889,7 +3895,7 @@ DOC_END +@@ -3890,7 +3896,7 @@ DOC_END NAME: logfile_rotate TYPE: int -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit source-highlight for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package source-highlight for openSUSE:Factory checked in at 2013-12-30 10:44:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/source-highlight (Old) and /work/SRC/openSUSE:Factory/.source-highlight.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "source-highlight" Changes: -------- --- /work/SRC/openSUSE:Factory/source-highlight/source-highlight.changes 2012-05-21 07:32:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.source-highlight.new/source-highlight.changes 2013-12-30 10:44:11.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Dec 29 15:33:29 UTC 2013 - benoit.monin(a)gmx.fr + +- update to 3.1.7: + * language definition for Lilypond + * language definition for R statistics programming language + * language definition for ISLISP + * improved Erlang definition file + * new output format: ESC 256 ascii code + +------------------------------------------------------------------- Old: ---- source-highlight-3.1.6.tar.gz New: ---- source-highlight-3.1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ source-highlight.spec ++++++ --- /var/tmp/diff_new_pack.GgQySR/_old 2013-12-30 10:44:12.000000000 +0100 +++ /var/tmp/diff_new_pack.GgQySR/_new 2013-12-30 10:44:12.000000000 +0100 @@ -18,7 +18,7 @@ Name: source-highlight -Version: 3.1.6 +Version: 3.1.7 Release: 0 %define soname 4 Summary: Source Code Highlighter with Support for Many Languages @@ -177,6 +177,7 @@ %{_bindir}/java2html %{_bindir}/source-highlight %{_bindir}/src-hilite-lesspipe.sh +%{_bindir}/source-highlight-esc.sh %{_bindir}/source-highlight-settings %dir %{_datadir}/source-highlight %{_datadir}/source-highlight/* ++++++ source-highlight-3.1.6.tar.gz -> source-highlight-3.1.7.tar.gz ++++++ ++++ 9582 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0