added my Recipes
This commit is contained in:
@@ -0,0 +1,209 @@
|
||||
From 269f18d5e6698fdd34fec2798f10c6fe072f3cd5 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 1 Sep 2022 23:36:52 -0700
|
||||
Subject: [PATCH] Fix signature of main function
|
||||
|
||||
Clang-15 errors out otherewise.
|
||||
Include needed headers for missing functions
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/chkshsgr.c | 2 +-
|
||||
src/tai64n.c | 2 +-
|
||||
src/tai64nlocal.c | 2 +-
|
||||
src/trycpp.c | 5 +++--
|
||||
src/tryflock.c | 4 ++--
|
||||
src/trymkffo.c | 2 +-
|
||||
src/trypoll.c | 3 ++-
|
||||
src/trysgact.c | 4 ++--
|
||||
src/trysgprm.c | 4 ++--
|
||||
src/tryshsgr.c | 3 ++-
|
||||
src/tryulong64.c | 4 ++--
|
||||
src/trywaitp.c | 4 ++--
|
||||
src/x86cpuid.c | 2 +-
|
||||
13 files changed, 22 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/src/chkshsgr.c b/src/chkshsgr.c
|
||||
index 038afe9..9547a4c 100644
|
||||
--- a/src/chkshsgr.c
|
||||
+++ b/src/chkshsgr.c
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <grp.h>
|
||||
#include <unistd.h>
|
||||
|
||||
-int main()
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
gid_t x[4];
|
||||
|
||||
diff --git a/src/tai64n.c b/src/tai64n.c
|
||||
index 17bdb82..7096ab3 100644
|
||||
--- a/src/tai64n.c
|
||||
+++ b/src/tai64n.c
|
||||
@@ -27,7 +27,7 @@ buffer in = BUFFER_INIT(myread,0,inbuf,sizeof inbuf);
|
||||
|
||||
char stamp[TIMESTAMP + 1];
|
||||
|
||||
-int main()
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
char ch;
|
||||
|
||||
diff --git a/src/tai64nlocal.c b/src/tai64nlocal.c
|
||||
index ce16ad8..2435737 100644
|
||||
--- a/src/tai64nlocal.c
|
||||
+++ b/src/tai64nlocal.c
|
||||
@@ -28,7 +28,7 @@ unsigned long nanosecs;
|
||||
unsigned long u;
|
||||
struct tm *t;
|
||||
|
||||
-int main()
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
char ch;
|
||||
|
||||
diff --git a/src/trycpp.c b/src/trycpp.c
|
||||
index e4503d4..d96c955 100644
|
||||
--- a/src/trycpp.c
|
||||
+++ b/src/trycpp.c
|
||||
@@ -1,6 +1,7 @@
|
||||
/* Public domain. */
|
||||
-
|
||||
-int main()
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
#ifdef NeXT
|
||||
printf("nextstep\n"); exit(0);
|
||||
diff --git a/src/tryflock.c b/src/tryflock.c
|
||||
index a82ffc2..5ca97d3 100644
|
||||
--- a/src/tryflock.c
|
||||
+++ b/src/tryflock.c
|
||||
@@ -3,8 +3,8 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/file.h>
|
||||
#include <fcntl.h>
|
||||
-
|
||||
-main()
|
||||
+void
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
flock(0,LOCK_EX | LOCK_UN | LOCK_NB);
|
||||
}
|
||||
diff --git a/src/trymkffo.c b/src/trymkffo.c
|
||||
index 9356342..f92414a 100644
|
||||
--- a/src/trymkffo.c
|
||||
+++ b/src/trymkffo.c
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
-void main()
|
||||
+void main(int argc, char *argv[])
|
||||
{
|
||||
mkfifo("temp-trymkffo",0);
|
||||
}
|
||||
diff --git a/src/trypoll.c b/src/trypoll.c
|
||||
index 6506617..cb888cc 100644
|
||||
--- a/src/trypoll.c
|
||||
+++ b/src/trypoll.c
|
||||
@@ -3,8 +3,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <poll.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
-int main()
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
struct pollfd x;
|
||||
|
||||
diff --git a/src/trysgact.c b/src/trysgact.c
|
||||
index e264ef2..25da013 100644
|
||||
--- a/src/trysgact.c
|
||||
+++ b/src/trysgact.c
|
||||
@@ -1,8 +1,8 @@
|
||||
/* Public domain. */
|
||||
|
||||
#include <signal.h>
|
||||
-
|
||||
-main()
|
||||
+void
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
struct sigaction sa;
|
||||
sa.sa_handler = 0;
|
||||
diff --git a/src/trysgprm.c b/src/trysgprm.c
|
||||
index a46c82c..5a9491c 100644
|
||||
--- a/src/trysgprm.c
|
||||
+++ b/src/trysgprm.c
|
||||
@@ -1,8 +1,8 @@
|
||||
/* Public domain. */
|
||||
|
||||
#include <signal.h>
|
||||
-
|
||||
-main()
|
||||
+void
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
sigset_t ss;
|
||||
|
||||
diff --git a/src/tryshsgr.c b/src/tryshsgr.c
|
||||
index c5ed6d6..d111e40 100644
|
||||
--- a/src/tryshsgr.c
|
||||
+++ b/src/tryshsgr.c
|
||||
@@ -1,6 +1,7 @@
|
||||
/* Public domain. */
|
||||
|
||||
-int main()
|
||||
+#include <unistd.h>
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
short x[4];
|
||||
|
||||
diff --git a/src/tryulong64.c b/src/tryulong64.c
|
||||
index 003548a..20a3a40 100644
|
||||
--- a/src/tryulong64.c
|
||||
+++ b/src/tryulong64.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/* Public domain. */
|
||||
-
|
||||
-int main()
|
||||
+#include <unistd.h>
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
unsigned long u;
|
||||
u = 1;
|
||||
diff --git a/src/trywaitp.c b/src/trywaitp.c
|
||||
index 319b81f..90bc5aa 100644
|
||||
--- a/src/trywaitp.c
|
||||
+++ b/src/trywaitp.c
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
-
|
||||
-main()
|
||||
+void
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
waitpid(0,0,0);
|
||||
}
|
||||
diff --git a/src/x86cpuid.c b/src/x86cpuid.c
|
||||
index f81c593..1cb1ea6 100644
|
||||
--- a/src/x86cpuid.c
|
||||
+++ b/src/x86cpuid.c
|
||||
@@ -7,7 +7,7 @@ void nope()
|
||||
exit(1);
|
||||
}
|
||||
|
||||
-int main()
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
unsigned long x[4];
|
||||
unsigned long y[4];
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From a86c4209da695909424db0c9108592194a3094b7 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Sat, 6 Aug 2016 00:47:37 +0900
|
||||
Subject: [PATCH] daemontools: Fix QA Issue
|
||||
|
||||
To fix the QA Issues as following:
|
||||
|
||||
ERROR: daemontools-0.76-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/build-poky/tmp/work/i586-poky-linux/daemontools/0.76-r0/packages-split/daemontools/usr/bin/tai64nlocal'
|
||||
|
||||
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
---
|
||||
src/conf-ld | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/conf-ld b/src/conf-ld
|
||||
index 2a44210..c7e7755 100644
|
||||
--- a/src/conf-ld
|
||||
+++ b/src/conf-ld
|
||||
@@ -1,3 +1,3 @@
|
||||
-${CC}
|
||||
+${CC} ${LDFLAGS}
|
||||
|
||||
This will be used to link .o files into an executable.
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From d3e7651e2f2492dd1031d09a99713644b604cab5 Mon Sep 17 00:00:00 2001
|
||||
From: Gerrit Pape <pape@smarden.org>
|
||||
Date: Wed, 12 Dec 2007 13:44:15 +0000
|
||||
Subject: [PATCH] error.h: '#include <errno.h>' instead of 'extern int errno;'
|
||||
|
||||
---
|
||||
daemontools-0.76/src/error.h | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git daemontools-0.76.orig/src/error.h daemontools-0.76/src/error.h
|
||||
index 086fb55..f7e8273 100644
|
||||
--- daemontools-0.76.orig/src/error.h
|
||||
+++ daemontools-0.76/src/error.h
|
||||
@@ -3,7 +3,7 @@
|
||||
#ifndef ERROR_H
|
||||
#define ERROR_H
|
||||
|
||||
-extern int errno;
|
||||
+#include <errno.h>
|
||||
|
||||
extern int error_intr;
|
||||
extern int error_nomem;
|
||||
--
|
||||
1.5.4.2
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From 7ee585cab1d5b68f804a5601a66ae87799c8a7c3 Mon Sep 17 00:00:00 2001
|
||||
From: Gerrit Pape <pape@smarden.org>
|
||||
Date: Sun, 24 Feb 2008 10:54:26 +0000
|
||||
Subject: [PATCH] supervise.c: ./supervise may be a symlink, if it's dangling, create link target
|
||||
|
||||
---
|
||||
daemontools-0.76/src/supervise.c | 17 ++++++++++++++++-
|
||||
1 files changed, 16 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git daemontools-0.76.orig/src/supervise.c daemontools-0.76/src/supervise.c
|
||||
index 2482ad2..f43cabf 100644
|
||||
--- daemontools-0.76.orig/src/supervise.c
|
||||
+++ daemontools-0.76/src/supervise.c
|
||||
@@ -208,6 +208,8 @@ void doit(void)
|
||||
int main(int argc,char **argv)
|
||||
{
|
||||
struct stat st;
|
||||
+ int r;
|
||||
+ char buf[256];
|
||||
|
||||
dir = argv[1];
|
||||
if (!dir || argv[2])
|
||||
@@ -232,7 +234,20 @@ int main(int argc,char **argv)
|
||||
if (errno != error_noent)
|
||||
strerr_die4sys(111,FATAL,"unable to stat ",dir,"/down: ");
|
||||
|
||||
- mkdir("supervise",0700);
|
||||
+ if (mkdir("supervise",0700) == -1) {
|
||||
+ if ((r = readlink("supervise", buf, 256)) != -1) {
|
||||
+ if (r == 256) {
|
||||
+ errno = EOVERFLOW;
|
||||
+ strerr_die1sys(111,"unable to readlink ./supervise: ");
|
||||
+ }
|
||||
+ buf[r] = 0;
|
||||
+ mkdir(buf, 0700);
|
||||
+ }
|
||||
+ else {
|
||||
+ if ((errno != ENOENT) && (errno != EINVAL))
|
||||
+ strerr_die1sys(111, "unable to readlink ./supervise: ");
|
||||
+ }
|
||||
+ }
|
||||
fdlock = open_append("supervise/lock");
|
||||
if ((fdlock == -1) || (lock_exnb(fdlock) == -1))
|
||||
strerr_die4sys(111,FATAL,"unable to acquire ",dir,"/supervise/lock: ");
|
||||
--
|
||||
1.5.4.2
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
make sure it can be compiled for cross target
|
||||
|
||||
1. never try to compile target binary by native gcc
|
||||
2. target's chkshsgr doesn't work on native.
|
||||
3. it's wrong to do target tests on native.
|
||||
|
||||
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
|
||||
|
||||
diff -Nurp daemontools-0.76.orig/src/conf-cc daemontools-0.76/src/conf-cc
|
||||
--- daemontools-0.76.orig/src/conf-cc 2001-07-13 00:49:49.000000000 +0800
|
||||
+++ daemontools-0.76/src/conf-cc 2014-11-26 09:34:38.828812162 +0800
|
||||
@@ -1,3 +1,3 @@
|
||||
-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
|
||||
+${CC} -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
|
||||
|
||||
This will be used to compile .c files.
|
||||
diff -Nurp daemontools-0.76.orig/src/conf-ld daemontools-0.76/src/conf-ld
|
||||
--- daemontools-0.76.orig/src/conf-ld 2001-07-13 00:49:49.000000000 +0800
|
||||
+++ daemontools-0.76/src/conf-ld 2014-11-26 09:34:49.880811730 +0800
|
||||
@@ -1,3 +1,3 @@
|
||||
-gcc -s
|
||||
+${CC}
|
||||
|
||||
This will be used to link .o files into an executable.
|
||||
diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile
|
||||
--- daemontools-0.76.orig/src/Makefile 2001-07-13 00:49:49.000000000 +0800
|
||||
+++ daemontools-0.76/src/Makefile 2014-11-26 09:38:47.120802459 +0800
|
||||
@@ -165,7 +165,7 @@ hassgprm.h: choose compile hassgprm.h1 h
|
||||
|
||||
hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \
|
||||
tryshsgr.c warn-shsgr
|
||||
- ./chkshsgr || ( cat warn-shsgr; exit 1 )
|
||||
+ echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )"
|
||||
./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
|
||||
|
||||
haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c
|
||||
@@ -265,7 +265,7 @@ readproctitle.o: compile error.h readpro
|
||||
rts: envdir envuidgid fghack matchtest multilog pgrphack \
|
||||
readproctitle rts.tests setlock setuidgid softlimit supervise svc \
|
||||
svok svscan svscanboot svstat tai64n tai64nlocal
|
||||
- env - /bin/sh rts.tests 2>&1 | cat -v > rts
|
||||
+ echo "Warning: We can not run test on cross target. - ignoring env - /bin/sh rts.tests 2>&1 | cat -v > rts"
|
||||
|
||||
scan_ulong.o: compile scan.h scan_ulong.c
|
||||
./compile scan_ulong.c
|
||||
@@ -0,0 +1,74 @@
|
||||
Fixup misc warnings
|
||||
|
||||
Patch by RiverRat
|
||||
|
||||
http://bugs.gentoo.org/124487
|
||||
|
||||
--- a/src/chkshsgr.c
|
||||
+++ b/src/chkshsgr.c
|
||||
@@ -1,10 +1,13 @@
|
||||
/* Public domain. */
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <grp.h>
|
||||
#include <unistd.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
- short x[4];
|
||||
+ gid_t x[4];
|
||||
|
||||
x[0] = x[1] = 0;
|
||||
if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
|
||||
--- a/src/matchtest.c
|
||||
+++ b/src/matchtest.c
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include <unistd.h>
|
||||
#include "match.h"
|
||||
#include "buffer.h"
|
||||
#include "str.h"
|
||||
--- a/src/multilog.c
|
||||
+++ b/src/multilog.c
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
--- a/src/prot.c
|
||||
+++ b/src/prot.c
|
||||
@@ -1,5 +1,8 @@
|
||||
/* Public domain. */
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <unistd.h>
|
||||
+#include <grp.h>
|
||||
#include "hasshsgr.h"
|
||||
#include "prot.h"
|
||||
|
||||
--- a/src/seek_set.c
|
||||
+++ b/src/seek_set.c
|
||||
@@ -1,6 +1,7 @@
|
||||
/* Public domain. */
|
||||
|
||||
#include <sys/types.h>
|
||||
+#include <unistd.h>
|
||||
#include "seek.h"
|
||||
|
||||
#define SET 0 /* sigh */
|
||||
--- a/src/supervise.c
|
||||
+++ b/src/supervise.c
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
--- a/src/pathexec_run.c
|
||||
+++ b/src/pathexec_run.c
|
||||
@@ -1,5 +1,6 @@
|
||||
/* Public domain. */
|
||||
|
||||
+#include <unistd.h>
|
||||
#include "error.h"
|
||||
#include "stralloc.h"
|
||||
#include "str.h"
|
||||
@@ -0,0 +1,48 @@
|
||||
SUMMARY = "DJB daemontools"
|
||||
HOMEPAGE = "http://cr.yp.to/daemontools.html"
|
||||
DESCRIPTION = "supervise monitors a service. It starts the service and restarts the \
|
||||
service if it dies. The companion svc program stops, pauses, or restarts \
|
||||
the service on sysadmin request. The svstat program prints a one-line \
|
||||
status report. \
|
||||
multilog saves error messages to one or more logs. It optionally timestamps \
|
||||
each line and, for each log, includes or excludes lines matching specified \
|
||||
patterns. It automatically rotates logs to limit the amount of disk space \
|
||||
used. If the disk fills up, it pauses and tries again, without losing any \
|
||||
data."
|
||||
|
||||
SECTION = "System/Servers"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://src/prot.c;beginline=1;endline=1;md5=96964cadf07e8f8c1e2ffb3b507dd647"
|
||||
LICENSE = "PD"
|
||||
|
||||
DEPENDS += "coreutils"
|
||||
|
||||
SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \
|
||||
file://0001-error.h-include-errno.h-instead-of-extern-int.diff \
|
||||
file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff \
|
||||
file://cross-compile.patch \
|
||||
file://0001-daemontools-Fix-QA-Issue.patch \
|
||||
file://warnings.patch \
|
||||
file://0001-Fix-signature-of-main-function.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc"
|
||||
SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f"
|
||||
|
||||
S = "${WORKDIR}/admin/${BP}"
|
||||
|
||||
do_compile() {
|
||||
./package/compile
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}/${bindir}
|
||||
}
|
||||
|
||||
do_install:append:class-target() {
|
||||
install -m755 ${S}/command/* ${D}/${bindir}
|
||||
}
|
||||
|
||||
inherit update-alternatives
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
ALTERNATIVE:${PN} = "svc svok"
|
||||
Reference in New Issue
Block a user