Skip to content

Commit

Permalink
xtables-addons: update to 2.11
Browse files Browse the repository at this point in the history
- fix compilation w. Kernel 4.6 due to
hash->shash crypto API
- remove a patch integrated upstream

- remove unrecognized configure option
removed upstream in 2010
commit 40d0345f1ed02de183b13a6ce38847bc1f4ac48e

Signed-off-by: Dirk Neukirchen <[email protected]>
  • Loading branch information
nakarotori authored and wigyori committed Sep 7, 2016
1 parent fef30a4 commit bd1c320
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 60 deletions.
5 changes: 2 additions & 3 deletions package/network/utils/xtables-addons/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=xtables-addons
PKG_VERSION:=2.10
PKG_VERSION:=2.11
PKG_RELEASE:=1
PKG_MD5SUM:=727bf0dd4a3d9c65724267bd0d5d80b0
PKG_MD5SUM:=9f3123295db81a9d1bc08dabf075d0d6

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/xtables-addons
Expand Down Expand Up @@ -39,7 +39,6 @@ endef

CONFIGURE_ARGS+= \
--with-kbuild="$(LINUX_DIR)" \
--with-xtables="$(STAGING_DIR)/usr" \
--with-xtlibdir="/usr/lib/iptables" \

define Build/Compile
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return

if test -n "$kbuilddir"; then
AC_MSG_CHECKING([kernel version that we will build against])
- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')";
+ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')";
save_IFS=$IFS;
IFS='.';
set x $krel;
- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
+ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
save_IFS="$IFS"
IFS='.'
set x $krel

0 comments on commit bd1c320

Please sign in to comment.