diff options
author | jlam <jlam> | 2005-03-28 09:39:56 +0000 |
---|---|---|
committer | jlam <jlam> | 2005-03-28 09:39:56 +0000 |
commit | 84849dca2e55f6d896414c5a64f694b70db3299c (patch) | |
tree | 5d91fd966c8e45560c66a1bcaeac4915342fbba0 /security | |
parent | 16f32fec1b8be1b3b89bb47637f02210f4e379f6 (diff) | |
download | pkgsrc-84849dca2e55f6d896414c5a64f694b70db3299c.tar.gz |
Remove security/cyrus-sasl and security/cy-login. These packages
tracked the Cyrus SASL 1.5.x releases, which are no longer maintained.
Adjust packages to use security/cyrus-sasl2 instead for SASL support.
This closes PR pkg/28218 and PR pkg/29736.
Diffstat (limited to 'security')
33 files changed, 1 insertions, 1569 deletions
diff --git a/security/Makefile b/security/Makefile index 24fb248f1ba..edce92f8125 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.231 2005/03/24 17:12:46 agc Exp $ +# $NetBSD: Makefile,v 1.232 2005/03/28 09:39:57 jlam Exp $ # COMMENT= Security tools @@ -24,7 +24,6 @@ SUBDIR+= chkrootkit SUBDIR+= courier-authlib SUBDIR+= crack SUBDIR+= crypto++ -SUBDIR+= cy-login SUBDIR+= cy2-anonymous SUBDIR+= cy2-crammd5 SUBDIR+= cy2-digestmd5 @@ -34,7 +33,6 @@ SUBDIR+= cy2-ntlm SUBDIR+= cy2-otp SUBDIR+= cy2-plain SUBDIR+= cy2-sql -SUBDIR+= cyrus-sasl SUBDIR+= cyrus-sasl2 SUBDIR+= cyrus-saslauthd SUBDIR+= ddos-scan diff --git a/security/cy-login/DESCR b/security/cy-login/DESCR deleted file mode 100644 index 8dcd42beed7..00000000000 --- a/security/cy-login/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -SASL is 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. - -This is the Cyrus SASL plugin that implements the LOGIN authentication -mechanism. It's recommended that it only be used if absolutely necessary -since it is not a secure authentication scheme. diff --git a/security/cy-login/Makefile b/security/cy-login/Makefile deleted file mode 100644 index e7902239233..00000000000 --- a/security/cy-login/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2005/02/07 11:35:47 jlam Exp $ - -PKGNAME= ${DISTNAME:S/cyrus-sasl/cy-login/} -PKGREVISION= 1 -COMMENT= Cyrus SASL LOGIN authentication plugin -SASL_PLUGIN= YES - -.include "../cyrus-sasl/Makefile.common" - -# We need to configure the PLAIN plugin as well since some of the important -# build variables for the LOGIN plugin are only set if PLAIN is configured. -# -CONFIGURE_ARGS+= --enable-login # LOGIN -CONFIGURE_ARGS+= --enable-plain # PLAIN - -PKG_OPTIONS_VAR= PKG_OPTIONS.cy-login -PKG_SUPPORTED_OPTIONS= PAM -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:MPAM) -. include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --with-pam=${PAMBASE} -.endif - -BUILD_DIRS= ${WRKSRC}/plugins -BUILD_TARGET= liblogin.la - -do-install: - cd ${WRKSRC}/plugins && \ - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} liblogin.la ${PLUGINDIR} - -.include "../../mk/bsd.pkg.mk" diff --git a/security/cy-login/PLIST b/security/cy-login/PLIST deleted file mode 100644 index 33c227898a6..00000000000 --- a/security/cy-login/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:51 jlam Exp $ -lib/sasl/liblogin.la diff --git a/security/cyrus-sasl/DEINSTALL b/security/cyrus-sasl/DEINSTALL deleted file mode 100644 index 22d58fd1bfe..00000000000 --- a/security/cyrus-sasl/DEINSTALL +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.6 2002/08/25 18:39:49 jlam Exp $ - -SASLDB=@PKG_SYSCONFDIR@/sasldb.db -SASLSOCKETDIR=@SASLSOCKETDIR@ - -case ${STAGE} in -POST-DEINSTALL) - ${RM} -f /usr/lib/sasl - ${RM} -rf ${SASLSOCKETDIR} - if [ -e ${SASLDB} ] - then - ${CAT} << EOF -=========================================================================== -You may want to remove the SASL password data file: - - ${SASLDB} -=========================================================================== -EOF - fi - ;; -esac diff --git a/security/cyrus-sasl/DESCR b/security/cyrus-sasl/DESCR deleted file mode 100644 index 5a3474499b8..00000000000 --- a/security/cyrus-sasl/DESCR +++ /dev/null @@ -1,14 +0,0 @@ -SASL is 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. - -This is the Cyrus SASL API implentation. It can be used on the client or -server side to provide authentication. See RFC 2222 for more information. - -There's a mailing list for Cyrus SASL. Subscribe by sending a message -to majordomo@lists.andrew.cmu.edu with the body "subscribe cyrus-sasl". -The mailing list is available via anonymous IMAP at -imap://cyrus.andrew.cmu.edu/archive.cyrus-sasl or via the web at -http://asg.web.cmu.edu/archive/mailbox.php3?mailbox=archive.cyrus-sasl. diff --git a/security/cyrus-sasl/INSTALL b/security/cyrus-sasl/INSTALL deleted file mode 100644 index 21144c2cd01..00000000000 --- a/security/cyrus-sasl/INSTALL +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: INSTALL,v 1.3 2002/01/31 20:42:08 jlam Exp $ - -case ${STAGE} in -POST-INSTALL) - # - # Create the default search location for SASL authentication - # mechanism libraries. - # - ${RM} -f /usr/lib/sasl - ${LN} -s ${PKG_PREFIX}/lib/sasl /usr/lib/sasl - ;; -esac diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile deleted file mode 100644 index 2405cd5cd5f..00000000000 --- a/security/cyrus-sasl/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# $NetBSD: Makefile,v 1.48 2005/01/14 05:15:39 jlam Exp $ - -.include "Makefile.common" - -PKGREVISION= 8 -SVR4_PKGNAME= csasl -COMMENT= Simple Authentication and Security Layer - -# Authentication mechanisms -CONFIGURE_ARGS+= --enable-anon # ANONYMOUS -CONFIGURE_ARGS+= --enable-cram # CRAM-MD5 -CONFIGURE_ARGS+= --enable-plain # PLAIN -CONFIGURE_ARGS+= --enable-digest # DIGEST-MD5 -CONFIGURE_ARGS+= --with-rc4=${SSLBASE} -.include "../../security/openssl/buildlink3.mk" - -.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) -PKG_DEFAULT_OPTIONS+= gssapi -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl -PKG_SUPPORTED_OPTIONS= PAM gssapi kerberos -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:MPAM) -. include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --with-pam=${PAMBASE} -.endif - -.if !empty(PKG_OPTIONS:Mkerberos) -. if empty(PKG_OPTIONS:Mgssapi) -PKG_OPTIONS+= gssapi -. endif -.endif - -.if !empty(PKG_OPTIONS:Mgssapi) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} # GSSAPI -PLIST_SUBST+= GSSAPI= -.else -PLIST_SUBST+= GSSAPI="@comment " -.endif - -USE_PKGINSTALL= YES -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - -PKG_GROUPS= ${CYRUS_GROUP} -PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH} -RCD_SCRIPTS= sasl_pwcheck saslauthd -OWN_DIRS= ${PREFIX}/lib/sasl - -post-install: - ${INSTALL_DATA_DIR} ${HTMLDIR} - cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR} - -.include "../../mk/bsd.pkg.mk" diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common deleted file mode 100644 index ea4905262ff..00000000000 --- a/security/cyrus-sasl/Makefile.common +++ /dev/null @@ -1,66 +0,0 @@ -# $NetBSD: Makefile.common,v 1.6 2004/03/23 06:13:30 jlam Exp $ -# -# This Makefile fragment should be included _below_ and SASL_PLUGIN -# definition and _above_ any CONFIGURE_ARGS definitions. - -DISTNAME= cyrus-sasl-1.5.27 -CATEGORIES= security -MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ - ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/ - -MAINTAINER= jlam@NetBSD.org -HOMEPAGE= http://asg.web.cmu.edu/sasl/ - -DISTINFO_FILE= ${.CURDIR}/../cyrus-sasl/distinfo -FILESDIR= ${.CURDIR}/../cyrus-sasl/files -PATCHDIR= ${.CURDIR}/../cyrus-sasl/patches - -.if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS]) -DEPENDS+= cyrus-sasl>=1.5.27:../../security/cyrus-sasl -.endif - -USE_BUILDLINK3= yes -GNU_CONFIGURE= yes -USE_GNU_TOOLS+= make -USE_LIBTOOL= yes - -.include "../../mk/bsd.prefs.mk" - -# CYRUS_USER username of the Cyrus administrator -# CYRUS_GROUP group of the Cyrus administrator -# -CYRUS_USER?= cyrus -CYRUS_GROUP?= mail -FILES_SUBST+= CYRUS_USER=${CYRUS_USER} - -HTMLDIR= ${PREFIX}/share/doc/html/cyrus-sasl -PLUGINDIR= ${PREFIX}/lib/sasl -SASLSOCKETDIR= /var/run/sasl -FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR} -PLIST_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR} - -BUILD_DEFS+= CYRUS_USER CYRUS_GROUP - -CONFIGURE_ARGS+= --with-pwcheck=${SASLSOCKETDIR} -CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR} -CONFIGURE_ARGS+= --with-dblib=ndbm -CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb -CONFIGURE_ARGS+= --with-plugindir=${PLUGINDIR} - -# Authentication mechanisms -CONFIGURE_ARGS+= --disable-anon # ANONYMOUS -CONFIGURE_ARGS+= --disable-cram # CRAM-MD5 -CONFIGURE_ARGS+= --disable-digest # DIGEST-MD5 -CONFIGURE_ARGS+= --disable-login # LOGIN -CONFIGURE_ARGS+= --disable-plain # PLAIN -CONFIGURE_ARGS+= --disable-scram # SCRAM-MD5 -CONFIGURE_ARGS+= --disable-sia # SIA -CONFIGURE_ARGS+= --disable-srp # SRP -CONFIGURE_ARGS+= --disable-x509 # X.509 -CONFIGURE_ARGS+= --disable-krb4 # KERBEROS_V4 -CONFIGURE_ARGS+= --disable-gssapi # GSSAPI -CONFIGURE_ARGS+= --without-pam - -post-extract: - cd ${WRKSRC}; ${RM} -f include/md5.h - ${CP} ${FILESDIR}/sasl-config.in ${WRKSRC}/plugins diff --git a/security/cyrus-sasl/PLIST b/security/cyrus-sasl/PLIST deleted file mode 100644 index 9654ae17278..00000000000 --- a/security/cyrus-sasl/PLIST +++ /dev/null @@ -1,56 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:52 jlam Exp $ -bin/sasl-config -include/hmac-md5.h -include/sasl.h -include/saslplug.h -include/saslutil.h -lib/libsasl.la -lib/sasl/libanonymous.la -lib/sasl/libcrammd5.la -lib/sasl/libdigestmd5.la -${GSSAPI}lib/sasl/libgssapiv2.la -lib/sasl/libplain.la -man/man3/sasl.3 -man/man3/sasl_authorize_t.3 -man/man3/sasl_done.3 -man/man3/sasl_callbacks.3 -man/man3/sasl_checkpass.3 -man/man3/sasl_client_init.3 -man/man3/sasl_client_new.3 -man/man3/sasl_client_start.3 -man/man3/sasl_client_step.3 -man/man3/sasl_decode.3 -man/man3/sasl_encode.3 -man/man3/sasl_errstring.3 -man/man3/sasl_getopt_t.3 -man/man3/sasl_getpath_t.3 -man/man3/sasl_getprop.3 -man/man3/sasl_getsecret_t.3 -man/man3/sasl_getsimple_t.3 -man/man3/sasl_listmech.3 -man/man3/sasl_log_t.3 -man/man3/sasl_server_init.3 -man/man3/sasl_server_new.3 -man/man3/sasl_server_start.3 -man/man3/sasl_server_step.3 -man/man3/sasl_setprop.3 -man/man3/sasl_usererr.3 -man/man8/saslauthd.8 -man/man8/sasldblistusers.8 -man/man8/saslpasswd.8 -sbin/pwcheck -sbin/saslauthd -sbin/sasldblistusers -sbin/saslpasswd -share/doc/html/cyrus-sasl/draft-newman-auth-scram-03.txt -share/doc/html/cyrus-sasl/gssapi.html -share/doc/html/cyrus-sasl/index.html -share/doc/html/cyrus-sasl/programming.html -share/doc/html/cyrus-sasl/rfc1321.txt -share/doc/html/cyrus-sasl/rfc2095.txt -share/doc/html/cyrus-sasl/rfc2104.txt -share/doc/html/cyrus-sasl/rfc2222.txt -share/doc/html/cyrus-sasl/rfc2245.txt -share/doc/html/cyrus-sasl/rfc2831.txt -share/doc/html/cyrus-sasl/sysadmin.html -@dirrm share/doc/html/cyrus-sasl diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk deleted file mode 100644 index 64586804714..00000000000 --- a/security/cyrus-sasl/buildlink3.mk +++ /dev/null @@ -1,30 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.6 2005/01/14 05:15:39 jlam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CYRUS_SASL_BUILDLINK3_MK:= ${CYRUS_SASL_BUILDLINK3_MK}+ - -.include "../../mk/bsd.prefs.mk" - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cyrus-sasl -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncyrus-sasl} -BUILDLINK_PACKAGES+= cyrus-sasl - -.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.cyrus-sasl+= cyrus-sasl>=1.5.27nb3 -BUILDLINK_RECOMMENDED.cyrus-sasl+= cyrus-sasl>=1.5.27nb7 -BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl -.endif # CYRUS_SASL_BUILDLINK3_MK - -PKG_OPTIONS.cyrus-sasl?= ${PKG_DEFAULT_OPTIONS} - -.if !empty(PKG_OPTIONS.cyrus-sasl:MPAM) -. include "../../mk/pam.buildlink3.mk" -.endif - -# Cyrus SASL mechanisms are shared modules loaded via dlopen(). -.include "../../mk/dlopen.buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo deleted file mode 100644 index 68f2ee8d5b4..00000000000 --- a/security/cyrus-sasl/distinfo +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: distinfo,v 1.12 2005/02/24 13:10:05 agc Exp $ - -SHA1 (cyrus-sasl-1.5.27.tar.gz) = eedaec8355219b61e64236e3a5d9845d3af5a13d -RMD160 (cyrus-sasl-1.5.27.tar.gz) = ae884e333b4d3335a9890aad7cc20f03e3ba1e56 -Size (cyrus-sasl-1.5.27.tar.gz) = 528252 bytes -SHA1 (patch-aa) = cedf8b0a45b69d292a4306192eab4ec6245b6e46 -SHA1 (patch-ab) = 82359390958c020348e7e7ebc39315da552d34c7 -SHA1 (patch-ac) = b5f99dd4789c19e36c29bbc3fbf47c556e32876e -SHA1 (patch-ad) = faa888873c16c3c322e110a6f90380748b138942 -SHA1 (patch-ae) = b9f4295f80a64defe0381bce7def7b462bf5d196 -SHA1 (patch-af) = 05ba0da5932f8674d63f70b6a0ba6d6d4b0d29c3 -SHA1 (patch-ag) = 9eed2d94c7c5546bcecf041c53f53fd51486c221 -SHA1 (patch-ah) = 84bb1809f9d1914746ca02de3ffc55149c28dd75 -SHA1 (patch-ai) = c2c5d5e8d507043d074ba96f6b903aa89520286b -SHA1 (patch-aj) = 386ebb6e33c93bed497b438b397e903200eb4549 -SHA1 (patch-ak) = c65c4b2f9082e8beedcedca140410f31f9599b76 -SHA1 (patch-al) = c54b721c7cc69c1050600633d982e8a05d91e283 -SHA1 (patch-am) = 95f01aad91729992d4189da87970e7d7d9cd4ceb -SHA1 (patch-an) = 308593d234b6d422749ebc409fd489d518c2a482 -SHA1 (patch-ao) = 63048c5d49a3e5dcc1065149864e567ef3cabb0e -SHA1 (patch-ap) = 074396e63f20f6457a7f95e29bb3c8c4e7b166ef -SHA1 (patch-aq) = d15cbbcc501a56407fb4cdfc08ef71bfb961f0a4 -SHA1 (patch-ar) = 4ce4bdf102c3632bf921eb3cbd2abd22150a8b94 diff --git a/security/cyrus-sasl/files/sasl-config.in b/security/cyrus-sasl/files/sasl-config.in deleted file mode 100644 index 606c73a2058..00000000000 --- a/security/cyrus-sasl/files/sasl-config.in +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -# -# $NetBSD: sasl-config.in,v 1.1 2000/12/10 09:43:37 jlam Exp $ - -sasl_libs="%%sasl_config_LIBS%%" -sasl_cflags="%%sasl_config_CFLAGS%%" - -prefix=%%prefix%% -exec_prefix=${prefix} -exec_prefix_set=no - -usage() -{ - cat <<EOF -Usage: sasl-config [OPTIONS] -Options: - [--prefix[=DIR]] - [--exec-prefix[=DIR]] - [--version] - [--libs] - [--cflags] -EOF - exit $1 -} - -if test $# -eq 0; then - usage 1 1>&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo %%VERSION%% - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_cflags" = "yes"; then - if test ${prefix}/include != /usr/include ; then - includes=-I${prefix}/include - for i in $sasl_cflags ; do - if test $i = -I${prefix}/include ; then - includes="" - fi - done - fi - echo $includes $sasl_cflags -fi - -if test "$echo_libs" = "yes"; then - libdirs="-L${exec_prefix}/lib -Wl,-R${exec_prefix}/lib" - for i in $sasl_libs ; do - if test $i != -L${exec_prefix}/lib -a $i != -Wl,-R${exec_prefix}/lib ; then - if test -z "$my_sasl_libs" ; then - my_sasl_libs="$i" - else - my_sasl_libs="$my_sasl_libs $i" - fi - fi - done - - echo $libdirs $my_sasl_libs -fi diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh deleted file mode 100644 index 77f421ae0ff..00000000000 --- a/security/cyrus-sasl/files/sasl_pwcheck.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: sasl_pwcheck.sh,v 1.10 2002/09/20 02:02:00 grant Exp $ -# -# The pwcheck daemon allows UNIX password authentication with Cyrus SASL. -# -# PROVIDE: sasl_pwcheck -# REQUIRE: DAEMON - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="sasl_pwcheck" -rcvar="${name}" -command="@PREFIX@/sbin/pwcheck" -command_args="& sleep 2" -start_precmd=sasl_pwcheck_precmd - -sasl_pwcheck_precmd() -{ - if [ ! -d @SASLSOCKETDIR@ ] - then - @MKDIR@ @SASLSOCKETDIR@ - @CHMOD@ 0700 @SASLSOCKETDIR@ - @CHOWN@ @CYRUS_USER@ @SASLSOCKETDIR@ - fi -} - -if [ -f /etc/rc.subr ] -then - load_rc_config $name - run_rc_command "$1" -else - @ECHO@ -n " ${name}" - eval ${start_precmd} - ${command} ${sasl_pwcheck_flags} ${command_args} -fi diff --git a/security/cyrus-sasl/files/saslauthd.sh b/security/cyrus-sasl/files/saslauthd.sh deleted file mode 100644 index f9d3bc93629..00000000000 --- a/security/cyrus-sasl/files/saslauthd.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: saslauthd.sh,v 1.3 2002/09/20 02:02:00 grant Exp $ -# -# The saslauthd daemon allows cleartext UNIX password authentication via -# several authentication mechanisms with Cyrus SASL. -# -# PROVIDE: saslauthd -# REQUIRE: DAEMON - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="saslauthd" -rcvar="${name}" -command="@PREFIX@/sbin/saslauthd" -command_args="& sleep 2" -start_precmd="saslauthd_precmd" - -# Default to authenticating against local password database. -if [ -z "${saslauthd_flags}" ] -then - saslauthd_flags="-a getpwent" -fi - -saslauthd_precmd() -{ - if [ ! -d @SASLSOCKETDIR@ ] - then - @MKDIR@ @SASLSOCKETDIR@ - @CHMOD@ 0700 @SASLSOCKETDIR@ - @CHOWN@ @CYRUS_USER@ @SASLSOCKETDIR@ - fi -} - -if [ -f /etc/rc.subr ] -then - load_rc_config $name - run_rc_command "$1" -else - @ECHO@ -n " ${name}" - ${command} ${saslauthd_flags} ${command_args} -fi diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa deleted file mode 100644 index a10e948d2cd..00000000000 --- a/security/cyrus-sasl/patches/patch-aa +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2002/09/07 07:37:39 jlam Exp $ - ---- configure.in.orig Fri Mar 23 17:47:27 2001 -+++ configure.in -@@ -69,6 +69,12 @@ dnl let's just link against local. othe - CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - CMU_ADD_LIBPATH("/usr/local/lib") - -+AC_PATH_PROG(SED, sed, no) -+if test "$SED" = "no"; then -+ AC_ERROR([sed is required to build sasl-config]) -+fi -+AC_SUBST(SED) -+ - AM_DISABLE_STATIC - - CMU_PROG_LIBTOOL -@@ -364,8 +370,11 @@ if test "$with_des" != no; then - CPPFLAGS="$CPPFLAGS -I${with_des}/include" - LDFLAGS="$LDFLAGS -L${with_des}/lib" - fi -- AC_CHECK_LIB(des, des_pcbc_encrypt, [LIB_DES="-ldes"; -- with_des=yes], with_des=no) -+ AC_CHECK_LIB(des, des_pcbc_encrypt, -+ AC_CHECK_HEADER(des.h, [LIB_DES="-ldes"; -+ with_des=yes], -+ with_des=no), -+ with_des=no) - - if test "$with_des" = no; then - dnl if openssl is around, we might be able to use that for des -@@ -476,7 +485,7 @@ AC_ARG_ENABLE(gssapi, [ --enable-gssapi - - if test "$gssapi" != no; then - if test -d ${gssapi}; then -- CPPFLAGS="$CPPFLAGS -I$gssapi/include" -+ CPPFLAGS="$CPPFLAGS -I$gssapi/include -I$gssapi/include/krb5" - LDFLAGS="$LDFLAGS -L$gssapi/lib" - fi - AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H), -@@ -661,6 +670,9 @@ AC_SUBST(SNPRINTFOBJS) - - LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'` - AC_SUBST(LTLIBOBJS) -+ -+dnl Check for /dev/urandom -+AC_CHECK_FILE(/dev/urandom, AC_DEFINE_UNQUOTED(SASL_DEV_RANDOM, "/dev/urandom")) - - AC_CHECK_HEADERS(getopt.h unistd.h crypt.h pwd.h shadow.h paths.h) - AC_C_CONST diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab deleted file mode 100644 index f2ec479e850..00000000000 --- a/security/cyrus-sasl/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2000/12/10 09:43:37 jlam Exp $ - ---- include/Makefile.am.orig Wed Mar 8 16:54:33 2000 -+++ include/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --include_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h -+include_HEADERS = hmac-md5.h sasl.h saslplug.h saslutil.h - - noinst_PROGRAMS = makemd5 - diff --git a/security/cyrus-sasl/patches/patch-ac b/security/cyrus-sasl/patches/patch-ac deleted file mode 100644 index 641812fc2f8..00000000000 --- a/security/cyrus-sasl/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2000/12/10 09:43:37 jlam Exp $ - ---- include/hmac-md5.h.orig Mon Nov 16 15:06:38 1998 -+++ include/hmac-md5.h -@@ -15,8 +15,8 @@ - * values stored in network byte order (Big Endian) - */ - typedef struct HMAC_MD5_STATE_s { -- UINT4 istate[4]; -- UINT4 ostate[4]; -+ u_int32_t istate[4]; -+ u_int32_t ostate[4]; - } HMAC_MD5_STATE; - - /* One step hmac computation diff --git a/security/cyrus-sasl/patches/patch-ad b/security/cyrus-sasl/patches/patch-ad deleted file mode 100644 index b5e2e7a1497..00000000000 --- a/security/cyrus-sasl/patches/patch-ad +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2000/12/10 09:43:37 jlam Exp $ - ---- include/saslplug.h.orig Sun Feb 27 17:39:02 2000 -+++ include/saslplug.h -@@ -4,11 +4,8 @@ - #ifndef SASLPLUG_H - #define SASLPLUG_H 1 - --#ifndef MD5GLOBAL_H --#include "md5global.h" --#endif - #ifndef MD5_H --#include "md5.h" -+#include <md5.h> - #endif - #ifndef HMAC_MD5_H - #include "hmac-md5.h" diff --git a/security/cyrus-sasl/patches/patch-ae b/security/cyrus-sasl/patches/patch-ae deleted file mode 100644 index e4bde9d97c6..00000000000 --- a/security/cyrus-sasl/patches/patch-ae +++ /dev/null @@ -1,395 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2000/12/10 09:43:37 jlam Exp $ - ---- lib/md5.c.orig Mon Mar 29 16:26:14 1999 -+++ lib/md5.c -@@ -24,327 +24,10 @@ - */ - - #include <config.h> --#include "md5global.h" --#include "md5.h" -+#include <md5.h> -+#include <string.h> - #include "hmac-md5.h" - --/* Constants for MD5Transform routine. --*/ -- --#define S11 7 --#define S12 12 --#define S13 17 --#define S14 22 --#define S21 5 --#define S22 9 --#define S23 14 --#define S24 20 --#define S31 4 --#define S32 11 --#define S33 16 --#define S34 23 --#define S41 6 --#define S42 10 --#define S43 15 --#define S44 21 -- --static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64])); --static void Encode PROTO_LIST -- ((unsigned char *, UINT4 *, unsigned int)); --static void Decode PROTO_LIST -- ((UINT4 *, unsigned char *, unsigned int)); --static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int)); --static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int)); -- --static unsigned char PADDING[64] = { -- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 --}; -- --/* F, G, H and I are basic MD5 functions. -- -- */ --#ifdef I --/* This might be defined via NANA */ --#undef I --#endif -- --#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) --#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) --#define H(x, y, z) ((x) ^ (y) ^ (z)) --#define I(x, y, z) ((y) ^ ((x) | (~z))) -- --/* ROTATE_LEFT rotates x left n bits. -- -- */ -- --#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) -- --/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. --Rotation is separate from addition to prevent recomputation. --*/ -- --#define FF(a, b, c, d, x, s, ac) { (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); } --#define GG(a, b, c, d, x, s, ac) { (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); } --#define HH(a, b, c, d, x, s, ac) { (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); } --#define II(a, b, c, d, x, s, ac) { (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); } -- --/* MD5 initialization. Begins an MD5 operation, writing a new context. --*/ -- --void MD5Init (context) --MD5_CTX *context; /* context */ --{ -- context->count[0] = context->count[1] = 0; -- -- /* Load magic initialization constants. -- --*/ -- context->state[0] = 0x67452301; -- context->state[1] = 0xefcdab89; -- context->state[2] = 0x98badcfe; -- context->state[3] = 0x10325476; --} -- --/* MD5 block update operation. Continues an MD5 message-digest -- operation, processing another message block, and updating the context. --*/ -- --void MD5Update (context, input, inputLen) --MD5_CTX *context; /* context */ --unsigned char *input; /* input block */ --unsigned int inputLen; /* length of input block */ --{ -- unsigned int i, index, partLen; -- -- /* Compute number of bytes mod 64 */ -- index = (unsigned int)((context->count[0] >> 3) & 0x3F); -- -- /* Update number of bits */ -- if ((context->count[0] += ((UINT4)inputLen << 3)) -- < ((UINT4)inputLen << 3)) -- context->count[1]++; -- context->count[1] += ((UINT4)inputLen >> 29); -- -- partLen = 64 - index; -- -- /* Transform as many times as possible. -- --*/ -- if (inputLen >= partLen) { -- MD5_memcpy -- ((POINTER)&context->buffer[index], (POINTER)input, partLen); MD5Transform -- (context->state, context->buffer); -- -- for (i = partLen; i + 63 < inputLen; i += 64) -- MD5Transform (context->state, &input[i]); -- -- index = 0; -- } -- else -- i = 0; -- -- /* Buffer remaining input */ -- MD5_memcpy -- ((POINTER)&context->buffer[index], (POINTER)&input[i], -- inputLen-i); -- --} -- --/* MD5 finalization. Ends an MD5 message-digest operation, writing the -- the message digest and zeroizing the context. -- -- */ -- --void MD5Final (digest, context) --unsigned char digest[16]; /* message digest */ --MD5_CTX *context; /* context */ --{ -- unsigned char bits[8]; -- unsigned int index, padLen; -- -- /* Save number of bits */ -- Encode (bits, context->count, 8); -- -- /* Pad out to 56 mod 64. -- --*/ -- index = (unsigned int)((context->count[0] >> 3) & 0x3f); -- padLen = (index < 56) ? (56 - index) : (120 - index); -- MD5Update (context, PADDING, padLen); -- -- /* Append length (before padding) */ -- MD5Update (context, bits, 8); -- -- /* Store state in digest */ -- Encode (digest, context->state, 16); -- -- /* Zeroize sensitive information. -- --*/ -- MD5_memset ((POINTER)context, 0, sizeof (*context)); --} -- --/* MD5 basic transformation. Transforms state based on block. -- -- */ -- --static void MD5Transform (state, block) --UINT4 state[4]; --unsigned char block[64]; --{ -- UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; -- -- Decode (x, block, 64); -- -- /* Round 1 */ -- FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ -- FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ -- FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ -- FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ -- FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ -- FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ -- FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ -- FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ -- FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ -- FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ -- FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ -- FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ -- FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ -- FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ -- FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ -- FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ -- -- /* Round 2 */ -- GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ -- GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ -- GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ -- GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ -- GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ -- GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ -- GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ -- GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ -- GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ -- GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ -- GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ -- GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ -- GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ -- GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ -- GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ -- GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ -- -- /* Round 3 */ -- HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ -- HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ -- HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ -- HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ -- HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ -- HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ -- HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ -- HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ -- HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ -- HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ -- HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ -- HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ -- HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ -- HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ -- HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ -- HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ -- -- /* Round 4 */ -- II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ -- II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ -- II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ -- II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ -- II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ -- II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ -- II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ -- II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ -- II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ -- II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ -- II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ -- II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ -- II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ -- II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ -- II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ -- II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ -- -- state[0] += a; -- state[1] += b; -- state[2] += c; -- state[3] += d; -- -- /* Zeroize sensitive information. -- */ -- MD5_memset ((POINTER)x, 0, sizeof (x)); --} -- --/* Encodes input (UINT4) into output (unsigned char). Assumes len is -- a multiple of 4. -- -- */ -- --static void Encode (output, input, len) --unsigned char *output; --UINT4 *input; --unsigned int len; --{ -- unsigned int i, j; -- -- for (i = 0, j = 0; j < len; i++, j += 4) { -- output[j] = (unsigned char)(input[i] & 0xff); -- output[j+1] = (unsigned char)((input[i] >> 8) & 0xff); -- output[j+2] = (unsigned char)((input[i] >> 16) & 0xff); -- output[j+3] = (unsigned char)((input[i] >> 24) & 0xff); -- } --} -- --/* Decodes input (unsigned char) into output (UINT4). Assumes len is -- a multiple of 4. -- -- */ -- --static void Decode (output, input, len) --UINT4 *output; --unsigned char *input; --unsigned int len; --{ -- unsigned int i, j; -- -- for (i = 0, j = 0; j < len; i++, j += 4) -- output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) | (((UINT4)input[j+2]) << 16) -- | (((UINT4)input[j+3]) << 24); --} -- --/* Note: Replace "for loop" with standard memcpy if possible. -- -- */ -- --static void MD5_memcpy (output, input, len) --POINTER output; --POINTER input; --unsigned int len; --{ -- unsigned int i; -- -- for (i = 0; i < len; i++) -- output[i] = input[i]; --} -- --/* Note: Replace "for loop" with standard memset if possible. --*/ -- --static void MD5_memset (output, value, len) --POINTER output; --int value; --unsigned int len; --{ -- unsigned int i; -- -- for (i = 0; i < len; i++) -- ((char *)output)[i] = (char)value; --} -- - void hmac_md5_init(HMAC_MD5_CTX *hmac, - const unsigned char *key, - int key_len) -@@ -382,10 +65,10 @@ - */ - - /* start out by storing key in pads */ -- MD5_memset(k_ipad, '\0', sizeof k_ipad); -- MD5_memset(k_opad, '\0', sizeof k_opad); -- MD5_memcpy( k_ipad, key, key_len); -- MD5_memcpy( k_opad, key, key_len); -+ memset(k_ipad, '\0', sizeof k_ipad); -+ memset(k_opad, '\0', sizeof k_opad); -+ memcpy( k_ipad, key, key_len); -+ memcpy( k_opad, key, key_len); - - /* XOR key with ipad and opad values */ - for (i=0; i<64; i++) { -@@ -400,9 +83,9 @@ - MD5Update(&hmac->octx, k_opad, 64); /* apply outer pad */ - - /* scrub the pads and key context (if used) */ -- MD5_memset(&k_ipad, 0, sizeof(k_ipad)); -- MD5_memset(&k_opad, 0, sizeof(k_opad)); -- MD5_memset(&tk, 0, sizeof(tk)); -+ memset(&k_ipad, 0, sizeof(k_ipad)); -+ memset(&k_opad, 0, sizeof(k_opad)); -+ memset(&tk, 0, sizeof(tk)); - - /* and we're done. */ - } -@@ -427,7 +110,7 @@ - state->istate[lupe] = htonl(hmac.ictx.state[lupe]); - state->ostate[lupe] = htonl(hmac.octx.state[lupe]); - } -- MD5_memset(&hmac, 0, sizeof(hmac)); -+ memset(&hmac, 0, sizeof(hmac)); - } - - -@@ -435,7 +118,7 @@ - HMAC_MD5_STATE *state) - { - unsigned lupe; -- MD5_memset(hmac, 0, sizeof(HMAC_MD5_CTX)); -+ memset(hmac, 0, sizeof(HMAC_MD5_CTX)); - for (lupe = 0; lupe < 4; lupe++) { - hmac->ictx.state[lupe] = ntohl(state->istate[lupe]); - hmac->octx.state[lupe] = ntohl(state->ostate[lupe]); -@@ -497,10 +180,10 @@ - */ - - /* start out by storing key in pads */ -- MD5_memset(k_ipad, '\0', sizeof k_ipad); -- MD5_memset(k_opad, '\0', sizeof k_opad); -- MD5_memcpy( k_ipad, key, key_len); -- MD5_memcpy( k_opad, key, key_len); -+ memset(k_ipad, '\0', sizeof k_ipad); -+ memset(k_opad, '\0', sizeof k_opad); -+ memcpy( k_ipad, key, key_len); -+ memcpy( k_opad, key, key_len); - - /* XOR key with ipad and opad values */ - for (i=0; i<64; i++) { diff --git a/security/cyrus-sasl/patches/patch-af b/security/cyrus-sasl/patches/patch-af deleted file mode 100644 index aa4b548e81d..00000000000 --- a/security/cyrus-sasl/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.2 2002/10/21 06:03:42 jlam Exp $ - ---- plugins/Makefile.am.orig Sat Mar 10 00:56:43 2001 -+++ plugins/Makefile.am -@@ -66,6 +66,10 @@ sasldir = $(prefix)/lib/sasl - sasl_LTLIBRARIES = @SASL_MECHS@ - EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la libscrammd5.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la - -+bin_SCRIPTS = sasl-config -+sasl_config_CFLAGS = $(CPPFLAGS) -+sasl_config_LIBS = -lsasl $(libplain_la_LIBADD) $(libkerberos4_la_LIBADD) $(libgssapiv2_la_LIBADD) -+ - libplain_la_SOURCES = plain.c - libplain_la_LDFLAGS = -version-info $(plain_version) - libplain_la_LIBADD = $(PLAIN_LIBS) -@@ -102,3 +106,10 @@ libsrp_la_LIBADD = $(SRP_LIBS) - # libx509_la_SOURCES = x509.c - # libx509_la_LDFLAGS = -version-info $(x509_version) - # libx509_la_LIBADD = $(X509_LIBS) -+ -+sasl-config: sasl-config.in -+ $(SED) -e "s,%%sasl_config_LIBS%%,$(sasl_config_LIBS),g" \ -+ -e "s,%%sasl_config_CFLAGS%%,$(sasl_config_CFLAGS),g" \ -+ -e "s,%%prefix%%,$(prefix),g" \ -+ -e "s,%%VERSION%%,$(VERSION),g" \ -+ < sasl-config.in > sasl-config diff --git a/security/cyrus-sasl/patches/patch-ag b/security/cyrus-sasl/patches/patch-ag deleted file mode 100644 index 2bdeeb7f62a..00000000000 --- a/security/cyrus-sasl/patches/patch-ag +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/10/07 19:16:47 seb Exp $ - ---- plugins/cram.c.orig Sat Mar 10 06:56:44 2001 -+++ plugins/cram.c -@@ -425,7 +425,7 @@ static int server_continue_step (void *c - - HMAC_MD5_CTX tmphmac; - char *digest_str = NULL; -- UINT4 digest[4]; -+ u_int32_t digest[4]; - - VL(("CRAM-MD5 Step 2\n")); - VL(("Clientin: %s\n",clientin)); -@@ -572,7 +572,7 @@ static int mechanism_db_filled(char *mec - int result; - sasl_server_getsecret_t *getsecret; - void *getsecret_context; -- long version = -1; -+ int32_t version = -1; - - /* get callback so we can request the secret */ - result = utils->getcallback(utils->conn, -@@ -597,8 +597,8 @@ static int mechanism_db_filled(char *mec - - /* check version */ - if (sec != NULL) { -- if (sec->len >= 4) { -- memcpy(&version, sec->data, 4); -+ if (sec->len >= sizeof(int32_t)) { -+ memcpy(&version, sec->data, sizeof(int32_t)); - version = ntohl(version); - } - free(sec); -@@ -633,7 +633,7 @@ static int mechanism_fill_db(char *mech_ - sasl_server_putsecret_t *putsecret; - void *putsecret_context; - sasl_secret_t *sec = NULL; -- long version; -+ int32_t version; - - /* don't do this again if it's already set */ - if (mydb_initialized == 1) -@@ -652,18 +652,18 @@ static int mechanism_fill_db(char *mech_ - - /* allocate a secret structure that we're going to save to disk */ - sec=(sasl_secret_t *) sparams->utils->malloc(sizeof(sasl_secret_t)+ -- 4); -+ sizeof(int32_t)); - if (sec == NULL) { - result = SASL_NOMEM; - return result; - } - - /* set the size */ -- sec->len = 4; -+ sec->len = sizeof(int32_t); - - /* and insert the data */ - version = htonl(CRAM_MD5_VERSION); -- memcpy(sec->data, &version, 4); -+ memcpy(sec->data, &version, sizeof(int32_t)); - - /* do the store */ - result = putsecret(putsecret_context, diff --git a/security/cyrus-sasl/patches/patch-ah b/security/cyrus-sasl/patches/patch-ah deleted file mode 100644 index ff77756a774..00000000000 --- a/security/cyrus-sasl/patches/patch-ah +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2002/03/24 23:30:20 wiz Exp $ - ---- plugins/gssapi.c.orig Sat Mar 10 06:56:46 2001 -+++ plugins/gssapi.c -@@ -49,6 +49,11 @@ - #else - #include <gssapi/gssapi.h> - #endif -+ -+/* Heimdal has this, but MIT Kerberos doesn't */ -+#ifndef GSS_C_NO_NAME -+#define GSS_C_NO_NAME ((gss_name_t) 0) -+#endif - - #ifdef WIN32 - # include <winsock.h> -@@ -65,11 +70,13 @@ - # include <arpa/inet.h> - # include <netdb.h> - #endif /* WIN32 */ -+#include <errno.h> - #include <fcntl.h> - #include <stdio.h> - #include <sasl.h> - #include <saslutil.h> - #include <saslplug.h> -+#include <unistd.h> - - #ifdef WIN32 - /* This must be after sasl.h */ diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai deleted file mode 100644 index 8f328f96a62..00000000000 --- a/security/cyrus-sasl/patches/patch-ai +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2002/12/16 10:55:03 martti Exp $ - ---- acconfig.h.orig Sat Feb 17 06:06:28 2001 -+++ acconfig.h Mon Dec 16 11:44:12 2002 -@@ -128,11 +128,20 @@ - /* define if your system has getpid() */ - #undef HAVE_GETPID - -+/* location of the random number generator */ -+#undef SASL_DEV_RANDOM -+ - @BOTTOM@ - - /* location of the random number generator */ --#ifndef DEV_RANDOM -+#ifdef SASL_DEV_RANDOM -+#define DEV_RANDOM SASL_DEV_RANDOM -+#else -+#if defined(__NetBSD__) -+#define DEV_RANDOM "/dev/urandom" -+#else - #define DEV_RANDOM "/dev/random" -+#endif - #endif - - /* Make Solaris happy... */ diff --git a/security/cyrus-sasl/patches/patch-aj b/security/cyrus-sasl/patches/patch-aj deleted file mode 100644 index 2b86eb5ffad..00000000000 --- a/security/cyrus-sasl/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2002/08/25 18:39:51 jlam Exp $ - ---- saslauthd/Makefile.am.orig Fri Mar 23 20:41:35 2001 -+++ saslauthd/Makefile.am -@@ -2,7 +2,7 @@ sbin_PROGRAMS = saslauthd - man_MANS = saslauthd.8 - - saslauthd_SOURCES = saslauthd.c mechanisms.c globals.h mechanisms.h auth_dce.c auth_dce.h auth_getpwent.c auth_getpwent.h auth_krb4.c auth_krb4.h auth_pam.c auth_pam.h auth_rimap.c auth_rimap.h auth_shadow.c auth_shadow.h auth_sia.c auth_sia.h --saslauthd_LDADD = @SASL_KRB_LIB@ -+saslauthd_LDADD = @PLAIN_LIBS@ - - INCLUDES = -I$(top_srcdir)/include - EXTRA_DIST = saslauthd.8 diff --git a/security/cyrus-sasl/patches/patch-ak b/security/cyrus-sasl/patches/patch-ak deleted file mode 100644 index adf8a601617..00000000000 --- a/security/cyrus-sasl/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2002/08/25 18:39:52 jlam Exp $ - ---- lib/checkpw.c.orig Sat Feb 17 00:06:48 2001 -+++ lib/checkpw.c -@@ -1127,7 +1127,7 @@ static int saslauthd_verify_password(sas - r = connect(s, (struct sockaddr *) &srvaddr, sizeof(srvaddr)); - if (r == -1) { - if (reply) -- *reply = "cannot connect to pwcheck server"; -+ *reply = "cannot connect to saslauthd server"; - return SASL_FAIL; - } - diff --git a/security/cyrus-sasl/patches/patch-al b/security/cyrus-sasl/patches/patch-al deleted file mode 100644 index 665d92539a9..00000000000 --- a/security/cyrus-sasl/patches/patch-al +++ /dev/null @@ -1,148 +0,0 @@ -$NetBSD: patch-al,v 1.1 2002/09/07 07:37:40 jlam Exp $ - ---- configure.orig Fri Mar 23 17:48:12 2001 -+++ configure -@@ -1364,6 +1364,47 @@ CPPFLAGS="-I/usr/local/include ${CPPFLAG - fi - - -+# Extract the first word of "sed", so it can be a program name with args. -+set dummy sed; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1371: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$SED" in -+ /*) -+ ac_cv_path_SED="$SED" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_SED="$SED" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_SED="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_SED" && ac_cv_path_SED="no" -+ ;; -+esac -+fi -+SED="$ac_cv_path_SED" -+if test -n "$SED"; then -+ echo "$ac_t""$SED" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+if test "$SED" = "no"; then -+ { echo "configure: error: sed is required to build sasl-config" 1>&2; exit 1; } -+fi -+ -+ - # Check whether --enable-static or --disable-static was given. - if test "${enable_static+set}" = set; then - enableval="$enable_static" -@@ -3599,8 +3640,41 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -+ ac_safe=`echo "des.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for des.h""... $ac_c" 1>&6 -+echo "configure:3646: checking for des.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 3651 "configure" -+#include "confdefs.h" -+#include <des.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:3656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - LIB_DES="-ldes"; -- with_des=yes -+ with_des=yes -+else -+ echo "$ac_t""no" 1>&6 -+with_des=no -+fi -+ - else - echo "$ac_t""no" 1>&6 - with_des=no -@@ -3997,7 +4071,7 @@ fi - - if test "$gssapi" != no; then - if test -d ${gssapi}; then -- CPPFLAGS="$CPPFLAGS -I$gssapi/include" -+ CPPFLAGS="$CPPFLAGS -I$gssapi/include -I$gssapi/include/krb5" - LDFLAGS="$LDFLAGS -L$gssapi/lib" - fi - ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'` -@@ -5000,6 +5074,35 @@ fi - LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'` - - -+ -+ac_safe=`echo "/dev/urandom" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6 -+echo "configure:5081: checking for /dev/urandom" >&5 -+if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; } -+else -+ if test -r /dev/urandom; then -+ eval "ac_cv_file_$ac_safe=yes" -+ else -+ eval "ac_cv_file_$ac_safe=no" -+ fi -+fi -+fi -+if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<EOF -+#define SASL_DEV_RANDOM "/dev/urandom" -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+fi -+ -+ - for ac_hdr in getopt.h unistd.h crypt.h pwd.h shadow.h paths.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -@@ -5474,6 +5577,7 @@ s%@MAKEINFO@%$MAKEINFO%g - s%@SET_MAKE@%$SET_MAKE%g - s%@CC@%$CC%g - s%@CPP@%$CPP%g -+s%@SED@%$SED%g - s%@build@%$build%g - s%@build_alias@%$build_alias%g - s%@build_cpu@%$build_cpu%g diff --git a/security/cyrus-sasl/patches/patch-am b/security/cyrus-sasl/patches/patch-am deleted file mode 100644 index 5f60aee273e..00000000000 --- a/security/cyrus-sasl/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2002/09/07 07:37:41 jlam Exp $ - ---- include/Makefile.in.orig Thu Sep 5 06:28:04 2002 -+++ include/Makefile.in -@@ -144,7 +144,7 @@ SRP_LIBS = @SRP_LIBS@ - VERSION = @VERSION@ - plugindir = @plugindir@ - --include_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h -+include_HEADERS = hmac-md5.h sasl.h saslplug.h saslutil.h - - noinst_PROGRAMS = makemd5 - diff --git a/security/cyrus-sasl/patches/patch-an b/security/cyrus-sasl/patches/patch-an deleted file mode 100644 index 561101b8709..00000000000 --- a/security/cyrus-sasl/patches/patch-an +++ /dev/null @@ -1,114 +0,0 @@ -$NetBSD: patch-an,v 1.2 2002/10/21 06:03:42 jlam Exp $ - ---- plugins/Makefile.in.orig Fri Mar 23 20:48:13 2001 -+++ plugins/Makefile.in -@@ -143,6 +143,7 @@ SASL_KRB_LIB = @SASL_KRB_LIB@ - SASL_MECHS = @SASL_MECHS@ - SASL_UTIL_HEADERS_EXTRA = @SASL_UTIL_HEADERS_EXTRA@ - SASL_UTIL_LIBS_EXTRA = @SASL_UTIL_LIBS_EXTRA@ -+SED = @SED@ - SNPRINTFOBJS = @SNPRINTFOBJS@ - SRP_LIBS = @SRP_LIBS@ - VERSION = @VERSION@ -@@ -168,6 +169,10 @@ sasldir = $(prefix)/lib/sasl - sasl_LTLIBRARIES = @SASL_MECHS@ - EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la libscrammd5.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la - -+bin_SCRIPTS = sasl-config -+sasl_config_CFLAGS = $(CPPFLAGS) -+sasl_config_LIBS = -lsasl $(libplain_la_LIBADD) $(libkerberos4_la_LIBADD) $(libgssapiv2_la_LIBADD) -+ - libplain_la_SOURCES = plain.c - libplain_la_LDFLAGS = -version-info $(plain_version) - libplain_la_LIBADD = $(PLAIN_LIBS) -@@ -227,6 +232,8 @@ liblogin_la_DEPENDENCIES = - liblogin_la_OBJECTS = login.lo - libsrp_la_DEPENDENCIES = - libsrp_la_OBJECTS = srp.lo -+SCRIPTS = $(bin_SCRIPTS) -+ - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -343,6 +350,25 @@ liblogin.la: $(liblogin_la_OBJECTS) $(li - libsrp.la: $(libsrp_la_OBJECTS) $(libsrp_la_DEPENDENCIES) - $(LINK) $(libsrp_la_LDFLAGS) $(libsrp_la_OBJECTS) $(libsrp_la_LIBADD) $(LIBS) - -+install-binSCRIPTS: $(bin_SCRIPTS) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(bindir) -+ @list='$(bin_SCRIPTS)'; for p in $$list; do \ -+ if test -f $$p; then \ -+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ -+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ -+ else if test -f $(srcdir)/$$p; then \ -+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ -+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ -+ else :; fi; fi; \ -+ done -+ -+uninstall-binSCRIPTS: -+ @$(NORMAL_UNINSTALL) -+ list='$(bin_SCRIPTS)'; for p in $$list; do \ -+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ -+ done -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) -@@ -395,7 +421,7 @@ check-am: all-am - check: check-am - installcheck-am: - installcheck: installcheck-am --install-exec-am: -+install-exec-am: install-binSCRIPTS - install-exec: install-exec-am - - install-data-am: install-saslLTLIBRARIES -@@ -404,14 +430,14 @@ install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-am --uninstall-am: uninstall-saslLTLIBRARIES -+uninstall-am: uninstall-saslLTLIBRARIES uninstall-binSCRIPTS - uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) -+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(sasldir) -+ $(mkinstalldirs) $(DESTDIR)$(sasldir) $(DESTDIR)$(bindir) - - - mostlyclean-generic: -@@ -455,9 +481,11 @@ clean-saslLTLIBRARIES maintainer-clean-s - uninstall-saslLTLIBRARIES install-saslLTLIBRARIES mostlyclean-compile \ - distclean-compile clean-compile maintainer-clean-compile \ - mostlyclean-libtool distclean-libtool clean-libtool \ --maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ -+maintainer-clean-libtool uninstall-binSCRIPTS install-binSCRIPTS tags \ -+mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -+distdir mostlyclean-depend distclean-depend clean-depend \ -+maintainer-clean-depend info-am info dvi-am dvi check check-am \ -+installcheck-am installcheck install-exec-am install-exec \ - install-data-am install-data install-am install uninstall-am uninstall \ - all-redirect all-am all installdirs mostlyclean-generic \ - distclean-generic clean-generic maintainer-clean-generic clean \ -@@ -467,6 +495,13 @@ mostlyclean distclean maintainer-clean - # libx509_la_SOURCES = x509.c - # libx509_la_LDFLAGS = -version-info $(x509_version) - # libx509_la_LIBADD = $(X509_LIBS) -+ -+sasl-config: sasl-config.in -+ $(SED) -e "s,%%sasl_config_LIBS%%,$(sasl_config_LIBS),g" \ -+ -e "s,%%sasl_config_CFLAGS%%,$(sasl_config_CFLAGS),g" \ -+ -e "s,%%prefix%%,$(prefix),g" \ -+ -e "s,%%VERSION%%,$(VERSION),g" \ -+ < sasl-config.in > sasl-config - - # 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. diff --git a/security/cyrus-sasl/patches/patch-ao b/security/cyrus-sasl/patches/patch-ao deleted file mode 100644 index cc00862f9cb..00000000000 --- a/security/cyrus-sasl/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2002/09/07 07:37:43 jlam Exp $ - ---- saslauthd/Makefile.in.orig Thu Sep 5 06:28:18 2002 -+++ saslauthd/Makefile.in -@@ -104,7 +104,7 @@ sbin_PROGRAMS = saslauthd - man_MANS = saslauthd.8 - - saslauthd_SOURCES = saslauthd.c mechanisms.c globals.h mechanisms.h auth_dce.c auth_dce.h auth_getpwent.c auth_getpwent.h auth_krb4.c auth_krb4.h auth_pam.c auth_pam.h auth_rimap.c auth_rimap.h auth_shadow.c auth_shadow.h auth_sia.c auth_sia.h --saslauthd_LDADD = @SASL_KRB_LIB@ -+saslauthd_LDADD = @PLAIN_LIBS@ - - INCLUDES = -I$(top_srcdir)/include - EXTRA_DIST = saslauthd.8 diff --git a/security/cyrus-sasl/patches/patch-ap b/security/cyrus-sasl/patches/patch-ap deleted file mode 100644 index 435f6101617..00000000000 --- a/security/cyrus-sasl/patches/patch-ap +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2002/10/07 19:16:48 seb Exp $ - ---- plugins/digestmd5.c.orig Sat Mar 10 12:07:21 2001 -+++ plugins/digestmd5.c -@@ -2714,7 +2714,7 @@ static int mechanism_db_filled(char *mec - int result; - sasl_server_getsecret_t *getsecret; - void *getsecret_context; -- long tmpversion = -1; -+ int32_t tmpversion = -1; - - /* get callback so we can request the secret */ - result = utils->getcallback(utils->conn, -@@ -2738,8 +2738,8 @@ static int mechanism_db_filled(char *mec - /* check version */ - if (sec != NULL) - { -- if (sec->len >= 4) { -- memcpy(&tmpversion, sec->data, 4); -+ if (sec->len >= sizeof(int32_t)) { -+ memcpy(&tmpversion, sec->data, sizeof(int32_t)); - tmpversion = ntohl(tmpversion); - } - free(sec); -@@ -2776,7 +2776,7 @@ static int mechanism_db_filled(char *mec - static int mechanism_fill_db(char *mech_name, sasl_server_params_t *sparams) - { - int result; -- long tmpversion; -+ int32_t tmpversion; - sasl_server_putsecret_t *putsecret; - void *putsecret_context; - sasl_secret_t *sec = NULL; -@@ -2798,18 +2798,18 @@ static int mechanism_fill_db(char *mech_ - - /* allocate a secret structure that we're going to save to disk */ - sec=(sasl_secret_t *) sparams->utils->malloc(sizeof(sasl_secret_t)+ -- 4); -+ sizeof(int32_t)); - if (sec == NULL) { - result = SASL_NOMEM; - return result; - } - - /* set the size */ -- sec->len = 4; -+ sec->len = sizeof(int32_t); - - /* and insert the data */ - tmpversion = htonl(DIGEST_MD5_VERSION); -- memcpy(sec->data, &tmpversion, 4); -+ memcpy(sec->data, &tmpversion, sizeof(int32_t)); - - /* do the store */ - result = putsecret(putsecret_context, diff --git a/security/cyrus-sasl/patches/patch-aq b/security/cyrus-sasl/patches/patch-aq deleted file mode 100644 index e2490fb2d4e..00000000000 --- a/security/cyrus-sasl/patches/patch-aq +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2002/10/07 19:16:49 seb Exp $ - ---- plugins/srp.c.orig Mon Apr 10 00:54:11 2000 -+++ plugins/srp.c -@@ -1243,7 +1243,7 @@ static int mechanism_fill_db(char *mech_ - sasl_server_putsecret_t *putsecret; - void *putsecret_context; - sasl_secret_t *sec = NULL; -- long version; -+ int32_t version; - - /* don't do this again if it's already set */ - if (mydb_initialized == 1) -@@ -1262,18 +1262,18 @@ static int mechanism_fill_db(char *mech_ - - /* allocate a secret structure that we're going to save to disk */ - sec=(sasl_secret_t *) sparams->utils->malloc(sizeof(sasl_secret_t)+ -- 4); -+ sizeof(int32_t)); - if (sec == NULL) { - result = SASL_NOMEM; - return result; - } - - /* set the size */ -- sec->len = 4; -+ sec->len = sizeof(int32_t); - - /* and insert the data */ - version = htonl(SRP_VERSION); -- memcpy(sec->data, &version, 4); -+ memcpy(sec->data, &version, sizeof(int32_t)); - - /* do the store */ - result = putsecret(putsecret_context, diff --git a/security/cyrus-sasl/patches/patch-ar b/security/cyrus-sasl/patches/patch-ar deleted file mode 100644 index f06230779a5..00000000000 --- a/security/cyrus-sasl/patches/patch-ar +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2002/12/16 10:55:03 martti Exp $ - ---- config.h.in.orig Wed Mar 14 05:49:33 2001 -+++ config.h.in Mon Dec 16 11:32:55 2002 -@@ -200,7 +200,11 @@ - - /* location of the random number generator */ - #ifndef DEV_RANDOM -+#if defined(__NetBSD__) -+#define DEV_RANDOM "/dev/urandom" -+#else - #define DEV_RANDOM "/dev/random" -+#endif - #endif - - /* Make Solaris happy... */ |