The attached patch drops Heimdal support.
commit 11ef3ad8ad7272ef6c8a2666460703be2340eb90 Author: Jelmer Vernooij <[email protected]> Date: Tue Oct 18 14:16:47 2016 +0000
Drop support for Heimdal. Closes: #837724
diff --git a/debian/changelog b/debian/changelog
index 65a9e41..f7e62fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cyrus-sasl2 (2.1.26.dfsg1-16.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop support for Heimdal. Closes: #837724
+
+ -- Jelmer Vernooij <[email protected]> Tue, 18 Oct 2016 14:16:41 +0000
+
cyrus-sasl2 (2.1.26.dfsg1-16) unstable; urgency=medium
* Add trailing slash to find command in init script, so people can have
diff --git a/debian/control b/debian/control
index 37a4dd6..c490d87 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),
libssl-dev,
libmysqlclient-dev | libmysqlclient15-dev,
libpq-dev,
- heimdal-multidev,
krb5-multidev,
libkrb5-dev,
libsqlite3-dev,
@@ -75,7 +74,7 @@ Description: Cyrus SASL - authentication abstraction library
negotiated, a security layer is inserted between the protocol and the
connection. See RFC 2222 for more information.
.
- Any of: ANONYMOUS, CRAM-MD5, DIGEST-MD5, GSSAPI (MIT or Heimdal
+ Any of: ANONYMOUS, CRAM-MD5, DIGEST-MD5, GSSAPI (MIT
Kerberos 5), NTLM, OTP, PLAIN, or LOGIN can be used.
Package: libsasl2-modules
@@ -87,7 +86,7 @@ Depends: ${shlibs:Depends},
Suggests: libsasl2-modules-otp,
libsasl2-modules-ldap,
libsasl2-modules-sql,
- libsasl2-modules-gssapi-mit | libsasl2-modules-gssapi-heimdal
+ libsasl2-modules-gssapi-mit
Breaks: logcheck-database (<= 1.3.16~)
Description: Cyrus SASL - pluggable authentication modules
This is the Cyrus SASL API implementation, version 2.1. See package
@@ -171,21 +170,6 @@ Description: Cyrus SASL - development files for authentication abstraction libra
This package includes development files for compiling programs with SASL
support. It is needed for development purposes only.
-Package: libsasl2-modules-gssapi-heimdal
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Depends: libsasl2-modules (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libsasl2-modules-gssapi-mit
-Description: Pluggable Authentication Modules for SASL (GSSAPI)
- This is the Cyrus SASL API implementation, version 2.1. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package provides the GSSAPI plugin, compiled with the Heimdal
- Kerberos 5 library.
-
Package: cyrus-sasl2-dbg
Section: debug
Architecture: any
@@ -193,7 +177,7 @@ Multi-Arch: same
Priority: extra
Depends: libsasl2-2 (= ${binary:Version}),
${misc:Depends}
-Recommends: cyrus-sasl2-mit-dbg | cyrus-sasl2-heimdal-dbg
+Recommends: cyrus-sasl2-mit-dbg
Description: Cyrus SASL - debugging symbols
This is the Cyrus SASL API implementation, version 2. See package
libsasl2-2 and RFC 2222 for more information.
@@ -221,22 +205,3 @@ Description: Cyrus SASL - debugging symbols for MIT modules
symbols can be useful when investigating crashes in the SASL library or
tools. You may be asked to install this package if you encounter such a
crash.
-
-Package: cyrus-sasl2-heimdal-dbg
-Section: debug
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Depends: cyrus-sasl2-dbg (= ${binary:Version}),
- libsasl2-modules-gssapi-heimdal (= ${binary:Version}),
- ${misc:Depends}
-Conflicts: cyrus-sasl2-mit-dbg
-Description: Cyrus SASL - debugging symbols for Heimdal modules
- This is the Cyrus SASL API implementation, version 2. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package contains the debugging symbols for the Cyrus SASL Heimdal
- GSSAPI modules package (libsasl2-modules-gssapi-heimdal). The debugging
- symbols can be useful when investigating crashes in the SASL library or
- tools. You may be asked to install this package if you encounter such a
- crash.
diff --git a/debian/cyrus-sasl2-heimdal-dbg.postinst b/debian/cyrus-sasl2-heimdal-dbg.postinst
deleted file mode 100644
index fc2358a..0000000
--- a/debian/cyrus-sasl2-heimdal-dbg.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# postinst script for sasl2-bin
-# Copyright (c) 2014 Roberto C. Sanchez <[email protected]>
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# This postinst script was added prior to the release of Jessie in order to
-# fix #664729. After the release of Jessie, this script can be dropped.
-
-set -e
-
-case "$1" in
- configure)
- dpkg-divert --remove --package cyrus-sasl2-heimdal-dbg --divert /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.22.mit --rename /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.22
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument $1" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libsasl2-modules-gssapi-heimdal.install b/debian/libsasl2-modules-gssapi-heimdal.install
deleted file mode 100644
index 97255a8..0000000
--- a/debian/libsasl2-modules-gssapi-heimdal.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/sasl2/libgssapiv2.so*
diff --git a/debian/libsasl2-modules-gssapi-heimdal.lintian-overrides b/debian/libsasl2-modules-gssapi-heimdal.lintian-overrides
deleted file mode 100644
index 63dc3fc..0000000
--- a/debian/libsasl2-modules-gssapi-heimdal.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# We do not link the GPL code we ship with openssl; it's a separate utility
-libsasl2-modules-gssapi-heimdal binary: possible-gpl-code-linked-with-openssl
diff --git a/debian/rules b/debian/rules
index 4404190..3400351 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,7 @@ ifeq (,$(findstring no-gssapi,$(DEB_BUILD_OPTIONS)))
else
CONFIGURE_GSSAPI=--disable-gssapi
DH_PACKAGE_EXCLUDES += -Nlibsasl2-modules-gssapi-mit \
- -Nlibsasl2-modules-gssapi-heimdal \
- -Ncyrus-sasl2-mit-dbg \
- -Ncyrus-sasl2-heimdal-dbg
+ -Ncyrus-sasl2-mit-dbg
endif
CONFIGURE_COMMON_OPTIONS= \
@@ -97,11 +95,7 @@ CONFIGURE_COMMON_OPTIONS= \
# Some convenience variables
export TMPBUILD_MIT := $(CURDIR)/build-mit
-export TMPBUILD_HEIMDAL := $(CURDIR)/build-heimdal
-export HEIMDAL_LDFLAGS := $(shell krb5-config.heimdal --libs gssapi | sed -e 's/ -l.*//')
-export HEIMDAL_CPPFLAGS := $(shell krb5-config.heimdal --cflags gssapi)
export TMPPKG_MIT := $(CURDIR)/debian/tmp-mit
-export TMPPKG_HEIMDAL := $(CURDIR)/debian/tmp-heimdal
AUTOFILES=acinclude.m4 aclocal.m4 config/config.sub config/config.guess \
config/ltmain.sh config/libtool.m4
@@ -114,7 +108,6 @@ BUILD_TMP_SUFFIX=.debian-build.tmp
override_dh_auto_clean:
dh_auto_clean -B$(TMPBUILD_MIT)
- dh_auto_clean -B$(TMPBUILD_HEIMDAL)
rm -f $(CURDIR)/sample/sample-client \
$(CURDIR)/sample/sample-server
@@ -132,17 +125,13 @@ override_dh_auto_clean:
-rm -f sasl-sample-client.8 sasl-sample-server.8 gen-auth.1
# Remove build directories
- rm -rf $(TMPBUILD_MIT) $(TMPBUILD_HEIMDAL) $(TMPPKG_MIT) $(TMPPKG_HEIMDAL)
+ rm -rf $(TMPBUILD_MIT) $(TMPPKG_MIT)
override_dh_auto_configure:
LDFLAGS="$(LDFLAGS) -L/usr/lib/mit-krb5 -Wl,-z,defs" \
CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/mit-krb5" \
dh_auto_configure -B$(TMPBUILD_MIT) -- $(CONFIGURE_COMMON_OPTIONS) --with-gss_impl=mit
- LDFLAGS="$(LDFLAGS) $(HEIMDAL_LDFLAGS) -Wl,-z,defs" \
- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) $(HEIMDAL_CPPFLAGS)" \
- dh_auto_configure -B$(TMPBUILD_HEIMDAL) -- $(CONFIGURE_COMMON_OPTIONS) --with-gss_impl=heimdal
-
# Record the build-time settings for later reference
echo 'To build this package, configure was called as follows:' \
> debian/README.configure-options
@@ -153,7 +142,6 @@ override_dh_auto_configure:
override_dh_auto_build:
dh_auto_build -B$(TMPBUILD_MIT) -- sasldir=/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2
- dh_auto_build -B$(TMPBUILD_HEIMDAL) -- sasldir=/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2
# Build sample-{client,server}
$(MAKE) -f $(CURDIR)/debian/sample/Makefile -C $(CURDIR)/sample T=$(TMPBUILD_MIT)
@@ -168,8 +156,6 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install -B$(TMPBUILD_MIT) -- DESTDIR=$(TMPPKG_MIT) sasldir=/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2
- dh_auto_install -B$(TMPBUILD_HEIMDAL) -- DESTDIR=$(TMPPKG_HEIMDAL) sasldir=/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2
-
# Note the version of Berkeley DB used to build this package
mkdir -p $(TMPPKG_MIT)/usr/lib/sasl2
@@ -217,17 +203,15 @@ endif
$(TMPPKG_MIT)/etc/logcheck/ignore.d.server/libsasl2-modules
override_dh_install:
- dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_MIT) -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-db -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal $(DH_PACKAGE_EXCLUDES)
- dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_HEIMDAL) -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-db -Nlibsasl2-modules-ldap -Nlibsasl2-modules-otp -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev $(DH_PACKAGE_EXCLUDES)
+ dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_MIT) -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-db -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev $(DH_PACKAGE_EXCLUDES)
override_dh_installinit:
dh_installinit $(DH_PACKAGE_EXCLUDES) --name=saslauthd start 20 2 3 4 5 . stop 20 0 1 6 .
override_dh_strip:
- dh_strip -Xlibgssapiv2.so. -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-db -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal $(DH_PACKAGE_EXCLUDES) --dbg-package=cyrus-sasl2-dbg
+ dh_strip -Xlibgssapiv2.so. -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-db -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev $(DH_PACKAGE_EXCLUDES) --dbg-package=cyrus-sasl2-dbg
ifeq (,$(findstring no-gssapi,$(DEB_BUILD_OPTIONS)))
dh_strip -Xlibgs2.so.3 -Xlibscram.so. -plibsasl2-modules-gssapi-mit --dbg-package=cyrus-sasl2-mit-dbg
- dh_strip -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-db -Nlibsasl2-modules-ldap -Nlibsasl2-modules-otp -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev --dbg-package=cyrus-sasl2-heimdal-dbg
endif
override_dh_makeshlibs:
signature.asc
Description: PGP signature
