Hi!
On Tue, 2018-09-11 at 17:35:07 +0200, Michael Prokop wrote:
> * Jonas Smedegaard [Tue Mar 06, 2018 at 09:26:47PM +0100]:
> > Quoting Frans van Berckel (2018-03-06 20:49:14)
> > > Nice to know, upstream officially changed the sources
>
> > > * added support for openssl version > 1.1
>
> > > https://redmine.kannel.org/projects/kannel/repository/revisions/5201
>
> > Great! thanks for pointing it out!
>
> Any news regarding a new kannel version in Debian?
>
> Currently kannel isn't part of testing and therefore won't make it
> into Debian/buster if the RC bugs aren't fixed in time (being
> #899559, which is trivial but probably needs a decision from the
> maintainer + this one - #858936 - "just" requires an upload of the
> current kannel version?).
>
> Please let me/us know if there's anything specific to help with.
We've prepared the following update for our internal use. Please see
the attached patch. I don't think it might be ready for a direct
upload, but I hope it can be helpful as a good starting point.
I'm not sure the libtool and stamp-h1 changes are correct because
these do not work when rebuilding a second time, but then I'm not a
cdbs user, and this was good enough for us. I didn't use split patches
for each change because I only noticed the salsa git repo when I was
already done.
Thanks,
Guillem
diff -Naur debian/changelog /tmp/kannel-1.4.5/debian/changelog
--- debian/changelog 2017-08-29 10:11:51.0 +0200
+++ /tmp/kannel-1.4.5/debian/changelog 2018-09-12 13:19:02.0 +0200
@@ -1,3 +1,31 @@
+kannel (1.4.5-0.1~bpo10+1sipwise1) buster-backports; urgency=medium
+
+ [ Michael Prokop ]
+ * New upstream release:
++ Add support for OpenSSL 1.1. Closes: #858936
++ Adjust debian/patches/ for new upstream release:
+ - Refresh 37_define_DEFAULT_SOURCE.patch
+ - Refresh 38_cleanup_soap_makefile.patch
+ - Refresh 40_strip_date_from_version_report_string.patch
+
+ [ Guillem Jover ]
+ * New upstream release:
++ Adjust debian/patches/ for new upstream release:
+ - New 00_build_system_fixes.patch
+ - Refresh 39_use_changelog_date_in_doc.patch
+ - Fix typo in 37_define_DEFAULT_SOURCE.patch
+ * Do not install TODO file, it's not shipped upstream anymore.
+ * Switch to use simply libssl-dev in Build-Depends, for OpenSSL 1.1 support.
+ * Use https in debian/control and debian/watch upstream URL.
+ * Mark libtool and stamp-h1 as upstream cruft.
+ * Update Vcs-Git and Vcs-Browser fields for alioth to salsa move.
+ * Set Jonas Smedegaard as Maintainer, to get rid of non-existent mailing
+list address. Closes: #899559
+ * Set R³ to no.
+ * Backport to buster.
+
+ -- Guillem Jover Wed, 12 Sep 2018 13:19:02 +0200
+
kannel (1.4.4-5) unstable; urgency=medium
* Remove Paul Dwerryhouse as uploader. Thanks for your past
diff -Naur debian/control /tmp/kannel-1.4.5/debian/control
--- debian/control 2017-08-29 09:54:29.0 +0200
+++ /tmp/kannel-1.4.5/debian/control 2018-09-12 13:19:02.0 +0200
@@ -1,14 +1,14 @@
Source: kannel
Section: net
Priority: optional
-Maintainer: Debian Kannel maintainers
-Uploaders: Jonas Smedegaard
+Maintainer: Jonas Smedegaard
+Rules-Requires-Root: no
Build-Depends: cdbs,
gnulib,
dh-autoreconf,
debhelper,
libxml2-dev,
- libssl1.0-dev | libssl-dev (<< 1.1~),
+ libssl-dev,
openssl,
default-libmysqlclient-dev | libmysqlclient-dev,
libsqlite0-dev,
@@ -30,9 +30,9 @@
imagemagick,
ghostscript,
docbook-xml
-Vcs-Git: https://anonscm.debian.org/git/pkg-kannel/kannel.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-kannel/kannel.git
-Homepage: http://www.kannel.org/
+Vcs-Git: https://salsa.debian.org/debian/kannel
+Vcs-Browser: https://salsa.debian.org/debian/kannel.git
+Homepage: https://www.kannel.org/
Standards-Version: 4.1.0
Package: kannel
diff -Naur debian/kannel.docs /tmp/kannel-1.4.5/debian/kannel.docs
--- debian/kannel.docs 1970-01-01 01:00:00.0 +0100
+++ /tmp/kannel-1.4.5/debian/kannel.docs 2018-09-12 12:28:44.0 +0200
@@ -0,0 +1,4 @@
+AUTHORS
+README
+NEWS
+VERSION
diff -Naur debian/patches/00_build_system_fixes.patch /tmp/kannel-1.4.5/debian/patches/00_build_system_fixes.patch
--- debian/patches/00_build_system_fixes.patch 1970-01-01 01:00:00.0 +0100
+++ /tmp/kannel-1.4.5/debian/patches/00_build_system_fixes.patch 2018-09-12 12:42:17.0 +0200
@@ -0,0 +1,123 @@
+Description: Fix upstream Makefile to cope with new release changes.
+ The utils/ directory uses automake, so it does not support the custom
+ rules that the root directory autoconf Makefile.in supports. Remove
+ any dependency from these rules to avoid calling them. And switch any
+ remaining dependencies for rules that are supported within utils/ to
+ use an explicit loop over SUBDIRS and recurse into them, otherwise the
+ old SUBDIRS target was passing on all targets specified to make on the
+ command-line, which meant the unsupported targets were leaking into
+ the
