[Pkg-xmpp-commits] [SCM] GNU SASL Library branch, master, updated. upstream/1.6.1-86-g7d413cb

[Simon Josefsson]

The following commit has been merged in the master branch:
commit 7d413cb0a24966c6bb3687897316e73ecb6b89db
Author: Simon Josefsson <simon at josefsson.org>
Date:   Tue May 29 09:33:05 2012 +0200

    Use internal crypto.

diff --git a/debian/changelog b/debian/changelog
index 9c052b4..2c77137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gsasl (1.8.0-1) experimental; urgency=low
   * Disable valgrind (false positives due to compiler
     optimizations of strlen).
   * Use --with-packager flags to get Debian-specific output from 'gsasl'.
+  * Use internal crypto (reduce dependencies, no thread locking issues).
 
  -- Simon Josefsson <simon at josefsson.org>  Tue, 29 May 2012 08:20:52 +0200
 
diff --git a/debian/control b/debian/control
index 656095a..9cf9c18 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel at lists.alioth.debian.org>
 Uploaders: Thadeu Lima de Souza Cascardo <cascardo at minaslivre.org>,
  Jorge Salamero Sanz <bencer at debian.org>, Simon Josefsson <simon at josefsson.org>
-Build-Depends: cdbs, debhelper (>= 7.0.0), autotools-dev, gettext, texinfo, pkg-config, libgcrypt-dev, libkrb5-dev, help2man, libidn11-dev, libgnutls-dev, libntlm0-dev, valgrind [amd64 i386 powerpc]
+Build-Depends: cdbs, debhelper (>= 7.0.0), autotools-dev, gettext, texinfo, pkg-config, libkrb5-dev, help2man, libidn11-dev, libgnutls-dev, libntlm0-dev, valgrind [amd64 i386 powerpc]
 Vcs-Git: git://git.debian.org/pkg-xmpp/gsasl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-xmpp/gsasl.git
 Homepage: http://www.gnu.org/software/gsasl/
@@ -17,7 +17,7 @@ Architecture: any
 Conflicts: libgsasl1-dev
 Replaces: libgsasl1-dev
 Depends: libgsasl7 (= ${binary:Version}), libidn11-dev, pkg-config,
- libntlm0-dev, libkrb5-dev, libgcrypt11-dev, ${misc:Depends}
+ libntlm0-dev, libkrb5-dev, ${misc:Depends}
 Description: Development files for the GNU SASL library
  GNU SASL is an implementation of the Simple Authentication and
  Security Layer framework and a few common SASL mechanisms. SASL is
@@ -31,7 +31,7 @@ Description: Development files for the GNU SASL library
 Package: libgsasl7
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgcrypt11 (>= 1.4.5-1)
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libgsasl1
 Replaces: libgsasl1
 Description: GNU SASL library
diff --git a/debian/rules b/debian/rules
index 1cf42fa..d897886 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ DEB_DH_STRIP_ARGS = --dbg-package=gsasl-dbg
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_MAKESHLIBS_ARGS_libgsasl7 = -- -c4
 
-DEB_CONFIGURE_USER_FLAGS = --disable-valgrind-tests
+DEB_CONFIGURE_USER_FLAGS = --disable-valgrind-tests --without-libgcrypt
 DEB_CONFIGURE_EXTRA_FLAGS = --with-packager=Debian --with-packager-version=$(DEB_VERSION) --with-packager-bug-reports=http://bugs.debian.org/
 
 common-install-arch::

-- 
GNU SASL Library