[Pkg-openldap-devel] Backporting slapd out of jessie to wheezy possible?

Tue Nov 25 05:55:49 UTC 2014

On Sat, Nov 15, 2014 at 12:18:29PM -0800, Ryan Tandy wrote:
>On Sat, Nov 15, 2014 at 08:07:48PM +0100, Luca Bruno wrote:
>>* play dirty tricks with version numbering
>>  Cons: not future-proof, we will end up we silly numbers like
>>        "2.4.31+really2.4.40"
>>
>>(The "+really" is normally used to recover from versioning screw-ups.)
>
>I also thought of this, after sending my previous message. The version 
>number does look silly, but it's also a minimally invasive way of 
>getting the result we want, if bpo-ftpmasters accept it.
>
>I tested this quickly, using the version 
>'2.4.31+really2.4.40-2~wheezy1'. The check for << 2.4.39-1 does cause 
>a spurious db reload on upgrade from wheezy to wheezy-bpo; but more 
>importantly, the upgrade from wheezy-bpo to jessie does work properly.

So far I think I still like this idea better than the alternatives.

The version check was bumped in the same commit as the db5.1→5.3 change; 
reverting that as well lets us skip the unnecessary reload on upgrade 
from wheezy to wheezy-backports.

How would you feel about the backport using gnutls28? It's already 
available in wheezy-backports with its dependencies. The benefit is that 
it resolves #368297 and its various relatives; but the downside is that 
installing libgnutls28 from wheezy-backports also pulls in newer nettle, 
hogweed, and p11-kit libraries.

(Note, nettle is still required either way, unless we revert smbk5pwd to 
2.4.39, but wheezy's version seems to be sufficient.)

Two possible debdiffs attached, using gnutls26 and gnutls28 
respectively. Thoughts? Can you elaborate on "Cons: not future-proof" in 
your earlier message?

thanks,
Ryan
-------------- next part --------------
diff -Nru openldap-2.4.40/debian/changelog openldap-2.4.31+really2.4.40/debian/changelog

--- openldap-2.4.40/debian/changelog	2014-11-24 21:09:28.000000000 -0800
+++ openldap-2.4.31+really2.4.40/debian/changelog	2014-11-24 21:09:29.000000000 -0800
@@ -1,3 +1,16 @@
+openldap (2.4.31+really2.4.40-3~bpo70+1~gnutls26) wheezy-backports; urgency=medium
+
+  * Backport to wheezy.
+    - Use a +really version lower than 2.4.39-1 to ensure a database upgrade 
+      is still performed when upgrading to jessie later.
+    - Build against db5.1 instead of db5.3, and revert the database upgrade 
+      version check as well (reloading isn't necessary when upgrading from 
+      wheezy to wheezy-backports). This reverts commit a6fb397d.
+    - Build against libgnutls-dev instead of libgnutls28-dev. Require at least 
+      2.12.0, following upstream's requirement.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Mon, 24 Nov 2014 20:45:51 -0800
+
 openldap (2.4.40-3) unstable; urgency=medium
 
   * Remove trailing spaces from slapd.templates.
diff -Nru openldap-2.4.40/debian/control openldap-2.4.31+really2.4.40/debian/control
--- openldap-2.4.40/debian/control	2014-11-24 21:09:28.000000000 -0800
+++ openldap-2.4.31+really2.4.40/debian/control	2014-11-24 21:09:29.000000000 -0800
@@ -10,8 +10,8 @@
  Ryan Tandy <ryan at nardis.ca>
 Build-Depends: debhelper (>= 8.9.0~),
 	dpkg-dev (>= 1.16.1),
-	libdb5.3-dev, nettle-dev,
- libgnutls28-dev, unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
+	libdb5.1-dev, nettle-dev,
+ libgnutls-dev (>= 2.12.0), unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
  libwrap0-dev, perl, po-debconf, quilt (>= 0.46-7),
  groff-base, time, heimdal-multidev,
diff -Nru openldap-2.4.40/debian/slapd.scripts-common openldap-2.4.31+really2.4.40/debian/slapd.scripts-common
--- openldap-2.4.40/debian/slapd.scripts-common	2014-11-24 21:09:28.000000000 -0800
+++ openldap-2.4.31+really2.4.40/debian/slapd.scripts-common	2014-11-24 21:09:29.000000000 -0800
@@ -46,7 +46,7 @@
 # Return success if yes.
 # Usage: if database_format_changed; then
 
-	if dpkg --compare-versions "$OLD_VERSION" lt-nl 2.4.39-1; then
+	if dpkg --compare-versions "$OLD_VERSION" lt-nl 2.4.25-2; then
 		return 0
 	else
 		return 1
-------------- next part --------------
diff -Nru openldap-2.4.40/debian/changelog openldap-2.4.31+really2.4.40/debian/changelog
--- openldap-2.4.40/debian/changelog	2014-11-24 21:09:35.000000000 -0800
+++ openldap-2.4.31+really2.4.40/debian/changelog	2014-11-24 21:09:35.000000000 -0800
@@ -1,3 +1,14 @@
+openldap (2.4.31+really2.4.40-3~bpo70+1~gnutls28) wheezy-backports; urgency=medium
+
+  * Backport to wheezy.
+    - Use a +really version lower than 2.4.39-1 to ensure a database upgrade 
+      is still performed when upgrading to jessie later.
+    - Build against db5.1 instead of db5.3, and revert the database upgrade 
+      version check as well (reloading isn't necessary when upgrading from 
+      wheezy to wheezy-backports). This reverts commit a6fb397d.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Mon, 24 Nov 2014 20:45:51 -0800
+
 openldap (2.4.40-3) unstable; urgency=medium
 
   * Remove trailing spaces from slapd.templates.
diff -Nru openldap-2.4.40/debian/control openldap-2.4.31+really2.4.40/debian/control
--- openldap-2.4.40/debian/control	2014-11-24 21:09:35.000000000 -0800
+++ openldap-2.4.31+really2.4.40/debian/control	2014-11-24 21:09:35.000000000 -0800
@@ -10,7 +10,7 @@
  Ryan Tandy <ryan at nardis.ca>
 Build-Depends: debhelper (>= 8.9.0~),
 	dpkg-dev (>= 1.16.1),
-	libdb5.3-dev, nettle-dev,
+	libdb5.1-dev, nettle-dev,
  libgnutls28-dev, unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
  libwrap0-dev, perl, po-debconf, quilt (>= 0.46-7),
diff -Nru openldap-2.4.40/debian/slapd.scripts-common openldap-2.4.31+really2.4.40/debian/slapd.scripts-common
--- openldap-2.4.40/debian/slapd.scripts-common	2014-11-24 21:09:35.000000000 -0800
+++ openldap-2.4.31+really2.4.40/debian/slapd.scripts-common	2014-11-24 21:09:35.000000000 -0800
@@ -46,7 +46,7 @@
 # Return success if yes.
 # Usage: if database_format_changed; then
 
-	if dpkg --compare-versions "$OLD_VERSION" lt-nl 2.4.39-1; then
+	if dpkg --compare-versions "$OLD_VERSION" lt-nl 2.4.25-2; then
 		return 0
 	else
 		return 1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-openldap-devel/attachments/20141124/76be612a/attachment.sig>
