Hi.
This diff updates cyrus-sasl2 to version 2.1.22.
Changelog is available in the tarball.
Regarding the port in itself changes are:
- fmt -w72 pkg/DESCR
- use PFRAG.sql for all sql related FLAVORS (mysql, pgsql, sqlite) as
they use the same files (and conflict with each others)
- use a variable for the broken FLAVOR combination message
I would appreciate wide testing of this and the applications that depend
on it.
Thanks.
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/cyrus-sasl2/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile 1 Jun 2007 16:49:22 -0000 1.39
+++ Makefile 7 Jun 2007 11:30:48 -0000
@@ -2,18 +2,17 @@
COMMENT= "RFC 2222 SASL (Simple Authentication and Security Layer)"
-DISTNAME= cyrus-sasl-2.1.21
-PKGNAME= ${DISTNAME}p5
-SHARED_LIBS= anonymous 2.21 \
- crammd5 2.21 \
- digestmd5 2.21 \
- gssapiv2 2.21 \
- login 2.21 \
- otp 2.21 \
- plain 2.21 \
- sasl2 2.21 \
- sasldb 2.21 \
- sql 2.21
+DISTNAME= cyrus-sasl-2.1.22
+SHARED_LIBS= anonymous 2.22 \
+ crammd5 2.22 \
+ digestmd5 2.22 \
+ gssapiv2 2.22 \
+ login 2.22 \
+ otp 2.22 \
+ plain 2.22 \
+ sasl2 2.22 \
+ sasldb 2.22 \
+ sql 2.22
CATEGORIES= security
HOMEPAGE= http://asg.web.cmu.edu/sasl/
@@ -49,6 +48,9 @@
FLAVORS= db4 ldap mysql pgsql sqlite
FLAVOR?=
+BRKFLAVORMSG= choose either mysql, pgsql or sqlite
+PKG_ARGS?= -Dsql=0
+
.if ${FLAVOR:L:Mdb4}
CONFIGURE_ARGS+=--with-dblib=berkeley \
--with-bdb-libdir="${LOCALBASE}/lib/db4" \
@@ -69,8 +71,9 @@
.if ${FLAVOR:L:Mmysql}
.if ${FLAVOR:L:Mpgsql} || ${FLAVOR:L:Msqlite}
-BROKEN= choose either mysql or pgsql or sqlite
+BROKEN= ${BRKFLAVORMSG}
.endif
+PKG_ARGS= -Dsql=1
LIB_DEPENDS+= lib/mysql/mysqlclient.>=10::databases/mysql
WANTLIB+= m ssl z
CONFIGURE_ARGS+=--enable-sql \
@@ -81,8 +84,9 @@
.if ${FLAVOR:L:Mpgsql}
.if ${FLAVOR:L:Mmysql} || ${FLAVOR:L:Msqlite}
-BROKEN= choose either mysql or pgsql or sqlite
+BROKEN= ${BRKFLAVORMSG}
.endif
+PKG_ARGS= -Dsql=1
LIB_DEPENDS+= pq.>=3:postgresql-client-*:databases/postgresql
CONFIGURE_ARGS+=--enable-sql \
--without-mysql \
@@ -93,8 +97,9 @@
.if ${FLAVOR:L:Msqlite}
.if ${FLAVOR:L:Mmysql} || ${FLAVOR:L:Mpgsql}
-BROKEN= choose either mysql or pgsql or sqlite
+BROKEN= ${BRKFLAVORMSG}
.endif
+PKG_ARGS= -Dsql=1
LIB_DEPENDS+= sqlite.>=8.6::databases/sqlite
CONFIGURE_ARGS+=--enable-sql \
--without-mysql \
@@ -102,7 +107,7 @@
--with-sqlite
.endif
-post-extract:
+pre-configure:
@perl -pi -e "s,/usr/local/etc,${SYSCONFDIR},g" \
${WRKSRC}/saslauthd/saslauthd.mdoc
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/cyrus-sasl2/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo 5 Apr 2007 17:26:06 -0000 1.11
+++ distinfo 7 Jun 2007 11:30:48 -0000
@@ -1,5 +1,5 @@
-MD5 (cyrus-sasl-2.1.21.tar.gz) = 3eAtsjTeqJK+4pg5CJBQLg==
-RMD160 (cyrus-sasl-2.1.21.tar.gz) = k+DhhoRTxXgWArXM4j50a4gjoms=
-SHA1 (cyrus-sasl-2.1.21.tar.gz) = ZEn3MMlj0p1DYAqVNzpuLbUtbWY=
-SHA256 (cyrus-sasl-2.1.21.tar.gz) = +je8yLhVWXqh5rcpFbOJhZkbSr1Oe8EWw+iP1OhvsPs=
-SIZE (cyrus-sasl-2.1.21.tar.gz) = 1584931
+MD5 (cyrus-sasl-2.1.22.tar.gz) = Rd3p0ZGTrp3TiOtosgJ7yQ==
+RMD160 (cyrus-sasl-2.1.22.tar.gz) = CG4g0BWIy4beytABJEtyo3IjNUw=
+SHA1 (cyrus-sasl-2.1.22.tar.gz) = 0jRUqxIFRxSrl9IpyGy5NM5j+7E=
+SHA256 (cyrus-sasl-2.1.22.tar.gz) = xp44U/NbFO4sP26HbkLYgJJyWP9GeKoFLl8IU9sgmWI=
+SIZE (cyrus-sasl-2.1.22.tar.gz) = 1609278
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/security/cyrus-sasl2/patches/patch-configure,v
retrieving revision 1.9
diff -u -r1.9 patch-configure
--- patches/patch-configure 20 Dec 2005 05:57:19 -0000 1.9
+++ patches/patch-configure 7 Jun 2007 11:30:48 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2005/12/20 05:57:19 pvalchev Exp $
---- configure.orig Sat May 14 23:58:28 2005
-+++ configure Mon Dec 19 18:27:04 2005
-@@ -3944,7 +3944,7 @@ _ACEOF
+--- configure.orig Thu May 18 21:30:13 2006
++++ configure Fri Jun 1 08:48:08 2007
+@@ -3945,7 +3945,7 @@ _ACEOF
fi
if test "$ac_cv_c_compiler_gnu" = yes; then
@@ -10,16 +10,43 @@
fi
-@@ -9447,7 +9447,7 @@ if test $ac_cv_lib_resolv_res_search = y
+@@ -4526,7 +4526,7 @@ echo "${ECHO_T}$ac_cv_func_res_search" >&6
+ if test $ac_cv_func_res_search = yes; then
+ :
+ else
+- LIBS="-lresolv $LIB_SOCKET $save_LIBS"
++ LIBS="$LIB_SOCKET $save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+@@ -4567,7 +4567,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- LIB_SOCKET="-lresolv $LIB_SOCKET"
++ LIB_SOCKET="$LIB_SOCKET"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9480,7 +9480,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv $LIBS"
++LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+@@ -9533,7 +9533,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
#define HAVE_LIBRESOLV 1
_ACEOF
- LIBS="-lresolv $LIBS"
-+ #LIBS="-lresolv $LIBS"
++ LIBS="$LIBS"
fi
-@@ -10159,6 +10159,9 @@ if test "$gssapi" != no; then
+@@ -10245,6 +10245,9 @@ if test "$gssapi" != no; then
*-*-aix*)
platform=__aix
;;
@@ -29,7 +56,7 @@
*)
{ echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
-@@ -10173,7 +10176,7 @@ echo "$as_me: error: CyberSafe was force
+@@ -10259,7 +10262,7 @@ echo "$as_me: error: CyberSafe was forced, cannot cont
cmu_saved_CPPFLAGS=$CPPFLAGS
if test -d ${gssapi}; then
@@ -38,16 +65,25 @@
# We want to keep -I in our CPPFLAGS, but only if we succeed
cmu_saved_CPPFLAGS=$CPPFLAGS
LDFLAGS="$LDFLAGS -L$gssapi/lib"
-@@ -10537,7 +10540,7 @@ if test $ac_cv_lib_resolv_res_search = y
+@@ -10570,7 +10573,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv $LIBS"
++LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+@@ -10623,7 +10626,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
#define HAVE_LIBRESOLV 1
_ACEOF
- LIBS="-lresolv $LIBS"
-+ #LIBS="-lresolv $LIBS"
++ LIBS="$LIBS"
fi
-@@ -10564,7 +10567,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
+@@ -10650,7 +10653,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -56,8 +92,8 @@
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -10914,8 +10917,8 @@ fi
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+@@ -11060,8 +11063,8 @@ fi
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
@@ -67,7 +103,16 @@
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-@@ -11154,7 +11157,7 @@ fi
+@@ -11251,7 +11254,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv $LIBS"
++LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+@@ -11300,7 +11303,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
if test $ac_cv_lib_resolv_res_search = yes; then
@@ -76,21 +121,21 @@
fi
SASL_MECHS="$SASL_MECHS libgssapiv2.la"
-@@ -12760,7 +12763,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se
+@@ -12923,7 +12926,7 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-+#LIBS="-lresolv $LIBS"
++LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -12813,7 +12816,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye
+@@ -12976,7 +12979,7 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
#define HAVE_LIBRESOLV 1
_ACEOF
- LIBS="-lresolv $LIBS"
-+ #IBS="-lresolv $LIBS"
++ LIBS="$LIBS"
fi
Index: patches/patch-saslauthd_Makefile_in
===================================================================
RCS file: /cvs/ports/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in,v
retrieving revision 1.7
diff -u -r1.7 patch-saslauthd_Makefile_in
--- patches/patch-saslauthd_Makefile_in 18 Dec 2005 10:37:26 -0000 1.7
+++ patches/patch-saslauthd_Makefile_in 7 Jun 2007 11:30:48 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-saslauthd_Makefile_in,v 1.7 2005/12/18 10:37:26 jakob Exp $
---- saslauthd/Makefile.in.orig Sun May 15 15:59:08 2005
-+++ saslauthd/Makefile.in Thu Jun 9 06:56:12 2005
-@@ -618,7 +618,7 @@ saslauthd.8: saslauthd.mdoc
+--- saslauthd/Makefile.in.orig Fri Jun 1 08:12:05 2007
++++ saslauthd/Makefile.in Fri Jun 1 08:13:41 2007
+@@ -621,7 +621,7 @@ saslauthd.8: saslauthd.mdoc
install-data-local: saslauthd.8
- $(mkinstalldirs) $(DESTDIR)$(mandir)/cat8
-- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8
+- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
+ $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.0
# 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.
Index: patches/patch-saslauthd_configure
===================================================================
RCS file: /cvs/ports/security/cyrus-sasl2/patches/patch-saslauthd_configure,v
retrieving revision 1.11
diff -u -r1.11 patch-saslauthd_configure
--- patches/patch-saslauthd_configure 2 Feb 2006 18:41:20 -0000 1.11
+++ patches/patch-saslauthd_configure 7 Jun 2007 11:30:48 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-saslauthd_configure,v 1.11 2006/02/02 18:41:20 jakob Exp $
---- saslauthd/configure.orig Sun May 15 07:59:04 2005
-+++ saslauthd/configure Tue Jan 24 19:33:31 2006
+--- saslauthd/configure.orig Thu May 18 21:30:20 2006
++++ saslauthd/configure Fri Jun 1 08:49:08 2007
@@ -753,10 +753,10 @@ ac_env_CC_set=${CC+set}
ac_env_CC_value=$CC
ac_cv_env_CC_set=${CC+set}
@@ -9,32 +9,50 @@
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-+# ac_env_CFLAGS_set=${CFLAGS+set}
-+# ac_env_CFLAGS_value=$CFLAGS
-+# ac_cv_env_CFLAGS_set=${CFLAGS+set}
-+# ac_cv_env_CFLAGS_value=$CFLAGS
++#ac_env_CFLAGS_set=${CFLAGS+set}
++#ac_env_CFLAGS_value=$CFLAGS
++#ac_cv_env_CFLAGS_set=${CFLAGS+set}
++#ac_cv_env_CFLAGS_value=$CFLAGS
ac_env_LDFLAGS_set=${LDFLAGS+set}
ac_env_LDFLAGS_value=$LDFLAGS
ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-@@ -5612,7 +5612,7 @@ if test "${ac_cv_lib_resolv_res_search+s
+@@ -3617,7 +3617,7 @@ echo "${ECHO_T}$ac_cv_func_res_search" >&6
+ if test $ac_cv_func_res_search = yes; then
+ :
+ else
+- LIBS="-lresolv $LIB_SOCKET $save_LIBS"
++ LIBS="$LIB_SOCKET $save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+@@ -3658,7 +3658,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- LIB_SOCKET="-lresolv $LIB_SOCKET"
++ LIB_SOCKET="$LIB_SOCKET"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5673,7 +5673,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-+# LIBS="-lresolv $LIBS"
++LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -5665,7 +5665,7 @@ if test $ac_cv_lib_resolv_res_search = y
+@@ -5726,7 +5726,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
#define HAVE_LIBRESOLV 1
_ACEOF
- LIBS="-lresolv $LIBS"
-+# LIBS="-lresolv $LIBS"
++ LIBS="$LIBS"
fi
-@@ -6377,6 +6377,9 @@ if test "$gssapi" != no; then
+@@ -6438,6 +6438,9 @@ if test "$gssapi" != no; then
*-*-aix*)
platform=__aix
;;
@@ -44,7 +62,7 @@
*)
{ echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
-@@ -6391,7 +6394,7 @@ echo "$as_me: error: CyberSafe was force
+@@ -6452,7 +6455,7 @@ echo "$as_me: error: CyberSafe was forced, cannot cont
cmu_saved_CPPFLAGS=$CPPFLAGS
if test -d ${gssapi}; then
@@ -53,30 +71,30 @@
# We want to keep -I in our CPPFLAGS, but only if we succeed
cmu_saved_CPPFLAGS=$CPPFLAGS
LDFLAGS="$LDFLAGS -L$gssapi/lib"
-@@ -6702,7 +6705,7 @@ if test "${ac_cv_lib_resolv_res_search+s
+@@ -6763,7 +6766,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-+#LIBS="-lresolv $LIBS"
++LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -6755,7 +6758,7 @@ if test $ac_cv_lib_resolv_res_search = y
+@@ -6816,7 +6819,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
#define HAVE_LIBRESOLV 1
_ACEOF
- LIBS="-lresolv $LIBS"
-+# LIBS="-lresolv $LIBS"
++ LIBS="$LIBS"
fi
-@@ -7128,12 +7131,12 @@ fi
+@@ -7249,12 +7252,12 @@ fi
fi
if test "$gss_impl" = "mit"; then
-- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
+- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err"
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libcrypto.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
elif test "$gss_impl" = "heimdal"; then
@@ -88,30 +106,39 @@
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-@@ -7323,7 +7326,7 @@ if test "${ac_cv_lib_resolv_res_search+s
+@@ -7444,7 +7447,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-+#LIBS="-lresolv $LIBS"
++LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -9568,7 +9571,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se
+@@ -7493,7 +7496,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
+ echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
+ if test $ac_cv_lib_resolv_res_search = yes; then
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS"
+ fi
+
+ SASL_MECHS="$SASL_MECHS libgssapiv2.la"
+@@ -9704,7 +9707,7 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-+#LIBS="-lresolv $LIBS"
++LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -9621,7 +9624,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye
+@@ -9757,7 +9760,7 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
#define HAVE_LIBRESOLV 1
_ACEOF
- LIBS="-lresolv $LIBS"
-+# LIBS="-lresolv $LIBS"
++ LIBS="$LIBS"
fi
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/security/cyrus-sasl2/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- pkg/DESCR 1 Jun 2007 15:24:26 -0000 1.3
+++ pkg/DESCR 7 Jun 2007 11:30:48 -0000
@@ -1,11 +1,11 @@
-The Cyrus SASL (Simple Authentication and Security Layer) Library v2
+The Cyrus SASL (Simple Authentication and Security Layer) Library v2.
-SASL is the Simple Authentication and Security Layer, a method for adding
-authentication support to connection-based protocols. To use SASL, a
-protocol includes a command for identifying and authenticating a user to a
-server and for optionally negotiating protection of subsequent protocol
-interactions. If its use is negotiated, a security layer is inserted
-between the protocol and the connection.
+SASL is the Simple Authentication and Security Layer, a method for
+adding authentication support to connection-based protocols. To use
+SASL, a protocol includes a command for identifying and authenticating a
+user to a server and for optionally negotiating protection of subsequent
+protocol interactions. If its use is negotiated, a security layer is
+inserted between the protocol and the connection.
Available flavors:
db4 - use Berkeley DB v4 for SASLDB (instead of ndbm)
Index: pkg/PFRAG.mysql
===================================================================
RCS file: pkg/PFRAG.mysql
diff -N pkg/PFRAG.mysql
--- pkg/PFRAG.mysql 5 Jan 2005 10:03:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.mysql,v 1.1 2005/01/05 10:03:14 jakob Exp $
-%%SHARED%%
-lib/sasl2/libsql.a
-lib/sasl2/libsql.la
Index: pkg/PFRAG.pgsql
===================================================================
RCS file: pkg/PFRAG.pgsql
diff -N pkg/PFRAG.pgsql
--- pkg/PFRAG.pgsql 5 Jan 2005 10:03:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.pgsql,v 1.1 2005/01/05 10:03:14 jakob Exp $
-%%SHARED%%
-lib/sasl2/libsql.a
-lib/sasl2/libsql.la
Index: pkg/PFRAG.shared-mysql
===================================================================
RCS file: pkg/PFRAG.shared-mysql
diff -N pkg/PFRAG.shared-mysql
--- pkg/PFRAG.shared-mysql 24 Dec 2005 20:52:58 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared-mysql,v 1.3 2005/12/24 20:52:58 sturm Exp $
[EMAIL PROTECTED] lib/sasl2/libsql.so.${LIBsql_VERSION}
Index: pkg/PFRAG.shared-pgsql
===================================================================
RCS file: pkg/PFRAG.shared-pgsql
diff -N pkg/PFRAG.shared-pgsql
--- pkg/PFRAG.shared-pgsql 24 Dec 2005 20:52:58 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared-pgsql,v 1.3 2005/12/24 20:52:58 sturm Exp $
[EMAIL PROTECTED] lib/sasl2/libsql.so.${LIBsql_VERSION}
Index: pkg/PFRAG.shared-sql
===================================================================
RCS file: pkg/PFRAG.shared-sql
diff -N pkg/PFRAG.shared-sql
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared-sql 7 Jun 2007 11:30:48 -0000
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] lib/sasl2/libsql.so.${LIBsql_VERSION}
Index: pkg/PFRAG.shared-sqlite
===================================================================
RCS file: pkg/PFRAG.shared-sqlite
diff -N pkg/PFRAG.shared-sqlite
--- pkg/PFRAG.shared-sqlite 24 Dec 2005 20:52:58 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared-sqlite,v 1.3 2005/12/24 20:52:58 sturm Exp $
[EMAIL PROTECTED] lib/sasl2/libsql.so.${LIBsql_VERSION}
Index: pkg/PFRAG.sql
===================================================================
RCS file: pkg/PFRAG.sql
diff -N pkg/PFRAG.sql
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.sql 7 Jun 2007 11:30:48 -0000
@@ -0,0 +1,4 @@
[EMAIL PROTECTED] $OpenBSD$
+%%SHARED%%
+lib/sasl2/libsql.a
+lib/sasl2/libsql.la
Index: pkg/PFRAG.sqlite
===================================================================
RCS file: pkg/PFRAG.sqlite
diff -N pkg/PFRAG.sqlite
--- pkg/PFRAG.sqlite 5 Jan 2005 10:03:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.sqlite,v 1.1 2005/01/05 10:03:14 jakob Exp $
-%%SHARED%%
-lib/sasl2/libsql.a
-lib/sasl2/libsql.la
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/cyrus-sasl2/pkg/PLIST,v
retrieving revision 1.14
diff -u -r1.14 PLIST
--- pkg/PLIST 18 Dec 2005 10:37:26 -0000 1.14
+++ pkg/PLIST 7 Jun 2007 11:30:48 -0000
@@ -50,6 +50,7 @@
@man man/man3/sasl_errdetail.3
@man man/man3/sasl_errors.3
@man man/man3/sasl_errstring.3
[EMAIL PROTECTED] man/man3/sasl_getconfpath_t.3
@man man/man3/sasl_getopt_t.3
@man man/man3/sasl_getpath_t.3
@man man/man3/sasl_getprop.3
@@ -70,8 +71,10 @@
@man man/man3/sasl_setprop.3
@man man/man3/sasl_user_exists.3
@man man/man3/sasl_verifyfile_t.3
[EMAIL PROTECTED] man/man8/pluginviewer.8
@man man/man8/sasldblistusers2.8
@man man/man8/saslpasswd2.8
+sbin/pluginviewer
sbin/saslauthd
sbin/sasldblistusers2
sbin/saslpasswd2
@@ -117,9 +120,7 @@
share/doc/sasl2/testing.txt
share/doc/sasl2/upgrading.html
share/doc/sasl2/windows.html
-%%mysql%%
-%%pgsql%%
-%%sqlite%%
+%%sql%%
%%SHARED%%
@sample /var/sasl2/
@extraunexec rm -rf /var/sasl2/*
