Initial import of mail/courier-auth-0.37.1.

This package contains the authentication daemon, modules, and utilities
for the Courier mail packages.

15 files changed, 533 insertions, 0 deletions

diff --git a/mail/courier-auth/DEINSTALL b/mail/courier-auth/DEINSTALL
new file mode 100644
index 00000000000..1191243b8ff
--- /dev/null
+++ b/mail/courier-auth/DEINSTALL
@@ -0,0 +1,16 @@
+# $NetBSD: DEINSTALL,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+# Additional files that are may be created by the sysadmin.
+ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdb"
+ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdb.dat"
+ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdbshadow.dat"
+
+case ${STAGE} in
+POST-DEINSTALL)
+	#
+	# Unconditionally remove authdaemon state directory as it contains
+	# files and sockets that authdaemond creates every time it is
+	# started.
+	#
+	${RM} -rf /var/authdaemon
+esac
diff --git a/mail/courier-auth/DESCR b/mail/courier-auth/DESCR
new file mode 100644
index 00000000000..0f1083e1624
--- /dev/null
+++ b/mail/courier-auth/DESCR
@@ -0,0 +1,2 @@
+This package contains the authentication daemon, modules, and utilities
+for the Courier mail packages.
diff --git a/mail/courier-auth/INSTALL b/mail/courier-auth/INSTALL
new file mode 100644
index 00000000000..4d27dfff5f9
--- /dev/null
+++ b/mail/courier-auth/INSTALL
@@ -0,0 +1,19 @@
+# $NetBSD: INSTALL,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+SYSCONFTOOL="@SYSCONFTOOL@"
+EGDIR=${PKG_PREFIX}/share/examples/courier
+GEN_FILES="@GEN_FILES@"
+
+case ${STAGE} in
+POST-INSTALL)
+	eval set -- ${GEN_FILES}
+	for file
+	do
+		# Merge new config files with the old ones.
+		${CP} ${EGDIR}/${file}.dist @PKG_SYSCONFDIR@/${file}.dist
+		${SYSCONFTOOL} @PKG_SYSCONFDIR@/${file}
+		${CHMOD} 0600 @PKG_SYSCONFDIR@/${file}
+		${RM} -f @PKG_SYSCONFDIR@/${file}.dist
+	done
+	;;
+esac
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
new file mode 100644
index 00000000000..ea6164d4236
--- /dev/null
+++ b/mail/courier-auth/Makefile
@@ -0,0 +1,78 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+PKGNAME=	courier-auth-${BASE_VERS}
+PKGREVISION?=	# empty
+COMMENT=	authentication modules for Courier mail packages
+
+CONFLICTS=	courier-imap<=1.4.0
+CONFLICTS+=	courier-imap-ldap-*
+
+USE_BUILDLINK_ONLY=	yes
+USE_PERL5=		yes
+REPLACE_PERL=		sysconftool
+
+.include "../../mail/courier-auth/Makefile.common"
+
+WRKSRC_FILES=		config.guess config.sub configure		\
+			install-sh mkinstalldirs
+WRKSRC_FILES+=		dbobj.h.in dbobj.config.in sysconftool
+WRKSRC_SUBDIRS=		afx bdbobj gdbmobj numlib soxwrap md5 sha1	\
+			libhmac random128 unicode rfc822 rfc1035	\
+			rfc2045	liblock
+WRKSRC_SUBDIRS+=	makedat userdb authlib
+
+EXTRACT_ELEMENTS=	${WRKSRC_FILES:S/^/${DISTNAME}\//}
+EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
+
+.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+INSTALL_TARGET=		install-strip
+.else
+INSTALL_TARGET=		install
+.endif
+
+SYSCONFTOOL=		${PREFIX}/sbin/authdaemon.sysconftool
+GEN_FILES=		authdaemonrc
+OWN_DIRS_PERMS=		/var/authdaemon ${ROOT_USER} ${ROOT_GROUP} 700
+
+CONF_FILES_PERMS=	# empty
+.for FILE in ${GEN_FILES}
+CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+.endfor
+RCD_SCRIPTS=		authdaemond
+
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
+FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
+
+pre-configure: configure-init
+
+do-build:
+.for DIR in ${WRKSRC_SUBDIRS}
+	@cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${ALL_TARGET}
+.endfor
+
+do-install:
+.for DIR in ${WRKSRC_SUBDIRS}
+	@cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${INSTALL_TARGET}
+.endfor
+
+post-install:
+	@for file in ${RCD_SCRIPTS}; do					\
+		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${file}.sh	\
+			> ${WRKDIR}/$${file}.sh;			\
+		${INSTALL_SCRIPT} ${WRKDIR}/$${file}.sh			\
+			${PREFIX}/etc/rc.d/$${file};			\
+	done
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
+	for file in authdaemonrc.dist; do				\
+		${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file} ${EGDIR};	\
+		${RM} -f ${PKG_SYSCONFDIR}/$${file};			\
+	done
+
+.include "../../mk/bsd.pkg.install.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-auth/Makefile.common b/mail/courier-auth/Makefile.common
new file mode 100644
index 00000000000..3972b1fa546
--- /dev/null
+++ b/mail/courier-auth/Makefile.common
@@ -0,0 +1,64 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+DISTNAME?=	courier-${DIST_VERS}
+CATEGORIES+=	mail
+MASTER_SITES?=	${MASTER_SITE_SOURCEFORGE:=courier/}
+
+MAINTAINER?=	jlam@netbsd.org
+HOMEPAGE?=	http://www.courier-mta.org/
+
+# Version numbering scheme:
+#
+# DIST_VERS	version number on the distfile
+# BASE_BERS	pkgsrc-manged version number
+#
+DIST_VERS=	0.37.1
+BASE_VERS=	${DIST_VERS}
+
+USE_GMAKE=		yes
+
+PKG_SYSCONFSUBDIR?=	courier
+DATADIR=		${PREFIX}/share/courier
+LIBEXECDIR=		${PREFIX}/libexec/courier
+AUTHLIBDIR=		${LIBEXECDIR}/authlib
+DOCDIR=			${PREFIX}/share/doc/courier
+EGDIR=			${PREFIX}/share/examples/courier
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--datadir=${DATADIR}
+CONFIGURE_ARGS+=	--libexecdir=${LIBEXECDIR}
+CONFIGURE_ARGS+=	--localstatedir=/var
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+CONFIGURE_ARGS+=	--enable-unicode
+CONFIGURE_ARGS+=	--with-authchangepwdir=${LIBEXECDIR}
+
+CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=	--with-userdb=${PKG_SYSCONFDIR}/userdb
+CONFIGURE_ARGS+=	--with-makedatprog=${LIBEXECDIR}/makedatprog
+CONFIGURE_ARGS+=	--disable-root-check
+
+# Build authdaemon, but explicitly disable certain methods (ldap, mysql, pgsql)
+# that are built in separate packages.  We also disable authcustom since it's
+# a template authentication method.
+#
+CONFIGURE_ARGS+=	--with-authdaemon
+CONFIGURE_ARGS+=	--without-authcustom
+CONFIGURE_ARGS+=	--without-authldap
+CONFIGURE_ARGS+=	--without-authmysql
+CONFIGURE_ARGS+=	--without-authpgsql
+
+.if ${OPSYS} == "SunOS"
+.include "../../databases/db/buildlink.mk"
+CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
+.endif
+
+.if defined(USE_PAM)
+.include "../../security/PAM/buildlink.mk"
+.endif
+
+configure-init:
+	${MKDIR} ${WRKSRC}/courier
+	${TOUCH} ${TOUCH_ARGS} ${WRKSRC}/courier/courier.c
diff --git a/mail/courier-auth/PLIST b/mail/courier-auth/PLIST
new file mode 100644
index 00000000000..43af3708c1f
--- /dev/null
+++ b/mail/courier-auth/PLIST
@@ -0,0 +1,40 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+etc/rc.d/authdaemond
+libexec/courier/authdaemon.passwd
+libexec/courier/authlib/authdaemon
+libexec/courier/authlib/authdaemond
+libexec/courier/authlib/authdaemond.plain
+libexec/courier/authsystem.passwd
+libexec/courier/makedatprog
+man/man7/authcram.7
+man/man7/authdaemon.7
+man/man7/authdaemond.7
+man/man7/authldap.7
+man/man7/authlib.7
+man/man7/authmysql.7
+man/man7/authpam.7
+man/man7/authpwd.7
+man/man7/authshadow.7
+man/man7/authuserdb.7
+man/man7/authvchkpw.7
+man/man8/makeuserdb.8
+man/man8/pw2userdb.8
+man/man8/userdb.8
+man/man8/userdbpw.8
+man/man8/vchkpw2userdb.8
+sbin/authdaemon.sysconftool
+sbin/makeuserdb
+sbin/pw2userdb
+sbin/userdb
+sbin/userdbpw
+sbin/vchkpw2userdb
+share/courier/authsystem.passwd
+share/courier/makeuserdb
+share/courier/pw2userdb
+share/courier/userdb
+share/courier/vchkpw2userdb
+share/examples/courier/authdaemonrc.dist
+@unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/libexec/courier/authlib 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/libexec/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-auth/distinfo b/mail/courier-auth/distinfo
new file mode 100644
index 00000000000..4918ef7165a
--- /dev/null
+++ b/mail/courier-auth/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+SHA1 (courier-0.37.1.tar.gz) = d1649ef994e43484e9cd966d988c1493bfefde9e
+Size (courier-0.37.1.tar.gz) = 3225792 bytes
+SHA1 (patch-aa) = 74431dced835cbfb77b53fe611d5959b0a254040
+SHA1 (patch-ab) = aacc6f34a97abfffe8c25382a58568eb6098219d
+SHA1 (patch-ac) = 18b127fb3ec544a24e834c52dca4ccf0718515a4
+SHA1 (patch-ad) = 380713f0b934c5365c538a6f3be035ea7d3187ff
+SHA1 (patch-ae) = f65a59aeac7790e4fe76eab8bf4950f0dddc3cfb
+SHA1 (patch-af) = 40dd3a78214a28c455ffcc24ab437fffd099b9a0
diff --git a/mail/courier-auth/files/Makefile.in b/mail/courier-auth/files/Makefile.in
new file mode 100644
index 00000000000..7d86b505ab7
--- /dev/null
+++ b/mail/courier-auth/files/Makefile.in
@@ -0,0 +1,130 @@
+# $NetBSD: Makefile.in,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+#
+# Makefile to build and to install just the authentication bits of courier.
+# This is mostly extracted from courier/Makefile with the appropriate
+# modifications to deal with directory locations.
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+authchangepwdir = @authchangepwdir@
+
+libexec_PROGRAMS = makedatprog
+bin_PROGRAMS = maildirmake
+sbin_PROGRAMS = userdbpw
+
+
+databindir = $(datadir)
+databin_SCRIPTS = makedat makeuserdb userdb pw2userdb vchkpw2userdb
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+
+install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+	@list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+
+install-databinSCRIPTS: $(databin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(databindir)
+	@list='$(databin_SCRIPTS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(databindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(databindir)/`echo $$p|sed '$(transform)'`; \
+	  else if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(databindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(databindir)/`echo $$p|sed '$(transform)'`; \
+	  else :; fi; fi; \
+	done
+
+install-exec-hook:
+	for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \
+		$(sysconfdir)/filters $(libexecdir)/authlib \
+		$(localstatedir) $(localstatedir)/tmp\
+		$(webmaildir)\
+		$(localstatedir)/tmp/broken\
+		$(localstatedir)/msgs $(localstatedir)/msgq ; do \
+			$(mkinstalldirs) $(DESTDIR)$$d || exit 1; done
+	for f in `cat ../authlib/installlist`; do test -z "$$f" && continue; \
+		test -f ../authlib/$$f || continue; \
+		$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) ../authlib/$$f \
+			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
+	for f in `cat ../authlib/installlist.sh`; do test -z "$$f" && continue; \
+		test -f ../authlib/$$f || continue; \
+		$(INSTALL_SCRIPT) ../authlib/$$f \
+			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
+	rm -f $(DESTDIR)$(bindir)/makedat
+	$(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
+	for f in makeuserdb userdb \
+		pw2userdb vchkpw2userdb ; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
+		$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
+	$(mkinstalldirs) $(DESTDIR)@authchangepwdir@
+	. ../authlib/authpwdprogs ; for f in `echo $$PWPROGS dummy` ; do \
+		test "$$f" = "dummy" && continue ; \
+		$(INSTALL_PROGRAM) ../authlib/$$f \
+			$(DESTDIR)@authchangepwdir@/$$f ; done
+	. ../authlib/authpwdprogs ; for f in `echo $$PWSCRIPTS dummy` ; do \
+		test "$$f" = "dummy" && continue ; \
+		$(INSTALL_SCRIPT) ../authlib/$$f \
+			$(DESTDIR)$(datadir)/$$f ; \
+		rm -f $(DESTDIR)@authchangepwdir@/$$f ; \
+		$(LN_S) $(datadir)/$$f \
+			$(DESTDIR)@authchangepwdir@/$$f ; done
+
+install-data-hook:
+	. ../authlib/authdaemonrc ; \
+		test "$$authdaemonvar" != "" || exit 0 ; \
+		$(mkinstalldirs) $(DESTDIR)$$authdaemonvar
diff --git a/mail/courier-auth/files/authdaemond.sh b/mail/courier-auth/files/authdaemond.sh
new file mode 100644
index 00000000000..870bff5a15b
--- /dev/null
+++ b/mail/courier-auth/files/authdaemond.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# $NetBSD: authdaemond.sh,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+#
+# Courier user authentication daemon
+#
+# PROVIDE: authdaemond
+# REQUIRE: DAEMON
+
+if [ -e /etc/rc.subr ]
+then
+        . /etc/rc.subr
+fi
+
+name="authdaemond"
+rcvar=${name}
+command="@PREFIX@/libexec/courier/authlib/authdaemond"
+pidfile="/var/authdaemon/pid"
+required_files="@PKG_SYSCONFDIR@/authdaemonrc"
+
+start_cmd="courier_doit start"
+stop_cmd="courier_doit stop"
+
+courier_doit()
+{
+        action=$1
+        case ${action} in
+        start)  echo "Starting ${name}." ;;
+        stop)   echo "Stopping ${name}." ;;
+        esac
+
+        @SETENV@ - ${command} ${action}
+}
+
+if [ -e /etc/rc.subr ]
+then
+        load_rc_config $name
+        run_rc_command "$1"
+else
+        echo -n " ${name}"
+        ${start_cmd}
+fi
diff --git a/mail/courier-auth/patches/patch-aa b/mail/courier-auth/patches/patch-aa
new file mode 100644
index 00000000000..ff54898715d
--- /dev/null
+++ b/mail/courier-auth/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+--- authlib/Makefile.in.orig	Fri Jan 18 22:04:42 2002
++++ authlib/Makefile.in
+@@ -1823,6 +1823,30 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ install-exec-am:
++	for d in $(sbindir) $(libexecdir) $(libexecdir)/authlib; do $(mkinstalldirs) $(DESTDIR)$$d || exit 1; done
++	for f in `cat ../authlib/installlist`; do test -z "$$f" && continue; \
++		test -f ../authlib/$$f || continue; \
++		$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) ../authlib/$$f \
++			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
++	for f in `cat ../authlib/installlist.sh`; do test -z "$$f" && continue; \
++		test -f ../authlib/$$f || continue; \
++		$(INSTALL_SCRIPT) ../authlib/$$f \
++			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
++	for f in makeuserdb userdb pw2userdb vchkpw2userdb ; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
++		$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
++	$(mkinstalldirs) $(DESTDIR)@authchangepwdir@
++	. ../authlib/authpwdprogs ; for f in `echo $$PWPROGS dummy` ; do \
++		test "$$f" = "dummy" && continue ; \
++		$(INSTALL_PROGRAM) ../authlib/$$f \
++			$(DESTDIR)@authchangepwdir@/$$f ; done
++	. ../authlib/authpwdprogs ; for f in `echo $$PWSCRIPTS dummy` ; do \
++		test "$$f" = "dummy" && continue ; \
++		$(INSTALL_SCRIPT) ../authlib/$$f \
++			$(DESTDIR)$(datadir)/$$f ; \
++		rm -f $(DESTDIR)@authchangepwdir@/$$f ; \
++		$(LN_S) $(datadir)/$$f \
++			$(DESTDIR)@authchangepwdir@/$$f ; done
++
+ install-exec: install-exec-am
+ 
+ install-data-am: install-man install-data-local
+@@ -2068,7 +2092,6 @@
+ 		for f in $(man_LINKS) "" ; do \
+ 			test "$$f" = "" && continue ; \
+ 			rm -f $$f; $(LN_S) authlib.7 $$f ; \
+-			test -w /etc && chown bin $$f && chgrp bin $$f ; \
+ 			done ; exit 0
+ 
+ uninstall-local: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
diff --git a/mail/courier-auth/patches/patch-ab b/mail/courier-auth/patches/patch-ab
new file mode 100644
index 00000000000..06c06c054c9
--- /dev/null
+++ b/mail/courier-auth/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+--- authlib/configure.in.orig	Thu Dec 27 17:26:43 2001
++++ authlib/configure.in
+@@ -411,8 +411,6 @@
+ 	STATIC_LIST="authldap_info $STATIC_LIST"
+ 	LIBAUTH="$LIBAUTH libauth-authldap.a"
+ 	echo authldaprc.dist >>authconfiglist
+-else
+-	authldaprc=""
+ fi
+ AC_SUBST(LDAPLIBS)
+ 
diff --git a/mail/courier-auth/patches/patch-ac b/mail/courier-auth/patches/patch-ac
new file mode 100644
index 00000000000..0f7f8ac019b
--- /dev/null
+++ b/mail/courier-auth/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+--- authlib/configure.orig	Thu Dec 27 17:27:05 2001
++++ authlib/configure
+@@ -2689,8 +2689,6 @@
+ 	STATIC_LIST="authldap_info $STATIC_LIST"
+ 	LIBAUTH="$LIBAUTH libauth-authldap.a"
+ 	echo authldaprc.dist >>authconfiglist
+-else
+-	authldaprc=""
+ fi
+ 
+ 
diff --git a/mail/courier-auth/patches/patch-ad b/mail/courier-auth/patches/patch-ad
new file mode 100644
index 00000000000..6dc4959e2a5
--- /dev/null
+++ b/mail/courier-auth/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+--- authlib/cryptpassword.c.orig	Wed Jun 20 21:44:30 2001
++++ authlib/cryptpassword.c
+@@ -6,6 +6,7 @@
+ #if	HAVE_CONFIG_H
+ #include	"config.h"
+ #endif
++#include	<stdlib.h>
+ #include	<string.h>
+ #if	HAVE_UNISTD_H
+ #include	<unistd.h>
diff --git a/mail/courier-auth/patches/patch-ae b/mail/courier-auth/patches/patch-ae
new file mode 100644
index 00000000000..cd7cd83080f
--- /dev/null
+++ b/mail/courier-auth/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+--- makedat/Makefile.in.orig	Fri Jan 18 22:04:44 2002
++++ makedat/Makefile.in
+@@ -281,6 +281,10 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ install-exec-am:
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
++	rm -f $(DESTDIR)$(libexecdir)/makedatprog
++	$(INSTALL_PROGRAM) makedatprog $(DESTDIR)$(libexecdir)/makedatprog
++
+ install-exec: install-exec-am
+ 
+ install-data-am:
diff --git a/mail/courier-auth/patches/patch-af b/mail/courier-auth/patches/patch-af
new file mode 100644
index 00000000000..bc8845be8c5
--- /dev/null
+++ b/mail/courier-auth/patches/patch-af
@@ -0,0 +1,36 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+
+--- userdb/Makefile.in.orig	Fri Jan 18 22:04:41 2002
++++ userdb/Makefile.in
+@@ -332,9 +332,31 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ install-exec-am:
++	$(mkinstalldirs) $(DESTDIR)$(sbindir)
++	$(INSTALL_PROGRAM) userdbpw $(DESTDIR)$(sbindir)/userdbpw
++	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	cp userdb.pl userdb
++	for f in makeuserdb userdb pw2userdb vchkpw2userdb; do \
++		$(INSTALL_SCRIPT) $$f $(DESTDIR)$(datadir)/$$f; \
++		rm -f $(DESTDIR)$(sbindir)/$$f; \
++		$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f; \
++	done
++
+ install-exec: install-exec-am
+ 
++man8dir = @mandir@/man8
++
+ install-data-am:
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
++	for i in $(man8); do \
++	  echo " $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i"; \
++	  $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
++	done
++	cd $(DESTDIR)$(man8dir) ; \
++		rm -f pw2userdb.8 vchkpw2userdb.8; \
++		$(LN_S) makeuserdb.8 pw2userdb.8 ; \
++		$(LN_S) makeuserdb.8 vchkpw2userdb.8 ; \
++
+ install-data: install-data-am
+ 
+ install-am: all-am