git: 28db06099cc1 - main - security/zxid: Remove expired port:

From: Rene Ladan <rene_at_FreeBSD.org>
Date: Sun, 28 May 2023 12:08:09 UTC 
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=28db06099cc14b20de85922413f5693e3287e472

commit 28db06099cc14b20de85922413f5693e3287e472
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2023-05-28 12:07:55 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2023-05-28 12:07:55 +0000

    security/zxid: Remove expired port:
    
    2023-05-27 security/zxid: Do not build with OpenSSL 1.1.1e and later
---
 MOVED                                |   1 +
 security/Makefile                    |   1 -
 security/zxid/Makefile               |  69 ------------------
 security/zxid/distinfo               |   2 -
 security/zxid/files/patch-errmac.h   |  21 ------
 security/zxid/files/patch-pkcs12.c   |  13 ----
 security/zxid/files/patch-platform.h |  10 ---
 security/zxid/files/patch-zx.h       |  10 ---
 security/zxid/files/patch-zxsig.c    |  69 ------------------
 security/zxid/files/patch-zxutil.c   |  21 ------
 security/zxid/pkg-descr              |   9 ---
 security/zxid/pkg-plist              | 132 -----------------------------------
 12 files changed, 1 insertion(+), 357 deletions(-)

diff --git a/MOVED b/MOVED
index d42b812e7260..b9dda57baf2f 100644
--- a/MOVED
+++ b/MOVED
@@ -7580,3 +7580,4 @@ www/yarn-node14||2023-05-28|Has expired: Requires upstream EOL node14
 www/npm-node14||2023-05-28|Has expired: Requires upstream EOL www/node14
 www/node14||2023-05-28|Has expired: Consider using www/node16 or later as Upstream EOL on 2023-04-30
 security/p5-Net-SAML||2023-05-28|Has expired: Depends on deprecated security/zxid
+security/zxid||2023-05-28|Has expired: Do not build with OpenSSL 1.1.1e and later
diff --git a/security/Makefile b/security/Makefile
index 34b7dc15c05b..91fa7e18bbf4 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1360,7 +1360,6 @@
     SUBDIR += zaproxy
     SUBDIR += zeek
     SUBDIR += zeronet
-    SUBDIR += zxid
     SUBDIR += zzuf
 
 .include <bsd.port.subdir.mk>
diff --git a/security/zxid/Makefile b/security/zxid/Makefile
deleted file mode 100644
index 7e69d656c273..000000000000
--- a/security/zxid/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-PORTNAME=	zxid
-PORTVERSION=	1.42
-PORTREVISION=	1
-CATEGORIES=	security www
-MASTER_SITES=	http://zxid.org/
-
-MAINTAINER=	admins@perceptyx.com
-COMMENT=	Open Source IdM for the Masses - SAML SSO
-WWW=		http://zxid.org/
-
-LICENSE=	E2ETA
-LICENSE_NAME=	End2End Trust Architecture (e2eta) Software Copying
-LICENSE_FILE=	${WRKSRC}/COPYING
-LICENSE_PERMS=	# none
-
-DEPRECATED=	Do not build with OpenSSL 1.1.1e and later
-EXPIRATION_DATE=	2023-05-27
-
-LIB_DEPENDS=	libcurl.so:ftp/curl
-
-USES=		gmake localbase tar:tgz ssl
-USE_CSTD=	gnu89
-USE_LDCONFIG=	yes
-
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
-		LD="${CC}" LDFLAGS="${LDFLAGS}" \
-		PREFIX="${PREFIX}" OPENSSL_ROOT="${OPENSSLBASE}" \
-		POSTLIBS="${LDFLAGS}" TARGET="${OPSYS:tl}" \
-		V=1
-MAKE_JOBS_UNSAFE=	yes
-ALL_TARGET=	default smime libzxid.so.0.0
-
-CFLAGS+=	-D_LSEEK_DECLARED -fPIC
-
-OPTIONS_DEFINE=	DOCS
-
-ZXID_BINS=	smime zxcall zxcot zxdecode zxencdectest zxidhlo \
-		zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple \
-		zxidwsctool zxlogview zxpasswd
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^LIBS/s|-lpthread|-pthread| ; \
-		 /^SHARED/s|--export-all-symbols|| ; \
-		 /..error /d ; \
-		 /which gcc/d' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e \ 's|<malloc.h>|<stdlib.h>|' \
-		${WRKSRC}/zxidconf.c ${WRKSRC}/zxididp.c
-
-do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${ZXID_BINS} \
-		${STAGEDIR}${PREFIX}/bin)
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/zx
-	${LN} -sf ../zxid/zx.h ${STAGEDIR}${PREFIX}/include/zx/zx.h
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/zxid
-	${INSTALL_DATA} ${WRKSRC}/*.h ${WRKSRC}/c/*.h \
-		${STAGEDIR}${PREFIX}/include/zxid
-
-	${INSTALL_DATA} ${WRKSRC}/libzxid.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/libzxid.so.0.0 ${STAGEDIR}${PREFIX}/lib
-	${LN} -sf libzxid.so.0.0 ${STAGEDIR}${PREFIX}/lib/libzxid.so
-	${LN} -sf libzxid.so.0.0 ${STAGEDIR}${PREFIX}/lib/libzxid.so.0
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.pd ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/security/zxid/distinfo b/security/zxid/distinfo
deleted file mode 100644
index a0eca9a61cde..000000000000
--- a/security/zxid/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (zxid-1.42.tgz) = 8b936c8a011cc6fc56d19c6a83cd2dede36bb16b6453b81e45ee8811b9272b10
-SIZE (zxid-1.42.tgz) = 2164542
diff --git a/security/zxid/files/patch-errmac.h b/security/zxid/files/patch-errmac.h
deleted file mode 100644
index 84ac00cd99c4..000000000000
--- a/security/zxid/files/patch-errmac.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- errmac.h.orig	2016-02-29 00:16:50 UTC
-+++ errmac.h
-@@ -483,9 +483,17 @@ extern FILE* errmac_debug_log;    /* Def
- #define DD_XML_BLOB(cf, lk, len, xml) /* Documentative */
- 
- int hexdmp(const char* msg, const void* p, int len, int max);
-+#if __FreeBSD__
-+int hexdump_zxid(const char* msg, const void* p, const void* lim, int max);
-+#else 
- int hexdump(const char* msg, const void* p, const void* lim, int max);
-+#endif
- 
-+#if __FreeBSD__
-+#define HEXDUMP(msg, p, lim, max) if ((errmac_debug&ERRMAC_DEBUG_MASK) > 1) hexdump_zxid((msg), (p), (lim), (max))
-+#else 
- #define HEXDUMP(msg, p, lim, max) if ((errmac_debug&ERRMAC_DEBUG_MASK) > 1) hexdump((msg), (p), (lim), (max))
-+#endif
- #define DHEXDUMP(msg, p, lim, max) /* Disabled hex dump */
- 
- #define DUMP_CORE() ASSERT(0)
-
diff --git a/security/zxid/files/patch-pkcs12.c b/security/zxid/files/patch-pkcs12.c
deleted file mode 100644
index 54e1fc67afaa..000000000000
--- a/security/zxid/files/patch-pkcs12.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- pkcs12.c.orig	2016-02-29 00:16:50 UTC
-+++ pkcs12.c
-@@ -99,6 +99,10 @@
- #define _STACK STACK
- #endif
- 
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10000000L
-+#define _STACK STACK
-+#endif
-+
- /* ================= P K C S 1 2    C O N V E R S I O N S ================ */
- /* Convert pem formatted certificate and private key into PKCS12
-  * object suitable for importing to browsers.
diff --git a/security/zxid/files/patch-platform.h b/security/zxid/files/patch-platform.h
deleted file mode 100644
index 22029a0fbcb8..000000000000
--- a/security/zxid/files/patch-platform.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- platform.h.orig	2016-02-29 00:16:50 UTC
-+++ platform.h
-@@ -132,6 +132,7 @@ unsigned int alarm(unsigned int secs);
-  * NOT MINGW nor WIN32CL (i.e. its Unix) */
- 
- #include <dirent.h>
-+#include <sys/types.h>
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/security/zxid/files/patch-zx.h b/security/zxid/files/patch-zx.h
deleted file mode 100644
index b1f286ba865c..000000000000
--- a/security/zxid/files/patch-zx.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- zx.h.orig	2016-02-29 00:16:50 UTC
-+++ zx.h
-@@ -29,6 +29,7 @@
- #include <memory.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <limits.h>
- 
- #ifdef USE_OPENSSL
- #include <openssl/x509.h>
diff --git a/security/zxid/files/patch-zxsig.c b/security/zxid/files/patch-zxsig.c
deleted file mode 100644
index 613bc7239d83..000000000000
--- a/security/zxid/files/patch-zxsig.c
+++ /dev/null
@@ -1,69 +0,0 @@
---- zxsig.c.orig	2016-02-29 00:16:50 UTC
-+++ zxsig.c
-@@ -887,8 +887,13 @@ int zx_report_openssl_err(const char* lo
- #endif
- 
-   D("%s: len=%d data(%.*s)", lk, len, len, data);
-+#if __FreeBSD__
-+  D("%s: data above %d", lk, hexdump_zxid("data: ", data, data+len, 4096));
-+  D("%s: digest above %d", lk, hexdump_zxid("digest: ", mdbuf, mdbuf+mdlen, 64));
-+#else
-   D("%s: data above %d", lk, hexdump("data: ", data, data+len, 4096));
-   D("%s: digest above %d", lk, hexdump("digest: ", mdbuf, mdbuf+mdlen, 64));
-+#endif
- 
-   if (!priv_key) {
-     ERR(priv_key_missing_msg, geteuid(), getegid());
-@@ -906,7 +911,11 @@ int zx_report_openssl_err(const char* lo
-     if (RSA_sign(EVP_MD_type(evp_digest), mdbuf, mdlen, (unsigned char*)*sig, (unsigned int*)&len, rsa)) {
-       DD("data = %s, SHA1 sig = %s, siglen = %d", data, *sig, len);
-       D("RSA siglen = %d", len);
-+#if __FreeBSD__
-+      D("%s: sig above %d", lk, hexdump_zxid("sig: ", *sig, *sig+len, 1024));
-+#else
-       D("%s: sig above %d", lk, hexdump("sig: ", *sig, *sig+len, 1024));
-+#endif
-       return len;
-     }
- #else
-@@ -1042,9 +1051,15 @@ int zxsig_verify_data(int len, char* dat
-   else if (!strcmp(mdalg, "SHA512")) { SHA512((unsigned char*)data, len, mdbuf); nid = NID_sha512; }
-   else { SHA1((unsigned char*)data, len, mdbuf); nid = NID_sha1; }
- #endif
-+#if __FreeBSD__
-+  D("%s: vfy data len=%d above %d", lk, len, hexdump_zxid("data: ", data, data+len, 8192));
-+  D("%s: vfy sig above %d",  lk, hexdump_zxid("sig: ",  sig,  sig+siglen, 8192));
-+  D("%s: vfy md above %d", lk, hexdump_zxid("md: ", mdbuf, mdbuf+64, 64));
-+#else
-   D("%s: vfy data len=%d above %d", lk, len, hexdump("data: ", data, data+len, 8192));
-   D("%s: vfy sig above %d",  lk, hexdump("sig: ",  sig,  sig+siglen, 8192));
-   D("%s: vfy md above %d", lk, hexdump("md: ", mdbuf, mdbuf+64, 64));
-+#endif
-   
-   evp_pubk = X509_get_pubkey(cert);
-   if (!evp_pubk) {
-@@ -1080,7 +1095,11 @@ int zxsig_verify_data(int len, char* dat
-     if (!verdict) {
-       ERR("RSA signature verify in %s data failed. Perhaps you have bad or no certificate(%p) len=%d data=%p siglen=%d sig=%p", lk, cert, len, data, siglen, sig);
-       zx_report_openssl_err(lk);
-+#if __FreeBSD__
-+      D("RSA_vfy(%s) bad sig above %d",  lk, hexdump_zxid("sig: ",  sig,  sig+siglen, 4096));
-+#else
-       D("RSA_vfy(%s) bad sig above %d",  lk, hexdump("sig: ",  sig,  sig+siglen, 4096));
-+#endif
-       return ZXSIG_VFY_FAIL;
-     } else {
-       D("RSA verify OK %d", verdict);
-@@ -1115,7 +1134,11 @@ int zxsig_verify_data(int len, char* dat
-     if (!verdict) {
-       ERR("DSA signature verify in %s data failed. Perhaps you have bad or no certificate(%p) len=%d data=%p siglen=%d sig=%p", lk, cert, len, data, siglen, sig);
-       zx_report_openssl_err(lk);
-+#if __FreeBSD__
-+      D("DSA_vfy(%s) sig above %d",  lk, hexdump_zxid("sig: ",  sig,  sig+siglen, 4096));
-+#else
-       D("DSA_vfy(%s) sig above %d",  lk, hexdump("sig: ",  sig,  sig+siglen, 4096));
-+#endif
-       return ZXSIG_VFY_FAIL;
-     } else {
-       D("DSA verify OK %d", verdict);
-
diff --git a/security/zxid/files/patch-zxutil.c b/security/zxid/files/patch-zxutil.c
deleted file mode 100644
index 26f9fc4b4759..000000000000
--- a/security/zxid/files/patch-zxutil.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- zxutil.c.orig	2018-08-06 01:37:42 UTC
-+++ zxutil.c
-@@ -681,7 +681,7 @@ linkrest:
- /*() Output a hexdump to stderr. Used for debugging purposes. */
- 
- /* Called by: */
--int hexdump(const char* msg, const void* data, const void* lim, int max)
-+int hexdump_zxid(const char* msg, const void* data, const void* lim, int max)
- {
-   int i;
-   const char* p = (const char*)data;
-@@ -720,7 +720,7 @@ int hexdump(const char* msg, const void*
- 
- /* Called by:  zx_get_symkey, zx_raw_cipher2 x4, zxbus_verify_receipt x2, zxsig_validate x19 */
- int hexdmp(const char* msg, const void* p, int len, int max) {
--  return hexdump(msg, p, p+len, max);
-+  return hexdump_zxid(msg, p, p+len, max);
- }
- 
- /*
-
diff --git a/security/zxid/pkg-descr b/security/zxid/pkg-descr
deleted file mode 100644
index cbeaf09534c1..000000000000
--- a/security/zxid/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-ZXID aims at full stack implementation of all federated identity
-management and identity web services protocols. Initial goal is
-supporting SP role, followed by ID-WSF WSC and IdP roles.
-
-ZXID is light weight, has a small foot print, and is implemented in C.
-It is suitable for both high performance and embedded applications.
-Scripting languages are supported using SWIG, including Perl, PHP and
-Java. The "full stack" nature of ZXID means it's self contained and
-has minimal external library dependencies (see downloads).
diff --git a/security/zxid/pkg-plist b/security/zxid/pkg-plist
deleted file mode 100644
index 88e6d6f8acb6..000000000000
--- a/security/zxid/pkg-plist
+++ /dev/null
@@ -1,132 +0,0 @@
-bin/smime
-bin/zxcall
-bin/zxcot
-bin/zxdecode
-bin/zxencdectest
-bin/zxidhlo
-bin/zxidhlowsf
-bin/zxidhrxmlwsc
-bin/zxidhrxmlwsp
-bin/zxididp
-bin/zxidsimple
-bin/zxidwsctool
-bin/zxlogview
-bin/zxpasswd
-include/zx/zx.h
-include/zxid/HRR.h
-include/zxid/akbox.h
-include/zxid/aktab.h
-include/zxid/errmac.h
-include/zxid/hiios.h
-include/zxid/hiproto.h
-include/zxid/logprint.h
-include/zxid/macglue.h
-include/zxid/platform.h
-include/zxid/port.h
-include/zxid/saml2.h
-include/zxid/smimeutil.h
-include/zxid/tas3.h
-include/zxid/wsf.h
-include/zxid/yubikey.h
-include/zxid/zx.h
-include/zxid/zx-a-data.h
-include/zxid/zx-ac-data.h
-include/zxid/zx-as-data.h
-include/zxid/zx-b-data.h
-include/zxid/zx-b12-data.h
-include/zxid/zx-cb-data.h
-include/zxid/zx-cdm-data.h
-include/zxid/zx-const.h
-include/zxid/zx-dap-data.h
-include/zxid/zx-data.h
-include/zxid/zx-demomed-data.h
-include/zxid/zx-di-data.h
-include/zxid/zx-di12-data.h
-include/zxid/zx-dp-data.h
-include/zxid/zx-ds-data.h
-include/zxid/zx-dst-data.h
-include/zxid/zx-e-data.h
-include/zxid/zx-ecp-data.h
-include/zxid/zx-exca-data.h
-include/zxid/zx-ff12-data.h
-include/zxid/zx-gl-data.h
-include/zxid/zx-hrxml-data.h
-include/zxid/zx-idhrxml-data.h
-include/zxid/zx-idp-data.h
-include/zxid/zx-idpdisc-data.h
-include/zxid/zx-im-data.h
-include/zxid/zx-is-data.h
-include/zxid/zx-is12-data.h
-include/zxid/zx-lu-data.h
-include/zxid/zx-m20-data.h
-include/zxid/zx-md-data.h
-include/zxid/zx-mm7-data.h
-include/zxid/zx-ns.h
-include/zxid/zx-paos-data.h
-include/zxid/zx-pmm-data.h
-include/zxid/zx-prov-data.h
-include/zxid/zx-ps-data.h
-include/zxid/zx-sa-data.h
-include/zxid/zx-sa11-data.h
-include/zxid/zx-sbf-data.h
-include/zxid/zx-sec-data.h
-include/zxid/zx-sec12-data.h
-include/zxid/zx-shibmd-data.h
-include/zxid/zx-shps-data.h
-include/zxid/zx-sp-data.h
-include/zxid/zx-sp11-data.h
-include/zxid/zx-subs-data.h
-include/zxid/zx-tas3-data.h
-include/zxid/zx-tas3sol-data.h
-include/zxid/zx-wsc-data.h
-include/zxid/zx-wsp-data.h
-include/zxid/zx-wsse-data.h
-include/zxid/zx-wst-data.h
-include/zxid/zx-wsu-data.h
-include/zxid/zx-xa-data.h
-include/zxid/zx-xac-data.h
-include/zxid/zx-xasa-data.h
-include/zxid/zx-xasacd1-data.h
-include/zxid/zx-xasp-data.h
-include/zxid/zx-xaspcd1-data.h
-include/zxid/zx-xenc-data.h
-include/zxid/zx-xml-data.h
-include/zxid/zx-xs-data.h
-include/zxid/zx-xsi-data.h
-include/zxid/zx_ext_pt.h
-include/zxid/zxid.h
-include/zxid/zxidconf.h
-include/zxid/zxidnoswig.h
-include/zxid/zxidpriv.h
-include/zxid/zxidutil.h
-include/zxid/zxidvers.h
-include/zxid/zxwsc.h
-lib/libzxid.a
-lib/libzxid.so
-lib/libzxid.so.0
-lib/libzxid.so.0.0
-%%PORTDOCS%%%%DOCSDIR%%/apache.pd
-%%PORTDOCS%%%%DOCSDIR%%/doc-end.pd
-%%PORTDOCS%%%%DOCSDIR%%/doc-inc.pd
-%%PORTDOCS%%%%DOCSDIR%%/mediawiki-zxid.pd
-%%PORTDOCS%%%%DOCSDIR%%/mod_auth_saml.pd
-%%PORTDOCS%%%%DOCSDIR%%/ref-inc.pd
-%%PORTDOCS%%%%DOCSDIR%%/schemata.pd
-%%PORTDOCS%%%%DOCSDIR%%/testplan.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-book.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-compile.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-conf.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-cot.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-faq.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-idp.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-install.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-java.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-license.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-log.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-perl.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-php.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-raw.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-ref.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-simple.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-tas3.pd
-%%PORTDOCS%%%%DOCSDIR%%/zxid-wsf.pd