Bug#880393: nmuing cyrus-sasl2
Hi all, I spent a half-day hacking cyrus-sasl2 and I uploaded 2.1.27 to experimental. I would appreciate if more people can test the package (I won’t have time until tomorrow or next week). I didn’t even had a chance to test it myself, so even the basic it installs and nothing breaks horribly would help. Ondrej -- Ondřej Surý > On 21 Jan 2019, at 03:17, Ryan Tandy wrote: > > Hello, > > I extracted Helmut's changes for this issue from the debdiff he posted in an > earlier message, and proposed a merge request on salsa. > > https://salsa.debian.org/debian/cyrus-sasl2/merge_requests/3 > > as a git-format-patch(1) patch: > > https://salsa.debian.org/debian/cyrus-sasl2/merge_requests/3.patch > > I have built it and verified that the Depends line and library dependencies > are corrected, and that it is installable. I have not actually tested the > module's functionality. > > I agree with Helmut that this looks suitable for a stretch update. I would be > willing to drive that process if the maintainers agree but lack time.
Bug#880393: nmuing cyrus-sasl2
Hi Ondřej, On Sun, Jan 20, 2019 at 10:01:04PM +0100, OndÅ?ej Surý wrote: > No harm doing was intended. I simply missed the NMU. > > If you can point me to the direction of the patches you prepared I will try > to care of it before soft freeze. In good NMU practise, I sent the combined patch to the very bug you are replying to. You can find it at: https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=880393;filename=cyrus-sasl2_2.1.27~101-g0780600%2Bdfsg-3.2.debdiff;msg=24 May I suggest subscribing to the cyrus-sasl2 package for not missing important communication? That's very easy to do these days using https://tracker.debian.org/. Once logged in, you have a "subscribe" button in the top right corner. It would be good if you could include those changes before the soft freeze indeed. Thank you for following up. Helmut
Bug#880393: nmuing cyrus-sasl2
Hello, I extracted Helmut's changes for this issue from the debdiff he posted in an earlier message, and proposed a merge request on salsa. https://salsa.debian.org/debian/cyrus-sasl2/merge_requests/3 as a git-format-patch(1) patch: https://salsa.debian.org/debian/cyrus-sasl2/merge_requests/3.patch I have built it and verified that the Depends line and library dependencies are corrected, and that it is installable. I have not actually tested the module's functionality. I agree with Helmut that this looks suitable for a stretch update. I would be willing to drive that process if the maintainers agree but lack time.
Bug#880393: nmuing cyrus-sasl2
No harm doing was intended. I simply missed the NMU. If you can point me to the direction of the patches you prepared I will try to care of it before soft freeze. Ondrej -- Ondřej Surý > On 25 Dec 2018, at 11:58, Helmut Grohne wrote: > > Hi Ryan, > >> On Mon, Dec 24, 2018 at 03:48:19PM -0800, Ryan Tandy wrote: >> I don't see any conversation about it in the bugs, but that NMU doesn't seem >> to have happened, was there a reason? > > The NMU went to delayed, but then Ondřej Surý did a maintainer upload > without including the fixes nor explaining why they shouldn't be used. > Since his (MU) version was higher than my (NMU) version, my upload was > rejected once it departed from delayed. Therefore this bug still affects > unstable despite having a solution. I'm unsure on how to best deal with > this non-communication and figured that I'd simply give up. > > I'd appreciate if someone else could handle this. At least I dissected > the cause and provided a simple and backportable solution. Could you > move this forward? > > Also given the simplicity of the fix, adding it to a stretch point > release would make a lot of sense. > > Helmut
Bug#880393: nmuing cyrus-sasl2
Hi Ryan, On Mon, Dec 24, 2018 at 03:48:19PM -0800, Ryan Tandy wrote: > I don't see any conversation about it in the bugs, but that NMU doesn't seem > to have happened, was there a reason? The NMU went to delayed, but then Ondřej Surý did a maintainer upload without including the fixes nor explaining why they shouldn't be used. Since his (MU) version was higher than my (NMU) version, my upload was rejected once it departed from delayed. Therefore this bug still affects unstable despite having a solution. I'm unsure on how to best deal with this non-communication and figured that I'd simply give up. I'd appreciate if someone else could handle this. At least I dissected the cause and provided a simple and backportable solution. Could you move this forward? Also given the simplicity of the fix, adding it to a stretch point release would make a lot of sense. Helmut
Bug#880393: nmuing cyrus-sasl2
Hi Helmut, On Sat, Sep 29, 2018 at 12:23:05PM +0200, Helmut Grohne wrote: You can find a .debdiff attached. I'll be uploading it to delayed/10 later today. Please let me know if I should delay it any longer. I don't see any conversation about it in the bugs, but that NMU doesn't seem to have happened, was there a reason?
Bug#880393: nmuing cyrus-sasl2
On Sat, 29 Sep 2018 12:23:05 +0200 Helmut Grohne wrote: Control: tags 792851 + pending Control: tags 880393 + pending patch Dear cyrus-sasl2 maintainers, I have prepared a NMU fixing the following bugs: * #792851: FTCBFS This one already had a patch since ages. * #880393: libsasl2-modules-gssapi-heimdal linked against mit krb5 Actually, libgssapiv2.so is built against heimdal correctly. It just happens that the dh_auto_install overwrites the heimdal version with the mit version. Putting the relevant dh_install between the two dh_auto_install fixes the issue. You can find a .debdiff attached. I'll be uploading it to delayed/10 later today. Please let me know if I should delay it any longer. Helmut
Bug#880393: nmuing cyrus-sasl2
On Sat, 29 Sep 2018 12:23:05 +0200 Helmut Grohne wrote: Control: tags 792851 + pending Control: tags 880393 + pending patch Dear cyrus-sasl2 maintainers, I have prepared a NMU fixing the following bugs: * #792851: FTCBFS This one already had a patch since ages. * #880393: libsasl2-modules-gssapi-heimdal linked against mit krb5 Actually, libgssapiv2.so is built against heimdal correctly. It just happens that the dh_auto_install overwrites the heimdal version with the mit version. Putting the relevant dh_install between the two dh_auto_install fixes the issue. You can find a .debdiff attached. I'll be uploading it to delayed/10 later today. Please let me know if I should delay it any longer. Helmut This problem is causing us serious heartburn. Is there a way to get the corrected stretch .deb file so we can move ahead with our upgrade to stretch? Adam
Bug#880393: nmuing cyrus-sasl2
Control: tags 792851 + pending Control: tags 880393 + pending patch Dear cyrus-sasl2 maintainers, I have prepared a NMU fixing the following bugs: * #792851: FTCBFS This one already had a patch since ages. * #880393: libsasl2-modules-gssapi-heimdal linked against mit krb5 Actually, libgssapiv2.so is built against heimdal correctly. It just happens that the dh_auto_install overwrites the heimdal version with the mit version. Putting the relevant dh_install between the two dh_auto_install fixes the issue. You can find a .debdiff attached. I'll be uploading it to delayed/10 later today. Please let me know if I should delay it any longer. Helmut diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/changelog cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/changelog --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/changelog 2018-04-21 18:20:16.0 +0200 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/changelog 2018-09-29 12:08:59.0 +0200 @@ -1,3 +1,14 @@ +cyrus-sasl2 (2.1.27~101-g0780600+dfsg-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #792851) ++ 0033-cross.patch: Drop -ldb from make depends. + * Build libsasl2-modules-gssapi-heimdal against heimdal: (Closes: #880393) ++ Run dh_install before overwriting libgssapiv2.so* with the MIT + implementation. + + -- Helmut Grohne Sat, 29 Sep 2018 12:08:59 +0200 + cyrus-sasl2 (2.1.27~101-g0780600+dfsg-3.1) unstable; urgency=medium * Non-maintainer upload with maintainer permission. diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/0033-cross.patch cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/0033-cross.patch --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/0033-cross.patch 1970-01-01 01:00:00.0 +0100 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/0033-cross.patch 2018-09-29 10:09:32.0 +0200 @@ -0,0 +1,18 @@ +Description: fix cross compialtion +Author: Helmut Grohne +Bug-Debian: https://bugs.debian.org/792851 +Last-Update: 2015-07-19 + + * Remove SASL_DB_LIB as it expands to -ldb and make fails to find a build arch + -ldb. + +--- a/sasldb/Makefile.am b/sasldb/Makefile.am +@@ -54,6 +54,6 @@ + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) + libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + libsasldb_la_LDFLAGS = -no-undefined diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/series cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/series --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/series 2016-12-31 15:59:34.0 +0100 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/series 2018-09-29 10:09:00.0 +0200 @@ -30,3 +30,4 @@ 0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch 0031-Cleanup-for-modern-autotools.patch 0032-Add-with_pgsql-include-postgresql-to-include-path.patch +0033-cross.patch diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/rules cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/rules --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/rules 2018-04-21 18:20:06.0 +0200 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/rules 2018-09-29 11:46:00.0 +0200 @@ -23,6 +23,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk +-include /usr/share/dpkg/buildtools.mk +export CC # see FEATURE AREAS in dpkg-buildflags(1) #export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -174,6 +176,7 @@ override_dh_auto_install: dh_auto_install -B$(TMPBUILD_HEIMDAL) -- sasldir=/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2 + dh_install -plibsasl2-modules-gssapi-heimdal dh_auto_install -B$(TMPBUILD_MIT) -- sasldir=/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2 # Remove static plugins - they are useless @@ -228,7 +231,7 @@ debian/tmp/etc/logcheck/ignore.d.server/libsasl2-modules override_dh_install: - dh_install --fail-missing + dh_install --fail-missing -Nlibsasl2-modules-gssapi-heimdal override_dh_installinit: dh_installinit $(DH_PACKAGE_EXCLUDES) --name=saslauthd start 20 2 3 4 5 . stop 20 0 1 6 . diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/sample/Makefile cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/sample/Makefile --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/sample/Makefile 2016-12-31 15:59:34.0 +0100 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/sample/Makefile 2018-09-29 10:06:18.0 +0200 @@ -11,7 +11,7 @@ all: sample-server sample-client sample-server: sample-server.c - gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -g -o sample-server sample-server.c -I. -I$(T) -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2 + $(CC) $(CFLAGS)
