pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update mail/courier-auth* packages to 0.44.2 from the ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e8075232dc9f
branches: trunk
changeset: 469277:e8075232dc9f
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Feb 21 14:43:15 2004 +0000
description:
Update mail/courier-auth* packages to 0.44.2 from the courier-0.44.2
source distribution. Changes from version 0.37.1 include fixing minor
bugs, plugging memory leaks, and improving documentation. The
authentication daemons also have improved behaviour when idling.
diffstat:
doc/CHANGES | 6 +++-
mail/courier-auth/Makefile | 18 +++++-------
mail/courier-auth/Makefile.authdaemond | 38 ++++++++++++++++++++------
mail/courier-auth/Makefile.common | 20 +++++---------
mail/courier-auth/distinfo | 17 +++++------
mail/courier-auth/files/authdaemond.sh | 13 +++-----
mail/courier-auth/patches/patch-aa | 47 ++++++++++++++++++++++++++-------
mail/courier-auth/patches/patch-ab | 8 ++--
mail/courier-auth/patches/patch-ac | 8 ++--
mail/courier-auth/patches/patch-ad | 12 --------
mail/courier-auth/patches/patch-ae | 28 +++++++++++++------
mail/courier-auth/patches/patch-af | 41 ++++++++++++++++++----------
mail/courier-authldap/Makefile | 22 ++++++++-------
mail/courier-authldap/PLIST | 3 +-
mail/courier-authmysql/Makefile | 20 +++++++-------
mail/courier-authpgsql/Makefile | 19 +++++++------
16 files changed, 185 insertions(+), 135 deletions(-)
diffs (truncated from 643 to 300 lines):
diff -r 4de651c490c6 -r e8075232dc9f doc/CHANGES
--- a/doc/CHANGES Sat Feb 21 13:55:01 2004 +0000
+++ b/doc/CHANGES Sat Feb 21 14:43:15 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4940 2004/02/21 13:09:32 jmmv Exp $
+$NetBSD: CHANGES,v 1.4941 2004/02/21 14:43:18 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -955,3 +955,7 @@
Updated gqview to 1.4.0 [snj 2004-02-21]
Removed gqview-devel [snj 2004-02-21]
Updated pkg_comp to 1.17 [jmmv 2004-02-21]
+ Updated courier-auth to 0.44.2 [jlam 2004-02-21]
+ Updated courier-authldap to 0.44.2 [jlam 2004-02-21]
+ Updated courier-authmysql to 0.44.2 [jlam 2004-02-21]
+ Updated courier-authpgsql to 0.44.2 [jlam 2004-02-21]
diff -r 4de651c490c6 -r e8075232dc9f mail/courier-auth/Makefile
--- a/mail/courier-auth/Makefile Sat Feb 21 13:55:01 2004 +0000
+++ b/mail/courier-auth/Makefile Sat Feb 21 14:43:15 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:19 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/21 14:43:15 jlam Exp $
PKGNAME= courier-auth-${BASE_VERS}
-PKGREVISION?= 1
CATEGORIES= security
COMMENT= Authentication modules for Courier mail packages
@@ -10,19 +9,22 @@
USE_PERL5= yes
REPLACE_PERL= sysconftool
+
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-.include "../../mail/courier-auth/Makefile.authdaemond"
+.include "../courier-auth/Makefile.authdaemond"
.if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
INSTALL_TARGET= install-strip
.endif
+INSTALL_DIRS= ${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
-
CONF_FILES_PERMS= # empty
.for FILE in ${GEN_FILES}
CONF_FILES_PERMS+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE} \
@@ -30,14 +32,10 @@
.endfor
RCD_SCRIPTS= authdaemond
-FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
-
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/authlib/authdaemonrc \
+ ${EGDIR}/authdaemonrc.dist
${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.mk"
diff -r 4de651c490c6 -r e8075232dc9f mail/courier-auth/Makefile.authdaemond
--- a/mail/courier-auth/Makefile.authdaemond Sat Feb 21 13:55:01 2004 +0000
+++ b/mail/courier-auth/Makefile.authdaemond Sat Feb 21 14:43:15 2004 +0000
@@ -1,16 +1,31 @@
-# $NetBSD: Makefile.authdaemond,v 1.6 2004/02/10 02:22:50 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.7 2004/02/21 14:43:15 jlam Exp $
-.include "../../mail/courier-auth/Makefile.common"
+.include "../courier-auth/Makefile.common"
PERL5_REQD+= 5.6.0
USE_PERL5?= build
+# These are files needed by the configure scripts or are needed by the
+# build process.
+#
WRKSRC_FILES= config.guess config.sub configure \
- install-sh mkinstalldirs
-WRKSRC_FILES+= dbobj.h.in dbobj.config.in sysconftool
+ install-sh mkinstalldirs \
+ depcomp missing sysconftool
+
+# These are the inputs for the files generated by the top-level configure
+# script.
+#
+WRKSRC_FILES+= Makefile.in courier.spec.in courier.sysvinit.in \
+ dbobj.h.in dbobj.config.in courier/courier.c
+
+# These are subdirectories of courier that build auxiliary libraries
+# used by the authentication daemon.
+#
WRKSRC_SUBDIRS= afx bdbobj gdbmobj numlib soxwrap md5 sha1 \
libhmac random128 unicode rfc822 rfc1035 \
rfc2045 liblock
+
+# These are the parts of courier that we will be building and installing.
WRKSRC_SUBDIRS+= makedat userdb authlib
EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//}
@@ -19,16 +34,21 @@
REPLACE_PERL= sysconftool
SYSCONFTOOL= ${PREFIX}/sbin/authdaemon.sysconftool
-DISTINFO_FILE= ${.CURDIR}/../../mail/courier-auth/distinfo
-PATCHDIR= ${.CURDIR}/../../mail/courier-auth/patches
+DISTINFO_FILE= ${.CURDIR}/../courier-auth/distinfo
+PATCHDIR= ${.CURDIR}/../courier-auth/patches
+# The top-level configure script will call all of the other configure
+# scripts in the subdirectories, so we don't need to set CONFIGURE_DIRS.
+# However, we need to build in each subdirectory on our own.
+#
BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
+.if ${OPSYS} == "SunOS"
+. include "../../databases/db/buildlink3.mk"
+.endif
.if defined(USE_PAM)
BUILD_DEFS+= USE_PAM
-. include "../../security/PAM/buildlink2.mk"
+. include "../../security/PAM/buildlink3.mk"
.endif
-
-pre-configure: configure-init
diff -r 4de651c490c6 -r e8075232dc9f mail/courier-auth/Makefile.common
--- a/mail/courier-auth/Makefile.common Sat Feb 21 13:55:01 2004 +0000
+++ b/mail/courier-auth/Makefile.common Sat Feb 21 14:43:15 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2004/01/24 13:55:30 grant Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/02/21 14:43:15 jlam Exp $
DISTNAME?= courier-${DIST_VERS}
CATEGORIES+= mail
MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX?= .tar.bz2
MAINTAINER?= jlam%NetBSD.org@localhost
HOMEPAGE?= http://www.courier-mta.org/
@@ -12,7 +13,7 @@
# DIST_VERS version number on the distfile
# BASE_BERS pkgsrc-manged version number
#
-DIST_VERS= 0.37.1
+DIST_VERS= 0.44.2
BASE_VERS= ${DIST_VERS}
USE_GNU_TOOLS+= make
@@ -26,7 +27,8 @@
.include "../../mk/bsd.prefs.mk"
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
+USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --datadir=${DATADIR}
CONFIGURE_ARGS+= --libexecdir=${LIBEXECDIR}
@@ -51,13 +53,5 @@
CONFIGURE_ARGS+= --without-authmysql
CONFIGURE_ARGS+= --without-authpgsql
-CONFIGURE_ENV+= EXPECT="${LOCALBASE}/bin/expect"
-
-.if ${OPSYS} == "SunOS"
-. include "../../databases/db/buildlink2.mk"
-CPPFLAGS+= ${BUILDLINK_CPPFLAGS.db}
-.endif
-
-configure-init:
- ${MKDIR} ${WRKSRC}/courier
- ${TOUCH} ${TOUCH_ARGS} ${WRKSRC}/courier/courier.c
+CONFIGURE_ENV+= EXPECT=${LOCALBASE}/bin/expect
+CONFIGURE_ENV+= PERL=${PERL5}
diff -r 4de651c490c6 -r e8075232dc9f mail/courier-auth/distinfo
--- a/mail/courier-auth/distinfo Sat Feb 21 13:55:01 2004 +0000
+++ b/mail/courier-auth/distinfo Sat Feb 21 14:43:15 2004 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/01/27 23:45:27 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/02/21 14:43:15 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) = 6a827912b852b094820d3d9625e3c56c6c253b31
-SHA1 (patch-ac) = b079eeca4116f3711dbcf17f46787fa1c80cfd02
-SHA1 (patch-ad) = 380713f0b934c5365c538a6f3be035ea7d3187ff
-SHA1 (patch-ae) = f65a59aeac7790e4fe76eab8bf4950f0dddc3cfb
-SHA1 (patch-af) = 40dd3a78214a28c455ffcc24ab437fffd099b9a0
+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 (patch-ae) = 50fc5bbfda430c28171ab2527233f7d922536f8a
+SHA1 (patch-af) = 9606816c7035dde2db87634f678f6eb281555c61
SHA1 (patch-ag) = b628ca5f8287e50db4e9f4131d67cb48e7a70697
diff -r 4de651c490c6 -r e8075232dc9f mail/courier-auth/files/authdaemond.sh
--- a/mail/courier-auth/files/authdaemond.sh Sat Feb 21 13:55:01 2004 +0000
+++ b/mail/courier-auth/files/authdaemond.sh Sat Feb 21 14:43:15 2004 +0000
@@ -1,14 +1,13 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: authdaemond.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
+# $NetBSD: authdaemond.sh,v 1.7 2004/02/21 14:43:15 jlam Exp $
#
# Courier user authentication daemon
#
# PROVIDE: authdaemond
# REQUIRE: LOGIN
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
@@ -27,8 +26,7 @@
# We read the config file in a subprocess to protect against shell
# environment pollution.
#
-if [ -f @PKG_SYSCONFDIR@/authdaemonrc ]
-then
+if [ -f @PKG_SYSCONFDIR@/authdaemonrc ]; then
command=`
. @PKG_SYSCONFDIR@/authdaemonrc
if [ -n "${version}" ]
@@ -51,11 +49,10 @@
@SETENV@ -i ${daemon} ${action}
}
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
load_rc_config $name
run_rc_command "$1"
else
- echo -n " ${name}"
+ @ECHO@ -n " ${name}"
${start_cmd}
fi
diff -r 4de651c490c6 -r e8075232dc9f mail/courier-auth/patches/patch-aa
--- a/mail/courier-auth/patches/patch-aa Sat Feb 21 13:55:01 2004 +0000
+++ b/mail/courier-auth/patches/patch-aa Sat Feb 21 14:43:15 2004 +0000
@@ -1,12 +1,35 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/22 22:00:22 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/21 14:43:16 jlam Exp $
---- authlib/Makefile.in.orig Fri Jan 18 22:04:42 2002
+--- authlib/Makefile.in.orig Sat Nov 15 12:54:45 2003
+++ authlib/Makefile.in
-@@ -1823,6 +1823,30 @@
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -54,7 +54,7 @@ AUTHUSERDB = @AUTHUSERDB@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+
+-AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/../automake.fix @AUTOMAKE@
++AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -1281,7 +1281,7 @@ info-am:
+
+ install-data-am: install-data-local
- install-exec-am:
-+ for d in $(sbindir) $(libexecdir) $(libexecdir)/authlib; do $(mkinstalldirs) $(DESTDIR)$$d || exit 1; done
+-install-exec-am:
++install-exec-am: install-exec-local
+
+ install-info: install-info-am
+
+@@ -1489,9 +1489,36 @@ authinfodaemondlist.c: authdaemondstatic
+ authdaemondstaticlist.c: config.status
+ @SHELL@ $(srcdir)/mkmodulelist.sh @DAEMON_STATIC_LIST@ >authdaemondstaticlist.c
+
++# This target installs the authlib daemons and password programs and is
++# largely copied from the install-exec-hook target in ../courier/Makefile.in.
++#
++install-exec-local:
++ 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 \
@@ -15,8 +38,6 @@
+ test -f ../authlib/$$f || continue; \
Home |
Main Index |
Thread Index |
Old Index