diff options
Diffstat (limited to 'package/cyrus-sasl')
| -rw-r--r-- | package/cyrus-sasl/Makefile | 14 | ||||
| -rw-r--r-- | package/cyrus-sasl/patches/patch-config_ltconfig | 29 | ||||
| -rw-r--r-- | package/cyrus-sasl/patches/patch-config_ltmain_sh | 14 |
3 files changed, 8 insertions, 49 deletions
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index a761f2e59..8dd026ecc 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -4,26 +4,28 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl -PKG_VERSION:= 2.1.26 -PKG_RELEASE:= 2 -PKG_HASH:= 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 +PKG_VERSION:= 2.1.28 +PKG_RELEASE:= 1 +PKG_HASH:= 3e38933a30b9ce183a5488b4f6a5937a702549cde0d3287903d80968ad4ec341 PKG_DESCR:= general purpose authentication library PKG_SECTION:= libs/crypto -PKG_DEPENDS:= libressl -PKG_BUILDDEP:= libressl +PKG_DEPENDS:= libopenssl +PKG_BUILDDEP:= openssl PKG_URL:= http://cyrusimap.org/ -PKG_SITES:= ftp://ftp.cyrusimap.org/cyrus-sasl/ +PKG_SITES:= https://github.com/cyrusimap/cyrus-sasl/archive/refs/tags/ PKG_LIBNAME:= libsasl2 PKG_OPTS:= dev PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_NAME)-${PKG_VERSION} include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autogen CONFIGURE_ARGS+= --enable-plain \ --enable-login \ --disable-anon \ diff --git a/package/cyrus-sasl/patches/patch-config_ltconfig b/package/cyrus-sasl/patches/patch-config_ltconfig deleted file mode 100644 index 1a04b28e0..000000000 --- a/package/cyrus-sasl/patches/patch-config_ltconfig +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 - deplibs_check_method=pass_all -- -- if test -f /lib/ld.so.1; then -- dynamic_linker='GNU ld.so' -- else -- # Only the GNU ld.so supports shared libraries on MkLinux. -- case "$host_cpu" in -- powerpc*) dynamic_linker=no ;; -- *) dynamic_linker='Linux ld.so' ;; -- esac -- fi -+ dynamic_linker='Linux ld.so' - ;; - - netbsd*) diff --git a/package/cyrus-sasl/patches/patch-config_ltmain_sh b/package/cyrus-sasl/patches/patch-config_ltmain_sh deleted file mode 100644 index 01b5a992c..000000000 --- a/package/cyrus-sasl/patches/patch-config_ltmain_sh +++ /dev/null @@ -1,14 +0,0 @@ ---- cyrus-sasl-2.1.23.orig/config/ltmain.sh 2003-07-02 15:29:00.000000000 +0200 -+++ cyrus-sasl-2.1.23/config/ltmain.sh 2011-03-30 21:20:59.111809629 +0200 -@@ -1081,6 +1081,11 @@ compiler." - esac - ;; - -+ -fstack-protector*|-flto*) -+ linkopts="$linkopts $arg" -+ continue -+ ;; -+ - -l*) - if test "$arg" = "-lc"; then - case "$host" in |