diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-11-08 23:19:34 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-12-14 19:04:17 -0800 |
| commit | 6961ba4af9810ba3e9d87b6a0ddc5f7ddc9ac247 (patch) | |
| tree | db33ab532d202535f623d1ff4ba56e21f8553d50 /net/conntrack-tools | |
| parent | e0fa06547c7ab6fd6d3cfba8b491cd04b381d036 (diff) | |
conntrack-tools: update to 1.4.6
Removed patch as upstream fixed libtirpc support differently.
Switched to normal tarballs for simplicity.
Fixed license information.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/conntrack-tools')
| -rw-r--r-- | net/conntrack-tools/Makefile | 19 | ||||
| -rw-r--r-- | net/conntrack-tools/patches/conntrack-tools-1.4.5-rpc.patch | 41 |
2 files changed, 9 insertions, 51 deletions
diff --git a/net/conntrack-tools/Makefile b/net/conntrack-tools/Makefile index 0945263a2..c97c46fab 100644 --- a/net/conntrack-tools/Makefile +++ b/net/conntrack-tools/Makefile @@ -8,21 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=conntrack-tools +PKG_VERSION:=1.4.6 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://git.netfilter.org/conntrack-tools -PKG_SOURCE_DATE:=2018-05-01 -PKG_SOURCE_VERSION:=88610abee7e58f4da7ec6f198e00ff70a92c870f -PKG_MIRROR_HASH:=cccc5e25e3cb159385b170f63f9b7fd2186f68d32239718080f605c060ea1cb8 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.netfilter.org/projects/conntrack-tools/files +PKG_HASH:=590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> -PKG_LICENSE:=GPL-2.0 -PKG_CPE_ID:=cpe:/a:conntrack-tools_project:conntrack-tools +PKG_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING +PKG_CPE_ID:=cpe:/a:netfilter:conntrack-tools -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 - +PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=libtirpc include $(INCLUDE_DIR)/package.mk @@ -32,7 +31,7 @@ define Package/conntrack-tools/default CATEGORY:=Network DEPENDS:=+libnetfilter-conntrack +libnetfilter-cttimeout +libnetfilter-cthelper +libnetfilter-queue SUBMENU:=Firewall - URL:=http://conntrack-tools.netfilter.org/ + URL:=https://conntrack-tools.netfilter.org/ endef define Package/conntrack diff --git a/net/conntrack-tools/patches/conntrack-tools-1.4.5-rpc.patch b/net/conntrack-tools/patches/conntrack-tools-1.4.5-rpc.patch deleted file mode 100644 index 1f7fc44f4..000000000 --- a/net/conntrack-tools/patches/conntrack-tools-1.4.5-rpc.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -50,6 +50,25 @@ - AS_HELP_STRING([--enable-systemd], [Build systemd support]), - [enable_systemd="$enableval"], [enable_systemd="no"]) - -+AC_ARG_WITH([libtirpc], -+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]), -+ [], [ with_libtirpc=no ]) -+ -+AS_IF([test "x$with_libtirpc" != xno], -+ [PKG_CHECK_MODULES([TIRPC], -+ [libtirpc], -+ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;], -+ [AC_MSG_ERROR([libtirpc requested, but library not found.])] -+ )], -+ [AC_CHECK_HEADER(rpc/rpc.h, -+ [RPC_CFLAGS=""; RPC_LIBS="";], -+ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])] -+ )] -+) -+ -+AC_SUBST(RPC_CFLAGS) -+AC_SUBST(RPC_LIBS) -+ - PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) - PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) - PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.7]) ---- a/src/helpers/Makefile.am -+++ b/src/helpers/Makefile.am -@@ -30,8 +30,8 @@ - ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS) - - ct_helper_rpc_la_SOURCES = rpc.c --ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) --ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) -+ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) $(RPC_LIBS) -+ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(RPC_CFLAGS) - - ct_helper_tftp_la_SOURCES = tftp.c - ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS) |