Date: Wed, 06 May 2026 23:18:42 +0000 From: Mark Felder <feld@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 17c2ef8a8b98 - main - mail/archiveopteryx: Update to latest git Message-ID: <69fbcc52.39dfe.62f921d9@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by feld: URL: https://cgit.FreeBSD.org/ports/commit/?id=17c2ef8a8b98d6c7b0e26c968b99d2bf6a3732c8 commit 17c2ef8a8b98d6c7b0e26c968b99d2bf6a3732c8 Author: Mark Felder <feld@FreeBSD.org> AuthorDate: 2026-05-06 23:14:38 +0000 Commit: Mark Felder <feld@FreeBSD.org> CommitDate: 2026-05-06 23:18:37 +0000 mail/archiveopteryx: Update to latest git archiveopteryx has not received an official release in many years and many fixes have been accumulating. I have traditionally published the git version under the mail/archiveopteryhx-devel port, but many improvements have happened that aox users should be getting by default. I'm working with upstream to get a new release finally made. While here, correct the LICENSE which is actually PostgreSQL, not MIT. --- mail/archiveopteryx/Makefile | 30 +++++++++++--------- mail/archiveopteryx/distinfo | 5 ++-- mail/archiveopteryx/files/patch-Jamrules | 11 -------- mail/archiveopteryx/files/patch-Jamsettings | 2 +- mail/archiveopteryx/files/patch-core__md5.cpp | 33 ---------------------- mail/archiveopteryx/files/patch-db__postgres.cpp | 11 -------- .../files/patch-server_tlsthread.cpp | 11 -------- 7 files changed, 20 insertions(+), 83 deletions(-) diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile index d32530f94b23..9007ea893f96 100644 --- a/mail/archiveopteryx/Makefile +++ b/mail/archiveopteryx/Makefile @@ -1,23 +1,27 @@ PORTNAME= archiveopteryx -PORTVERSION= 3.2.0 -PORTREVISION= 10 +PORTVERSION= 3.2.0.20260429 +PORTREVISION= 0 CATEGORIES= mail -MASTER_SITES= http://archiveopteryx.org/download/ MAINTAINER= feld@FreeBSD.org COMMENT= Advanced PostgreSQL-based IMAP/POP server WWW= https://www.archiveopteryx.org/ -LICENSE= MIT +LICENSE= PostgreSQL +LICENSE_FILE= doc/readme/license.txt -BUILD_DEPENDS= jam:devel/jam +BUILD_DEPENDS= jam:devel/jam \ + idnkit2>0:dns/idnkit2 -USES= compiler perl5 ssl tar:bzip2 -USE_PERL5= build +USE_GITHUB= yes +GH_ACCOUNT= aox +GH_PROJECT= aox +GH_TAGNAME= 1f9a987 -CONFLICTS_INSTALL= archiveopteryx-devel # bin/aox bin/aoxdeliver bin/aoxexport bin/aoximport +PORTDOCS= COPYING README -PORTDOCS= COPYING README bsd.txt +USES= compiler perl5 ssl +USE_PERL5= build SUB_FILES= pkg-message @@ -29,7 +33,6 @@ PLIST_SUB+= USERS="${USERS}" PLIST_SUB+= GROUPS="${GROUPS}" JAM?= ${LOCALBASE}/bin/jam -JAMARG+= -dx OPTIONS_DEFINE= DOCS @@ -50,10 +53,9 @@ post-patch: ${WRKSRC}/Jamsettings ${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \ ${WRKSRC}/server/Jamfile -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} - @${REINPLACE_CMD} -e 's|-Werror|-Werror -DOPENSSL_API_COMPAT=0x10100000L|g' \ - ${WRKSRC}/Jamsettings -.endif + # copy some PORTDOCS to WRKSRC like in a normal release + ${CP} ${WRKSRC}/doc/readme/COPYING ${WRKSRC}/ + ${CP} ${WRKSRC}/doc/readme/README ${WRKSRC}/ do-build: @cd ${WRKSRC} && ${JAM} ${JAMARG} diff --git a/mail/archiveopteryx/distinfo b/mail/archiveopteryx/distinfo index f1da1927974d..5d56bc12ef22 100644 --- a/mail/archiveopteryx/distinfo +++ b/mail/archiveopteryx/distinfo @@ -1,2 +1,3 @@ -SHA256 (archiveopteryx-3.2.0.tar.bz2) = 1d57ea42190bf252bf5a2109b1120f58333ea329217b6fb1497059141b7a1f44 -SIZE (archiveopteryx-3.2.0.tar.bz2) = 1322679 +TIMESTAMP = 1778104806 +SHA256 (aox-aox-3.2.0.20260429-1f9a987_GH0.tar.gz) = 62d68680415b0e936e1263ca7f3005a8b6537260679041331e41bc6880ca0480 +SIZE (aox-aox-3.2.0.20260429-1f9a987_GH0.tar.gz) = 2558754 diff --git a/mail/archiveopteryx/files/patch-Jamrules b/mail/archiveopteryx/files/patch-Jamrules deleted file mode 100644 index 2131e76749c3..000000000000 --- a/mail/archiveopteryx/files/patch-Jamrules +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Jamrules.orig 2014-03-06 13:45:47.495401383 -0600 -+++ ./Jamrules 2014-03-06 13:46:02.417400626 -0600 -@@ -35,7 +35,7 @@ - } - else { - C++ = g++ ; -- C++FLAGS += -W -Wall -Wno-unused-result ; -+ C++FLAGS += -W -Wall ; - BUILD = build/gcc ; - if $(OPTIM) { - BUILD = build/gcc$(OPTIM) ; diff --git a/mail/archiveopteryx/files/patch-Jamsettings b/mail/archiveopteryx/files/patch-Jamsettings index a0dee81024fb..0e678aec17e9 100644 --- a/mail/archiveopteryx/files/patch-Jamsettings +++ b/mail/archiveopteryx/files/patch-Jamsettings @@ -1,4 +1,4 @@ ---- Jamsettings.orig 2014-03-10 13:44:59 UTC +--- Jamsettings.orig 2018-06-01 02:17:49 UTC +++ Jamsettings @@ -12,7 +12,7 @@ INSTALLROOT ?= "" ; diff --git a/mail/archiveopteryx/files/patch-core__md5.cpp b/mail/archiveopteryx/files/patch-core__md5.cpp deleted file mode 100644 index 675a9cd8e8a7..000000000000 --- a/mail/archiveopteryx/files/patch-core__md5.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- core/md5.cpp.orig 2014-03-10 13:44:59 UTC -+++ core/md5.cpp -@@ -52,7 +52,7 @@ void MD5::init() - - void MD5::add( const char *str, uint len ) - { -- register uint32 t; -+ uint32 t; - - /* It's not possible to add() data, call hash(), then add more data - and call hash() again, because hash() destroys the accumulated -@@ -149,12 +149,9 @@ EString MD5::hash() - } - swapBytes( in, 14 ); - --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Wstrict-aliasing" - /* Append length in bits and transform. */ - ((uint32 *)in)[14] = bits[0]; - ((uint32 *)in)[15] = bits[1]; --#pragma GCC diagnostic pop - transform(); - swapBytes( (char *)buf, 4 ); - -@@ -247,7 +244,7 @@ EString MD5::HMAC( const EString &secret - - void MD5::transform() - { -- register uint32 a, b, c, d; -+ uint32 a, b, c, d; - uint32 *inw = (uint32 *)in; - - a = buf[0]; diff --git a/mail/archiveopteryx/files/patch-db__postgres.cpp b/mail/archiveopteryx/files/patch-db__postgres.cpp deleted file mode 100644 index cb0eaeefc3b2..000000000000 --- a/mail/archiveopteryx/files/patch-db__postgres.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./db/postgres.cpp.orig 2014-05-06 13:03:48.795894217 -0500 -+++ ./db/postgres.cpp 2014-05-06 13:04:03.207891218 -0500 -@@ -85,7 +85,7 @@ - "from pg_locks h join pg_locks w using (locktype) " - "join pg_stat_activity a on (h.pid=" - ); -- if (Postgres::version() < 90300) -+ if (Postgres::version() < 90200) - s.append( "a.procpid" ); - else - s.append( "a.pid" ); diff --git a/mail/archiveopteryx/files/patch-server_tlsthread.cpp b/mail/archiveopteryx/files/patch-server_tlsthread.cpp deleted file mode 100644 index d43d193746fd..000000000000 --- a/mail/archiveopteryx/files/patch-server_tlsthread.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- server/tlsthread.cpp.orig 2017-01-10 15:10:07 UTC -+++ server/tlsthread.cpp -@@ -93,7 +93,7 @@ void TlsThread::setup() - SSL_library_init(); - - ctx = ::SSL_CTX_new( SSLv23_server_method() ); -- int options = SSL_OP_ALL -+ long options = SSL_OP_ALL - // also try to pick the same ciphers suites more often - | SSL_OP_CIPHER_SERVER_PREFERENCE - // and don't use SSLv2, even if the client wants tohome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69fbcc52.39dfe.62f921d9>