49cb564d14
* par is kept at -Np0
```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
```
22 lines
733 B
Diff
22 lines
733 B
Diff
Musl provides encrypt() with different signature in unistd.h.
|
|
|
|
--- a/src/pidgin-gpg.c
|
|
+++ b/src/pidgin-gpg.c
|
|
@@ -458,7 +458,7 @@ static char* verify(const char* sig_str)
|
|
/* ------------------
|
|
* encrypt a plain string with the key found with fingerprint fpr
|
|
* ------------------ */
|
|
-static char* encrypt(const char* plain_str, const char* fpr)
|
|
+static char* p_encrypt(const char* plain_str, const char* fpr)
|
|
{
|
|
gpgme_error_t error;
|
|
gpgme_ctx_t ctx;
|
|
@@ -829,7 +829,7 @@ void jabber_send_signal_cb(PurpleConnection *pc, xmlnode **packet,
|
|
free(bare_jid);
|
|
|
|
// encrypt message
|
|
- enc_str = encrypt(message,fpr_to);
|
|
+ enc_str = p_encrypt(message,fpr_to);
|
|
if (enc_str != NULL)
|
|
{
|
|
// remove message from body
|