summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-03 04:55:37 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-03 04:55:37 -0500
commit8576ded640eaa1fad322a5e0a54c0f4d6d74cbd3 (patch)
treed34beb8b1cbce01852de614fa53da2ed19acd395
parent0487db916754b631af2a0edfe463525033c35569 (diff)
downloadpackages-8576ded640eaa1fad322a5e0a54c0f4d6d74cbd3.tar.gz
packages-8576ded640eaa1fad322a5e0a54c0f4d6d74cbd3.tar.bz2
packages-8576ded640eaa1fad322a5e0a54c0f4d6d74cbd3.tar.xz
packages-8576ded640eaa1fad322a5e0a54c0f4d6d74cbd3.zip
system/m4: fix dumb GPG passphrase test again
-rw-r--r--system/m4/APKBUILD4
-rw-r--r--system/m4/gnulib-tests-dont-require-gpg-passphrase.patch10
2 files changed, 13 insertions, 1 deletions
diff --git a/system/m4/APKBUILD b/system/m4/APKBUILD
index 70b47fc55..9c712662d 100644
--- a/system/m4/APKBUILD
+++ b/system/m4/APKBUILD
@@ -13,6 +13,7 @@ subpackages="m4-doc"
source="ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz
disable-mbrtowc-test.patch
localename-test-fix.patch
+ gnulib-tests-dont-require-gpg-passphrase.patch
"
build() {
@@ -38,4 +39,5 @@ package() {
sha512sums="29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae m4-1.4.18.tar.gz
78bf099c96fcec8c9cebd4e34f0d7c942e99da2ec238baa9464f8443580edb0565e9026c433ee54fb564304ec8e7e90766e19474472e57b48e567fd7b356777e disable-mbrtowc-test.patch
-fac0cb58e698996284a222c4da340f92689d6db98f1fbab6e61e1c5f2d90122660296f8e5c60c94169413e3e2ee632c6264f12b98e5d3a1e1aae145a2d4aac45 localename-test-fix.patch"
+fac0cb58e698996284a222c4da340f92689d6db98f1fbab6e61e1c5f2d90122660296f8e5c60c94169413e3e2ee632c6264f12b98e5d3a1e1aae145a2d4aac45 localename-test-fix.patch
+fb7344bc8a7aea1f1ce87474109aaf3d5a5ca0cd86b517025c6aad9a388a9ede7c267e7095d171d8768d1c0f0d9d8009e307467352afa81484c54dc476db0ebd gnulib-tests-dont-require-gpg-passphrase.patch"
diff --git a/system/m4/gnulib-tests-dont-require-gpg-passphrase.patch b/system/m4/gnulib-tests-dont-require-gpg-passphrase.patch
new file mode 100644
index 000000000..d00fbfd6a
--- /dev/null
+++ b/system/m4/gnulib-tests-dont-require-gpg-passphrase.patch
@@ -0,0 +1,10 @@
+--- m4-1.4.18/tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600
++++ m4-1.4.18/tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500
+@@ -32,6 +32,7 @@
+ touch d/a b c &&
+ git config user.email "you@example.com" &&
+ git config user.name "Your Name" &&
++ git config commit.gpgsign false &&
+ git add . > /dev/null &&
+ git commit -q -a -m log &&
+ printf '%s\n' b c d/a > expected &&