rpms/ebtables
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bring ebtables to 2.0.8-2

Browse Source
This commit is contained in:
Tom Callaway 2007-10-28 19:21:05 +00:00
parent 0aa7f4c5cb
commit 7e44b8110e
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ebtables-2.0.8-norootinst.patch
View File

@ -1,43 +1,43 @@
diff -up ebtables-v2.0.8-1/Makefile.BAD ebtables-v2.0.8-1/Makefile
--- ebtables-v2.0.8-1/Makefile.BAD 2007-08-23 09:42:30.000000000 -0400
+++ ebtables-v2.0.8-1/Makefile 2007-08-23 09:44:23.000000000 -0400
@@ -163,28 +163,28 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
diff -up ebtables-v2.0.8-2/Makefile.orig ebtables-v2.0.8-2/Makefile
--- ebtables-v2.0.8-2/Makefile.orig 2007-09-21 13:27:20.000000000 -0400
+++ ebtables-v2.0.8-2/Makefile 2007-10-28 15:09:01.000000000 -0400
@@ -154,28 +154,28 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
.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_ $(BINDIR)/ebtables-save
+ install -m 0755 ebtables-save_ $(BINDIR)/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_ $(INITDIR)/ebtables
+ install -m 0755 ebtables.sysv_ $(INITDIR)/ebtables
- 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_ $(SYSCONFIGDIR)/ebtables-config
+ install -m 0600 ebtables-config_ $(SYSCONFIGDIR)/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 $(@D)
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_ $@
+ install -m 0644 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 $(@D)
- install -m 0644 -o root -g root $< $@
+ install -m 0644 $< $@
mkdir -p $(DESTDIR)$(@D)
- install -m 0644 -o root -g root $< $(DESTDIR)$@
+ install -m 0644 $< $(DESTDIR)$@
.PHONY: exec
exec: ebtables ebtables-restore
mkdir -p $(BINDIR)
- install -m 0755 -o root -g root $(PROGNAME) $(BINDIR)/$(PROGNAME)
- install -m 0755 -o root -g root ebtables-restore $(BINDIR)/ebtables-restore
+ install -m 0755 $(PROGNAME) $(BINDIR)/$(PROGNAME)
+ install -m 0755 ebtables-restore $(BINDIR)/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
@@ -208,18 +208,18 @@ release:
@@ -199,18 +199,18 @@ release:
rm -f extensions/ebt_inat.c
rm -rf $(CVSDIRS)
mkdir -p include/linux/netfilter_bridge

16
ebtables.spec
View File

@ -1,18 +1,17 @@
Name: ebtables
Version: 2.0.8
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Ethernet Bridge frame table administration tool
License: GPLv2+
Group: System Environment/Base
URL: http://ebtables.sourceforge.net/
Source0: http://dl.sf.net/ebtables/ebtables-v%{version}-1.tar.gz
Source0: http://dl.sf.net/ebtables/ebtables-v%{version}-2.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: /sbin/chkconfig
PreReq: /sbin/service
Patch0: ebtables-2.0.8-norootinst.patch
Patch1: ebtables-2.0.8-cflags.patch
Patch2: ebtables-2.0.8-buildid.patch
Patch3: ebtables-2.0.8-fixbrokendestdir.patch
%description
Ethernet bridge tables is a firewalling tool to transparently filter network
@ -26,21 +25,20 @@ 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}-1
%setup -q -n ebtables-v%{version}-2
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'`
make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" LIBDIR="%{_libdir}" BINDIR="/sbin" MANDIR="%{_mandir}"
make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" LIBDIR="%{_libdir}/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="%{_libdir}" BINDIR="/sbin" MANDIR="%{_mandir}" install
make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="%{_libdir}/ebtables" BINDIR="/sbin" MANDIR="%{_mandir}" install
touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.filter
touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.nat
touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.broute
@ -78,6 +76,10 @@ fi
%ghost %{_sysconfdir}/sysconfig/ebtables.broute
%changelog
* Sun Oct 28 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-4
- bump to 2.0.8-2 from upstream
- keep _libdir/ebtables, even though upstream just moved away from it.
* Thu Aug 23 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-3
- use _libdir/ebtables to match upstream RPATH (bugzilla 248865)
- correct license tag

3
sources
View File

@ -1,2 +1 @@
92f0dd5107b92a744e104f50f9b2dd2d ebtables-v2.0.8-rc3.tar.gz
216e5d20fbd0e56dbe7e56b0d07b1909 ebtables-v2.0.8-1.tar.gz
66bcbcb2dcf3b981ad4e86e1720e796e ebtables-v2.0.8-2.tar.gz