Browse Source

xtables-addons: update to 3.19

Fixes compilation with kernel 5.15.

Fixed changed binary name.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit e5af506795)
lilik-openwrt-22.03
Rosen Penev 3 years ago
parent
commit
4a5633b6b5
2 changed files with 6 additions and 6 deletions
  1. +4
    -4
      net/xtables-addons/Makefile
  2. +2
    -2
      net/xtables-addons/patches/001-fix-kernel-version-detection.patch

+ 4
- 4
net/xtables-addons/Makefile View File

@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=xtables-addons
PKG_VERSION:=3.13
PKG_RELEASE:=4
PKG_HASH:=893c0c4ea09759cda1ab7e68f1281d125e59270f7b59e446204ce686c6a76d65
PKG_VERSION:=3.19
PKG_RELEASE:=$(AUTORELEASE)
PKG_HASH:=5e36ea027ab15a84d9af1f3f8e84a78b80a617093657f08089bd44657722f661
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/
@ -162,7 +162,7 @@ define Package/iptgeoip/install
$(1)/usr/lib/xtables-addons/
$(INSTALL_DIR) $(1)/usr/bin
$(CP) \
$(PKG_INSTALL_DIR)/usr/bin/xt_geoip_fetch \
$(PKG_INSTALL_DIR)/usr/bin/xt_geoip_query \
$(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/share/xt_geoip
touch $(1)/usr/share/xt_geoip/.keep


+ 2
- 2
net/xtables-addons/patches/001-fix-kernel-version-detection.patch View File

@ -1,8 +1,8 @@
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return
@@ -42,7 +42,7 @@ regular_CFLAGS="-Wall -Waggregate-return
if test -n "$kbuilddir"; then
AS_IF([test -n "$kbuilddir"], [
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}')"


Loading…
Cancel
Save