Index: head/databases/courier-authlib-mysql/Makefile =================================================================== --- head/databases/courier-authlib-mysql/Makefile (revision 385028) +++ head/databases/courier-authlib-mysql/Makefile (revision 385029) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 1 +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 385028) +++ head/databases/courier-authlib-pgsql/Makefile (revision 385029) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 1 +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 385028) +++ head/databases/courier-authlib-userdb/Makefile (revision 385029) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 1 +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 385028) +++ head/databases/courier-authlib-usergdbm/Makefile (revision 385029) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 1 +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 385028) +++ head/devel/courier-unicode/Makefile (revision 385029) @@ -1,27 +1,26 @@ # $FreeBSD$ PORTNAME= courier-unicode -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.2 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 385028) +++ head/devel/courier-unicode/distinfo (revision 385029) @@ -1,2 +1,2 @@ -SHA256 (courier-unicode-1.1.tar.bz2) = a10e61d20f3bf25bebdec495dea54258948f333a29f29a7f155a31f9bfb3f56c -SIZE (courier-unicode-1.1.tar.bz2) = 372684 +SHA256 (courier-unicode-1.2.tar.bz2) = 55017f49975dfece84f061e33f38361ff7d7e52ceda98346c9462bf036d9724f +SIZE (courier-unicode-1.2.tar.bz2) = 390014 Property changes on: head/devel/courier-unicode/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/devel/courier-unicode/pkg-plist =================================================================== --- head/devel/courier-unicode/pkg-plist (revision 385028) +++ head/devel/courier-unicode/pkg-plist (revision 385029) @@ -1,61 +1,62 @@ -include/unicode.h -lib/libunicode.a -lib/libunicode.so -lib/libunicode.so.1 -lib/libunicode.so.1.0.0 +include/courier-unicode.h +lib/libcourier-unicode.a +lib/libcourier-unicode.so +lib/libcourier-unicode.so.1 +lib/libcourier-unicode.so.1.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::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_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_isspace.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_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 Property changes on: head/devel/courier-unicode/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/mail/courier-authlib-vchkpw/Makefile =================================================================== --- head/mail/courier-authlib-vchkpw/Makefile (revision 385028) +++ head/mail/courier-authlib-vchkpw/Makefile (revision 385029) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 1 +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 385028) +++ head/mail/courier-imap/Makefile (revision 385029) @@ -1,149 +1,150 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= courier-imap -PORTVERSION= 4.15 -PORTREVISION= 2 +PORTVERSION= 4.16.1 PORTEPOCH= 2 CATEGORIES= mail ipv6 MASTER_SITES= SF/courier/imap/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base -RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base +RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base \ + ${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool +LIB_DEPENDS= libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode USES= gmake perl5 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} USE_OPENSSL= yes 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:${PORTSDIR}/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:${PORTSDIR}/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 - - cd ${WRKSRC} && ( ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \ - install-configure ; cd - ) @${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 385028) +++ head/mail/courier-imap/distinfo (revision 385029) @@ -1,2 +1,2 @@ -SHA256 (courier-imap-4.15.tar.bz2) = 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109 -SIZE (courier-imap-4.15.tar.bz2) = 3266353 +SHA256 (courier-imap-4.16.1.tar.bz2) = 51241784f78b7ce8342adf9d4741a2f8ae8ee0641fe7ead4751af8d4019d4204 +SIZE (courier-imap-4.16.1.tar.bz2) = 3026062 Index: head/mail/courier-imap/files/patch-Makefile.in =================================================================== --- head/mail/courier-imap/files/patch-Makefile.in (revision 385028) +++ head/mail/courier-imap/files/patch-Makefile.in (revision 385029) @@ -1,42 +1,52 @@ ---- Makefile.in.orig 2009-06-27 19:26:28.000000000 +0200 -+++ Makefile.in 2009-07-27 19:19:27.000000000 +0200 -@@ -307,7 +307,7 @@ - EXTRA_DIST = 00README.NOW.OR.SUFFER README README.cygwin COPYING.GPL \ - NEWS.html $(TEMPLFILES) pgpkeys.txt sysconftool +--- Makefile.in.orig 2015-04-25 13:49:07 UTC ++++ Makefile.in +@@ -395,8 +395,7 @@ sbin_SCRIPTS = sharedindexinstall shared + CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS) + databindir = $(datadir) + databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams +-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \ +- makeimapaccess makedat ++binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw + + sbinPROGRAMS = imaplogin pop3login + libexecPROGRAMS = makedatprog couriertcpd +@@ -412,7 +411,7 @@ man_MANS = couriertcpd.1 deliverquota.8 + EXTRA_DIST = README README.cygwin COPYING.GPL NEWS.html $(TEMPLFILES) \ + pgpkeys.txt sysconftool sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \ - imapd.cnf pop3d.cnf quotawarnmsg.example + quotawarnmsg.example libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc HTML2TXT = links -dump -no-numbering -no-references -@@ -659,8 +659,8 @@ +@@ -793,8 +792,8 @@ install-man1: $(man_MANS) for i in $$list; do echo "$$i"; done | $(am__base_list) | \ while read files; do \ test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man1dir)'"; \ + %%INSTALL_MAN%% $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ done; } uninstall-man1: -@@ -690,15 +690,15 @@ +@@ -829,15 +828,15 @@ install-man8: $(man_MANS) sed 'N;N;s,\n, ,g' | { \ list=; while read file base inst; do \ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \ + echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \ fi; \ done; \ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ while read files; do \ test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \ + echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man8dir)'"; \ + %%INSTALL_MAN%% $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \ done; } uninstall-man8: Index: head/mail/courier-imap/pkg-plist =================================================================== --- head/mail/courier-imap/pkg-plist (revision 385028) +++ head/mail/courier-imap/pkg-plist (revision 385029) @@ -1,69 +1,67 @@ bin/couriertls bin/deliverquota bin/imapd bin/maildiracl bin/maildirkw bin/maildirmake +bin/makedat +bin/makeimapaccess bin/pop3d @unexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi %%CONFDIR%%/imapd-ssl.dist @exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd-ssl.dist @unexec if cmp -s %D/%%CONFDIR%%/imapd.cnf.dist %D/%%CONFDIR%%/imapd.cnf; then rm -f %D/%%CONFDIR%%/imapd.cnf; fi %%CONFDIR%%/imapd.cnf.dist @unexec if cmp -s %D/%%CONFDIR%%/imapd.dist %D/%%CONFDIR%%/imapd; then rm -f %D/%%CONFDIR%%/imapd; fi %%CONFDIR%%/imapd.dist @exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd.dist @unexec if cmp -s %D/%%CONFDIR%%/pop3d-ssl.dist %D/%%CONFDIR%%/pop3d-ssl; then rm -f %D/%%CONFDIR%%/pop3d-ssl; fi %%CONFDIR%%/pop3d-ssl.dist @exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d-ssl.dist @unexec if cmp -s %D/%%CONFDIR%%/pop3d.cnf.dist %D/%%CONFDIR%%/pop3d.cnf; then rm -f %D/%%CONFDIR%%/pop3d.cnf; fi %%CONFDIR%%/pop3d.cnf.dist @unexec if cmp -s %D/%%CONFDIR%%/pop3d.dist %D/%%CONFDIR%%/pop3d; then rm -f %D/%%CONFDIR%%/pop3d; fi %%CONFDIR%%/pop3d.dist @exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d.dist %%CONFDIR%%/quotawarnmsg.example %%LIBEXECDIR%%/couriertcpd %%LIBEXECDIR%%/imapd-ssl.rc %%LIBEXECDIR%%/imapd.rc %%LIBEXECDIR%%/makedatprog %%LIBEXECDIR%%/pop3d-ssl.rc %%LIBEXECDIR%%/pop3d.rc man/man1/couriertcpd.1.gz man/man1/maildiracl.1.gz man/man1/maildirkw.1.gz man/man1/maildirmake.1.gz man/man8/deliverquota.8.gz man/man8/imapd.8.gz man/man8/mkdhparams.8.gz man/man8/mkimapdcert.8.gz +man/man8/makeimapaccess.8.gz man/man8/mkpop3dcert.8.gz sbin/imaplogin sbin/mkdhparams sbin/mkimapdcert sbin/mkpop3dcert sbin/pop3login sbin/sharedindexinstall sbin/sharedindexsplit share/courier-imap/mkdhparams share/courier-imap/mkimapdcert share/courier-imap/mkpop3dcert %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.proxy %%PORTDOCS%%%%DOCSDIR%%/README.imapkeywords.html %%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt %%PORTDOCS%%%%DOCSDIR%%/README.couriertls -@exec mkdir -p -m 755 %D/%%CONFDIR%%/shared %D/%%CONFDIR%%/shared -@exec mkdir -p -m 755 %D/%%CONFDIR%%/shared %D/%%CONFDIR%%/shared.tmp -@dirrmtry var -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm share/courier-imap -@dirrm %%LIBEXECDIR%% -@dirrm %%CONFDIR%%/shared -@dirrm %%CONFDIR%%/shared.tmp -@dirrmtry %%CONFDIR%% +@dir %%ETCDIR%%/imapaccess +@dir var +@dir %%CONFDIR%%/shared +@dir %%CONFDIR%%/shared.tmp Index: head/mail/maildrop/Makefile =================================================================== --- head/mail/maildrop/Makefile (revision 385028) +++ head/mail/maildrop/Makefile (revision 385029) @@ -1,134 +1,134 @@ # 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 PORTNAME= maildrop -PORTVERSION= 2.8.1 +PORTVERSION= 2.8.2 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Mail delivery agent (MDA) with filtering abilities LICENSE= GPLv3 USES= iconv 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 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS= courier-0.65* libunicode-[0-9]* LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ - libunicode.so:${PORTSDIR}/devel/courier-unicode + libcourier-unicode.so:${PORTSDIR}/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/makedat.1 libs/maildrop/reformail.1 \ + 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} 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:${PORTSDIR}/databases/gdbm IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/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 ${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:${PORTSDIR}/security/courier-authlib-base RUN_DEPENDS+= courierauthconfig:${PORTSDIR}/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 385028) +++ head/mail/maildrop/distinfo (revision 385029) @@ -1,2 +1,2 @@ -SHA256 (maildrop-2.8.1.tar.bz2) = e1dbdc83ca92c614b05feea837dbae6d275e11b9a35728f68c2d4b8042153b64 -SIZE (maildrop-2.8.1.tar.bz2) = 1989926 +SHA256 (maildrop-2.8.2.tar.bz2) = ab505c4c75ec5566f0626ae477c21ca3069ac37f8f31c41b318025d4ee549654 +SIZE (maildrop-2.8.2.tar.bz2) = 1989913 Index: head/mail/maildrop/files/patch-filelock.C =================================================================== --- head/mail/maildrop/files/patch-filelock.C (revision 385028) +++ head/mail/maildrop/files/patch-filelock.C (nonexistent) @@ -1,11 +0,0 @@ ---- libs/maildrop/filelock.C.orig 2013-08-25 20:54:20.000000000 +0200 -+++ libs/maildrop/filelock.C 2013-10-01 17:26:36.724456433 +0200 -@@ -63,7 +63,7 @@ - // you're writing to a device file, you know what you're doing. - - if (fstat(fd, &stat_buf) >= 0 && ( -- S_ISREG(stat_buf.st_mode) || S_ISDIR(stat_buf.st_mode))) -+ S_ISCHR(stat_buf.st_mode) || S_ISBLK(stat_buf.st_mode))) - { - return; - } Property changes on: head/mail/maildrop/files/patch-filelock.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/files/patch-Makefile.in =================================================================== --- head/mail/maildrop/files/patch-Makefile.in (revision 385028) +++ head/mail/maildrop/files/patch-Makefile.in (revision 385029) @@ -1,93 +1,115 @@ ---- Makefile.in.orig 2014-09-01 14:50:09.000000000 +0200 -+++ Makefile.in 2014-09-02 00:46:38.638094906 +0200 -@@ -376,7 +376,7 @@ +--- Makefile.in.orig 2015-04-25 13:56:37 UTC ++++ Makefile.in +@@ -83,10 +83,10 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@HAVE_DBLIBRARY_TRUE@am__append_1 = makedat.html +-@HAVE_DBLIBRARY_TRUE@am__append_2 = makedat.1 +-@HAVE_DBLIBRARY_FALSE@am__append_3 = makedat.html +-@HAVE_DBLIBRARY_FALSE@am__append_4 = makedat.1 ++@HAVE_DBLIBRARY_TRUE@am__append_1 = ++@HAVE_DBLIBRARY_TRUE@am__append_2 = ++@HAVE_DBLIBRARY_FALSE@am__append_3 = ++@HAVE_DBLIBRARY_FALSE@am__append_4 = + subdir = . + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ +@@ -376,7 +376,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = $(docdir)/html +htmldir = $(datadir)/doc/@PACKAGE@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -@@ -411,15 +411,15 @@ +@@ -412,15 +412,15 @@ EXTRA_DIST = README.html INSTALL.html UP maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW) scriptdir = $(pkgdatadir)/scripts -DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html +DELIVERQUOTAHTMLSOURCE = maildirquota.html maildrop-deliverquota.html DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE) -DELIVERQUOTAMAN = maildirquota.7 deliverquota.8 +DELIVERQUOTAMAN = maildirquota.7 maildrop-deliverquota.8 MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \ - maildirmake.html maildropex.html maildir.html \ + maildrop-maildirmake.html maildropex.html \ maildropfilter.html maildropgdbm.html maildrop.html \ mailbot.html makemime.html reformail.html reformime.html \ $(am__append_1) -MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 \ +MAILDROPMAN = lockmail.1 maildrop-maildirmake.1 maildrop.1 mailbot.1 \ maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \ makemime.1 reformail.1 reformime.1 $(am__append_2) EXTRA_LTLIBRARIES = librfc822.la librfc2045.la -@@ -1257,21 +1257,21 @@ +@@ -1265,21 +1265,21 @@ uninstall-man: uninstall-man1 uninstall- install-deliverquota: $(mkinstalldirs) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota + $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/maildrop-deliverquota cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota uninstall-deliverquota: - rm -f $(DESTDIR)$(bindir)/deliverquota + rm -f $(DESTDIR)$(bindir)/maildrop-deliverquota install-data-local: install-man install-deliverquota install-maildrop uninstall-local: uninstall-deliverquota uninstall-maildrop -deliverquota.8: libs/maildir/deliverquota.8 - cp -f libs/maildir/deliverquota.8 deliverquota.8 +maildrop-deliverquota.8: libs/maildir/deliverquota.8 + cp -f libs/maildir/deliverquota.8 maildrop-deliverquota.8 -deliverquota.html: libs/maildir/deliverquota.html - cp -f libs/maildir/deliverquota.html deliverquota.html +maildrop-deliverquota.html: libs/maildir/deliverquota.html + cp -f libs/maildir/deliverquota.html maildrop-deliverquota.html # In maildrop 0.74, maildirmake was installed as bindir/maildrop.maildirmake # and a soft link was created from maildirmake to maildrop.maildirmake -@@ -1289,7 +1289,7 @@ +@@ -1297,18 +1297,18 @@ install-maildrop: $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \ done $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail - $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake + $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildrop-maildirmake $(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime $(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime - test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ -@@ -1300,7 +1300,7 @@ +- test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ +- $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog +- test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ +- $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat ++# test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ ++# $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog ++# test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ ++# $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat + . libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail . libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail uninstall-maildrop: - for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \ + for f in maildrop mailbot maildir-maildirmake reformail lockmail makemime reformime; do \ rm -f $(DESTDIR)$(bindir)/$$f ; \ done test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ -@@ -1354,11 +1354,11 @@ +@@ -1362,11 +1362,11 @@ maildiracl.html: libs/maildir/maildiracl maildirkw.html: libs/maildir/maildirkw.html cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html -maildirmake.html: libs/maildir/maildirmake.html - cp -f libs/maildir/maildirmake.html maildirmake.html +maildrop-maildirmake.html: libs/maildir/maildirmake.html + cp -f libs/maildir/maildirmake.html maildrop-maildirmake.html -maildirmake.1: libs/maildir/maildirmake.1 - cp -f libs/maildir/maildirmake.1 . +maildrop-maildirmake.1: libs/maildir/maildirmake.1 + cp -f libs/maildir/maildirmake.1 maildrop-maildirmake.1 maildropex.html: libs/maildrop/maildropex.html cp -f $(srcdir)/libs/maildrop/maildropex.html maildropex.html Index: head/mail/maildrop/files/patch-libs_maildrop_filelock.C =================================================================== --- head/mail/maildrop/files/patch-libs_maildrop_filelock.C (nonexistent) +++ head/mail/maildrop/files/patch-libs_maildrop_filelock.C (revision 385029) @@ -0,0 +1,11 @@ +--- libs/maildrop/filelock.C.orig 2013-08-25 18:54:20 UTC ++++ libs/maildrop/filelock.C +@@ -63,7 +63,7 @@ int flockrc; + // you're writing to a device file, you know what you're doing. + + if (fstat(fd, &stat_buf) >= 0 && ( +- S_ISREG(stat_buf.st_mode) || S_ISDIR(stat_buf.st_mode))) ++ S_ISCHR(stat_buf.st_mode) || S_ISBLK(stat_buf.st_mode))) + { + return; + } Property changes on: head/mail/maildrop/files/patch-libs_maildrop_filelock.C ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/maildrop/pkg-plist =================================================================== --- head/mail/maildrop/pkg-plist (revision 385028) +++ head/mail/maildrop/pkg-plist (revision 385029) @@ -1,65 +1,61 @@ @owner %%MUID%% @group %%MGID%% @mode %%MMODE%% bin/lockmail bin/maildrop @owner @group @mode bin/maildrop-deliverquota bin/mailbot bin/maildrop-maildirmake -bin/makedat -bin/makedatprog bin/makemime bin/reformail bin/reformime etc/quotawarnmsg.sample man/man1/lockmail.1.gz man/man1/mailbot.1.gz man/man1/maildrop-maildirmake.1.gz man/man1/maildrop.1.gz -man/man1/makedat.1.gz man/man1/makemime.1.gz man/man1/reformail.1.gz man/man1/reformime.1.gz man/man5/maildir.5.gz man/man7/maildirquota.7.gz man/man7/maildropex.7.gz man/man7/maildropfilter.7.gz man/man7/maildropgdbm.7.gz man/man8/maildrop-deliverquota.8.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html %%PORTDOCS%%%%DOCSDIR%%/README %%DOVECOTAUTH%%%%PORTDOCS%%%%DOCSDIR%%/README.dovecotauth %%PORTDOCS%%%%DOCSDIR%%/README.html %%PORTDOCS%%%%DOCSDIR%%/README.imapkeywords.html %%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.html %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt %%PORTDOCS%%%%DOCSDIR%%/README.postfix %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.html %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt %%PORTDOCS%%%%DOCSDIR%%/UPGRADE %%PORTDOCS%%%%DOCSDIR%%/UPGRADE.html %%PORTDOCS%%%%DOCSDIR%%/maildrop-deliverquota.html %%PORTDOCS%%%%DOCSDIR%%/lockmail.html %%PORTDOCS%%%%DOCSDIR%%/mailbot.html %%PORTDOCS%%%%DOCSDIR%%/maildiracl.html %%PORTDOCS%%%%DOCSDIR%%/maildirkw.html %%PORTDOCS%%%%DOCSDIR%%/maildrop-maildirmake.html %%PORTDOCS%%%%DOCSDIR%%/maildirquota.html %%PORTDOCS%%%%DOCSDIR%%/maildrop.html %%PORTDOCS%%%%DOCSDIR%%/maildropex.html %%PORTDOCS%%%%DOCSDIR%%/maildropfilter.html %%PORTDOCS%%%%DOCSDIR%%/maildropgdbm.html %%PORTDOCS%%%%DOCSDIR%%/maildroptips.txt -%%PORTDOCS%%%%DOCSDIR%%/makedat.html %%PORTDOCS%%%%DOCSDIR%%/makemime.html %%PORTDOCS%%%%DOCSDIR%%/manpage.css %%PORTDOCS%%%%DOCSDIR%%/reformail.html %%PORTDOCS%%%%DOCSDIR%%/reformime.html %%PORTDOCS%%%%DOCSDIR%%/rfc2045.html %%PORTDOCS%%%%DOCSDIR%%/rfc822.html Index: head/mail/sqwebmail/Makefile =================================================================== --- head/mail/sqwebmail/Makefile (revision 385028) +++ head/mail/sqwebmail/Makefile (revision 385029) @@ -1,199 +1,209 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= sqwebmail -PORTVERSION= 5.8.1 +PORTVERSION= 5.8.2 CATEGORIES= mail www MASTER_SITES= SF/courier/webmail/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ - libunicode.so:${PORTSDIR}/devel/courier-unicode + libcourier-unicode.so:${PORTSDIR}/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 + --cache-file=${WRKDIR}/sqwebmail.cache \ + --with-mailuser=${MAILOWN} \ + --with-mailgroup=${MAILGRP} PLIST_SUB+= CGIBINDIR=${CGIBINDIR} \ CGIBINSUBDIR=${CGIBINSUBDIR} \ WEBDATADIR=${WEBDATADIR} \ - WEBDATASUBDIR=${WEBDATASUBDIR} + 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 -INSTALL_TARGET= install-strip install-configure - .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:${PORTSDIR}/textproc/aspell-ispell RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/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:${PORTSDIR}/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:${PORTSDIR}/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 385028) +++ head/mail/sqwebmail/distinfo (revision 385029) @@ -1,2 +1,2 @@ -SHA256 (sqwebmail-5.8.1.tar.bz2) = 490bd1f3aac5c99965c8d0e7f35814304eedd10db5a42976ad3ecc9dde15dd76 -SIZE (sqwebmail-5.8.1.tar.bz2) = 3512211 +SHA256 (sqwebmail-5.8.2.tar.bz2) = 5a0a722a8e09b2ab318c91e3a09888564826616d26635799c52b4c545dfde7d9 +SIZE (sqwebmail-5.8.2.tar.bz2) = 3514846 Index: head/mail/sqwebmail/pkg-plist =================================================================== --- head/mail/sqwebmail/pkg-plist (revision 385028) +++ head/mail/sqwebmail/pkg-plist (revision 385029) @@ -1,146 +1,142 @@ -@unexec if cmp %D/%%ETCDIR%%/ldapaddressbook %D/%%ETCDIR%%/ldapaddressbook.dist ; then rm -vf %D/%%ETCDIR%%/ldapaddressbook ; fi -%%ETCDIR%%/ldapaddressbook.dist -@exec [ -f %D/%%ETCDIR%%/ldapaddressbook ] || cp -v %D/%%ETCDIR%%/ldapaddressbook.dist %D/%%ETCDIR%%/ldapaddressbook -@unexec if cmp %D/%%ETCDIR%%/sqwebmaild %D/%%ETCDIR%%/sqwebmaild.dist ; then rm -vf %D/%%ETCDIR%%/sqwebmaild ; fi -%%ETCDIR%%/sqwebmaild.dist -@exec [ -f %D/%%ETCDIR%%/sqwebmaild ] || cp -v %D/%%ETCDIR%%/sqwebmaild.dist %D/%%ETCDIR%%/sqwebmaild +@sample %%ETCDIR%%/ldapaddressbook.sample +@sample %%ETCDIR%%/sqwebmaild.sample @unexec [ -f /var/sqwebmail/run/sqwebmail.pid ] && %D/etc/rc.d/sqwebmail-sqwebmaild stop || true libexec/sqwebmail/deliverquota libexec/sqwebmail/maildirmake libexec/sqwebmail/makemime libexec/sqwebmail/pcpd libexec/sqwebmail/reformime libexec/sqwebmail/sqwebmaild -libexec/sqwebmail/sqwebpasswd +@(%%MAILOWN%%,%%MAILGRP%%,2755) libexec/sqwebmail/sqwebpasswd libexec/sqwebmaild.rc man/man1/maildirmake.1.gz man/man8/deliverquota.8.gz %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl sbin/sharedindexinstall.sqwebmail sbin/sharedindexsplit.sqwebmail share/sqwebmail/cleancache.pl share/sqwebmail/html/en share/sqwebmail/html/en-us/CHARSET share/sqwebmail/html/en-us/ISPELLDICT share/sqwebmail/html/en-us/LANGUAGE share/sqwebmail/html/en-us/LANGUAGE_PREF share/sqwebmail/html/en-us/LOCALE share/sqwebmail/html/en-us/TIMEZONELIST share/sqwebmail/html/en-us/abooklist.html share/sqwebmail/html/en-us/acl.html share/sqwebmail/html/en-us/attachments.html share/sqwebmail/html/en-us/autoresponder.html share/sqwebmail/html/en-us/calendarlogin.inc.html share/sqwebmail/html/en-us/empty.html share/sqwebmail/html/en-us/eventacl.html share/sqwebmail/html/en-us/eventdaily.html share/sqwebmail/html/en-us/eventdelete.html share/sqwebmail/html/en-us/eventmonthly.html share/sqwebmail/html/en-us/eventnotifydelete.txt share/sqwebmail/html/en-us/eventnotifynew.txt share/sqwebmail/html/en-us/eventnotifysubject.txt share/sqwebmail/html/en-us/eventshow.html share/sqwebmail/html/en-us/eventweekly.html share/sqwebmail/html/en-us/expired.html share/sqwebmail/html/en-us/filter.html share/sqwebmail/html/en-us/folder.html share/sqwebmail/html/en-us/folders.html share/sqwebmail/html/en-us/gpg.html share/sqwebmail/html/en-us/gpgcreate.html share/sqwebmail/html/en-us/gpgerr.html share/sqwebmail/html/en-us/index.html share/sqwebmail/html/en-us/invalid.html share/sqwebmail/html/en-us/keyimport.html share/sqwebmail/html/en-us/ldaplist.html share/sqwebmail/html/en-us/ldapsearch.html share/sqwebmail/html/en-us/login.html share/sqwebmail/html/en-us/loginform.inc.html share/sqwebmail/html/en-us/navbar.inc.html share/sqwebmail/html/en-us/navbar2.inc.html share/sqwebmail/html/en-us/navbar3.inc.html share/sqwebmail/html/en-us/newevent.html share/sqwebmail/html/en-us/newmsg.html share/sqwebmail/html/en-us/preferences.html share/sqwebmail/html/en-us/print.html share/sqwebmail/html/en-us/printnocookie.html share/sqwebmail/html/en-us/printredirect.html share/sqwebmail/html/en-us/quickadd.html share/sqwebmail/html/en-us/readmsg.html share/sqwebmail/html/en-us/redirect.html share/sqwebmail/html/en-us/refreshfr.html share/sqwebmail/html/en-us/smileys.txt share/sqwebmail/html/en-us/spellchk.html share/sqwebmail/ldapsearch share/sqwebmail/sendit.sh share/sqwebmail/webgpg %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.logindomainlist.html %%PORTDOCS%%%%DOCSDIR%%/README.pam %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt %%PORTDOCS%%@dir %%DOCSDIR%% @dir etc/sqwebmail -%%CACHE%%@dir /var/sqwebmail/cache +%%CACHE%%@dir(%%CACHEOWN%%,,) %%CACHEDIR%% @dir /var/sqwebmail/calendar/public @dir /var/sqwebmail/calendar/private @dir /var/sqwebmail/calendar/localcache @dir /var/sqwebmail/calendar @dir /var/sqwebmail/run @dir /var/sqwebmail @dir share/sqwebmail/html/en-us @dir share/sqwebmail/html @dir share/sqwebmail @dir libexec/sqwebmail %%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail @dir %%CGIBINDIR%%/%%CGIBINSUBDIR%% @dir %%CGIBINDIR%% %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/calendar.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/cancel.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/eventadd.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/eventedit.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/first.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/folders.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/forward.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/forwardatt.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/fullheaders.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/key.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/last.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/left.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/left2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/logo.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/print.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/reply.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/replyall.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/replylist.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/right.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/right2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/save.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sep.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/signin.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-frowney.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-frowney2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-notsmiley.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-notsmiley2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-ohno.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-smiley.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-smiley2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-wink.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-wink2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sqwebmail.css %%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/wikifmt.html @dir %%WEBDATADIR%%/%%WEBDATASUBDIR%% @dir %%WEBDATADIR%% Index: head/net/courier-authlib-ldap/Makefile =================================================================== --- head/net/courier-authlib-ldap/Makefile (revision 385028) +++ head/net/courier-authlib-ldap/Makefile (revision 385029) @@ -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 385028) +++ head/security/courier-authlib/Makefile (revision 385029) @@ -1,196 +1,200 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= courier-authlib -PORTVERSION= 0.66.1 +PORTVERSION= 0.66.2 PORTREVISION?= 0 CATEGORIES?= security mail .if defined(PKGNAMESUFFIX) MASTER_SITES= SF/courier/authlib/${PORTVERSION} MASTER_SITE_SUBDIR= courier .else MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty .endif MAINTAINER= oliver@FreeBSD.org COMMENT?= Meta-port for the courier authentication library CONFLICTS= courier-0.45* .if !defined(PKGNAMESUFFIX) RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base NO_BUILD= yes PATCHDIR= /dev/null OPTIONS_DEFINE+= GDBM .include "${.CURDIR}/Makefile.opt" .else # !defined(PKGNAMESUFFIX) -LIB_DEPENDS+= libltdl.so:${PORTSDIR}/devel/libltdl +LIB_DEPENDS+= libltdl.so:${PORTSDIR}/devel/libltdl \ + libcourier-unicode.so:${PORTSDIR}/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:${PORTSDIR}/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:${PORTSDIR}/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:${PORTSDIR}/mail/vpopmail CONFIGURE_ARGS+=--with-authvchkpw .else CONFIGURE_ARGS+=--without-authvchkpw .endif .endif # !defined(PKGNAMESUFFIX) .include .if !defined(PKGNAMESUFFIX) .include "${.CURDIR}/Makefile.dep" do-install: #empty do-build: #empty .else # !defined(PKGNAMESUFFIX) .if ${AUTHMOD} == authbase .if defined(WITH_RCORDER) USE_RCORDER= courier-authdaemond .else USE_RC_SUBR= courier-authdaemond .endif 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|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} -f "${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 385028) +++ head/security/courier-authlib/distinfo (revision 385029) @@ -1,2 +1,2 @@ -SHA256 (courier-authlib-0.66.1.tar.bz2) = 8f89166f57c8e59f445fe0135da92b95f1c4417896d01eda5e2e94d8ff878fe8 -SIZE (courier-authlib-0.66.1.tar.bz2) = 2299965 +SHA256 (courier-authlib-0.66.2.tar.bz2) = ed104562b6bc6a2c6212d73b647f5526da68cf262e0c1d2c1ee478182b8f87a9 +SIZE (courier-authlib-0.66.2.tar.bz2) = 2081381 Index: head/security/courier-authlib/files/patch-liblock__locktest.c =================================================================== --- head/security/courier-authlib/files/patch-liblock__locktest.c (revision 385028) +++ head/security/courier-authlib/files/patch-liblock__locktest.c (nonexistent) @@ -1,81 +0,0 @@ ---- libs/liblock/locktest.c.orig Mon Dec 6 14:18:55 1999 -+++ libs/liblock/locktest.c Sun May 15 08:00:42 2005 -@@ -5,6 +5,7 @@ - - /* $Id */ - -+#include - #include "liblock.h" - #if USE_FCNTL - #include "lockfcntl.c" -@@ -20,11 +21,23 @@ - - int main() - { -+#define FILENAME "courier-authlib.locktest.XXXXX" - int fd[2]; - pid_t p; - int s; - int f; - -+ char *name; -+ const char *tmpdir; -+ if ((tmpdir = (char *)getenv("TMPDIR")) == NULL) -+ tmpdir = _PATH_TMP; -+ (void)asprintf(&name, "%s%s%s", tmpdir, -+ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME); -+ if (name == NULL) { -+ perror("get filename"); -+ exit(1); -+ } -+ - signal(SIGCHLD, SIG_DFL); - if (pipe(fd)) - { -@@ -32,6 +45,12 @@ - return (1); - } - -+ if ((f=mkstemp(name)) < 0) -+ { -+ perror("open"); -+ exit(1); -+ } -+ - if ((p=fork()) == (pid_t)-1) - { - perror("fork"); -@@ -46,7 +65,7 @@ - read(fd[0], &c, 1); - close(fd[0]); - -- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0) -+ if ((f=open(name, O_RDWR)) < 0) - { - perror("open"); - exit(1); -@@ -56,22 +75,18 @@ - if (ll_lockfd(f, ll_writelock, 0, 0)) - { - close(f); -+ unlink(name); - exit(0); - } - close(f); - exit(1); - } -- -- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0) -- { -- perror("open"); -- exit(1); -- } - - if (ll_lockfd(f, ll_writelock, 0, 0)) - { - perror("lock"); - close(f); -+ unlink(name); - exit(1); - } - close(fd[1]); Property changes on: head/security/courier-authlib/files/patch-liblock__locktest.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/security/courier-authlib/files/patch-Makefile.in =================================================================== --- head/security/courier-authlib/files/patch-Makefile.in (revision 385028) +++ head/security/courier-authlib/files/patch-Makefile.in (revision 385029) @@ -1,356 +1,340 @@ ---- Makefile.in.orig 2013-11-11 19:58:27.000000000 +0100 -+++ Makefile.in 2013-12-30 11:45:33.000000000 +0100 -@@ -85,11 +85,10 @@ +--- Makefile.in.orig 2015-04-25 14:07:07 UTC ++++ Makefile.in +@@ -85,11 +85,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 = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ -@@ -218,6 +217,12 @@ + 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 $@ +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 \ -@@ -334,6 +339,8 @@ +@@ -336,6 +342,8 @@ SOURCES = $(libauthcustom_la_SOURCES) $( $(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) \ -@@ -501,6 +508,7 @@ +@@ -503,6 +511,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ LIBAUTHSHADOW = @LIBAUTHSHADOW@ LIBAUTHSQLITE = @LIBAUTHSQLITE@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ +LIBAUTHVCHKPW = @LIBAUTHVCHKPW@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ LIBGDBM = @LIBGDBM@ -@@ -623,21 +631,27 @@ +@@ -625,21 +634,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/unicode libs/rfc822 libs/random128 libs/liblock liblog +-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/unicode libs/rfc822 libs/random128 ++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) sbin_SCRIPTS = authdaemond EXTRA_LTLIBRARIES = libauthuserdb.la \ libauthpam.la libauthpwd.la libauthshadow.la \ + libauthvchkpw.la \ libauthpgsql.la \ libauthldap.la \ libauthmysql.la \ -@@ -711,6 +725,13 @@ +@@ -713,6 +728,13 @@ libauthshadow_la_DEPENDENCIES = $(common 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 -@@ -790,8 +811,8 @@ +@@ -792,8 +814,8 @@ libcourierauthsaslclient_la_SOURCES = co 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 -@@ -832,7 +853,7 @@ +@@ -834,7 +856,7 @@ authmksock_LDADD = @NETLIBS@ man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.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 \ -@@ -989,6 +1010,9 @@ +@@ -993,6 +1015,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJ 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) -@@ -1258,6 +1282,8 @@ +@@ -1262,6 +1287,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@ -@@ -1275,6 +1301,7 @@ +@@ -1279,6 +1306,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthsqlite.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 $@ $< -@@ -1771,18 +1798,26 @@ +@@ -1782,18 +1810,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: -@@ -1862,14 +1897,20 @@ +@@ -1873,14 +1909,18 @@ uninstall-man: uninstall-man1 uninstall- uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS +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@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.sample -+@HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.sample @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc: @HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist -@@ -1888,9 +1929,9 @@ +@@ -1899,9 +1939,7 @@ authldaplib.lo: authldaplib.c authldaprc @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@ -chown @mailuser@ $(DESTDIR)@authldaprc@.sample -+@HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc@.sample @HAVE_LDAP_TRUE@uninstall-authldaprc: @HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist -@@ -1901,6 +1942,19 @@ +@@ -1912,6 +1950,18 @@ authldaplib.lo: authldaplib.c authldaprc @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 -@@ -1909,9 +1963,9 @@ +@@ -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@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.sample -+@HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.sample @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist -@@ -1930,9 +1984,9 @@ +@@ -1941,9 +1989,7 @@ authsqlitelib.lo: authsqlitelib.c authsq @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@ -chown @mailuser@ $(DESTDIR)@authsqliterc@.sample -+@HAVE_AUTHSQLITE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.sample @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc@.dist -@@ -1951,16 +2005,22 @@ +@@ -1962,16 +2008,20 @@ authpipelib.lo: authpipelib.c authpipeli 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@ $(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 -+@HAVE_BASE_TRUE@ -chown @mailuser@ $(DESTDIR)@authdaemonrc@.sample -+@HAVE_BASE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.sample -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 -@@ -2003,24 +2063,30 @@ +@@ -2014,24 +2064,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_BASE_TRUE@ -chown @mailuser@ $(DESTDIR)$(pkglibexecdir) -+@HAVE_BASE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir) +@HAVE_USERDB_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : +@HAVE_USERDB_TRUE@ chmod 755 $(DESTDIR)$(pkglibexecdir) -+@HAVE_USERDB_TRUE@ -chown @mailuser@ $(DESTDIR)$(pkglibexecdir) -+@HAVE_USERDB_TRUE@ -chgrp @mailgroup@ $(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@ -+@HAVE_BASE_TRUE@ -chown @mailuser@ $(DESTDIR)@authdaemonvar@ -+@HAVE_BASE_TRUE@ -chgrp @mailgroup@ $(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 \ -@@ -2033,9 +2099,10 @@ +@@ -2044,9 +2094,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 \ -@@ -2046,7 +2113,7 @@ +@@ -2057,7 +2108,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@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html - @HAVE_SGML_TRUE@ libs/docbook/sgml2html authpasswd.sgml authpasswd.html + @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 Index: head/security/courier-authlib/files/patch-configure =================================================================== --- head/security/courier-authlib/files/patch-configure (revision 385028) +++ head/security/courier-authlib/files/patch-configure (revision 385029) @@ -1,331 +1,340 @@ ---- configure.orig 2012-10-14 12:45:02.000000000 +0200 -+++ configure 2012-10-14 12:46:15.000000000 +0200 -@@ -622,6 +622,10 @@ +--- configure.orig 2015-04-25 14:07:07 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 -@@ -656,6 +660,9 @@ +@@ -676,6 +680,9 @@ LIBAUTHPGSQL PGSQL_LIBS PG_CONFIG authpgsqlrc +vpopmail_home +VPOPMAILLIBS +LIBAUTHVCHKPW LIBAUTHPWD LIBAUTHSHADOW SHADOWLIBS -@@ -1519,6 +1526,7 @@ +@@ -1546,6 +1553,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 -@@ -2755,7 +2763,7 @@ +@@ -2795,7 +2803,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; } -@@ -13532,8 +13540,12 @@ +@@ -13456,7 +13464,7 @@ LIBS="$saveLIBS" + + 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" -@@ -13991,6 +14003,20 @@ +@@ -14208,6 +14220,20 @@ 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= -@@ -14209,6 +14235,256 @@ +@@ -14426,6 +14452,256 @@ 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/files/patch-libs_liblock_locktest.c =================================================================== --- head/security/courier-authlib/files/patch-libs_liblock_locktest.c (nonexistent) +++ head/security/courier-authlib/files/patch-libs_liblock_locktest.c (revision 385029) @@ -0,0 +1,38 @@ +--- libs/liblock/locktest.c.orig 2014-07-13 13:58:08 UTC ++++ libs/liblock/locktest.c +@@ -3,6 +3,7 @@ + ** distribution information. + */ + ++#include + #include "liblock.h" + #if USE_FCNTL + #include "lockfcntl.c" +@@ -20,7 +21,7 @@ + + int main() + { +-#define FILENAME "courier-imap.locktest.XXXXXXXXXX" ++#define FILENAME "courier-authlib.locktest.XXXXXXXXXX" + int fd[2]; + pid_t p; + int s; +@@ -29,7 +30,7 @@ int f; + char *name; + const char *tmpdir; + if ((tmpdir = (char *)getenv("TMPDIR")) == NULL || !*tmpdir) +- tmpdir = "/tmp"; ++ tmpdir = _PATH_TMP; + + if ((name=malloc(strlen(tmpdir)+sizeof(FILENAME)+1)) == NULL) + { +@@ -37,7 +38,8 @@ int f; + exit(1); + } + +- (void)sprintf(name, "%s/%s", tmpdir, FILENAME); ++ (void)sprintf(name, "%s%s%s", tmpdir, ++ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME); + + signal(SIGCHLD, SIG_DFL); + if (pipe(fd)) Property changes on: head/security/courier-authlib/files/patch-libs_liblock_locktest.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/courier-authlib/pkg-descr =================================================================== --- head/security/courier-authlib/pkg-descr (revision 385028) +++ head/security/courier-authlib/pkg-descr (revision 385029) @@ -1,9 +1,9 @@ The Courier Authentication Library is a generic authentication API used for two purposes: 1. Read the name of a mail account. Determine the local account's home directory, and system userid and groupid. 2. Read an account name, and a password. If valid, determine the account's home directory, system userid, and groupid. -WWW: http://www.Courier-MTA.org/authlib/ +WWW: http://www.Courier-MTA.org/authlib/ Index: head/security/courier-authlib/pkg-plist-base =================================================================== --- head/security/courier-authlib/pkg-plist-base (revision 385028) +++ head/security/courier-authlib/pkg-plist-base (revision 385029) @@ -1,44 +1,44 @@ bin/courierauthconfig @sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authdaemonrc.sample include/courier_auth_config.h include/courierauth.h include/courierauthdebug.h include/courierauthsasl.h include/courierauthsaslclient.h include/courierauthstaticlist.h lib/courier-authlib/libcourierauth.so lib/courier-authlib/libcourierauthcommon.so lib/courier-authlib/libcourierauthsasl.so lib/courier-authlib/libcourierauthsaslclient.so lib/courier-authlib/libauthpam.so lib/courier-authlib/libauthpipe.so libexec/courier-authlib/authdaemond libexec/courier-authlib/authsystem.passwd man/man1/authtest.1.gz -man/man1/%%MAILOWN%%logger.1.gz +man/man1/courierlogger.1.gz man/man3/auth_enumerate.3.gz man/man3/auth_generic.3.gz man/man3/auth_getoption.3.gz man/man3/auth_getuserinfo.3.gz man/man3/auth_login.3.gz man/man3/auth_passwd.3.gz man/man3/auth_sasl.3.gz man/man3/auth_sasl_ex.3.gz man/man3/authlib.3.gz sbin/authdaemond sbin/authenumerate sbin/authtest sbin/courierlogger %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html %%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry(%%MAILOWN%%,%%MAILGRP%%,750) %%AUTHDAEMONVAR%% @dirrmtry etc/authlib @dirrm(%%MAILOWN%%,%%MAILGRP%%,755) libexec/courier-authlib @dirrm lib/courier-authlib Index: head/security/courier-authlib-base/Makefile =================================================================== --- head/security/courier-authlib-base/Makefile (revision 385028) +++ head/security/courier-authlib-base/Makefile (revision 385029) @@ -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"