Bring ebtables to 2.0.8-2
This commit is contained in:
parent
0aa7f4c5cb
commit
7e44b8110e
@ -1,43 +1,43 @@
|
|||||||
diff -up ebtables-v2.0.8-1/Makefile.BAD ebtables-v2.0.8-1/Makefile
|
diff -up ebtables-v2.0.8-2/Makefile.orig ebtables-v2.0.8-2/Makefile
|
||||||
--- ebtables-v2.0.8-1/Makefile.BAD 2007-08-23 09:42:30.000000000 -0400
|
--- ebtables-v2.0.8-2/Makefile.orig 2007-09-21 13:27:20.000000000 -0400
|
||||||
+++ ebtables-v2.0.8-1/Makefile 2007-08-23 09:44:23.000000000 -0400
|
+++ ebtables-v2.0.8-2/Makefile 2007-10-28 15:09:01.000000000 -0400
|
||||||
@@ -163,28 +163,28 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
|
@@ -154,28 +154,28 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
|
||||||
.PHONY: scripts
|
.PHONY: scripts
|
||||||
scripts: ebtables-save ebtables.sysv ebtables-config
|
scripts: ebtables-save ebtables.sysv ebtables-config
|
||||||
cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
|
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 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
|
||||||
+ install -m 0755 ebtables-save_ $(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_
|
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 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
|
||||||
+ install -m 0755 ebtables.sysv_ $(INITDIR)/ebtables
|
+ install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
|
||||||
cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
|
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 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
|
||||||
+ install -m 0600 ebtables-config_ $(SYSCONFIGDIR)/ebtables-config
|
+ install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
|
||||||
rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
|
rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
|
||||||
|
|
||||||
$(MANDIR)/man8/ebtables.8: ebtables.8
|
$(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_
|
sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
|
||||||
- install -m 0644 -o root -g root ebtables.8_ $@
|
- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
|
||||||
+ install -m 0644 ebtables.8_ $@
|
+ install -m 0644 ebtables.8_ $(DESTDIR)$@
|
||||||
rm -f ebtables.8_
|
rm -f ebtables.8_
|
||||||
|
|
||||||
$(ETHERTYPESFILE): ethertypes
|
$(ETHERTYPESFILE): ethertypes
|
||||||
mkdir -p $(@D)
|
mkdir -p $(DESTDIR)$(@D)
|
||||||
- install -m 0644 -o root -g root $< $@
|
- install -m 0644 -o root -g root $< $(DESTDIR)$@
|
||||||
+ install -m 0644 $< $@
|
+ install -m 0644 $< $(DESTDIR)$@
|
||||||
|
|
||||||
.PHONY: exec
|
.PHONY: exec
|
||||||
exec: ebtables ebtables-restore
|
exec: ebtables ebtables-restore
|
||||||
mkdir -p $(BINDIR)
|
mkdir -p $(DESTDIR)$(BINDIR)
|
||||||
- install -m 0755 -o root -g root $(PROGNAME) $(BINDIR)/$(PROGNAME)
|
- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
|
||||||
- install -m 0755 -o root -g root ebtables-restore $(BINDIR)/ebtables-restore
|
- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
|
||||||
+ install -m 0755 $(PROGNAME) $(BINDIR)/$(PROGNAME)
|
+ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
|
||||||
+ install -m 0755 ebtables-restore $(BINDIR)/ebtables-restore
|
+ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
|
||||||
|
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
|
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 -f extensions/ebt_inat.c
|
||||||
rm -rf $(CVSDIRS)
|
rm -rf $(CVSDIRS)
|
||||||
mkdir -p include/linux/netfilter_bridge
|
mkdir -p include/linux/netfilter_bridge
|
||||||
|
@ -1,18 +1,17 @@
|
|||||||
Name: ebtables
|
Name: ebtables
|
||||||
Version: 2.0.8
|
Version: 2.0.8
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Ethernet Bridge frame table administration tool
|
Summary: Ethernet Bridge frame table administration tool
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: http://ebtables.sourceforge.net/
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
PreReq: /sbin/chkconfig
|
PreReq: /sbin/chkconfig
|
||||||
PreReq: /sbin/service
|
PreReq: /sbin/service
|
||||||
Patch0: ebtables-2.0.8-norootinst.patch
|
Patch0: ebtables-2.0.8-norootinst.patch
|
||||||
Patch1: ebtables-2.0.8-cflags.patch
|
Patch1: ebtables-2.0.8-cflags.patch
|
||||||
Patch2: ebtables-2.0.8-buildid.patch
|
Patch2: ebtables-2.0.8-buildid.patch
|
||||||
Patch3: ebtables-2.0.8-fixbrokendestdir.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Ethernet bridge tables is a firewalling tool to transparently filter network
|
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.
|
like iptables. There are no known incompatibility issues.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n ebtables-v%{version}-1
|
%setup -q -n ebtables-v%{version}-2
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'`
|
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
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
|
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
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.filter
|
||||||
touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.nat
|
touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.nat
|
||||||
touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.broute
|
touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ebtables.broute
|
||||||
@ -78,6 +76,10 @@ fi
|
|||||||
%ghost %{_sysconfdir}/sysconfig/ebtables.broute
|
%ghost %{_sysconfdir}/sysconfig/ebtables.broute
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Aug 23 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-3
|
||||||
- use _libdir/ebtables to match upstream RPATH (bugzilla 248865)
|
- use _libdir/ebtables to match upstream RPATH (bugzilla 248865)
|
||||||
- correct license tag
|
- correct license tag
|
||||||
|
Loading…
Reference in New Issue
Block a user