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

update to 2.1.21; work by naddy and me

Browse Source
This commit is contained in:
jakob 2005-12-18 10:37:26 +00:00
parent 07badf03d9
commit caa6471e90
16 changed files with 101 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/cyrus-sasl2/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.30 2005/11/01 23:41:13 aanriot Exp $
# $OpenBSD: Makefile,v 1.31 2005/12/18 10:37:26 jakob Exp $
COMMENT= "RFC 2222 SASL (Simple Authentication and Security Layer)"
DISTNAME= cyrus-sasl-2.1.20
PKGNAME= ${DISTNAME}p7
VERSION= 2.1.21
LIBVERSION= 2.21
DISTNAME= cyrus-sasl-${VERSION}
PKGNAME= ${DISTNAME}
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -19,6 +22,8 @@ PERMIT_DISTFILES_CDROM= yes
PERMIT_DISTFILES_FTP= yes
WANTLIB= asn1 c com_err crypto gssapi krb5
SUBST_VARS+= LIBVERSION
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= LDFLAGS='${LDFLAGS}'
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
@ -59,6 +64,7 @@ CONFIGURE_ARGS+= --without-ldap
BROKEN= choose either mysql or pgsql or sqlite
.endif
LIB_DEPENDS+= lib/mysql/mysqlclient.10::databases/mysql
WANTLIB+= m ssl z
CONFIGURE_ARGS+= --enable-sql \
--with-mysql \
--without-pgsql \
@ -83,14 +89,16 @@ BROKEN= choose either mysql or pgsql or sqlite
.endif
LIB_DEPENDS= sqlite.8.6::databases/sqlite
CONFIGURE_ARGS+= --enable-sql \
--without-mysql \
--without-pgsql \
--with-sqlite
.endif
post-build:
(cd ${WRKBUILD}/saslauthd; \
cd ${WRKBUILD}/saslauthd; \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} testsaslauthd \
saslauthd.8)
saslauthd.8
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sasl2

8
security/cyrus-sasl2/distinfo
View File

@ -1,4 +1,4 @@
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
SIZE (cyrus-sasl-2.1.20.tar.gz) = 1775163
MD5 (cyrus-sasl-2.1.21.tar.gz) = dde02db234dea892bee298390890502e
RMD160 (cyrus-sasl-2.1.21.tar.gz) = 93e0e1868453c5781602b5cce23e746b8823a26b
SHA1 (cyrus-sasl-2.1.21.tar.gz) = 6449f730c963d29d43600a95373a6e2db52d6d66
SIZE (cyrus-sasl-2.1.21.tar.gz) = 1584931

95
security/cyrus-sasl2/patches/patch-config_ltconfig
View File

@ -1,95 +0,0 @@
$OpenBSD: patch-config_ltconfig,v 1.3 2004/07/09 15:07:07 kevlo Exp $
--- config/ltconfig.orig Thu Jun 12 00:32:43 2003
+++ config/ltconfig Fri Jul 9 18:01:14 2004
@@ -501,7 +501,14 @@ fi
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1110,7 +1117,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -1428,10 +1437,31 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
+ case "$host_cpu" in
+ m88k|vax)
+ ld_shlibs=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2062,9 +2092,25 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

90
security/cyrus-sasl2/patches/patch-config_ltmain_sh
View File

@ -1,90 +0,0 @@
$OpenBSD: patch-config_ltmain_sh,v 1.2 2004/07/09 15:07:07 kevlo Exp $
--- config/ltmain.sh.orig Fri Jul 9 17:17:16 2004
+++ config/ltmain.sh Fri Jul 9 17:21:00 2004
@@ -1093,6 +1093,17 @@ compiler."
deplibs="$deplibs -framework System"
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -1110,6 +1121,17 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1828,6 +1850,9 @@ compiler."
# Rhapsody C library is in the System framework
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3601,40 +3626,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

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

@ -1,25 +1,7 @@
$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
-LIBS="-lresolv $LIBS"
+ #LIBS="-lresolv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -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
-LIBS="-lresolv $LIBS"
+ #LIBS="-lresolv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -8973,7 +8973,7 @@ if test $ac_cv_lib_resolv_res_search = y
$OpenBSD: patch-configure,v 1.8 2005/12/18 10:37:26 jakob Exp $
--- configure.orig Sun May 15 15:58:28 2005
+++ configure Thu Jun 9 07:12:35 2005
@@ -9447,7 +9447,7 @@ if test $ac_cv_lib_resolv_res_search = y
#define HAVE_LIBRESOLV 1
_ACEOF
@ -28,35 +10,26 @@ $OpenBSD: patch-configure,v 1.7 2004/11/03 10:33:31 jakob Exp $
fi
@@ -9687,6 +9687,9 @@ fi;
*-*-aix*)
platform=__aix
;;
+ *-*-openbsd*)
+ platform=__openbsd
+ ;;
*)
{ 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
@@ -10159,6 +10159,9 @@ if test "$gssapi" != no; then
*-*-aix*)
platform=__aix
;;
+ *-*-openbsd*)
+ platform=__openbsd
+ ;;
*)
{ 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;}
@@ -9701,7 +9704,7 @@ echo "$as_me: error: CyberSafe was force
cmu_saved_CPPFLAGS=$CPPFLAGS
@@ -10173,7 +10176,7 @@ echo "$as_me: error: CyberSafe was force
cmu_saved_CPPFLAGS=$CPPFLAGS
if test -d ${gssapi}; then
- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
+ CPPFLAGS="$CPPFLAGS -I$gssapi/include/kerberosV"
if test -d ${gssapi}; then
- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
+ CPPFLAGS="$CPPFLAGS -I$gssapi/include/kerberosV"
# We want to keep -I in our CPPFLAGS, but only if we succeed
cmu_saved_CPPFLAGS=$CPPFLAGS
LDFLAGS="$LDFLAGS -L$gssapi/lib"
@@ -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
-LIBS="-lresolv $LIBS"
+ #LIBS="-lresolv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -10059,7 +10062,7 @@ if test $ac_cv_lib_resolv_res_search = y
cmu_saved_CPPFLAGS=$CPPFLAGS
LDFLAGS="$LDFLAGS -L$gssapi/lib"
@@ -10537,7 +10540,7 @@ if test $ac_cv_lib_resolv_res_search = y
#define HAVE_LIBRESOLV 1
_ACEOF
@ -65,16 +38,16 @@ $OpenBSD: patch-configure,v 1.7 2004/11/03 10:33:31 jakob Exp $
fi
@@ -10084,7 +10087,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
@@ -10564,7 +10567,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
+LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -10434,8 +10437,8 @@ fi
@@ -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"
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
@ -85,39 +58,30 @@ $OpenBSD: patch-configure,v 1.7 2004/11/03 10:33:31 jakob Exp $
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
@@ -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
-LIBS="-lresolv $LIBS"
+ #LIBS="-lresolv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -10676,7 +10679,7 @@ fi
@@ -11154,7 +11157,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"
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS"
fi
SASL_MECHS="$SASL_MECHS libgssapiv2.la"
@@ -11881,7 +11884,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se
@@ -12760,7 +12763,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
+ #LIBS="-lresolv $LIBS"
+#LIBS="-lresolv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -11934,7 +11937,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye
@@ -12813,7 +12816,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye
#define HAVE_LIBRESOLV 1
_ACEOF
- LIBS="-lresolv $LIBS"
+ #LIBS="-lresolv $LIBS"
+ #IBS="-lresolv $LIBS"
fi

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

@ -1,7 +1,7 @@
$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
$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
install-data-local: saslauthd.8
$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8

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

@ -1,11 +0,0 @@
--- 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 */
- snprintf(tfname,sizeof(tfname), "/tmp/k5cc_%d", getpid());
+ snprintf(tfname,sizeof(tfname), "%s/k5cc_%d", tf_dir, getpid());
if (krb5_cc_resolve(context, tfname, &ccache)) {
krb5_free_principal(context, auth_user);
krb5_free_context(context);

35
security/cyrus-sasl2/patches/patch-saslauthd_config_ltconfig
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-saslauthd_config_ltconfig,v 1.1 2004/07/09 15:07:07 kevlo Exp $
--- saslauthd/config/ltconfig.orig Wed Oct 8 20:24:14 2003
+++ saslauthd/config/ltconfig Fri Jul 9 16:30:17 2004
@@ -1207,6 +1207,16 @@ EOF
fi
;;
+ openbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+ # can we support soname and/or expsyms with a.out? -oliva
+ fi
+ ;;
+
solaris* | sysv5*)
if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
@@ -1428,8 +1438,12 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out
+ else
+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF
+ fi
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
;;

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-saslauthd_configure,v 1.9 2005/12/18 10:37:26 jakob Exp $
--- saslauthd/configure.orig Sun May 15 15:59:04 2005
+++ saslauthd/configure Thu Jun 9 07:18:10 2005
@@ -753,10 +753,10 @@ ac_env_CC_set=${CC+set}
ac_env_CC_value=$CC
ac_cv_env_CC_set=${CC+set}
@ -16,35 +16,17 @@ $OpenBSD: patch-saslauthd_configure,v 1.8 2004/11/03 10:33:32 jakob Exp $
ac_env_LDFLAGS_set=${LDFLAGS+set}
ac_env_LDFLAGS_value=$LDFLAGS
ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
@@ -5995,6 +5995,9 @@ fi;
*-*-aix*)
platform=__aix
;;
+ *-*-openbsd*)
+ platform=__openbsd
+ ;;
*)
{ 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
@@ -6377,6 +6377,9 @@ if test "$gssapi" != no; then
*-*-aix*)
platform=__aix
;;
+ *-*-openbsd*)
+ platform=__openbsd
+ ;;
*)
{ 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;}
@@ -6009,7 +6012,7 @@ echo "$as_me: error: CyberSafe was force
cmu_saved_CPPFLAGS=$CPPFLAGS
if test -d ${gssapi}; then
- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
+ CPPFLAGS="$CPPFLAGS -I$gssapi/include/kerberosV"
# We want to keep -I in our CPPFLAGS, but only if we succeed
cmu_saved_CPPFLAGS=$CPPFLAGS
LDFLAGS="$LDFLAGS -L$gssapi/lib"
@@ -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
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
+LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -6738,12 +6741,12 @@ fi
@@ -7128,12 +7131,12 @@ fi
fi
if test "$gss_impl" = "mit"; then

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

@ -1,6 +1,6 @@
$OpenBSD: patch-utils_sasldblistusers2_8,v 1.1 2005/11/01 23:41:13 aanriot Exp $
--- utils/sasldblistusers2.8.orig Tue Nov 1 12:32:44 2005
+++ utils/sasldblistusers2.8 Tue Nov 1 12:33:22 2005
$OpenBSD: patch-utils_sasldblistusers2_8,v 1.2 2005/12/18 10:37:26 jakob Exp $
--- utils/sasldblistusers2.8.orig Mon Apr 11 06:51:26 2005
+++ utils/sasldblistusers2.8 Sun Dec 18 11:34:29 2005
@@ -1,7 +1,6 @@
.\" sasldblistusers - List users in sasldb file
.\" Tim Martin 3/8/00
@ -15,5 +15,5 @@ $OpenBSD: patch-utils_sasldblistusers2_8,v 1.1 2005/11/01 23:41:13 aanriot Exp $
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
.\"
.TH SASLDBLISTUSERS 8 "March 8, 2000" "CMU SASL"
.TH SASLDBLISTUSERS2 8 "March 7, 2005" "CMU SASL"
.SH NAME

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

@ -1,6 +1,6 @@
$OpenBSD: patch-utils_saslpasswd2_8,v 1.1 2005/11/01 23:41:13 aanriot Exp $
--- utils/saslpasswd2.8.orig Tue Nov 1 12:32:50 2005
+++ utils/saslpasswd2.8 Tue Nov 1 12:33:32 2005
$OpenBSD: patch-utils_saslpasswd2_8,v 1.2 2005/12/18 10:37:26 jakob Exp $
--- utils/saslpasswd2.8.orig Mon Apr 11 06:51:26 2005
+++ utils/saslpasswd2.8 Sun Dec 18 11:34:29 2005
@@ -1,7 +1,6 @@
.\" saslpasswd.8 -- saslpasswd man page
.\" Rob Earhart
@ -15,5 +15,5 @@ $OpenBSD: patch-utils_saslpasswd2_8,v 1.1 2005/11/01 23:41:13 aanriot Exp $
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
.\"
.TH SASLPASSWD 8 "Jan 11, 1999" "CMU SASL"
.TH SASLPASSWD2 8 "Mar 7, 2005" "CMU SASL"
.SH NAME

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

@ -1,10 +1,10 @@
@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
@comment $OpenBSD: PFRAG.shared,v 1.12 2005/12/18 10:37:26 jakob Exp $
@lib lib/libsasl2.so.${LIBVERSION}
@lib lib/sasl2/libanonymous.so.${LIBVERSION}
@lib lib/sasl2/libcrammd5.so.${LIBVERSION}
@lib lib/sasl2/libdigestmd5.so.${LIBVERSION}
@lib lib/sasl2/libgssapiv2.so.${LIBVERSION}
@lib lib/sasl2/liblogin.so.${LIBVERSION}
@lib lib/sasl2/libotp.so.${LIBVERSION}
@lib lib/sasl2/libplain.so.${LIBVERSION}
@lib lib/sasl2/libsasldb.so.${LIBVERSION}

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

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-mysql,v 1.1 2005/01/05 10:03:14 jakob Exp $
@lib lib/sasl2/libsql.so.2.20
@comment $OpenBSD: PFRAG.shared-mysql,v 1.2 2005/12/18 10:37:26 jakob Exp $
@lib lib/sasl2/libsql.so.${LIBVERSION}

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

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-pgsql,v 1.1 2005/01/05 10:03:14 jakob Exp $
@lib lib/sasl2/libsql.so.2.20
@comment $OpenBSD: PFRAG.shared-pgsql,v 1.2 2005/12/18 10:37:26 jakob Exp $
@lib lib/sasl2/libsql.so.${LIBVERSION}

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

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-sqlite,v 1.1 2005/01/05 10:03:14 jakob Exp $
@lib lib/sasl2/libsql.so.2.20
@comment $OpenBSD: PFRAG.shared-sqlite,v 1.2 2005/12/18 10:37:26 jakob Exp $
@lib lib/sasl2/libsql.so.${LIBVERSION}

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2005/10/29 14:57:45 sturm Exp $
@comment $OpenBSD: PLIST,v 1.14 2005/12/18 10:37:26 jakob Exp $
@conflict cyrus-sasl-*
include/sasl/
include/sasl/hmac-md5.h
@ -80,23 +80,23 @@ share/doc/sasl2/
share/doc/sasl2/advanced.html
share/doc/sasl2/appconvert.html
share/doc/sasl2/components.html
share/doc/sasl2/draft-burdis-cat-srp-sasl-08.txt
share/doc/sasl2/draft-ietf-sasl-anon-02.txt
share/doc/sasl2/draft-ietf-sasl-crammd5-01.txt
share/doc/sasl2/draft-ietf-sasl-gssapi-00.txt
share/doc/sasl2/draft-ietf-sasl-plain-03.txt
share/doc/sasl2/draft-ietf-sasl-rfc2222bis-03.txt
share/doc/sasl2/draft-ietf-sasl-rfc2831bis-02.txt
share/doc/sasl2/draft-ietf-sasl-saslprep-04.txt
share/doc/sasl2/draft-murchison-sasl-login-00.txt
share/doc/sasl2/draft-newman-sasl-c-api-01.txt
share/doc/sasl2/draft-burdis-cat-srp-sasl-xx.txt
share/doc/sasl2/draft-ietf-sasl-anon-xx.txt
share/doc/sasl2/draft-ietf-sasl-crammd5-xx.txt
share/doc/sasl2/draft-ietf-sasl-gssapi-xx.txt
share/doc/sasl2/draft-ietf-sasl-plain-xx.txt
share/doc/sasl2/draft-ietf-sasl-rfc2222bis-xx.txt
share/doc/sasl2/draft-ietf-sasl-rfc2831bis-xx.txt
share/doc/sasl2/draft-ietf-sasl-saslprep-xx.txt
share/doc/sasl2/draft-murchison-sasl-login-xx.txt
share/doc/sasl2/draft-newman-sasl-c-api-xx.txt
share/doc/sasl2/draft-newman-sasl-passdss-xx.txt
share/doc/sasl2/gssapi.html
share/doc/sasl2/index.html
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