b6bcd8cd34
* daemontools and dmraid 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
```
14 lines
502 B
Diff
14 lines
502 B
Diff
diff --git modules/60crypt-ssh/module-setup.sh modules/60crypt-ssh/module-setup.sh
|
|
index c3b6584..80e7dbe 100644
|
|
--- a/modules/60crypt-ssh/module-setup.sh
|
|
+++ b/modules/60crypt-ssh/module-setup.sh
|
|
@@ -40,7 +40,7 @@ install() {
|
|
|
|
case ${state} in
|
|
GENERATE )
|
|
- ssh-keygen -t $keyType -f $osshKey -q -N "" || {
|
|
+ ssh-keygen -t $keyType -f $osshKey -q -N "" -m PEM || {
|
|
derror "SSH ${msgKeyType} key creation failed"
|
|
rm -rf "$tmpDir"
|
|
return 1
|