Bug#1035345: unblock: libbssolv-perl/0.17-4

[Andrej Shadura]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
X-Debbugs-Cc: libbssolv-perl at packages.debian.org
Control: affects -1 + src:libbssolv-perl

Please unblock package libbssolv-perl

Library libbssolv is used by e.g. OBS to resolve dependencies
of packages to be built. When processing Debian packages,
the current version doesn’t accept "0" as a valid epoch, resulting
it packages like woff-tools that have a zero epoch (0:2009.10.04-2)
to be skipped and be forever unresolvable.

Since the only rdep of libbssolv-perl in Debian is OBS, impact on the
rest of Debian is near-zero. The risk of not shipping this change is also
low, but it would help users avoid patching this package.

In the debdiff, I’m also including low-impact changes to the metadata
that were sitting in Git for the last two years.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock libbssolv-perl/0.17-4
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 9cb7ecf70812..b138325c88db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libbssolv-perl (0.17-4) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Bump debhelper from old 12 to 13.
+  * Update standards version to 4.6.0, no changes needed.
+
+  [ Andrej Shadura ]
+  * Add a patch proposed upstream to accept "0" as a valid epoch.
+    See https://github.com/openSUSE/perl-BSSolv/pull/17
+
+ -- Andrej Shadura <andrewsh at debian.org>  Mon, 01 May 2023 16:14:28 +0200
+
 libbssolv-perl (0.17-3) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index 02b5c716f1f6..7adabd60217f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Uploaders: Mike Gabriel <sunweaver at debian.org>
 Section: perl
 Testsuite: autopkgtest-pkg-perl
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                libsolv-dev (>= 0.7),
                perl-xs-dev,
                perl:native
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libbssolv-perl
 Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libbssolv-perl.git
 Homepage: https://github.com/openSUSE/perl-BSSolv
diff --git a/debian/patches/1001-accept-0-as-epoch.patch b/debian/patches/1001-accept-0-as-epoch.patch
new file mode 100644
index 000000000000..e29b40182832
--- /dev/null
+++ b/debian/patches/1001-accept-0-as-epoch.patch
@@ -0,0 +1,25 @@
+From: Sjoerd Simons <sjoerd at collabora.com>
+Date: Mon, 1 May 2023 15:35:09 +0200
+Subject: Accept "0" as an epoch
+
+In Debian an zero epoch is actually valid; e.g. woff-tools actually has
+a zero epoch (0:2009.10.04-2).
+
+Signed-off-by: Sjoerd Simons <sjoerd at collabora.com>
+---
+ BSSolv.xs | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/BSSolv.xs b/BSSolv.xs
+index ced6823..31c7a7a 100644
+--- a/BSSolv.xs
++++ b/BSSolv.xs
+@@ -207,8 +207,6 @@ makeevr(Pool *pool, char *e, char *v, char *r)
+ 
+   if (!v)
+     return 0;
+-  if (e && !strcmp(e, "0"))
+-    e = 0;
+   if (e)
+     s = pool_tmpjoin(pool, e, ":", v);
+   else
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000000..65e3b6438662
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1001-accept-0-as-epoch.patch
-------------- next part --------------
>From f974c721737f71cde617aab37ba92eb785ac7d14 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd at collabora.com>
Date: Mon, 1 May 2023 15:35:09 +0200
Subject: [PATCH] Accept "0" as an epoch

In Debian an zero epoch is actually valid; e.g. woff-tools actually has
a zero epoch (0:2009.10.04-2).

Signed-off-by: Sjoerd Simons <sjoerd at collabora.com>
---
 BSSolv.xs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/BSSolv.xs b/BSSolv.xs
index ced6823..31c7a7a 100644
--- a/BSSolv.xs
+++ b/BSSolv.xs
@@ -207,8 +207,6 @@ makeevr(Pool *pool, char *e, char *v, char *r)
 
   if (!v)
     return 0;
-  if (e && !strcmp(e, "0"))
-    e = 0;
   if (e)
     s = pool_tmpjoin(pool, e, ":", v);
   else