diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 08:42:03 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 08:42:03 +0100 |
| commit | 76d0c1cfe5eb3d30ef34396796fc52daed6461c0 (patch) | |
| tree | 1f635f1b7a5daf93055de0a51e0da65c5f9c65d6 /package | |
| parent | 3f286c568e3f02b29e61757175f79539e4c6c967 (diff) | |
| parent | 4bf2218941e4eaeec2ce318865044469f3553353 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/cyrus-sasl/Makefile | 7 | ||||
| -rw-r--r-- | package/cyrus-sasl/patches/patch-config_ltconfig | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index b3e1794b0..9ffae6c92 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl PKG_VERSION:= 2.1.26 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= a7f4e5e559a0e37b3ffc438c9456e425 PKG_DESCR:= a general purpose authentication library PKG_SECTION:= libs @@ -21,10 +21,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --enable-staticdlopen \ - --enable-plain \ - --enable-anon \ +CONFIGURE_ARGS+= --enable-plain \ --enable-login \ + --disable-anon \ --disable-cram \ --disable-digest \ --disable-scram \ diff --git a/package/cyrus-sasl/patches/patch-config_ltconfig b/package/cyrus-sasl/patches/patch-config_ltconfig index 7112c26e1..1a04b28e0 100644 --- a/package/cyrus-sasl/patches/patch-config_ltconfig +++ b/package/cyrus-sasl/patches/patch-config_ltconfig @@ -1,5 +1,14 @@ ---- cyrus-sasl-2.1.23.orig/config/ltconfig 2003-06-12 02:32:43.000000000 +0200 -+++ cyrus-sasl-2.1.23/config/ltconfig 2011-08-08 10:54:43.509265006 +0200 +--- cyrus-sasl-2.1.26.orig/config/ltconfig 2012-10-12 16:05:48.000000000 +0200 ++++ cyrus-sasl-2.1.26/config/ltconfig 2014-03-07 07:46:01.000000000 +0100 +@@ -2024,7 +2024,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + version_type=linux + need_lib_prefix=no + need_version=no @@ -2034,16 +2034,7 @@ linux-gnu*) shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no |