git: 16afea3494c1 - main - net/libarms: undeprecate the port and update to version 6.33

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=16afea3494c1da81aa13548058418093e528beb8

commit 16afea3494c1da81aa13548058418093e528beb8
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2025-07-31 17:29:44 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2025-07-31 17:29:44 +0000

    net/libarms: undeprecate the port and update to version 6.33
    
    This is not the latest one, but later versions have broken
    docfiles installation due to seemingly incorrectly populated
    nobase_dist_doc_DATA (install: ./doc/api: Inappropriate file
    type or format).
---
 net/libarms/Makefile                  | 19 +++++++-------
 net/libarms/distinfo                  |  5 ++--
 net/libarms/files/patch-libarms_ssl.c | 47 ++++++++---------------------------
 net/libarms/pkg-plist                 |  2 +-
 4 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/net/libarms/Makefile b/net/libarms/Makefile
index 2dcadff5b656..0d6171591cd4 100644
--- a/net/libarms/Makefile
+++ b/net/libarms/Makefile
@@ -1,9 +1,7 @@
 PORTNAME=	libarms
-PORTVERSION=	5.01
-PORTREVISION=	2
+PORTVERSION=	6.33
 CATEGORIES=	net devel
-MASTER_SITES=	https://dev.smf.jp/dl/ \
-		http://dev.smf.jp/dl/
+MASTER_SITES=	https://dev.smf.jp/dl/
 
 MAINTAINER=	shigeru@iij.ad.jp
 COMMENT=	SMFv2/ARMS client library for C
@@ -12,17 +10,18 @@ WWW=		https://dev.smf.jp/libarms/
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	Obsolete version and not updated in a decade
-EXPIRATION_DATE=2025-07-31
-
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake libtool localbase ssl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-post-configure:
-	@${REINPLACE_CMD} 's|$${datarootdir}/doc/$${PACKAGE_TARNAME}|${DOCSDIR}|' \
-		${WRKSRC}/Makefile
+post-patch:
+# NetBSD's SIMPLEQ_* macros are called STAILQ_* on FreeBSD
+	@${REINPLACE_CMD} -e 's,SIMPLEQ_,STAILQ_,' \
+		${WRKSRC}/libarms/cache.c \
+		${WRKSRC}/module/module_db_mi.c \
+		${WRKSRC}/protocol/proto_push_read_status.c \
+		${WRKSRC}/protocol/proto_push_read_storage.c
 
 .include <bsd.port.mk>
diff --git a/net/libarms/distinfo b/net/libarms/distinfo
index 9d16d81a44d6..568dcdce86fe 100644
--- a/net/libarms/distinfo
+++ b/net/libarms/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libarms-5.01.tar.gz) = d74122990d0b3f3a4487f52238ebe7f7b3c3a49aadd5f03e3ecc3f0c2011d9ad
-SIZE (libarms-5.01.tar.gz) = 866681
+TIMESTAMP = 1702963884
+SHA256 (libarms-6.33.tar.gz) = 642ecf8f58dec5feeb668adee8781d2b5496421f59dfd6ea33049d0f110bca1e
+SIZE (libarms-6.33.tar.gz) = 1030353
diff --git a/net/libarms/files/patch-libarms_ssl.c b/net/libarms/files/patch-libarms_ssl.c
index ae93afdba118..70201446a643 100644
--- a/net/libarms/files/patch-libarms_ssl.c
+++ b/net/libarms/files/patch-libarms_ssl.c
@@ -1,37 +1,12 @@
---- libarms/ssl.c.orig	2012-01-24 02:47:27 UTC
+--- libarms/ssl.c.orig	2019-03-29 01:15:24 UTC
 +++ libarms/ssl.c
-@@ -162,6 +162,7 @@ arms_ssl_servercert_verify_cb(int ok, X509_STORE_CTX *
- {
- 	char cn[256];
- 	const char *errmsg = NULL;
-+	int error;
- 
- 	X509_NAME_oneline(
- 		X509_get_subject_name(
-@@ -171,13 +172,15 @@ arms_ssl_servercert_verify_cb(int ok, X509_STORE_CTX *
- 		X509_get_issuer_name(
- 			X509_STORE_CTX_get_current_cert(ctx)), cn, sizeof(cn));
- 
-+	error = X509_STORE_CTX_get_error(ctx);
-+
- 	if (!ok) {
--		switch (ctx->error) {
-+		switch (error) {
- 		case X509_V_ERR_CERT_NOT_YET_VALID:
- 		case X509_V_ERR_CERT_HAS_EXPIRED:
- 			/* XXX: ignore Validity Not Before/Not After field */
- 			ok = 1;
--			ctx->error = X509_V_OK;
-+			X509_STORE_CTX_set_error(ctx, X509_V_OK);
- 			break;
- 
- 		case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
-@@ -187,7 +190,7 @@ arms_ssl_servercert_verify_cb(int ok, X509_STORE_CTX *
- 			break;
- 
- 		default:
--			errmsg = X509_verify_cert_error_string(ctx->error);
-+			errmsg = X509_verify_cert_error_string(error);
- 			break;
- 		}
- 
+@@ -338,7 +338,8 @@ arms_ssl_dhparam(SSL_CTX *ctx)
+ 	}
+ 
+ /* for compatibility with before OpenSSL-1.1.0 and LibreSSL-2.7.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x20700000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
++	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	dh->p = p;
+ 	dh->g = g;
+ #else
diff --git a/net/libarms/pkg-plist b/net/libarms/pkg-plist
index c0520d7d23cd..9f5b5c1468d7 100644
--- a/net/libarms/pkg-plist
+++ b/net/libarms/pkg-plist
@@ -2,7 +2,7 @@ include/libarms.h
 lib/libarms.a
 lib/libarms.so
 lib/libarms.so.0
-lib/libarms.so.0.0.1
+lib/libarms.so.0.0.3
 %%DOCSDIR%%/doc/.buildinfo
 %%DOCSDIR%%/doc/_images/libarms-pull.png
 %%DOCSDIR%%/doc/_images/libarms-push.png