Resolve blockers that Chris Ricker pointed out.

This commit is contained in:
Tom Callaway 2005-07-01 16:27:10 +00:00
parent 871a94d185
commit 3ef3dc672f
2 changed files with 26 additions and 7 deletions

View File

@ -1,6 +1,6 @@
Name: ebtables Name: ebtables
Version: 2.0.6 Version: 2.0.6
Release: 4%{?dist} Release: 5%{?dist}
Summary: Ethernet Bridge frame table administration tool Summary: Ethernet Bridge frame table administration tool
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
@ -10,12 +10,17 @@ Source1: ebtables.sysv
Patch0: ebtables-2.0.6-gcc34.patch Patch0: ebtables-2.0.6-gcc34.patch
Patch1: ebtables-2.0.6-gcc4.patch Patch1: ebtables-2.0.6-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: /sbin/chkconfig
PreReq: /sbin/service
%description %description
Ethernet bridge tables is a firewalling tool to transparantly filter network Ethernet bridge tables is a firewalling tool to transparently filter network
traffic passing a bridge. The filtering possibilities are limited to link traffic passing a bridge. The filtering possibilities are limited to link
layer filtering and some basic filtering on higher network layers. layer filtering and some basic filtering on higher network layers.
This tool is the userspace control for the bridge and ebtables kernel
components (built by default in Fedora Core kernels).
The ebtables tool can be used together with the other Linux filtering tools, 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.
@ -47,7 +52,9 @@ if [ $1 -eq 0 ]; then
fi fi
%postun %postun
/sbin/service ebtables condrestart &>/dev/null || : if [ $1 -ge 1 ]
/sbin/service ebtables condrestart &> /dev/null || :
fi
%files %files
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
@ -56,10 +63,20 @@ fi
%config(noreplace) %{_sysconfdir}/ethertypes %config(noreplace) %{_sysconfdir}/ethertypes
%{_initrddir}/ebtables %{_initrddir}/ebtables
/sbin/ebtables /sbin/ebtables
%ghost %{_sysconfdir}/ebtables.filter
%ghost %{_sysconfdir}/ebtables.nat
%ghost %{_sysconfdir}/ebtables.broute
%changelog %changelog
* Fri Jul 1 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-5
- fix sysv file
* Fri Jul 1 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-4 * Fri Jul 1 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-4
- remove INSTALL file - remove INSTALL file
- add some text to description, correct typos
- fix %postun
- add PreReqs
- add %ghost config files
* Tue May 31 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-3 * Tue May 31 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-3
- reworked for Fedora Extras - reworked for Fedora Extras

View File

@ -10,7 +10,7 @@
# #
# config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.filter
# config: /etc/sysconfig/ebtables.nat # config: /etc/sysconfig/ebtables.nat
# config: /etc/sysconfig/ebtables.route # config: /etc/sysconfig/ebtables.broute
source /etc/init.d/functions source /etc/init.d/functions
source /etc/sysconfig/network source /etc/sysconfig/network
@ -27,6 +27,8 @@ RETVAL_BROUTE=0
prog="ebtables" prog="ebtables"
desc="Ethernet bridge filtering" desc="Ethernet bridge filtering"
lockfile=/var/lock/subsys/$prog
initialize() { initialize() {
# Initialize $TYPE tables # Initialize $TYPE tables
echo -n $" $TYPE tables: " echo -n $" $TYPE tables: "
@ -68,7 +70,7 @@ start() {
RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER`
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
rm -f /var/lock/subsys/$prog touch $lockfile
fi fi
echo echo
@ -87,7 +89,7 @@ stop() {
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
success "$prog shutdown" success "$prog shutdown"
rm -f /var/lock/subsys/$prog rm -f $lockfile
else else
failure "$prog shutdown" failure "$prog shutdown"
fi fi
@ -126,7 +128,7 @@ case "$1" in
restart restart
;; ;;
condrestart) condrestart)
[ -e /var/lock/subsys/$prog ] && restart [ -e $lockfile ] && restart
RETVAL=$? RETVAL=$?
;; ;;
save) save)