From 35b32556477ef30bde9215b76647bc53ab977ec9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Dec 2025 15:42:32 +0100 Subject: [PATCH] package/linknx: bump version to 0.0.1.39 Changelog: https://github.com/linknx/linknx/compare/0.0.1.38...0.0.1.39 Removed patches which are included in this release. Fixes: https://autobuild.buildroot.net/results/492/492b46b997758bbe6b8ec8510e5b2e2bad2aa704/ Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- .checkpackageignore | 2 - ...nfigure-ac-tweak-CPPUNIT-conditional.patch | 47 ------------------- ...Makefile.am-fix-linking-with-log4cpp.patch | 37 --------------- package/linknx/linknx.hash | 2 +- package/linknx/linknx.mk | 4 +- 5 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch delete mode 100644 package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0d61d3c69b..1f406c3426 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -622,8 +622,6 @@ package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch lib_patc package/libyuv/0001-i386-sse2.patch lib_patch.Upstream package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch lib_patch.Upstream package/lighttpd/S50lighttpd Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables -package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch lib_patch.Upstream -package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch lib_patch.Upstream package/linux-zigbee/0001-test-serial-Remove-test-serial.patch lib_patch.Upstream package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch lib_patch.Upstream package/linuxptp/S65ptp4l Shellcheck lib_sysv.Indent diff --git a/package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch b/package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch deleted file mode 100644 index 733e2927dd..0000000000 --- a/package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8e7da14647dada5eee8f583b0814bffb31d1b91e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Apr 2019 23:17:34 +0200 -Subject: [PATCH] configure.ac: tweak CPPUNIT conditional - -Following review of buildroot's patch -(http://patchwork.ozlabs.org/patch/1088520), tweak CPPUNIT to move call -to AM_CONDITIONAL outside condition - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/linknx/linknx/commit/8e7da14647dada5eee8f583b0814bffb31d1b91e] ---- - configure.ac | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 51d8ae66..4d9d8efa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -135,22 +135,20 @@ if test x"$WITH_CPPUNIT" != xno; then - AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit]) - AC_SUBST(CPPUNIT_CFLAGS) - AC_SUBST(CPPUNIT_LIBS) -- AM_CONDITIONAL(CPPUNIT, true) -+ found_cppunit=yes - ],[ - AC_MSG_RESULT([no]) -- AM_CONDITIONAL(CPPUNIT, false) - ]) - else - PKG_CHECK_MODULES(CPPUNIT, $CPPUNITPC >= 1.9.6, [ - AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit]) - AC_SUBST(CPPUNIT_CFLAGS) - AC_SUBST(CPPUNIT_LIBS) -- AM_CONDITIONAL([CPPUNIT], true) -- ],[AM_CONDITIONAL([CPPUNIT], false)]) -+ found_cppunit=yes -+ ]) - fi --else -- AM_CONDITIONAL([CPPUNIT], false) - fi -+AM_CONDITIONAL([CPPUNIT], [test x"$found_cppunit" = xyes]) - - dnl ######################################################################### - dnl Check if using log4cpp diff --git a/package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch b/package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch deleted file mode 100644 index 4f1a8e4356..0000000000 --- a/package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 048b9ae8f3c07be217f1738c35ab995ab6394453 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 8 Mar 2020 10:02:07 +0100 -Subject: [PATCH] src/Makefile.am: fix linking with log4cpp - -linknx fails to build with log4cpp because LOG4CPP_CFLAGS (which -contains -pthread) is added to AM_CPPFLAGS (which is not used at link -time) instead of AM_CXXFLAGS: - -/home/buildroot/autobuild/instance-0/output/host/bin/mipsel-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o linknx linknx.o logger.o ruleserver.o objectcontroller.o eibclient.o threads.o timermanager.o persistentstorage.o xmlserver.o smsgateway.o emailgateway.o knxconnection.o services.o suncalc.o luacondition.o ioport.o ../ticpp/libticpp.a -L/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lpthsem -L/home/buildroot/autobuild/instance-0/output/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -llog4cpp -lm -/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/liblog4cpp.so: undefined reference to `pthread_key_create' - -So move LOG4CPP_CFLAGS to AM_CXXFLAGS - -Fixes: - - http://autobuild.buildroot.org/results/1863f8f27041bc15ca68e786ba3b8e4764c40574 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/linknx/linknx/commit/048b9ae8f3c07be217f1738c35ab995ab6394453] ---- - src/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 6e0dc03b..5065c248 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -6,6 +6,7 @@ else - B64_CFLAGS= - B64_LIBS= - endif --AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LOG4CPP_CFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS) -+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS) -+AM_CXXFLAGS=$(LOG4CPP_CFLAGS) - linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(LIBICONV) $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm - linknx_SOURCES=linknx.cpp logger.cpp ruleserver.cpp objectcontroller.cpp eibclient.c threads.cpp timermanager.cpp persistentstorage.cpp xmlserver.cpp smsgateway.cpp emailgateway.cpp knxconnection.cpp services.cpp suncalc.cpp luacondition.cpp ioport.cpp ruleserver.h objectcontroller.h threads.h timermanager.h persistentstorage.h xmlserver.h smsgateway.h emailgateway.h knxconnection.h services.h suncalc.h luacondition.h ioport.h logger.h diff --git a/package/linknx/linknx.hash b/package/linknx/linknx.hash index 86ec522809..d12d4aa8f2 100644 --- a/package/linknx/linknx.hash +++ b/package/linknx/linknx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 00c53776c2e871295459ede922402d8ad0208367d2364781fdb92ddafad94d3d linknx-0.0.1.38.tar.gz +sha256 d07199875c6e3f90871308989dd7d4240b67ce971d5908cb39592690341f8d0a linknx-0.0.1.39.tar.gz sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk index 683e0c49cb..d67f010093 100644 --- a/package/linknx/linknx.mk +++ b/package/linknx/linknx.mk @@ -4,13 +4,11 @@ # ################################################################################ -LINKNX_VERSION = 0.0.1.38 +LINKNX_VERSION = 0.0.1.39 LINKNX_SITE = $(call github,linknx,linknx,$(LINKNX_VERSION)) LINKNX_LICENSE = GPL-2.0+ LINKNX_LICENSE_FILES = LICENSE LINKNX_INSTALL_STAGING = YES -# We're patching configure.ac -LINKNX_AUTORECONF = YES LINKNX_CONF_OPTS = \ --without-cppunit \ --without-pth-test \