ulogd: Backport JSON network patch

It was requested in #9065 .

Cleaned up Makefile slightly.

Removed inactive maintainer.

Added PKG_BUILD_PARALLEL for faster compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-07-28 17:59:10 -07:00
parent ec2cbce031
commit 23a36b00e2
2 changed files with 454 additions and 17 deletions
+13 -17
View File
@@ -9,26 +9,33 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ulogd
PKG_VERSION:=2.0.7
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://netfilter.org/projects/ulogd/files/ \
ftp://ftp.netfilter.org/pub/ulogd/
PKG_HASH:=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=libnetfilter-acct libnetfilter-conntrack libnetfilter-log
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_ulogd-mod-dbi \
CONFIG_PACKAGE_ulogd-mod-mysql \
CONFIG_PACKAGE_ulogd-mod-pgsql \
CONFIG_PACKAGE_ulogd-mod-sqlite
include $(INCLUDE_DIR)/package.mk
define Package/ulogd/Default
SECTION:=net
CATEGORY:=Network
URL:=http://www.netfilter.org/projects/ulogd/index.html
URL:=https://www.netfilter.org/projects/ulogd/index.html
endef
define Package/ulogd
@@ -114,21 +121,10 @@ define Package/ulogd-mod-extra
TITLE:=Extra plugins
endef
PKG_BUILD_DEPENDS:=libnetfilter-acct libnetfilter-conntrack libnetfilter-log
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_ulogd-mod-dbi \
CONFIG_PACKAGE_ulogd-mod-mysql \
CONFIG_PACKAGE_ulogd-mod-pgsql \
CONFIG_PACKAGE_ulogd-mod-sqlite \
TARGET_CFLAGS += \
-D_GNU_SOURCE \
CONFIGURE_ARGS += \
--enable-nfacct \
--enable-nfct \
--enable-nflog \
--enable-nflog
ifneq ($(DEVELOPER)$(SDK)$(CONFIG_PACKAGE_ulogd-mod-dbi),)
CONFIGURE_ARGS += --with-dbi \