From b4eaefa54e49f200f8c79cb1f219ba6257f319bb Mon Sep 17 00:00:00 2001 From: lean Date: Tue, 24 Mar 2020 18:24:26 +0800 Subject: [PATCH] libmnl: update ABI version --- include/target.mk | 2 +- package/lean/luci-app-nft-qos/Makefile | 5 +---- package/lean/luci-app-nft-qos/po/es/nft-qos.po | 8 ++++++-- package/lean/nft-qos/files/nft-qos.config | 2 +- package/libs/libmnl/Makefile | 3 ++- package/libs/libnftnl/Makefile | 3 +-- package/network/utils/nftables/Makefile | 5 +++-- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/target.mk b/include/target.mk index a62c75f19..b748010c2 100644 --- a/include/target.mk +++ b/include/target.mk @@ -15,7 +15,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd urandom-seed urngd \ block-mount coremark kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw wget libustream-openssl ca-certificates \ -default-settings luci luci-proto-relay luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ +default-settings luci luci-proto-relay luci-app-ddns luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ luci-app-filetransfer luci-app-vsftpd luci-app-ssr-plus luci-app-unblockmusic \ luci-app-arpbind luci-app-vlmcsd luci-app-wol luci-app-ramfree \ luci-app-sfe luci-app-flowoffload luci-app-nlbwmon luci-app-accesscontrol luci-app-cpufreq \ diff --git a/package/lean/luci-app-nft-qos/Makefile b/package/lean/luci-app-nft-qos/Makefile index 1452dac42..01de87993 100644 --- a/package/lean/luci-app-nft-qos/Makefile +++ b/package/lean/luci-app-nft-qos/Makefile @@ -8,10 +8,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Qos over Nftables LUCI_DEPENDS:=+nft-qos -LUCI_PKGARCH:=all -PKG_VERSION:=1.0 -PKG_RELEASE:=2 -include $(TOPDIR)/feeds/luci/luci.mk +include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/package/lean/luci-app-nft-qos/po/es/nft-qos.po b/package/lean/luci-app-nft-qos/po/es/nft-qos.po index 2d729e001..4cdcb95f2 100644 --- a/package/lean/luci-app-nft-qos/po/es/nft-qos.po +++ b/package/lean/luci-app-nft-qos/po/es/nft-qos.po @@ -133,7 +133,9 @@ msgstr "Configuración de NFT-QoS" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" -msgstr "Interfaz de red para configuración de tráfico, por ejemplo, br-lan, eth0.1, eth0, etc." +msgstr "" +"Interfaz de red para configuración de tráfico, por ejemplo, br-lan, eth0.1, " +"eth0, etc." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" @@ -205,7 +207,9 @@ msgstr "Red de destino 6 (IPv6/MÁSCARA)" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:127 msgid "This page gives an overview over currently download/upload rate." -msgstr "Esta página ofrece una vista general sobre la velocidad de descarga/carga actual." +msgstr "" +"Esta página ofrece una vista general sobre la velocidad de descarga/carga " +"actual." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:194 msgid "Traffic Priority Settings" diff --git a/package/lean/nft-qos/files/nft-qos.config b/package/lean/nft-qos/files/nft-qos.config index 24eadb0fe..82e3b3928 100644 --- a/package/lean/nft-qos/files/nft-qos.config +++ b/package/lean/nft-qos/files/nft-qos.config @@ -26,7 +26,7 @@ config default default # Enable Flag for limit rate - option limit_enable '0' + option limit_enable '1' # Options for enable Static QoS (rate limit) option limit_type 'static' diff --git a/package/libs/libmnl/Makefile b/package/libs/libmnl/Makefile index 6d05e2544..13628728e 100644 --- a/package/libs/libmnl/Makefile +++ b/package/libs/libmnl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmnl PKG_VERSION:=1.0.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -30,6 +30,7 @@ define Package/libmnl CATEGORY:=Libraries TITLE:=Minimalistic user-space library for Netlink URL:=http://www.netfilter.org/projects/libmnl/ + ABI_VERSION:=0 endef define Package/libmnl/description diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile index f90c6fb3e..74771fe67 100644 --- a/package/libs/libnftnl/Makefile +++ b/package/libs/libnftnl/Makefile @@ -43,8 +43,7 @@ TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ --enable-static \ - --enable-shared \ - --without-json-parsing + --enable-shared define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/libnftnl diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile index d1e995116..68e712bb5 100644 --- a/package/network/utils/nftables/Makefile +++ b/package/network/utils/nftables/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nftables -PKG_VERSION:=0.9.0 +PKG_VERSION:=0.9.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files -PKG_HASH:=ad8181b5fcb9ca572f444bed54018749588522ee97e4c21922648bb78d7e7e91 +PKG_HASH:=5cb66180143e6bfc774f4eb316206d40ac1cb6df269a90882404cbf7165513f5 PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0 @@ -28,6 +28,7 @@ CONFIGURE_ARGS += \ --disable-man-doc \ --with-mini-gmp \ --without-cli \ + --disable-python \ define Package/nftables SECTION:=net