Hi,
I will upload a change disabling the failing test to DELAYED/7.
Please let me know if I should cancel it. Debdiff attached.
The failing mruby test might or might not point to a real problem,
it seems like its not 100% reproducible (in my builds at least).
I want src:h2o / libh2o to stay in bookworm so it can be used by
dnsdist; after bookworm I expect dnsdist upstream to switch away
from h2o, which itself seems upstream-dead.
Thanks,
Chris
diff -Nru h2o-2.2.5+dfsg2/debian/changelog h2o-2.2.5+dfsg2/debian/changelog
--- h2o-2.2.5+dfsg2/debian/changelog 2022-04-13 20:41:51.000000000 +0000
+++ h2o-2.2.5+dfsg2/debian/changelog 2023-03-21 12:40:38.000000000 +0000
@@ -1,3 +1,11 @@
+h2o (2.2.5+dfsg2-7) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove VCS tags from picohttpparser source files
+ * Disable failing mruby test (Closes: #1032554)
+
+ -- Chris Hofstaedtler <z...@debian.org> Tue, 21 Mar 2023 12:40:38 +0000
+
h2o (2.2.5+dfsg2-6.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru h2o-2.2.5+dfsg2/debian/patches/picohttpparser-vcstags.patch
h2o-2.2.5+dfsg2/debian/patches/picohttpparser-vcstags.patch
--- h2o-2.2.5+dfsg2/debian/patches/picohttpparser-vcstags.patch 1970-01-01
00:00:00.000000000 +0000
+++ h2o-2.2.5+dfsg2/debian/patches/picohttpparser-vcstags.patch 2023-03-21
12:40:38.000000000 +0000
@@ -0,0 +1,25 @@
+Remove expanded $Id$ strings, which seem to break building
+using h2o_2.2.5+dfsg2.orig.tar.xz from the archive.
+
+--- h2o-2.2.5+dfsg2.orig/deps/picohttpparser/picohttpparser.c
++++ h2o-2.2.5+dfsg2/deps/picohttpparser/picohttpparser.c
+@@ -36,7 +36,7 @@
+ #endif
+ #include "picohttpparser.h"
+
+-/* $Id: a707070d11d499609f99d09f97535642cec910a8 $ */
++/* $Id$ */
+
+ #if __GNUC__ >= 3
+ #define likely(x) __builtin_expect(!!(x), 1)
+--- h2o-2.2.5+dfsg2.orig/deps/picohttpparser/picohttpparser.h
++++ h2o-2.2.5+dfsg2/deps/picohttpparser/picohttpparser.h
+@@ -33,7 +33,7 @@
+ #define ssize_t intptr_t
+ #endif
+
+-/* $Id: 67fd3ee74103ada60258d8a16e868f483abcca87 $ */
++/* $Id$ */
+
+ #ifdef __cplusplus
+ extern "C" {
diff -Nru h2o-2.2.5+dfsg2/debian/patches/series
h2o-2.2.5+dfsg2/debian/patches/series
--- h2o-2.2.5+dfsg2/debian/patches/series 2022-04-13 20:41:51.000000000
+0000
+++ h2o-2.2.5+dfsg2/debian/patches/series 2023-03-21 12:40:38.000000000
+0000
@@ -5,3 +5,4 @@
link-libh2o-with-wslay.patch
fix_CVE-2019_1.patch
mruby_fileutils_no_verbose.patch
+picohttpparser-vcstags.patch
diff -Nru h2o-2.2.5+dfsg2/debian/rules h2o-2.2.5+dfsg2/debian/rules
--- h2o-2.2.5+dfsg2/debian/rules 2022-04-13 20:41:51.000000000 +0000
+++ h2o-2.2.5+dfsg2/debian/rules 2023-03-21 12:40:38.000000000 +0000
@@ -7,7 +7,7 @@
# Disable the following tests as they require network access
BAD_TESTS=10http1client 50access-log 50reverse-proxy-added-headers
50reverse-proxy-drop-headers 50reverse-proxy-https
50reverse-proxy-session-resumption 80invalid-h2-chars-in-headers 40server-push
50mruby-acl 80issues595 40max-connections 40session-ticket
# Disable test which fails with newer mruby
-BAD_TESTS += 50mruby-htpasswd
+BAD_TESTS += 50mruby-htpasswd 50mruby-http-request
%:
dh $@
