7fc9190f0e
* gcc is kept at -Np0, because of void-cross
```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
532 B
Diff
22 lines
532 B
Diff
upstream: no
|
|
reason: don't prompt for password, don't assume it has been asked for
|
|
|
|
--- a/tests/cert-tests/certtool
|
|
+++ b/tests/cert-tests/certtool
|
|
@@ -26,6 +26,7 @@
|
|
TMPFILE1=certtool-file1.$$.tmp
|
|
TMPFILE2=certtool-file2.$$.tmp
|
|
PASS="1234"
|
|
+export GNUTLS_PIN="1234"
|
|
|
|
if test -n "$DISABLE_BASH_TESTS"; then
|
|
exit 77
|
|
@@ -66,7 +67,7 @@
|
|
fi
|
|
|
|
grep "Enter password" ${TMPFILE2} >/dev/null 2>&1
|
|
- if test $? != 0;then
|
|
+ if test $? != 0 && test -z "$GNUTLS_PIN" ; then
|
|
cat ${TMPFILE2}
|
|
echo "No password was asked"
|
|
exit 1
|