diff --git a/package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch b/package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch deleted file mode 100644 index 48d95f122f..0000000000 --- a/package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b879e6886498fdd147287bffdf5867378c7f3299 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 24 Jun 2021 14:28:10 +0300 -Subject: [PATCH] daemon: fix build with musl libc (again) - -Commit 6b28c54dd95b3 added HAVE_SYS_TTYDEFAULTS_H to guard -sys/ttydefaults.h include. This breaks musl libc build because -HAVE_SYS_TTYDEFAULTS_H is not defined until config.h is included. - -Move sys/ttydefaults.h include below config.h - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/raforg/daemon/pull/4 - - daemon.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/daemon.c b/daemon.c -index 5c5ef2cb86df..f88a0d49bf84 100644 ---- a/daemon.c -+++ b/daemon.c -@@ -1011,9 +1011,6 @@ I - #ifdef _RESTORE_POSIX_SOURCE - #define _POSIX_SOURCE - #endif --#ifdef HAVE_SYS_TTYDEFAULTS_H /* For CEOF in musl libc (Linux only) */ --#include --#endif - #include - #include - #include -@@ -1037,6 +1034,10 @@ I - #include - #endif - -+#ifdef HAVE_SYS_TTYDEFAULTS_H /* For CEOF in musl libc (Linux only) */ -+#include -+#endif -+ - /* Configuration file entries */ - - typedef struct Config Config; --- -2.30.2 - diff --git a/package/daemon/0002-Fix-build-with-NDEBUG-defined.patch b/package/daemon/0002-Fix-build-with-NDEBUG-defined.patch deleted file mode 100644 index e99e9d8ed7..0000000000 --- a/package/daemon/0002-Fix-build-with-NDEBUG-defined.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fc84d8d572ffcecb533fd6d6d025abea12ce027e Mon Sep 17 00:00:00 2001 -Message-Id: -From: Baruch Siach -Date: Thu, 3 Jun 2021 15:01:10 +0300 -Subject: [PATCH] Fix build with NDEBUG defined - -Build with NDEBUG fails because the debug() macro becomes empty. This -creates invalid syntax with the debug() call is the only statement in -the body of a 'for' loop. - -This fixes build failures like: - -daemon.c: In function 'show': -daemon.c:3607:2: error: expected expression before '}' token - } - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/raforg/daemon/pull/3 - - libslack/err.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libslack/err.h b/libslack/err.h -index 106bdb01e074..7acfbe46d60a 100644 ---- a/libslack/err.h -+++ b/libslack/err.h -@@ -40,10 +40,10 @@ - #undef check - - #ifdef NDEBUG --#define debug(args) --#define vdebug(args) --#define debugsys(args) --#define vdebugsys(args) -+#define debug(args) do {} while (0); -+#define vdebug(args) do {} while (0); -+#define debugsys(args) do {} while (0); -+#define vdebugsys(args) do {} while (0); - #define check(cond, mesg) (void_cast(0)) - #else - #define debug(args) debugf args; --- -2.30.2 - diff --git a/package/daemon/daemon.hash b/package/daemon/daemon.hash index c490f71548..5ad7bf6ce2 100644 --- a/package/daemon/daemon.hash +++ b/package/daemon/daemon.hash @@ -1,5 +1,7 @@ # From http://www.libslack.org/daemon/ -sha256 74f12e6d4b3c85632489bd08431d3d997bc17264bf57b7202384f2e809cff596 daemon-0.8.tar.gz +sha256 b34b37543bba43bd086e59f4b754c8102380ae5c1728b987c890d5da4b4cf3ca daemon-0.8.2.tar.gz # Locally calculated -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE -sha256 91329bb9be4ae0b7800081fa054e9bb760c60005b26958c1fb8461bc66bcd998 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 35e31504fc0aec878e86900dde1d90a04404833c182f50d5678d873910bb11eb COPYING +sha256 5a93d5831e1297ab10fe643e1a631e83be392896da14ee2951285a79012df69d LICENSES/BSD-3-Clause.txt +sha256 aaf135472f81c5b4a0dca9367e5bb5e9750032b5bebe5442b36e4c0a47430df3 LICENSES/GPL-2.0-or-later.txt diff --git a/package/daemon/daemon.mk b/package/daemon/daemon.mk index 96a163e597..5e7e497ff1 100644 --- a/package/daemon/daemon.mk +++ b/package/daemon/daemon.mk @@ -4,10 +4,10 @@ # ################################################################################ -DAEMON_VERSION = 0.8 +DAEMON_VERSION = 0.8.2 DAEMON_SITE = http://libslack.org/daemon/download -DAEMON_LICENSE = GPL-2.0+ -DAEMON_LICENSE_FILES = LICENSE COPYING +DAEMON_LICENSE = GPL-2.0+, LGPL-2.0+, BSD-3-Clause +DAEMON_LICENSE_FILES = LICENSE COPYING LICENSES/BSD-3-Clause.txt LICENSES/GPL-2.0-or-later.txt define DAEMON_CONFIGURE_CMDS (cd $(@D); ./configure)