Refresh patch queue

debian/patches/debian/2021-11-29.use-asciidoctor-to-build-manpages.patch

@@ -5,17 +5,17 @@ Forwarded: no
 
 --- a/meson.build
 +++ b/meson.build
-@@ -39,7 +39,7 @@
+@@ -38,7 +38,7 @@
  threads = dependency('threads')
  jansson = dependency('jansson', version: '>=2.10')
  libcrypto = dependency('libcrypto', version: '>=1.0.2')
--a2x = find_program('a2x', required: false)
+-a2x = find_program('a2x', required: get_option('docs'))
 +asciidoctor = find_program('asciidoctor', required: false)
  jq = find_program('jq', required: false)
  
  mans = []
-@@ -66,10 +66,10 @@
-   requires: 'jansson',
+@@ -64,10 +64,10 @@
+   requires: jansson,
  )
  
 -if a2x.found()

debian/patches/for-upstream/2021-12-01.increase-test-timeout.patch

@@ -1,24 +0,0 @@
-Subject: Increase timeout values in the test suite
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2021-12-01
-Forwarded: https://github.com/latchset/jose/issues/110
-
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -37,14 +37,14 @@
-   if p == 'api_b64'
-     to = 1800
-   else
--    to = 30
-+    to = 180
-   endif
-   test(p, exe, timeout: to)
- endforeach
- 
- foreach s: scripts
-   exe = find_program('./' + s)
--  test(s, exe, env: e, timeout: 60)
-+  test(s, exe, env: e, timeout: 900)
- endforeach
- 
- subdir('issue-75')

debian/patches/for-upstream/2021-12-01.probe-for-jq.patch

@@ -1,15 +0,0 @@
-Subject: Probe for jq
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2021-12-01
-Forwarded: https://github.com/latchset/jose/issues/109
-
---- a/meson.build
-+++ b/meson.build
-@@ -40,6 +40,7 @@
- jansson = dependency('jansson', version: '>=2.10')
- libcrypto = dependency('libcrypto', version: '>=1.0.2')
- a2x = find_program('a2x', required: false)
-+jq = find_program('jq', required: false)
- 
- mans = []
- 

debian/patches/for-upstream/2021-12-01.replace-usage-of-which.patch

@@ -1,25 +0,0 @@
-Subject: Replace usage of which(1)
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2021-12-01
-Forwarded: https://github.com/latchset/jose/issues/108
-
---- a/tests/jose-jwe-enc
-+++ b/tests/jose-jwe-enc
-@@ -15,7 +15,7 @@
- jwe=$tmpdir/jwe
- 
- jqopt() {
--    if ! which jq >/dev/null 2>&1; then
-+    if ! command -v jq >/dev/null 2>&1; then
-         echo "$3"
-     else
-         jq -r "if $2 | type | . = \"string\" then $2 else error(\"\") end" < $1
-@@ -23,7 +23,7 @@
- }
- 
- jqbopt() {
--    if ! which jq >/dev/null 2>&1; then
-+    if ! command -v jq >/dev/null 2>&1; then
-         echo "$4"
-     else
-         jq -r "if $2 | type | . = \"string\" then $2 else error(\"\") end" < $1 \

debian/patches/series

@@ -2,9 +2,6 @@
 # cherry-picked commits. Keep in upstream's chronological order
 
 # patches for upstream
-for-upstream/2021-12-01.replace-usage-of-which.patch
-for-upstream/2021-12-01.probe-for-jq.patch
-for-upstream/2021-12-01.increase-test-timeout.patch
 
 # patches for Debian
 debian/2021-11-29.use-asciidoctor-to-build-manpages.patch