Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xtables-addons for openSUSE:Factory
checked in at 2023-05-16 14:16:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xtables-addons (Old)
and /work/SRC/openSUSE:Factory/.xtables-addons.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtables-addons"
Tue May 16 14:16:18 2023 rev:80 rq:1087257 version:3.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/xtables-addons/xtables-addons.changes
2023-01-14 00:03:02.509649421 +0100
+++ /work/SRC/openSUSE:Factory/.xtables-addons.new.1533/xtables-addons.changes
2023-05-16 14:27:19.283705940 +0200
@@ -1,0 +2,7 @@
+Mon May 15 14:10:45 UTC 2023 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 3.24
+ * xt_geoip: bump number of territories per rule
+ * geoip: use stdout for output and stderr for errors/diag
+
+-------------------------------------------------------------------
Old:
----
xtables-addons-3.23.tar.asc
xtables-addons-3.23.tar.xz
New:
----
xtables-addons-3.24.tar.asc
xtables-addons-3.24.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xtables-addons.spec ++++++
--- /var/tmp/diff_new_pack.MXTrrw/_old 2023-05-16 14:27:19.699708319 +0200
+++ /var/tmp/diff_new_pack.MXTrrw/_new 2023-05-16 14:27:19.703708342 +0200
@@ -17,7 +17,7 @@
Name: xtables-addons
-Version: 3.23
+Version: 3.24
Release: 0
Summary: IP Packet Filter Administration Extensions
License: GPL-2.0-only AND GPL-2.0-or-later
++++++ xtables-addons-3.23.tar.xz -> xtables-addons-3.24.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/INSTALL.rst
new/xtables-addons-3.24/INSTALL.rst
--- old/xtables-addons-3.23/INSTALL.rst 2023-01-12 23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/INSTALL.rst 2023-04-30 15:39:07.000000000 +0200
@@ -58,7 +58,7 @@
the right directory. (If not, you need to install something.)
For RPM building, it should be ``/usr/src/linux-obj/...``
- or whatever location the distro makes use of.
+ or whatever location the distribution makes use of.
``--with-xtlibdir=``
Specifies the path to where the newly built extensions should
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/README.rst
new/xtables-addons-3.24/README.rst
--- old/xtables-addons-3.23/README.rst 2023-01-12 23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/README.rst 2023-04-30 15:39:07.000000000 +0200
@@ -9,6 +9,8 @@
Xtables/iptables is required. However, do see the INSTALL file for
the minimum requirements of Xtables-addons.
+See also https://inai.de/projects/xtables-addons/
+
Included in this package
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/configure
new/xtables-addons-3.24/configure
--- old/xtables-addons-3.23/configure 2023-01-12 23:32:39.646821457 +0100
+++ new/xtables-addons-3.24/configure 2023-04-30 15:39:58.407136649 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xtables-addons 3.23.
+# Generated by GNU Autoconf 2.71 for xtables-addons 3.24.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -618,8 +618,8 @@
# Identity of this package.
PACKAGE_NAME='xtables-addons'
PACKAGE_TARNAME='xtables-addons'
-PACKAGE_VERSION='3.23'
-PACKAGE_STRING='xtables-addons 3.23'
+PACKAGE_VERSION='3.24'
+PACKAGE_STRING='xtables-addons 3.24'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1363,7 +1363,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 xtables-addons 3.23 to adapt to many kinds of systems.
+\`configure' configures xtables-addons 3.24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1434,7 +1434,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xtables-addons 3.23:";;
+ short | recursive ) echo "Configuration of xtables-addons 3.24:";;
esac
cat <<\_ACEOF
@@ -1558,7 +1558,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xtables-addons configure 3.23
+xtables-addons configure 3.24
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1776,7 +1776,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xtables-addons $as_me 3.23, which was
+It was created by xtables-addons $as_me 3.24, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3049,7 +3049,7 @@
# Define the identity of the package.
PACKAGE='xtables-addons'
- VERSION='3.23'
+ VERSION='3.24'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -13655,7 +13655,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xtables-addons $as_me 3.23, which was
+This file was extended by xtables-addons $as_me 3.24, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13723,7 +13723,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-xtables-addons config.status 3.23
+xtables-addons config.status 3.24
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/configure.ac
new/xtables-addons-3.24/configure.ac
--- old/xtables-addons-3.23/configure.ac 2023-01-12 23:32:08.000000000
+0100
+++ new/xtables-addons-3.24/configure.ac 2023-04-30 15:39:07.000000000
+0200
@@ -1,4 +1,4 @@
-AC_INIT([xtables-addons], [3.23])
+AC_INIT([xtables-addons], [3.24])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/doc/changelog.rst
new/xtables-addons-3.24/doc/changelog.rst
--- old/xtables-addons-3.23/doc/changelog.rst 2023-01-12 23:32:08.000000000
+0100
+++ new/xtables-addons-3.24/doc/changelog.rst 2023-04-30 15:39:07.000000000
+0200
@@ -1,3 +1,10 @@
+v3.24 (2023-04-30)
+==================
+
+* xt_geoip: bump number of territories per rule
+* geoip: use stdout for output and stderr for errors/diag
+
+
v3.23 (2023-01-12)
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/ACCOUNT/iptaccount.8
new/xtables-addons-3.24/extensions/ACCOUNT/iptaccount.8
--- old/xtables-addons-3.23/extensions/ACCOUNT/iptaccount.8 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/ACCOUNT/iptaccount.8 2023-04-30
15:39:07.000000000 +0200
@@ -9,7 +9,7 @@
List all (accounting) table names.
.PP
\fB\-c\fP
-Loop every second (abort with CTRL+C).
+Loop every second (abort with Ctrl+C).
.PP
\fB\-f\fP
Flush data after display.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/ACCOUNT/iptaccount.c
new/xtables-addons-3.24/extensions/ACCOUNT/iptaccount.c
--- old/xtables-addons-3.23/extensions/ACCOUNT/iptaccount.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/ACCOUNT/iptaccount.c 2023-04-30
15:39:07.000000000 +0200
@@ -48,13 +48,13 @@
static void show_usage(void)
{
- printf("Unknown command line option. Try: [-u] [-h] [-a] [-f] [-c] [-s]
[-l name]\n");
+ printf("Unknown command-line option. Try: [-u] [-h] [-a] [-f] [-c] [-s]
[-l name]\n");
printf("[-u] show kernel handle usage\n");
printf("[-h] free all kernel handles (experts only!)\n\n");
printf("[-a] list all table names\n");
printf("[-l name] show data in table <name>\n");
printf("[-f] flush data after showing\n");
- printf("[-c] loop every second (abort with CTRL+C)\n");
+ printf("[-c] loop every second (abort with Ctrl+C)\n");
printf("[-s] CSV output (for spreadsheet import)\n");
printf("\n");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xtables-addons-3.23/extensions/ACCOUNT/libxt_ACCOUNT.man
new/xtables-addons-3.24/extensions/ACCOUNT/libxt_ACCOUNT.man
--- old/xtables-addons-3.23/extensions/ACCOUNT/libxt_ACCOUNT.man
2023-01-12 23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/ACCOUNT/libxt_ACCOUNT.man
2023-04-30 15:39:07.000000000 +0200
@@ -11,7 +11,7 @@
network. ACCOUNT uses fixed internal data structures
which speeds up the processing of each packet. Furthermore,
accounting data for one complete 192.168.1.X/24 network takes 4 KB of
-memory. Memory for 16 or 24 bit networks is only allocated when
+memory. Memory for 16-bit or 24-bit networks is only allocated when
needed.
.PP
To optimize the kernel<->userspace data transfer a bit more, the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/ACCOUNT/xt_ACCOUNT.c
new/xtables-addons-3.24/extensions/ACCOUNT/xt_ACCOUNT.c
--- old/xtables-addons-3.23/extensions/ACCOUNT/xt_ACCOUNT.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/ACCOUNT/xt_ACCOUNT.c 2023-04-30
15:39:07.000000000 +0200
@@ -68,7 +68,7 @@
/**
* Internal handle structure
- * @ip: base IP address of the network. Used for caculating the
final
+ * @ip: base IP address of the network. Used for calculating
the final
* address during get_data().
* @depth: size of the network; see above
* @itemcount: number of addresses in this table
@@ -82,7 +82,7 @@
/* Used for every IP entry
Size is 32 bytes so that 256 (class C network) * 16
- fits in a double kernel (zero) page (two consecutive kernel pages)*/
+ fits in a double kernel (zero) page (two consecutive kernel pages) */
struct ipt_acc_ip {
uint64_t src_packets;
uint64_t src_bytes;
@@ -93,8 +93,8 @@
/*
* The IP addresses are organized as an array so that direct slot
* calculations are possible.
- * Only 8-bit networks are preallocated, 16/24-bit networks
- * allocate their slots when needed -> very efficent.
+ * Only 8-bit networks are preallocated, 16-bit and 24-bit networks
+ * allocate their slots when needed -> very efficient.
*/
struct ipt_acc_mask_24 {
struct ipt_acc_ip ip[256];
@@ -140,13 +140,13 @@
if (!data)
return;
- /* Free for 8 bit network */
+ /* Free for 8-bit network */
if (depth == 0) {
free_pages((unsigned long)data, 2);
return;
}
- /* Free for 16 bit network */
+ /* Free for 16-bit network */
if (depth == 1) {
struct ipt_acc_mask_16 *mask_16 = data;
unsigned int b;
@@ -157,7 +157,7 @@
return;
}
- /* Free for 24 bit network */
+ /* Free for 24-bit network */
if (depth == 2) {
unsigned int a, b;
for (a = 0; a <= 255; a++) {
@@ -366,7 +366,7 @@
/* Increase size counters */
if (is_src) {
/* Calculate network slot */
- pr_debug("ACCOUNT: Calculated SRC 8 bit network slot: %d\n",
src_slot);
+ pr_debug("ACCOUNT: Calculated SRC 8-bit network slot: %d\n",
src_slot);
if (!mask_24->ip[src_slot].src_packets
&& !mask_24->ip[src_slot].dst_packets)
is_src_new_ip = true;
@@ -375,7 +375,7 @@
mask_24->ip[src_slot].src_bytes += size;
}
if (is_dst) {
- pr_debug("ACCOUNT: Calculated DST 8 bit network slot: %d\n",
dst_slot);
+ pr_debug("ACCOUNT: Calculated DST 8-bit network slot: %d\n",
dst_slot);
if (!mask_24->ip[dst_slot].src_packets
&& !mask_24->ip[dst_slot].dst_packets)
is_dst_new_ip = true;
@@ -413,7 +413,7 @@
/* Do we need to process src IP? */
if ((net_ip & netmask) == (src_ip & netmask)) {
uint8_t slot = (ntohl(src_ip) & 0xFF00) >> 8;
- pr_debug("ACCOUNT: Calculated SRC 16 bit network slot: %d\n",
slot);
+ pr_debug("ACCOUNT: Calculated SRC 16-bit network slot: %d\n",
slot);
/* Do we need to create a new mask_24 bucket? */
if (!mask_16->mask_24[slot] && (mask_16->mask_24[slot] =
@@ -429,7 +429,7 @@
/* Do we need to process dst IP? */
if ((net_ip & netmask) == (dst_ip & netmask)) {
uint8_t slot = (ntohl(dst_ip) & 0xFF00) >> 8;
- pr_debug("ACCOUNT: Calculated DST 16 bit network slot: %d\n",
slot);
+ pr_debug("ACCOUNT: Calculated DST 16-bit network slot: %d\n",
slot);
/* Do we need to create a new mask_24 bucket? */
if (!mask_16->mask_24[slot] && (mask_16->mask_24[slot]
@@ -451,7 +451,7 @@
/* Do we need to process src IP? */
if ((net_ip & netmask) == (src_ip & netmask)) {
uint8_t slot = (ntohl(src_ip) & 0xFF0000) >> 16;
- pr_debug("ACCOUNT: Calculated SRC 24 bit network slot: %d\n",
slot);
+ pr_debug("ACCOUNT: Calculated SRC 24-bit network slot: %d\n",
slot);
/* Do we need to create a new mask_24 bucket? */
if (!mask_8->mask_16[slot] && (mask_8->mask_16[slot]
@@ -467,7 +467,7 @@
/* Do we need to process dst IP? */
if ((net_ip & netmask) == (dst_ip & netmask)) {
uint8_t slot = (ntohl(dst_ip) & 0xFF0000) >> 16;
- pr_debug("ACCOUNT: Calculated DST 24 bit network slot: %d\n",
slot);
+ pr_debug("ACCOUNT: Calculated DST 24-bit network slot: %d\n",
slot);
/* Do we need to create a new mask_24 bucket? */
if (!mask_8->mask_16[slot] && (mask_8->mask_16[slot]
@@ -502,7 +502,7 @@
return XT_CONTINUE;
}
- /* 8 bit network or "any" network */
+ /* 8-bit network or "any" network */
if (ipt_acc_tables[info->table_nr].depth == 0) {
/* Count packet and check if the IP is new */
ipt_acc_depth0_insert(
@@ -514,7 +514,7 @@
return XT_CONTINUE;
}
- /* 16 bit network */
+ /* 16-bit network */
if (ipt_acc_tables[info->table_nr].depth == 1) {
ipt_acc_depth1_insert(
ipt_acc_tables[info->table_nr].data,
@@ -525,7 +525,7 @@
return XT_CONTINUE;
}
- /* 24 bit network */
+ /* 24-bit network */
if (ipt_acc_tables[info->table_nr].depth == 2) {
ipt_acc_depth2_insert(
ipt_acc_tables[info->table_nr].data,
@@ -644,7 +644,7 @@
continue;
if ((network_16->mask_24[b] =
ipt_acc_zalloc_page()) == NULL) {
- printk("ACCOUNT: out of memory during copy of
16 bit "
+ printk("ACCOUNT: out of memory during copy of
16-bit "
"network in
ipt_acc_handle_prepare_read()\n");
ipt_acc_data_free(dest->data, depth);
return -1;
@@ -665,7 +665,7 @@
continue;
if ((network_8->mask_16[a] =
ipt_acc_zalloc_page()) == NULL) {
- printk("ACCOUNT: out of memory during copy of
24 bit network"
+ printk("ACCOUNT: out of memory during copy of
24-bit network"
" in ipt_acc_handle_prepare_read()\n");
ipt_acc_data_free(dest->data, depth);
return -1;
@@ -682,7 +682,7 @@
continue;
if ((network_16->mask_24[b] =
ipt_acc_zalloc_page()) == NULL) {
- printk("ACCOUNT: out of memory during
copy of 16 bit"
+ printk("ACCOUNT: out of memory during
copy of 16-bit"
" network in
ipt_acc_handle_prepare_read()\n");
ipt_acc_data_free(dest->data, depth);
return -1;
@@ -740,7 +740,7 @@
return 0;
}
-/* Copy 8 bit network data into a prepared buffer.
+/* Copy 8-bit network data into a prepared buffer.
We only copy entries != 0 to increase performance.
*/
static int ipt_acc_handle_copy_data(struct ipt_acc_net *ian,
@@ -804,7 +804,7 @@
net_ip = ntohl(ian->ipt_acc_handles[handle].ip);
depth = ian->ipt_acc_handles[handle].depth;
- /* 8 bit network */
+ /* 8-bit network */
if (depth == 0) {
struct ipt_acc_mask_24 *network =
ian->ipt_acc_handles[handle].data;
@@ -820,7 +820,7 @@
return 0;
}
- /* 16 bit network */
+ /* 16-bit network */
if (depth == 1) {
struct ipt_acc_mask_16 *network_16 =
ian->ipt_acc_handles[handle].data;
@@ -843,7 +843,7 @@
return 0;
}
- /* 24 bit network */
+ /* 24-bit network */
if (depth == 2) {
struct ipt_acc_mask_8 *network_8 =
ian->ipt_acc_handles[handle].data;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_CHAOS.man
new/xtables-addons-3.24/extensions/libxt_CHAOS.man
--- old/xtables-addons-3.23/extensions/libxt_CHAOS.man 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_CHAOS.man 2023-04-30
15:39:07.000000000 +0200
@@ -11,7 +11,7 @@
\fB\-\-tarpit\fP
Use the REJECT and TARPIT target as a base to hold the connection until it
times out. This consumes conntrack entries when connection tracking is loaded
-(which usually is on most machines), and routers inbetween you and the Internet
+(which usually is on most machines), and routers between you and the Internet
may fail to do their connection tracking if they have to handle more
connections than they can.
.PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_DNETMAP.c
new/xtables-addons-3.24/extensions/libxt_DNETMAP.c
--- old/xtables-addons-3.23/extensions/libxt_DNETMAP.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_DNETMAP.c 2023-04-30
15:39:07.000000000 +0200
@@ -214,7 +214,7 @@
if (*flags & XT_DNETMAP_PERSISTENT)
printf(" --persistent ");
- /* ommited because default value can change as kernel mod param */
+ /* omitted because the default value can change as the kernel modifies
parameters */
if (*flags & XT_DNETMAP_TTL)
printf(" --ttl %i ", tginfo->ttl);
}
@@ -239,7 +239,7 @@
.extra_opts = DNETMAP_opts,
};
-static void _init(void)
+static __attribute__((constructor)) void dnetmap_tg_ldr(void)
{
xtables_register_target(&dnetmap_tg_reg);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_DNETMAP.man
new/xtables-addons-3.24/extensions/libxt_DNETMAP.man
--- old/xtables-addons-3.23/extensions/libxt_DNETMAP.man 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_DNETMAP.man 2023-04-30
15:39:07.000000000 +0200
@@ -88,7 +88,7 @@
.PP
\fB* Logging\fR
.PP
-The module logs binding add/timeout events to klog. This behaviour can be
+The module logs binding add/timeout events to klog. This behavior can be
disabled using the \fBdisable_log\fR module parameter.
.PP
\fB* Examples\fR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_PROTO.man
new/xtables-addons-3.24/extensions/libxt_PROTO.man
--- old/xtables-addons-3.23/extensions/libxt_PROTO.man 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_PROTO.man 2023-04-30
15:39:07.000000000 +0200
@@ -14,7 +14,7 @@
authentication extension header will be seen as a non-extension header.
.PP
For IPv4 packets, the \fBProtocol\fP field is modified and the checksum is
-re-calculated.
+recalculated.
.PP
For IPv6 packets, the scenario can be more complex due to the introduction of
the extension headers mechanism. By default, the PROTO target will scan the
IPv6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_SYSRQ.man
new/xtables-addons-3.24/extensions/libxt_SYSRQ.man
--- old/xtables-addons-3.23/extensions/libxt_SYSRQ.man 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_SYSRQ.man 2023-04-30
15:39:07.000000000 +0200
@@ -1,7 +1,7 @@
.PP
The SYSRQ target allows one to remotely trigger sysrq on the local machine over
the network. This can be useful when vital parts of the machine hang, for
-example an oops in a filesystem causing locks to be not released and processes
+example an oops in a file system causing locks to be not released and processes
to get stuck as a result \(em if still possible, use /proc/sysrq-trigger. Even
when processes are stuck, interrupts are likely to be still processed, and as
such, sysrq can be triggered through incoming network packets.
@@ -71,7 +71,7 @@
.fi
.PP
See the Linux docs for possible sysrq keys. Important ones are: re(b)oot,
-power(o)ff, (s)ync filesystems, (u)mount and remount readonly. More than one
+power(o)ff, (s)ync file systems, (u)mount and remount readonly. More than one
sysrq key can be used at once, but bear in mind that, for example, a sync may
not complete before a subsequent reboot or poweroff.
.PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_asn.c
new/xtables-addons-3.24/extensions/libxt_asn.c
--- old/xtables-addons-3.23/extensions/libxt_asn.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_asn.c 2023-04-30
15:39:07.000000000 +0200
@@ -37,7 +37,7 @@
"[!] --dst-asn, --destination-number number[,number...]\n"
" Match packet going to (one of) the specified ASN(s)\n"
"\n"
- "NOTE: The number is inputed by its ISO3166 code.\n"
+ "NOTE: The number is inputed by its ISO 3166 code.\n"
"\n"
);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_asn.man
new/xtables-addons-3.24/extensions/libxt_asn.man
--- old/xtables-addons-3.23/extensions/libxt_asn.man 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_asn.man 2023-04-30
15:39:07.000000000 +0200
@@ -9,7 +9,7 @@
.TP
.PP
The extra files you will need are the binary database files. They are generated
-from a ASN-subnet database with the asn_build_db.pl tool that is shipped
+from an ASN-subnet database with the asn_build_db.pl tool that is shipped
with the source package, and which should be available in compiled packages in
/usr/lib(exec)/xtables-addons/. The first command retrieves CSV files from
MaxMind, while the other two build packed bisectable range files:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_geoip.c
new/xtables-addons-3.24/extensions/libxt_geoip.c
--- old/xtables-addons-3.23/extensions/libxt_geoip.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_geoip.c 2023-04-30
15:39:07.000000000 +0200
@@ -36,7 +36,7 @@
"[!] --dst-cc, --destination-country country[,country...]\n"
" Match packet going to (one of) the specified country(ies)\n"
"\n"
- "NOTE: The country is inputed by its ISO3166 code.\n"
+ "NOTE: The country is inputed by its ISO 3166 code.\n"
"\n"
);
}
@@ -157,7 +157,7 @@
u_int16_t cc_int16;
if (strlen(cc) != 2) /* Country must be 2 chars long according
-
to the ISO3166 standard */
+
to the ISO 3166 standard */
xtables_error(PARAMETER_PROBLEM,
"geoip: invalid country code '%s'", cc);
@@ -170,7 +170,7 @@
xtables_error(PARAMETER_PROBLEM,
"geoip: invalid country code '%s'", cc);
- /* Convert chars into a single 16 bit integer.
+ /* Convert chars into a single 16-bit integer.
* FIXME: This assumes that a country code is
* exactly 2 chars long. If this is
* going to change someday, this whole
@@ -315,7 +315,7 @@
{
.family = NFPROTO_IPV6,
.name = "geoip",
- .revision = 1,
+ .revision = 2,
.version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct xt_geoip_match_info)),
.userspacesize = offsetof(struct xt_geoip_match_info, mem),
@@ -329,7 +329,7 @@
{
.family = NFPROTO_IPV4,
.name = "geoip",
- .revision = 1,
+ .revision = 2,
.version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct xt_geoip_match_info)),
.userspacesize = offsetof(struct xt_geoip_match_info, mem),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_geoip.man
new/xtables-addons-3.24/extensions/libxt_geoip.man
--- old/xtables-addons-3.23/extensions/libxt_geoip.man 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_geoip.man 2023-04-30
15:39:07.000000000 +0200
@@ -8,7 +8,7 @@
Match packet going to (one of) the specified country(ies)
.TP
NOTE:
-The country is inputed by its ISO-3166 code.
+The country is inputed by its ISO 3166 code.
.PP
The extra files you will need is the binary database files. They are generated
from a country-subnet database with the geoip_build_db.pl tool that is shipped
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_iface.c
new/xtables-addons-3.24/extensions/libxt_iface.c
--- old/xtables-addons-3.23/extensions/libxt_iface.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_iface.c 2023-04-30
15:39:07.000000000 +0200
@@ -221,7 +221,7 @@
.extra_opts = iface_mt_opts,
};
-static void _init(void)
+static __attribute__((constructor)) void iface_mt_ldr(void)
{
xtables_register_match(&iface_mt_reg);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_ipv4options.c
new/xtables-addons-3.24/extensions/libxt_ipv4options.c
--- old/xtables-addons-3.23/extensions/libxt_ipv4options.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_ipv4options.c 2023-04-30
15:39:07.000000000 +0200
@@ -120,14 +120,14 @@
unsigned int i;
for (i = 1; i < 32; ++i)
- if (tmp & (1 << i)) {
- if (info->invert & (1 << i))
+ if (tmp & (1U << i)) {
+ if (info->invert & (1U << i))
printf("!");
if (!numeric && v4opt_names[i] != NULL)
printf("%s", v4opt_names[i]);
else
printf("%u", i);
- tmp &= ~(1 << i);
+ tmp &= ~(1U << i);
if (tmp)
printf(",");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/libxt_length2.c
new/xtables-addons-3.24/extensions/libxt_length2.c
--- old/xtables-addons-3.23/extensions/libxt_length2.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/libxt_length2.c 2023-04-30
15:39:07.000000000 +0200
@@ -152,7 +152,7 @@
.extra_opts = length_mt_opts,
};
-static void _init(void)
+static __attribute__((constructor)) void length2_mt_ldr(void)
{
xtables_register_match(&length2_mt_reg);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/mac.c
new/xtables-addons-3.24/extensions/mac.c
--- old/xtables-addons-3.23/extensions/mac.c 2023-01-12 23:32:08.000000000
+0100
+++ new/xtables-addons-3.24/extensions/mac.c 2023-04-30 15:39:07.000000000
+0200
@@ -1,7 +1,7 @@
static bool mac_parse(const char *addr, unsigned char *dest, uint8_t *mask)
{
unsigned int i = 0, value;
- char *end;
+ char *end = "//";
for (i = 0; i < ETH_ALEN; ++i) {
value = strtoul(addr, &end, 16);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xtables-addons-3.23/extensions/pknock/libxt_pknock.man
new/xtables-addons-3.24/extensions/pknock/libxt_pknock.man
--- old/xtables-addons-3.23/extensions/pknock/libxt_pknock.man 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/pknock/libxt_pknock.man 2023-04-30
15:39:07.000000000 +0200
@@ -23,7 +23,7 @@
The rule will allow tcp port 22 for the attempting IP address after the
successful reception of TCP SYN packets
to ports 4002, 4001 and 4004, in this order (a.k.a. port-knocking).
Port numbers in the connect sequence must follow the exact specification, no
-other ports may be "knocked" inbetween. The rule is named '\fBSSH\fP' \(em a
file of
+other ports may be "knocked" in between. The rule is named '\fBSSH\fP' \(em a
file of
the same name for tracking port knocking states will be created in
\fB/proc/net/xt_pknock\fP .
Successive port knocks must occur with delay of at most 10 seconds. Port 22
(from the example) will
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/pknock/xt_pknock.c
new/xtables-addons-3.24/extensions/pknock/xt_pknock.c
--- old/xtables-addons-3.23/extensions/pknock/xt_pknock.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/pknock/xt_pknock.c 2023-04-30
15:39:07.000000000 +0200
@@ -128,7 +128,7 @@
* @len: length
* @initval
* @max
- * @return: a 32 bits index
+ * @return: a 32-bit index
*/
static inline uint32_t
pknock_hash(const void *key, uint32_t len, uint32_t initval, uint32_t max)
@@ -347,7 +347,7 @@
}
/**
- * Garbage collector. It removes the old entries after tis timers have expired.
+ * Garbage collector. It removes the old entries after its timers have expired.
*
* @r: rule
*/
@@ -722,12 +722,6 @@
if (payload_len == 0)
return false;
-
- /*
- * hexa: 4bits
- * ascii: 8bits
- * hexa = ascii * 2
- */
hexa_size = crypto.size * 2;
/* + 1 cause we MUST add NULL in the payload */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/xt_DNETMAP.c
new/xtables-addons-3.24/extensions/xt_DNETMAP.c
--- old/xtables-addons-3.23/extensions/xt_DNETMAP.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/xt_DNETMAP.c 2023-04-30
15:39:07.000000000 +0200
@@ -458,7 +458,7 @@
goto bind_new_prefix;
}
/* don't reset ttl if flag is set
- or it is static entry*/
+ or it is static entry */
if (jttl >= 0 && ! (e->flags & XT_DNETMAP_STATIC) ) {
e->stamp = jiffies + jttl;
p = e->prefix;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/xt_asn.c
new/xtables-addons-3.24/extensions/xt_asn.c
--- old/xtables-addons-3.23/extensions/xt_asn.c 2023-01-12 23:32:08.000000000
+0100
+++ new/xtables-addons-3.24/extensions/xt_asn.c 2023-04-30 15:39:07.000000000
+0200
@@ -129,10 +129,6 @@
spin_unlock(&asn_lock);
return;
}
-
- /* So now am unlinked or the only one alive, right ?
- * What are you waiting ? Free up some memory!
- */
list_del_rcu(&p->list);
spin_unlock(&asn_lock);
@@ -214,7 +210,7 @@
rcu_read_lock();
for (i = 0; i < info->count; i++) {
if ((node = info->mem[i].kernel) == NULL) {
- printk(KERN_ERR "xt_asn: what the hell ?? '%u' isn't
loaded into memory... skip it!\n",
+ printk(KERN_ERR "xt_asn: %u is not loaded into
memory\n",
info->asn[i]);
continue;
}
@@ -264,7 +260,7 @@
rcu_read_lock();
for (i = 0; i < info->count; i++) {
if ((node = info->mem[i].kernel) == NULL) {
- printk(KERN_ERR "xt_asn: what the hell ?? '%u' isn't
loaded into memory... skip it!\n",
+ printk(KERN_ERR "xt_asn: %u is not loaded into
memory\n",
info->asn[i]);
continue;
}
@@ -328,9 +324,7 @@
else
/* Something strange happened. There's no memory
allocated for this
* number. Please send this bug to the mailing list. */
- printk(KERN_ERR
- "xt_asn: What happened peejix ? What
happened acidfu ?\n"
- "xt_asn: please report this bug to the
maintainers\n");
+ printk(KERN_ERR "xt_asn: no memory allocated for this
number\n");
}
static struct xt_match xt_asn_match[] __read_mostly = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/xt_fuzzy.c
new/xtables-addons-3.24/extensions/xt_fuzzy.c
--- old/xtables-addons-3.23/extensions/xt_fuzzy.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/xt_fuzzy.c 2023-04-30
15:39:07.000000000 +0200
@@ -74,7 +74,7 @@
amount = info->present_time - info->previous_time;
} else {
/*
- * There was a transition: I choose to re-sample
+ * There was a transition: I choose to resample
* and keep the old acceptance rate...
*/
amount = 0;
@@ -101,7 +101,7 @@
* denominator proportional to (howhigh+howlow) but, in this
* particular case, that expression is constant.
*
- * An imediate consequence is that it is not necessary to call
+ * An immediate consequence is that it is not necessary to call
* both mf_high and mf_low - but to keep things understandable,
* I did so.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/xt_geoip.c
new/xtables-addons-3.24/extensions/xt_geoip.c
--- old/xtables-addons-3.23/extensions/xt_geoip.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/xt_geoip.c 2023-04-30
15:39:07.000000000 +0200
@@ -127,10 +127,6 @@
spin_unlock(&geoip_lock);
return;
}
-
- /* So now am unlinked or the only one alive, right ?
- * What are you waiting ? Free up some memory!
- */
list_del_rcu(&p->list);
spin_unlock(&geoip_lock);
@@ -212,7 +208,7 @@
rcu_read_lock();
for (i = 0; i < info->count; i++) {
if ((node = info->mem[i].kernel) == NULL) {
- printk(KERN_ERR "xt_geoip: what the hell ?? '%c%c'
isn't loaded into memory... skip it!\n",
+ printk(KERN_ERR "xt_geoip: %c%c is not loaded into
memory\n",
COUNTRY(info->cc[i]));
continue;
}
@@ -262,7 +258,7 @@
rcu_read_lock();
for (i = 0; i < info->count; i++) {
if ((node = info->mem[i].kernel) == NULL) {
- printk(KERN_ERR "xt_geoip: what the hell ?? '%c%c'
isn't loaded into memory... skip it!\n",
+ printk(KERN_ERR "xt_geoip: %c%c is not loaded into
memory\n",
COUNTRY(info->cc[i]));
continue;
}
@@ -295,7 +291,7 @@
}
}
- /* Overwrite the now-useless pointer info->mem[i] with
+ /* Overwrite the, now useless, pointer info->mem[i] with
* a pointer to the node's kernelspace structure.
* This avoids searching for a node in the match() and
* destroy() functions.
@@ -326,15 +322,13 @@
else
/* Something strange happened. There's no memory
allocated for this
* country. Please send this bug to the mailing list.
*/
- printk(KERN_ERR
- "xt_geoip: What happened peejix ? What
happened acidfu ?\n"
- "xt_geoip: please report this bug to
the maintainers\n");
+ printk(KERN_ERR "xt_geoip: no memory allocated for this
number\n");
}
static struct xt_match xt_geoip_match[] __read_mostly = {
{
.name = "geoip",
- .revision = 1,
+ .revision = 2,
.family = NFPROTO_IPV6,
.match = xt_geoip_mt6,
.checkentry = xt_geoip_mt_checkentry,
@@ -344,7 +338,7 @@
},
{
.name = "geoip",
- .revision = 1,
+ .revision = 2,
.family = NFPROTO_IPV4,
.match = xt_geoip_mt4,
.checkentry = xt_geoip_mt_checkentry,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/xt_geoip.h
new/xtables-addons-3.24/extensions/xt_geoip.h
--- old/xtables-addons-3.23/extensions/xt_geoip.h 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/xt_geoip.h 2023-04-30
15:39:07.000000000 +0200
@@ -17,7 +17,7 @@
XT_GEOIP_DST = 1 << 1, /* Perform check on Destination IP */
XT_GEOIP_INV = 1 << 2, /* Negate the condition */
- XT_GEOIP_MAX = 15, /* Maximum of countries */
+ XT_GEOIP_MAX = 31, /* Maximum of countries */
};
/* Yup, an address range will be passed in with host-order */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/xt_ipp2p.c
new/xtables-addons-3.24/extensions/xt_ipp2p.c
--- old/xtables-addons-3.23/extensions/xt_ipp2p.c 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/extensions/xt_ipp2p.c 2023-04-30
15:39:07.000000000 +0200
@@ -57,7 +57,7 @@
switch (t[0]) {
case 0xe3:
- /* edonkey */
+ /* eDonkey */
switch (t[1]) {
/* client -> server status request */
case 0x96:
@@ -270,13 +270,13 @@
/* packetlen must be bigger than 32 */
/* first 4 bytes are zero */
if (packet_len > 32 && get_u32(haystack, 0) == 0x00000000) {
- /* first rule: 00 00 00 00 01 00 00 xx xx xx xx 00 00 00 00*/
+ /* first rule: 00 00 00 00 01 00 00 xx xx xx xx 00 00 00 00 */
if (get_u32(haystack, 4) == 0x00000000 &&
get_u32(haystack, 8) == 0x00010000 &&
get_u32(haystack, 16) == 0x00000000)
return IPP2P_BIT * 100 + 71;
- /* 00 01 00 00 0d 00 00 xx xx xx xx 00 00 00 00*/
+ /* 00 01 00 00 0d 00 00 xx xx xx xx 00 00 00 00 */
if (get_u32(haystack, 4) == 0x00000001 &&
get_u32(haystack, 8) == 0x000d0000 &&
get_u32(haystack, 16) == 0x00000000)
@@ -329,7 +329,7 @@
return IPP2P_ARES * 100 + 1;
if (plen == 60)
- /* possible download command*/
+ /* possible download command */
if (payload[59] == 0x0a && payload[58] == 0x0a)
if (memcmp(t, "PUSH SHA1:", 10) == 0)
/* found download command */
@@ -439,7 +439,7 @@
}
/* match 14 00 00 00 01 yy 00 00 00 STRING(YY) 01 00 00 00 00 46|50 00
00 00 00 */
- /* without size at the beginning !!! */
+ /* without size at the beginning! */
if (get_u32(payload, 0) == 0x14 && get_u8(payload, 4) == 0x01) {
uint32_t y = get_u32(payload, 5);
@@ -581,7 +581,7 @@
return 0;
}
-/* check for gnutella get command */
+/* check for Gnutella get command */
static unsigned int
search_gnu(const unsigned char *payload, const unsigned int plen)
{
@@ -596,7 +596,7 @@
return 0;
}
-/* check for gnutella get commands and other typical data */
+/* check for Gnutella get commands and other typical data */
static unsigned int
search_all_gnu(const unsigned char *payload, const unsigned int plen)
{
@@ -666,7 +666,7 @@
return 0;
}
-/* fast check for edonkey file segment transfer command */
+/* fast check for eDonkey file segment transfer command */
static unsigned int
search_edk(const unsigned char *payload, const unsigned int plen)
{
@@ -682,7 +682,7 @@
}
}
-/* intensive but slower search for some edonkey packets including size-check */
+/* intensive but slower search for some eDonkey packets including size check */
static unsigned int
search_all_edk(const unsigned char *payload, const unsigned int plen)
{
@@ -776,7 +776,7 @@
const uint16_t end = plen - 13;
/*
- * is seems to be a irc private massage, chedck for
+ * is seems to be an IRC private massage, check for
* xdcc command
*/
while (x < end) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/extensions/xt_psd.c
new/xtables-addons-3.24/extensions/xt_psd.c
--- old/xtables-addons-3.23/extensions/xt_psd.c 2023-01-12 23:32:08.000000000
+0100
+++ new/xtables-addons-3.24/extensions/xt_psd.c 2023-04-30 15:39:07.000000000
+0200
@@ -256,7 +256,7 @@
struct host *h, *last = NULL;
/*
- * We are going to re-use the oldest list entry, so remove it from the
+ * We are going to reuse the oldest list entry, so remove it from the
* hash table first, if it is really already in use.
*/
h = *head;
@@ -322,7 +322,7 @@
/* We know this address, but the entry is outdated. Mark it
unused, and
* remove from the hash table. We'll allocate a new entry
instead since
- * this one might get re-used too soon. */
+ * this one might get reused too soon. */
curr4 = host_to_host4(curr);
curr4->saddr = 0;
ht_unlink(head, last);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/geoip/xt_geoip_build
new/xtables-addons-3.24/geoip/xt_geoip_build
--- old/xtables-addons-3.23/geoip/xt_geoip_build 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/geoip/xt_geoip_build 2023-04-30
15:39:07.000000000 +0200
@@ -11,6 +11,7 @@
use warnings;
use Text::CSV_XS; # or trade for Text::CSV
use strict;
+$| = 1;
my $csv = Text::CSV_XS->new({
allow_whitespace => 1,
@@ -65,11 +66,11 @@
}
if (!$quiet && $. % 4096 == 0) {
- print STDERR "\r\e[2K$. entries";
+ print STDOUT "\r\e[2K$. entries";
}
}
- print STDERR "\r\e[2K$. entries total\n" unless ($quiet);
+ print STDOUT "\r\e[2K$. entries total\n" unless ($quiet);
close($fh);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/geoip/xt_geoip_build_maxmind
new/xtables-addons-3.24/geoip/xt_geoip_build_maxmind
--- old/xtables-addons-3.23/geoip/xt_geoip_build_maxmind 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/geoip/xt_geoip_build_maxmind 2023-04-30
15:39:07.000000000 +0200
@@ -10,6 +10,7 @@
use warnings;
use Text::CSV_XS; # or trade for Text::CSV
use strict;
+$| = 1;
my $csv = Text::CSV_XS->new({
allow_whitespace => 1,
@@ -168,12 +169,12 @@
$cidr = $row->[net];
$country{$cc}->{pool_v4}->add($cidr);
- if ($. % 4096 == 0) {
- print STDERR "\r\e[2K$. entries";
+ if (!$quiet && $. % 4096 == 0) {
+ print STDOUT "\r\e[2K$. entries";
}
}
- print STDERR "\r\e[2K$. entries total\n";
+ print STDOUT "\r\e[2K$. entries total\n" unless ($quiet);
close($fh);
@@ -203,11 +204,11 @@
$country{$cc}->{pool_v6}->add($cidr);
if (!$quiet && $. % 4096 == 0) {
- print STDERR "\r\e[2K$. entries";
+ print STDOUT "\r\e[2K$. entries";
}
}
- print STDERR "\r\e[2K$. entries total\n" unless ($quiet);
+ print STDOUT "\r\e[2K$. entries total\n" unless ($quiet);
close($fh);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xtables-addons-3.23/geoip/xt_geoip_query.1
new/xtables-addons-3.24/geoip/xt_geoip_query.1
--- old/xtables-addons-3.23/geoip/xt_geoip_query.1 2023-01-12
23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/geoip/xt_geoip_query.1 2023-04-30
15:39:07.000000000 +0200
@@ -24,7 +24,7 @@
Specifies IPv6 data only.
.TP
\fIcc\fP [ \fIcc\fP ... ]
-The ISO-3166 country code names of the desired countries' databases.
+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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xtables-addons-3.23/include/linux/netfilter/nf_conntrack_tuple_common.h
new/xtables-addons-3.24/include/linux/netfilter/nf_conntrack_tuple_common.h
--- old/xtables-addons-3.23/include/linux/netfilter/nf_conntrack_tuple_common.h
2023-01-12 23:32:08.000000000 +0100
+++ new/xtables-addons-3.24/include/linux/netfilter/nf_conntrack_tuple_common.h
2023-04-30 15:39:07.000000000 +0200
@@ -30,7 +30,7 @@
__be16 port;
} sctp;
struct {
- __be16 key; /* GRE key is 32bit, PPtP only uses 16bit */
+ __be16 key; /* GRE key is 32-bit, PPtP only uses 16-bit */
} gre;
};
