diff --git a/.gitignore b/.gitignore index 6b05d04..0aa9fe8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ebtables-v2.0.9-2.tar.gz +/ebtables-v2.0.10-1.tar.gz diff --git a/ebtables-2.0.10-ldflags.patch b/ebtables-2.0.10-ldflags.patch new file mode 100644 index 0000000..cd1faaf --- /dev/null +++ b/ebtables-2.0.10-ldflags.patch @@ -0,0 +1,12 @@ +diff -up ebtables-v2.0.10-1/extensions/Makefile.orig ebtables-v2.0.10-1/extensions/Makefile +--- ebtables-v2.0.10-1/extensions/Makefile.orig 2011-07-10 05:28:52.000000000 -0400 ++++ ebtables-v2.0.10-1/extensions/Makefile 2011-07-11 10:47:06.054911646 -0400 +@@ -11,7 +11,7 @@ EXT_LIBSI+=$(foreach T,$(EXT_FUNC), -leb + EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T)) + + extensions/ebt_%.so: extensions/ebt_%.o +- $(CC) -shared -o $@ -lc $< -nostartfiles ++ $(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles + + extensions/libebt_%.so: extensions/ebt_%.so + mv $< $@ diff --git a/ebtables-2.0.10-norootinst.patch b/ebtables-2.0.10-norootinst.patch new file mode 100644 index 0000000..0017720 --- /dev/null +++ b/ebtables-2.0.10-norootinst.patch @@ -0,0 +1,66 @@ +diff -up ebtables-v2.0.10-1/Makefile.orig ebtables-v2.0.10-1/Makefile +--- ebtables-v2.0.10-1/Makefile.orig 2011-07-10 05:28:52.000000000 -0400 ++++ ebtables-v2.0.10-1/Makefile 2011-07-11 10:45:00.323426448 -0400 +@@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/ + scripts: ebtables-save ebtables.sysv ebtables-config + cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ + mkdir -p $(DESTDIR)$(BINDIR) +- 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_ + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi +- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi ++ if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi + cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi +- if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi ++ if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi + rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ + + tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g') + $(MANDIR)/man8/ebtables.8: ebtables.8 + mkdir -p $(DESTDIR)$(@D) + sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_ +- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@ ++ install -m 0644 ebtables.8_ $(DESTDIR)$@ + rm -f ebtables.8_ + + $(DESTDIR)$(ETHERTYPESFILE): ethertypes + mkdir -p $(@D) +- install -m 0644 -o root -g root $< $@ ++ install -m 0644 $< $@ + + .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 $(DESTDIR)$(ETHERTYPESFILE) exec scripts +@@ -205,18 +205,18 @@ release: + 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 * diff --git a/ebtables.spec b/ebtables.spec index a3cf288..d6e79bd 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -1,16 +1,15 @@ Name: ebtables -Version: 2.0.9 -Release: 6%{?dist} +Version: 2.0.10 +Release: 1%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ Group: System Environment/Base URL: http://ebtables.sourceforge.net/ -Source0: http://downloads.sourceforge.net/ebtables/ebtables-v%{version}-2.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://downloads.sourceforge.net/ebtables/ebtables-v%{version}-1.tar.gz Requires(pre): /sbin/chkconfig Requires(postun): /sbin/service -Patch0: ebtables-2.0.8-norootinst.patch -Patch1: ebtables-2.0.8-cflags.patch +Patch0: ebtables-2.0.10-norootinst.patch +Patch1: ebtables-2.0.10-ldflags.patch Patch3: ebtables-2.0.9-lsb.patch %description @@ -25,9 +24,9 @@ The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. %prep -%setup -q -n ebtables-v%{version}-2 -%patch0 -p1 -%patch1 -p1 +%setup -q -n ebtables-v%{version}-1 +%patch0 -p1 -b .norootinst +%patch1 -p1 -b .ldflags %patch3 -p1 -b .lsb # Convert to UTF-8 @@ -38,7 +37,6 @@ MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" LIBDIR="/%{_lib}/ebtables" BINDIR="/sbin" MANDIR="%{_mandir}" %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="/%{_lib}/ebtables" BINDIR="/sbin" MANDIR="%{_mandir}" install @@ -46,9 +44,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.filter touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.nat touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.broute -%clean -rm -rf $RPM_BUILD_ROOT - %post /sbin/chkconfig --add ebtables /sbin/ldconfig @@ -79,6 +74,9 @@ fi %ghost %{_sysconfdir}/sysconfig/ebtables.broute %changelog +* Mon Jul 11 2011 Tom Callaway - 2.0.10-1 +- update to 2.0.10-1 + * Tue Feb 08 2011 Fedora Release Engineering - 2.0.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 6ec0628..02955a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b880429a6424186728eb57ae80ef878a ebtables-v2.0.9-2.tar.gz +33b9ff7c9b605605c705418f17812714 ebtables-v2.0.10-1.tar.gz