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.000000000 +0200 +++ /tmp/kannel-1.4.5/debian/changelog 2018-09-12 13:19:02.000000000 +0200 @@ -1,3 +1,31 @@ +kannel (1.4.5-0.1~bpo10+1sipwise1) buster-backports; urgency=medium + + [ Michael Prokop <[email protected]> ] + * 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 <[email protected]> ] + * 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 <[email protected]> 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.000000000 +0200 +++ /tmp/kannel-1.4.5/debian/control 2018-09-12 13:19:02.000000000 +0200 @@ -1,14 +1,14 @@ Source: kannel Section: net Priority: optional -Maintainer: Debian Kannel maintainers <[email protected]> -Uploaders: Jonas Smedegaard <[email protected]> +Maintainer: Jonas Smedegaard <[email protected]> +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.000000000 +0100 +++ /tmp/kannel-1.4.5/debian/kannel.docs 2018-09-12 12:28:44.000000000 +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.000000000 +0100 +++ /tmp/kannel-1.4.5/debian/patches/00_build_system_fixes.patch 2018-09-12 12:42:17.000000000 +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 SUBDIRS, breaking the build. +Author: Guillem Jover <[email protected]> +Last-Update: 2018-09-12 +--- +This patch header follows DEP-3: https://dep.debian.net/deps/dep3/ +--- + Makefile.in | 40 ++++++++++++++++++++++++++-------------- + 1 file changed, 26 insertions(+), 14 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -227,7 +227,10 @@ figs = $(figsrcs:.fig=.png) $(figsrcs:. + .c.i: + $(CC) $(CFLAGS) -o $@ -E $< + +-all: $(libs) $(SUBDIRS) progs $(testprogs) $(checkprogs) $(DOCSTARGET) gw-config ++all: $(libs) progs $(testprogs) $(checkprogs) $(DOCSTARGET) gw-config ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir $@; \ ++ done + progs: $(progs) + tests: $(testprogs) + docs: figs ps $(docs) +@@ -236,15 +239,21 @@ figs: $(figs) + ps: $(ps) + pp: $(pres) + +-check: all $(SUBDIRS) ++check: all ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir $@; \ ++ done + utils/run-checks $(checks) + +-bench: all $(benchformats) $(SUBDIRS) ++bench: all $(benchformats) + benchmarks/report.xml: dummy + benchmarks/run-benchmarks benchmarks/*.sh + dummy: + +-install: all $(SUBDIRS) ++install: all ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir $@; \ ++ done + $(INSTALL) -d $(DESTDIR)$(bindir) + for prog in $(binprogs); do \ + $(INSTALL) $$prog \ +@@ -277,7 +286,7 @@ install: all $(SUBDIRS) + $(INSTALL) -d $(DESTDIR)$(libdir)/kannel + $(INSTALL_DATA) lib*.a $(DESTDIR)$(libdir)/kannel + +-install-test: all $(SUBDIRS) ++install-test: all + $(INSTALL) -d $(DESTDIR)$(libdir)/kannel + $(INSTALL) -d $(DESTDIR)$(libdir)/kannel/test + (cd test && find . -type f ! -name "*.c" ! -name "*.o" | grep -v ".cvsignore" | grep -v "/CVS/" | while read a ; do $(INSTALL_DATA) $$a $(DESTDIR)$(libdir)/kannel/test ; done) +@@ -285,20 +294,20 @@ install-test: all $(SUBDIRS) + chmod 755 $(DESTDIR)$(libdir)/kannel/$$prog ; \ + done + +-install-checks: all $(SUBDIRS) ++install-checks: all + $(INSTALL) -d $(DESTDIR)$(libdir)/kannel/checks + (cd checks && find . -type f ! -name "*.c" ! -name "*.o" | grep -v ".cvsignore" | grep -v "/CVS/" | while read a ; do $(INSTALL_DATA) $$a $(DESTDIR)$(libdir)/kannel/checks ; done) + for prog in $(checks) ; do \ + chmod 755 $(DESTDIR)$(libdir)/kannel/$$prog ; \ + done + +-install-contrib: all $(SUBDIRS) ++install-contrib: all + $(INSTALL) -d $(DESTDIR)$(docdir)/contrib + (cd contrib && find . -type d ! -name "CVS" | while read a ; do $(INSTALL) -d $(DESTDIR)$(docdir)/contrib/$$a ; done ) + (cd contrib && find . -type f ! -name ".cvsignore" | grep -v "/CVS/" | while read a ; do $(INSTALL_DATA) $$a $(DESTDIR)$(docdir)/contrib/$$a ; done ) + find $(DESTDIR)$(docdir)/contrib/ -name "*.pl" -o -name "*.sh" -o -name "*.cgi" -o -name "sendsms" -o -name "kannel.monitor" | while read a ; do chmod 755 "$$a" ; done + +-install-docs: $(SUBDIRS) ++install-docs: + $(INSTALL) -d $(DESTDIR)$(docdir)/examples + $(INSTALL_DATA) doc/examples/*.conf $(DESTDIR)$(docdir)/examples + for docfile in userguide alligata wtls ; do \ +@@ -310,13 +319,19 @@ install-docs: $(SUBDIRS) + $(INSTALL_DATA) doc/$$docfile/*.png $(DESTDIR)$(docdir)/$$docfile ; \ + done + +-clean: $(SUBDIRS) ++clean: ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir $@; \ ++ done + find . -name "*.o" -o -name "*.i" -o -name "*.a" | xargs rm -f + rm -f core gw-config $(progs) $(testprogs) $(checkprogs) + rm -f $(figs) $(ps) $(docs) + rm -f $(benchoutputs) + +-distclean: clean $(SUBDIRS) ++distclean: clean ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir $@; \ ++ done + rm -f Makefile gw-config.h config.cache config.log config.status config.nice .depend gwlib/gw_uuid_types.h + + nag: +@@ -376,10 +391,7 @@ gw-config: utils/foobar-config.sh Makefi + "@VERSION@" > gw-config + chmod 0755 gw-config + +-$(SUBDIRS): +- $(MAKE) -C $@ $(MAKECMDGOALS) +- + am--refresh: + @: + +-.PHONY: $(SUBDIRS) am--refresh ++.PHONY: am--refresh diff -Naur debian/patches/37_define_DEFAULT_SOURCE.patch /tmp/kannel-1.4.5/debian/patches/37_define_DEFAULT_SOURCE.patch --- debian/patches/37_define_DEFAULT_SOURCE.patch 2017-08-29 10:08:01.000000000 +0200 +++ /tmp/kannel-1.4.5/debian/patches/37_define_DEFAULT_SOURCE.patch 2018-09-12 11:30:19.000000000 +0200 @@ -1,4 +1,4 @@ -Description: Define _DEFAULT_SOURCE (not _VSD_SOURCE or _SVID_SOURCE) +Description: Define _DEFAULT_SOURCE (not _BSD_SOURCE or _SVID_SOURCE) Author: Jonas Smedegaard <[email protected]> Last-Update: 2016-05-29 --- @@ -21,17 +21,6 @@ ;; *-linux-*) - CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE" -+ CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE" - LDFLAGS="$LDFLAGS -rdynamic" - ;; - *-*-openbsd* | *-*-freebsd*) ---- a/configure.in -+++ b/configure.in -@@ -156,7 +156,7 @@ - LIBTOOL="libtool -static -o" - ;; - *-linux-*) -- CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE" + CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE" LDFLAGS="$LDFLAGS -rdynamic" ;; diff -Naur debian/patches/38_cleanup_soap_makefile.patch /tmp/kannel-1.4.5/debian/patches/38_cleanup_soap_makefile.patch --- debian/patches/38_cleanup_soap_makefile.patch 2017-08-29 10:08:04.000000000 +0200 +++ /tmp/kannel-1.4.5/debian/patches/38_cleanup_soap_makefile.patch 2018-09-12 12:25:41.000000000 +0200 @@ -3,12 +3,16 @@ Last-Update: 2016-05-29 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/Makefile.in +++ b/Makefile.in -@@ -323,7 +323,7 @@ - rm -f $(benchoutputs) - - distclean: clean +@@ -332,7 +332,7 @@ distclean: clean + for dir in $(SUBDIRS); do \ + $(MAKE) -C $$dir $@; \ + done - rm -f Makefile gw-config.h config.cache config.log config.status config.nice .depend gwlib/gw_uuid_types.h + rm -f Makefile soap/Makefile gw-config.h config.cache config.log config.status config.nice .depend gwlib/gw_uuid_types.h diff -Naur debian/patches/39_use_changelog_date_in_doc.patch /tmp/kannel-1.4.5/debian/patches/39_use_changelog_date_in_doc.patch --- debian/patches/39_use_changelog_date_in_doc.patch 2017-08-29 10:08:07.000000000 +0200 +++ /tmp/kannel-1.4.5/debian/patches/39_use_changelog_date_in_doc.patch 2018-09-12 12:03:52.000000000 +0200 @@ -5,9 +5,16 @@ Last-Update: 2016-12-03 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + Makefile.in | 9 +++++---- + addons/opensmppbox/Makefile.am | 9 +++++---- + addons/sqlbox/Makefile.am | 9 +++++---- + configure.in | 5 +++++ + 4 files changed, 20 insertions(+), 12 deletions(-) + --- a/Makefile.in +++ b/Makefile.in -@@ -60,6 +60,7 @@ +@@ -60,6 +60,7 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHELL = @SHELL@ VERSION = @VERSION@ @@ -15,7 +22,7 @@ SUFFIX = @SUFFIX@ LEX = @LEX@ PERL = @PERL@ -@@ -179,17 +180,17 @@ +@@ -173,17 +174,17 @@ figs = $(figsrcs:.fig=.png) $(figsrcs:. .SUFFIXES: $(SUFFIXES) .xml .html .rtf .ps .fig .png .y .c .i .o .pdf .xml.html: @@ -36,7 +43,7 @@ $(JADE) -o $*.tex -t tex -d $(TEX_DSL) $(XML_DCL) $*.tmp rm -f $*.tmp cd `dirname $<` && $(JADETEX) `basename $*`.tex >/dev/null || true -@@ -201,7 +202,7 @@ +@@ -195,7 +196,7 @@ figs = $(figsrcs:.fig=.png) $(figsrcs:. rm -f $*.dvi $*.tex $*.aux .xml.pdf: @@ -47,7 +54,7 @@ cd `dirname $<` && $(JADETEX) `basename $*`.tex >/dev/null || true --- a/addons/opensmppbox/Makefile.am +++ b/addons/opensmppbox/Makefile.am -@@ -6,6 +6,7 @@ +@@ -6,6 +6,7 @@ rpmtemp = /tmp/opensmppbox-rpm DOCSTARGET=@DOCSTARGET@ DOCDRAFTS=@DOCDRAFTS@ RPMPKG=opensmppbox-@PACKAGE_VERSION@ @@ -55,7 +62,7 @@ pssrcs = $(wildcard doc/*.png) ps = $(pssrcs:.png=.ps) -@@ -14,17 +15,17 @@ +@@ -14,17 +15,17 @@ figsrcs = $(wildcard doc/*.fig) figs = $(figsrcs:.fig=.png) $(figsrcs:.fig=.ps) .xml.html: @@ -76,7 +83,7 @@ $(JADE) -o $*.tex -t tex -d $(TEX_DSL) $(XML_DCL) $*.tmp rm -f $*.tmp cd `dirname $<` && $(JADETEX) `basename $*`.tex >/dev/null || true -@@ -36,7 +37,7 @@ +@@ -36,7 +37,7 @@ figs = $(figsrcs:.fig=.png) $(figsrcs:. rm -f $*.dvi $*.tex $*.aux .xml.pdf: @@ -87,7 +94,7 @@ cd `dirname $<` && $(JADETEX) `basename $*`.tex >/dev/null || true --- a/addons/sqlbox/Makefile.am +++ b/addons/sqlbox/Makefile.am -@@ -6,6 +6,7 @@ +@@ -6,6 +6,7 @@ rpmtemp = /tmp/sqlbox-rpm DOCSTARGET=@DOCSTARGET@ DOCDRAFTS=@DOCDRAFTS@ RPMPKG=sqlbox-@PACKAGE_VERSION@ @@ -95,7 +102,7 @@ pssrcs = $(wildcard doc/*.png) ps = $(pssrcs:.png=.ps) -@@ -14,17 +15,17 @@ +@@ -14,17 +15,17 @@ figsrcs = $(wildcard doc/*.fig) figs = $(figsrcs:.fig=.png) $(figsrcs:.fig=.ps) .xml.html: @@ -116,7 +123,7 @@ $(JADE) -o $*.tex -t tex -d $(TEX_DSL) $(XML_DCL) $*.tmp rm -f $*.tmp cd `dirname $<` && $(JADETEX) `basename $*`.tex >/dev/null || true -@@ -36,7 +37,7 @@ +@@ -36,7 +37,7 @@ figs = $(figsrcs:.fig=.png) $(figsrcs:. rm -f $*.dvi $*.tex $*.aux .xml.pdf: @@ -127,7 +134,7 @@ cd `dirname $<` && $(JADETEX) `basename $*`.tex >/dev/null || true --- a/configure.in +++ b/configure.in -@@ -71,6 +71,11 @@ +@@ -71,6 +71,11 @@ AC_CONFIG_AUX_DIR(.) AC_SET_TERMINAL_SEQUENCES() AC_CONFIG_NICE(config.nice) diff -Naur debian/patches/40_strip_date_from_version_report_string.patch /tmp/kannel-1.4.5/debian/patches/40_strip_date_from_version_report_string.patch --- debian/patches/40_strip_date_from_version_report_string.patch 2017-08-29 10:08:12.000000000 +0200 +++ /tmp/kannel-1.4.5/debian/patches/40_strip_date_from_version_report_string.patch 2018-09-11 19:51:40.000000000 +0200 @@ -7,7 +7,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/gwlib/utils.c +++ b/gwlib/utils.c -@@ -553,7 +553,7 @@ +@@ -551,7 +551,7 @@ struct utsname u; uname(&u); @@ -16,7 +16,7 @@ "System %s, release %s, version %s, machine %s.\n" "Hostname %s, IP %s.\n" "Libxml version %s.\n" -@@ -589,10 +589,9 @@ +@@ -587,10 +587,9 @@ "Using %s malloc.\n", boxname, GW_VERSION, #ifdef __GNUC__ diff -Naur debian/patches/series /tmp/kannel-1.4.5/debian/patches/series --- debian/patches/series 2016-12-03 20:23:14.000000000 +0100 +++ /tmp/kannel-1.4.5/debian/patches/series 2018-09-12 12:01:00.000000000 +0200 @@ -1,3 +1,4 @@ +00_build_system_fixes.patch 33_docpatch.patch 34_sqlite3_libversion.patch 35_kfreebsd.patch diff -Naur debian/rules /tmp/kannel-1.4.5/debian/rules --- debian/rules 2017-08-29 10:03:32.000000000 +0200 +++ /tmp/kannel-1.4.5/debian/rules 2018-09-12 12:45:49.000000000 +0200 @@ -21,7 +21,7 @@ # (Re)create autotools include /usr/share/cdbs/1/rules/autoreconf.mk export AUTOHEADER = true -DEB_UPSTREAM_CRUFT_MOVE = aclocal.m4 configure +DEB_UPSTREAM_CRUFT_MOVE = aclocal.m4 configure libtool stamp-h1 DEB_CONFIGURE_EXTRA_FLAGS = \ --enable-warnings \ diff -Naur debian/watch /tmp/kannel-1.4.5/debian/watch --- debian/watch 2017-08-29 10:06:57.000000000 +0200 +++ /tmp/kannel-1.4.5/debian/watch 2018-09-12 11:32:24.000000000 +0200 @@ -1,3 +1,3 @@ # run "uscan --report" to check or "gpb import-orig --uscan" to update version=4 -http://www.kannel.org/download.shtml .*/gateway-(\d[\d.]*)\.tar\.\S+ +https://www.kannel.org/download.shtml .*/gateway-(\d[\d.]*)\.tar\.\S+
