ports/core
4
3
Fork 0
Code Issues Pull Requests Activity

start-stop-daemon: update to 20150921

Browse Source
This commit is contained in:
Steffen Nurpmeso 2015-09-24 13:51:41 +02:00 committed by Juergen Daubert
parent a44edc9e8b
commit 5fc7a6939c
4 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start-stop-daemon/.md5sum
View File

@ -1,4 +1,4 @@
fc4fc999c1d7fadae2c0fd4068b56bf1 crux-patch.diff d69ea09c844389f3e4d0cda696d0d968 crux-patch.diff
707efd334e4ba1d5f65f366a3c03c794 makefile 707efd334e4ba1d5f65f366a3c03c794 makefile
c021c418059b2afcb2f501927239beca start-stop-daemon.8 c021c418059b2afcb2f501927239beca start-stop-daemon.8
4e7b036a171570419127363228133bbc start-stop-daemon.c 61ba9ca1003221e1af632714c1cfbd11 start-stop-daemon.c

2
start-stop-daemon/Pkgfile
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=20150915 version=20150921
release=1 release=1
source=(start-stop-daemon.c start-stop-daemon.8 crux-patch.diff makefile) source=(start-stop-daemon.c start-stop-daemon.8 crux-patch.diff makefile)

28
start-stop-daemon/crux-patch.diff
View File

@ -7,12 +7,12 @@ index deae6c6..28d2de8 100644
.\" along with this program. If not, see <https://www.gnu.org/licenses/>. .\" along with this program. If not, see <https://www.gnu.org/licenses/>.
. .
-.TH start\-stop\-daemon 8 "2014-03-26" "Debian Project" "dpkg utilities" -.TH start\-stop\-daemon 8 "2014-03-26" "Debian Project" "dpkg utilities"
+.TH start\-stop\-daemon 8 "2015-09-15" "CRUX 3.2" "core services" +.TH start\-stop\-daemon 8 "2015-09-21" "CRUX 3.2" "core services"
.SH NAME .SH NAME
start\-stop\-daemon \- start and stop system daemon programs start\-stop\-daemon \- start and stop system daemon programs
. .
diff --git a/start-stop-daemon/start-stop-daemon.c b/start-stop-daemon/start-stop-daemon.c diff --git a/start-stop-daemon/start-stop-daemon.c b/start-stop-daemon/start-stop-daemon.c
index 6d74feb..e94e482 100644 index c844f2e..67cd043 100644
--- a/start-stop-daemon/start-stop-daemon.c --- a/start-stop-daemon/start-stop-daemon.c
+++ b/start-stop-daemon/start-stop-daemon.c +++ b/start-stop-daemon/start-stop-daemon.c
@@ -20,10 +20,34 @@ @@ -20,10 +20,34 @@
@ -25,7 +25,7 @@ index 6d74feb..e94e482 100644
#include <dpkg/macros.h> #include <dpkg/macros.h>
+#else +#else
+# define VERSION "20150915" +# define VERSION "20150921"
+# define CRUX "CRUX 3.2" +# define CRUX "CRUX 3.2"
+ +
+# define HAVE_SYS_PARAM_H +# define HAVE_SYS_PARAM_H
@ -61,25 +61,7 @@ index 6d74feb..e94e482 100644
#define IOPRIO_CLASS_SHIFT 13 #define IOPRIO_CLASS_SHIFT 13
#define IOPRIO_PRIO_VALUE(class, prio) (((class) << IOPRIO_CLASS_SHIFT) | (prio)) #define IOPRIO_PRIO_VALUE(class, prio) (((class) << IOPRIO_CLASS_SHIFT) | (prio))
#define IO_SCHED_PRIO_MIN 0 #define IO_SCHED_PRIO_MIN 0
@@ -297,17 +325,6 @@ xmalloc(int size) @@ -310,8 +338,7 @@ xstrndup(const char *str, size_t n)
}
static char *
-xstrdup(const char *str)
-{
- char *new_str;
-
- new_str = strdup(str);
- if (new_str)
- return new_str;
- fatal("strdup(%s) failed", str);
-}
-
-static char *
xstrndup(const char *str, size_t n)
{
char *new_str;
@@ -321,8 +338,7 @@ xstrndup(const char *str, size_t n)
static void static void
timespec_gettime(struct timespec *ts) timespec_gettime(struct timespec *ts)
{ {
@ -89,7 +71,7 @@ index 6d74feb..e94e482 100644
if (clock_gettime(CLOCK_MONOTONIC, ts) < 0) if (clock_gettime(CLOCK_MONOTONIC, ts) < 0)
fatal("clock_gettime failed"); fatal("clock_gettime failed");
#else #else
@@ -626,9 +642,9 @@ usage(void) @@ -615,9 +642,9 @@ usage(void)
static void static void
do_version(void) do_version(void)
{ {

16
start-stop-daemon/start-stop-daemon.c
View File

@ -296,17 +296,6 @@ xmalloc(int size)
fatal("malloc(%d) failed", size); fatal("malloc(%d) failed", size);
} }
static char *
xstrdup(const char *str)
{
char *new_str;
new_str = strdup(str);
if (new_str)
return new_str;
fatal("strdup(%s) failed", str);
}
static char * static char *
xstrndup(const char *str, size_t n) xstrndup(const char *str, size_t n)
{ {
@ -1049,10 +1038,11 @@ parse_options(int argc, char * const *argv)
* argument later. */ * argument later. */
changeuser_len = strcspn(optarg, ":"); changeuser_len = strcspn(optarg, ":");
changeuser = xstrndup(optarg, changeuser_len); changeuser = xstrndup(optarg, changeuser_len);
if (optarg[changeuser_len] == ':' && if (optarg[changeuser_len] == ':') {
optarg[changeuser_len + 1] == '\0') if (optarg[changeuser_len + 1] == '\0')
fatal("missing group name"); fatal("missing group name");
changegroup = optarg + changeuser_len + 1; changegroup = optarg + changeuser_len + 1;
}
break; break;
case 'g': /* --group <group>|<gid> */ case 'g': /* --group <group>|<gid> */
changegroup = optarg; changegroup = optarg;