Hello community, here is the log from the commit of package xtables-addons for openSUSE:Factory checked in at 2020-09-17 15:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-addons (Old) and /work/SRC/openSUSE:Factory/.xtables-addons.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtables-addons" Thu Sep 17 15:00:28 2020 rev:68 rq:834974 version:3.11 Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-addons/xtables-addons.changes 2020-02-25 16:06:55.052579775 +0100 +++ /work/SRC/openSUSE:Factory/.xtables-addons.new.4249/xtables-addons.changes 2020-09-17 15:08:22.076910955 +0200 @@ -1,0 +2,6 @@ +Wed Sep 16 17:46:41 UTC 2020 - Jan Engelhardt <[email protected]> + +- Update to release 3.11 + * Support for Linux 5.9 + +------------------------------------------------------------------- Old: ---- xtables-addons-3.9.tar.asc xtables-addons-3.9.tar.xz New: ---- xtables-addons-3.11.tar.asc xtables-addons-3.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-addons.spec ++++++ --- /var/tmp/diff_new_pack.bOD79A/_old 2020-09-17 15:08:23.724912520 +0200 +++ /var/tmp/diff_new_pack.bOD79A/_new 2020-09-17 15:08:23.728912524 +0200 @@ -17,17 +17,16 @@ Name: xtables-addons -Version: 3.9 +Version: 3.11 Release: 0 Summary: IP Packet Filter Administration Extensions License: GPL-2.0-only AND GPL-2.0-or-later Group: Productivity/Networking/Security URL: http://xtables-addons.sf.net/ -#Git-Clone: git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons -#Git-Web: http://xtables-addons.git.sf.net/ -Source: http://downloads.sf.net/%name/%name-%version.tar.xz -Source2: http://downloads.sf.net/%name/%name-%version.tar.asc +#Git-Clone: git://git.inai.de/xtables-addons +Source: https://inai.de/files/%name/%name-%version.tar.xz +Source2: https://inai.de/files/%name/%name-%version.tar.asc Source3: %name-preamble Source4: %name.keyring BuildRequires: %kernel_module_package_buildreqs @@ -97,6 +96,7 @@ %postun -p /sbin/ldconfig %files +%_bindir/xt_geoip_fetch %_mandir/man*/* %_sbindir/* %_libdir/*.so.* ++++++ xtables-addons-3.9.tar.xz -> xtables-addons-3.11.tar.xz ++++++ ++++ 4991 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/Makefile.am new/xtables-addons-3.11/Makefile.am --- old/xtables-addons-3.9/Makefile.am 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/Makefile.am 2020-09-06 16:35:13.000000000 +0200 @@ -1,7 +1,7 @@ # -*- Makefile -*- ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = extensions geoip +SUBDIRS = extensions extensions/ACCOUNT extensions/pknock geoip man_MANS := xtables-addons.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/Makefile.mans.in new/xtables-addons-3.11/Makefile.mans.in --- old/xtables-addons-3.9/Makefile.mans.in 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/Makefile.mans.in 2020-09-06 16:35:13.000000000 +0200 @@ -40,4 +40,4 @@ $(call man_run,${wlist_targets}) clean: - rm -f xtables-addons.8 matches.man targets.man + rm -f xtables-addons.8 matches.man targets.man .manpages.lst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/build-aux/ar-lib new/xtables-addons-3.11/build-aux/ar-lib --- old/xtables-addons-3.9/build-aux/ar-lib 2020-02-25 07:35:31.575922705 +0100 +++ new/xtables-addons-3.11/build-aux/ar-lib 2020-09-06 16:35:46.926429829 +0200 @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2020 Free Software Foundation, Inc. # Written by Peter Rosin <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin) + cygwin | msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) @@ -224,10 +224,11 @@ esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/build-aux/compile new/xtables-addons-3.11/build-aux/compile --- old/xtables-addons-3.9/build-aux/compile 2020-02-25 07:35:31.575922705 +0100 +++ new/xtables-addons-3.11/build-aux/compile 2020-09-06 16:35:46.930429841 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/build-aux/missing new/xtables-addons-3.11/build-aux/missing --- old/xtables-addons-3.9/build-aux/missing 2020-02-25 07:35:31.583922687 +0100 +++ new/xtables-addons-3.11/build-aux/missing 2020-09-06 16:35:46.942429877 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/configure.ac new/xtables-addons-3.11/configure.ac --- old/xtables-addons-3.9/configure.ac 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/configure.ac 2020-09-06 16:35:13.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([xtables-addons], [3.9]) +AC_INIT([xtables-addons], [3.11]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -27,7 +27,7 @@ AC_CHECK_HEADERS([linux/netfilter/x_tables.h], [], [AC_MSG_ERROR([You need to have linux/netfilter/x_tables.h, see INSTALL file for details])]) PKG_CHECK_MODULES([libxtables], [xtables >= 1.6.0]) -xtlibdir="$(pkg-config --variable=xtlibdir xtables)" +xtlibdir="$($PKG_CONFIG --variable=xtlibdir xtables)" AC_ARG_WITH([xtlibdir], AS_HELP_STRING([--with-xtlibdir=PATH], @@ -57,7 +57,7 @@ echo "WARNING: Version detection did not succeed. Continue at own luck."; else echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 5 -o "$kmajor" -eq 5 -a "$kminor" -gt 6; then + if test "$kmajor" -gt 5 -o "$kmajor" -eq 5 -a "$kminor" -gt 9; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; elif test "$kmajor" -eq 5 -a "$kminor" -ge 0; then : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/doc/changelog.txt new/xtables-addons-3.11/doc/changelog.txt --- old/xtables-addons-3.9/doc/changelog.txt 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/doc/changelog.txt 2020-09-06 16:35:13.000000000 +0200 @@ -1,3 +1,13 @@ +v3.11 (2020-09-06) +================== +- Support for up to Linux 5.9 + + +v3.10 (2020-07-28) +================== +- Support for up to Linux 5.8 + + v3.9 (2020-02-25) ================= - Support for Linux 5.6 procfs changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/extensions/ACCOUNT/xt_ACCOUNT.c new/xtables-addons-3.11/extensions/ACCOUNT/xt_ACCOUNT.c --- old/xtables-addons-3.9/extensions/ACCOUNT/xt_ACCOUNT.c 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/extensions/ACCOUNT/xt_ACCOUNT.c 2020-09-06 16:35:13.000000000 +0200 @@ -28,6 +28,9 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/string.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) +#include <linux/sockptr.h> +#endif #include <linux/spinlock.h> #include <asm/uaccess.h> #include <net/netns/generic.h> @@ -879,7 +882,12 @@ } static int ipt_acc_set_ctl(struct sock *sk, int cmd, - void *user, unsigned int len) +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) + void *user, +#else + sockptr_t arg, +#endif + unsigned int len) { struct net *net = sock_net(sk); struct ipt_acc_net *ian = net_generic(net, ipt_acc_net_id); @@ -898,7 +906,12 @@ break; } - if (copy_from_user(&handle, user, len)) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) + if (copy_from_user(&handle, user, len)) +#else + if (copy_from_sockptr(&handle, arg, len)) +#endif + { printk("ACCOUNT: ipt_acc_set_ctl: copy_from_user failed for " "IPT_SO_SET_HANDLE_FREE\n"); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/extensions/libxt_DNETMAP.man new/xtables-addons-3.11/extensions/libxt_DNETMAP.man --- old/xtables-addons-3.9/extensions/libxt_DNETMAP.man 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/extensions/libxt_DNETMAP.man 2020-09-06 16:35:13.000000000 +0200 @@ -46,7 +46,7 @@ \fBprenat address\fR, \fBpostnat address\fR, \fBttl\fR (seconds until the entry times out), \fBlasthit\fR (last hit to the entry in seconds relative to system boot time). Please note that the \fBttl\fR and \fBlasthit\fR entries contain an -'\fBS\fR' in case of a static binding. +\(oq\fBS\fR\(cq in case of a static binding. .TP \fB/proc/net/xt_DNETMAP/\fR\fIsubnet\fR\fB_\fR\fImask\fR\fB_stat\fR Contains statistics for a given \fIsubnet/mask\fP. The line contains four diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/extensions/pknock/Makefile.am new/xtables-addons-3.11/extensions/pknock/Makefile.am --- old/xtables-addons-3.9/extensions/pknock/Makefile.am 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/extensions/pknock/Makefile.am 2020-09-06 16:35:13.000000000 +0200 @@ -5,4 +5,4 @@ include ../../Makefile.extra -noinst_PROGRAMS = pknlusr +sbin_PROGRAMS = pknlusr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/geoip/Makefile.am new/xtables-addons-3.11/geoip/Makefile.am --- old/xtables-addons-3.9/geoip/Makefile.am 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/geoip/Makefile.am 2020-09-06 16:35:13.000000000 +0200 @@ -1,5 +1,7 @@ # -*- Makefile -*- +bin_SCRIPTS = xt_geoip_fetch + pkglibexec_SCRIPTS = xt_geoip_build xt_geoip_dl -man1_MANS = xt_geoip_build.1 xt_geoip_dl.1 +man1_MANS = xt_geoip_build.1 xt_geoip_dl.1 xt_geoip_fetch.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/geoip/xt_geoip_build new/xtables-addons-3.11/geoip/xt_geoip_build --- old/xtables-addons-3.9/geoip/xt_geoip_build 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/geoip/xt_geoip_build 2020-09-06 16:35:13.000000000 +0200 @@ -17,19 +17,18 @@ binary => 1, eol => $/, }); # or Text::CSV -my $source_dir = "."; +my $quiet = 0; +my $input_file = "dbip-country-lite.csv"; my $target_dir = "."; &Getopt::Long::Configure(qw(bundling)); &GetOptions( "D=s" => \$target_dir, - "S=s" => \$source_dir, + "i=s" => \$input_file, + "q" => \$quiet, + "s" => sub { $target_dir = "/usr/share/xt_geoip"; }, ); -if (!-d $source_dir) { - print STDERR "Source directory \"$source_dir\" does not exist.\n"; - exit 1; -} if (!-d $target_dir) { print STDERR "Target directory \"$target_dir\" does not exist.\n"; exit 1; @@ -41,9 +40,11 @@ { my ($file, $fh, $row); my (%country); - - $file = "$source_dir/dbip-country-lite.csv"; - open($fh, '<', $file) || die "Can't open DBIP database\n"; + if ($input_file eq "-") { + open($fh, "<&STDIN"); + } else { + open($fh, "<", $input_file) || die "Cannot open $input_file: $!\n"; + } while ($row = $csv->getline($fh)) { my ($cc, $range); @@ -63,12 +64,12 @@ $country{$cc}->{pool_v6}->add_range($range); } - if ($. % 4096 == 0) { + if (!$quiet && $. % 4096 == 0) { print STDERR "\r\e[2K$. entries"; } } - print STDERR "\r\e[2K$. entries total\n"; + print STDERR "\r\e[2K$. entries total\n" unless ($quiet); close($fh); @@ -106,7 +107,7 @@ printf "%5u IPv%s ranges for %s\n", scalar(@ranges), ($family == AF_INET ? '4' : '6'), - $iso_code; + $iso_code unless ($quiet); my $file = "$target_dir/".uc($iso_code).".iv".($family == AF_INET ? '4' : '6'); if (!open($fh, '>', $file)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/geoip/xt_geoip_build.1 new/xtables-addons-3.11/geoip/xt_geoip_build.1 --- old/xtables-addons-3.9/geoip/xt_geoip_build.1 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/geoip/xt_geoip_build.1 2020-09-06 16:35:13.000000000 +0200 @@ -5,7 +5,7 @@ .SH Syntax .PP \fI/usr/libexec/xt_geoip/\fP\fBxt_geoip_build\fP [\fB\-D\fP -\fItarget_dir\fP] [\fB\-S\fP \fIsource_dir\fP] +\fItarget_dir\fP] [\fB\-i\fP \fIinput_file\fP] .SH Description .PP xt_geoip_build is used to build packed raw representations of the range @@ -24,16 +24,18 @@ \fB\-D\fP \fItarget_dir\fP Specifies the target directory into which the files are to be put. Defaults to ".". .TP -\fB\-S\fP \fIsource_dir\fP -Specifies the source directory from which to read the three files by the name -of \fBGeoLite2\-Country\-Blocks\-IPv4.csv\fP, -\fBGeoLite2\-Country\-Blocks\-IPv6.csv\fP and -\fBGeoLite2\-Country\-Locations\-en.csv\fP. Defaults to ".". +\fB\-i\fP \fIinput_file\fP +Specifies the source location of the DBIP CSV file. Defaults to +"dbip-country-lite.csv". Use "-" to read from stdin. +.TP +\fB\-s\fP +"System mode". Equivalent to \fB\-D /usr/share/xt_geoip\fP. .SH Application .PP -Shell commands to build the databases and put them to where they are expected: +Shell commands to build the databases and put them to where they are expected +(usually run as root): .PP -xt_geoip_build \-D /usr/share/xt_geoip +xt_geoip_build \-s .SH See also .PP xt_geoip_dl(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/geoip/xt_geoip_dl new/xtables-addons-3.11/geoip/xt_geoip_dl --- old/xtables-addons-3.9/geoip/xt_geoip_dl 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/geoip/xt_geoip_dl 2020-09-06 16:35:13.000000000 +0200 @@ -1,7 +1,5 @@ #!/bin/sh -rm -rf GeoLite2-Country-CSV_* - -wget -q http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip -unzip -q GeoLite2-Country-CSV.zip -rm -f GeoLite2-Country-CSV.zip +timestamp=$(date "+%Y-%m") +wget -q "https://download.db-ip.com/free/dbip-country-lite-$timestamp.csv.gz"; -O- | \ + gzip -cd >dbip-country-lite.csv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/geoip/xt_geoip_fetch new/xtables-addons-3.11/geoip/xt_geoip_fetch --- old/xtables-addons-3.9/geoip/xt_geoip_fetch 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/geoip/xt_geoip_fetch 2020-09-06 16:35:13.000000000 +0200 @@ -53,8 +53,9 @@ binmode($fh); while (($bytes = read($fh, $buffer, AF_INET_SIZE * 2)) == AF_INET_SIZE * 2) { - my $start = inet_ntop(AF_INET, substr($buffer, 0, AF_INET_SIZE)); - my $end = inet_ntop(AF_INET, substr($buffer, AF_INET_SIZE)); + my ($start, $end) = unpack('a4a4', $buffer); + $start = inet_ntop(AF_INET, $start); + $end = inet_ntop(AF_INET, $end); print $start, '-', $end, "\n"; } close($fh); @@ -75,8 +76,9 @@ binmode($fh); while (($bytes = read($fh, $buffer, AF_INET6_SIZE * 2)) == AF_INET6_SIZE * 2) { - my $start = inet_ntop(AF_INET6, substr($buffer, 0, AF_INET6_SIZE)); - my $end = inet_ntop(AF_INET6, substr($buffer, AF_INET6_SIZE)); + my ($start, $end) = unpack('a16a16', $buffer); + $start = inet_ntop(AF_INET6, $start); + $end = inet_ntop(AF_INET6, $end); print $start, '-', $end, "\n"; } close($fh); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/geoip/xt_geoip_fetch.1 new/xtables-addons-3.11/geoip/xt_geoip_fetch.1 --- old/xtables-addons-3.9/geoip/xt_geoip_fetch.1 1970-01-01 01:00:00.000000000 +0100 +++ new/xtables-addons-3.11/geoip/xt_geoip_fetch.1 2020-09-06 16:35:13.000000000 +0200 @@ -0,0 +1,35 @@ +.TH xt_geoip_fetch 1 "2020-04-30" "xtables-addons" "xtables-addons" +.SH Name +.PP +xt_geoip_fetch \(em dump a country database to stdout +.SH Syntax +.PP +\fBxt_geoip_fetch\fP [\fB\-D\fP +\fIdatabase_dir\fP] [\fB-4\fP] [\fB-6\fP] \fIcc\fP [ \fIcc\fP ... ] +.SH Description +.PP +xt_geoip_fetch unpacks a country's IPv4 or IPv6 databases and dumps +them to standard output as a sorted, non-overlaping list of ranges (which +is how they're represented in the database) suitable for browsing or +further processing. +.PP Options +.TP +\fB\-D\fP \fIdatabase_dir\fP +Specifies the directory into which the files have been put. Defaults to ".". +.TP +\fB-4\fP +Specifies IPv4 data only. +.TP +\fB-6\fP +Specifies IPv6 data only. +.TP +\fIcc\fP [ \fIcc\fP ... ] +The ISO-3166 country code names of the desired countries' databases. +.SH Application +.PP +Shell command to dump the list of Swiss IPv6 address ranges: +.PP +xt_geoip_fetch \-D /usr/share/xt_geoip \-6 ch +.SH See also +.PP +xt_geoip_build(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xtables-addons-3.9/xtables-addons.8.in new/xtables-addons-3.11/xtables-addons.8.in --- old/xtables-addons-3.9/xtables-addons.8.in 2020-02-25 07:35:08.000000000 +0100 +++ new/xtables-addons-3.11/xtables-addons.8.in 2020-09-06 16:35:13.000000000 +0200 @@ -1,4 +1,4 @@ -.TH xtables-addons 8 "" "" "v3.9 (2020-02-25)" +.TH xtables-addons 8 "" "" "v3.11 (2020-09-06)" .SH Name Xtables-addons \(em additional extensions for iptables, ip6tables, etc. .SH Targets ++++++ xtables-addons.keyring ++++++ --- /var/tmp/diff_new_pack.bOD79A/_old 2020-09-17 15:08:23.948912733 +0200 +++ /var/tmp/diff_new_pack.bOD79A/_new 2020-09-17 15:08:23.948912733 +0200 @@ -1,91 +1,52 @@ -pub 4096R/0xA28BDFEEB5A2B2FF 2015-05-07 [expires: 2020-08-08] - Key fingerprint = 2F8B FE96 D14F 8B56 0FBC 1F1D A28B DFEE B5A2 B2FF -uid [ultimate] Jan Engelhardt <[email protected]> -sub 4096R/0xB927458717B4ECED 2015-05-07 [expires: 2020-08-08] -sub 4096R/0x6A3933DA297DFB7D 2015-05-07 [expires: 2020-08-08] - -----BEGIN PGP PUBLIC KEY BLOCK----- -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 -cCAy -=ePMx +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 +NGTT6x12 +=QLsa -----END PGP PUBLIC KEY BLOCK-----
