2fd8d4df94
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
26 lines
546 B
Diff
26 lines
546 B
Diff
--- a/src/ntpd.h
|
|
+++ b/src/ntpd.h
|
|
@@ -33,6 +33,10 @@
|
|
|
|
#include "ntp.h"
|
|
|
|
+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
|
|
+#define __dead __attribute__((__noreturn__))
|
|
+#endif
|
|
+
|
|
#define MAXIMUM(a, b) ((a) > (b) ? (a) : (b))
|
|
|
|
#ifndef NTPD_USER
|
|
--- a/src/log.c
|
|
+++ b/src/log.c
|
|
@@ -24,6 +24,10 @@
|
|
#include <errno.h>
|
|
#include <time.h>
|
|
|
|
+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
|
|
+#define __dead __attribute__((__noreturn__))
|
|
+#endif
|
|
+
|
|
static int debug;
|
|
static int verbose;
|
|
const char *log_procname;
|