pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/courier-auth Update mail/courier-auth to 0.45.6. ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b5ab7286b239
branches: trunk
changeset: 478023:b5ab7286b239
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Jul 14 20:07:07 2004 +0000
description:
Update mail/courier-auth to 0.45.6. Changes from version 0.44.2 include:
* Honor ${VARBASE}.
* Rename "authdaemon.sysconftool" to "sysconftool" for use by other
Courier mail packages.
* authvchkpw explicitly disabled -- it's not officially supported within
courier, and there's a workaround by using vchkpw2userdb(8). This
closes pkg/19365.
* courierlogger(1) moved from mail/courier-imap into this package.
* Support a new setting DEBUG_LOGIN in authdaemonrc to allow easier
debugging of the authentication process.
* Added documentation on how to debug the authentication process in
${PREFIX}/share/doc/courier.
* makedat: Skip subdirectories named "CVS". Allows all directory-based
lists (makesmtpaccess, etc...) to be managed via CVS.
diffstat:
mail/courier-auth/DEINSTALL | 10 ++++----
mail/courier-auth/INSTALL | 10 ++++----
mail/courier-auth/MESSAGE | 4 +-
mail/courier-auth/Makefile | 14 ++++++++----
mail/courier-auth/Makefile.authdaemond | 7 +-----
mail/courier-auth/Makefile.common | 23 ++++++++++++++------
mail/courier-auth/PLIST | 10 +++++++-
mail/courier-auth/distinfo | 14 +++++++-----
mail/courier-auth/files/authdaemond.sh | 7 ++---
mail/courier-auth/patches/patch-aa | 18 ++++++++++------
mail/courier-auth/patches/patch-ab | 8 +++---
mail/courier-auth/patches/patch-ac | 8 +++---
mail/courier-auth/patches/patch-ah | 21 +++++++++++++++++++
mail/courier-auth/patches/patch-ai | 37 ++++++++++++++++++++++++++++++++++
14 files changed, 134 insertions(+), 57 deletions(-)
diffs (truncated from 459 to 300 lines):
diff -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/DEINSTALL
--- a/mail/courier-auth/DEINSTALL Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/DEINSTALL Wed Jul 14 20:07:07 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2004/07/14 20:07:07 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"
+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)
@@ -12,5 +12,5 @@
# files and sockets that authdaemond creates every time it is
# started.
#
- ${RM} -rf /var/authdaemon
+ ${RM} -rf @AUTHDAEMONVAR@
esac
diff -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/INSTALL
--- a/mail/courier-auth/INSTALL Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/INSTALL Wed Jul 14 20:07:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2004/07/14 20:07:07 jlam Exp $
SYSCONFTOOL="@SYSCONFTOOL@"
EGDIR=${PKG_PREFIX}/share/examples/courier
@@ -10,10 +10,10 @@
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
+ ${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 -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/MESSAGE
--- a/mail/courier-auth/MESSAGE Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/MESSAGE Wed Jul 14 20:07:07 2004 +0000
@@ -1,8 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2002/01/24 16:02:21 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2004/07/14 20:07:07 jlam Exp $
To enable changing the system password via a Courier authentication module,
the following packages will need to be installed:
- tcl-expect Tcl extension for scripting of interactive programs
+ tcl-expect Tcl extension for scripting of interactive programs
===========================================================================
diff -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/Makefile
--- a/mail/courier-auth/Makefile Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/Makefile Wed Jul 14 20:07:07 2004 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2004/05/12 23:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/07/14 20:07:07 jlam Exp $
PKGNAME= courier-auth-${BASE_VERS}
CATEGORIES= security
-COMMENT= Authentication modules for Courier mail packages
+COMMENT= authentication modules for Courier mail packages
CONFLICTS= courier-imap<=1.4.0
-CONFLICTS+= courier-imap-ldap-*
+CONFLICTS+= courier-imap-ldap-[0-9]*
USE_PERL5= yes
REPLACE_PERL= sysconftool
@@ -17,13 +17,15 @@
.include "../courier-auth/Makefile.authdaemond"
WRKSRC_FILES+= imap/system-auth.authpam
+WRKSRC_SUBDIRS+= liblog
-INSTALL_DIRS= ${WRKSRC}/makedat ${WRKSRC}/userdb ${WRKSRC}/authlib
+INSTALL_DIRS= ${WRKSRC}/liblog ${WRKSRC}/makedat \
+ ${WRKSRC}/userdb ${WRKSRC}/authlib
GEN_FILES= authdaemonrc
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
-OWN_DIRS_PERMS= /var/authdaemon ${ROOT_USER} ${ROOT_GROUP} 700
+OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${ROOT_USER} ${ROOT_GROUP} 700
CONF_FILES_PERMS= # empty
.for FILE in ${GEN_FILES}
CONF_FILES_PERMS+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE} \
@@ -32,6 +34,8 @@
RCD_SCRIPTS= authdaemond
post-install:
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/authlib/README.authdebug.html ${DOCDIR}
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/authlib/authdaemonrc \
${EGDIR}/authdaemonrc.dist
diff -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/Makefile.authdaemond
--- a/mail/courier-auth/Makefile.authdaemond Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/Makefile.authdaemond Wed Jul 14 20:07:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.authdaemond,v 1.11 2004/03/26 18:48:52 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.12 2004/07/14 20:07:07 jlam Exp $
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
@@ -34,9 +34,6 @@
EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//}
EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
-REPLACE_PERL= sysconftool
-SYSCONFTOOL= ${PREFIX}/sbin/authdaemon.sysconftool
-
DISTINFO_FILE= ${.CURDIR}/../courier-auth/distinfo
PATCHDIR= ${.CURDIR}/../courier-auth/patches
@@ -46,8 +43,6 @@
#
BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
-FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
-
.include "../../mk/bdb.buildlink3.mk"
.if defined(USE_PAM)
BUILD_DEFS+= USE_PAM
diff -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/Makefile.common
--- a/mail/courier-auth/Makefile.common Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/Makefile.common Wed Jul 14 20:07:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2004/02/23 23:24:32 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/07/14 20:07:07 jlam Exp $
DISTNAME?= courier-${DIST_VERS}
CATEGORIES+= mail
@@ -13,7 +13,7 @@
# DIST_VERS version number on the distfile
# BASE_BERS pkgsrc-manged version number
#
-DIST_VERS= 0.44.2
+DIST_VERS= 0.45.6
BASE_VERS= ${DIST_VERS}
USE_GNU_TOOLS+= make
@@ -26,12 +26,15 @@
HTMLDIR= ${PREFIX}/share/doc/html/courier
EGDIR= ${PREFIX}/share/examples/courier
+SYSCONFTOOL= ${DATADIR}/sysconftool
+FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
+
.include "../../mk/bsd.prefs.mk"
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --datadir=${DATADIR}
CONFIGURE_ARGS+= --libexecdir=${LIBEXECDIR}
-CONFIGURE_ARGS+= --localstatedir=/var
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --enable-unicode
@@ -49,16 +52,22 @@
CONFIGURE_ARGS+= --with-waitfunc=wait3
.endif
-# 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.
+# Build authdaemon, but explicitly disable certain methods (ldap, mysql,
+# pgsql) that are built in separate packages. We also disable authcustom
+# since it's just a sample template authentication method, and authvchkpw
+# since vpopmail is very explicitly *not* officially supported by the
+# Courier author (though it's possible to work around this deficiency by
+# using vchkpw2userdb(8)).
#
+AUTHDAEMONVAR?= ${VARBASE}/authdaemon
+FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR}
CONFIGURE_ARGS+= --with-authdaemon
-CONFIGURE_ARGS+= --with-authdaemonvar=/var/authdaemon
+CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR}
CONFIGURE_ARGS+= --without-authcustom
CONFIGURE_ARGS+= --without-authldap
CONFIGURE_ARGS+= --without-authmysql
CONFIGURE_ARGS+= --without-authpgsql
+CONFIGURE_ARGS+= --without-authvchkpw
CONFIGURE_ENV+= EXPECT=${LOCALBASE}/bin/expect
CONFIGURE_ENV+= PERL=${PERL5}
diff -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/PLIST
--- a/mail/courier-auth/PLIST Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/PLIST Wed Jul 14 20:07:07 2004 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/04/23 22:07:53 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/07/14 20:07:07 jlam Exp $
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/man1/courierlogger.1
man/man7/authcram.7
man/man7/authdaemon.7
man/man7/authdaemond.7
@@ -21,7 +22,9 @@
man/man8/userdb.8
man/man8/userdbpw.8
man/man8/vchkpw2userdb.8
-sbin/authdaemon.sysconftool
+sbin/authenumerate
+sbin/authinfo
+sbin/courierlogger
sbin/makeuserdb
sbin/pw2userdb
sbin/userdb
@@ -30,11 +33,14 @@
share/courier/authsystem.passwd
share/courier/makeuserdb
share/courier/pw2userdb
+share/courier/sysconftool
share/courier/userdb
share/courier/vchkpw2userdb
+share/doc/courier/README.authdebug.html
share/examples/courier/authdaemonrc.dist
share/examples/courier/system-auth.authpam
@unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/share/doc/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 -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/distinfo
--- a/mail/courier-auth/distinfo Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/distinfo Wed Jul 14 20:07:07 2004 +0000
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.4 2004/02/21 14:43:15 jlam Exp $
+$NetBSD: distinfo,v 1.5 2004/07/14 20:07:07 jlam Exp $
-SHA1 (courier-0.44.2.tar.bz2) = 8ea25894c5b2cfe841171b47da8e33b24cdca56d
-Size (courier-0.44.2.tar.bz2) = 4001993 bytes
-SHA1 (patch-aa) = 5311880803120adac1f26166ab92ff5586efa2dc
-SHA1 (patch-ab) = 66f10721534bcbb147545ba05ab69d5c4e573b85
-SHA1 (patch-ac) = 630bf5f151607bb39e2e1db9b1c7660ce2b37d8f
+SHA1 (courier-0.45.6.tar.bz2) = 0d8e36211af42e7b539cf53fe1f596e1ecb15117
+Size (courier-0.45.6.tar.bz2) = 4310616 bytes
+SHA1 (patch-aa) = c98d26c09d7c783783aad0050895db0e52e51054
+SHA1 (patch-ab) = fe2fdca8fbf00ea8404af49b62d1aa48e77f704f
+SHA1 (patch-ac) = 882528d0be8b807b9eb24f7c54da5ec455d4d0a3
SHA1 (patch-ae) = 50fc5bbfda430c28171ab2527233f7d922536f8a
SHA1 (patch-af) = 9606816c7035dde2db87634f678f6eb281555c61
SHA1 (patch-ag) = b628ca5f8287e50db4e9f4131d67cb48e7a70697
+SHA1 (patch-ah) = 67edc2090b713d9d6224a0a92854c9c497e6688e
+SHA1 (patch-ai) = e2acc313dd3fb577059b5daf22760b0095b246d3
diff -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/files/authdaemond.sh
--- a/mail/courier-auth/files/authdaemond.sh Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/files/authdaemond.sh Wed Jul 14 20:07:07 2004 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: authdaemond.sh,v 1.7 2004/02/21 14:43:15 jlam Exp $
+# $NetBSD: authdaemond.sh,v 1.8 2004/07/14 20:07:07 jlam Exp $
#
# Courier user authentication daemon
#
@@ -14,7 +14,7 @@
name="authdaemond"
rcvar=${name}
daemon="@PREFIX@/libexec/courier/authlib/authdaemond"
-pidfile="/var/authdaemon/pid"
+pidfile="@AUTHDAEMONVAR@/pid"
required_files="@PKG_SYSCONFDIR@/authdaemonrc"
start_cmd="courier_doit start"
@@ -29,8 +29,7 @@
if [ -f @PKG_SYSCONFDIR@/authdaemonrc ]; then
command=`
. @PKG_SYSCONFDIR@/authdaemonrc
- if [ -n "${version}" ]
- then
+ if [ -n "${version}" ]; then
@ECHO@ @PREFIX@/libexec/courier/authlib/${version}
else
@ECHO@ @PREFIX@/libexec/courier/authlib/authdaemond.plain
diff -r a4de6425c66b -r b5ab7286b239 mail/courier-auth/patches/patch-aa
--- a/mail/courier-auth/patches/patch-aa Wed Jul 14 20:06:28 2004 +0000
+++ b/mail/courier-auth/patches/patch-aa Wed Jul 14 20:07:07 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/02/21 14:43:16 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2004/07/14 20:07:07 jlam Exp $
---- authlib/Makefile.in.orig Sat Nov 15 12:54:45 2003
-+++ authlib/Makefile.in
Home |
Main Index |
Thread Index |
Old Index