From aa5ac7f166736ba3c161d9440da07f2113a5ca6a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 24 Jun 2021 14:39:40 +0300 Subject: [PATCH] package/daemon: bump to version 0.8 Drop upstream patch. Add another patch to fix build with musl. Update COPYING hash because of date change. Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- ...aemon-fix-build-with-musl-libc-again.patch | 46 +++++++++++++++++++ package/daemon/0001-fix-musl.patch | 18 -------- package/daemon/daemon.hash | 4 +- package/daemon/daemon.mk | 2 +- 4 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch delete mode 100644 package/daemon/0001-fix-musl.patch 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 new file mode 100644 index 0000000000..48d95f122f --- /dev/null +++ b/package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch @@ -0,0 +1,46 @@ +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/0001-fix-musl.patch b/package/daemon/0001-fix-musl.patch deleted file mode 100644 index 5ebb645973..0000000000 --- a/package/daemon/0001-fix-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -daemon: fix build with musl - -musl requires the ttydefaults.h to be included explicitly for CEOF. - -Signed-off-by: Baruch Siach ---- - -diff -Nuar daemon-0.6.4-orig/daemon.c daemon-0.6.4/daemon.c ---- daemon-0.6.4-orig/daemon.c 2010-06-12 16:37:00.000000000 +0300 -+++ daemon-0.6.4/daemon.c 2017-05-01 22:02:17.721413468 +0300 -@@ -864,6 +864,7 @@ - #ifdef _RESTORE_POSIX_SOURCE - #define _POSIX_SOURCE - #endif -+#include - #include - #include - #include diff --git a/package/daemon/daemon.hash b/package/daemon/daemon.hash index ec7451a81e..c490f71548 100644 --- a/package/daemon/daemon.hash +++ b/package/daemon/daemon.hash @@ -1,5 +1,5 @@ # From http://www.libslack.org/daemon/ -sha256 ba1f6dc87532c852bfb8f436179cd661c3458ff898f67767c414123198626dfd daemon-0.7.1.tar.gz +sha256 74f12e6d4b3c85632489bd08431d3d997bc17264bf57b7202384f2e809cff596 daemon-0.8.tar.gz # Locally calculated sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE -sha256 cbac6eb0e1f7f95826966c7903939d591092a7f7d7726862946cb49096e8497d COPYING +sha256 91329bb9be4ae0b7800081fa054e9bb760c60005b26958c1fb8461bc66bcd998 COPYING diff --git a/package/daemon/daemon.mk b/package/daemon/daemon.mk index 91f77dd24a..96a163e597 100644 --- a/package/daemon/daemon.mk +++ b/package/daemon/daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAEMON_VERSION = 0.7.1 +DAEMON_VERSION = 0.8 DAEMON_SITE = http://libslack.org/daemon/download DAEMON_LICENSE = GPL-2.0+ DAEMON_LICENSE_FILES = LICENSE COPYING -- 2.30.2