Index: head/databases/courier-authlib-mysql/Makefile =================================================================== --- head/databases/courier-authlib-mysql/Makefile (revision 445135) +++ head/databases/courier-authlib-mysql/Makefile (revision 445136) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -mysql COMMENT= MySQL support for the Courier authentication library CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib .include "${MASTERDIR}/Makefile" Index: head/databases/courier-authlib-pgsql/Makefile =================================================================== --- head/databases/courier-authlib-pgsql/Makefile (revision 445135) +++ head/databases/courier-authlib-pgsql/Makefile (revision 445136) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -pgsql COMMENT= PostgreSQL support for the Courier authentication library CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib .include "${MASTERDIR}/Makefile" Index: head/databases/courier-authlib-userdb/Makefile =================================================================== --- head/databases/courier-authlib-userdb/Makefile (revision 445135) +++ head/databases/courier-authlib-userdb/Makefile (revision 445136) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -userdb COMMENT= Userdb support for the Courier authentication library CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib .include "${MASTERDIR}/Makefile" Index: head/databases/courier-authlib-usergdbm/Makefile =================================================================== --- head/databases/courier-authlib-usergdbm/Makefile (revision 445135) +++ head/databases/courier-authlib-usergdbm/Makefile (revision 445136) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -usergdbm COMMENT= Userdb support for the Courier authentication library CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib .include "${MASTERDIR}/Makefile" Index: head/devel/courier-unicode/Makefile =================================================================== --- head/devel/courier-unicode/Makefile (revision 445135) +++ head/devel/courier-unicode/Makefile (revision 445136) @@ -1,26 +1,26 @@ # $FreeBSD$ PORTNAME= courier-unicode -PORTVERSION= 1.4 +PORTVERSION= 2.0 CATEGORIES= devel mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Courier implementation of Unicode Standard related algorithms LICENSE= GPLv3 CONFLICTS= libunicode-[0-9]* USES= iconv libtool perl5 tar:bzip2 USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure .include Index: head/devel/courier-unicode/distinfo =================================================================== --- head/devel/courier-unicode/distinfo (revision 445135) +++ head/devel/courier-unicode/distinfo (revision 445136) @@ -1,2 +1,3 @@ -SHA256 (courier-unicode-1.4.tar.bz2) = 2174f4cdd2cd3fe554d4cbbd9557abac0e54c0226084f368bcb2e66b0e78cf96 -SIZE (courier-unicode-1.4.tar.bz2) = 434338 +TIMESTAMP = 1499009098 +SHA256 (courier-unicode-2.0.tar.bz2) = 6b46011d465918af7d0ed41fbf21d918449820bd3ef7e651dbc56eb2933a8711 +SIZE (courier-unicode-2.0.tar.bz2) = 446215 Index: head/devel/courier-unicode/pkg-plist =================================================================== --- head/devel/courier-unicode/pkg-plist (revision 445135) +++ head/devel/courier-unicode/pkg-plist (revision 445136) @@ -1,76 +1,77 @@ include/courier-unicode-categories-tab.h include/courier-unicode-script-tab.h include/courier-unicode.h lib/libcourier-unicode.a lib/libcourier-unicode.so -lib/libcourier-unicode.so.3 -lib/libcourier-unicode.so.3.0.0 +lib/libcourier-unicode.so.4 +lib/libcourier-unicode.so.4.0.0 man/man3/unicode::iconvert::convert.3.gz man/man3/unicode::iconvert::convert_tocase.3.gz man/man3/unicode::iconvert::fromu.3.gz man/man3/unicode::iconvert::tou.3.gz man/man3/unicode::iso_8859_1.3.gz man/man3/unicode::linebreak_callback_base.3.gz man/man3/unicode::linebreak_callback_save_buf.3.gz man/man3/unicode::linebreak_iter.3.gz man/man3/unicode::linebreakc_callback_base.3.gz man/man3/unicode::linebreakc_iter.3.gz man/man3/unicode::tolower.3.gz man/man3/unicode::toupper.3.gz man/man3/unicode::ucs_2.3.gz man/man3/unicode::ucs_4.3.gz man/man3/unicode::utf_8.3.gz man/man3/unicode::wordbreak_callback_base.3.gz man/man3/unicode_category_lookup.3.gz man/man3/unicode_convert.3.gz man/man3/unicode_convert_deinit.3.gz man/man3/unicode_convert_fromu_init.3.gz man/man3/unicode_convert_fromu_tobuf.3.gz man/man3/unicode_convert_fromutf8.3.gz man/man3/unicode_convert_init.3.gz man/man3/unicode_convert_tobuf.3.gz man/man3/unicode_convert_tocase.3.gz man/man3/unicode_convert_tocbuf_fromutf8_init.3.gz man/man3/unicode_convert_tocbuf_init.3.gz man/man3/unicode_convert_tocbuf_toutf8_init.3.gz man/man3/unicode_convert_tou_init.3.gz man/man3/unicode_convert_tou_tobuf.3.gz man/man3/unicode_convert_toutf8.3.gz man/man3/unicode_convert_uc.3.gz man/man3/unicode_default_chset.3.gz man/man3/unicode_grapheme_break.3.gz man/man3/unicode_html40ent_lookup.3.gz man/man3/unicode_isalnum.3.gz man/man3/unicode_isalpha.3.gz man/man3/unicode_isblank.3.gz man/man3/unicode_isdigit.3.gz man/man3/unicode_isgraph.3.gz man/man3/unicode_islower.3.gz man/man3/unicode_ispunct.3.gz man/man3/unicode_isspace.3.gz man/man3/unicode_isupper.3.gz man/man3/unicode_lb_end.3.gz man/man3/unicode_lb_init.3.gz man/man3/unicode_lb_next.3.gz man/man3/unicode_lb_next_cnt.3.gz man/man3/unicode_lb_set_opts.3.gz man/man3/unicode_lbc_end.3.gz man/man3/unicode_lbc_init.3.gz man/man3/unicode_lbc_next.3.gz man/man3/unicode_lbc_next_cnt.3.gz man/man3/unicode_lbc_set_opts.3.gz man/man3/unicode_lc.3.gz man/man3/unicode_locale_chset.3.gz man/man3/unicode_script.3.gz man/man3/unicode_tc.3.gz man/man3/unicode_u_ucs2_native.3.gz man/man3/unicode_u_ucs4_native.3.gz man/man3/unicode_uc.3.gz man/man3/unicode_wb_end.3.gz man/man3/unicode_wb_init.3.gz man/man3/unicode_wb_next.3.gz man/man3/unicode_wb_next_cnt.3.gz man/man3/unicode_wbscan_end.3.gz man/man3/unicode_wbscan_init.3.gz man/man3/unicode_wbscan_next.3.gz man/man7/courier-unicode.7.gz +share/aclocal/courier-unicode.m4 Index: head/mail/cone/Makefile =================================================================== --- head/mail/cone/Makefile (revision 445135) +++ head/mail/cone/Makefile (revision 445136) @@ -1,46 +1,46 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= cone -PORTVERSION= 0.94 +PORTVERSION= 0.96 CATEGORIES= mail # This is for beta versions, leave it in please: #MASTER_SITES= http://www.courier-mta.org/beta/${PORTNAME}/ \ # http://www.lerctr.org/~ler/ # This is for release versions, leave it in please: MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Console based mail client with POP3/IMAP/SMAP support LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.GPL LIB_DEPENDS= libaspell.so:textproc/aspell \ libcourier-unicode.so:devel/courier-unicode BUILD_DEPENDS= gpgv:security/gnupg1 RUN_DEPENDS= gpgv:security/gnupg1 USES= fam gettext gmake iconv localbase:ldflags ncurses perl5 shebangfix ssl tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX} SHEBANG_FILES= sysconftool USE_GNOME= libxml2 INSTALL_TARGET= install-strip CPPFLAGS+= -D_XOPEN_SOURCE_EXTENDED OPTIONS_DEFINE= DOCS post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/leaf @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mailtool @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cone ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool @${RM} ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0 post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR} .include Index: head/mail/cone/distinfo =================================================================== --- head/mail/cone/distinfo (revision 445135) +++ head/mail/cone/distinfo (revision 445136) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483020625 -SHA256 (cone-0.94.tar.bz2) = c52be25ca3547baf1d7ed6fdfdb2aaec3224ea6183b8fc8eeb53f3e615694f49 -SIZE (cone-0.94.tar.bz2) = 3749999 +TIMESTAMP = 1499031560 +SHA256 (cone-0.96.tar.bz2) = 657b16002deae701d5a9ca5572bfe9c05ba40c0da523ecebb8171f48863f6a8e +SIZE (cone-0.96.tar.bz2) = 3752115 Index: head/mail/courier-authlib-vchkpw/Makefile =================================================================== --- head/mail/courier-authlib-vchkpw/Makefile (revision 445135) +++ head/mail/courier-authlib-vchkpw/Makefile (revision 445136) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 PKGNAMESUFFIX= -vchkpw COMMENT= Vpopmail/vchkpw support for the Courier authentication library CATEGORIES= mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib .include "${MASTERDIR}/Makefile" Index: head/mail/courier-imap/Makefile =================================================================== --- head/mail/courier-imap/Makefile (revision 445135) +++ head/mail/courier-imap/Makefile (revision 445136) @@ -1,150 +1,149 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= courier-imap -PORTVERSION= 4.16.2 -PORTREVISION= 2 +PORTVERSION= 4.18.0 PORTEPOCH= 2 CATEGORIES= mail ipv6 MASTER_SITES= SF/courier/imap/${PORTVERSION} -MAINTAINER= oliver@FreeBSD.org +MAINTAINER= madpilot@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \ ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool LIB_DEPENDS= libcourier-unicode.so:devel/courier-unicode USES= gmake perl5 ssl tar:bzip2 GNU_CONFIGURE= yes USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl CPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include LDFLAGS+= -L${LOCALBASE}/lib -L${PREFIX}/lib CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash MAKE_ENV:= ${CONFIGURE_ENV} ALL_TARGET= all makeimapaccess makedat # # options available: # # WITH_SYSLOG_FACILITY: The syslogfacility to use # OPTIONS_DEFINE= FAM TRASHQUOTA GDBM IPV6 GNUTLS FAM_DESC= Fam support for IDLE command TRASHQUOTA_DESC= Include deleted mails in the quota GNUTLS_DESC= Use GnuTLS instead of OpenSSL (Enables SNI) FAM_USES= fam .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" .endif CONFDIR?= ${PREFIX}/etc/${PORTNAME} USERDB?= ${PREFIX}/etc/userdb LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --localstatedir="${PREFIX}/var" \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --enable-workarounds-for-imap-client-bugs \ --enable-unicode \ --disable-root-check \ --with-locking-method=fcntl \ COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig .include .if ${PORT_OPTIONS:MGNUTLS} CONFIGURE_ARGS+=--with-gnutls LIB_DEPENDS+= libgnutls.so:security/gnutls USES+= pkgconfig .endif .include .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif .if ${PORT_OPTIONS:MSYSLOG_FACILITY} CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY} .endif .if ${PORT_OPTIONS:MAUTH_USERDB} .if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB} LIB_DEPENDS+= libgdbm.so:databases/gdbm .else CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} .endif .endif .if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--without-ipv6 .endif .if ${PORT_OPTIONS:MTRASHQUOTA} CONFIGURE_ARGS+=--with-trashquota .endif .if ${PORT_OPTIONS:MFAM} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif EXTRA_DOCS= AUTHORS INSTALL NEWS \ libs/imap/ChangeLog \ libs/imap/README \ libs/imap/README.proxy \ libs/maildir/README.imapkeywords.html \ libs/maildir/README.maildirfilter.html \ libs/maildir/README.maildirquota.txt \ libs/maildir/README.sharedfolders.txt \ libs/tcpd/README.couriertls \ post-patch: .if ! ${PORT_OPTIONS:MFAM} @${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \ ${WRKSRC}/libs/maildir/configure .endif @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/libs/liblock/configure @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|TLS_PROTOCOL=SSL3|TLS_PROTOCOL=SSL23|g' \ ${WRKSRC}/libs/imap/pop3d-ssl.dist.in \ ${WRKSRC}/libs/imap/imapd-ssl.dist.in post-install: ${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/ .for i in imapd pop3d ${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor @${ECHO_MSG} "In case you use authpam, you should put the following lines" @${ECHO_MSG} "in your /etc/pam.d/imap" @${ECHO_MSG} "auth required pam_unix.so try_first_pass" @${ECHO_MSG} "account required pam_unix.so try_first_pass" @${ECHO_MSG} "session required pam_permit.so" @${ECHO_MSG} "" @${ECHO_MSG} "You will have to run ${DATADIR}/mkimapdcert to create" @${ECHO_MSG} "a self-signed certificate if you want to use imapd-ssl." @${ECHO_MSG} "And you will have to copy and edit the *.dist files to *" @${ECHO_MSG} "in ${CONFDIR}." @${ECHO_MSG} "" .include Index: head/mail/courier-imap/distinfo =================================================================== --- head/mail/courier-imap/distinfo (revision 445135) +++ head/mail/courier-imap/distinfo (revision 445136) @@ -1,2 +1,3 @@ -SHA256 (courier-imap-4.16.2.tar.bz2) = 3be244b3c4d3d5c5e33efb37e4cf712ae83cbe21e43c31725e0d996ab4acc387 -SIZE (courier-imap-4.16.2.tar.bz2) = 3028445 +TIMESTAMP = 1499031625 +SHA256 (courier-imap-4.18.0.tar.bz2) = fa8c2e3b71295c9fa124dfad350f688263ddf7f2b15709f2d44d0f9722de7c52 +SIZE (courier-imap-4.18.0.tar.bz2) = 3202389 Index: head/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c =================================================================== --- head/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c (revision 445135) +++ head/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c (nonexistent) @@ -1,12 +0,0 @@ ---- libs/tcpd/libcouriertls.c.orig 2015-06-10 00:08:23 UTC -+++ libs/tcpd/libcouriertls.c -@@ -74,7 +74,9 @@ struct proto_ops op_list[] = - { "TLSv1", &TLSv1_method, SSL_OP_ALL }, - { "TLS1", &TLSv1_method, SSL_OP_ALL }, - { "SSL3+", &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2 }, -+#ifdef HAVE_SSLV3_METHOD - { "SSL3", &SSLv3_method, SSL_OP_ALL }, -+#endif - { "SSL23", &SSLv23_method, SSL_OP_ALL }, - { "", &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 }, - { NULL, &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 }, Property changes on: head/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/maildrop/Makefile =================================================================== --- head/mail/maildrop/Makefile (revision 445135) +++ head/mail/maildrop/Makefile (revision 445136) @@ -1,137 +1,137 @@ # Created by: Tom Hukins # $FreeBSD$ # You can define the following to enable further compile time # customizations: # MAILDROP_SUID=, # MAILDROP_SGID= Maildrop will be installed with suid # permissions for MAILDROP_SUID, and sgid # permissions for MAILDROP_SGID. # NOTE: must be a valid username/groupname # at installation time, numeric uids/gids # and non existing users will cause the # installed package to miss files. # MAILDROP_TRUSTED_USERS= Specify users allowed to use the -d option # MAILDROP_LOG_COLUMNS lenght of 'File:' line in log - 8; default: 72 # MAILDROP_MBOX_DIR= Specify DEFAULT mailbox location PORTNAME= maildrop -PORTVERSION= 2.8.5 +PORTVERSION= 2.9.0 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Mail delivery agent (MDA) with filtering abilities LICENSE= GPLv3 USES= iconv localbase:ldflags perl5 tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-syslog=1 \ --enable-use-flock=1 \ --with-etcdir="${PREFIX}/etc" \ --enable-maildirquota INSTALL_TARGET= install-strip CONFLICTS= courier-0.65* libunicode-[0-9]* LIB_DEPENDS= libpcre.so:devel/pcre \ libcourier-unicode.so:devel/courier-unicode MAILDROP_LOG_COLUMNS?= 72 # lenght of 'File:' line in log FIXDOCPATH= libs/liblock/lockmail.1 libs/maildir/deliverquota.8.in \ libs/maildir/maildir.5 libs/maildir/maildiracl.1.in \ libs/maildir/maildirkw.1 libs/maildir/maildirmake.1.in \ libs/maildir/maildirquota.7 libs/maildrop/mailbot.1 \ libs/maildrop/maildrop.1.in libs/maildrop/maildropex.7 \ libs/maildrop/maildropfilter.7.in libs/maildrop/maildropgdbm.7 \ libs/maildrop/reformail.1 \ libs/rfc2045/makemime.1 libs/rfc2045/reformime.1 \ libs/rfc2045/rfc2045.3 libs/rfc822/rfc822.3 DOCS= AUTHORS INSTALL INSTALL.html README README.html README.postfix \ UPGRADE UPGRADE.html maildroptips.txt maildir/README.* .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" OPTIONS_MULTI_AUTHLIB:= ${OPTIONS_DEFINE:NDOCS} OPTIONS_DEFINE= AUTHLIB OPTIONS_MULTI= AUTHLIB AUTHLIB_DESC= Courier Auth Library support .endif OPTIONS_DEFINE+= DOVECOTAUTH FAM GDBM IDN MAILWRAPPER DOCS DOVECOTAUTH_DESC= Dovecot Authentication support MAILWRAPPER_DESC= Let configure guess which sendmail binary to use OPTIONS_SUB= yes GDBM_CONFIGURE_ON= --with-db=gdbm GDBM_CONFIGURE_OFF= --with-db=db GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:dns/libidn MAILWRAPPER_CONFIGURE_OFF= --enable-sendmail=/usr/sbin/sendmail DOVECOTAUTH_CONFIGURE_ENABLE= dovecotauth .include .if defined(MAILDROP_SUID) && defined(MAILDROP_SGID) CONFIGURE_ARGS+= --enable-maildrop-uid="${MAILDROP_SUID}" --enable-maildrop-gid="${MAILDROP_SGID}" PLIST_SUB+= MMODE='6755' MUID='${MAILDROP_SUID}' MGID='${MAILDROP_SGID}' .elif defined(MAILDROP_SUID) CONFIGURE_ARGS+= --enable-maildrop-uid="${MAILDROP_SUID}" PLIST_SUB+= MMODE='4755' MUID='${MAILDROP_SUID}' MGID='mail' .elif defined(MAILDROP_SGID) CONFIGURE_ARGS+= --enable-maildrop-gid="${MAILDROP_SGID}" PLIST_SUB+= MMODE='2755' MGID='${MAILDROP_SGID}' MUID='root' .else PLIST_SUB+= MMODE='' MUID='root' MGID='mail' .endif .if defined(MAILDROP_MBOX_DIR) CONFIGURE_ARGS+= --with-default-maildrop='${MAILDROP_MBOX_DIR}' .endif .if ${PORT_OPTIONS:MFAM} USES+= fam .else CONFIGURE_ARGS+= ac_cv_header_fam_h=no ac_cv_lib_fam_FAMOpen=no .endif .if defined(MAILDROP_TRUSTED_USERS) CONFIGURE_ARGS+= --enable-trusted-users="${MAILDROP_TRUSTED_USERS}" .endif post-patch: @${REINPLACE_CMD} -e "s/l= 72 - szbuf.Length();/l= ${MAILDROP_LOG_COLUMNS} - szbuf.Length();/" \ ${WRKSRC}/libs/maildrop/log.C .for f in ${FIXDOCPATH} @${REINPLACE_CMD} -e "s|\\\%\[set \$$man\.base\.url\.for\.relative\.links\]|${DOCSDIR}|" \ -e "s/\(maildirmake.html\)/maildrop-\1/" \ -e "s/\(deliverquota.html\)/maildrop-\1/" ${WRKSRC}/${f} .endfor .if ${PORT_OPTIONS:MAUTHLIB} @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -L${LOCALBASE}/lib/courier-authlib|' \ ${WRKSRC}/libs/maildrop/Makefile.in .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif BUILD_DEPENDS+= courierauthconfig:security/courier-authlib-base RUN_DEPENDS+= courierauthconfig:security/courier-authlib-base CONFIGURE_ARGS+= --enable-authlib .else CONFIGURE_ARGS+= --disable-authlib .endif post-install: .if ${PORT_OPTIONS:MDOVECOTAUTH} ${INSTALL_DATA} ${WRKSRC}/README.dovecotauth ${STAGEDIR}${DOCSDIR} .endif ${INSTALL_DATA} ${WRKSRC}/libs/maildir/quotawarnmsg \ ${STAGEDIR}${PREFIX}/etc/quotawarnmsg.sample cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS:S/maildir\//libs\/&/} ${STAGEDIR}${DOCSDIR} .include Index: head/mail/maildrop/distinfo =================================================================== --- head/mail/maildrop/distinfo (revision 445135) +++ head/mail/maildrop/distinfo (revision 445136) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484728651 -SHA256 (maildrop-2.8.5.tar.bz2) = c21174ef882aeb169031bb5886b55959687074415153232f4c60695405fcddb1 -SIZE (maildrop-2.8.5.tar.bz2) = 2072987 +TIMESTAMP = 1499009130 +SHA256 (maildrop-2.9.0.tar.bz2) = 6f1b2db822a34d8256d9cc2a011e5a2c6b7e6dd01ed66881cd6fce6f4eb5981c +SIZE (maildrop-2.9.0.tar.bz2) = 2075698 Index: head/mail/sqwebmail/Makefile =================================================================== --- head/mail/sqwebmail/Makefile (revision 445135) +++ head/mail/sqwebmail/Makefile (revision 445136) @@ -1,210 +1,211 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= sqwebmail -PORTVERSION= 5.8.3 -PORTREVISION= 1 +PORTVERSION= 5.9.0 CATEGORIES= mail www MASTER_SITES= SF/courier/webmail/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs -BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base -RUN_DEPENDS= courierauthconfig:security/courier-authlib-base +BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base \ + gpg:security/gnupg +RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \ + gpg:security/gnupg LIB_DEPENDS= libpcre.so:devel/pcre \ libcourier-unicode.so:devel/courier-unicode CFLAGS:= -I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//} CXXFLAGS:= -I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//} OPTIONS_DEFINE= CACHEDIR FAM GDBM GZIP HTTPS HTTPS_LOGIN ISPELL MIMETYPES SENTRENAME CHARSET DOCS OPTIONS_DEFAULT= CACHEDIR FAM GZIP SENTRENAME CACHEDIR_DESC= Cache logins FAM_DESC= Build in fam support for IDLE command GDBM_DESC= Use gdbm db instead of system bdb GZIP_DESC= Compress messages with gzip HTTPS_DESC= Generate https:// URLs for all accesses HTTPS_LOGIN_DESC= Generate https:// URLs only for login MIMETYPES_DESC= search for a mime.types file SENTRENAME_DESC= Periodic rename the Sent folder CHARSET_DESC= charsets FAM_USES= fam .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" CGIBINDIR?= www/cgi-bin-dist CGIBINSUBDIR?= sqwebmail WEBDATADIR?= www/data-dist WEBDATASUBDIR?= sqwebmail IMAGEURL?= ${WEBDATASUBDIR} RCDIR?= ${PREFIX}/etc/rc.d CACHEDIR?= /var/sqwebmail/cache CACHEOWNER?= bin MAILOWN?= courier MAILGRP?= courier # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr) # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m) # set WITH_AUTOPURGE to something other than 7 days # set WITH_MAXPURGE to something other than 90 days # # The following settings are in bytes: # set WITH_MAXMSGSIZE to max size of messages (including attachments) # set WITH_MAXARGSIZE to max size of a text message (excluding attachments) # set WITH_MAXFORMARGSIZE to max size of attachments # # End of user variables USES= gettext gmake iconv perl5 tar:bzip2 USE_RC_SUBR= sqwebmail-sqwebmaild GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ --localstatedir=/var/sqwebmail \ --sysconfdir=${PREFIX}/etc/sqwebmail \ --enable-imageurl=/${IMAGEURL} \ --with-locking-method=fcntl \ --with-libintl-prefix=${LOCALBASE} \ ${ICONV_CONFIGURE_ARG} \ --cache-file=${WRKDIR}/sqwebmail.cache \ --with-mailuser=${MAILOWN} \ --with-mailgroup=${MAILGRP} PLIST_SUB+= CGIBINDIR=${CGIBINDIR} \ CGIBINSUBDIR=${CGIBINSUBDIR} \ WEBDATADIR=${WEBDATADIR} \ WEBDATASUBDIR=${WEBDATASUBDIR} \ MAILOWN=${MAILOWN} \ MAILGRP=${MAILGRP} \ CACHEDIR=${CACHEDIR} \ CACHEOWN=${CACHEOWNER} EXTRA_DOCS= README README.logindomainlist.html README.pam \ libs/sqwebmail/ChangeLog \ libs/maildir/README.maildirquota.txt \ libs/maildir/README.sharedfolders.txt .include .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif .if ! ${PORT_OPTIONS:MCACHEDIR} PLIST_SUB+= CACHE="@comment " CONFIGURE_ARGS+= --without-cachedir .else PLIST_SUB+= CACHE="" CONFIGURE_ARGS+= --with-cachedir=${CACHEDIR} \ --with-cacheowner=${CACHEOWNER} .endif .if ${PORT_OPTIONS:MHTTPS_LOGIN} CONFIGURE_ARGS+= --enable-https=login .elif ${PORT_OPTIONS:MHTTPS} CONFIGURE_ARGS+= --enable-https .endif .if ! ${PORT_OPTIONS:MSENTRENAME} CONFIGURE_ARGS+= --disable-autorenamesent .endif .if ! ${PORT_OPTIONS:MGZIP} CONFIGURE_ARGS+= --without-gzip .endif .if ${PORT_OPTIONS:MISPELL} BUILD_DEPENDS+= ${LOCALBASE}/bin/ispell:textproc/aspell-ispell RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:textproc/aspell-ispell CONFIGURE_ARGS+= --with-ispell=${LOCALBASE}/bin/ispell .else CONFIGURE_ARGS+= --without-ispell .endif .if ${PORT_OPTIONS:MMIMETYPES} RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support CONFIGURE_ARGS+= --enable-mimetypes=${LOCALBASE}/etc .else CONFIGURE_ARGS+= --disable-mimetypes .endif .if ${PORT_OPTIONS:MTIMEOUTHARD} CONFIGURE_ARGS+= --enable-hardtimeout=${WITH_TIMEOUTHARD} .endif .if ${PORT_OPTIONS:MTIMEOUTSOFT} CONFIGURE_ARGS+= --enable-softtimeout=${WITH_TIMEOUTSOFT} .endif .if ${PORT_OPTIONS:MMAXMSGSIZE} CONFIGURE_ARGS+= --with-maxmsgsize=${WITH_MAXMSGSIZE} .endif .if ${PORT_OPTIONS:MMAXARGSIZE} CONFIGURE_ARGS+= --with-maxargsize=${WITH_MAXARGSIZE} .endif .if ${PORT_OPTIONS:MMAXFORMARGSIZE} CONFIGURE_ARGS+= --with-maxformargsize=${WITH_MAXFORMARGSIZE} .endif .if ${PORT_OPTIONS:MCHARSET} CONFIGURE_ARGS+= --enable-unicode .endif .if ${PORT_OPTIONS:MAUTOPURGE} CONFIGURE_ARGS+= --enable-autopurge=${WITH_AUTOPURGE} .endif .if ${PORT_OPTIONS:MMAXPURGE} CONFIGURE_ARGS+= --enable-maxpurge=${WITH_MAXPURGE} .endif .if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+=--with-db=gdbm LIB_DEPENDS+= libgdbm.so:databases/gdbm .else CONFIGURE_ARGS+=--with-db=db .endif post-patch: .if ! ${PORT_OPTIONS:MFAM} @${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \ ${WRKSRC}/libs/maildir/configure .endif @${REINPLACE_CMD} -e 's|LIBPCRE=-lpcre|LIBPCRE="-L${LOCALBASE}/lib -lpcre"|g' \ ${WRKSRC}/libs/maildir/configure @${REINPLACE_CMD} -e 's|@echo|echo|g' ${WRKSRC}/libs/maildir/configure @${REINPLACE_CMD} -e 's|-lpcre|-L${LOCALBASE}/lib &|g' \ ${WRKSRC}/libs/sqwebmail/Makefile.in @${REINPLACE_CMD} -e 's|\$$(testmaildirfilter_LDADD)|& \$$(LIBPCRE)|g; \ s|$$(LINK) $$(maildirkw_LDFLAGS)|$$(CXXLINK) $$(maildirkw_LDFLAGS)|' \ ${WRKSRC}/libs/maildir/Makefile.in @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/libs/liblock/configure @${REINPLACE_CMD} -e 's|mkdir -p|${MKDIR}|g' ${WRKSRC}/libs/pcp/configure .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor .endif @${ECHO_MSG} "" @${ECHO_MSG} "Add the following line to your /etc/crontab to make sure the" @${ECHO_MSG} "sqwebmail cache directory gets cleaned up." @${ECHO_MSG} "0 * * * * ${CACHEOWNER} ${PREFIX}/share/sqwebmail/cleancache.pl" @${ECHO_MSG} "" post-install: @${MV} ${STAGEDIR}/${ETCDIR}/ldapaddressbook.dist ${STAGEDIR}/${ETCDIR}/ldapaddressbook.sample @${MV} ${STAGEDIR}/${ETCDIR}/sqwebmaild.dist ${STAGEDIR}/${ETCDIR}/sqwebmaild.sample .include Index: head/mail/sqwebmail/distinfo =================================================================== --- head/mail/sqwebmail/distinfo (revision 445135) +++ head/mail/sqwebmail/distinfo (revision 445136) @@ -1,2 +1,3 @@ -SHA256 (sqwebmail-5.8.3.tar.bz2) = 92b30599dc52ca815357f9c540d9ab69d1d975bb7a41c787c3a4a1066d12855c -SIZE (sqwebmail-5.8.3.tar.bz2) = 3520773 +TIMESTAMP = 1499031751 +SHA256 (sqwebmail-5.9.0.tar.bz2) = 2729440716c5c39babe061dc45c5acd47fcf5e559858cc932c59c9c93b5d47ca +SIZE (sqwebmail-5.9.0.tar.bz2) = 3648976 Index: head/net/courier-authlib-ldap/Makefile =================================================================== --- head/net/courier-authlib-ldap/Makefile (revision 445135) +++ head/net/courier-authlib-ldap/Makefile (revision 445136) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -ldap COMMENT= LDAP support for the Courier authentication library CATEGORIES= net mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib .include "${MASTERDIR}/Makefile" Index: head/security/courier-authlib/Makefile =================================================================== --- head/security/courier-authlib/Makefile (revision 445135) +++ head/security/courier-authlib/Makefile (revision 445136) @@ -1,194 +1,194 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= courier-authlib -PORTVERSION= 0.66.3 +PORTVERSION= 0.68.0 PORTREVISION?= 0 CATEGORIES?= security mail .if defined(PKGNAMESUFFIX) MASTER_SITES= SF/courier/authlib/${PORTVERSION} .else MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty .endif -MAINTAINER= oliver@FreeBSD.org +MAINTAINER= madpilot@FreeBSD.org COMMENT?= Meta-port for the courier authentication library CONFLICTS= courier-0.45* .if !defined(PKGNAMESUFFIX) RUN_DEPENDS= courierauthconfig:security/courier-authlib-base NO_BUILD= yes NO_INSTALL= yes PATCHDIR= /dev/null OPTIONS_DEFINE+= GDBM .include "${.CURDIR}/Makefile.opt" .else # !defined(PKGNAMESUFFIX) LIB_DEPENDS+= libltdl.so:devel/libltdl \ libcourier-unicode.so:devel/courier-unicode USES= iconv gmake libtool perl5 tar:bzip2 GNU_CONFIGURE= yes USE_SUBMAKE= yes MAILOWN= courier MAILGRP= courier LOCALSTATEDIR= /var AUTHDAEMONVAR= ${LOCALSTATEDIR}/run/authdaemond VPOPMAILDIR?= ${LOCALBASE}/vpopmail USERDB?= ${PREFIX}/etc/userdb CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-unicode \ --disable-static \ --without-authcustom \ --without-authshadow \ --without-authpwd \ --with-mailuser=${MAILOWN} \ --with-mailgroup=${MAILGRP} \ --localstatedir=${LOCALSTATEDIR} \ --with-authdaemonvar=${AUTHDAEMONVAR} \ --cache-file=${WRKDIR}/courier-authlib.cache \ --without-authsqlite INSTALL_TARGET= install-strip DESCR= ${PKGDIR}/pkg-descr${PKGNAMESUFFIX} PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX:S/gdbm/db/} PLIST_SUB+= MAILOWN=${MAILOWN} MAILGRP=${MAILGRP} AUTHMOD= auth${PKGNAMESUFFIX:S/-//:S/gdbm/db/} .if ${AUTHMOD} == authbase CONFIGURE_ARGS+=--with-base --with-authpam --with-authpipe USERS= ${MAILOWN} GROUPS= ${MAILGRP} DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ README.authdebug.html README_authlib.html PLIST_SUB+= AUTHDAEMONVAR=${AUTHDAEMONVAR} SUB_LIST+= AUTHDAEMONVAR=${AUTHDAEMONVAR} .if defined(WITH_AUTHPIPE_PROG) CONFIGURE_ARGS+=--with-pipeprog=${WITH_AUTHPIPE_PROG} .endif .else RUN_DEPENDS+= courierauthconfig:security/courier-authlib-base CONFIGURE_ARGS+=--without-base --without-authpam --without-authpipe REMOVE_SUBDIRS+=liblock liblog .endif .if ${AUTHMOD} == authuserdb .if ${PKGNAMESUFFIX} == -usergdbm CONFLICTS+= ${PORTNAME}-userdb-0.* LIB_DEPENDS+= libgdbm.so:databases/gdbm CONFIGURE_ARGS+=--with-db=gdbm .elif ${PKGNAMESUFFIX} == -userdb CONFLICTS+= ${PORTNAME}-usergdbm-0.* CONFIGURE_ARGS+=--with-db=db .endif CONFIGURE_ARGS+=--with-userdb=${USERDB} .else CONFIGURE_ARGS+=--with-db=db --without-authuserdb REMOVE_SUBDIRS+=makedat userdb .endif .if ${AUTHMOD} == authldap DOCS= README.ldap USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-authldap .else CONFIGURE_ARGS+=--without-authldap .endif .if ${AUTHMOD} == authmysql DOCS= README.authmysql.html README.authmysql.myownquery USE_MYSQL= yes CONFIGURE_ARGS+=--with-authmysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql \ --with-mysql-includes=${LOCALBASE}/include/mysql .else CONFIGURE_ARGS+=--without-authmysql .endif .if ${AUTHMOD} == authpgsql DOCS= README.authpostgres.html USES+= pgsql CONFIGURE_ARGS+=--with-authpgsql .else CONFIGURE_ARGS+=--without-authpgsql .endif .if ${AUTHMOD} == authvchkpw BUILD_DEPENDS+= ${VPOPMAILDIR}/lib/libvpopmail.a:mail/vpopmail CONFIGURE_ARGS+=--with-authvchkpw .else CONFIGURE_ARGS+=--without-authvchkpw .endif .endif # !defined(PKGNAMESUFFIX) .include .if !defined(PKGNAMESUFFIX) .include "${.CURDIR}/Makefile.dep" .else # !defined(PKGNAMESUFFIX) .if ${AUTHMOD} == authbase USE_RC_SUBR= courier-authdaemond pre-everything:: @${ECHO_CMD} @${ECHO_CMD} " Set WITH_AUTHPIPE_PROG to a program you want to use instead of" @${ECHO_CMD} " authProg for libauthpipe" @${ECHO_CMD} .endif post-patch: @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g; \ s|mysql_connect|mysql_real_connect|g; \ s|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/*/configure \ ${WRKSRC}/configure .for subdir in ${REMOVE_SUBDIRS} @${REINPLACE_CMD} -E 's,(^(ac_subdirs_all|subdirs).*)${subdir},\1,g' \ ${WRKSRC}/configure .endfor @${REINPLACE_CMD} -e 's|^\(DEFAULTOPTIONS=\)""$$|\1"wbnodsn=1"|' \ -e 's|@ALLMODULES@|authuserdb authvchkpw authpam authldap authmysql authpgsql|' \ ${WRKSRC}/authdaemonrc.in @${REINPLACE_CMD} -e 's:@EXPECT@:${SETENV} expect:' \ ${WRKSRC}/authsystem.passwd.in pre-configure: @if [ -f "${WRKDIR}/courier-authlib.cache" -a -s "${WRKDIR}/courier-authlib.cache" ] ; then \ ${RM} "${WRKDIR}/courier-authlib.cache" ; \ fi post-install: .if !empty(DOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif .endif # !defined(PKGNAMESUFFIX) .include Index: head/security/courier-authlib/distinfo =================================================================== --- head/security/courier-authlib/distinfo (revision 445135) +++ head/security/courier-authlib/distinfo (revision 445136) @@ -1,2 +1,3 @@ -SHA256 (courier-authlib-0.66.3.tar.bz2) = 033402a86e334999eaf17c1b722d6f6cc1961fccb5d2ee88342dfd6c5d534961 -SIZE (courier-authlib-0.66.3.tar.bz2) = 2085083 +TIMESTAMP = 1499032525 +SHA256 (courier-authlib-0.68.0.tar.bz2) = 9096118823ababfac8f46a1a7393765a414ea3628c9413bfba39af5d70fd3e2e +SIZE (courier-authlib-0.68.0.tar.bz2) = 2194982 Index: head/security/courier-authlib/files/patch-Makefile.in =================================================================== --- head/security/courier-authlib/files/patch-Makefile.in (revision 445135) +++ head/security/courier-authlib/files/patch-Makefile.in (revision 445136) @@ -1,340 +1,337 @@ ---- Makefile.in.orig 2015-04-25 14:07:07 UTC +--- Makefile.in.orig 2017-07-02 14:41:39 UTC +++ Makefile.in -@@ -85,11 +85,10 @@ PRE_UNINSTALL = : +@@ -95,11 +95,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) \ - authpasswd$(EXEEXT) -bin_PROGRAMS = courierauthconfig$(EXEEXT) -noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ - authdaemondprog$(EXEEXT) +@HAVE_BASE_TRUE@sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) +@HAVE_BASE_TRUE@bin_PROGRAMS = courierauthconfig$(EXEEXT) +@HAVE_BASE_TRUE@noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ +@HAVE_BASE_TRUE@ authdaemondprog$(EXEEXT) - @HAVE_SGML_TRUE@am__append_1 = $(GITFILES) subdir = . - DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ -@@ -220,6 +219,13 @@ libauthuserdb_la_LINK = $(LIBTOOL) $(AM_ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libauthuserdb_la_LDFLAGS) $(LDFLAGS) \ - -o $@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -219,6 +218,13 @@ libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac. + libs/md5/libmd5.la libs/sha1/libsha1.la \ + libs/numlib/libnumlib.la libs/random128/librandom128.la \ + libs/rfc822/libencode.la +am_libauthvchkpw_la_OBJECTS = authvchkpw.lo authvchkpwlib.lo \ + preauthvchkpw.lo +libauthvchkpw_la_OBJECTS = $(am_libauthvchkpw_la_OBJECTS) +libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@ + - libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac.la \ - libs/md5/libmd5.la libs/sha1/libsha1.la \ - libs/numlib/libnumlib.la libs/random128/librandom128.la \ -@@ -336,6 +342,8 @@ SOURCES = $(libauthcustom_la_SOURCES) $( + am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \ + preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \ + authoption.lo +@@ -350,6 +356,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ $(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \ $(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \ + $(libauthvchkpw_la_SOURCES) \ -+ $(libauthvchkpw_la_SOURCES) \ $(libcourierauth_la_SOURCES) \ $(libcourierauthcommon_la_SOURCES) \ $(libcourierauthsasl_la_SOURCES) \ -@@ -503,6 +511,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ +@@ -532,6 +539,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ LIBAUTHSHADOW = @LIBAUTHSHADOW@ LIBAUTHSQLITE = @LIBAUTHSQLITE@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ +LIBAUTHVCHKPW = @LIBAUTHVCHKPW@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ LIBGDBM = @LIBGDBM@ -@@ -625,21 +634,27 @@ top_builddir = @top_builddir@ +@@ -657,21 +665,27 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ userdb = @userdb@ AUTOMAKE_OPTIONS = dist-bzip2 -SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib libs/makedat userdb libs/rfc822 libs/random128 libs/liblock liblog +SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib +@HAVE_USERDB_TRUE@SUBDIRS+= libs/makedat userdb +SUBDIRS += libs/rfc822 libs/random128 +@HAVE_BASE_TRUE@SUBDIRS+= libs/liblock liblog AM_CPPFLAGS = -I liblock $(LTDLINCL) modules = @LIBAUTHUSERDB@ \ @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \ @LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ @LIBAUTHSQLITE@ \ - @LIBAUTHCUSTOM@ @LIBAUTHPIPE@ + @LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@ pkglibexec_SCRIPTS = authsystem.passwd -pkglib_LTLIBRARIES = libcourierauth.la \ - libcourierauthsasl.la libcourierauthsaslclient.la \ - libcourierauthcommon.la $(modules) +@HAVE_BASE_TRUE@pkglib_LTLIBRARIES = libcourierauth.la \ +@HAVE_BASE_TRUE@ libcourierauthsasl.la libcourierauthsaslclient.la \ +@HAVE_BASE_TRUE@ libcourierauthcommon.la $(modules) -+ -+@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules) ++@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules) ++ sbin_SCRIPTS = authdaemond EXTRA_LTLIBRARIES = libauthuserdb.la \ libauthpam.la libauthpwd.la libauthshadow.la \ + libauthvchkpw.la \ libauthpgsql.la \ libauthldap.la \ libauthmysql.la \ -@@ -713,6 +728,13 @@ libauthshadow_la_DEPENDENCIES = $(common +@@ -746,6 +760,13 @@ libauthshadow_la_DEPENDENCIES = $(commonlibdep) libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t) libauthshadow_la_LDFLAGS = $(commonldflags) +# The authvchkpw module +libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@ +libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c +libauthvchkpw_la_DEPENDENCIES = $(commonlibdep) +libauthvchkpw_la_LIBADD = $(commonlibadd) +libauthvchkpw_la_LDFLAGS = $(commonldflags) $(libauthvchkpw_t) + # The authpgsql module libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ - libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h -@@ -792,8 +814,8 @@ libcourierauthsaslclient_la_SOURCES = co + libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h +@@ -827,8 +848,8 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc libcourierauthsaslclient_la_LIBADD = libcourierauth.la libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version -include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ - courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h +@HAVE_BASE_TRUE@include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ +@HAVE_BASE_TRUE@ courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h courierauthconfig_SOURCES = authinfo.c authpasswd_SOURCES = authpasswd.c -@@ -834,7 +856,7 @@ authmksock_LDADD = @NETLIBS@ - man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \ +@@ -869,7 +890,7 @@ authmksock_LDADD = @NETLIBS@ + man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 auth_mkhomedir.3 \ auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3 -man1 = authpasswd.1 authtest.1 +man1 = authtest.1 man_MANS = $(man1) $(man3) auth_sasl_ex.3 BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ authdaemonrc.h packageversion.h \ -@@ -993,6 +1015,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJ +@@ -1027,6 +1048,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libaut libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) $(AM_V_CCLD)$(libauthuserdb_la_LINK) $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS) +libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES) + $(AM_V_CCLD)$(libauthvchkpw_la_LINK) $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_LIBADD) $(LIBS) + libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(EXTRA_libcourierauth_la_DEPENDENCIES) $(AM_V_CCLD)$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS) -@@ -1262,6 +1287,8 @@ distclean-compile: +@@ -1297,6 +1321,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpw.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpwlib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@ -@@ -1279,6 +1306,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthsqlite.Plo@am__quote@ +@@ -1312,6 +1338,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthvchkpw.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -1782,18 +1810,26 @@ info: info-recursive +@@ -1836,18 +1863,26 @@ info: info-recursive info-am: -install-data-am: install-includeHEADERS install-man - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook +@HAVE_BASE_TRUE@install-data-am: install-includeHEADERS install-man +@HAVE_BASE_TRUE@ @$(NORMAL_INSTALL) +@HAVE_BASE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +@HAVE_BASE_FALSE@install-data-am: +@HAVE_BASE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +@HAVE_BASE_TRUE@install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \ +@HAVE_BASE_TRUE@ install-pkglibexecSCRIPTS install-sbinPROGRAMS \ +@HAVE_BASE_TRUE@ install-sbinSCRIPTS +@HAVE_BASE_TRUE@ @$(NORMAL_INSTALL) +@HAVE_BASE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + +@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES +@HAVE_BASE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \ - install-pkglibexecSCRIPTS install-sbinPROGRAMS \ - install-sbinSCRIPTS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-recursive install-html-am: -@@ -1873,14 +1909,18 @@ uninstall-man: uninstall-man1 uninstall- - uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS +@@ -1929,12 +1964,16 @@ uninstall-man: uninstall-man1 uninstall-man3 + .PRECIOUS: Makefile +authvchkpw.lo: authvchkpw.c vpopmail_config.h +preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h + +vpopmail_config.h: + echo '#include "@vpopmail_home@/include/config.h"' >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@ $(DESTDIR)@authpgsqlrc@.dist -@HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist -@HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist +@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc@.sample @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc: @HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist -@@ -1899,9 +1939,7 @@ authldaplib.lo: authldaplib.c authldaprc +@@ -1951,9 +1990,7 @@ authpgsqlrc.h: @HAVE_LDAP_TRUE@install-authldaprc: @HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || : @HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \ -@HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist -@HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc@.dist -@HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist +@HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.sample @HAVE_LDAP_TRUE@uninstall-authldaprc: @HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist -@@ -1912,6 +1950,18 @@ authldaplib.lo: authldaplib.c authldaprc +@@ -1964,15 +2001,25 @@ authpgsqlrc.h: @HAVE_LDAP_FALSE@uninstall-authldaprc: @HAVE_LDAP_FALSE@ @: +@HAVE_LDAP_TRUE@install-ldapschema: +@HAVE_LDAP_TRUE@ $(mkinstalldirs) ${DESTDIR}${sysconfdir}/openldap/schema +@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ +@HAVE_LDAP_TRUE@ ${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.sample +@HAVE_LDAP_TRUE@# if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \ +@HAVE_LDAP_TRUE@# $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ +@HAVE_LDAP_TRUE@# ${sysconfdir}/openldap/schema/authldap.schema ; \ +@HAVE_LDAP_TRUE@# fi + +@HAVE_LDAP_FALSE@install-ldapschema: +@HAVE_LDAP_FALSE@ @: + authldaprc.h: echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h -@@ -1920,9 +1970,7 @@ authmysqllib.lo: authmysqllib.c authmysq @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || : @HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \ -@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist -@HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist -@HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist +@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.sample @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist -@@ -1941,9 +1989,7 @@ authsqlitelib.lo: authsqlitelib.c authsq +@@ -1989,9 +2036,7 @@ authmysqlrc.h: @HAVE_AUTHSQLITE_TRUE@install-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || : @HAVE_AUTHSQLITE_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \ -@HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc@.dist -@HAVE_AUTHSQLITE_TRUE@ -chown @mailuser@ $(DESTDIR)@authsqliterc@.dist -@HAVE_AUTHSQLITE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.dist +@HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc@.sample @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc@.dist -@@ -1962,16 +2008,20 @@ authpipelib.lo: authpipelib.c authpipeli +@@ -2010,17 +2055,21 @@ authpipelib.lo: authpipelib.c authpipelib.h authpiperc authpiperc.h: echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h -install-authdaemonrc: - $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || : - sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' authdaemonrc.tmp - $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist - rm -f authdaemonrc.tmp - -chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist - -chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist +@HAVE_BASE_TRUE@install-authdaemonrc: +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || : +@HAVE_BASE_TRUE@ sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' authdaemonrc.tmp +@HAVE_BASE_TRUE@ $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.sample +@HAVE_BASE_TRUE@ rm -f authdaemonrc.tmp -uninstall-authdaemonrc: - rm -f $(DESTDIR)@authdaemonrc@.dist +@HAVE_BASE_FALSE@install-authdaemonrc: +@HAVE_BASE_FALSE@ @: -+ + +@HAVE_BASE_TRUE@uninstall-authdaemonrc: +@HAVE_BASE_TRUE@ rm -f $(DESTDIR)@authdaemonrc@.dist + +@HAVE_BASE_FALSE@uninstall-authdaemonrc: +@HAVE_BASE_FALSE@ @: - ++ authdaemonrc.h: echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h -@@ -2014,24 +2064,24 @@ dist-hook: + echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h +@@ -2066,24 +2115,24 @@ dist-hook: # automake still a bit stupid... install-data-hook: install-authdaemonrc install-authpgsqlrc \ - install-authldaprc install-authmysqlrc install-authsqliterc + install-authldaprc install-ldapschema install-authmysqlrc install-authsqliterc : install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(bindir) || : - $(mkinstalldirs) $(DESTDIR)$(sbindir) || : - $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : - chmod 755 $(DESTDIR)$(pkglibexecdir) - -chown @mailuser@ $(DESTDIR)$(pkglibexecdir) - -chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir) - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond - $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || : - chmod 750 $(DESTDIR)@authdaemonvar@ - -chown @mailuser@ $(DESTDIR)@authdaemonvar@ - -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@ +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(bindir) || : +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(sbindir) || : +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : +@HAVE_BASE_TRUE@ chmod 755 $(DESTDIR)$(pkglibexecdir) +@HAVE_USERDB_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : +@HAVE_USERDB_TRUE@ chmod 755 $(DESTDIR)$(pkglibexecdir) +@HAVE_BASE_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || : +@HAVE_BASE_TRUE@ chmod 750 $(DESTDIR)@authdaemonvar@ test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) libs/makedat/makedatprog \ $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ + $(INSTALL_SCRIPT) userdb/vchkpw2userdb \ + $(DESTDIR)$(sbindir)/vchkpw2userdb ; \ $(INSTALL_SCRIPT) userdb/pw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb ; \ $(INSTALL_SCRIPT) userdb/makeuserdb \ -@@ -2044,9 +2094,10 @@ install-exec-hook: +@@ -2096,9 +2145,10 @@ install-exec-hook: $(DESTDIR)$(sbindir)/userdb-test-cram-md5 uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc - rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond +@HAVE_BASE_TRUE@ rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond test "@AUTHUSERDB@" = "" && exit 0 ;\ rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \ + $(DESTDIR)$(sbindir)/vchkpw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb \ $(DESTDIR)$(sbindir)/makeuserdb \ $(DESTDIR)$(sbindir)/userdb \ -@@ -2057,7 +2108,7 @@ authlib.html: authlib.html.in +@@ -2109,7 +2159,7 @@ authlib.html: authlib.html.in $(SHELL) ./config.status --file=authlib.html authlib.3: authlib.3.in - $(SHELL) ./config.status --file=authlib.3 +@HAVE_BASE_TRUE@ $(SHELL) ./config.status --file=authlib.3 - @HAVE_SGML_TRUE@$(GITFILES): %: %.git - @HAVE_SGML_TRUE@ perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp + @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html + @HAVE_SGML_TRUE@ libs/docbook/sgml2html authpasswd.sgml authpasswd.html Index: head/security/courier-authlib/files/patch-authdaemond.in =================================================================== --- head/security/courier-authlib/files/patch-authdaemond.in (revision 445135) +++ head/security/courier-authlib/files/patch-authdaemond.in (revision 445136) @@ -1,8 +1,8 @@ ---- authdaemond.in.orig Wed Oct 20 20:10:49 2004 -+++ authdaemond.in Wed Oct 20 20:10:49 2004 -@@ -15,4 +15,4 @@ +--- authdaemond.in.orig 2013-08-25 18:57:37 UTC ++++ authdaemond.in +@@ -14,4 +14,4 @@ localstatedir=@localstatedir@ set -a . @authdaemonrc@ --exec ${sbindir}/courierlogger -pid=@authdaemonvar@/pid -$1 @libexecdir@/courier-authlib/authdaemond +-exec ${sbindir}/courierlogger -pid=@authdaemonvar@/pid $LOGGEROPTS -$1 @libexecdir@/courier-authlib/authdaemond +exec ${sbindir}/courierlogger -facility=${subsystem:-mail} -pid=@authdaemonvar@/pid -$1 @libexecdir@/courier-authlib/authdaemond Index: head/security/courier-authlib/files/patch-authdaemonrc.in =================================================================== --- head/security/courier-authlib/files/patch-authdaemonrc.in (revision 445135) +++ head/security/courier-authlib/files/patch-authdaemonrc.in (revision 445136) @@ -1,45 +1,45 @@ ---- authdaemonrc.in.orig Tue Nov 9 19:42:04 2004 -+++ authdaemonrc.in Tue Nov 9 19:42:04 2004 -@@ -59,6 +59,42 @@ +--- authdaemonrc.in.orig 2016-01-05 01:20:05 UTC ++++ authdaemonrc.in +@@ -59,6 +59,42 @@ daemons=5 authdaemonvar=@authdaemonvar@ +##NAME: subsystem:0 +# +# The syslog facility uses subsystem to determine which log messages +# are recorded in which log files. +# +# The currently defined subsystems are: +# +# o auth +# o authpriv +# o console +# o cron +# o daemon +# o ftp +# o kern +# o lpr +# o mail +# o news +# o security +# o user +# o uucp +# o local0 +# o local1 +# o local2 +# o local3 +# o local4 +# o local5 +# o local6 +# o local7 +# +# Note: Not all of the above facility names are implemented on +# every system. Check your system's syslog documentation for +# information on which facility names are allowed, and which log +# files record the corresponding messages for each facility. + +subsystem=mail + ##NAME: DEBUG_LOGIN:0 # # Dump additional diagnostics to syslog Index: head/security/courier-authlib/files/patch-authvchkpw =================================================================== --- head/security/courier-authlib/files/patch-authvchkpw (revision 445135) +++ head/security/courier-authlib/files/patch-authvchkpw (revision 445136) @@ -1,626 +1,626 @@ ---- authvchkpw.c.orig 2009-07-02 09:56:41.000000000 +0200 -+++ authvchkpw.c 2009-07-02 09:56:41.000000000 +0200 +--- authvchkpw.c.orig 2017-07-03 08:38:16 UTC ++++ authvchkpw.c @@ -0,0 +1,242 @@ +/* +** Copyright 1998 - 2007 Double Precision, Inc. See COPYING for +** distribution information. +*/ + +#if HAVE_CONFIG_H +#include "courier_auth_config.h" +#endif +#include +#include +#include +#include +#include +#if HAVE_UNISTD_H +#include +#endif +#include "auth.h" +#include "courierauthstaticlist.h" +#include "courierauthdebug.h" +#include "vpopmail_config.h" +#include +#include + +static const char rcsid[]="$Id: authvchkpw.c,v 1.29 2007/10/07 02:50:45 mrsam Exp $"; + + +extern int auth_vchkpw_pre(const char *userid, const char *service, + int (*callback)(struct authinfo *, void *), + void *arg); + +extern FILE *authvchkpw_file(const char *, const char *); + +static int auth_vchkpw_login(const char *service, char *authdata, + int (*callback_func)(struct authinfo *, void *), void *callback_arg); + +struct callback_info { + const char *pass; + int (*callback_func)(struct authinfo *, void *); + void *callback_arg; + }; + +static int callback_vchkpw(struct authinfo *a, void *p) +{ +struct callback_info *i=(struct callback_info *)p; + + /* exit with perm failure if the supplied password is empty, + * or if the supplied password doesnt match the retrieved password */ + if (a->passwd == 0) + { + DPRINTF("no password supplied"); + return (-1); + } + + if (authcheckpassword(i->pass, a->passwd)) + return (-1); + + a->clearpasswd=i->pass; + return (*i->callback_func)(a, i->callback_arg); +} + +#if HAVE_HMACLIB + +#include "libhmac/hmac.h" +#include "cramlib.h" + +static int auth_vchkpw_login(const char *service, char *authdata, + int (*callback_func)(struct authinfo *, void *), void *callback_arg); + +static int auth_vchkpw_cram(const char *service, + const char *authtype, char *authdata, + int (*callback_func)(struct authinfo *, void *), + void *callback_arg) +{ + struct cram_callback_info cci; + + if (auth_get_cram(authtype, authdata, &cci)) + return (-1); + + cci.callback_func=callback_func; + cci.callback_arg=callback_arg; + + return auth_vchkpw_pre(cci.user, service, &auth_cram_callback, &cci); +} +#endif + +int auth_vchkpw(const char *service, const char *authtype, char *authdata, + int (*callback_func)(struct authinfo *, void *), + void *callback_arg) +{ + if (strcmp(authtype, AUTHTYPE_LOGIN) == 0) + return (auth_vchkpw_login(service, authdata, + callback_func, callback_arg)); + +#if HAVE_HMACLIB + return (auth_vchkpw_cram(service, authtype, authdata, + callback_func, callback_arg)); +#else + errno=EPERM; + return (-1); +#endif + +} + + + +static int auth_vchkpw_login(const char *service, char *authdata, + int (*callback_func)(struct authinfo *, void *), void *callback_arg) +{ +char *user, *pass; +struct callback_info ci; +int rc; + /* Make sure that we have been supplied with the correct + * AUTHDATA format which is : useridpassword + */ + if ( (user=strtok(authdata, "\n")) == 0 || (pass=strtok(0, "\n")) == 0) + { + /* login syntax was invalid */ + errno=EPERM; + return (-1); + } + + ci.pass=pass; + ci.callback_func=callback_func; + ci.callback_arg=callback_arg; + + /* auth_vchkpw_pre() does this : + * - lookup the passwd entry for this user from the auth backend + * - check to see if this user is permitted to use this service type + * If successful it will populate the ci struct with the + * user's passwd entry. Return value of function will be 0. + * If unsuccessful (eg user doesnt exist, or is not permitted to + * use this auth method), it will return : + * <0 on a permanent failure (eg user doesnt exist) + * >0 on a temp failure + */ + rc=auth_vchkpw_pre(user, service, &callback_vchkpw, &ci); + + if (rc) + return rc; + + /* user has been successfully auth'ed at this point */ + +#if 0 + /* + ** sam - new courier-authlib never receives TCPREMOTEIP, at this + ** time. + */ + +#ifdef HAVE_OPEN_SMTP_RELAY + if ( (strcmp("pop3", service)==0) || (strcmp("imap", service)==0) ) { + /* Michael Bowe 13th August 2003 + * + * There is a problem here because open_smtp_relay needs + * to get the user's ip from getenv("TCPREMOTEIP"). + * If we run --with-authvchkpw --without-authdaemon, + * then this var is available. + * But if we run --with-authvchkpw --with-authdaemon, + * then TCPREMOTEIP is null + * + * If TCPREMOTEIP isnt available, then open_smtp_relay() + * will just return() back immediately. + */ + open_smtp_relay(); + } +#endif +#endif + + return 0; +} + +static void authvchkpwclose() +{ +} + +static int auth_vchkpw_changepass(const char *service, + const char *username, + const char *pass, + const char *npass) +{ +struct vqpasswd *vpw; +char User[256]; +char Domain[256]; + + /* Take the supplied userid, and split it out into the user and domain + * parts. (If a domain was not supplied, then set the domain to be + * the default domain) + */ + /* WARNING: parse_email lowercases the username in place - not const!! */ + if ( parse_email(username, User, Domain, 256) != 0) { + /* Failed to successfully extract user and domain. + * So now exit with a permanent failure code + */ + return(-1); + } + + /* check to see if domain exists. + * If you pass an alias domain to vget_assign, it will change it + * to be the real domain on return from the function + */ + if ( vget_assign(Domain,NULL,0,NULL,NULL) ==NULL ) { + /* domain doesnt exist */ + return (-1); + } + + if ( (vpw=vauth_getpw(User, Domain)) == NULL) { + /* That user doesnt exist in the auth backend */ + errno=ENOENT; + return (-1); + } + + /* Exit if any of the following : + * - user's password field in the passwd entry is empty + * - supplied current password doesnt match stored password + */ + if (vpw->pw_passwd == 0 || authcheckpassword(pass, vpw->pw_passwd)) { + errno=EPERM; + return (-1); + } + + /* save the new password into the auth backend */ + if ( vpasswd(User, Domain, (char *)npass, 0) != 0 ) { + /* password set failed */ + return (-1); + }; + + return (0); +} + +struct authstaticinfo authvchkpw_info={ + "authvchkpw", + auth_vchkpw, + auth_vchkpw_pre, + authvchkpwclose, + auth_vchkpw_changepass, + authvchkpwclose, + NULL}; + + +struct authstaticinfo *courier_authvchkpw_init() +{ + return &authvchkpw_info; +} ---- authvchkpwlib.c.orig 2009-07-02 09:56:41.000000000 +0200 -+++ authvchkpwlib.c 2009-07-02 09:56:41.000000000 +0200 +--- authvchkpwlib.c.orig 2017-07-03 08:38:16 UTC ++++ authvchkpwlib.c @@ -0,0 +1,33 @@ +/* +** Copyright 1998 - 2000 Double Precision, Inc. See COPYING for +** distribution information. +*/ + +#if HAVE_CONFIG_H +#include "courier_auth_config.h" +#endif +#include +#include +#include +#include +#include +#if HAVE_UNISTD_H +#include +#endif +#include +#include +#include "auth.h" + +static const char rcsid[]="$Id: authvchkpwlib.c,v 1.8 2004/10/21 00:10:49 mrsam Exp $"; + +char *authvchkpw_isvirtual(char *c) +{ +char *p; + + if ((p=strchr(c, '@')) != 0) return (p); +#if 0 + if ((p=strchr(c, '%')) != 0) return (p); +#endif + if ((p=strchr(c, ':')) != 0) return (p); + return (0); +} ---- courier_auth_config.h.orig 2009-06-27 17:59:04.000000000 +0200 -+++ courier_auth_config.h 2009-07-02 09:56:41.000000000 +0200 -@@ -122,6 +122,9 @@ +--- courier_auth_config.h.orig 2016-09-04 23:37:40 UTC ++++ courier_auth_config.h +@@ -125,6 +125,9 @@ /* Define to 1 if you have the `opendir' function. */ #define HAVE_OPENDIR 1 +/* Whether -lvpopmail has the open_smtp_relay() function */ +/* #undef HAVE_OPEN_SMTP_RELAY */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_PAM_PAM_APPL_H */ -@@ -217,6 +220,9 @@ - */ - #define LT_OBJDIR ".libs/" +@@ -227,6 +230,9 @@ + /* Define to the shared archive member specification, say "(shr.o)". */ + /* #undef LT_SHARED_LIB_MEMBER */ ++ +/* Whether -lvpopmail has the vset_lastauth() function */ +/* #undef HAVE_VSET_LASTAUTH */ -+ + /* Whether we must a prototype for crypt() */ #define NEED_CRYPT_PROTOTYPE 0 - ---- courier_auth_config.h.in.orig 2009-06-27 18:09:18.000000000 +0200 -+++ courier_auth_config.h.in 2009-07-02 09:56:41.000000000 +0200 -@@ -121,6 +121,9 @@ +--- courier_auth_config.h.in.orig 2017-07-02 14:41:47 UTC ++++ courier_auth_config.h.in +@@ -124,6 +124,9 @@ /* Define to 1 if you have the `opendir' function. */ #undef HAVE_OPENDIR +/* Whether -lvpopmail has the open_smtp_relay() function */ +#undef HAVE_OPEN_SMTP_RELAY + /* Define to 1 if you have the header file. */ #undef HAVE_PAM_PAM_APPL_H -@@ -216,6 +219,9 @@ - */ - #undef LT_OBJDIR +@@ -226,6 +229,9 @@ + /* Define to the shared archive member specification, say "(shr.o)". */ + #undef LT_SHARED_LIB_MEMBER ++ +/* Whether -lvpopmail has the vset_lastauth() function */ +#undef HAVE_VSET_LASTAUTH -+ + /* Whether we must a prototype for crypt() */ #undef NEED_CRYPT_PROTOTYPE - ---- preauthvchkpw.c.orig 2009-07-02 09:56:41.000000000 +0200 -+++ preauthvchkpw.c 2009-07-02 09:56:41.000000000 +0200 +--- preauthvchkpw.c.orig 2017-07-03 08:38:16 UTC ++++ preauthvchkpw.c @@ -0,0 +1,159 @@ +/* +** Copyright 1998 - 2001 Double Precision, Inc. See COPYING for +** distribution information. +*/ + +#if HAVE_CONFIG_H +#include "courier_auth_config.h" +#endif +#include +#include +#include +#include +#include +#if HAVE_UNISTD_H +#include +#endif +#include "auth.h" +#include "courierauthdebug.h" +#include +#include +#include "vpopmail_config.h" + +/* make use of pw_flags only if available */ +#ifndef VQPASSWD_HAS_PW_FLAGS +#define pw_flags pw_gid +#endif + +extern FILE *authvchkpw_file(const char *, const char *); + +static const char rcsid[]="$Id: preauthvchkpw.c,v 1.26 2007/04/22 18:53:30 mrsam Exp $"; + +/* This function is called by the auth_vchkpw() function + * + * This function does the following : + * - extract the username and domain from the supplied userid + * - lookup the passwd entry for that user from the auth backend + * - populate *and return) a courier authinfo structure with the values + * from the vpopmail passwd entry + * + * Return -1 on perm failure + * Return 0 on success + * Return 1 on temp failure + * + */ + +int auth_vchkpw_pre( + const char *userid, + const char *service, + int (*callback)(struct authinfo *, void *), + void *arg) +{ +struct vqpasswd *vpw; +static uid_t uid; +gid_t gid; +struct authinfo auth; +static char User[256]; +static char Domain[256]; +static char options[80]; + + /* Make sure the auth struct is empty */ + memset(&auth, 0, sizeof(auth)); + + /* Take the supplied userid, and split it out into the user and domain + * parts. (If a domain was not supplied, then set the domain to be + * the default domain) + */ + if ( parse_email(userid, User, Domain, 256) != 0) { + /* Failed to successfully extract user and domain. + * So now exit with a permanent failure code + */ + DPRINTF("vchkpw: unable to split into user and domain"); + return(-1); + } + + /* Check to see if the domain exists. + * If so, on return vget_assign will : + * Rewrite Domain to be the real domain if it was sent as an alias domain + * Retrieve the domain's uid and gid + */ + if ( vget_assign(Domain,NULL,0,&uid, &gid) == NULL ) { + /* Domain does not exist + * So now exit with a permanent failure code */ + DPRINTF("vchkpw: domain does not exist"); + return (-1); + } + + /* Try and retrieve the user's passwd entry from the auth backend */ + if ( (vpw=vauth_getpw(User, Domain)) == NULL) { + /* User does not exist + * So now exit with a permanent failure code + */ + DPRINTF("vchkpw: user does not exist"); + return (-1); + } + + /* Check to see if the user has been allocated a dir yet. + * Some of the vpopmail backends (eg mysql) allow users to + * be manually inserted into the auth backend but without + * allocating a dir. A dir will be created when the user + * first trys to auth (or when they 1st receive mail) + */ + if (vpw->pw_dir == NULL || strlen(vpw->pw_dir) == 0 ) { + /* user does not have a dir allocated yet */ + if ( make_user_dir(User, Domain, uid, gid) == NULL) { + /* Could not allocate a user dir at this time + * so exit with a temp error code + */ + DPRINTF("vchkpw: make_user_dir failed"); + return(1); + } + /* We have allocated the user a dir now. + * Go and grab the updated passwd entry + */ + if ( (vpw=vauth_getpw(User, Domain)) == NULL ) { + /* Could not get the passwd entry + * So exit with a permanent failure code + */ + DPRINTF("vchkpw: could not get the password entry"); + return(-1); + } + } + + snprintf(options, sizeof(options), + "disablewebmail=%d,disablepop3=%d,disableimap=%d", + vpw->pw_flags & NO_WEBMAIL ? 1 : 0, + vpw->pw_flags & NO_POP ? 1 : 0, + vpw->pw_flags & NO_IMAP ? 1 : 0); + +#ifdef HAVE_VSET_LASTAUTH + /* if we are keeping track of their last auth time, + * then store this value now. Note that this isnt + * consistent with the authentication via vchkpw + * because it only stores the lastauth attempt + * after the password has been verified. Here we are + * logging it after the user has been found to exist, + * but before the password has been verified. We could + * do the logging inside authvchkpw.c, but that would + * be a lot harder because we would have to go and + * parse_email() again there before calling vset_lastauth() + */ + vset_lastauth(User, Domain, service); +#endif + + /* save the user's passwd fields into the appropriate + * courier structure + */ + /*auth.sysusername = userid;*/ + auth.sysuserid = &uid; + auth.sysgroupid = gid; + auth.homedir = vpw->pw_dir; + auth.address = userid; + auth.fullname = vpw->pw_gecos; + auth.passwd = vpw->pw_passwd; + auth.clearpasswd = vpw->pw_clear_passwd; + auth.options = options; + courier_authdebug_authinfo("DEBUG: authvchkpw: ", &auth, 0, vpw->pw_passwd); + + return ((*callback)(&auth, arg)); +} ---- userdb/configure.orig 2009-06-27 17:55:53.000000000 +0200 -+++ userdb/configure 2009-07-02 09:56:41.000000000 +0200 -@@ -12452,7 +12452,7 @@ +--- userdb/Makefile.in.orig 2016-06-23 12:29:59 UTC ++++ userdb/Makefile.in +@@ -107,7 +107,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cach + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb ++CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb vchkpw2userdb + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + libuserdb_la_LIBADD = +@@ -222,6 +222,7 @@ CSCOPE = cscope + AM_RECURSIVE_TARGETS = cscope + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/makeuserdb.in $(srcdir)/pw2userdb.in \ ++ $(srcdir)/vchkpw2userdb.in \ + $(srcdir)/userdb.pl.in $(top_srcdir)/../compile \ + $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ + $(top_srcdir)/../depcomp $(top_srcdir)/../install-sh \ +@@ -377,7 +378,7 @@ BUILT_SOURCES = makeuserdb.html.in makeuserdb.8.in \ + userdb.html.in userdb.8.in \ + userdbpw.html.in userdbpw.8.in + +-noinst_SCRIPTS = makeuserdb pw2userdb dummy ++noinst_SCRIPTS = makeuserdb pw2userdb vchkpw2userdb dummy + noinst_DATA = makeuserdb.html userdb.html userdbpw.html + userdbpw_SOURCES = userdbpw.c + userdbpw_LDADD = libuserdb.la @HMACLIB@ @MD5LIB@ @SHA1LIB@ @CRYPTLIBS@ +@@ -444,6 +445,8 @@ userdb.pl: $(top_builddir)/config.status $(srcdir)/use + makeuserdb: $(top_builddir)/config.status $(srcdir)/makeuserdb.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2userdb.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ ++vchkpw2userdb: $(top_builddir)/config.status $(srcdir)/vchkpw2userdb.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + + clean-noinstLTLIBRARIES: +--- userdb/configure.orig 2016-06-23 12:29:59 UTC ++++ userdb/configure +@@ -12873,7 +12873,7 @@ else fi -ac_config_files="$ac_config_files Makefile userdb.pl makeuserdb pw2userdb" +ac_config_files="$ac_config_files Makefile userdb.pl makeuserdb pw2userdb vchkpw2userdb" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -13364,6 +13364,7 @@ +@@ -13894,6 +13894,7 @@ do "userdb.pl") CONFIG_FILES="$CONFIG_FILES userdb.pl" ;; "makeuserdb") CONFIG_FILES="$CONFIG_FILES makeuserdb" ;; "pw2userdb") CONFIG_FILES="$CONFIG_FILES pw2userdb" ;; + "vchkpw2userdb") CONFIG_FILES="$CONFIG_FILES vchkpw2userdb" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ---- userdb/vchkpw2userdb.in.orig 2009-07-02 09:56:41.000000000 +0200 -+++ userdb/vchkpw2userdb.in 2009-07-02 09:56:41.000000000 +0200 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +--- userdb/vchkpw2userdb.in.orig 2017-07-03 08:38:16 UTC ++++ userdb/vchkpw2userdb.in @@ -0,0 +1,80 @@ +#! @PERL@ +# +# Convert vchkpw to userdb format. +# +# $Id: vchkpw2userdb.in,v 1.4 2000/02/16 01:12:13 mrsam Exp $ +# +# Copyright 1998 - 1999 Double Precision, Inc. See COPYING for +# distribution information. + +use Getopt::Long; + +die "Invalid options.\n" unless + GetOptions("vpopmailhome=s" => \$vpopmailhome, + "todir=s" => \$todir); + +if ( ! ( $vpopmailhome =~ /./ )) +{ + (undef, undef, undef, undef, undef, undef, undef, $vpopmailhome) + = getpwnam("vpopmail"); + + die "Cannot find vpopmail home.\n" unless $vpopmailhome =~ /./; +} + +-d "$vpopmailhome" || die "$vpopmailhome: not found.\n"; + +if ( $todir =~ /./ ) +{ + -d "$todir" || mkdir($todir, 0700) || die "$!\n"; +} + +$bindir=$0; + +if ($bindir =~ /^(.*)\/[^\/]*$/ ) +{ + $bindir=$1; +} +else +{ + $bindir="."; +} + +die "Unable to locate pw2userdb.\n" unless -f "$bindir/pw2userdb"; + +$redir=""; + +if ( $todir =~ /./ ) +{ + $redir=">$todir/users-vpasswd"; + -d "$todir/domains" || mkdir("$todir/domains", 0700) || die "$!\n"; +} + +if ( -f "$vpopmailhome/users/vpasswd") +{ + $rc=system ("$bindir/pw2userdb --vpopuid --passwd='$vpopmailhome/users/vpasswd' --noshadow --nouid $redir"); + exit $rc / 256 if $rc; +} + +if ( opendir(DIR, "$vpopmailhome/domains")) +{ + while ($domain=readdir(DIR)) + { + $domainopt="--domain='$domain'"; + $domainopt="" if $domain eq "default"; + next if $domain eq "." || $domain eq ".."; + next unless -f "$vpopmailhome/domains/$domain/vpasswd"; + $redir=""; + if ( $todir =~ /./ ) + { + $redir=">$todir/domains/$domain"; + $redir=">$todir/users-default" + if $domain eq "default"; + } + + $rc=system ("$bindir/pw2userdb --passwd='$vpopmailhome/domains/$domain/vpasswd' --vpopuid --noshadow --nouid $domainopt $redir"); + + exit $rc / 256 if $rc != 0; + } + close(DIR); +} + ---- userdb/Makefile.in.orig 2015-06-06 14:37:22 UTC -+++ userdb/Makefile.in -@@ -107,7 +107,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb -+CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb vchkpw2userdb - CONFIG_CLEAN_VPATH_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) - libuserdb_la_LIBADD = -@@ -222,6 +222,7 @@ CSCOPE = cscope - AM_RECURSIVE_TARGETS = cscope - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/makeuserdb.in $(srcdir)/pw2userdb.in \ -+ $(srcdir)/vchkpw2userdb.in \ - $(srcdir)/userdb.pl.in $(top_srcdir)/../compile \ - $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ - $(top_srcdir)/../depcomp $(top_srcdir)/../install-sh \ -@@ -376,7 +377,7 @@ BUILT_SOURCES = makeuserdb.html.in makeu - userdb.html.in userdb.8.in \ - userdbpw.html.in userdbpw.8.in - --noinst_SCRIPTS = makeuserdb pw2userdb dummy -+noinst_SCRIPTS = makeuserdb pw2userdb vchkpw2userdb dummy - noinst_DATA = makeuserdb.html userdb.html userdbpw.html - userdbpw_SOURCES = userdbpw.c - userdbpw_LDADD = libuserdb.la @HMACLIB@ @MD5LIB@ @SHA1LIB@ @CRYPTLIBS@ -@@ -444,6 +445,8 @@ makeuserdb: $(top_builddir)/config.statu - cd $(top_builddir) && $(SHELL) ./config.status $@ - pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2userdb.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -+vchkpw2userdb: $(top_builddir)/config.status $(srcdir)/vchkpw2userdb.in -+ cd $(top_builddir) && $(SHELL) ./config.status $@ - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) Index: head/security/courier-authlib/files/patch-configure =================================================================== --- head/security/courier-authlib/files/patch-configure (revision 445135) +++ head/security/courier-authlib/files/patch-configure (revision 445136) @@ -1,340 +1,332 @@ ---- configure.orig 2015-04-25 14:07:07 UTC +--- configure.orig 2017-07-02 14:41:39 UTC +++ configure @@ -642,6 +642,10 @@ ltdl_LIBOBJS am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +HAVE_BASE_TRUE +HAVE_BASE_FALSE +HAVE_USERDB_TRUE +HAVE_USERDB_FALSE LIBOBJS HAVE_SGML_FALSE HAVE_SGML_TRUE @@ -676,6 +680,9 @@ LIBAUTHPGSQL PGSQL_LIBS PG_CONFIG authpgsqlrc +vpopmail_home +VPOPMAILLIBS +LIBAUTHVCHKPW LIBAUTHPWD LIBAUTHSHADOW SHADOWLIBS -@@ -1546,6 +1553,7 @@ Optional Packages: +@@ -1563,6 +1570,7 @@ Optional Packages: --with-authldaprc=filename Expect to find authldaprc here --without-authpwd Do not include the authpwd module --without-authshadow Do not include the authshadow module + --without-authvchkpw Do not include the authvchkpw module --with-authpgsqlrc=filename Expect to find authpgsql here --without-authpgsql Do not include the authpgsql module --with-pgsql-libs=DIR Look for pgsql libs in this dir -@@ -2795,7 +2803,7 @@ else +@@ -2938,7 +2946,7 @@ else fi fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="${INSTALL_PROGRAM} -s" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -@@ -13456,7 +13464,7 @@ LIBS="$saveLIBS" +@@ -18097,8 +18105,12 @@ fi - - save_LIBS="$LIBS" --LIBS="-lcourier-unicode" -+LIBS="-L%%LOCALBASE%%/lib -lcourier-unicode" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -13749,8 +13757,12 @@ fi - if test "$doauthuserdb" = "no" then + HAVE_USERDB_TRUE='#' + HAVE_USERDB_FALSE= AUTHUSERDB="" else + HAVE_USERDB_TRUE= + HAVE_USERDB_FALSE='#' AUTHUSERDB="authuserdb" LIBAUTHUSERDB="libauthuserdb.la" -@@ -14208,6 +14220,20 @@ else +@@ -18556,7 +18568,21 @@ else fi +if test "${with_base+set}" = set; then + withval="$with_base" + dobase="$withval" +else + dobase="yes" +fi; -+ + +if test "$dobase" = "no"; then + HAVE_BASE_TRUE='#' + HAVE_BASE_FALSE= +else + HAVE_BASE_TRUE= + HAVE_BASE_FALSE='#' +fi - ++ if test "$HAVE_LDAP" = 1; then HAVE_LDAP_TRUE= -@@ -14426,6 +14452,256 @@ fi - - - + HAVE_LDAP_FALSE='#' +@@ -18768,6 +18794,256 @@ if test "$HAVE_PWD" = 1 + then + LIBAUTHPWD="libauthpwd.la" + fi + ++ ++ ++ ++ ++ ++ +vpopmail_home=`$PERL -e '@a=getpwnam("vpopmail"); print "$a[7]";'` + + + + +# Check whether --with-authvchkpw was given. +if test "${with_authvchkpw+set}" = set; then + withval=$with_authvchkpw; doauthvchkpw="$withval" +else + doauthvchkpw=no + if test "$vpopmail_home" != "" + then + doauthvchkpw=yes + fi +fi + + +if test "$doauthvchkpw" = "no" +then + HAVE_VCHKPW=0 + vpopmail_home=. +else + HAVE_VCHKPW=1 + + + cat <&5 +echo "$as_me: error: ${vpopmail_home}/etc/lib_deps does not exist - upgrade vpopmail to the current version or fix the permissions on this file" >&2;} + { (exit 1); exit 1; }; } + fi +fi + + + +LIBAUTHVCHKPW="" +if test "$HAVE_VCHKPW" = 1 +then + LIBAUTHVCHKPW="libauthvchkpw.la" + HAVE_VCHKPW="1" + + + _SAVE_LIBS=$LIBS + LIBS="$VPOPMAILLIBS $CRYPTLIBS $LIBS" + { echo "$as_me:$LINENO: checking for open_smtp_relay" >&5 +echo $ECHO_N "checking for open_smtp_relay... $ECHO_C" >&6; } +if test "${ac_cv_func_open_smtp_relay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define open_smtp_relay to an innocuous variant, in case declares open_smtp_relay. + For example, HP-UX 11i declares gettimeofday. */ +#define open_smtp_relay innocuous_open_smtp_relay + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char open_smtp_relay (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef open_smtp_relay + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char open_smtp_relay (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_open_smtp_relay || defined __stub___open_smtp_relay +choke me +#endif + +int +main () +{ +return open_smtp_relay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_open_smtp_relay=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_open_smtp_relay=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_open_smtp_relay" >&5 +echo "${ECHO_T}$ac_cv_func_open_smtp_relay" >&6; } +if test $ac_cv_func_open_smtp_relay = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_OPEN_SMTP_RELAY 1 +_ACEOF + +fi + + { echo "$as_me:$LINENO: checking for vset_lastauth" >&5 +echo $ECHO_N "checking for vset_lastauth... $ECHO_C" >&6; } +if test "${ac_cv_func_vset_lastauth+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define vset_lastauth to an innocuous variant, in case declares vset_lastauth. + For example, HP-UX 11i declares gettimeofday. */ +#define vset_lastauth innocuous_vset_lastauth + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char vset_lastauth (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef vset_lastauth + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char vset_lastauth (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_vset_lastauth || defined __stub___vset_lastauth +choke me +#endif + +int +main () +{ +return vset_lastauth (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_vset_lastauth=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vset_lastauth=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_vset_lastauth" >&5 +echo "${ECHO_T}$ac_cv_func_vset_lastauth" >&6; } +if test $ac_cv_func_vset_lastauth = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_VSET_LASTAUTH 1 +_ACEOF + +fi + + LIBS=$_SAVE_LIBS +fi + -+ -+ -+ -+ -+ -+ - # Check whether --with-authpgsqlrc was given. - if test "${with_authpgsqlrc+set}" = set; then : - withval=$with_authpgsqlrc; authpgsqlrc="$withval" + + + Index: head/security/courier-authlib-base/Makefile =================================================================== --- head/security/courier-authlib-base/Makefile (revision 445135) +++ head/security/courier-authlib-base/Makefile (revision 445136) @@ -1,14 +1,14 @@ # Created by: Oliver Lehmann # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -base COMMENT= Courier authentication library base CATEGORIES= security mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} .include "${MASTERDIR}/Makefile"