Hello community,
here is the log from the commit of package arptables for openSUSE:Factory
checked in at Fri Mar 19 10:37:45 CET 2010.
--------
--- arptables/arptables.changes 2009-12-19 18:40:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/arptables/arptables.changes 2010-03-15 14:01:11.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Mar 15 12:44:28 UTC 2010 - jengelh@medozas.de
+
+- drop JF fork and use the mainline arptables again
+- update to v0.0.3-4
+ * Update the userspace arptables tool to kernels 2.6.16 and
+ above. A change in the kernel API broke compatibility with the
+ arptables tool around release 2.6.16, causing the filtering to
+ behave unexpectedly.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
arptables_jf-0.0.8-2.6-kernel.patch
arptables_jf-0.0.8-fclose.patch
arptables_jf-0.0.8-header.patch
arptables_jf-0.0.8-man.patch
arptables_jf-0.0.8-no-script.patch
arptables_jf-0.0.8.tbz
arptables_jf-0.0.8-warnings.patch
New:
----
arptables-install.diff
arptables-v0.0.3-4.tar.xz
arptables-warnings.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arptables.spec ++++++
--- /var/tmp/diff_new_pack.6qMS9l/_old 2010-03-19 10:36:46.000000000 +0100
+++ /var/tmp/diff_new_pack.6qMS9l/_new 2010-03-19 10:36:46.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package arptables (Version 0.0.8)
+# spec file for package arptables (Version 1.0.3.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,22 +20,19 @@
Url: http://ebtables.sourceforge.net/
Name: arptables
-Version: 0.0.8
-Release: 6
+Version: 1.0.3.4
+Release: 1
+%define oversion v0.0.3-4
License: GPLv2+
Group: Productivity/Networking/Security
Summary: User Space Tool to Set Up and Maintain ARP Filtering Tables
-PreReq: %insserv_prereq %fillup_prereq
-AutoReqProv: on
-Source0: %{name}_jf-%{version}.tbz
-Patch1: %{name}_jf-%{version}-2.6-kernel.patch
-Patch2: %{name}_jf-%{version}-man.patch
-Patch3: %{name}_jf-%{version}-warnings.patch
-Patch4: %{name}_jf-%{version}-header.patch
-Patch5: %{name}_jf-%{version}-no-script.patch
-Patch6: %{name}_jf-%{version}-fclose.patch
+
+#Source: http://downloads.sf.net/ebtables/arptables-v0.0.3-4.tar.gz
+Source: %name-%oversion.tar.xz
+Patch1: arptables-install.diff
+Patch2: arptables-warnings.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: coreutils licenses perl
+BuildRequires: coreutils licenses perl xz
Requires: licenses
%description
@@ -48,25 +45,20 @@
Authors:
--------
- Jay Fenlason
- and others
+ Bart De Schuymer
+ Netfilter Developers
%prep
-%setup -q -n %{name}_jf-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%setup -qn %name-%oversion
+%patch -P 1 -P 2 -p1
%build
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -W -Wall"
export CFLAGS="$RPM_OPT_FLAGS"
-make %{?jobs:-j%jobs} all LIBDIR=/%{_lib}
+make %{?_smp_mflags} all LIBDIR=/%{_lib} PREFIX=%_prefix
%install
-make install DESTDIR=%{buildroot} LIBDIR=/%{_lib}
+make install DESTDIR=%{buildroot} LIBDIR=/%{_lib} PREFIX=%_prefix MANDIR=%_mandir
ln -sf $(readlink -f /usr/share/doc/licenses/GPL-2.0.txt) COPYING
%clean
@@ -76,7 +68,7 @@
%files
%defattr(-,root,root)
-/sbin/arptables*
+%_sbindir/arptables*
%{_mandir}/*/arptables*
%doc COPYING
++++++ arptables-install.diff ++++++
---
Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: arptables-v0.0.3-4/Makefile
===================================================================
--- arptables-v0.0.3-4.orig/Makefile
+++ arptables-v0.0.3-4/Makefile
@@ -35,22 +35,22 @@ arptables: arptables-standalone.o arptab
$(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8
mkdir -p $(@D)
- install -m 0644 -o root -g root $< $@
+ install -m 0644 $< $@
$(DESTDIR)$(BINDIR)/arptables: arptables
mkdir -p $(DESTDIR)$(BINDIR)
- install -m 0755 -o root -g root $< $@
+ install -m 0755 $< $@
tmp1:=$(shell printf $(BINDIR) | sed 's/\//\\\//g')
tmp2:=$(shell printf $(SYSCONFIGDIR) | sed 's/\//\\\//g')
.PHONY: scripts
scripts: arptables-save arptables-restore arptables.sysv
cat arptables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-save_
- install -m 0755 -o root -g root arptables-save_ $(DESTDIR)$(BINDIR)/arptables-save
+ install -m 0755 arptables-save_ $(DESTDIR)$(BINDIR)/arptables-save
cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_
- install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore
+ install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore
cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_
- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi
+ if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi
rm -f arptables-save_ arptables-restore_ arptables.sysv_
.PHONY: install
++++++ arptables-warnings.diff ++++++
---
arptables.c | 27 +++++++++++++++------------
libarptc/libarptc.c | 6 ++++--
libarptc/libarptc_incl.c | 6 ++++--
3 files changed, 23 insertions(+), 16 deletions(-)
Index: arptables-v0.0.3-4/arptables.c
===================================================================
--- arptables-v0.0.3-4.orig/arptables.c
+++ arptables-v0.0.3-4/arptables.c
@@ -874,7 +874,7 @@ parse_target(const char *targetname)
if (strlen(targetname)+1 > sizeof(arpt_chainlabel))
exit_error(PARAMETER_PROBLEM,
- "Invalid target name `%s' (%i chars max)",
+ "Invalid target name `%s' (%zu chars max)",
targetname, sizeof(arpt_chainlabel)-1);
for (ptr = targetname; *ptr; ptr++)
@@ -1062,7 +1062,7 @@ register_match(struct arptables_match *m
}
if (me->size != ARPT_ALIGN(me->size)) {
- fprintf(stderr, "%s: match `%s' has invalid size %u.\n",
+ fprintf(stderr, "%s: match `%s' has invalid size %zu.\n",
program_name, me->name, me->size);
exit(1);
}
@@ -1092,7 +1092,7 @@ register_target(struct arptables_target
}
if (me->size != ARPT_ALIGN(me->size)) {
- fprintf(stderr, "%s: target `%s' has invalid size %u.\n",
+ fprintf(stderr, "%s: target `%s' has invalid size %zu.\n",
program_name, me->name, me->size);
exit(1);
}
@@ -1116,17 +1116,17 @@ print_num(u_int64_t number, unsigned int
number = (number + 500) / 1000;
if (number > 9999) {
number = (number + 500) / 1000;
- printf(FMT("%4lluT ","%lluT "), number);
+ printf(FMT("%4lluT ","%lluT "), (unsigned long long)number);
}
- else printf(FMT("%4lluG ","%lluG "), number);
+ else printf(FMT("%4lluG ","%lluG "), (unsigned long long)number);
}
- else printf(FMT("%4lluM ","%lluM "), number);
+ else printf(FMT("%4lluM ","%lluM "), (unsigned long long)number);
} else
- printf(FMT("%4lluK ","%lluK "), number);
+ printf(FMT("%4lluK ","%lluK "), (unsigned long long)number);
} else
- printf(FMT("%5llu ","%llu "), number);
+ printf(FMT("%5llu ","%llu "), (unsigned long long)number);
} else
- printf(FMT("%8llu ","%llu "), number);
+ printf(FMT("%8llu ","%llu "), (unsigned long long)number);
}
@@ -1370,7 +1370,7 @@ after_devdst:
/* Print the target information. */
target->print(&fw->arp, t, format & FMT_NUMERIC);
} else if (t->u.target_size != sizeof(*t))
- printf("[%u bytes of unknown target data] ",
+ printf("[%zu bytes of unknown target data] ",
t->u.target_size - sizeof(*t));
if (!(format & FMT_NOCOUNTS)) {
@@ -1777,6 +1777,7 @@ int do_command(int argc, char *argv[], c
const char *jumpto = "";
char *protocol = NULL;
const char *modprobe = NULL;
+ unsigned long long bpcnt_num;
/* first figure out if this is a 2.6 or a 2.4 kernel */
*handle = arptc_init(*table);
@@ -2159,15 +2160,17 @@ int do_command(int argc, char *argv[], c
"-%c requires packet and byte counter",
opt2char(OPT_COUNTERS));
- if (sscanf(pcnt, "%llu", &fw.counters.pcnt) != 1)
+ if (sscanf(pcnt, "%llu", &bpcnt_num) != 1)
exit_error(PARAMETER_PROBLEM,
"-%c packet counter not numeric",
opt2char(OPT_COUNTERS));
+ fw.counters.pcnt = bpcnt_num;
- if (sscanf(bcnt, "%llu", &fw.counters.bcnt) != 1)
+ if (sscanf(bcnt, "%llu", &bpcnt_num) != 1)
exit_error(PARAMETER_PROBLEM,
"-%c byte counter not numeric",
opt2char(OPT_COUNTERS));
+ fw.counters.bcnt = bpcnt_num;
break;
Index: arptables-v0.0.3-4/libarptc/libarptc.c
===================================================================
--- arptables-v0.0.3-4.orig/libarptc/libarptc.c
+++ arptables-v0.0.3-4/libarptc/libarptc.c
@@ -133,7 +133,8 @@ dump_entry(STRUCT_ENTRY *e, const TC_HAN
printf("Flags: %02X\n", e->arp.flags);
printf("Invflags: %02X\n", e->arp.invflags);
printf("Counters: %llu packets, %llu bytes\n",
- e->counters.pcnt, e->counters.bcnt);
+ (unsigned long long)e->counters.pcnt,
+ (unsigned long long)e->counters.bcnt);
/*
printf("Cache: %08X ", e->nfcache);
if (e->nfcache & NFC_ALTERED) printf("ALTERED ");
@@ -159,7 +160,8 @@ dump_entry(STRUCT_ENTRY *e, const TC_HAN
t = GET_TARGET(e);
printf("Target name: `%s' [%u]\n", t->u.user.name, t->u.target_size);
if (strcmp(t->u.user.name, STANDARD_TARGET) == 0) {
- int pos = *(int *)t->data;
+ const unsigned char *data = t->data;
+ int pos = *(const int *)data;
if (pos < 0)
printf("verdict=%s\n",
pos == -NF_ACCEPT-1 ? "NF_ACCEPT"
Index: arptables-v0.0.3-4/libarptc/libarptc_incl.c
===================================================================
--- arptables-v0.0.3-4.orig/libarptc/libarptc_incl.c
+++ arptables-v0.0.3-4/libarptc/libarptc_incl.c
@@ -121,7 +121,7 @@ entry2index(const TC_HANDLE_T h, const S
if (ENTRY_ITERATE(h->entries.entrytable, h->entries.size,
get_number, seek, &pos) == 0) {
- fprintf(stderr, "ERROR: offset %i not an entry!\n",
+ fprintf(stderr, "ERROR: offset %zu not an entry!\n",
(char *)seek - (char *)h->entries.entrytable);
abort();
}
@@ -583,6 +583,7 @@ target_name(TC_HANDLE_T handle, const ST
int spos;
unsigned int labelidx;
STRUCT_ENTRY *jumpto;
+ const unsigned char *data;
/* To avoid const warnings */
STRUCT_ENTRY *e = (STRUCT_ENTRY *)ce;
@@ -591,7 +592,8 @@ target_name(TC_HANDLE_T handle, const ST
return GET_TARGET(e)->u.user.name;
/* Standard target: evaluate */
- spos = *(int *)GET_TARGET(e)->data;
+ data = GET_TARGET(e)->data;
+ spos = *(const int *)data;
if (spos < 0) {
if (spos == RETURN)
return LABEL_RETURN;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
