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
```
43 lines
847 B
Diff
43 lines
847 B
Diff
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1340,40 +1340,6 @@
|
|
|
|
# Where to place smtpd.pid
|
|
piddir=/var/run
|
|
-AC_MSG_CHECKING([system pid directory])
|
|
-AC_RUN_IFELSE(
|
|
- [
|
|
- AC_LANG_PROGRAM([[
|
|
-#include <stdio.h>
|
|
-#include <stdlib.h>
|
|
-#ifdef HAVE_PATHS_H
|
|
-#include <paths.h>
|
|
-#endif
|
|
-#define DATA "conftest.piddir"
|
|
- ]],
|
|
- [[
|
|
-#ifdef _PATH_VARRUN
|
|
-FILE *fd;
|
|
-int rc;
|
|
-
|
|
-if ((fd = fopen(DATA,"w")) == NULL) { exit(1); }
|
|
-if ((rc = fprintf(fd ,"%s\n", _PATH_VARRUN)) < 0) { exit(2); }
|
|
-exit(0);
|
|
-#else
|
|
-exit(-1);
|
|
-#endif
|
|
- ]])
|
|
- ], [
|
|
- piddir=`cat conftest.piddir`
|
|
- AC_MSG_RESULT([$piddir from paths.h])
|
|
- ],
|
|
- [
|
|
- AC_MSG_RESULT([$piddir from default value])
|
|
- ],
|
|
- [
|
|
- AC_MSG_RESULT([$piddir from default value])
|
|
- ]
|
|
-)
|
|
|
|
AC_ARG_WITH([path-pidfile],
|
|
[ --with-path-pidfile=PATH Specify path to smtpd.pid directory (default=/var/run)],
|