diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/DEINSTALL | 11 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/DESCR | 2 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/Makefile | 68 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/PLIST | 6 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/distinfo | 7 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/files/saslauthd.sh | 40 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/patches/patch-aa | 20 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/patches/patch-ab | 23 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/patches/patch-ac | 38 |
10 files changed, 217 insertions, 1 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 27865607b4b..010684bb756 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.4406 2004/01/09 19:38:02 jlam Exp $ +$NetBSD: CHANGES,v 1.4407 2004/01/09 19:45:27 jlam Exp $ Changes to the packages collection and infrastructure in 2004: @@ -131,3 +131,4 @@ Changes to the packages collection and infrastructure in 2004: Added darkice-0.13.2 [xtraeme 2004-01-09] Added jgrasp-1.6.4 [jschauma 2004-01-09] Updated cyrus-sasl2 to 2.1.15nb2 [jlam 2004-01-09] + Added cyrus-saslauthd-2.1.17 [jlam 2004-01-09] diff --git a/security/cyrus-saslauthd/DEINSTALL b/security/cyrus-saslauthd/DEINSTALL new file mode 100644 index 00000000000..ccb99a9de36 --- /dev/null +++ b/security/cyrus-saslauthd/DEINSTALL @@ -0,0 +1,11 @@ +#!/bin/sh +# +# $NetBSD: DEINSTALL,v 1.1.1.1 2004/01/09 19:44:10 jlam Exp $ + +SASLSOCKETDIR=@SASLSOCKETDIR@ + +case ${STAGE} in +POST-DEINSTALL) + ${RM} -rf ${SASLSOCKETDIR} + ;; +esac diff --git a/security/cyrus-saslauthd/DESCR b/security/cyrus-saslauthd/DESCR new file mode 100644 index 00000000000..bd2971e4b41 --- /dev/null +++ b/security/cyrus-saslauthd/DESCR @@ -0,0 +1,2 @@ +saslauthd is a daemon process that handles plaintext authentication +requests on behalf of the Cyrus SASL library. diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile new file mode 100644 index 00000000000..a58b9688b8d --- /dev/null +++ b/security/cyrus-saslauthd/Makefile @@ -0,0 +1,68 @@ +# $NetBSD: Makefile,v 1.1.1.1 2004/01/09 19:44:10 jlam Exp $ + +DISTNAME= cyrus-sasl-2.1.17 +PKGNAME= ${DISTNAME:S/sasl/saslauthd/} +CATEGORIES= security +MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ + ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/ + +CONFLICTS+= cyrus-sasl-[0-9]* + +PKG_INSTALLATION_TYPES= overwrite pkgviews + +.include "../../mk/bsd.prefs.mk" + +WRKSRC= ${WRKDIR}/${DISTNAME}/saslauthd +EXTRACT_ELEMENTS= ${DISTNAME}/saslauthd +EXTRACT_ELEMENTS+= ${DISTNAME}/include/hmac-md5.h + +USE_BUILDLINK3= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} + +BUILD_DEFS+= USE_PAM USE_LDAP SASL_USE_GSSAPI + +# /var/run/saslauthd matches the default value in configure. +SASLSOCKETDIR= /var/run/saslauthd +FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR} +CONFIGURE_ARGS+= --with-saslauthd="${SASLSOCKETDIR}" + +.if defined(USE_PAM) +. include "../../security/PAM/buildlink3.mk" +CONFIGURE_ARGS+= --with-pam=${BUILDLINK_PREFIX.pam} +.endif + +.if defined(USE_LDAP) +. include "../../databases/openldap/buildlink3.mk" +. include "../../security/openssl/buildlink3.mk" +CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +.endif + +.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) +CONFIGURE_ARGS+= --enable-gssapi=/usr # GSSAPI +. if exists(/usr/include/krb5/krb5.h) +CPPFLAGS+= -I/usr/include/krb5 +. endif +.endif + +USE_PKGINSTALL= yes +DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL +RCD_SCRIPTS= saslauthd + +post-configure: + ${LN} -sf saslauthd.h ${WRKSRC}/config.h + +post-build: + cd ${WRKSRC}; for f in LDAP_SASLAUTHD saslauthd.mdoc; do \ + ${SED} -e "s|/usr/local/etc/|${PKG_SYSCONFDIR}/|g" \ + $$f > $$f.new; \ + ${MV} -f $$f.new $$f; \ + done + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cyrus-saslauthd + ${INSTALL_DATA} ${WRKSRC}/LDAP_SASLAUTHD \ + ${PREFIX}/share/examples/cyrus-saslauthd + +.include "../../mk/bsd.pkg.mk" diff --git a/security/cyrus-saslauthd/PLIST b/security/cyrus-saslauthd/PLIST new file mode 100644 index 00000000000..362e53f9e75 --- /dev/null +++ b/security/cyrus-saslauthd/PLIST @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/09 19:44:10 jlam Exp $ +etc/rc.d/saslauthd +man/man8/saslauthd.8 +sbin/saslauthd +share/examples/cyrus-saslauthd/LDAP_SASLAUTHD +@dirrm share/examples/cyrus-saslauthd diff --git a/security/cyrus-saslauthd/distinfo b/security/cyrus-saslauthd/distinfo new file mode 100644 index 00000000000..bf57905ad56 --- /dev/null +++ b/security/cyrus-saslauthd/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1.1.1 2004/01/09 19:44:10 jlam Exp $ + +SHA1 (cyrus-sasl-2.1.17.tar.gz) = c91e073274279ea59d8ca9514559140e23e3be57 +Size (cyrus-sasl-2.1.17.tar.gz) = 1499725 bytes +SHA1 (patch-aa) = cad401f765bcebf19f8ebb87af3aae0f2c1a46d0 +SHA1 (patch-ab) = 34a7ec01af30035b433e070607572798e8325b22 +SHA1 (patch-ac) = 79267ad3e175632728e43fb2ba159ab411e7ff3c diff --git a/security/cyrus-saslauthd/files/saslauthd.sh b/security/cyrus-saslauthd/files/saslauthd.sh new file mode 100644 index 00000000000..f28560904b9 --- /dev/null +++ b/security/cyrus-saslauthd/files/saslauthd.sh @@ -0,0 +1,40 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: saslauthd.sh,v 1.1.1.1 2004/01/09 19:44:10 jlam 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" +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@ 0755 @SASLSOCKETDIR@ + @CHOWN@ @ROOT_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-saslauthd/patches/patch-aa b/security/cyrus-saslauthd/patches/patch-aa new file mode 100644 index 00000000000..4c7e386fb6c --- /dev/null +++ b/security/cyrus-saslauthd/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/01/09 19:44:10 jlam Exp $ + +--- Makefile.am.orig Wed Sep 24 15:36:09 2003 ++++ Makefile.am +@@ -30,11 +30,8 @@ INCLUDES = -I$(top_srcdir)/include -I$(t + DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I.. + + +-dist-hook: saslauthd.8 ++dist-hook: saslauthd.mdoc + +-saslauthd.8: saslauthd.mdoc +- nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8 +- +-install-data-local: saslauthd.8 +- $(mkinstalldirs) $(DESTDIR)$(mandir)/cat8 +- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8 ++install-data-local: saslauthd.mdoc ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 ++ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 diff --git a/security/cyrus-saslauthd/patches/patch-ab b/security/cyrus-saslauthd/patches/patch-ab new file mode 100644 index 00000000000..1660952174b --- /dev/null +++ b/security/cyrus-saslauthd/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/01/09 19:44:11 jlam Exp $ + +--- Makefile.in.orig Mon Dec 1 11:35:12 2003 ++++ Makefile.in +@@ -602,14 +602,11 @@ uninstall-am: uninstall-info-am uninstal + uninstall-sbinPROGRAMS + + +-dist-hook: saslauthd.8 ++dist-hook: saslauthd.mdoc + +-saslauthd.8: saslauthd.mdoc +- nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8 +- +-install-data-local: saslauthd.8 +- $(mkinstalldirs) $(DESTDIR)$(mandir)/cat8 +- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8 ++install-data-local: saslauthd.mdoc ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 ++ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 + # 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. + .NOEXPORT: diff --git a/security/cyrus-saslauthd/patches/patch-ac b/security/cyrus-saslauthd/patches/patch-ac new file mode 100644 index 00000000000..54fe88748e2 --- /dev/null +++ b/security/cyrus-saslauthd/patches/patch-ac @@ -0,0 +1,38 @@ +$NetBSD: patch-ac,v 1.1.1.1 2004/01/09 19:44:11 jlam Exp $ + +--- md5global.h.orig Fri Mar 28 14:59:24 2003 ++++ md5global.h +@@ -3,6 +3,13 @@ + #ifndef MD5GLOBAL_H + #define MD5GLOBAL_H + ++#ifdef HAVE_STDINT_H ++#include <stdint.h> ++#endif ++#ifdef HAVE_INTTYPES_H ++#include <inttypes.h> ++#endif ++ + /* PROTOTYPES should be set to one if and only if the compiler supports + function argument prototyping. + The following makes PROTOTYPES default to 0 if it has not already +@@ -15,13 +22,13 @@ The following makes PROTOTYPES default t + /* POINTER defines a generic pointer type */ + typedef unsigned char *POINTER; + +-typedef signed char INT1; /* 8 bits */ +-typedef short INT2; /* 16 bits */ +-typedef int INT4; /* 32 bits */ ++typedef int8_t INT1; /* 8 bits */ ++typedef int16_t INT2; /* 16 bits */ ++typedef int32_t INT4; /* 32 bits */ + /* There is no 64 bit type */ +-typedef unsigned char UINT1; /* 8 bits */ +-typedef unsigned short UINT2; /* 16 bits */ +-typedef unsigned int UINT4; /* 32 bits */ ++typedef uint8_t UINT1; /* 8 bits */ ++typedef uint16_t UINT2; /* 16 bits */ ++typedef uint32_t UINT4; /* 32 bits */ + /* There is no 64 bit type */ + + /* PROTO_LIST is defined depending on how PROTOTYPES is defined above. |