dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ebtables
-# $Id$
-NAME := ebtables
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ebtables.spec

@@ -1,44 +1,53 @@
 Name:		ebtables
-Version:	2.0.6
-Release:	4%{?dist}
+Version:	2.0.8
+Release:	1%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
-License:	GPL
+License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://ebtables.sourceforge.net/
-Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz
+Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}-1.tar.gz
 Source1:	ebtables.sysv
-Patch0:		ebtables-2.0.6-gcc34.patch
-Patch1:		ebtables-2.0.6-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+PreReq:		/sbin/chkconfig
+PreReq:		/sbin/service
 
 %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
 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,
 like iptables. There are no known incompatibility issues.
 
 %prep
-%setup -n ebtables-v%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n ebtables-v%{version}-1
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'`
+make %{?_smp_mflags} CFLAGS="$MY_CFLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
 install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8
+touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.filter
+touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.nat
+touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.broute
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -47,7 +56,10 @@ if [ $1 -eq 0 ]; then
 fi
 
 %postun
-/sbin/service ebtables condrestart &>/dev/null || :
+if [ $1 -ge 1 ]; then
+	/sbin/service ebtables condrestart &> /dev/null || :
+fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -55,11 +67,67 @@ fi
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
+%ghost %{_sysconfdir}/ebtables.filter
+%ghost %{_sysconfdir}/ebtables.nat
+%ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Jul  2 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-1
+- final 2.0.8 release
+
+* Wed Jan 17 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.8.rc3
+- fix release order
+
+* Wed Jan 17 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.1.rc3
+- bump to rc3
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 2.0.8-0.7.rc2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Mon Sep 18 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.6.rc2
+- fix versioning
+
+* Thu Sep 14 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.3.rc2
+- fix bugzilla 206257
+
+* Tue Sep 12 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.2.rc2
+- fix for FC-6
+
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
+* Wed Mar 29 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.3.rc1
+- use -fPIC
+
+* Wed Mar 29 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.2.rc1
+- broken tagging
+
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-0.1.rc1
+- bump to 2.0.8-rc1
+
+* Mon Jul  4 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-7
+- buildsystem error requires artificial release bump
+
+* Mon Jul  4 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-6
+- actually touch ghosted files
+
+* 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
 - 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
 - reworked for Fedora Extras

ebtables.sysv

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

sources

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