libsasl: update to 2.1.26 (soname bump).

This commit is contained in:
Juan RP 2014-07-25 15:39:08 +02:00
parent 36a09a7f38
commit d8316ad893
3 changed files with 7 additions and 30 deletions

View File

@ -609,7 +609,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
libgdkmm-3.0.so.1 gtkmm-2.99.5_1 libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgksu2.so.0 libgksu-2.0.12_1 libgksu2.so.0 libgksu-2.0.12_1
libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1 libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
libsasl2.so.2 libsasl-2.1.23_1 libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1 liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1 libldap-2.4.so.2 libldap-2.4.21_1
libldap_r-2.4.so.2 libldap-2.4.21_1 libldap_r-2.4.so.2 libldap-2.4.21_1

View File

@ -1,24 +0,0 @@
Author: Ondřej Surý <ondrej@debian.org>
Description: Support newer Berkeley DB versions
--- sasldb/db_berkeley.c
+++ sasldb/db_berkeley.c
@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
ret = db_create(mbdb, NULL, 0);
if (ret == 0 && *mbdb != NULL)
{
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
#else
ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
--- utils/dbconverter-2.c
+++ utils/dbconverter-2.c
@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
ret = db_create(mbdb, NULL, 0);
if (ret == 0 && *mbdb != NULL)
{
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
#else
ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);

View File

@ -1,7 +1,7 @@
# Template file for 'libsasl' # Template file for 'libsasl'
pkgname=libsasl pkgname=libsasl
version=2.1.25 version=2.1.26
revision=7 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-cram --enable-digest --enable-auth-sasldb configure_args="--enable-cram --enable-digest --enable-auth-sasldb
--enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm --enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm
@ -13,8 +13,8 @@ short_desc="Cyrus SASL - runtime shared libraries"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://cyrusimap.web.cmu.edu/" homepage="http://cyrusimap.web.cmu.edu/"
license="BSD" license="BSD"
distfiles="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-$version.tar.gz" distfiles="ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${version}.tar.gz"
checksum=418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe checksum=8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
disable_parallel_build=yes disable_parallel_build=yes
@ -24,10 +24,11 @@ post_install() {
} }
libsasl-devel_package() { libsasl-devel_package() {
depends="db-devel>=5.3 libsasl>=${version}_${revision}" depends="libsasl>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
} }
} }