Date: Sat, 11 Jan 2025 14:55:46 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5d39586a1a2f - main - mail/dbmail: Update version 3.4.1=>3.5 Message-ID: <202501111455.50BEtkMT036151@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d39586a1a2f4abaefa6562b3dfa03e1e34d4716 commit 5d39586a1a2f4abaefa6562b3dfa03e1e34d4716 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2025-01-11 13:12:47 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2025-01-11 14:55:25 +0000 mail/dbmail: Update version 3.4.1=>3.5 Changelog: https://github.com/dbmail/dbmail/releases/tag/v3.5 --- mail/dbmail/Makefile | 18 ++++++------------ mail/dbmail/distinfo | 6 +++--- mail/dbmail/files/patch-acinclude.m4 | 4 ++-- mail/dbmail/files/patch-src_mpool_mpool.c | 8 ++++---- mail/dbmail/pkg-plist | 10 +++++----- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index 01c19bcfb489..5edabeed6513 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -1,7 +1,6 @@ PORTNAME= dbmail -PORTVERSION= 3.4.1 DISTVERSIONPREFIX= v -PORTREVISION= 4 +DISTVERSION= 3.5 CATEGORIES= mail MAINTAINER= bofh@FreeBSD.org @@ -13,7 +12,8 @@ LICENSE= GPLv2 BUILD_DEPENDS= asciidoc:textproc/asciidoc \ docbook-sgml>0:textproc/docbook-sgml \ xmlto:textproc/xmlto -LIB_DEPENDS= libevent.so:devel/libevent \ +LIB_DEPENDS= libcurl.so:ftp/curl \ + libevent.so:devel/libevent \ libgmime-3.0.so:mail/gmime30 \ libmhash.so:security/mhash \ libzdb.so:databases/libzdb @@ -24,7 +24,6 @@ USE_GITHUB= yes USE_GNOME= glib20 USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved - SHEBANG_FILES= man/fixsp.pl GNU_CONFIGURE= yes @@ -32,7 +31,6 @@ CONFIGURE_ARGS+= --enable-manpages \ --sysconfdir=${LOCALBASE}/etc \ --with-zdb=${LOCALBASE} -MAKE_ARGS+= mandir=${PREFIX}/share/man INSTALL_TARGET= install-strip PLIST_SUB+= DBMAIL_GROUP="${DBMAIL_GROUP}" \ @@ -42,10 +40,10 @@ PLIST_SUB+= DBMAIL_GROUP="${DBMAIL_GROUP}" \ OPTIONS_DEFINE= DOCS LDAP SIEVE OPTIONS_DEFAULT= SIEVE OPTIONS_SUB= yes + SIEVE_DESC= Sieve mail sorting language support DOCS= AUTHORS CHANGELOG.md INSTALL README THANKS UPGRADING - LDAP_USES= gettext-runtime ldap LDAP_CONFIGURE_WITH= ldap SIEVE_LIB_DEPENDS= libsieve.so:mail/libsieve @@ -55,12 +53,6 @@ DBMAIL_USER?= mailnull DBMAIL_GROUP?= mail PIDDIR?= /var/run/dbmail -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD -CFLAGS+= -Wno-error=incompatible-function-pointer-types -.endif - post-patch: @${REINPLACE_CMD} -e '/dbmail-sieved\.8 /d' \ ${WRKSRC}/man/Makefile.am \ @@ -72,6 +64,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/sql && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}${PIDDIR} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo index 6e2848a95435..938e24030f9a 100644 --- a/mail/dbmail/distinfo +++ b/mail/dbmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697969396 -SHA256 (dbmail-dbmail-v3.4.1_GH0.tar.gz) = eb11ec7c1a09b206a6b1816f18bb53aa41600a8de6e169ab61effa856a621e4e -SIZE (dbmail-dbmail-v3.4.1_GH0.tar.gz) = 2531604 +TIMESTAMP = 1736600585 +SHA256 (dbmail-dbmail-v3.5_GH0.tar.gz) = d7bc133536453f6be573533b6468eb1e6043e69737e26d715cd6b04c99626213 +SIZE (dbmail-dbmail-v3.5_GH0.tar.gz) = 2538259 diff --git a/mail/dbmail/files/patch-acinclude.m4 b/mail/dbmail/files/patch-acinclude.m4 index e8584f6c9264..8130b502937f 100644 --- a/mail/dbmail/files/patch-acinclude.m4 +++ b/mail/dbmail/files/patch-acinclude.m4 @@ -1,4 +1,4 @@ ---- acinclude.m4.orig 2022-10-15 15:02:38 UTC +--- acinclude.m4.orig 2025-01-09 16:25:33 UTC +++ acinclude.m4 @@ -43,7 +43,7 @@ AC_DEFINE_UNQUOTED([DM_VERSION], "$PACKAGE_VERSION", [ AC_DEFINE_UNQUOTED([DM_PWD], "$ac_pwd", [Build directory]) @@ -165,7 +165,7 @@ ) LIBS="$SOCKETLIB $save_LIBS" AC_CHECK_FUNCS(dn_expand dns_lookup) -@@ -592,19 +592,19 @@ AC_DEFUN([DM_UPGRADE_STEPS], [dnl +@@ -611,19 +611,19 @@ AC_DEFUN([DM_UPGRADE_STEPS], [dnl PGSQL_32004=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/' sql/postgresql/upgrades/32004.psql` MYSQL_32004=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/' sql/mysql/upgrades/32004.mysql` SQLITE_32004=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/' sql/sqlite/upgrades/32004.sqlite` diff --git a/mail/dbmail/files/patch-src_mpool_mpool.c b/mail/dbmail/files/patch-src_mpool_mpool.c index 281c65aab0ab..4dfca012db3a 100644 --- a/mail/dbmail/files/patch-src_mpool_mpool.c +++ b/mail/dbmail/files/patch-src_mpool_mpool.c @@ -1,6 +1,6 @@ ---- src/mpool/mpool.c.orig +--- src/mpool/mpool.c.orig 2023-10-21 13:00:24 UTC +++ src/mpool/mpool.c -@@ -241,6 +241,7 @@ +@@ -241,6 +241,7 @@ static void *alloc_pages(mpool_t *mp_p, const unsigned (void)printf("allocating %u pages or %lu bytes\n", page_n, size); #endif @@ -8,7 +8,7 @@ if (BIT_IS_SET(mp_p->mp_flags, MPOOL_FLAG_USE_SBRK)) { mem = sbrk(size); if (mem == (void *)-1) { -@@ -263,7 +264,9 @@ +@@ -263,7 +264,9 @@ static void *alloc_pages(mpool_t *mp_p, const unsigned mem = (char *)mem + fill; } } @@ -19,7 +19,7 @@ state = MAP_PRIVATE; #ifdef MAP_FILE state |= MAP_FILE; -@@ -937,12 +940,15 @@ +@@ -937,12 +940,15 @@ mpool_t *mpool_open(const unsigned int flags, const un } } diff --git a/mail/dbmail/pkg-plist b/mail/dbmail/pkg-plist index b0bc36b4ba70..081f99c650de 100644 --- a/mail/dbmail/pkg-plist +++ b/mail/dbmail/pkg-plist @@ -20,7 +20,6 @@ share/man/man8/dbmail-imapd.8.gz share/man/man8/dbmail-lmtpd.8.gz share/man/man8/dbmail-pop3d.8.gz share/man/man8/dbmail-sievecmd.8.gz -share/man/man8/dbmail-timsieved.8.gz share/man/man8/dbmail-users.8.gz share/man/man8/dbmail-util.8.gz sbin/dbmail-deliver @@ -33,7 +32,6 @@ sbin/dbmail-users sbin/dbmail-util %%SIEVE%%sbin/dbmail-sievecmd %%SIEVE%%sbin/dbmail-sieved -%%SIEVE%%sbin/dbmail-timsieved %%DATADIR%%/dbmail.schema %%DATADIR%%/mysql/2_1_7-2_2_0.mysql %%DATADIR%%/mysql/2_2-3_0.mysql @@ -54,7 +52,8 @@ sbin/dbmail-util %%DATADIR%%/mysql/upgrades/32004.mysql %%DATADIR%%/mysql/upgrades/32005.mysql %%DATADIR%%/mysql/upgrades/32006.mysql -%%DATADIR%%/mysql/upgrades/upgrade.mysql +%%DATADIR%%/mysql/upgrades/35001.mysql +%%DATADIR%%/mysql/upgrades/create_tables.mysql %%DATADIR%%/oracle/dbmail_grant.sql %%DATADIR%%/oracle/dbmail_schema.sql %%DATADIR%%/oracle/dbmail_ts.sql @@ -74,7 +73,8 @@ sbin/dbmail-util %%DATADIR%%/postgresql/upgrades/32004.psql %%DATADIR%%/postgresql/upgrades/32005.psql %%DATADIR%%/postgresql/upgrades/32006.psql -%%DATADIR%%/postgresql/upgrades/upgrade.psql +%%DATADIR%%/postgresql/upgrades/35001.psql +%%DATADIR%%/postgresql/upgrades/create_tables.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 @@ -90,7 +90,7 @@ sbin/dbmail-util %%DATADIR%%/sqlite/upgrades/32004.sqlite %%DATADIR%%/sqlite/upgrades/32005.sqlite %%DATADIR%%/sqlite/upgrades/32006.sqlite -%%DATADIR%%/sqlite/upgrades/upgrade.sqlite +%%DATADIR%%/sqlite/upgrades/35001.sqlite %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501111455.50BEtkMT036151>