Control: tags 844393 + patch
Control: tags 844393 + pending
Dear maintainer,
I've prepared an NMU for blhc (versioned as 0.07-0.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards,
Eriberto
diff -Nru blhc-0.07/debian/changelog blhc-0.07/debian/changelog
--- blhc-0.07/debian/changelog 2016-09-10 21:40:10.000000000 -0300
+++ blhc-0.07/debian/changelog 2016-11-20 19:09:48.000000000 -0200
@@ -1,3 +1,12 @@
+blhc (0.07-0.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/10_support-dpkg-debarch-to-debtuple.patch: created to add
+ support new dpkg versions which use debarch_to_debtuple. Thanks to Simon
+ Ruderich <si...@ruderich.org>. (Closes: #844393)
+
+ -- Joao Eriberto Mota Filho <eribe...@debian.org> Sun, 20 Nov 2016 19:09:48
-0200
+
blhc (0.07-0.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru blhc-0.07/debian/patches/10_support-dpkg-debarch-to-debtuple.patch
blhc-0.07/debian/patches/10_support-dpkg-debarch-to-debtuple.patch
--- blhc-0.07/debian/patches/10_support-dpkg-debarch-to-debtuple.patch
1969-12-31 21:00:00.000000000 -0300
+++ blhc-0.07/debian/patches/10_support-dpkg-debarch-to-debtuple.patch
2016-11-20 19:09:48.000000000 -0200
@@ -0,0 +1,32 @@
+Description: add support new dpkg versions which use debarch_to_debtuple.
+ (Closes: #844393)
+Author: Simon Ruderich <si...@ruderich.org>
+Last-Update: 2016-11-16
+Index: blhc-0.07/bin/blhc
+===================================================================
+--- blhc-0.07.orig/bin/blhc
++++ blhc-0.07/bin/blhc
+@@ -1022,14 +1022,21 @@ foreach my $file (@ARGV) {
+
+ # Option or auto detected.
+ if ($arch) {
+- # The following was partially copied from dpkg-dev 1.18.10
++ # The following was partially copied from dpkg-dev 1.18.15
+ # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, _add_hardening_flags()),
+ # copyright Raphaël Hertzog <hert...@debian.org>, Kees Cook
+ # <k...@debian.org>, Canonical, Ltd. licensed under GPL version 2 or
+ # later. Keep it in sync.
+
+ require Dpkg::Arch;
+- my ($abi, $os, $cpu) = Dpkg::Arch::debarch_to_debtriplet($arch);
++ my ($os, $cpu);
++ # Recent dpkg versions use a quadruplet for arch. Support both.
++ eval {
++ (undef, undef, $os, $cpu) =
Dpkg::Arch::debarch_to_debtuple($arch);
++ };
++ if ($@) {
++ (undef, $os, $cpu) = Dpkg::Arch::debarch_to_debtriplet($arch);
++ }
+
+ # Disable unsupported hardening options.
+ if ($os !~ /^(?:linux|kfreebsd|knetbsd|hurd)$/
diff -Nru blhc-0.07/debian/patches/series blhc-0.07/debian/patches/series
--- blhc-0.07/debian/patches/series 1969-12-31 21:00:00.000000000 -0300
+++ blhc-0.07/debian/patches/series 2016-11-20 19:09:48.000000000 -0200
@@ -0,0 +1 @@
+10_support-dpkg-debarch-to-debtuple.patch
