c987560802
```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
```
21 lines
546 B
Diff
21 lines
546 B
Diff
From 416f1de878ef97e27e27508914f7ba8599a0be22 Mon Sep 17 00:00:00 2001
|
|
From: Malte Kraus <malte.kraus@suse.com>
|
|
Date: Tue, 13 Aug 2019 11:25:57 +0200
|
|
Subject: [PATCH] fail HELLO command when SSL is required
|
|
|
|
---
|
|
daemon.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git daemon.c daemon.c
|
|
index 2d8407d..2a1a8af 100644
|
|
--- a/daemon.c
|
|
+++ b/daemon.c
|
|
@@ -747,6 +747,7 @@ void csync_daemon_session()
|
|
goto conn_without_ssl_ok;
|
|
}
|
|
cmd_error = conn_response(CR_ERR_SSL_EXPECTED);
|
|
+ peer = NULL;
|
|
}
|
|
conn_without_ssl_ok:;
|
|
#endif
|