diff --git a/common/shlibs b/common/shlibs index 518ca5977b..39ef55a7ca 100644 --- a/common/shlibs +++ b/common/shlibs @@ -609,7 +609,7 @@ libgtkmm-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 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 libldap-2.4.so.2 libldap-2.4.21_1 libldap_r-2.4.so.2 libldap-2.4.21_1 diff --git a/srcpkgs/libsasl/patches/0027_db5_support.patch b/srcpkgs/libsasl/patches/0027_db5_support.patch deleted file mode 100644 index 6853ea7a0d..0000000000 --- a/srcpkgs/libsasl/patches/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej Surý -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); diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template index da055de3c7..fa00df3544 100644 --- a/srcpkgs/libsasl/template +++ b/srcpkgs/libsasl/template @@ -1,7 +1,7 @@ # Template file for 'libsasl' pkgname=libsasl -version=2.1.25 -revision=7 +version=2.1.26 +revision=1 build_style=gnu-configure configure_args="--enable-cram --enable-digest --enable-auth-sasldb --enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm @@ -13,8 +13,8 @@ short_desc="Cyrus SASL - runtime shared libraries" maintainer="Juan RP " homepage="http://cyrusimap.web.cmu.edu/" license="BSD" -distfiles="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-$version.tar.gz" -checksum=418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe +distfiles="ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${version}.tar.gz" +checksum=8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 disable_parallel_build=yes @@ -24,10 +24,11 @@ post_install() { } libsasl-devel_package() { - depends="db-devel>=5.3 libsasl>=${version}_${revision}" + depends="libsasl>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig } }