diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 14:45:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 14:45:35 +0200 |
| commit | 8b1ca5579245e7b0a4351fcda87250ec4b7705b9 (patch) | |
| tree | ba35ca88f7129a24e5274b35b085e14c7a18ba50 /package/cyrus-sasl | |
| parent | 63d026ea19c657fd4f5f9675be86daacc7410263 (diff) | |
update to latest upstream version, fix SSP build
Diffstat (limited to 'package/cyrus-sasl')
| -rw-r--r-- | package/cyrus-sasl/Makefile | 28 | ||||
| -rw-r--r-- | package/cyrus-sasl/patches/patch-config_ltmain_sh | 14 |
2 files changed, 28 insertions, 14 deletions
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index c914941e9..9fd2e6f8b 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl -PKG_VERSION:= 2.1.22 +PKG_VERSION:= 2.1.23 PKG_RELEASE:= 1 -PKG_MD5SUM:= 45dde9d19193ae9dd388eb68b2027bc9 +PKG_MD5SUM:= 2eb0e48106f0e9cd8001e654f267ecbc PKG_DESCR:= a general purpose authentication library PKG_SECTION:= libs -PKG_DEPENDS:= libopenssl PKG_BUILDDEP:= openssl +PKG_DEPENDS:= libopenssl PKG_URL:= http://asg.web.cmu.edu/sasl/ PKG_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/ PKG_NOPARALLEL:= 1 @@ -24,33 +24,34 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSASL2_DEV,libsasl2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSASL2_DEV},${PKGSC_LIBSASL2_DEV})) -CONFIGURE_ARGS+= --disable-sample \ - --enable-staticdlopen \ +CONFIGURE_ARGS+= --enable-staticdlopen \ + --enable-cram \ + --enable-plain \ + --enable-anon \ + --enable-digest \ + --with-ipctype=unix \ + --with-devrandom="/dev/urandom" \ + --with-openssl="${STAGING_TARGET_DIR}/usr" \ + --disable-sample \ --disable-java \ --disable-alwaystrue \ --disable-checkapop \ - --enable-cram \ - --enable-digest \ --disable-otp \ --disable-srp \ --disable-srp-setpass \ --disable-krb4 \ --disable-gssapi \ --disable-gss_mutexes \ - --enable-plain \ - --enable-anon \ --disable-login \ --disable-ntlm \ --disable-sql \ + --disable-static \ --without-dblib \ --without-gdbm \ - --with-devrandom="/dev/urandom" \ --without-pam \ --without-saslauthd \ --without-authdaemond \ --without-pwcheck \ - --with-ipctype=unix \ - --with-openssl="${STAGING_TARGET_DIR}/usr" \ --without-des \ --without-opie \ --without-ldap \ @@ -59,8 +60,7 @@ CONFIGURE_ARGS+= --disable-sample \ --without-sqlite \ --without-rc4 \ --without-dmalloc \ - --without-sfio \ - --disable-static + --without-sfio pre-build: ${MAKE} -C ${WRKBUILD}/include \ diff --git a/package/cyrus-sasl/patches/patch-config_ltmain_sh b/package/cyrus-sasl/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..01b5a992c --- /dev/null +++ b/package/cyrus-sasl/patches/patch-config_ltmain_sh @@ -0,0 +1,14 @@ +--- 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 |