Install /etc/ethertypes even with USE=static, bug #367379 thank Dirk-Lüder Kreie for report. Respect LDFLAGS when USE=static. Drop old.

(Portage version: 2.1.9.49/cvs/Linux x86_64)

9 files changed, 36 insertions, 350 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 70eff3cc9b52..57ce08052726 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-firewall/ebtables
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.39 2010/07/11 12:07:23 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.40 2011/05/19 10:29:33 pva Exp $
+
+*ebtables-2.0.9.2-r2 (19 May 2011)
+
+  19 May 2011; Peter Volkov <pva@gentoo.org>
+  -files/ebtables-v2.0.9-1-LDFLAGS.diff, -ebtables-2.0.9.1.ebuild,
+  -ebtables-2.0.9.1-r1.ebuild, -ebtables-2.0.9.2.ebuild,
+  +ebtables-2.0.9.2-r2.ebuild, -files/ebtables-v2.0.8-2-LDFLAGS.diff,
+  files/ebtables-v2.0.9-2-LDFLAGS.diff, -files/ebtables.confd,
+  -files/ebtables.initd:
+  Install /etc/ethertypes even with USE=static, bug #367379 thank Dirk-Lüder
+  Kreie for report. Respect LDFLAGS when USE=static. Drop old.
 
   11 Jul 2010; Markus Meier <maekke@gentoo.org> ebtables-2.0.9.2-r1.ebuild:
   x86 stable, bug #323571
diff --git a/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild
deleted file mode 100644
index 6c1fc9df9c15..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild,v 1.3 2009/12/06 22:47:01 flameeyes Exp $
-
-EAPI="2"
-
-inherit versionator eutils toolchain-funcs multilib flag-o-matic
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P=${PN}-v${MY_PV}
-
-DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static"
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use static; then
-		ewarn "You've chosen static build which is useful for embedded devices."
-		ewarn "It has no init script. Make sure that's really what you want."
-	fi
-}
-
-src_prepare() {
-	# Enhance ebtables-save to take table names as parameters bug #189315
-	epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.9-1-LDFLAGS.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.8-2-ethertype-DESTDIR-mkdir.patch"
-
-	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
-		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
-		-e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \
-		-e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
-		-e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
-	sed -i -e "s/^CFLAGS:=/CFLAGS+=/" Makefile
-	sed -i -e "s,^CC:=.*,CC:=$(tc-getCC)," Makefile
-}
-
-src_compile() {
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	append-ldflags $(no-as-needed)
-	emake $(use static && echo static) || die "emake failed"
-}
-
-src_install() {
-	if ! use static; then
-		make DESTDIR="${D}" install || die
-		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd ebtables || die
-		newconfd "${FILESDIR}"/ebtables.confd ebtables || die
-	else
-		into /
-		newsbin static ebtables || die
-	fi
-	dodoc ChangeLog THANKS || die
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.9.1.ebuild b/net-firewall/ebtables/ebtables-2.0.9.1.ebuild
deleted file mode 100644
index 1986bea23e1d..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.9.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.1.ebuild,v 1.4 2009/11/08 19:20:20 nixnut Exp $
-
-inherit versionator eutils toolchain-funcs multilib flag-o-matic
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P=${PN}-v${MY_PV}
-
-DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Enchance ebtables-save to take table names as parameters bug #189315
-	epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.9-1-LDFLAGS.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.8-2-ethertype-DESTDIR-mkdir.patch"
-
-	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
-		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
-		-e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \
-		-e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
-		-e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
-	sed -i -e "s/^CFLAGS:=/CFLAGS+=/" Makefile
-	sed -i -e "s,^CC:=.*,CC:=$(tc-getCC)," Makefile
-}
-
-src_compile() {
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	append-ldflags $(no-as-needed)
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog THANKS || die
-	keepdir /var/lib/ebtables/
-	newinitd "${FILESDIR}"/ebtables.initd ebtables || die
-	newconfd "${FILESDIR}"/ebtables.confd ebtables || die
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.9.2.ebuild b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
index 1f1ae2bf3c67..97aad4c6f6ab 100644
--- a/net-firewall/ebtables/ebtables-2.0.9.2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.2.ebuild,v 1.1 2010/03/16 07:49:08 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild,v 1.1 2011/05/19 10:29:33 pva Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit versionator eutils toolchain-funcs multilib flag-o-matic
 
@@ -47,19 +47,20 @@ src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		$(use static && echo static) \
-		|| die "emake failed"
+		$(use static && echo static)
 }
 
 src_install() {
 	if ! use static; then
-		make DESTDIR="${D}" install || die
+		make DESTDIR="${D}" install
 		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd ebtables || die
-		newconfd "${FILESDIR}"/ebtables.confd ebtables || die
+		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
+		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
 	else
 		into /
-		newsbin static ebtables || die
+		newsbin static ebtables
+		insinto /etc
+		doins ethertypes
 	fi
 	dodoc ChangeLog THANKS || die
 }
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.8-2-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.8-2-LDFLAGS.diff
deleted file mode 100644
index f5ccb9375dbe..000000000000
--- a/net-firewall/ebtables/files/ebtables-v2.0.8-2-LDFLAGS.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-=== modified file 'Makefile'
---- Makefile	2008-08-12 12:30:44 +0000
-+++ Makefile	2008-08-12 12:30:56 +0000
-@@ -18,7 +18,6 @@
- CFLAGS:=-Wall -Wunused
- CFLAGS_SH_LIB:=-fPIC
- CC:=gcc
--LD:=ld
- 
- ifeq ($(shell uname -m),sparc64)
- CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-@@ -85,10 +84,10 @@
- 
- .PHONY: libebtc
- libebtc: $(OBJECTS2)
--	$(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
-+	$(CC) -shared  $(LDFLAGS) -Wl,-soname=libebtc.so -o libebtc.so -lc $(OBJECTS2)
- 
- ebtables: $(OBJECTS) ebtables-standalone.o libebtc
--	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-+	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- ebtablesu: ebtablesu.c
-@@ -105,7 +104,7 @@
- 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@  -I$(KERNEL_INCLUDES)
- 
- ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc
--	$(CC) $(CFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- .PHONY: daemon
-
-=== modified file 'extensions/Makefile'
---- extensions/Makefile	2008-08-12 12:30:44 +0000
-+++ extensions/Makefile	2008-08-12 12:30:45 +0000
-@@ -11,13 +11,13 @@
- 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 $< $@
- 
- extensions/ebtable_%.so: extensions/ebtable_%.o
--	$(CC) -shared -o $@ -lc $< -nostartfiles
-+	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
- 
- extensions/libebtable_%.so: extensions/ebtable_%.so
- 	mv $< $@
-
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff
deleted file mode 100644
index 1e42fe58a046..000000000000
--- a/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-=== modified file 'Makefile'
---- Makefile	2009-06-22 14:41:37 +0000
-+++ Makefile	2009-06-22 14:52:59 +0000
-@@ -18,7 +18,6 @@
- CFLAGS:=-Wall -Wunused
- CFLAGS_SH_LIB:=-fPIC
- CC:=gcc
--LD:=ld
- 
- ifeq ($(shell uname -m),sparc64)
- CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-@@ -85,10 +84,10 @@
- 
- .PHONY: libebtc
- libebtc: $(OBJECTS2)
--	$(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
-+	$(CC) -shared  $(LDFLAGS) -Wl,-soname=libebtc.so -o libebtc.so -lc $(OBJECTS2)
- 
- ebtables: $(OBJECTS) ebtables-standalone.o libebtc
--	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-+	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- ebtablesu: ebtablesu.c
-@@ -105,7 +104,7 @@
- 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@  -I$(KERNEL_INCLUDES)
- 
- ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc
--	$(CC) $(CFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- .PHONY: daemon
-
-=== modified file 'extensions/Makefile'
---- extensions/Makefile	2009-06-22 14:41:37 +0000
-+++ extensions/Makefile	2009-06-22 14:55:36 +0000
-@@ -11,13 +11,13 @@
- 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 $< $@
- 
- extensions/ebtable_%.so: extensions/ebtable_%.o
--	$(CC) -shared -o $@ -lc $< -nostartfiles
-+	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
- 
- extensions/libebtable_%.so: extensions/ebtable_%.so
- 	mv $< $@
-
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
index ab5d9aafe575..e29909474b7f 100644
--- a/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
+++ b/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
@@ -1,6 +1,6 @@
 === modified file 'Makefile'
---- Makefile	2010-03-16 07:37:01 +0000
-+++ Makefile	2010-03-16 07:39:15 +0000
+--- Makefile	2011-05-17 11:10:15 +0000
++++ Makefile	2011-05-17 11:47:00 +0000
 @@ -18,7 +18,6 @@
  CFLAGS:=-Wall -Wunused
  CFLAGS_SH_LIB:=-fPIC
@@ -31,10 +31,19 @@
  	-Wl,-rpath,$(LIBDIR)
  
  .PHONY: daemon
+@@ -134,7 +133,7 @@
+ 	printf "extern void %s();\n" _t_$${arg}_init >> include/ebtables_u.h ; \
+ 	done ; \
+ 	printf "\n\tpseudomain(argc, argv);\n\treturn 0;\n}\n" >> ebtables-standalone.c ;\
+-	$(CC) $(CFLAGS) $(PROGSPECS) -o $@ $^ -I$(KERNEL_INCLUDES) -Iinclude ; \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(PROGSPECS) -o $@ $^ -I$(KERNEL_INCLUDES) -Iinclude ; \
+ 	for arg in $(EXT_FUNC) \
+ 	; do \
+ 	sed "s/ .*_init/ _init/" extensions/ebt_$${arg}.c > extensions/ebt_$${arg}.c_ ; \
 
 === modified file 'extensions/Makefile'
---- extensions/Makefile	2010-03-16 07:37:01 +0000
-+++ extensions/Makefile	2010-03-16 07:37:43 +0000
+--- extensions/Makefile	2011-05-17 11:10:15 +0000
++++ extensions/Makefile	2011-05-17 11:46:36 +0000
 @@ -11,13 +11,13 @@
  EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
  
diff --git a/net-firewall/ebtables/files/ebtables.confd b/net-firewall/ebtables/files/ebtables.confd
deleted file mode 100644
index db46ffb58793..000000000000
--- a/net-firewall/ebtables/files/ebtables.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/conf.d/ebtables
-
-# Location in which ebtables initscript will save set rules on 
-# service shutdown
-EBTABLES_SAVE="/var/lib/ebtables/rules-save"
-
-# Options to pass to ebtables-save and ebtables-restore 
-SAVE_RESTORE_OPTIONS=""
-
-# Save state on stopping ebtables
-SAVE_ON_STOP="yes"
-
-# Tables to be saved and restored. If you have built ebtables as modules, you
-# may leave it blank. Otherwise, you MUST define which to control.
-TABLE_NAMES="filter nat broute"
diff --git a/net-firewall/ebtables/files/ebtables.initd b/net-firewall/ebtables/files/ebtables.initd
deleted file mode 100644
index 27c743c91014..000000000000
--- a/net-firewall/ebtables/files/ebtables.initd
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/files/ebtables.initd,v 1.2 2007/09/28 19:22:14 pva Exp $
-
-opts="save reload panic"
-
-ebtables_bin="/sbin/ebtables"
-ebtables_save=${EBTABLES_SAVE}
-ebtables_tables=$(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//)
-if [ "$ebtables_tables" == "" ] ; then
-	ebtables_tables=${TABLE_NAMES}
-fi
-
-depend() {
-	before net
-	use logger
-}
-
-set_table_policy() {
-	local chains table=$1 policy=$2
-	case ${table} in
-		nat)    chains="PREROUTING POSTROUTING OUTPUT";;
-		broute) chains="BROUTING";;
-		filter) chains="INPUT FORWARD OUTPUT";;
-		*)      chains="";;
-	esac
-	local chain
-	for chain in ${chains} ; do
-		${ebtables_bin} -t ${table} -P ${chain} ${policy}
-	done
-}
-
-checkconfig() {
-	if [ ! -f ${ebtables_save} ] ; then
-		eerror "Not starting ebtables.  First create some rules then run:"
-		eerror "/etc/init.d/ebtables save"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Loading ebtables state and starting bridge firewall"
-	${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}"
-	eend $?
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-		save || return 1
-	fi
-	ebegin "Stopping bridge firewall"
-	local a
-	for a in ${ebtables_tables}; do
-		set_table_policy $a ACCEPT
-
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-	done
-	eend $?
-}
-
-reload() {
-	ebegin "Flushing bridge firewall"
-	local a
-	for a in ${ebtables_tables}; do
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-	done
-	eend $?
-
-	start
-}
-
-save() {
-	ebegin "Saving ebtables state"
-	touch "${ebtables_save}"
-	chmod 0600 "${ebtables_save}"
-	${ebtables_bin}-save ${ebtables_tables} ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
-	eend $?
-}
-
-panic() {
-	service_started ebtables && svc_stop
-
-	local a
-	ebegin "Dropping all packets forwarded on bridges"
-	for a in ${ebtables_tables}; do
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-
-		set_table_policy $a DROP
-	done
-	eend $?
-}