From 93aaa021e1ee3cf5595a8d266f787e8b15a3061e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 7 May 2020 22:47:47 +0200 Subject: [PATCH 1/6] opkg: update to latest Git HEAD f2166a8 libopkg: implement lightweight package listing logic cf4554d libopkg: support passing callbacks to feed parsing functions 2a0210f opkg-cl: don't read feeds on opkg update b6f1967 libopkg: use xsystem() to spawn opkg-key 60b9af2 file_util.c: refactor and fix checksum_hex2bin() 206ebae file_util.c: fix possible bad memory access in file_read_line_alloc() Signed-off-by: Jo-Philipp Wich --- package/system/opkg/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index b40d6b610a..0bb0ed2750 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -14,9 +14,9 @@ PKG_FLAGS:=essential PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.openwrt.org/project/opkg-lede.git -PKG_SOURCE_DATE:=2020-01-25 -PKG_SOURCE_VERSION:=c09fe2098718807ddbca13ee36e3e38801822946 -PKG_MIRROR_HASH:=b2fba519fb3bf2da2e325a33eee951b85c7c1886e48ebaac3892435a71ae33d5 +PKG_SOURCE_DATE:=2020-05-07 +PKG_SOURCE_VERSION:=f2166a89b7e96e2c60002959731eebc5f45fa318 +PKG_MIRROR_HASH:=67e55cd9fb93bb5b62e2c7b11946483b5570287bd1504aa2a3886d11f8b750b9 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 452dff0886a6eda49d29747ed0d792e6ea8be5e0 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Mon, 4 May 2020 21:25:47 +0200 Subject: [PATCH 2/6] odhcpd: update to latest git HEAD (FS#3056) 5ce0770 router: fix Lan host reachibility due to identical RIO and PIO prefixes (FS#3056) Signed-off-by: Hans Dedecker --- package/network/services/odhcpd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 746a08a519..6510ce6c80 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git -PKG_SOURCE_DATE:=2020-03-14 -PKG_SOURCE_VERSION:=6594c6b182a9065570316cf3a7a6a72a7afda150 -PKG_MIRROR_HASH:=58c87e3322854b3c2797403e622b09b019eac9ccf3dddd2bc2307cedad1c003a +PKG_SOURCE_DATE:=2020-05-04 +PKG_SOURCE_VERSION:=5ce077026b991f49d96464587386f93d92f56385 +PKG_MIRROR_HASH:=5fcb4e9f219398ac09ab87e942d1a9a3f4c58431dceefa30b429a19d2dba8ff6 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 From e903ec8c14373b93909c1d31c473705a897fb16e Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Wed, 26 Feb 2020 21:44:45 +0100 Subject: [PATCH 3/6] lldpd: add management IP setting add option to set management IP pattern also add missing 'unconfigure system hostname' for example pattern '!192.168.1.1' makes it possible that WAN IP is selected instead of LAN IP Signed-off-by: Daniel A. Maierhofer [grammar and spelling fixes in commit message] Signed-off-by: Stijn Tintel --- package/network/services/lldpd/Makefile | 2 +- package/network/services/lldpd/files/lldpd.config | 4 +++- package/network/services/lldpd/files/lldpd.init | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index 48a3993492..7c00685008 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lldpd PKG_VERSION:=1.0.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://media.luffy.cx/files/lldpd diff --git a/package/network/services/lldpd/files/lldpd.config b/package/network/services/lldpd/files/lldpd.config index e16643c1f7..5e7c51ba7e 100644 --- a/package/network/services/lldpd/files/lldpd.config +++ b/package/network/services/lldpd/files/lldpd.config @@ -5,7 +5,7 @@ config lldpd config option enable_edp 1 option agentxsocket /var/run/agentx.sock - + option lldp_class 4 option lldp_location "2:FR:6:Commercial Rd:3:Roseville:19:4" @@ -13,6 +13,8 @@ config lldpd config #option lldp_description "OpenWrt System" #option lldp_hostname "Modified Hostname" + #option lldp_mgmt_ip "!192.168.1.1" + # interfaces to listen on list interface "loopback" list interface "lan" diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init index 9fb3a82559..7a5b25e016 100644 --- a/package/network/services/lldpd/files/lldpd.init +++ b/package/network/services/lldpd/files/lldpd.init @@ -42,11 +42,15 @@ write_lldpd_conf() fi done + local lldp_mgmt_ip + config_get lldp_mgmt_ip 'config' 'lldp_mgmt_ip' + # Clear out the config file first echo -n > "$LLDPD_CONF" [ -n "$ifnames" ] && echo "configure system interface pattern" "$ifnames" >> "$LLDPD_CONF" [ -n "$lldp_description" ] && echo "configure system description" "\"$lldp_description\"" >> "$LLDPD_CONF" [ -n "$lldp_hostname" ] && echo "configure system hostname" "\"$lldp_hostname\"" >> "$LLDPD_CONF" + [ -n "$lldp_mgmt_ip" ] && echo "configure system ip management pattern" "\"$lldp_mgmt_ip\"" >> "$LLDPD_CONF" # Since lldpd's sysconfdir is /tmp, we'll symlink /etc/lldpd.d to /tmp/$LLDPD_CONFS_DIR [ -e $LLDPD_CONFS_DIR ] || ln -s /etc/lldpd.d $LLDPD_CONFS_DIR @@ -103,6 +107,8 @@ reload_service() { unconfigure lldp custom-tlv unconfigure system interface pattern unconfigure system description + unconfigure system hostname + unconfigure system ip management pattern EOF # Rewrite lldpd.conf # If something changed it should be included by the lldpcli call From b925e419ef6b7931760a6b658d520017660f2df5 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Sun, 16 Dec 2018 21:30:20 +0100 Subject: [PATCH 4/6] buildsystem: add CPE information to ipkg packages and manifest files Common Platform Enumeration (CPE) is a structured naming scheme for information technology systems, software, and packages. This information already exists in some makefiles. In order for the information to be processed further, it should also be added to the manifest file and the control file of ipkg packages. Signed-off-by: Florian Eckert --- include/package-ipkg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index c4c8f4a36f..569edcbf03 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -173,6 +173,7 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) )$$(call addfield,LicenseFiles,$(LICENSE_FILES) )$$(call addfield,Section,$(SECTION) )$$(call addfield,Require-User,$(USERID) +)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID) )$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed )$(if $(filter essential,$(PKG_FLAGS)),Essential: yes )$(if $(MAINTAINER),Maintainer: $(MAINTAINER) From 63b1a5a5a5dea0fd5a247d8b5aec3b6aa735d244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 5 May 2020 22:08:01 +0200 Subject: [PATCH 5/6] kernel: bump 4.14 to 4.14.179 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Runtime-tested on: qemu-x86-64 Compile-tested on: x86/64 Signed-off-by: Petr Štetiar --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b06f6c2a29..f62a9e5285 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .221 -LINUX_VERSION-4.14 = .178 +LINUX_VERSION-4.14 = .179 LINUX_VERSION-4.19 = .120 LINUX_KERNEL_HASH-4.9.221 = e64281cf92c7a6597b740267ce34a389588b33d483bd78445ab3d3d5c7e901be -LINUX_KERNEL_HASH-4.14.178 = fd2c33875e822e3ded994b60c5a3dbe456c1d352abf0a886498ee49870ed98dd +LINUX_KERNEL_HASH-4.14.179 = 5da7eb5c94904ee31db7e25eb7be53e27a34c9a7fde2ee4bb0b3af7b87cc5981 LINUX_KERNEL_HASH-4.19.120 = 0b9b00e182d707f5eca475b047bdc7789c9f95f62998945a34c527cdcbb3b20e remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) From af105f2f571f85e6663e26b5ed0d1017e5769443 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 10 May 2020 14:33:07 +0800 Subject: [PATCH 6/6] kernel: bump to 4.9.222, 4.19.121 Signed-off-by: CN_SZTL --- include/kernel-version.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index f62a9e5285..1ea344547b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .221 +LINUX_VERSION-4.9 = .222 LINUX_VERSION-4.14 = .179 -LINUX_VERSION-4.19 = .120 +LINUX_VERSION-4.19 = .121 -LINUX_KERNEL_HASH-4.9.221 = e64281cf92c7a6597b740267ce34a389588b33d483bd78445ab3d3d5c7e901be +LINUX_KERNEL_HASH-4.9.222 = 4cce9016eba7bbc51989d4fc6a5811a0f1c65e6d79a0b6203b7299e4a87b5229 LINUX_KERNEL_HASH-4.14.179 = 5da7eb5c94904ee31db7e25eb7be53e27a34c9a7fde2ee4bb0b3af7b87cc5981 -LINUX_KERNEL_HASH-4.19.120 = 0b9b00e182d707f5eca475b047bdc7789c9f95f62998945a34c527cdcbb3b20e +LINUX_KERNEL_HASH-4.19.121 = fbe5a813ae0b2d37f25f122a005f341130fbe59cad63e2601784411855937085 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))