pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/courier-authlib Update security/courier-authl...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee6b6c6cccb9
branches:  trunk
changeset: 498048:ee6b6c6cccb9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 11 00:03:16 2005 +0000

description:
Update security/courier-authlib to 0.57.  Changes from version 0.55
include:

        * authlib: create the authtest and authpasswd manual pages.

        * authdaemon.c (auth_generic): Silly bug in auth_generic().
        * authldaplib.c (auth_ldap_do3): Fix call of authcryptpasswd().
        * authpgsqllib.c (auth_pgsql_setpass): Ditto.
        * authmysqllib.c (auth_mysql_setpass): Ditto.
        * authmysqllib.c (auth_mysql_setpass): Fix a memory leak.
        * authpipe: more fixes to the authpipe module.
        * authpipe: various fixes to the authpipe module.
        * authpipe.c (auth_pipe_pre): Fix zombies created by the authpipe
          module.
        * New authpipe authentication module.
        * authldap.schema: Add mailhost to the recommended LDAP schema.

        * README_authlib.sgml: Document updated authpipe protocol.

        * cryptpassword.c (authcryptpasswd): Fix handling of encryption hints.
        * checkpassword.c (do_authcheckpassword): Ignore {CRYPT} prefix on
          crypted passwords.
        * checkpasswordsha1.c (authcheckpasswordsha1): Fix {SHA256} passwords.

        * authdaemond.c: Strip full name/gecos field after the first comma.
        * authdaemond: Pass LOGGEROPTS option to authdaemond.

        * liblog/logger.c: Fix wrong args to setuidgid().
        * liblog/logger.c: Added -droproot option to courierlogger.

        * liblock/lockdaemon.c: Try to recover if upgraded daemon process runs
          under a different uid.

        * Changed -uid and -gid options to -user and -group for consistency
          with couriertcpd. Change them to affect courierlogger itself,
          after it has spawned any child.

        * Optional default domain for authentication requests.

        * Fix the error code when an empty password is provided.

diffstat:

 security/courier-authlib/Makefile         |   22 ++-
 security/courier-authlib/PLIST            |    5 +-
 security/courier-authlib/distinfo         |   13 +-
 security/courier-authlib/options.mk       |   28 +++-
 security/courier-authlib/patches/patch-aa |  193 ++++++++++++++++-------------
 security/courier-authlib/patches/patch-ab |   12 +-
 security/courier-authlib/patches/patch-ac |   12 +
 7 files changed, 171 insertions(+), 114 deletions(-)

diffs (truncated from 521 to 300 lines):

diff -r 31dc35434499 -r ee6b6c6cccb9 security/courier-authlib/Makefile
--- a/security/courier-authlib/Makefile Wed Aug 10 23:37:08 2005 +0000
+++ b/security/courier-authlib/Makefile Thu Aug 11 00:03:16 2005 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:19 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/11 00:03:16 jlam Exp $
 
 .include "Makefile.common"
 
-DISTNAME=      courier-authlib-0.55
-PKGREVISION=   1
+DISTNAME=      courier-authlib-0.57
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -17,16 +16,17 @@
 CONFLICTS+=    courier-authmysql-[0-9]*
 CONFLICTS+=    courier-authpgsql-[0-9]*
 
-USE_TOOLS+=            cat gmake perl:run
 USE_LIBTOOL=           yes
 PKG_SYSCONFSUBDIR=     authlib
 
-REPLACE_PERL=          sysconftool
+REPLACE_PERL=          samplepipe.pl sysconftool
+
+USE_TOOLS+=            cat:run gmake perl:run
+CONFIGURE_ENV+=                CAT=${TOOLS_CAT:Q}              # makedat
 
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --with-pkgconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --without-stdheaderdir
-CONFIGURE_ENV+=                CAT="${TOOLS_CAT}"
 
 AUTHDAEMONVAR?=                ${VARBASE}/authdaemon
 CONFIGURE_ARGS+=       --with-authdaemonvar=${AUTHDAEMONVAR}
@@ -36,7 +36,7 @@
 # Expect is used to change the password from within the courier webmail
 # application (sqwebmail).
 #
-CONFIGURE_ENV+=                EXPECT="${LOCALBASE}/bin/expect"
+CONFIGURE_ENV+=                EXPECT=${LOCALBASE:Q}/bin/expect
 
 AUTHLIBDIR=            lib/courier-authlib
 AUTHLIBEXECDIR=                libexec/courier-authlib
@@ -64,7 +64,7 @@
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS}                                   \
                        AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 
-POST_INSTALL_TARGETS=  post-install-common
+POST_INSTALL_TARGETS=  post-install-common post-install-authdaemon
 
 .include "options.mk"
 .include "../../devel/libltdl/buildlink3.mk"
@@ -89,8 +89,8 @@
 post-install: ${POST_INSTALL_TARGETS}
 
 post-install-common:
+       ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/makedat/makedat ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/authldap.schema ${EGDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin
        ${INSTALL_DATA_DIR} ${DOCDIR}
@@ -99,4 +99,8 @@
        ${INSTALL_DATA} ${WRKSRC}/README.html ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/README_authlib.html ${DOCDIR}
 
+post-install-authdaemon:
+       ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authdaemonrc.dist
+       ${CHMOD} ${SHAREMODE} ${EGDIR}/authdaemonrc.dist
+
 .include "../../mk/bsd.pkg.mk"
diff -r 31dc35434499 -r ee6b6c6cccb9 security/courier-authlib/PLIST
--- a/security/courier-authlib/PLIST    Wed Aug 10 23:37:08 2005 +0000
+++ b/security/courier-authlib/PLIST    Thu Aug 11 00:03:16 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:34:04 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/08/11 00:03:16 jlam Exp $
 bin/courierauthconfig
 bin/makedat
 include/courier_auth_config.h
@@ -12,6 +12,8 @@
 lib/courier-authlib/libcourierauthsaslclient.la
 libexec/courier-authlib/authdaemond
 libexec/courier-authlib/authsystem.passwd
+man/man1/authpasswd.1
+man/man1/authtest.1
 man/man1/courierlogger.1
 man/man3/auth_enumerate.3
 man/man3/auth_generic.3
@@ -26,6 +28,7 @@
 man/man8/userdbpw.8
 sbin/authdaemond
 sbin/authenumerate
+sbin/authpasswd
 sbin/authtest
 sbin/courierlogger
 sbin/sysconftool
diff -r 31dc35434499 -r ee6b6c6cccb9 security/courier-authlib/distinfo
--- a/security/courier-authlib/distinfo Wed Aug 10 23:37:08 2005 +0000
+++ b/security/courier-authlib/distinfo Thu Aug 11 00:03:16 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/03/24 07:13:14 jlam Exp $
+$NetBSD: distinfo,v 1.7 2005/08/11 00:03:16 jlam Exp $
 
-SHA1 (courier-authlib-0.55.tar.bz2) = f8570eeee2d8469e2b3d11ef1b58554d1f14fb83
-RMD160 (courier-authlib-0.55.tar.bz2) = 05907d9e7f8824aafa24c652083f564b9ed03e02
-Size (courier-authlib-0.55.tar.bz2) = 1972024 bytes
-SHA1 (patch-aa) = 4235c3fd951b354c65bbd448fa301bdc442e606b
-SHA1 (patch-ab) = 350254052c0ad63b75cf81e1dab752a78ae3843f
+SHA1 (courier-authlib-0.57.tar.bz2) = dd68cf4ff7f73ce472206c88dc19a0fd93128f63
+RMD160 (courier-authlib-0.57.tar.bz2) = b11e2f39b2af38c1487b81bb89c4925723627c9f
+Size (courier-authlib-0.57.tar.bz2) = 2006138 bytes
+SHA1 (patch-aa) = 2775ced0c6454c15baecf640461484ceccc8eef1
+SHA1 (patch-ab) = 0108a05af5da6dcdb3463a2aeb592264ca914898
+SHA1 (patch-ac) = 2e67a598f39f54de901079c63b9078521b5a5937
diff -r 31dc35434499 -r ee6b6c6cccb9 security/courier-authlib/options.mk
--- a/security/courier-authlib/options.mk       Wed Aug 10 23:37:08 2005 +0000
+++ b/security/courier-authlib/options.mk       Thu Aug 11 00:03:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/05/31 11:24:32 dillo Exp $
+# $NetBSD: options.mk,v 1.6 2005/08/11 00:03:16 jlam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.courier-authlib
 PKG_SUPPORTED_OPTIONS= pam bdb ldap mysql pgsql
@@ -9,10 +9,24 @@
 ###
 ### UNIX (shadow) password authentication
 ###
+CONFIGURE_ARGS+=       --with-authpwd
+CONFIGURE_ARGS+=       --with-authshadow
 AUTHLIB_PLIST+=                ${AUTHLIBDIR}/libauthpwd.la
 AUTHLIB_PLIST+=                ${AUTHLIBDIR}/libauthshadow.la
 
 ###
+### "pipe-to-external-program" authentication
+###
+CONFIGURE_ARGS+=       --with-authpipe
+REPLACE_PERL+=         samplepipe.pl
+AUTHLIB_PLIST+=                ${AUTHLIBDIR}/libauthpipe.la
+AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/samplepipe.pl
+POST_INSTALL_TARGETS+= post-install-pipe
+
+post-install-pipe:
+       ${INSTALL_SCRIPT} ${WRKSRC}/samplepipe.pl ${EGDIR}
+
+###
 ### PAM authentication
 ###
 .if !empty(PKG_OPTIONS:Mpam)
@@ -33,12 +47,12 @@
 CONFIGURE_ARGS+=       --with-authuserdb
 AUTHLIB_PLIST+=                ${AUTHLIBDIR}/libauthuserdb.la
 AUTHLIB_PLIST+=                ${AUTHLIBEXECDIR}/makedatprog
-AUTHLIB_PLIST+=                sbin/vchkpw2userdb
+AUTHLIB_PLIST+=                sbin/makeuserdb
 AUTHLIB_PLIST+=                sbin/pw2userdb
-AUTHLIB_PLIST+=                sbin/makeuserdb
 AUTHLIB_PLIST+=                sbin/userdb
+AUTHLIB_PLIST+=                sbin/userdb-test-cram-md5
 AUTHLIB_PLIST+=                sbin/userdbpw
-AUTHLIB_PLIST+=                sbin/userdb-test-cram-md5
+AUTHLIB_PLIST+=                sbin/vchkpw2userdb
 .else
 CONFIGURE_ARGS+=       --without-authuserdb
 PLIST_SUBST+=          BDB="@comment "
@@ -58,6 +72,8 @@
 POST_INSTALL_TARGETS+= post-install-ldap
 
 post-install-ldap:
+       ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authldaprc.dist
+       ${CHMOD} ${SHAREMODE} ${EGDIR}/authldaprc.dist
        ${INSTALL_DATA} ${WRKSRC}/README.ldap ${DOCDIR}
 .else
 CONFIGURE_ARGS+=       --without-authldap
@@ -76,6 +92,8 @@
 POST_INSTALL_TARGETS+= post-install-mysql
 
 post-install-mysql:
+       ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authmysqlrc.dist
+       ${CHMOD} ${SHAREMODE} ${EGDIR}/authmysqlrc.dist
        ${INSTALL_DATA} ${WRKSRC}/README.authmysql.html ${DOCDIR}
 .else
 CONFIGURE_ARGS+=       --without-authmysql
@@ -100,6 +118,8 @@
 POST_INSTALL_TARGETS+= post-install-pgsql
 
 post-install-pgsql:
+       ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authpgsqlrc.dist
+       ${CHMOD} ${SHAREMODE} ${EGDIR}/authpgsqlrc.dist
        ${INSTALL_DATA} ${WRKSRC}/README.authpostgres.html ${DOCDIR}
 .else
 CONFIGURE_ARGS+=       --without-authpgsql
diff -r 31dc35434499 -r ee6b6c6cccb9 security/courier-authlib/patches/patch-aa
--- a/security/courier-authlib/patches/patch-aa Wed Aug 10 23:37:08 2005 +0000
+++ b/security/courier-authlib/patches/patch-aa Thu Aug 11 00:03:16 2005 +0000
@@ -1,80 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2005/03/24 07:13:14 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
 
---- Makefile.in.orig   2005-02-28 21:22:03.000000000 -0500
+--- Makefile.in.orig   2005-07-23 00:06:37.000000000 +0000
 +++ Makefile.in
-@@ -465,6 +465,7 @@ commonlibdep = libcourierauthcommon.la
- commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
- commonlibadd = libcourierauthcommon.la
- libcourierauthcommon_t = @CRYPTLIBS@
-+libcourierauthcommon_t := $(libcourierauthcommon_t:-Wl,%=%)
- libcourierauthcommon_la_SOURCES = \
-       auth.h courierauth.h \
-       authpwdenumerate.c \
-@@ -481,6 +482,7 @@ libcourierauthcommon_la_LDFLAGS = libcou
-       $(libcourierauthcommon_t:%=-Wl,%)
+@@ -448,7 +448,7 @@ libcourierauthcommon_la_SOURCES = \
  
- libcourierauth_t = random128/libshrandom128.a rfc822/libshencode.a @NETLIBS@
-+libcourierauth_t := $(libcourierauth_t:-Wl,%=%)
+ libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
+ libcourierauthcommon_la_LIBADD = libcourierauth.la
+-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%)
++libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
  libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
        authmoduser2.c authmoduser3.c debug.c \
        courierauthdebug.h \
-@@ -491,6 +493,7 @@ libcourierauth_la_LDFLAGS = -Wl,numlib/l
- 
- # The userdb module
- libauthuserdb_t = userdb/libshuserdb.a @shdblibrary@ @LIBGDBM@ @LIBDB@
-+libauthuserdb_t := $(libauthuserdb_t:-Wl,%=%)
- libauthuserdb_la_SOURCES = authuserdb.c preauthuserdb.c preauthuserdbcommon.c \
-        authuserdbpwd.c
- 
-@@ -500,6 +503,7 @@ libauthuserdb_la_LDFLAGS = $(commonldfla
- 
- # the authpam module
- libauthpam_t = -lpam @SHADOWLIBS@ @AUTHPAMCRYPT@ @LIBDL@
-+libauthpam_t := $(libauthpam_t:-Wl,%=%)
- libauthpam_la_SOURCES = authpam.c preauthpam.c authwait.h
- libauthpam_la_DEPENDENCIES = $(commonlibdep)
- libauthpam_la_LIBADD = $(commonlibadd)
-@@ -513,6 +517,7 @@ libauthpwd_la_LDFLAGS = $(commonldflags)
- 
- # The authshadow module
- libauthshadow_t = @SHADOWLIBS@
-+libauthshadow_t := $(libauthshadow_t:-Wl,%=%)
- libauthshadow_la_SOURCES = authshadow.c preauthshadow.c
- libauthshadow_la_DEPENDENCIES = $(commonlibdep)
- libauthshadow_la_LIBADD = $(commonlibadd)
-@@ -520,6 +525,7 @@ libauthshadow_la_LDFLAGS = $(commonldfla
- 
- # The authvchkpw module
- libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@
-+libauthvchkpw_t := $(libauthvchkpw_t:-Wl,%=%)
- libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c
- libauthvchkpw_la_DEPENDENCIES = $(commonlibdep)
- libauthvchkpw_la_LIBADD = $(commonlibadd)
-@@ -527,6 +533,7 @@ libauthvchkpw_la_LDFLAGS = $(commonldfla
- 
- # The authpgsql module
- libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@
-+libauthpgsql_t := $(libauthpgsql_t:-Wl,%=%)
- libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h
- libauthpgsql_la_DEPENDENCIES = $(commonlibdep)
- libauthpgsql_la_LIBADD = $(commonlibadd)
-@@ -534,6 +541,7 @@ libauthpgsql_la_LDFLAGS = $(commonldflag
- 
- # The authldap module
- libauthldap_t = @LDAPLIBS@ @NETLIBS@
-+libauthldap_t := $(libauthldap_t:-Wl,%=%)
- libauthldap_la_SOURCES = authldap.c preauthldap.c authldaplib.c authldap.h
- libauthldap_la_DEPENDENCIES = $(commonlibdep)
- libauthldap_la_LIBADD = $(commonlibadd)
-@@ -541,6 +549,7 @@ libauthldap_la_LDFLAGS = $(commonldflags
- 
- # The authmysql module
- libauthmysql_t = @MYSQL_LIBS@ @LIBM@ @NETLIBS@
-+libauthmysql_t := $(libauthmysql_t:-Wl,%=%)
- libauthmysql_la_SOURCES = authmysql.c preauthmysql.c authmysqllib.c authmysql.h
- libauthmysql_la_DEPENDENCIES = $(commonlibdep)
- libauthmysql_la_LIBADD = $(commonlibadd)
-@@ -608,8 +617,8 @@ authdaemondprog_SOURCES = authdaemond.c
+@@ -590,8 +590,8 @@ authdaemondprog_SOURCES = authdaemond.c
  authdaemondprog_DEPENDENCIES = libcourierauthcommon.la \
        liblock/liblock.la $(modules)
  
@@ -85,18 +22,19 @@
  authdaemontest_SOURCES = authdaemontest.c
  authdaemontest_DEPENDENCIES = libcourierauthcommon.la
  authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
-@@ -1437,14 +1446,12 @@ vpopmail_config.h:
+@@ -1480,14 +1480,14 @@ vpopmail_config.h:
  authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
  
  @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
 -@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@`
--@HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
++@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)`
+ @HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
 -@HAVE_AUTHPGSQL_TRUE@         $(DESTDIR)@authpgsqlrc@.dist



Home | Main Index | Thread Index | Old Index