diff --git a/.checkpackageignore b/.checkpackageignore index e502d52138..c815170e9a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -618,7 +618,6 @@ package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch lib_ package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch lib_patch.Upstream package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream -package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream package/minidlna/S60minidlnad Shellcheck lib_sysv.Indent lib_sysv.Variables package/minissdpd/S50minissdpd Shellcheck lib_sysv.Indent lib_sysv.Variables package/modem-manager/S44modem-manager Shellcheck lib_sysv.Variables diff --git a/package/mini-snmpd/0001-linux.c-fix-musl-build.patch b/package/mini-snmpd/0001-linux.c-fix-musl-build.patch deleted file mode 100644 index 8e8bb090fd..0000000000 --- a/package/mini-snmpd/0001-linux.c-fix-musl-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 73fa408f51ec25121075aaccac9c9db1c68567cd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 12 Mar 2020 10:02:18 +0100 -Subject: [PATCH] linux.c: fix musl build - -Remove include on linux/if_link.h to avoid the following build failure -with musl: - -In file included from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, - from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:4, - from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/if_link.h:5, - from linux.c:21: -/home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' - struct sysinfo { - ^~~~~~~ -In file included from linux.c:19: -/home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - struct sysinfo { - ^~~~~~~ - CC mini_snmpd-globals.o - -Fixes: - - http://autobuild.buildroot.org/results/6903a0f685076b4a2c2824de6158da40e9e712d8 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/troglobit/mini-snmpd/commit/73fa408f51ec25121075aaccac9c9db1c68567cd] ---- - linux.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/linux.c b/linux.c -index a657912..86a7085 100644 ---- a/linux.c -+++ b/linux.c -@@ -18,7 +18,6 @@ - #include - #include - #include --#include - #include - #include - #include --- -2.25.1 - diff --git a/package/mini-snmpd/mini-snmpd.hash b/package/mini-snmpd/mini-snmpd.hash index fee76c07a3..d1e8f51f8e 100644 --- a/package/mini-snmpd/mini-snmpd.hash +++ b/package/mini-snmpd/mini-snmpd.hash @@ -1,3 +1,4 @@ +# sha256 from https://github.com/troglobit/mini-snmpd/releases/tag/v2.0 +sha256 851acf49a1a36356664af0a7a040fa31f75403eb26e03627eba188ee15d4854c mini-snmpd-2.0.tar.gz # Locally calculated -sha256 de00c475a3c70c56f3ee97cd683cb71009d3521d60b1f589c5a91b4671ede9f3 mini-snmpd-1.6.tar.gz sha256 8a43b895972a24567297f44f35dab0f5f9ed3b7db6dac0bf6094075b27ab9d56 COPYING diff --git a/package/mini-snmpd/mini-snmpd.mk b/package/mini-snmpd/mini-snmpd.mk index 1f6e5c1919..89eca4ce79 100644 --- a/package/mini-snmpd/mini-snmpd.mk +++ b/package/mini-snmpd/mini-snmpd.mk @@ -4,13 +4,12 @@ # ################################################################################ -MINI_SNMPD_VERSION = 1.6 -MINI_SNMPD_SITE = $(call github,troglobit,mini-snmpd,v$(MINI_SNMPD_VERSION)) +MINI_SNMPD_VERSION = 2.0 +MINI_SNMPD_SITE = https://github.com/troglobit/mini-snmpd/releases/download/v$(MINI_SNMPD_VERSION) MINI_SNMPD_LICENSE = GPL-2.0 MINI_SNMPD_LICENSE_FILES = COPYING MINI_SNMPD_CPE_ID_VENDOR = minisnmpd_project MINI_SNMPD_CPE_ID_PRODUCT = minisnmpd -MINI_SNMPD_AUTORECONF = YES MINI_SNMPD_DEPENDENCIES = host-pkgconf define MINI_SNMPD_INSTALL_ETC_DEFAULT