diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index c09e4037c0f8..7a9f1c9482f2 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,210 +1,212 @@ PORTNAME= sqwebmail -PORTVERSION= 6.0.6 +PORTVERSION= 6.2.4 CATEGORIES= mail www MASTER_SITES= SF/courier/webmail/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs WWW= https://inter7.com/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 \ libcourier-unicode.so:devel/courier-unicode CFLAGS:= -I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//} CXXFLAGS:= -I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//} OPTIONS_DEFINE= CACHEDIR FAM GDBM GZIP HTTPS HTTPS_LOGIN ISPELL MIMETYPES SENTRENAME CHARSET DOCS OPTIONS_DEFAULT= CACHEDIR FAM GZIP SENTRENAME CACHEDIR_DESC= Cache logins FAM_DESC= Build in fam support for IDLE command GDBM_DESC= Use gdbm db instead of system bdb GZIP_DESC= Compress messages with gzip HTTPS_DESC= Generate https:// URLs for all accesses HTTPS_LOGIN_DESC= Generate https:// URLs only for login MIMETYPES_DESC= search for a mime.types file SENTRENAME_DESC= Periodic rename the Sent folder CHARSET_DESC= charsets FAM_USES= fam .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" CGIBINDIR?= www/cgi-bin-dist CGIBINSUBDIR?= sqwebmail WEBDATADIR?= www/data-dist WEBDATASUBDIR?= sqwebmail IMAGEURL?= ${WEBDATASUBDIR} RCDIR?= ${PREFIX}/etc/rc.d CACHEDIR?= /var/sqwebmail/cache CACHEOWNER?= bin MAILOWN?= courier MAILGRP?= courier # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr) # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m) # set WITH_AUTOPURGE to something other than 7 days # set WITH_MAXPURGE to something other than 90 days # # The following settings are in bytes: # set WITH_MAXMSGSIZE to max size of messages (including attachments) # set WITH_MAXARGSIZE to max size of a text message (excluding attachments) # set WITH_MAXFORMARGSIZE to max size of attachments # # End of user variables USES= compiler:c++11-lang gettext gmake iconv perl5 tar:bzip2 USE_RC_SUBR= sqwebmail-sqwebmaild GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ --localstatedir=/var/sqwebmail \ --sysconfdir=${PREFIX}/etc/sqwebmail \ --enable-imageurl=/${IMAGEURL} \ --with-locking-method=fcntl \ --with-libintl-prefix=${LOCALBASE} \ ${ICONV_CONFIGURE_ARG} \ --cache-file=${WRKDIR}/sqwebmail.cache \ --with-mailuser=${MAILOWN} \ --with-mailgroup=${MAILGRP} \ --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)|' \ ${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 fb81d7792c67..1f83e5e25456 100644 --- a/mail/sqwebmail/distinfo +++ b/mail/sqwebmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636795058 -SHA256 (sqwebmail-6.0.6.tar.bz2) = 7512d7ba70ddfd1781bfac5f6ca13b6a11fcfc9b2852d2c4f314428af10aa364 -SIZE (sqwebmail-6.0.6.tar.bz2) = 3705965 +TIMESTAMP = 1697149887 +SHA256 (sqwebmail-6.2.4.tar.bz2) = 0e9fe042413b64e81aea3abeea180648e7b0a71912ca37b0c7d30cb0d0299942 +SIZE (sqwebmail-6.2.4.tar.bz2) = 3748078 diff --git a/mail/sqwebmail/files/patch-Makefile.in b/mail/sqwebmail/files/patch-Makefile.in index e3b74ce274eb..18a54190064a 100644 --- a/mail/sqwebmail/files/patch-Makefile.in +++ b/mail/sqwebmail/files/patch-Makefile.in @@ -1,60 +1,34 @@ ---- Makefile.in.orig 2017-06-23 20:05:50.000000000 +0900 -+++ Makefile.in 2017-08-11 02:13:12.050582000 +0900 -@@ -395,18 +395,18 @@ - +--- Makefile.in.orig 2023-08-28 12:32:30 UTC ++++ Makefile.in +@@ -404,13 +404,13 @@ EXTRA_DIST = INSTALL.html README NEWS README.html READ + packaging/debian/sqwebmail-apache2.lintian-overrides scriptbindir = $(sbindir) scriptbin_SCRIPTS = \ - sharedindexinstall sharedindexsplit + sharedindexinstall.sqwebmail sharedindexsplit.sqwebmail pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@ libexec_SCRIPTS = sqwebmaild.rc CLEANFILES = $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA) \ - sharedindexinstall sharedindexsplit + sharedindexinstall.sqwebmail sharedindexsplit.sqwebmail - pkgman8dir = @mandir@/man8 --pkgman8_DATA = deliverquota.8 -+pkgman8_DATA = deliverquota.sqwebmail.8 - pkgman1dir = @mandir@/man1 --pkgman1_DATA = maildirmake.1 -+pkgman1_DATA = maildirmake.sqwebmail.1 - WWW = $$HOME/www/www.courier-mta.org + WWW = $$HOME/www/hostrocket/courier-mta.org @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index.html - all: config.h -@@ -1091,14 +1091,14 @@ - maildirmake: libs/maildir/maildirmake - cp libs/maildir/maildirmake . - --maildirmake.1: libs/maildir/maildirmake.1 -- cp libs/maildir/maildirmake.1 . -+maildirmake.sqwebmail.1: libs/maildir/maildirmake.1 -+ cp libs/maildir/maildirmake.1 maildirmake.sqwebmail.1 - - deliverquota: libs/maildir/deliverquota - cp libs/maildir/deliverquota . - --deliverquota.8: libs/maildir/deliverquota.8 -- cp libs/maildir/deliverquota.8 . -+deliverquota.sqwebmail.8: libs/maildir/deliverquota.8 -+ cp libs/maildir/deliverquota.8 deliverquota.sqwebmail.8 - - reformime: libs/rfc2045/reformime - cp libs/rfc2045/reformime . -@@ -1106,11 +1106,11 @@ +@@ -1068,11 +1068,11 @@ reformime: libs/rfc2045/reformime makemime: libs/rfc2045/makemime cp libs/rfc2045/makemime . -sharedindexinstall: libs/maildir/sharedindexinstall - cp -f libs/maildir/sharedindexinstall . +sharedindexinstall.sqwebmail: libs/maildir/sharedindexinstall + cp -f libs/maildir/sharedindexinstall ./sharedindexinstall.sqwebmail -sharedindexsplit: libs/maildir/sharedindexsplit - cp -f libs/maildir/sharedindexsplit . +sharedindexsplit.sqwebmail: libs/maildir/sharedindexsplit + cp -f libs/maildir/sharedindexsplit ./sharedindexsplit.sqwebmail # # Install SqWebMail setuid to root, if we're running as root diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist index 7f6dc03f0920..f40e720313e9 100644 --- a/mail/sqwebmail/pkg-plist +++ b/mail/sqwebmail/pkg-plist @@ -1,141 +1,139 @@ @sample %%ETCDIR%%/ldapaddressbook.sample @sample %%ETCDIR%%/sqwebmaild.sample libexec/sqwebmail/deliverquota libexec/sqwebmail/maildirmake libexec/sqwebmail/makemime libexec/sqwebmail/pcpd libexec/sqwebmail/reformime libexec/sqwebmail/sqwebmaild @(%%MAILOWN%%,%%MAILGRP%%,2755) libexec/sqwebmail/sqwebpasswd libexec/sqwebmaild.rc -man/man1/maildirmake.sqwebmail.1.gz -man/man8/deliverquota.sqwebmail.8.gz %%CACHE%%@preunexec %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(%%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%%