Package: cyrus-sasl2 Severity: normal tags 622221 +patch thank you
Attached is patch which rip out the otp from cyrus-sasl2. O.
diff --git a/debian/control b/debian/control index f61dd67..4bd45bc 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: standard Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-de...@lists.alioth.debian.org> Uploaders: Fabian Fagerholm <fa...@debian.org>, Roberto C. Sanchez <robe...@connexer.com> Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), autotools-dev, automake1.9, autoconf, libtool, libdb-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libopie-dev (>= 2.32-10), libpq-dev (>= 8.1.3-4), heimdal-multidev, krb5-multidev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base, debconf (>= 0.5) | debconf-2.0, po-debconf, docbook-to-man, hardening-wrapper +Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), autotools-dev, automake1.9, autoconf, libtool, libdb-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libpq-dev (>= 8.1.3-4), heimdal-multidev, krb5-multidev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base, debconf (>= 0.5) | debconf-2.0, po-debconf, docbook-to-man, hardening-wrapper Build-Conflicts: heimdal-dev Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/ Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/ @@ -50,7 +50,7 @@ Description: Cyrus SASL - authentication abstraction library connection. See RFC 2222 for more information. . Any of: ANONYMOUS, CRAM-MD5, DIGEST-MD5, GSSAPI (MIT or Heimdal - Kerberos 5), NTLM, OTP, PLAIN, or LOGIN can be used. If you intend to + Kerberos 5), NTLM, PLAIN, or LOGIN can be used. If you intend to use this package on a server that provides SASL authentication, then you must install some of the libsasl2-modules* packages. @@ -58,7 +58,7 @@ Package: libsasl2-modules Priority: optional Architecture: any Depends: libsasl2-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: libsasl2-modules-otp, libsasl2-modules-ldap, libsasl2-modules-sql, libsasl2-modules-gssapi-mit | libsasl2-modules-gssapi-heimdal +Suggests: libsasl2-modules-ldap, libsasl2-modules-sql, libsasl2-modules-gssapi-mit | libsasl2-modules-gssapi-heimdal Description: Cyrus SASL - pluggable authentication modules This is the Cyrus SASL API implementation, version 2.1. See package libsasl2-2 and RFC 2222 for more information. @@ -76,16 +76,6 @@ Description: Cyrus SASL - pluggable authentication modules (LDAP) . This package provides the LDAP plugin, which supports OpenLDAP. -Package: libsasl2-modules-otp -Priority: extra -Architecture: any -Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: Cyrus SASL - pluggable authentication modules (OTP) - This is the Cyrus SASL API implementation, version 2.1. See package - libsasl2-2 and RFC 2222 for more information. - . - This package provides the OTP plugin, which supports one time passwords. - Package: libsasl2-modules-sql Priority: extra Architecture: any diff --git a/debian/libsasl2-modules-otp.dirs b/debian/libsasl2-modules-otp.dirs deleted file mode 100644 index 3024311..0000000 --- a/debian/libsasl2-modules-otp.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/sasl2 -usr/share/lintian/overrides diff --git a/debian/libsasl2-modules-otp.install b/debian/libsasl2-modules-otp.install deleted file mode 100644 index a82b136..0000000 --- a/debian/libsasl2-modules-otp.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/sasl2/libotp.* diff --git a/debian/libsasl2-modules-otp.lintian-overrides b/debian/libsasl2-modules-otp.lintian-overrides deleted file mode 100644 index 85b8f9a..0000000 --- a/debian/libsasl2-modules-otp.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libsasl2-modules-otp binary: possible-gpl-code-linked-with-openssl diff --git a/debian/rules b/debian/rules index 7e7ab4a..4acd042 100755 --- a/debian/rules +++ b/debian/rules @@ -71,7 +71,7 @@ CONFIGURE_COMMON_OPTIONS=--host=$(DEB_HOST_GNU_TYPE) \ --enable-checkapop \ --enable-cram \ --enable-digest \ - --enable-otp \ + --disable-otp \ --disable-srp \ --disable-srp-setpass \ --disable-krb4 \ @@ -300,17 +300,15 @@ binary-arch: build-arch install debian/sasl2-bin/usr/share/lintian/overrides/sasl2-bin cp debian/libsasl2-modules.lintian-overrides \ debian/libsasl2-modules/usr/share/lintian/overrides/libsasl2-modules - cp debian/libsasl2-modules-otp.lintian-overrides \ - debian/libsasl2-modules-otp/usr/share/lintian/overrides/libsasl2-modules-otp cp debian/libsasl2-modules-gssapi-heimdal.lintian-overrides \ debian/libsasl2-modules-gssapi-heimdal/usr/share/lintian/overrides/libsasl2-modules-gssapi-heimdal - dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_MIT) -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal - dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_HEIMDAL) -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-ldap -Nlibsasl2-modules-otp -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev + dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_MIT) -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-ldap -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal + dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_HEIMDAL) -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-ldap -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev dh_installinit --name=saslauthd start 20 2 3 4 5 . stop 20 1 . dh_installman -s dh_link -s - dh_strip -s -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal --dbg-package=cyrus-sasl2-dbg - dh_strip -s -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-ldap -Nlibsasl2-modules-otp -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev --dbg-package=cyrus-sasl2-heimdal-dbg + dh_strip -s -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-ldap -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal --dbg-package=cyrus-sasl2-dbg + dh_strip -s -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-ldap -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev --dbg-package=cyrus-sasl2-heimdal-dbg mv debian/cyrus-sasl2-dbg/usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.23 debian/cyrus-sasl2-mit-dbg/usr/lib/debug/usr/lib/sasl2/ dh_compress -s dh_fixperms -s
