diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index f9bbfe3c7ebd..f346d599e893 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,213 +1,206 @@ PORTNAME= sqwebmail -PORTVERSION= 6.3.0 +PORTVERSION= 6.3.1 CATEGORIES= mail www MASTER_SITES= SF/courier/webmail/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs WWW= https://www.courier-mta.org/sqwebmail/ LICENSE= GPLv3 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 \ +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libcourier-unicode.so:devel/courier-unicode \ libidn2.so:dns/libidn2 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_LIB_DEPENDS= libfam.so.0:devel/gamin .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= compiler:c++17-lang gettext gmake iconv perl5 tar:bzip2 pkgconfig 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} \ --with-notice=unicode 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)|' \ + @${REINPLACE_CMD} -e '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 diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo index 046a1b9b4299..fc691a07e429 100644 --- a/mail/sqwebmail/distinfo +++ b/mail/sqwebmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760884299 -SHA256 (sqwebmail-6.3.0.tar.bz2) = e6548e4c974024f02b629d8a5090af3c7000faf2d52b28b87b11d48ae3a61be3 -SIZE (sqwebmail-6.3.0.tar.bz2) = 4087972 +TIMESTAMP = 1776186417 +SHA256 (sqwebmail-6.3.1.tar.bz2) = ee7b1febe8ab10cffcb3314ad592035013d692316d79b7b7d6ac6954b0a0e331 +SIZE (sqwebmail-6.3.1.tar.bz2) = 4076694 diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h b/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h deleted file mode 100644 index 36c6fd96cfb4..000000000000 --- a/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/rfc2045/rfc2045.h.orig 2025-10-06 09:00:04 UTC -+++ libs/rfc2045/rfc2045.h -@@ -3224,7 +3224,7 @@ void rfc822::mime_decoder::decode( - - if (decode_header) - { -- typename rfc2045::entity::line_iter::headers< -+ typename rfc2045::entity::line_iter::template headers< - src_type> parser{e, src }; - - parser.name_lc=header_name_lc; diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C b/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C deleted file mode 100644 index 5d1494f61819..000000000000 --- a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/rfc2045/testsuitecpp.C.orig 2025-10-04 09:00:12 UTC -+++ libs/rfc2045/testsuitecpp.C -@@ -19,7 +19,7 @@ void testrfc2045line_iter_testset(int &testnum, test_t - auto b=s.begin(); - auto e=s.end(); - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::string_view::iterator, - std::string_view::iterator - > diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C b/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C deleted file mode 100644 index bd49c3117802..000000000000 --- a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C +++ /dev/null @@ -1,29 +0,0 @@ ---- libs/rfc2045/testsuitecpp2.C.orig 2025-09-10 09:00:12 UTC -+++ libs/rfc2045/testsuitecpp2.C -@@ -217,7 +217,7 @@ void test3() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e}; -@@ -310,7 +310,7 @@ void test4() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e}; -@@ -488,7 +488,7 @@ void test5() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e};