Index: head/mail/dbmail/Makefile =================================================================== --- head/mail/dbmail/Makefile (revision 544341) +++ head/mail/dbmail/Makefile (revision 544342) @@ -1,76 +1,75 @@ # Created by: Clement Laforet # $FreeBSD$ PORTNAME= dbmail -PORTVERSION= 3.2.4 +PORTVERSION= 3.2.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= mail MAINTAINER= bofh@FreeBSD.org COMMENT= SQL database-based mail system (POP3 and IMAP) LICENSE= GPLv2 BROKEN_aarch64= Fails to link: missing sbrk LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ libzdb.so:databases/libzdb \ libmhash.so:security/mhash \ libevent.so:devel/libevent BUILD_DEPENDS= asciidoc:textproc/asciidoc \ xmlto:textproc/xmlto \ docbook-sgml>0:textproc/docbook-sgml USES= autoreconf gmake gnome libtool localbase pkgconfig shebangfix ssl USE_GITHUB= yes USE_GNOME= glib20 USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved CONFLICTS= dbmail22-[0-9]* GH_ACCOUNT= dbmail OPTIONS_DEFINE= DOCS LDAP SIEVE OPTIONS_DEFAULT= SIEVE OPTIONS_SUB= yes SIEVE_DESC= Sieve mail sorting language support INSTALL_TARGET= install-strip GNU_CONFIGURE= yes SHEBANG_FILES= man/fixsp.pl CONFIGURE_ARGS+= --with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc --enable-manpages MAKE_ARGS+= mandir=${MANPREFIX}/man DOCS= AUTHORS CHANGELOG.md INSTALL README THANKS UPGRADING SIEVE_CONFIGURE_WITH= sieve SIEVE_LIB_DEPENDS= libsieve.so:mail/libsieve LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LDAP_USES= gettext-runtime DBMAIL_USER?= mailnull DBMAIL_GROUP?= mail PIDDIR?= /var/run/dbmail PLIST_SUB+= DBMAIL_USER="${DBMAIL_USER}" \ DBMAIL_GROUP="${DBMAIL_GROUP}" \ PIDDIR="${PIDDIR}" post-install: ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf.sample @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/sql && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}${PIDDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Index: head/mail/dbmail/distinfo =================================================================== --- head/mail/dbmail/distinfo (revision 544341) +++ head/mail/dbmail/distinfo (revision 544342) @@ -1,3 +1,3 @@ -TIMESTAMP = 1591622979 -SHA256 (dbmail-dbmail-v3.2.4_GH0.tar.gz) = 33c5d00f7a2d0a30ac90a220f9942c040fb4c8769a5940392294a874b1f9d549 -SIZE (dbmail-dbmail-v3.2.4_GH0.tar.gz) = 2461068 +TIMESTAMP = 1596742176 +SHA256 (dbmail-dbmail-v3.2.5_GH0.tar.gz) = 54cea77c0be8098c62035adf46ba7d951ab8e121374f916c70498161884115f0 +SIZE (dbmail-dbmail-v3.2.5_GH0.tar.gz) = 2463966 Index: head/mail/dbmail/files/patch-src_dm__imapsession.c =================================================================== --- head/mail/dbmail/files/patch-src_dm__imapsession.c (revision 544341) +++ head/mail/dbmail/files/patch-src_dm__imapsession.c (nonexistent) @@ -1,16 +0,0 @@ ---- src/dm_imapsession.c.orig 2020-07-23 04:06:59 UTC -+++ src/dm_imapsession.c -@@ -804,9 +804,10 @@ static void _fetch_headers(ImapSession *self, body_fet - "m.mailbox_idnr = %" PRIu64 " " - "AND m.message_idnr %s " - "AND status < %d " -- //"AND n.headername %s IN ('%s') " //old, from the sql point of view is slow -- "having seq %s %d " //patch Cosmin Cioranu, removing the above conditions needs a restriction, patched added -- "ORDER BY message_idnr, seq", -+ //"AND n.headername %s IN ('%s') " //old, from the sql point of view is slow, CC 2020 -+ "GROUP By m.message_idnr, n.headername, v.headervalue " -+ "having seq %s %d " -+ "ORDER BY m.message_idnr, seq", - not?"":fieldorder->str, - DBPFX, DBPFX, DBPFX, DBPFX, - self->mailbox->id, p_string_str(range), Property changes on: head/mail/dbmail/files/patch-src_dm__imapsession.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/dbmail/files/patch-src_dm__misc.c =================================================================== --- head/mail/dbmail/files/patch-src_dm__misc.c (revision 544341) +++ head/mail/dbmail/files/patch-src_dm__misc.c (nonexistent) @@ -1,21 +0,0 @@ ---- src/dm_misc.c.orig 2020-06-29 22:53:45 UTC -+++ src/dm_misc.c -@@ -131,6 +131,10 @@ int drop_privileges(char *newuser, char *newgroup) - - int get_opened_fd_count(void) - { -+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__SUNPRO_C) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -+ // BSD like systems don't use proc -+ return 0; -+#else - DIR* dir = NULL; - struct dirent* entry = NULL; - char buf[32]; -@@ -147,6 +151,7 @@ int get_opened_fd_count(void) - closedir(dir); - - return fd_count - 2; /* exclude '.' and '..' entries */ -+#endif - } - - void create_unique_id(char *target, uint64_t message_idnr) Property changes on: head/mail/dbmail/files/patch-src_dm__misc.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/dbmail/pkg-plist =================================================================== --- head/mail/dbmail/pkg-plist (revision 544341) +++ head/mail/dbmail/pkg-plist (revision 544342) @@ -1,102 +1,105 @@ @sample etc/dbmail.conf.sample %%LDAP%%lib/dbmail/libauth_ldap.so %%LDAP%%lib/dbmail/libauth_ldap.so.0 %%LDAP%%lib/dbmail/libauth_ldap.so.0.0.0 lib/dbmail/libauth_sql.so lib/dbmail/libauth_sql.so.0 lib/dbmail/libauth_sql.so.0.0.0 lib/dbmail/libdbmail.so lib/dbmail/libdbmail.so.0 lib/dbmail/libdbmail.so.0.0.0 %%SIEVE%%lib/dbmail/libsort_sieve.so %%SIEVE%%lib/dbmail/libsort_sieve.so.0 %%SIEVE%%lib/dbmail/libsort_sieve.so.0.0.0 man/man1/dbmail-deliver.1.gz man/man1/dbmail.1.gz man/man5/dbmail.conf.5.gz man/man8/dbmail-export.8.gz man/man8/dbmail-httpd.8.gz man/man8/dbmail-imapd.8.gz man/man8/dbmail-lmtpd.8.gz man/man8/dbmail-pop3d.8.gz man/man8/dbmail-sievecmd.8.gz man/man8/dbmail-timsieved.8.gz man/man8/dbmail-users.8.gz man/man8/dbmail-util.8.gz sbin/dbmail-deliver sbin/dbmail-export sbin/dbmail-httpd sbin/dbmail-imapd sbin/dbmail-lmtpd sbin/dbmail-pop3d sbin/dbmail-users sbin/dbmail-util %%SIEVE%%sbin/dbmail-sievecmd %%SIEVE%%sbin/dbmail-timsieved %%DATADIR%%/dbmail.schema %%DATADIR%%/mysql/2_1_7-2_2_0.mysql %%DATADIR%%/mysql/2_2-3_0.mysql %%DATADIR%%/mysql/2_2_5-2_3_0.mysql %%DATADIR%%/mysql/2_3_0-2_3_2.mysql %%DATADIR%%/mysql/2_3_4-2_3_5.mysql %%DATADIR%%/mysql/2_3_5-2_3_6.mysql %%DATADIR%%/mysql/2_3_6-3_0_0.mysql %%DATADIR%%/mysql/3_0_2-3_1_0.mysql %%DATADIR%%/mysql/create_tables.mysql %%DATADIR%%/mysql/fix_foreign_keys.mysql %%DATADIR%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql %%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql %%DATADIR%%/mysql/update_headervalue_01.mysql %%DATADIR%%/mysql/upgrades/32001.mysql %%DATADIR%%/mysql/upgrades/32002.mysql %%DATADIR%%/mysql/upgrades/32003.mysql %%DATADIR%%/mysql/upgrades/32004.mysql +%%DATADIR%%/mysql/upgrades/32005.mysql %%DATADIR%%/oracle/dbmail_grant.sql %%DATADIR%%/oracle/dbmail_schema.sql %%DATADIR%%/oracle/dbmail_ts.sql %%DATADIR%%/postgresql/2_1_7-2_2_0.pgsql %%DATADIR%%/postgresql/2_2-3_0.pgsql %%DATADIR%%/postgresql/2_2_5-2_3_0.pgsql %%DATADIR%%/postgresql/2_3_4-2_3_5.pgsql %%DATADIR%%/postgresql/2_3_5-2_3_6.pgsql %%DATADIR%%/postgresql/2_3_6-3_0_0.pgsql %%DATADIR%%/postgresql/3_0_2-3_1_0.psql %%DATADIR%%/postgresql/create_tables.pgsql %%DATADIR%%/postgresql/migrate_from_1.x_to_2.0.pgsql %%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql %%DATADIR%%/postgresql/upgrades/32001.psql %%DATADIR%%/postgresql/upgrades/32002.psql %%DATADIR%%/postgresql/upgrades/32003.psql %%DATADIR%%/postgresql/upgrades/32004.psql +%%DATADIR%%/postgresql/upgrades/32005.psql %%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite %%DATADIR%%/sqlite/2_2-3_0.sqlite %%DATADIR%%/sqlite/2_2_5-2_3_0.sqlite %%DATADIR%%/sqlite/2_3_4-2_3_5.sqlite %%DATADIR%%/sqlite/2_3_5-2_3_6.sqlite %%DATADIR%%/sqlite/2_3_6-3_0_0.sqlite %%DATADIR%%/sqlite/3_0_2-3_1_0.sqlite %%DATADIR%%/sqlite/create_tables.sqlite %%DATADIR%%/sqlite/trigger.tmpl.sql %%DATADIR%%/sqlite/upgrades/32001.sqlite %%DATADIR%%/sqlite/upgrades/32002.sqlite %%DATADIR%%/sqlite/upgrades/32003.sqlite %%DATADIR%%/sqlite/upgrades/32004.sqlite +%%DATADIR%%/sqlite/upgrades/32005.sqlite %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.aliases %%PORTDOCS%%%%DOCSDIR%%/README.exim %%PORTDOCS%%%%DOCSDIR%%/README.filters %%PORTDOCS%%%%DOCSDIR%%/README.http %%PORTDOCS%%%%DOCSDIR%%/README.ldap %%PORTDOCS%%%%DOCSDIR%%/README.postfix %%PORTDOCS%%%%DOCSDIR%%/README.qmail %%PORTDOCS%%%%DOCSDIR%%/README.sieve %%PORTDOCS%%%%DOCSDIR%%/README.smtp %%PORTDOCS%%%%DOCSDIR%%/README.security-password %%PORTDOCS%%%%DOCSDIR%%/README.solaris %%PORTDOCS%%%%DOCSDIR%%/README.usermap %%PORTDOCS%%%%DOCSDIR%%/THANKS %%PORTDOCS%%%%DOCSDIR%%/UPGRADING @dir(%%DBMAIL_USER%%,%%DBMAIL_GROUP%%,) %%PIDDIR%%