Bug#1008426: h2o: diff for NMU version 2.2.5+dfsg2-6.2
I do not have this tag as I did not repack a tarball. Anton Am Mi., 13. Apr. 2022 um 22:47 Uhr schrieb Chris Hofstaedtler : > > Hi Anton, > > * Anton Gladky [220412 19:18]: > > thanks a lot for NMU! Feel free to upload immediately, > > but please commit your changes into the git. Thanks! > > okay, can/will do. Could you push the tag tags/upstream/2.2.5+dfsg2 into > git? > > I have cancelled the NMU in the meantime. > > Thanks, > Chris >
Bug#1008426: h2o: diff for NMU version 2.2.5+dfsg2-6.2
Hi Anton, * Anton Gladky [220412 19:18]: > thanks a lot for NMU! Feel free to upload immediately, > but please commit your changes into the git. Thanks! okay, can/will do. Could you push the tag tags/upstream/2.2.5+dfsg2 into git? I have cancelled the NMU in the meantime. Thanks, Chris
Bug#1008426: h2o: diff for NMU version 2.2.5+dfsg2-6.2
Hi Chris,
thanks a lot for NMU! Feel free to upload immediately,
but please commit your changes into the git. Thanks!
Regards
Anton
Am Di., 12. Apr. 2022 um 17:33 Uhr schrieb Chris Hofstaedtler :
>
> Control: tags 1008426 + patch
> Control: tags 1008426 + pending
>
>
> Dear maintainer,
>
> I've prepared an NMU for h2o (versioned as 2.2.5+dfsg2-6.2) and
> uploaded it to DELAYED/7. Please feel free to tell me if I
> should delay it longer.
>
> Regards.
>
> diff -Nru h2o-2.2.5+dfsg2/debian/changelog h2o-2.2.5+dfsg2/debian/changelog
> --- h2o-2.2.5+dfsg2/debian/changelog2021-10-17 11:38:52.0 +
> +++ h2o-2.2.5+dfsg2/debian/changelog2022-04-12 14:57:18.0 +
> @@ -1,3 +1,11 @@
> +h2o (2.2.5+dfsg2-6.2) unstable; urgency=medium
> +
> + * Non-maintainer upload.
> + * Remove now unsupported hash parameters to FileUtils methods,
> +fixing FTBFS. (Closes: #1008426)
> +
> + -- Chris Hofstaedtler Tue, 12 Apr 2022 14:57:18 +
> +
> h2o (2.2.5+dfsg2-6.1) unstable; urgency=medium
>
>* Non-maintainer upload.
> diff -Nru h2o-2.2.5+dfsg2/debian/patches/mruby_fileutils_no_verbose
> h2o-2.2.5+dfsg2/debian/patches/mruby_fileutils_no_verbose
> --- h2o-2.2.5+dfsg2/debian/patches/mruby_fileutils_no_verbose 1970-01-01
> 00:00:00.0 +
> +++ h2o-2.2.5+dfsg2/debian/patches/mruby_fileutils_no_verbose 2022-04-12
> 14:56:46.0 +
> @@ -0,0 +1,70 @@
> +Remove hash with verbose from calls to FileUtils. This apparently
> +has stopped being supported in ruby.
> +
> +Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008426
> +
> +Index: h2o-2.2.5+dfsg2/deps/mruby/Rakefile
> +===
> +--- h2o-2.2.5+dfsg2.orig/deps/mruby/Rakefile
> h2o-2.2.5+dfsg2/deps/mruby/Rakefile
> +@@ -37,15 +37,15 @@ load "#{MRUBY_ROOT}/tasks/gitlab.rake"
> + task :default => :all
> +
> + bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
> +-FileUtils.mkdir_p bin_path, { :verbose => $verbose }
> ++FileUtils.mkdir_p bin_path
> +
> + depfiles = MRuby.targets['host'].bins.map do |bin|
> + install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
> + source_path =
> MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
> +
> + file install_path => source_path do |t|
> +-FileUtils.rm_f t.name, { :verbose => $verbose }
> +-FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
> ++FileUtils.rm_f t.name
> ++FileUtils.cp t.prerequisites.first, t.name
> + end
> +
> + install_path
> +@@ -78,8 +78,8 @@ MRuby.each_target do |target|
> + install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
> +
> + file install_path => exec do |t|
> +- FileUtils.rm_f t.name, { :verbose => $verbose }
> +- FileUtils.cp t.prerequisites.first, t.name, { :verbose =>
> $verbose }
> ++ FileUtils.rm_f t.name
> ++ FileUtils.cp t.prerequisites.first, t.name
> + end
> + depfiles += [ install_path ]
> + elsif target == MRuby.targets['host-debug']
> +@@ -87,8 +87,8 @@ MRuby.each_target do |target|
> + install_path =
> MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}")
> +
> + file install_path => exec do |t|
> +-FileUtils.rm_f t.name, { :verbose => $verbose }
> +-FileUtils.cp t.prerequisites.first, t.name, { :verbose =>
> $verbose }
> ++FileUtils.rm_f t.name
> ++FileUtils.cp t.prerequisites.first, t.name
> + end
> + depfiles += [ install_path ]
> + end
> +@@ -127,16 +127,16 @@ end
> + desc "clean all built and in-repo installed artifacts"
> + task :clean do
> + MRuby.each_target do |t|
> +-FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
> ++FileUtils.rm_rf t.build_dir
> + end
> +- FileUtils.rm_f depfiles, { :verbose => $verbose }
> ++ FileUtils.rm_f depfiles
> + puts "Cleaned up target build folder"
> + end
> +
> + desc "clean everything!"
> + task :deep_clean => ["clean"] do
> + MRuby.each_target do |t|
> +-FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose }
> ++FileUtils.rm_rf t.gem_clone_dir
> + end
> + puts "Cleaned up mrbgems build folder"
> + end
> 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 2020-05-03 20:12:52.0
> +
> +++ h2o-2.2.5+dfsg2/debian/patches/series 2022-04-12 14:54:56.0
> +
> @@ -4,3 +4,4 @@
> tests-force-TLSv1.2-on-s_client-invocations.patch
> link-libh2o-with-wslay.patch
> fix_CVE-2019_1.patch
> +mruby_fileutils_no_verbose
>
Bug#1008426: h2o: diff for NMU version 2.2.5+dfsg2-6.2
Control: tags 1008426 + patch
Control: tags 1008426 + pending
Dear maintainer,
I've prepared an NMU for h2o (versioned as 2.2.5+dfsg2-6.2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru h2o-2.2.5+dfsg2/debian/changelog h2o-2.2.5+dfsg2/debian/changelog
--- h2o-2.2.5+dfsg2/debian/changelog2021-10-17 11:38:52.0 +
+++ h2o-2.2.5+dfsg2/debian/changelog2022-04-12 14:57:18.0 +
@@ -1,3 +1,11 @@
+h2o (2.2.5+dfsg2-6.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove now unsupported hash parameters to FileUtils methods,
+fixing FTBFS. (Closes: #1008426)
+
+ -- Chris Hofstaedtler Tue, 12 Apr 2022 14:57:18 +
+
h2o (2.2.5+dfsg2-6.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru h2o-2.2.5+dfsg2/debian/patches/mruby_fileutils_no_verbose
h2o-2.2.5+dfsg2/debian/patches/mruby_fileutils_no_verbose
--- h2o-2.2.5+dfsg2/debian/patches/mruby_fileutils_no_verbose 1970-01-01
00:00:00.0 +
+++ h2o-2.2.5+dfsg2/debian/patches/mruby_fileutils_no_verbose 2022-04-12
14:56:46.0 +
@@ -0,0 +1,70 @@
+Remove hash with verbose from calls to FileUtils. This apparently
+has stopped being supported in ruby.
+
+Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008426
+
+Index: h2o-2.2.5+dfsg2/deps/mruby/Rakefile
+===
+--- h2o-2.2.5+dfsg2.orig/deps/mruby/Rakefile
h2o-2.2.5+dfsg2/deps/mruby/Rakefile
+@@ -37,15 +37,15 @@ load "#{MRUBY_ROOT}/tasks/gitlab.rake"
+ task :default => :all
+
+ bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
+-FileUtils.mkdir_p bin_path, { :verbose => $verbose }
++FileUtils.mkdir_p bin_path
+
+ depfiles = MRuby.targets['host'].bins.map do |bin|
+ install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
+ source_path =
MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
+
+ file install_path => source_path do |t|
+-FileUtils.rm_f t.name, { :verbose => $verbose }
+-FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++FileUtils.rm_f t.name
++FileUtils.cp t.prerequisites.first, t.name
+ end
+
+ install_path
+@@ -78,8 +78,8 @@ MRuby.each_target do |target|
+ install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
+
+ file install_path => exec do |t|
+- FileUtils.rm_f t.name, { :verbose => $verbose }
+- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++ FileUtils.rm_f t.name
++ FileUtils.cp t.prerequisites.first, t.name
+ end
+ depfiles += [ install_path ]
+ elsif target == MRuby.targets['host-debug']
+@@ -87,8 +87,8 @@ MRuby.each_target do |target|
+ install_path =
MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}")
+
+ file install_path => exec do |t|
+-FileUtils.rm_f t.name, { :verbose => $verbose }
+-FileUtils.cp t.prerequisites.first, t.name, { :verbose =>
$verbose }
++FileUtils.rm_f t.name
++FileUtils.cp t.prerequisites.first, t.name
+ end
+ depfiles += [ install_path ]
+ end
+@@ -127,16 +127,16 @@ end
+ desc "clean all built and in-repo installed artifacts"
+ task :clean do
+ MRuby.each_target do |t|
+-FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
++FileUtils.rm_rf t.build_dir
+ end
+- FileUtils.rm_f depfiles, { :verbose => $verbose }
++ FileUtils.rm_f depfiles
+ puts "Cleaned up target build folder"
+ end
+
+ desc "clean everything!"
+ task :deep_clean => ["clean"] do
+ MRuby.each_target do |t|
+-FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose }
++FileUtils.rm_rf t.gem_clone_dir
+ end
+ puts "Cleaned up mrbgems build folder"
+ end
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 2020-05-03 20:12:52.0
+
+++ h2o-2.2.5+dfsg2/debian/patches/series 2022-04-12 14:54:56.0
+
@@ -4,3 +4,4 @@
tests-force-TLSv1.2-on-s_client-invocations.patch
link-libh2o-with-wslay.patch
fix_CVE-2019_1.patch
+mruby_fileutils_no_verbose
