[Pkg-citadel-devel] Bug#828267: citadel: FTBFS with openssl 1.1.0

[Christoph Biedl]

tags 828267 patch
thanks

Well, let's put an end to this. The old libssl is back, so the patch
attached uses it and also partially reverts the change in 902-1, build
passes again now.

This is of course band-aid but sufficient for the stretch release, and
there's a good chance upstream will follow the OpenSSL switch during
the buster development cycle.

Cheers,
    Christoph

-------------- next part --------------
diff -u citadel-902/debian/changelog citadel-902/debian/changelog
--- citadel-902/debian/changelog
+++ citadel-902/debian/changelog
@@ -1,3 +1,10 @@
+citadel (902-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use SSL compability library. Closes: #828267, #846543
+
+ -- Christoph Biedl <debian.axhn at manchmal.in-ulm.de>  Tue, 13 Dec 2016 23:05:13 +0100
+
 citadel (902-2) unstable; urgency=medium
 
   * Use SSL compatibility API. (Closes: #828267)
diff -u citadel-902/debian/control citadel-902/debian/control
--- citadel-902/debian/control
+++ citadel-902/debian/control
@@ -5,7 +5,7 @@
 Uploaders: Wilfried Goesgens <w.goesgens at outgesourced.org>, Michael Meskes <meskes at debian.org>, Alexander Wirt <formorer at debian.org>
 Build-Depends: debhelper (>= 9), po-debconf, quilt, bison, autotools-dev, 
  libdb-dev, libexpat1-dev, libical-dev (>= 2.0.0), libldap2-dev, libncurses5-dev,
- libpam0g-dev, libsieve2-dev, libssl-dev, libcitadel-dev (>= 902),
+ libpam0g-dev, libsieve2-dev, libssl1.0-dev, libcitadel-dev (>= 902),
  libcurl4-openssl-dev (>> 7.25), zlib1g-dev, libev-dev (>= 4.0), libc-ares-dev (>= 1.7.2)
 Standards-Version: 3.9.8
 Vcs-Git: git://anonscm.debian.org/pkg-citadel/citadel.git
diff -u citadel-902/debian/rules citadel-902/debian/rules
--- citadel-902/debian/rules
+++ citadel-902/debian/rules
@@ -16,7 +16,6 @@
 
 LDFLAGS_DEF = `dpkg-buildflags --get LDFLAGS`
 CPPFLAGS_DEF = `dpkg-buildflags --get CPPFLAGS`
-CPPFLAGS += -DOPENSSL_API_COMPAT=0x10100000L
 
 EXTRA_ARGS=
 PROFILE_ARGS=
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-citadel-devel/attachments/20161213/72d906b2/attachment.sig>