65749575ab
```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
```
25 lines
881 B
Diff
25 lines
881 B
Diff
$NetBSD: patch-src_netpgp_netpgp.1,v 1.1 2018/03/15 20:14:14 khorben Exp $
|
|
|
|
Correct option "--armor".
|
|
Also document alternate option "--detach".
|
|
|
|
--- a/src/netpgp/netpgp.1 2014-02-17 07:23:18.000000000 +0000
|
|
+++ b/src/netpgp/netpgp.1
|
|
@@ -203,7 +203,7 @@ library.
|
|
In addition to one of the preceding commands, a number of qualifiers
|
|
or options may be given.
|
|
.Bl -tag -width Ar
|
|
-.It Fl Fl armour , Fl armor
|
|
+.It Fl Fl armour , Fl Fl armor
|
|
This option, however it is spelled, wraps the signature as an
|
|
ASCII-encoded piece of text, for ease of use.
|
|
.It Fl Fl cipher Ar ciphername
|
|
@@ -216,7 +216,7 @@ access to the cipher used.
|
|
The default cipher algorithm is the
|
|
.Dq CAST5
|
|
algorithm.
|
|
-.It Fl Fl detached
|
|
+.It Fl Fl detach , Fl Fl detached
|
|
When signing a file, place the resulting signature in a separate
|
|
file from the one being signed.
|
|
.It Fl Fl hash-alg Ar hash-algorithm
|