start-stop-daemon: update to 20221219

This commit is contained in:
Juergen Daubert 2023-01-05 11:50:48 +01:00
parent 35d9d523f4
commit 08b14ccad4
4 changed files with 26 additions and 21 deletions

View File

@ -1,8 +1,8 @@
untrusted comment: verify with /etc/ports/core.pub untrusted comment: verify with /etc/ports/core.pub
RWRJc1FUaeVeqvMw2t6PikYaEjFQVlkyVVpKn3LKc95Ppuvs892tqxUl4FTh0/CLHw7CfhpkbHjl5rJwfhZh9f/Z7pi5EYuyKAA= RWRJc1FUaeVeqnlnFMSIBx71HYCk0JxCmI2NL3nuH+rrLgtNbTfj6WFYQlUEnYozf3BOV//vD3sLD8SMPqb00CIvsVgqHsrUbw8=
SHA256 (Pkgfile) = 659d9bbb6007968396c34ea1e0bf3b1e2de4c3d6e03e90fa67cca4b6ddcdc76d SHA256 (Pkgfile) = 1bd62b7047141422155698002c969edb184f68100679dd96c45eecd9f000717d
SHA256 (.footprint) = a24924dba386364cd2326ad6abefd3be01927f37f8f2175b3f56845fc88bfb79 SHA256 (.footprint) = a24924dba386364cd2326ad6abefd3be01927f37f8f2175b3f56845fc88bfb79
SHA256 (start-stop-daemon.c) = d8d88dcd212db0b05f207f27a507f47c53cea055ca8a07b61da7e19e7a2ad7d0 SHA256 (start-stop-daemon.c) = d7613743c2daf09a90da2cced5798994d19eb82696241912483894cca55ecc5c
SHA256 (start-stop-daemon.pod) = c588a34af20e087a57ea79349a6c2494874f7b6b673e464661dcff68a0335ced SHA256 (start-stop-daemon.pod) = c588a34af20e087a57ea79349a6c2494874f7b6b673e464661dcff68a0335ced
SHA256 (crux-patch.diff) = 86f706a6b8f4801fb002275b6b96f11ed525320580e8df20aac92aa5034d8850 SHA256 (crux-patch.diff) = 267444ac85ec3875d2b80b8d6438cd6616b97e10336440385f00afbc192e2e65
SHA256 (makefile) = 74de83342773a7de5928acbdbe79777e54169666b395d1d10bbae34386aed62a SHA256 (makefile) = 74de83342773a7de5928acbdbe79777e54169666b395d1d10bbae34386aed62a

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu # Maintainer: CRUX System Team, core-ports at crux dot nu
name=start-stop-daemon name=start-stop-daemon
version=20210417 version=20221219
release=1 release=1
source=(start-stop-daemon.c start-stop-daemon.pod crux-patch.diff makefile) source=(start-stop-daemon.c start-stop-daemon.pod crux-patch.diff makefile)

View File

@ -12,7 +12,7 @@ index d16f0ed..1c3ff78 100644
#include <dpkg/macros.h> #include <dpkg/macros.h>
+#else +#else
+# define VERSION "20210417" +# define VERSION "20221219"
+# define CRUX "CRUX-Linux" +# define CRUX "CRUX-Linux"
+ +
+# define WANT_SYSTEMD_NOTIFY 0 /* 1=yes */ +# define WANT_SYSTEMD_NOTIFY 0 /* 1=yes */
@ -29,9 +29,9 @@ index d16f0ed..1c3ff78 100644
+# define HAVE_IOPRIO_SET +# define HAVE_IOPRIO_SET
+# define HAVE_SETSID +# define HAVE_SETSID
+ +
+# define DPKG_ATTR_NORET __attribute__((noreturn)) +# define LIBCOMPAT_ATTR_NORET __attribute__((noreturn))
+# define DPKG_ATTR_PRINTF(X) +# define LIBCOMPAT_ATTR_PRINTF(X)
+# define DPKG_ATTR_VPRINTF(X) +# define LIBCOMPAT_ATTR_VPRINTF(X)
+ +
+# define _GNU_SOURCE +# define _GNU_SOURCE
+# include <unistd.h> +# include <unistd.h>

View File

@ -135,6 +135,11 @@
#define SCHED_RR -1 #define SCHED_RR -1
#endif #endif
/* At least macOS and AIX do not define this. */
#ifndef SOCK_NONBLOCK
#define SOCK_NONBLOCK 0
#endif
#if defined(OS_Linux) #if defined(OS_Linux)
/* This comes from TASK_COMM_LEN defined in Linux' include/linux/sched.h. */ /* This comes from TASK_COMM_LEN defined in Linux' include/linux/sched.h. */
#define PROCESS_NAME_SIZE 15 #define PROCESS_NAME_SIZE 15
@ -287,7 +292,7 @@ static int schedule_length;
static struct schedule_item *schedule = NULL; static struct schedule_item *schedule = NULL;
static void DPKG_ATTR_PRINTF(1) static void LIBCOMPAT_ATTR_PRINTF(1)
debug(const char *format, ...) debug(const char *format, ...)
{ {
va_list arglist; va_list arglist;
@ -300,7 +305,7 @@ debug(const char *format, ...)
va_end(arglist); va_end(arglist);
} }
static void DPKG_ATTR_PRINTF(1) static void LIBCOMPAT_ATTR_PRINTF(1)
info(const char *format, ...) info(const char *format, ...)
{ {
va_list arglist; va_list arglist;
@ -313,7 +318,7 @@ info(const char *format, ...)
va_end(arglist); va_end(arglist);
} }
static void DPKG_ATTR_PRINTF(1) static void LIBCOMPAT_ATTR_PRINTF(1)
warning(const char *format, ...) warning(const char *format, ...)
{ {
va_list arglist; va_list arglist;
@ -324,7 +329,7 @@ warning(const char *format, ...)
va_end(arglist); va_end(arglist);
} }
static void DPKG_ATTR_NORET DPKG_ATTR_VPRINTF(2) static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_VPRINTF(2)
fatalv(int errno_fatal, const char *format, va_list args) fatalv(int errno_fatal, const char *format, va_list args)
{ {
va_list args_copy; va_list args_copy;
@ -344,7 +349,7 @@ fatalv(int errno_fatal, const char *format, va_list args)
exit(2); exit(2);
} }
static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1) static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(1)
fatal(const char *format, ...) fatal(const char *format, ...)
{ {
va_list args; va_list args;
@ -353,7 +358,7 @@ fatal(const char *format, ...)
fatalv(0, format, args); fatalv(0, format, args);
} }
static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1) static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(1)
fatale(const char *format, ...) fatale(const char *format, ...)
{ {
va_list args; va_list args;
@ -364,7 +369,7 @@ fatale(const char *format, ...)
#define BUG(...) bug(__FILE__, __LINE__, __func__, __VA_ARGS__) #define BUG(...) bug(__FILE__, __LINE__, __func__, __VA_ARGS__)
static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(4) static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(4)
bug(const char *file, int line, const char *func, const char *format, ...) bug(const char *file, int line, const char *func, const char *format, ...)
{ {
va_list arglist; va_list arglist;
@ -561,8 +566,8 @@ setup_socket_name(const char *suffix)
{ {
const char *basedir; const char *basedir;
if (getuid() == 0 && access("/run", F_OK) == 0) { if (getuid() == 0 && access(RUNSTATEDIR, F_OK) == 0) {
basedir = "/run"; basedir = RUNSTATEDIR;
} else { } else {
basedir = getenv("TMPDIR"); basedir = getenv("TMPDIR");
if (basedir == NULL) if (basedir == NULL)
@ -627,7 +632,7 @@ create_notify_socket(void)
su.sun_family = AF_UNIX; su.sun_family = AF_UNIX;
strncpy(su.sun_path, sockname, sizeof(su.sun_path) - 1); strncpy(su.sun_path, sockname, sizeof(su.sun_path) - 1);
rc = bind(fd, &su, sizeof(su)); rc = bind(fd, (struct sockaddr *)&su, sizeof(su));
if (rc < 0) if (rc < 0)
fatale("cannot bind to notification socket"); fatale("cannot bind to notification socket");
@ -958,7 +963,7 @@ do_version(void)
printf("Written by Marek Michalkiewicz, public domain.\n"); printf("Written by Marek Michalkiewicz, public domain.\n");
} }
static void DPKG_ATTR_NORET static void LIBCOMPAT_ATTR_NORET
badusage(const char *msg) badusage(const char *msg)
{ {
if (msg) if (msg)
@ -2701,7 +2706,7 @@ do_stop_summary(int retry_nr)
printf(".\n"); printf(".\n");
} }
static void DPKG_ATTR_PRINTF(1) static void LIBCOMPAT_ATTR_PRINTF(1)
set_what_stop(const char *format, ...) set_what_stop(const char *format, ...)
{ {
va_list arglist; va_list arglist;