summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/cy2-gssapi/Makefile3
-rw-r--r--security/cy2-sql/Makefile3
-rw-r--r--security/cyrus-sasl/Makefile6
-rw-r--r--security/cyrus-sasl/Makefile.common8
-rw-r--r--security/cyrus-sasl/PLIST3
-rw-r--r--security/cyrus-sasl/buildlink3.mk4
-rw-r--r--security/cyrus-sasl/distinfo10
-rw-r--r--security/cyrus-sasl/patches/patch-plugins_gssapi.c25
-rw-r--r--security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c12
-rw-r--r--security/cyrus-saslauthd/Makefile3
10 files changed, 32 insertions, 45 deletions
diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile
index e8e1f993482..d4e76d81e13 100644
--- a/security/cy2-gssapi/Makefile
+++ b/security/cy2-gssapi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2012/10/23 18:16:23 asau Exp $
+# $NetBSD: Makefile,v 1.19 2012/12/16 01:36:43 obache Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
-PKGREVISION= 1
COMMENT= Cyrus SASL GSSAPI authentication plugin
SASL_PLUGIN= yes
diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile
index dc21d59e920..c637ab2580e 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2012/10/23 18:16:24 asau Exp $
+# $NetBSD: Makefile,v 1.21 2012/12/16 01:36:44 obache Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION= 2
COMMENT= Cyrus SASL SQL authentication plugin
SASL_PLUGIN= yes
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 0a2d923b3c6..56405154821 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2012/10/23 18:16:24 asau Exp $
+# $NetBSD: Makefile,v 1.65 2012/12/16 01:36:44 obache Exp $
SVR4_PKGNAME= csasl
COMMENT= Simple Authentication and Security Layer
@@ -15,7 +15,7 @@ SASL_DBTYPE?= berkeley
BUILD_DEFS+= SASL_DBTYPE
.if ${SASL_DBTYPE} == "berkeley"
-BDB_ACCEPTED= db3 db4
+BDB_ACCEPTED= db3 db4 db5
. include "../../mk/bdb.buildlink3.mk"
CONFIGURE_ENV+= with_bdb=${BDB_TYPE}
.endif
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --with-devrandom=${SASL_ENTROPY_SOURCE:Q}
BUILD_DEFS+= SASL_ENTROPY_SOURCE
# Let not to build sample codes.
-CONFIGURE_ARGS+= --disable-sample
+CONFIGURE_ARGS+= --enable-sample=no
# CYRUS_USER username of the Cyrus administrator
# CYRUS_GROUP group of the Cyrus administrator
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index 85e1434cd6f..2844f02aad6 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2012/02/28 00:52:56 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.19 2012/12/16 01:36:44 obache Exp $
#
# used by security/cyrus-sasl/Makefile
# used by security/cy2-anonymous/Makefile
@@ -17,13 +17,13 @@
# This Makefile fragment should be included _below_ any SASL_PLUGIN
# definition and _above_ any CONFIGURE_ARGS definitions.
-DISTNAME= cyrus-sasl-2.1.25
+DISTNAME= cyrus-sasl-2.1.26
CATEGORIES= security
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
MAINTAINER= obache@NetBSD.org
-HOMEPAGE= http://asg.web.cmu.edu/sasl/
+HOMEPAGE= http://www.cyrussasl.org/
LICENSE= original-bsd # CMU version
DISTINFO_FILE= ${.CURDIR}/../cyrus-sasl/distinfo
@@ -76,6 +76,8 @@ CONFIGURE_ARGS+= --without-openssl
CONFIGURE_ARGS+= --without-pam
CONFIGURE_ARGS+= --without-saslauthd
+PKGCONFIG_OVERRIDE+= libsasl2.pc.in
+
# 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 74b3790c9aa..26b357bdda9 100644
--- a/security/cyrus-sasl/PLIST
+++ b/security/cyrus-sasl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:13:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/12/16 01:36:44 obache Exp $
include/sasl/hmac-md5.h
include/sasl/md5.h
include/sasl/md5global.h
@@ -7,6 +7,7 @@ include/sasl/sasl.h
include/sasl/saslplug.h
include/sasl/saslutil.h
lib/libsasl2.la
+lib/pkgconfig/libsasl2.pc
lib/sasl2/libsasldb.la
man/man3/sasl.3
man/man3/sasl_authorize_t.3
diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk
index ee45d0358fd..b442fecc266 100644
--- a/security/cyrus-sasl/buildlink3.mk
+++ b/security/cyrus-sasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:53:55 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2012/12/16 01:36:44 obache Exp $
BUILDLINK_TREE+= cyrus-sasl
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= cyrus-sasl
CYRUS_SASL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.12
-BUILDLINK_ABI_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.20nb3
+BUILDLINK_ABI_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.26
BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl
# Cyrus SASL mechanisms are shared modules loaded via dlopen().
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 0e5ecb0aa80..3b1ae6f947a 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2012/09/22 06:20:21 obache Exp $
+$NetBSD: distinfo,v 1.22 2012/12/16 01:36:44 obache Exp $
-SHA1 (cyrus-sasl-2.1.25.tar.gz) = b6c34426012d9b5d448d5646cbecd818a5eeacbf
-RMD160 (cyrus-sasl-2.1.25.tar.gz) = c9ed9093828f7f7bb1b35c8a690cadbcd44f3862
-Size (cyrus-sasl-2.1.25.tar.gz) = 5209240 bytes
-SHA1 (patch-plugins_gssapi.c) = 05c5dcad2b3cc793edbd128aff95146d9923a21c
+SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c
+RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8
+Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes
SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20
+SHA1 (patch-saslauthd_auth__rimap.c) = fcc8a64e3c64bfceac17bb9dc6829da784f03a4f
SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde
SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed
diff --git a/security/cyrus-sasl/patches/patch-plugins_gssapi.c b/security/cyrus-sasl/patches/patch-plugins_gssapi.c
deleted file mode 100644
index 8ea3bd14125..00000000000
--- a/security/cyrus-sasl/patches/patch-plugins_gssapi.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-plugins_gssapi.c,v 1.1 2012/01/02 03:25:57 obache Exp $
-
-* Fixes a segfault in gssapi.c
- http://git.cyrusimap.org/cyrus-sasl/commit/?id=fa289f15ceb2b9c64bdcf057a75469808454190d
-
---- plugins/gssapi.c.orig 2011-05-11 19:25:55.000000000 +0000
-+++ plugins/gssapi.c
-@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
- }
-
- if (output_token->value && output) {
-- unsigned char * p = (unsigned char *) text->encode_buf;
-+ unsigned char * p;
-
- ret = _plug_buf_alloc(text->utils,
- &(text->encode_buf),
-@@ -383,6 +383,8 @@ sasl_gss_encode(void *context, const str
- GSS_UNLOCK_MUTEX(text->utils);
- return ret;
- }
-+
-+ p = (unsigned char *) text->encode_buf;
-
- p[0] = (output_token->length>>24) & 0xFF;
- p[1] = (output_token->length>>16) & 0xFF;
diff --git a/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c b/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c
new file mode 100644
index 00000000000..83c46a113f9
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-saslauthd_auth__rimap.c,v 1.1 2012/12/16 01:36:44 obache Exp $
+
+--- saslauthd/auth_rimap.c.orig 2012-10-12 14:05:48.000000000 +0000
++++ saslauthd/auth_rimap.c
+@@ -71,6 +71,7 @@
+ #include <syslog.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <signal.h>
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index 40a9e65a953..8f92d1e2723 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2012/10/23 18:16:24 asau Exp $
+# $NetBSD: Makefile,v 1.44 2012/12/16 01:36:44 obache Exp $
PKGNAME= ${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION= 1
CONFLICTS+= cyrus-sasl<2.1.15nb2
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 20:27:26 +0000