diff options
26 files changed, 85 insertions, 259 deletions
diff --git a/security/cy2-anonymous/Makefile b/security/cy2-anonymous/Makefile index f7286c2e273..328691f6231 100644 --- a/security/cy2-anonymous/Makefile +++ b/security/cy2-anonymous/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-anonymous/} -PKGREVISION= 1 +#PKGREVISION= 1 COMMENT= Cyrus SASL ANONYMOUS authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-crammd5/Makefile b/security/cy2-crammd5/Makefile index 0bc90257668..47a75e6c2ea 100644 --- a/security/cy2-crammd5/Makefile +++ b/security/cy2-crammd5/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-crammd5/} -PKGREVISION= 1 +#PKGREVISION= 1 COMMENT= Cyrus SASL CRAM-MD5 authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile index 57488a8a7a9..701f897a039 100644 --- a/security/cy2-digestmd5/Makefile +++ b/security/cy2-digestmd5/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/} -PKGREVISION= 4 +#PKGREVISION= 4 COMMENT= Cyrus SASL DIGEST-MD5 authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile index 207c0aca5f2..5f3a4a94230 100644 --- a/security/cy2-gssapi/Makefile +++ b/security/cy2-gssapi/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.27 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/} -PKGREVISION= 4 +#PKGREVISION= 4 COMMENT= Cyrus SASL GSSAPI authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-ldapdb/Makefile b/security/cy2-ldapdb/Makefile index aeb0f258fd9..406b180e5ac 100644 --- a/security/cy2-ldapdb/Makefile +++ b/security/cy2-ldapdb/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.13 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ldapdb/} -PKGREVISION= 4 +#PKGREVISION= 4 COMMENT= Cyrus SASL LDAPDB authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-login/Makefile b/security/cy2-login/Makefile index 3093008c17f..8b5e1936c19 100644 --- a/security/cy2-login/Makefile +++ b/security/cy2-login/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.18 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-login/} -PKGREVISION= 1 +#PKGREVISION= 1 COMMENT= Cyrus SASL LOGIN authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile index a8282638b87..8c1aabf175e 100644 --- a/security/cy2-ntlm/Makefile +++ b/security/cy2-ntlm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.29 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/} -PKGREVISION= 4 +#PKGREVISION= 4 COMMENT= Cyrus SASL NTLM authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile index 54644aa829d..57947b1f1b8 100644 --- a/security/cy2-otp/Makefile +++ b/security/cy2-otp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.22 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/} -PKGREVISION= 5 +#PKGREVISION= 5 COMMENT= Cyrus SASL OTP authentication plugin SASL_PLUGIN= yes @@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --enable-otp CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} BUILD_DIRS= plugins -BUILD_TARGET= libotp.la +#BUILD_TARGET= libotp.la .include "../../security/openssl/buildlink3.mk" diff --git a/security/cy2-plain/Makefile b/security/cy2-plain/Makefile index 30627292d07..1706b2d5633 100644 --- a/security/cy2-plain/Makefile +++ b/security/cy2-plain/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-plain/} -PKGREVISION= 1 +#PKGREVISION= 1 COMMENT= Cyrus SASL PLAIN authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-scram/Makefile b/security/cy2-scram/Makefile index 30ffa87076f..a76a45d7642 100644 --- a/security/cy2-scram/Makefile +++ b/security/cy2-scram/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2018/04/17 01:57:19 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-scram/} -PKGREVISION= 4 +#PKGREVISION= 4 COMMENT= Cyrus SASL SCRAM authentication plugin SASL_PLUGIN= yes diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile index d686aa5b517..e358fc7cabc 100644 --- a/security/cy2-sql/Makefile +++ b/security/cy2-sql/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2018/04/14 07:34:39 adam Exp $ +# $NetBSD: Makefile,v 1.38 2018/04/17 01:57:19 christos Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/} -PKGREVISION= 15 +#PKGREVISION= 15 COMMENT= Cyrus SASL SQL authentication plugin SASL_PLUGIN= yes diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index d03c35c8fab..4ab69d627a2 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.73 2018/01/28 20:11:03 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2018/04/17 01:57:17 christos Exp $ -PKGREVISION= 7 +#PKGREVISION= 7 COMMENT= Simple Authentication and Security Layer .include "Makefile.common" @@ -65,7 +65,7 @@ MESSAGE_SUBST+= PLUGINDIR=${PLUGINDIR:Q} post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} - cd ${WRKSRC}/doc; for file in *.fig *.html *.txt; do \ + cd ${WRKSRC}/doc/legacy; for file in *.fig *.html *.txt; do \ ${INSTALL_DATA} $${file} ${DESTDIR}${DOCDIR}; \ done diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common index 047c37d2d8f..6c144346093 100644 --- a/security/cyrus-sasl/Makefile.common +++ b/security/cyrus-sasl/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.27 2018/04/17 01:57:17 christos Exp $ # # used by security/cyrus-sasl/Makefile # used by security/cy2-anonymous/Makefile @@ -17,14 +17,15 @@ # This Makefile fragment should be included _below_ any SASL_PLUGIN # definition and _above_ any CONFIGURE_ARGS definitions. -DISTNAME= cyrus-sasl-2.1.26 +DISTNAME= cyrus-sasl-2.1.27 +DISTFILES= ${DISTNAME}-rc7${EXTRACT_SUFX} CATEGORIES= security MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ -MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/ -PATCHFILES+= cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2 -SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \ - -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d -PATCH_DIST_STRIP= -p1 +#MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/ +#PATCHFILES+= cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2 +#SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \ +# -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d +#PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cyrussasl.org/ @@ -87,6 +88,9 @@ CONFIGURE_ARGS+= --without-saslauthd PKGCONFIG_OVERRIDE+= libsasl2.pc.in +pre-build: + cd ${WRKSRC}/common && ${BUILD_MAKE_CMD} all + # Left here as reference for patch makers... # clean up a bit to help package maintainer produce patch files # diff --git a/security/cyrus-sasl/PLIST b/security/cyrus-sasl/PLIST index 26b357bdda9..87835ed748b 100644 --- a/security/cyrus-sasl/PLIST +++ b/security/cyrus-sasl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2012/12/16 01:36:44 obache Exp $ +@comment $NetBSD: PLIST,v 1.9 2018/04/17 01:57:17 christos Exp $ include/sasl/hmac-md5.h include/sasl/md5.h include/sasl/md5global.h @@ -61,39 +61,16 @@ sbin/saslpasswd2 share/doc/cyrus-sasl/advanced.html share/doc/cyrus-sasl/appconvert.html share/doc/cyrus-sasl/components.html -share/doc/cyrus-sasl/draft-burdis-cat-srp-sasl-xx.txt -share/doc/cyrus-sasl/draft-ietf-sasl-anon-xx.txt -share/doc/cyrus-sasl/draft-ietf-sasl-crammd5-xx.txt -share/doc/cyrus-sasl/draft-ietf-sasl-gssapi-xx.txt -share/doc/cyrus-sasl/draft-ietf-sasl-plain-xx.txt -share/doc/cyrus-sasl/draft-ietf-sasl-rfc2222bis-xx.txt -share/doc/cyrus-sasl/draft-ietf-sasl-rfc2831bis-xx.txt -share/doc/cyrus-sasl/draft-ietf-sasl-saslprep-xx.txt -share/doc/cyrus-sasl/draft-murchison-sasl-login-xx.txt -share/doc/cyrus-sasl/draft-newman-sasl-c-api-xx.txt -share/doc/cyrus-sasl/draft-newman-sasl-passdss-xx.txt share/doc/cyrus-sasl/gssapi.html share/doc/cyrus-sasl/index.html share/doc/cyrus-sasl/install.html share/doc/cyrus-sasl/macosx.html share/doc/cyrus-sasl/mechanisms.html share/doc/cyrus-sasl/options.html +share/doc/cyrus-sasl/os390.html share/doc/cyrus-sasl/plugprog.html share/doc/cyrus-sasl/programming.html share/doc/cyrus-sasl/readme.html -share/doc/cyrus-sasl/rfc1321.txt -share/doc/cyrus-sasl/rfc1939.txt -share/doc/cyrus-sasl/rfc2104.txt -share/doc/cyrus-sasl/rfc2195.txt -share/doc/cyrus-sasl/rfc2222.txt -share/doc/cyrus-sasl/rfc2243.txt -share/doc/cyrus-sasl/rfc2245.txt -share/doc/cyrus-sasl/rfc2289.txt -share/doc/cyrus-sasl/rfc2444.txt -share/doc/cyrus-sasl/rfc2595.txt -share/doc/cyrus-sasl/rfc2831.txt -share/doc/cyrus-sasl/rfc2945.txt -share/doc/cyrus-sasl/rfc3174.txt share/doc/cyrus-sasl/server-plugin-flow.fig share/doc/cyrus-sasl/sysadmin.html share/doc/cyrus-sasl/testing.txt diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo index 7903aee1aef..012f12b92d9 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1,20 +1,14 @@ -$NetBSD: distinfo,v 1.34 2016/09/11 06:11:15 richard Exp $ +$NetBSD: distinfo,v 1.35 2018/04/17 01:57:17 christos Exp $ -SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c -RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8 -SHA512 (cyrus-sasl-2.1.26.tar.gz) = 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 -Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes +SHA1 (cyrus-sasl-2.1.27-rc7.tar.gz) = d4b72782975be980cc46ac9ccf176b8307bfcf67 +RMD160 (cyrus-sasl-2.1.27-rc7.tar.gz) = 6679c7b887f73da50a314dba97f676848d067684 +SHA512 (cyrus-sasl-2.1.27-rc7.tar.gz) = 498b0f83e99f77dcf56bd2b735e71b554571703305ef9ef64038f04ef235b39d49e7b2363fc8b9952dbe2f4921542c31811e93618d7ceb468d73b4f6dafa89aa +Size (cyrus-sasl-2.1.27-rc7.tar.gz) = 4146356 bytes SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 7fef4cda079e451517b950e99dfd49f255b9d113 RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = c42b1b5c0b6c7322001fd506c44320a7f6eeee80 SHA512 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 08964bc3ad713e137b8f05f9bac345d79676d14784bc37525f195e8e2a3e6740428237b64f7eeeacc0c71ed6cf1664c6e9c2267ac6df327761d92174a1853744 Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 3836 bytes -SHA1 (patch-configure) = 473e4bb41d6e5c6ac136288b673880bd123853cf -SHA1 (patch-configure.in) = c1bc731ea44e13943dc3952c46a0e588364c1dc7 -SHA1 (patch-include_sasl.h) = 315e9e8236108b49955dbf304a56b17cd028a8d6 -SHA1 (patch-libsasl2.pc.in) = ef5679feef7afb12429071020892d88ecd7c43e6 -SHA1 (patch-plugins_otp.c) = 482dfaa16efd9577274ed43d90aaec1bcf451337 -SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20 -SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab +SHA1 (patch-configure) = 1afa4777f2cc2a24bb526fab9fb6d9265677fb9f +SHA1 (patch-plugins_otp.c) = 1dd8763d5b14c2f2462349ce5f73353ae70313fa +SHA1 (patch-saslauthd_Makefile.in) = 397bc893975ff4d8b0067dae571381f06486493d SHA1 (patch-saslauthd_ipc__doors.c) = 2470ed0f04a19f487811dec405f68ce91d4a4cd0 -SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde -SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed diff --git a/security/cyrus-sasl/patches/patch-configure b/security/cyrus-sasl/patches/patch-configure index 5579a69e111..25afa59942c 100644 --- a/security/cyrus-sasl/patches/patch-configure +++ b/security/cyrus-sasl/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.1 2013/10/20 17:56:02 joerg Exp $ +$NetBSD: patch-configure,v 1.2 2018/04/17 01:57:18 christos Exp $ ---- configure.orig 2013-10-20 15:45:41.000000000 +0000 -+++ configure -@@ -4346,9 +4346,9 @@ if test "${andrew_cv_runpath_switch+set} +--- configure.orig 2018-01-19 09:14:17.000000000 -0500 ++++ configure 2018-04-16 20:43:13.559772861 -0400 +@@ -6219,9 +6219,9 @@ $as_echo_n "(cached) " >&6 else @@ -11,39 +11,15 @@ $NetBSD: patch-configure,v 1.1 2013/10/20 17:56:02 joerg Exp $ SAVE_LDFLAGS="${LDFLAGS}" - LDFLAGS="-R /usr/lib" + LDFLAGS="${COMPILER_RPATH_FLAG} /usr/lib" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -6234,7 +6234,7 @@ + } _ACEOF -@@ -4385,7 +4385,7 @@ $as_echo "$ac_try_echo") >&5 - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_c_try_link "$LINENO"; then : - andrew_cv_runpath_switch="-R" + andrew_cv_runpath_switch="${COMPILER_RPATH_FLAG}" else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -14591,9 +14591,9 @@ case "$with_sqlite" in - $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;; - *) - if test -d ${with_sqlite}/lib; then -- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib" -+ LIB_SQLITE="-L${with_sqlite}/lib ${COMPILER_RPATH_FLAG}${with_sqlite}/lib" - else -- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}" -+ LIB_SQLITE="-L${with_sqlite} ${COMPILER_RPATH_FLAG}${with_sqlite}" - fi - - LIB_SQLITE_DIR=$LIB_SQLITE -@@ -14721,9 +14721,9 @@ case "$with_sqlite3" in - $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;; - *) - if test -d ${with_sqlite3}/lib; then -- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib" -+ LIB_SQLITE3="-L${with_sqlite3}/lib ${COMPILER_RPATH_FLAG}${with_sqlite3}/lib" - else -- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}" -+ LIB_SQLITE3="-L${with_sqlite3} ${COMPILER_RPATH_FLAG}${with_sqlite3}" - fi - LIB_SQLITE3_DIR=$LIB_SQLITE3 + LDFLAGS="-Wl,-rpath,/usr/lib" diff --git a/security/cyrus-sasl/patches/patch-configure.in b/security/cyrus-sasl/patches/patch-configure.in deleted file mode 100644 index 4a9b30d34d8..00000000000 --- a/security/cyrus-sasl/patches/patch-configure.in +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-configure.in,v 1.1 2013/10/20 17:56:02 joerg Exp $ - ---- configure.in.orig 2013-10-20 15:45:39.000000000 +0000 -+++ configure.in -@@ -861,9 +861,9 @@ case "$with_sqlite" in - notfound) AC_WARN([SQLite Library not found]); true;; - *) - if test -d ${with_sqlite}/lib; then -- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib" -+ LIB_SQLITE="-L${with_sqlite}/lib ${COMPILER_RPATH_FLAG}${with_sqlite}/lib" - else -- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}" -+ LIB_SQLITE="-L${with_sqlite} ${COMPILER_RPATH_FLAG}${with_sqlite}" - fi - - LIB_SQLITE_DIR=$LIB_SQLITE -@@ -913,9 +913,9 @@ case "$with_sqlite3" in - notfound) AC_WARN([SQLite3 Library not found]); true;; - *) - if test -d ${with_sqlite3}/lib; then -- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib" -+ LIB_SQLITE3="-L${with_sqlite3}/lib ${COMPILER_RPATH_FLAG}${with_sqlite3}/lib" - else -- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}" -+ LIB_SQLITE3="-L${with_sqlite3} ${COMPILER_RPATH_FLAG}${with_sqlite3}" - fi - - LIB_SQLITE3_DIR=$LIB_SQLITE3 diff --git a/security/cyrus-sasl/patches/patch-include_sasl.h b/security/cyrus-sasl/patches/patch-include_sasl.h deleted file mode 100644 index a533e7009a2..00000000000 --- a/security/cyrus-sasl/patches/patch-include_sasl.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-include_sasl.h,v 1.2 2013/09/30 06:24:09 obache Exp $ - -* #include <stddef.h> for size_t on NetBSD - http://git.cyrusimap.org/cyrus-sasl/commit/?id=67a188693796a14e3a76ac603104807fbbfddfc4 - ---- include/sasl.h.orig 2012-12-20 22:26:09.000000000 +0000 -+++ include/sasl.h -@@ -121,6 +121,8 @@ - #ifndef SASL_H - #define SASL_H 1 - -+#include <stddef.h> /* For size_t */ -+ - /* Keep in sync with win32/common.mak */ - #define SASL_VERSION_MAJOR 2 - #define SASL_VERSION_MINOR 1 diff --git a/security/cyrus-sasl/patches/patch-libsasl2.pc.in b/security/cyrus-sasl/patches/patch-libsasl2.pc.in deleted file mode 100644 index f5a95cb3fda..00000000000 --- a/security/cyrus-sasl/patches/patch-libsasl2.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-libsasl2.pc.in,v 1.1 2014/05/07 15:41:08 fhajny Exp $ - -Make the pkg-config file useful at all. ---- libsasl2.pc.in.orig 2012-10-12 14:05:48.000000000 +0000 -+++ libsasl2.pc.in -@@ -1,3 +1,4 @@ -+exec_prefix = @prefix@ - libdir = @libdir@ - - Name: Cyrus SASL diff --git a/security/cyrus-sasl/patches/patch-plugins_otp.c b/security/cyrus-sasl/patches/patch-plugins_otp.c index 0928bfea8af..aa686b9a21d 100644 --- a/security/cyrus-sasl/patches/patch-plugins_otp.c +++ b/security/cyrus-sasl/patches/patch-plugins_otp.c @@ -1,12 +1,11 @@ -$NetBSD: patch-plugins_otp.c,v 1.1 2015/11/10 08:46:06 manu Exp $ +$NetBSD: patch-plugins_otp.c,v 1.2 2018/04/17 01:57:18 christos Exp $ Fix the OTP plugin on 32 bit machines and add SHA2 support Submitted upstream as https://bugzilla.cyrusimap.org/show_bug.cgi?id=3914 ---- plugins/otp.c.orig 2012-10-12 16:05:48.000000000 +0200 -+++ plugins/otp.c 2015-11-07 15:19:43.000000000 +0100 -@@ -92,8 +92,12 @@ - static algorithm_option_t algorithm_options[] = { +--- plugins/otp.c.orig 2016-12-10 10:54:27.000000000 -0500 ++++ plugins/otp.c 2018-04-16 20:09:59.910785912 -0400 +@@ -91,6 +91,10 @@ {"md4", 0, "md4"}, {"md5", 0, "md5"}, {"sha1", 4, "sha1"}, @@ -17,9 +16,7 @@ Submitted upstream as https://bugzilla.cyrusimap.org/show_bug.cgi?id=3914 {NULL, 0, NULL} }; - /* Convert the binary data into ASCII hex */ -@@ -675,9 +679,9 @@ - SETERROR(utils, "OTP secret too short"); +@@ -706,7 +710,7 @@ return SASL_FAIL; } @@ -28,4 +25,3 @@ Submitted upstream as https://bugzilla.cyrusimap.org/show_bug.cgi?id=3914 alg, seq, seed, buf, timeout); hex2bin(buf, otp, OTP_HASH_SIZE); - diff --git a/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in b/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in index e4eeeb9898c..387d2b4dba8 100644 --- a/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in +++ b/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in @@ -1,11 +1,22 @@ -$NetBSD: patch-saslauthd_Makefile.in,v 1.1 2012/09/22 06:20:21 obache Exp $ +$NetBSD: patch-saslauthd_Makefile.in,v 1.2 2018/04/17 01:57:18 christos Exp $ * install man source into $(mandir)/man8 instead of catman. https://bugzilla.cyrusimap.org/show_bug.cgi?id=3740 ---- saslauthd/Makefile.in.orig 2011-09-07 13:13:56.000000000 +0000 -+++ saslauthd/Makefile.in -@@ -720,9 +720,9 @@ dist-hook: saslauthd.8 +--- saslauthd/Makefile.in.orig 2018-01-19 09:14:18.000000000 -0500 ++++ saslauthd/Makefile.in 2018-04-16 21:21:07.610121926 -0400 +@@ -89,8 +89,8 @@ + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-sbin_PROGRAMS = saslauthd$(EXEEXT) testsaslauthd$(EXEEXT) +-EXTRA_PROGRAMS = saslcache$(EXEEXT) ++sbin_PROGRAMS = saslauthd$(EXEEXT) testsaslauthd$(EXEEXT) saslcache$(EXEEXT) ++#EXTRA_PROGRAMS = saslcache$(EXEEXT) + subdir = saslauthd + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ +@@ -787,9 +787,9 @@ saslauthd.8: saslauthd.mdoc nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8 @@ -15,5 +26,5 @@ $NetBSD: patch-saslauthd_Makefile.in,v 1.1 2012/09/22 06:20:21 obache Exp $ - $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 + $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. + uninstall-local: + -rm -rf $(DESTDIR)$(mandir)/man8/saslauthd.8 diff --git a/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c b/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c deleted file mode 100644 index 3d86f729874..00000000000 --- a/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-saslauthd_auth__rimap.c,v 1.3 2013/09/30 05:44:33 obache Exp $ - -* Added missing include files for struct timeval - http://git.cyrusimap.org/cyrus-sasl/commit/?id=f2e77ab1ac01f611d71ae56ff7635a46b930ef8e - ---- saslauthd/auth_rimap.c.orig 2012-10-12 14:05:48.000000000 +0000 -+++ saslauthd/auth_rimap.c -@@ -75,6 +75,16 @@ - #include <arpa/inet.h> - #include <signal.h> - #include <netdb.h> -+#if TIME_WITH_SYS_TIME -+# include <sys/time.h> -+# include <time.h> -+#else -+# if HAVE_SYS_TIME_H -+# include <sys/time.h> -+# else -+# include <time.h> -+# endif -+#endif - - #include "auth_rimap.h" - #include "utils.h" diff --git a/security/cyrus-sasl/patches/patch-saslauthd_md5global.h b/security/cyrus-sasl/patches/patch-saslauthd_md5global.h deleted file mode 100644 index efb6979fe09..00000000000 --- a/security/cyrus-sasl/patches/patch-saslauthd_md5global.h +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-saslauthd_md5global.h,v 1.1 2011/09/17 11:32:02 obache Exp $ - -* use standard types for certain bits types. - ---- saslauthd/md5global.h.orig 2003-03-28 19:59:24.000000000 +0000 -+++ saslauthd/md5global.h -@@ -3,6 +3,13 @@ - #ifndef MD5GLOBAL_H - #define MD5GLOBAL_H - -+#ifdef HAVE_STDINT_H -+#include <stdint.h> -+#endif -+#ifdef HAVE_INTTYPES_H -+#include <inttypes.h> -+#endif -+ - /* PROTOTYPES should be set to one if and only if the compiler supports - function argument prototyping. - The following makes PROTOTYPES default to 0 if it has not already -@@ -15,13 +22,13 @@ The following makes PROTOTYPES default t - /* POINTER defines a generic pointer type */ - typedef unsigned char *POINTER; - --typedef signed char INT1; /* 8 bits */ --typedef short INT2; /* 16 bits */ --typedef int INT4; /* 32 bits */ -+typedef int8_t INT1; /* 8 bits */ -+typedef int16_t INT2; /* 16 bits */ -+typedef int32_t INT4; /* 32 bits */ - /* There is no 64 bit type */ --typedef unsigned char UINT1; /* 8 bits */ --typedef unsigned short UINT2; /* 16 bits */ --typedef unsigned int UINT4; /* 32 bits */ -+typedef uint8_t UINT1; /* 8 bits */ -+typedef uint16_t UINT2; /* 16 bits */ -+typedef uint32_t UINT4; /* 32 bits */ - /* There is no 64 bit type */ - - /* PROTO_LIST is defined depending on how PROTOTYPES is defined above. diff --git a/security/cyrus-sasl/patches/patch-saslauthd_saslcache.c b/security/cyrus-sasl/patches/patch-saslauthd_saslcache.c deleted file mode 100644 index 65b2e6afab4..00000000000 --- a/security/cyrus-sasl/patches/patch-saslauthd_saslcache.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-saslauthd_saslcache.c,v 1.1 2011/09/17 11:32:02 obache Exp $ - -* fixes build with gcc-4. - ---- saslauthd/saslcache.c.orig 2003-03-28 19:59:24.000000000 +0000 -+++ saslauthd/saslcache.c -@@ -137,7 +137,7 @@ int main(int argc, char **argv) { - } - - table_stats = shm_base + 64; -- (char *)table = (char *)table_stats + 128; -+ table = (struct bucket *)((char *)table_stats + 128); - - if (dump_stat_info == 0 && dump_user_info == 0) - dump_stat_info = 1; diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile index 03f857717cf..8b356172ebd 100644 --- a/security/cyrus-saslauthd/Makefile +++ b/security/cyrus-saslauthd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2017/04/27 13:56:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.53 2018/04/17 01:57:18 christos Exp $ PKGNAME= ${DISTNAME:S/sasl/saslauthd/} -PKGREVISION= 7 +#PKGREVISION= 7 CONFLICTS+= cyrus-sasl<2.1.15nb2 .include "../../security/cyrus-sasl/Makefile.common" @@ -10,7 +10,7 @@ COMMENT= Cyrus SASL plaintext authentication daemon CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -BUILD_TARGET= all saslcache +BUILD_TARGET= all SASLSOCKETDIR?= ${VARBASE}/run/saslauthd BUILD_DEFS+= SASLSOCKETDIR diff --git a/security/cyrus-saslauthd/PLIST b/security/cyrus-saslauthd/PLIST index 2102aebc0da..329855b3fa0 100644 --- a/security/cyrus-saslauthd/PLIST +++ b/security/cyrus-saslauthd/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.13 2014/03/11 14:05:13 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.14 2018/04/17 01:57:18 christos Exp $ bin/saslcache man/man8/saslauthd.8 +sbin/saslcache sbin/saslauthd sbin/testsaslauthd ${PLIST.ldap}share/doc/cyrus-saslauthd/LDAP_SASLAUTHD |