ebtables: update to 2.0.11

package/ebtables/Makefile

@@ -4,28 +4,24 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		ebtables
-PKG_VERSION:=		2.0.10
+PKG_VERSION:=		2.0.11
 PKG_RELEASE:=		1
-PKG_HASH:=		dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d
+PKG_HASH:=		b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a
 PKG_DESCR:=		ethernet bridging firewall tool
 PKG_SECTION:=		net/route
-PKG_URL:=		http://ebtables.sourceforge.net
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ebtables/}
+PKG_SITES:=		https://www.netfilter.org/pub/ebtables/
 
-DISTFILES:=		${PKG_NAME}-v${PKG_VERSION}-4.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-4
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,EBTABLES,ebtables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=		manual
-
 ebtables-install:
 	${INSTALL_DIR} ${IDIR_EBTABLES}/etc
 	${INSTALL_DIR} ${IDIR_EBTABLES}/usr/sbin ${IDIR_EBTABLES}/usr/lib
 	${INSTALL_DATA} ${WRKINST}/etc/ethertypes ${IDIR_EBTABLES}/etc
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/ebtables ${IDIR_EBTABLES}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/ebtables-legacy ${IDIR_EBTABLES}/usr/sbin/ebtables
 	${CP} ${WRKINST}/usr/lib/*.so ${IDIR_EBTABLES}/usr/lib
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/ebtables/patches/patch-Makefile

@@ -1,24 +0,0 @@
---- ebtables-v2.0.10-4.orig/Makefile	2011-12-15 21:02:47.000000000 +0100
-+++ ebtables-v2.0.10-4/Makefile	2014-03-23 15:46:20.000000000 +0100
-@@ -10,16 +10,16 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed
- 
- # default paths
- LIBDIR:=/usr/lib
--MANDIR:=/usr/local/man
--BINDIR:=/usr/local/sbin
-+MANDIR:=/usr/man
-+BINDIR:=/usr/sbin
- ETCDIR:=/etc
--INITDIR:=/etc/rc.d/init.d
-+INITDIR:=/etc/init.d
- SYSCONFIGDIR:=/etc/sysconfig
- DESTDIR:=
- 
--CFLAGS:=-Wall -Wunused -Werror
-+CFLAGS?=-Wall -Wunused -Werror
- CFLAGS_SH_LIB:=-fPIC -O3
--CC:=gcc
-+CC?=gcc
- 
- ifeq ($(shell uname -m),sparc64)
- CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32

package/ebtables/patches/patch-extensions_ebt_among_c

@@ -1,10 +0,0 @@
---- ebtables-v2.0.10-4.orig/extensions/ebt_among.c	2011-12-15 21:02:47.000000000 +0100
-+++ ebtables-v2.0.10-4/extensions/ebt_among.c	2014-03-23 15:51:29.000000000 +0100
-@@ -13,7 +13,6 @@
- #include <ctype.h>
- #include <unistd.h>
- #include "../include/ebtables_u.h"
--#include <netinet/ether.h>
- #include "../include/ethernetdb.h"
- #include <linux/if_ether.h>
- #include <linux/netfilter_bridge/ebt_among.h>

package/ebtables/patches/patch-extensions_ebt_arpreply_c

@@ -1,10 +0,0 @@
---- ebtables-v2.0.10-4.orig/extensions/ebt_arpreply.c	2011-12-15 21:02:47.000000000 +0100
-+++ ebtables-v2.0.10-4/extensions/ebt_arpreply.c	2014-03-23 15:50:38.000000000 +0100
-@@ -12,7 +12,6 @@
- #include <string.h>
- #include <getopt.h>
- #include "../include/ebtables_u.h"
--#include <netinet/ether.h>
- #include <linux/netfilter_bridge/ebt_arpreply.h>
- 
- static int mac_supplied;

package/ebtables/patches/patch-extensions_ebt_ip6_c

@@ -1,10 +0,0 @@
---- ebtables-v2.0.10-4.orig/extensions/ebt_ip6.c	2011-12-15 21:02:47.000000000 +0100
-+++ ebtables-v2.0.10-4/extensions/ebt_ip6.c	2014-03-23 15:51:09.000000000 +0100
-@@ -11,6 +11,7 @@
-  *
-  */
- 
-+#include <sys/types.h>
- #include <errno.h>
- #include <inttypes.h>
- #include <limits.h>

package/ebtables/patches/patch-extensions_ebt_limit_c

@@ -1,10 +0,0 @@
---- ebtables-v2.0.10-4.orig/extensions/ebt_limit.c	2011-12-15 21:02:47.000000000 +0100
-+++ ebtables-v2.0.10-4/extensions/ebt_limit.c	2014-03-23 15:52:04.000000000 +0100
-@@ -8,6 +8,7 @@
-  * September, 2003
-  */
- 
-+#include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>

package/ebtables/patches/patch-extensions_ebt_nat_c

@@ -1,10 +0,0 @@
---- ebtables-v2.0.10-4.orig/extensions/ebt_nat.c	2011-12-15 21:02:47.000000000 +0100
-+++ ebtables-v2.0.10-4/extensions/ebt_nat.c	2014-03-23 15:50:13.000000000 +0100
-@@ -11,7 +11,6 @@
- #include <string.h>
- #include <getopt.h>
- #include "../include/ebtables_u.h"
--#include <netinet/ether.h>
- #include <linux/netfilter_bridge/ebt_nat.h>
- 
- static int to_source_supplied, to_dest_supplied;

package/ebtables/patches/patch-include_ethernetdb_h

@@ -1,29 +0,0 @@
---- ebtables-v2.0.10-4.orig/include/ethernetdb.h	2011-12-15 21:02:47.000000000 +0100
-+++ ebtables-v2.0.10-4/include/ethernetdb.h	2014-03-23 15:47:35.000000000 +0100
-@@ -38,21 +38,20 @@ struct ethertypeent {
- 
- /* Open ethertype data base files and mark them as staying open even
-    after a later search if STAY_OPEN is non-zero.  */
--extern void setethertypeent(int __stay_open) __THROW;
-+extern void setethertypeent(int __stay_open);
- 
- /* Close ethertype data base files and clear `stay open' flag.  */
--extern void endethertypeent(void) __THROW;
-+extern void endethertypeent(void);
- 
- /* Get next entry from ethertype data base file.  Open data base if
-    necessary.  */
--extern struct ethertypeent *getethertypeent(void) __THROW;
-+extern struct ethertypeent *getethertypeent(void);
- 
- /* Return entry from ethertype data base for network with NAME.  */
--extern struct ethertypeent *getethertypebyname(__const char *__name)
--    __THROW;
-+extern struct ethertypeent *getethertypebyname(__const char *__name);
- 
- /* Return entry from ethertype data base which number is PROTO.  */
--extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW;
-+extern struct ethertypeent *getethertypebynumber(int __ethertype);
- 
- 
- #endif				/* ethernetdb.h */

package/ebtables/patches/patch-useful_functions_c

@@ -1,10 +0,0 @@
---- ebtables-v2.0.10-4.orig/useful_functions.c	2011-12-15 21:02:47.000000000 +0100
-+++ ebtables-v2.0.10-4/useful_functions.c	2014-03-23 15:49:15.000000000 +0100
-@@ -25,7 +25,6 @@
- #include "include/ebtables_u.h"
- #include "include/ethernetdb.h"
- #include <stdio.h>
--#include <netinet/ether.h>
- #include <string.h>
- #include <stdlib.h>
- #include <getopt.h>