pool/ebtables
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ebtables?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown 2007-10-12 22:07:43 +00:00 committed by Git OBS Bridge
parent 543bb23222
commit 8971583ec7
8 changed files with 149 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
ebtables-v2.0.6-gcc.diff
View File

@ -1,83 +0,0 @@
--- ebtables.c
+++ ebtables.c
@@ -1171,6 +1171,7 @@
continue;
return i;
letscontinue:
+ ;
}
return -1;
}
--- extensions/ebt_ip.c
+++ extensions/ebt_ip.c
@@ -313,7 +313,7 @@
ipinfo->invflags |= EBT_IP_PROTO;
if (optind > argc)
print_error("Missing IP protocol argument");
- (unsigned char) i = strtoul(argv[optind - 1], &end, 10);
+ i = (unsigned char) strtoul(argv[optind - 1], &end, 10);
if (*end != '\0') {
struct protoent *pe;
--- extensions/ebt_limit.c
+++ extensions/ebt_limit.c
@@ -203,15 +203,15 @@
static struct ebt_u_match limit_match =
{
- .name EBT_LIMIT_MATCH,
- .size sizeof(struct ebt_limit_info),
- .help print_help,
- .init init,
- .parse parse,
- .final_check final_check,
- .print print,
- .compare compare,
- .extra_ops opts,
+ .name = EBT_LIMIT_MATCH,
+ .size = sizeof(struct ebt_limit_info),
+ .help = print_help,
+ .init = init,
+ .parse = parse,
+ .final_check= final_check,
+ .print = print,
+ .compare = compare,
+ .extra_ops = opts,
};
static void _init(void) __attribute((constructor));
--- extensions/ebt_vlan.c
+++ extensions/ebt_vlan.c
@@ -141,8 +141,8 @@
check_option(flags, OPT_VLAN_ID);
CHECK_INV_FLAG(EBT_VLAN_ID);
CHECK_IF_MISSING_VALUE;
- (unsigned short) local.id =
- strtoul(argv[optind - 1], &end, 10);
+ local.id =
+ (unsigned short) strtoul(argv[optind - 1], &end, 10);
CHECK_RANGE(local.id > 4094 || *end != '\0');
vlaninfo->id = local.id;
SET_BITMASK(EBT_VLAN_ID);
@@ -152,8 +152,8 @@
check_option(flags, OPT_VLAN_PRIO);
CHECK_INV_FLAG(EBT_VLAN_PRIO);
CHECK_IF_MISSING_VALUE;
- (unsigned char) local.prio =
- strtoul(argv[optind - 1], &end, 10);
+ local.prio =
+ (unsigned char) strtoul(argv[optind - 1], &end, 10);
CHECK_RANGE(local.prio >= 8 || *end != '\0');
vlaninfo->prio = local.prio;
SET_BITMASK(EBT_VLAN_PRIO);
@@ -163,8 +163,8 @@
check_option(flags, OPT_VLAN_ENCAP);
CHECK_INV_FLAG(EBT_VLAN_ENCAP);
CHECK_IF_MISSING_VALUE;
- (unsigned short) local.encap =
- strtoul(argv[optind - 1], &end, 16);
+ local.encap =
+ (unsigned short) strtoul(argv[optind - 1], &end, 16);
if (*end != '\0') {
ethent = getethertypebyname(argv[optind - 1]);
if (ethent == NULL)

21
ebtables-v2.0.6-makefile.diff
View File

@ -1,21 +0,0 @@
--- Makefile
+++ Makefile
@@ -46,15 +46,15 @@
$(MANDIR)/man8/ebtables.8: ebtables.8
mkdir -p $(@D)
- install -m 0644 -o root -g root $< $@
+ install -m 0644 $< $@
$(ETHERTYPESFILE): ethertypes
mkdir -p $(@D)
- install -m 0644 -o root -g root $< $@
+ install -m 0644 $< $@
.PHONY: exec
exec: ebtables
- install -m 0755 -o root -g root $< $(BINFILE)
+ install -m 0755 $< $(BINFILE)
.PHONY: install
install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec

3
ebtables-v2.0.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc14a4b550e0a0516d678e1d11eae8dfddc17052474016c31809ee327f9e5754
size 58691

3
ebtables-v2.0.8-2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a1789a8c96009d1e8931bfcec884525fa20721dd55cc52ed658a3d597f39116
size 80196

17
ebtables-v2.0.8-initscript.diff Normal file
View File

@ -0,0 +1,17 @@
--- ebtables.sysv
+++ ebtables.sysv
@@ -11,6 +11,14 @@
#
# config: __SYSCONFIG__/ebtables (text)
# __SYSCONFIG__/ebtables.<table> (binary)
+### BEGIN INIT INFO
+# Provides: eptables
+# Required-Start: $remote_fs
+# Required-Stop:
+# Short-Description: Ethernet Bridge filter tables
+# Description: Ethernet Bridge filter tables
+### END INIT INFO
+
source /etc/init.d/functions
source /etc/sysconfig/network

62
ebtables-v2.0.8-makefile.diff Normal file
View File

@ -0,0 +1,62 @@
--- Makefile
+++ Makefile
@@ -154,28 +154,28 @@
.PHONY: scripts
scripts: ebtables-save ebtables.sysv ebtables-config
cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
+ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
- install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
+ install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
- install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
+ install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
$(MANDIR)/man8/ebtables.8: ebtables.8
mkdir -p $(DESTDIR)$(@D)
sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
+ install -m 0644 ebtables.8_ $(DESTDIR)$@
rm -f ebtables.8_
$(ETHERTYPESFILE): ethertypes
mkdir -p $(DESTDIR)$(@D)
- install -m 0644 -o root -g root $< $(DESTDIR)$@
+ install -m 0644 $< $(DESTDIR)$@
.PHONY: exec
exec: ebtables ebtables-restore
mkdir -p $(DESTDIR)$(BINDIR)
- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
+ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
+ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
.PHONY: install
install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
@@ -199,18 +199,18 @@
rm -f extensions/ebt_inat.c
rm -rf $(CVSDIRS)
mkdir -p include/linux/netfilter_bridge
- install -m 0644 -o root -g root \
+ install -m 0644 \
$(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/
# To keep possible compile error complaints about undefined ETH_P_8021Q
# off my back
- install -m 0644 -o root -g root \
+ install -m 0644 \
$(KERNEL_INCLUDES)/linux/if_ether.h include/linux/
- install -m 0644 -o root -g root \
+ install -m 0644 \
$(KERNEL_INCLUDES)/linux/types.h include/linux/
- install -m 0644 -o root -g root \
+ install -m 0644 \
$(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \
include/linux/netfilter_bridge/
- install -m 0644 -o root -g root \
+ install -m 0644 \
include/ebtables.h include/linux/netfilter_bridge/
make clean
touch *

12
ebtables.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Oct 12 16:13:57 CEST 2007 - prusnak@suse.cz
- update to 2.0.8-2
* add sysconfig support (ebtables-save, ebtables-restore, etc)
* add ulog watcher
* use shared libraries (making the code easily usable by third parties)
* improve speed
* bugfixes, dccp and sctp support
- dropped obsolete patches:
* gcc.diff (included in update)
-------------------------------------------------------------------
Thu Aug 9 16:27:37 CEST 2007 - olh@suse.de

78
ebtables.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package ebtables (Version v2.0.6)
# spec file for package ebtables (Version v2.0.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -13,14 +13,14 @@
Name: ebtables
License: GPL v2 or later
Group: Productivity/Networking/Security
Autoreqprov: on
Version: v2.0.6
Release: 68
AutoReqProv: on
Version: v2.0.8
Release: 1
Summary: Ethernet Bridge Tables
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-%{version}-makefile.diff
Patch1: %{name}-%{version}-gcc.diff
URL: http://ebtables.sourceforge.net/
Source: %{name}-%{version}-2.tar.bz2
Patch0: %{name}-%{version}-makefile.diff
Patch1: %{name}-%{version}-initscript.diff
Url: http://ebtables.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -39,24 +39,42 @@ Authors:
Grzegorz Borowiak <grzes@gnu.univ.gda.pl>
%prep
%setup
%patch
%setup -q -n %{name}-%{version}-2
%patch0
%patch1
%build
rm -rf include/linux/
make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
BINPATH=%{_prefix}/sbin/ \
MANDIR=%{_mandir} \
ETHERTYPESPATH=/etc
make \
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
LIBDIR=%{_libdir} \
MANDIR=%{_mandir} \
BINDIR=%{_sbindir} \
ETCDIR=%{_sysconfdir} \
INITDIR=%{_sysconfdir}/init.d \
SYSCONFIGDIR=%{_sysconfdir}
%install
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/sbin
install -d -m 755 $RPM_BUILD_ROOT/etc
make BINPATH=$RPM_BUILD_ROOT%{_prefix}/sbin/ \
MANDIR=$RPM_BUILD_ROOT%{_mandir} \
ETHERTYPESPATH=$RPM_BUILD_ROOT/etc \
install
install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
make \
DESTDIR=$RPM_BUILD_ROOT \
LIBDIR=%{_libdir} \
MANDIR=%{_mandir} \
BINDIR=%{_sbindir} \
ETCDIR=%{_sysconfdir} \
INITDIR=%{_sysconfdir}/init.d \
SYSCONFIGDIR=%{_sysconfdir} \
install
ln -sf %{_sysconfdir}/init.d/ebtables $RPM_BUILD_ROOT%{_sbindir}/rcebtables
%preun
%stop_on_removal ebtables
%postun
%restart_on_update ebtables
%insserv_cleanup
%clean
rm -rf $RPM_BUILD_ROOT
@ -64,10 +82,24 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc %{_mandir}/man8/ebtables.8*
%{_prefix}/sbin/ebtables
%config(noreplace) /etc/ethertypes
%config(noreplace) %{_sysconfdir}/ebtables-config
%config(noreplace) %{_sysconfdir}/ethertypes
%{_sysconfdir}/init.d/ebtables
%{_libdir}/*
%{_sbindir}/ebtables
%{_sbindir}/ebtables-restore
%{_sbindir}/ebtables-save
%{_sbindir}/rcebtables
%changelog
* Fri Oct 12 2007 - prusnak@suse.cz
- update to 2.0.8-2
* add sysconfig support (ebtables-save, ebtables-restore, etc)
* add ulog watcher
* use shared libraries (making the code easily usable by third parties)
* improve speed
* bugfixes, dccp and sctp support
- dropped obsolete patches:
* gcc.diff (included in update)
* Thu Aug 09 2007 - olh@suse.de
- remove private include/linux/ files
* Wed Jan 25 2006 - mls@suse.de