cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Cyrus SASL 2.1.20; thanks to Ben Hooper for diffs

Browse Source
This commit is contained in:
jakob 2004-11-03 10:33:31 +00:00
parent f030d58b1d
commit b48f786b0e
11 changed files with 61 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/cyrus-sasl2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.20 2004/10/18 06:45:35 jakob Exp $
# $OpenBSD: Makefile,v 1.21 2004/11/03 10:33:31 jakob Exp $
COMMENT= "RFC 2222 SASL (Simple Authentication and Security Layer)"
DISTNAME= cyrus-sasl-2.1.19
PKGNAME= ${DISTNAME}p1
DISTNAME= cyrus-sasl-2.1.20
PKGNAME= ${DISTNAME}
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -58,7 +58,6 @@ CONFIGURE_ARGS+= --with-ldap=${LOCALBASE}
.endif
post-build:
rm ${WRKBUILD}/saslauthd/saslauthd.8
(cd ${WRKBUILD}/saslauthd; \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} testsaslauthd \
saslauthd.8)

6
security/cyrus-sasl2/distinfo
View File

@ -1,3 +1,3 @@
MD5 (cyrus-sasl-2.1.19.tar.gz) = ea76410ad88fa7b6c17a6aac424382c9
RMD160 (cyrus-sasl-2.1.19.tar.gz) = c74ca8685e9bdf12fe1f64137de931d79a4384ab
SHA1 (cyrus-sasl-2.1.19.tar.gz) = 9512d70ecea33b9d44e69d185a323a0f7b133705
MD5 (cyrus-sasl-2.1.20.tar.gz) = 268ead27f4ac39bcfe17d9e38e0f2977
RMD160 (cyrus-sasl-2.1.20.tar.gz) = 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c
SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6

34
security/cyrus-sasl2/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
--- configure.orig Wed Mar 10 15:56:10 2004
+++ configure Fri Jul 9 16:30:17 2004
@@ -4524,7 +4524,7 @@ if test "${ac_cv_lib_resolv_res_search+s
$OpenBSD: patch-configure,v 1.7 2004/11/03 10:33:31 jakob Exp $
--- configure.orig Mon Oct 25 06:21:08 2004
+++ configure Sun Oct 31 22:50:04 2004
@@ -4526,7 +4526,7 @@ if test "${ac_cv_lib_resolv_res_search+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -9010,7 +9010,7 @@ if test "${ac_cv_lib_resolv_res_search+s
@@ -8920,7 +8920,7 @@ if test "${ac_cv_lib_resolv_res_search+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -9063,7 +9063,7 @@ if test $ac_cv_lib_resolv_res_search = y
@@ -8973,7 +8973,7 @@ if test $ac_cv_lib_resolv_res_search = y
#define HAVE_LIBRESOLV 1
_ACEOF
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
fi
@@ -9777,6 +9777,9 @@ fi;
@@ -9687,6 +9687,9 @@ fi;
*-*-aix*)
platform=__aix
;;
@ -38,7 +38,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
*)
{ 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;}
@@ -9786,7 +9789,7 @@ echo "$as_me: WARNING: The system type i
@@ -9701,7 +9704,7 @@ echo "$as_me: error: CyberSafe was force
cmu_saved_CPPFLAGS=$CPPFLAGS
if test -d ${gssapi}; then
@ -47,7 +47,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
# We want to keep -I in our CPPFLAGS, but only if we succeed
cmu_saved_CPPFLAGS=$CPPFLAGS
LDFLAGS="$LDFLAGS -L$gssapi/lib"
@@ -10089,7 +10092,7 @@ if test "${ac_cv_lib_resolv_res_search+s
@@ -10006,7 +10009,7 @@ if test "${ac_cv_lib_resolv_res_search+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -56,7 +56,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -10142,7 +10145,7 @@ if test $ac_cv_lib_resolv_res_search = y
@@ -10059,7 +10062,7 @@ if test $ac_cv_lib_resolv_res_search = y
#define HAVE_LIBRESOLV 1
_ACEOF
@ -65,7 +65,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
fi
@@ -10167,7 +10170,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
@@ -10084,7 +10087,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -74,10 +74,10 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -10516,8 +10519,8 @@ fi
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
@@ -10434,8 +10437,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"
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${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/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err"
@ -85,7 +85,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
@@ -10709,7 +10712,7 @@ if test "${ac_cv_lib_resolv_res_search+s
@@ -10627,7 +10630,7 @@ if test "${ac_cv_lib_resolv_res_search+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -94,7 +94,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -10758,7 +10761,7 @@ fi
@@ -10676,7 +10679,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
@ -103,7 +103,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
fi
SASL_MECHS="$SASL_MECHS libgssapiv2.la"
@@ -11756,7 +11759,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se
@@ -11881,7 +11884,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -112,7 +112,7 @@ $OpenBSD: patch-configure,v 1.6 2004/07/09 15:07:07 kevlo Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -11809,7 +11812,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye
@@ -11934,7 +11937,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye
#define HAVE_LIBRESOLV 1
_ACEOF

14
security/cyrus-sasl2/patches/patch-lib_common_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-lib_common_c,v 1.2 2004/10/15 11:30:57 robert Exp $
--- lib/common.c.orig Tue Jul 6 18:03:05 2004
+++ lib/common.c Fri Oct 15 13:22:39 2004
@@ -1838,7 +1838,10 @@
if (! path)
return SASL_BADPARAM;
+ /* Honor external variable only in a safe environment */
+ if (getuid() == geteuid() && getgid() == getegid())
*path = getenv(SASL_PATH_ENV_VAR);
+
if (! *path)
*path = PLUGINDIR;

8
security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-saslauthd_Makefile_in,v 1.5 2004/07/09 15:07:07 kevlo Exp $
--- saslauthd/Makefile.in.orig Wed Mar 10 15:56:16 2004
+++ saslauthd/Makefile.in Fri Jul 9 16:30:17 2004
@@ -608,7 +608,7 @@ saslauthd.8: saslauthd.mdoc
$OpenBSD: patch-saslauthd_Makefile_in,v 1.6 2004/11/03 10:33:32 jakob Exp $
--- saslauthd/Makefile.in.orig Mon Oct 25 06:21:14 2004
+++ saslauthd/Makefile.in Sun Oct 31 22:44:54 2004
@@ -613,7 +613,7 @@ saslauthd.8: saslauthd.mdoc
install-data-local: saslauthd.8
$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8

6
security/cyrus-sasl2/patches/patch-saslauthd_auth_krb5_c
View File

@ -1,6 +1,6 @@
--- saslauthd/auth_krb5.c.orig Wed May 14 18:32:23 2003
+++ saslauthd/auth_krb5.c Fri Jul 9 16:30:17 2004
@@ -311,7 +311,7 @@ auth_krb5 (
--- saslauthd/auth_krb5.c.orig Sat May 22 06:38:57 2004
+++ saslauthd/auth_krb5.c Sun Oct 31 22:44:54 2004
@@ -329,7 +329,7 @@ auth_krb5 (
}
/* create a new CCACHE so we don't stomp on anything */

22
security/cyrus-sasl2/patches/patch-saslauthd_configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-saslauthd_configure,v 1.7 2004/07/09 15:07:07 kevlo Exp $
--- saslauthd/configure.orig Wed Mar 10 15:56:16 2004
+++ saslauthd/configure Fri Jul 9 16:30:17 2004
$OpenBSD: patch-saslauthd_configure,v 1.8 2004/11/03 10:33:32 jakob Exp $
--- saslauthd/configure.orig Mon Oct 25 06:21:13 2004
+++ saslauthd/configure Sun Oct 31 23:09:13 2004
@@ -753,10 +753,10 @@ ac_env_CC_set=${CC+set}
ac_env_CC_value=$CC
ac_cv_env_CC_set=${CC+set}
@ -26,7 +26,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.7 2004/07/09 15:07:07 kevlo Exp $
*)
{ 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;}
@@ -6004,7 +6007,7 @@ echo "$as_me: WARNING: The system type i
@@ -6009,7 +6012,7 @@ echo "$as_me: error: CyberSafe was force
cmu_saved_CPPFLAGS=$CPPFLAGS
if test -d ${gssapi}; then
@ -35,7 +35,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.7 2004/07/09 15:07:07 kevlo Exp $
# We want to keep -I in our CPPFLAGS, but only if we succeed
cmu_saved_CPPFLAGS=$CPPFLAGS
LDFLAGS="$LDFLAGS -L$gssapi/lib"
@@ -6385,7 +6388,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
@@ -6392,7 +6395,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -44,10 +44,16 @@ $OpenBSD: patch-saslauthd_configure,v 1.7 2004/07/09 15:07:07 kevlo Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -6734,8 +6737,8 @@ fi
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"
@@ -6738,12 +6741,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 -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
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${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/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err"

20
security/cyrus-sasl2/pkg/PFRAG.shared
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PFRAG.shared,v 1.10 2004/09/15 18:35:59 espie Exp $
@lib lib/libsasl2.so.2.19
@lib lib/sasl2/libanonymous.so.2.19
@lib lib/sasl2/libcrammd5.so.2.19
@lib lib/sasl2/libdigestmd5.so.2.19
@lib lib/sasl2/libgssapiv2.so.2.19
@lib lib/sasl2/liblogin.so.2.19
@lib lib/sasl2/libotp.so.2.19
@lib lib/sasl2/libplain.so.2.19
@lib lib/sasl2/libsasldb.so.2.19
@comment $OpenBSD: PFRAG.shared,v 1.11 2004/11/03 10:33:32 jakob Exp $
@lib lib/libsasl2.so.2.20
@lib lib/sasl2/libanonymous.so.2.20
@lib lib/sasl2/libcrammd5.so.2.20
@lib lib/sasl2/libdigestmd5.so.2.20
@lib lib/sasl2/libgssapiv2.so.2.20
@lib lib/sasl2/liblogin.so.2.20
@lib lib/sasl2/libotp.so.2.20
@lib lib/sasl2/libplain.so.2.20
@lib lib/sasl2/libsasldb.so.2.20

4
security/cyrus-sasl2/pkg/PFRAG.shared-sql
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-sql,v 1.1 2004/09/15 21:40:17 espie Exp $
lib/sasl2/libsql.so.2.19
@comment $OpenBSD: PFRAG.shared-sql,v 1.2 2004/11/03 10:33:32 jakob Exp $
@lib lib/sasl2/libsql.so.2.20

4
security/cyrus-sasl2/pkg/PFRAG.sql
View File

@ -1,2 +1,4 @@
@comment $OpenBSD: PFRAG.sql,v 1.2 2004/09/15 18:35:59 espie Exp $
@comment $OpenBSD: PFRAG.sql,v 1.3 2004/11/03 10:33:32 jakob Exp $
%%SHARED%%
lib/sasl2/libsql.a
lib/sasl2/libsql.la

3
security/cyrus-sasl2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2004/09/18 13:06:43 espie Exp $
@comment $OpenBSD: PLIST,v 1.11 2004/11/03 10:33:32 jakob Exp $
@conflict cyrus-sasl-*
include/sasl/
include/sasl/hmac-md5.h
@ -96,6 +96,7 @@ share/doc/sasl2/install.html
share/doc/sasl2/macosx.html
share/doc/sasl2/mechanisms.html
share/doc/sasl2/options.html
share/doc/sasl2/os390.html
share/doc/sasl2/plugprog.html
share/doc/sasl2/programming.html
share/doc/sasl2/readme.html