From nobody Fri Mar 31 00:01:56 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PngSh61njz42YWT; Fri, 31 Mar 2023 00:01:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PngSh2QmVz4P7x; Fri, 31 Mar 2023 00:01:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgwR+UoADEcT7+BQ/rw1WqZnrOlL7EYks9HZznTlfJw=; b=deg6yNbd+4Nm0tYOyo9KMEoF109jOwMMzPBWbtGRL/ggYaiuPtrsFvrTkHdSh5Pa9WnJuu 1IpBpwYKs72uLBkeUylduumXN/Fj2MEw2tLXu4W5hyMpVWa+Df7N6Cu5vVQAJu0Nae66Rr fs2up6wTxufpWIWFacXNL2N52V1fMfBQg5Hl2tJSemUFr2vYqWfYgvc0OkBhj6xANDl35k x3rp36jHuFxUjYpXD/YmgXxkKPh6L7QeyHvfod1nI0RYI/pZSD8TyE+eOCgeCAY4xX72E9 A1DyEIV/51IqigqvTNncXrvW4/XaQJwHZ1OCuOYGWPBPcZttwtmpEXSWWsMu/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgwR+UoADEcT7+BQ/rw1WqZnrOlL7EYks9HZznTlfJw=; b=FMCTGRIFfjU15Fey95mFeEvGBT9sh/BRMZuitBrVvz9Mgkj2xXijbmfjbKGxzK13fxhXCe 2ltyZXfr9IGZQgY7ZEG3I8grMe9Gohjgt4Nw9QDS5J2wqf0WNWRJPXv11yP+lJtG+wM8Fu kUi4pIXnEElcuytx9cMYZ0jMsQ3HcYQtxJRVAdhB0Svlj5fnTVVe/PeIGsXJJxQOCk+OoY knNr1ISDppJbBDAQK01Auc9lKMeNIQDg+RBADky83pbaoTlX872xaxuX6PwHtNBEUfYvaw yWcehfa4HMO/vCfWkPsZZysGpoCZ6diiDTtReStIGZ3YrUdrKfhk2yy8ZV7QQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680220916; a=rsa-sha256; cv=none; b=vLJldpS/4ADwQNviLdWvH4FiyG2GXBeF6p/h9U5haqnIxDVL4KZeUmJU0DYJandPEmp3ZD peSJYD6XNZ/kuniz0LOc0yGdw+UVqrINF2VCQvMb/THWmaI8TErjhVbUmxm77xO5QeYRcZ aLEWKhT5K09p6I5mpVNJcYi+KFVKYUKVTt2Ha6lbSIuE/KXR8TIUgwwn6tPUqVydeAU64y XL/qdqva+XmWqnyh6aP7/Fx5Yv7p+35zbMAcGIMYKP0j7fglSFEn9bm+2rWba46DhjtfdF XGCjoz/c7RyvrwgsI/TCFlK7FOm0e6LA9uuRNQoQk8IeSla5ZvczAgEQQ1DYxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PngSh175qzXXJ; Fri, 31 Mar 2023 00:01:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V01uQp014425; Fri, 31 Mar 2023 00:01:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V01u6I014424; Fri, 31 Mar 2023 00:01:56 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:01:56 GMT Message-Id: <202303310001.32V01u6I014424@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: b8a99dc18389 - main - security/openscep: Remove expired port: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8a99dc18389585568b5036e4388e77289726b91 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8a99dc18389585568b5036e4388e77289726b91 commit b8a99dc18389585568b5036e4388e77289726b91 Author: Muhammad Moinur Rahman AuthorDate: 2023-03-25 15:02:14 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-03-30 23:59:42 +0000 security/openscep: Remove expired port: 2023-03-31 security/openscep: Do not support recent RFC 8894 --- MOVED | 1 + security/Makefile | 1 - security/openscep/Makefile | 68 ---------- security/openscep/distinfo | 2 - .../openscep/files/patch-include_openscep_err.h | 36 ------ security/openscep/files/patch-include_scep.h | 14 --- security/openscep/files/patch-lib_Makefile.in | 37 ------ security/openscep/files/patch-lib_decode.c | 10 -- security/openscep/files/patch-lib_fingerprint.c | 10 -- security/openscep/files/patch-lib_http.c | 10 -- security/openscep/files/patch-lib_init.c | 22 ---- security/openscep/files/patch-lib_isasu.c | 28 ----- security/openscep/files/patch-lib_openscep__err.c | 139 --------------------- security/openscep/files/patch-lib_payload.c | 28 ----- security/openscep/files/patch-lib_proxy.c | 10 -- security/openscep/files/patch-lib_sigattr.c | 35 ------ security/openscep/files/patch-scepd_Makefile.in | 11 -- security/openscep/files/patch-scepd_dn2xid.c | 10 -- security/openscep/files/patch-scepd_scepconf.c | 14 --- security/openscep/files/patch-scepd_sceplist.c | 32 ----- security/openscep/files/pkg-message.in | 18 --- security/openscep/pkg-descr | 6 - security/openscep/pkg-plist | 94 -------------- 23 files changed, 1 insertion(+), 635 deletions(-) diff --git a/MOVED b/MOVED index 6a5e76f0ee87..193fc4506031 100644 --- a/MOVED +++ b/MOVED @@ -17863,3 +17863,4 @@ news/nntpcache||2023-03-31|Has expired: Upstream site no longer available ports-mgmt/p5-FreeBSD-Portindex||2023-03-31|Has expired: Not working, and no fix forthcoming print/ghostscript9-x11||2023-03-31|Has expired: Released over 10 years ago and unsupported by upstream, consider print/ghostscript9-agpl-x11 print/ghostscript9-base||2023-03-31|Has expired: Released over 10 years ago and unsupported by upstream, consider print/ghostscript9-agpl-base +security/openscep||2023-03-31|Has expired: Do not support recent RFC 8894 diff --git a/security/Makefile b/security/Makefile index 8138752548fa..01c174d4e633 100644 --- a/security/Makefile +++ b/security/Makefile @@ -406,7 +406,6 @@ SUBDIR += openiked-portable SUBDIR += opensaml SUBDIR += opensc - SUBDIR += openscep SUBDIR += openssh-askpass SUBDIR += openssh-portable SUBDIR += openssl diff --git a/security/openscep/Makefile b/security/openscep/Makefile deleted file mode 100644 index dd25c44dc64b..000000000000 --- a/security/openscep/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -PORTNAME= openscep -PORTVERSION= 0.4.2 -PORTREVISION= 11 -CATEGORIES= security -MASTER_SITES= http://openscep.othello.ch/download/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Open source scep server -WWW= http://openscep.othello.ch/ - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Do not support recent RFC 8894 -EXPIRATION_DATE= 2023-03-31 - -USES= apache gmake ldap libtool ssl -BROKEN_SSL= base -BROKEN_SSL_REASON= unexpected type name 'issuer_and_subject_t': expected expression -IGNORE_SSL= libressl libressl-devel -IGNORE_SSL_REASON= unknown ASN1 functions -USE_LDCONFIG= yes - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-html-install-dir="${PREFIX}/www/openscep" \ - --with-cgi-install-dir="${PREFIX}/www/cgi-bin/openscep" \ - --with-openscep-dir="${PREFIX}/etc/openscep" \ - --with-pkiclientexe="${PREFIX}/www/cgi-bin/pkiclient.exe" - -CPPFLAGS+= -I${OPENSSLINC} -I${LOCALBASE}/include -LIBS+= -L${OPENSSLLIB} -L${LOCALBASE}/lib - -CONF_DIR= ${PREFIX}/etc/${PORTNAME} -LOCAL_CONF_FILES= openscep.cnf openscep.ldif openscep.schema slapd.conf - -CONFLICTS_INSTALL= nss-3.* - -SUB_FILES= pkg-message -SUB_LIST= CONF_DIR="${CONF_DIR}" CONF_FILES="${LOCAL_CONF_FILES}" - -post-patch: - @${REINPLACE_CMD} -e '/^subdirs=/ s|libltdl||' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/^SUBDIRS =/ s|libltdl||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|^\(install-data-am:\) install-data-local$$|\1|' \ - ${WRKSRC}/ldap/Makefile.in ${WRKSRC}/openssl/Makefile.in - @${REINPLACE_CMD} 's,sbindir),DESTDIR)$$(&,' \ - ${WRKSRC}/openssl/Makefile.in - @${REINPLACE_CMD} -E -e 's,(bin|sbin)dir},DESTDIR}$${&,' \ - -e 's,-o \$$\(USER\) -g \$$\(GROUP\),,' \ - ${WRKSRC}/scep/Makefile.in \ - ${WRKSRC}/scepd/Makefile.in - @${REINPLACE_CMD} -E 's,(CGIINSTALLDIR|PKICLIENTEXE)),DESTDIR)$$(&,' \ - ${WRKSRC}/cgi-bin/Makefile.in - @${REINPLACE_CMD} 's|HTMLINSTALLDIR)|DESTDIR)$$(&|' \ - ${WRKSRC}/Makefile.in \ - ${WRKSRC}/doc/Makefile.in \ - ${WRKSRC}/html/Makefile.in - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libscep.so - @${MKDIR} ${STAGEDIR}${CONF_DIR} - ${INSTALL_DATA} ${WRKSRC}/openssl/openscep.cnf \ - ${STAGEDIR}${CONF_DIR}/openscep.cnf.sample -.for f in openscep.ldif openscep.schema slapd.conf - ${INSTALL_DATA} ${WRKSRC}/ldap/${f} ${STAGEDIR}${CONF_DIR}/${f}.sample -.endfor - -.include diff --git a/security/openscep/distinfo b/security/openscep/distinfo deleted file mode 100644 index ce8b41af53d1..000000000000 --- a/security/openscep/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (openscep-0.4.2.tar.gz) = 1bd44c09872d27abb50ffc75565e7507a5942a93e6dc91b1b2660b3087c098d5 -SIZE (openscep-0.4.2.tar.gz) = 416294 diff --git a/security/openscep/files/patch-include_openscep_err.h b/security/openscep/files/patch-include_openscep_err.h deleted file mode 100644 index 6b003582d0f0..000000000000 --- a/security/openscep/files/patch-include_openscep_err.h +++ /dev/null @@ -1,36 +0,0 @@ ---- include/openscep_err.h.orig Thu May 19 16:26:46 2005 -+++ include/openscep_err.h Thu May 19 16:26:46 2005 -@@ -0,0 +1,33 @@ -+#ifndef HEADER_OPENSCEP_ERR_H -+#define HEADER_OPENSCEP_ERR_H -+ -+#if OPENSSL_VERSION_NUMBER < 0x00907000L -+/* ERR_unload_strings was added in 0.9.7. with older versions, it's -+ redefined as a no-op here so the auto-generated code in -+ openscep_err.c doesn't need to be changed. */ -+#define ERR_unload_strings(A,B) do{}while(0) -+#endif -+ -+/* BEGIN ERROR CODES */ -+/* The following lines are auto generated by the script mkerr.pl. Any changes -+ * made after this point may be overwritten when the script is next run. -+ */ -+void ERR_load_OPENSCEP_strings(void); -+void ERR_unload_OPENSCEP_strings(void); -+void ERR_OPENSCEP_error(int function, int reason, char *file, int line); -+#define OPENSCEPerr(f,r) ERR_OPENSCEP_error((f),(r),__FILE__,__LINE__) -+ -+/* Error codes for the OPENSCEP functions. */ -+ -+/* Function codes. */ -+#define OPENSCEP_F_D2I_ISSUER_AND_SUBJECT 100 -+#define OPENSCEP_F_D2I_PAYLOAD 101 -+#define OPENSCEP_F_ISSUER_AND_SUBJECT_NEW 102 -+#define OPENSCEP_F_PAYLOAD_NEW 103 -+ -+/* Reason codes. */ -+ -+#ifdef __cplusplus -+} -+#endif -+#endif diff --git a/security/openscep/files/patch-include_scep.h b/security/openscep/files/patch-include_scep.h deleted file mode 100644 index 81e686ef7896..000000000000 --- a/security/openscep/files/patch-include_scep.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/scep.h.orig 2002-02-20 00:40:05.000000000 +0100 -+++ include/scep.h 2014-07-10 22:24:29.366255595 +0200 -@@ -80,7 +80,11 @@ - int recipientNonceLength; - - /* OpenSSL configuration file contents */ -+#ifdef LHASH_OF -+ LHASH_OF(CONF_VALUE) *conf; -+#else - LHASH *conf; -+#endif - - /* signer/client information different from requestor for v2 */ - X509 *selfsignedcert; diff --git a/security/openscep/files/patch-lib_Makefile.in b/security/openscep/files/patch-lib_Makefile.in deleted file mode 100644 index e65904cf12a2..000000000000 --- a/security/openscep/files/patch-lib_Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ ---- lib/Makefile.in.orig Tue Feb 26 02:11:39 2002 -+++ lib/Makefile.in Thu May 19 16:35:38 2005 -@@ -115,14 +115,13 @@ - - LDADD = libscep.la - LDFLAGS = -R$(libdir) $(LIBS) --CPPFLAGS = -DOPENSCEPDIR=\"$(OPENSCEPDIR)\" -+CPPFLAGS += -DOPENSCEPDIR=\"$(OPENSCEPDIR)\" - - VERSION_FILE = openscep_vers.c - - libscep_la_LDFLAGS = -version-info `../shtool version -d libtool $(VERSION_FILE)` - --libscep_la_SOURCES = init.c isasu.c decode.c sigattr.c pkcsreq.c certrep.c getcertinitial.c getcert.c getcrl.c badreply.c attr.c goodreply.c encode.c check.c grant.c scepldap.c fingerprint.c openscep_vers.c selfsigned.c createreq.c http.c iser.c proxy.c payload.c v2request.c transcheck.c pending.c spki2file.c -- -+libscep_la_SOURCES = init.c isasu.c decode.c sigattr.c pkcsreq.c certrep.c getcertinitial.c getcert.c getcrl.c badreply.c attr.c goodreply.c encode.c check.c grant.c scepldap.c fingerprint.c openscep_vers.c selfsigned.c createreq.c http.c iser.c proxy.c payload.c v2request.c transcheck.c pending.c spki2file.c openscep_err.c - - INCLUDES = $(INCLTDL) -I$(top_srcdir)/include -I$(OPENSSLDIR)/include - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -138,7 +137,8 @@ - certrep.lo getcertinitial.lo getcert.lo getcrl.lo badreply.lo attr.lo \ - goodreply.lo encode.lo check.lo grant.lo scepldap.lo fingerprint.lo \ - openscep_vers.lo selfsigned.lo createreq.lo http.lo iser.lo proxy.lo \ --payload.lo v2request.lo transcheck.lo pending.lo spki2file.lo -+payload.lo v2request.lo transcheck.lo pending.lo spki2file.lo \ -+openscep_err.lo - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -364,6 +364,7 @@ - ../include/scep.h ../include/isasu.h ../include/payload.h \ - ../include/transcheck.h ../include/pending.h \ - ../include/goodreply.h ../include/badreply.h ../include/init.h -+openscep_err.lo openscep_err.o : openscep_err.c ../include/openscep_err.h - - info-am: - info: info-am diff --git a/security/openscep/files/patch-lib_decode.c b/security/openscep/files/patch-lib_decode.c deleted file mode 100644 index e06c58fed984..000000000000 --- a/security/openscep/files/patch-lib_decode.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/decode.c.orig Tue Feb 26 02:01:06 2002 -+++ lib/decode.c Thu May 19 16:23:01 2005 -@@ -58,6 +58,7 @@ - __LINE__, (scep->client) ? "reply" : "request"); - - /* convert from base64 to internal representation */ -+ BIO_set_mem_eof_return(bio, 0); - if (msg->base64) { - if (debug) - BIO_printf(bio_err, "%s:%d: prepending Base64 " diff --git a/security/openscep/files/patch-lib_fingerprint.c b/security/openscep/files/patch-lib_fingerprint.c deleted file mode 100644 index edfeb9215388..000000000000 --- a/security/openscep/files/patch-lib_fingerprint.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/fingerprint.c.orig -+++ lib/fingerprint.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/security/openscep/files/patch-lib_http.c b/security/openscep/files/patch-lib_http.c deleted file mode 100644 index 57cd8f999c36..000000000000 --- a/security/openscep/files/patch-lib_http.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/http.c.orig Thu May 19 16:37:26 2005 -+++ lib/http.c Thu May 19 16:38:42 2005 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - /* - * parse the url given in the second argument and fill in the h member diff --git a/security/openscep/files/patch-lib_init.c b/security/openscep/files/patch-lib_init.c deleted file mode 100644 index 75bdd1330f11..000000000000 --- a/security/openscep/files/patch-lib_init.c +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/init.c.orig Wed Feb 20 02:40:06 2002 -+++ lib/init.c Thu May 19 16:23:01 2005 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #define TMPPATH "/var/tmp/openscep" - -@@ -66,6 +67,11 @@ - ERR_load_crypto_strings(); - if (debug) - fprintf(stderr, "%s:%d: crypto strings loaded\n", __FILE__, -+ __LINE__); -+ -+ ERR_load_OPENSCEP_strings(); -+ if (debug) -+ fprintf(stderr, "%s:%d: openscep strings loaded\n", __FILE__, - __LINE__); - - /* add the encryption algorithms available */ diff --git a/security/openscep/files/patch-lib_isasu.c b/security/openscep/files/patch-lib_isasu.c deleted file mode 100644 index 07f62ca1ed5d..000000000000 --- a/security/openscep/files/patch-lib_isasu.c +++ /dev/null @@ -1,28 +0,0 @@ ---- lib/isasu.c.orig Wed Feb 20 02:40:06 2002 -+++ lib/isasu.c Thu May 19 16:23:01 2005 -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - /* - * the methods in this file are based on the similar functions for the -@@ -40,7 +41,7 @@ - M_ASN1_D2I_get(ret->issuer, d2i_X509_NAME); - M_ASN1_D2I_get(ret->subject, d2i_X509_NAME); - M_ASN1_D2I_Finish(a,issuer_and_subject_free, -- ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL); -+ OPENSCEP_F_D2I_ISSUER_AND_SUBJECT); - } - - issuer_and_subject_t *issuer_and_subject_new(void) { -@@ -50,7 +51,7 @@ - M_ASN1_New(ret->issuer, X509_NAME_new); - M_ASN1_New(ret->subject, X509_NAME_new); - return ret; -- M_ASN1_New_Error(ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW); /* wrong error code */ -+ M_ASN1_New_Error(OPENSCEP_F_ISSUER_AND_SUBJECT_NEW); - } - - void issuer_and_subject_free(issuer_and_subject_t *isasu) { diff --git a/security/openscep/files/patch-lib_openscep__err.c b/security/openscep/files/patch-lib_openscep__err.c deleted file mode 100644 index a0ea6b031416..000000000000 --- a/security/openscep/files/patch-lib_openscep__err.c +++ /dev/null @@ -1,139 +0,0 @@ ---- lib/openscep_err.c.orig Thu May 19 16:26:46 2005 -+++ lib/openscep_err.c Thu May 19 16:26:46 2005 -@@ -0,0 +1,136 @@ -+/* openscep_err.c */ -+/* ==================================================================== -+ * Copyright (c) 1999-2003 The OpenSSL Project. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. All advertising materials mentioning features or use of this -+ * software must display the following acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" -+ * -+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For written permission, please contact -+ * openssl-core@OpenSSL.org. -+ * -+ * 5. Products derived from this software may not be called "OpenSSL" -+ * nor may "OpenSSL" appear in their names without prior written -+ * permission of the OpenSSL Project. -+ * -+ * 6. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ==================================================================== -+ * -+ * This product includes cryptographic software written by Eric Young -+ * (eay@cryptsoft.com). This product includes software written by Tim -+ * Hudson (tjh@cryptsoft.com). -+ * -+ */ -+ -+/* NOTE: this file was auto generated by the mkerr.pl script: any changes -+ * made to it will be overwritten when the script next updates this file, -+ * only reason strings will be preserved. -+ */ -+ -+#include -+#include -+#include "openscep_err.h" -+ -+/* BEGIN ERROR CODES */ -+#ifndef OPENSSL_NO_ERR -+static ERR_STRING_DATA OPENSCEP_str_functs[]= -+ { -+{ERR_PACK(0,OPENSCEP_F_D2I_ISSUER_AND_SUBJECT,0), "D2I_ISSUER_AND_SUBJECT"}, -+{ERR_PACK(0,OPENSCEP_F_D2I_PAYLOAD,0), "D2I_PAYLOAD"}, -+{ERR_PACK(0,OPENSCEP_F_ISSUER_AND_SUBJECT_NEW,0), "ISSUER_AND_SUBJECT_NEW"}, -+{ERR_PACK(0,OPENSCEP_F_PAYLOAD_NEW,0), "PAYLOAD_NEW"}, -+{0,NULL} -+ }; -+ -+static ERR_STRING_DATA OPENSCEP_str_reasons[]= -+ { -+{0,NULL} -+ }; -+ -+#endif -+ -+#ifdef OPENSCEP_LIB_NAME -+static ERR_STRING_DATA OPENSCEP_lib_name[]= -+ { -+{0 ,OPENSCEP_LIB_NAME}, -+{0,NULL} -+ }; -+#endif -+ -+ -+static int OPENSCEP_lib_error_code=0; -+static int OPENSCEP_error_init=1; -+ -+void ERR_load_OPENSCEP_strings(void) -+ { -+ if (OPENSCEP_lib_error_code == 0) -+ OPENSCEP_lib_error_code=ERR_get_next_error_library(); -+ -+ if (OPENSCEP_error_init) -+ { -+ OPENSCEP_error_init=0; -+#ifndef OPENSSL_NO_ERR -+ ERR_load_strings(OPENSCEP_lib_error_code,OPENSCEP_str_functs); -+ ERR_load_strings(OPENSCEP_lib_error_code,OPENSCEP_str_reasons); -+#endif -+ -+#ifdef OPENSCEP_LIB_NAME -+ OPENSCEP_lib_name->error = ERR_PACK(OPENSCEP_lib_error_code,0,0); -+ ERR_load_strings(0,OPENSCEP_lib_name); -+#endif -+ } -+ } -+ -+void ERR_unload_OPENSCEP_strings(void) -+ { -+ if (OPENSCEP_error_init == 0) -+ { -+#ifndef OPENSSL_NO_ERR -+ ERR_unload_strings(OPENSCEP_lib_error_code,OPENSCEP_str_functs); -+ ERR_unload_strings(OPENSCEP_lib_error_code,OPENSCEP_str_reasons); -+#endif -+ -+#ifdef OPENSCEP_LIB_NAME -+ ERR_unload_strings(0,OPENSCEP_lib_name); -+#endif -+ OPENSCEP_error_init=1; -+ } -+ } -+ -+void ERR_OPENSCEP_error(int function, int reason, char *file, int line) -+ { -+ if (OPENSCEP_lib_error_code == 0) -+ OPENSCEP_lib_error_code=ERR_get_next_error_library(); -+ ERR_PUT_error(OPENSCEP_lib_error_code,function,reason,file,line); -+ } diff --git a/security/openscep/files/patch-lib_payload.c b/security/openscep/files/patch-lib_payload.c deleted file mode 100644 index fe73e22a1dc5..000000000000 --- a/security/openscep/files/patch-lib_payload.c +++ /dev/null @@ -1,28 +0,0 @@ ---- lib/payload.c.orig Mon Feb 25 00:40:01 2002 -+++ lib/payload.c Thu May 19 16:26:46 2005 -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - /* - * payload_build_original convert the original request into a bit string -@@ -68,7 +69,7 @@ - p->rt = -1; - p->od.req = NULL; - return p; -- M_ASN1_New_Error(ASN1_F_X509_REQ_INFO_NEW); /* wrong error code */ -+ M_ASN1_New_Error(OPENSCEP_F_PAYLOAD_NEW); - } - - void payload_free(payload_t *a) { -@@ -171,7 +172,7 @@ - ret->od.spki = d2i_NETSCAPE_SPKI(&r2, &u, l); - break; - } -- M_ASN1_D2I_Finish(a, payload_free, ASN1_F_D2I_X509_REQ_INFO); -+ M_ASN1_D2I_Finish(a, payload_free, OPENSCEP_F_D2I_PAYLOAD); - } - - /* diff --git a/security/openscep/files/patch-lib_proxy.c b/security/openscep/files/patch-lib_proxy.c deleted file mode 100644 index 9d638ea39708..000000000000 --- a/security/openscep/files/patch-lib_proxy.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/proxy.c.orig -+++ lib/proxy.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - /* - * proxy_authenticator compute the proxy authenticator hash value diff --git a/security/openscep/files/patch-lib_sigattr.c b/security/openscep/files/patch-lib_sigattr.c deleted file mode 100644 index f90f9afc4600..000000000000 --- a/security/openscep/files/patch-lib_sigattr.c +++ /dev/null @@ -1,35 +0,0 @@ ---- lib/sigattr.c.orig Wed Feb 20 02:40:06 2002 -+++ lib/sigattr.c Thu May 19 16:26:46 2005 -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - /* - * read an attribute of type string -@@ -120,6 +121,7 @@ - X509_ATTRIBUTE *attr; - int i; - scepmsg_t *msg; -+ int single; - - if (debug) - BIO_printf(bio_err, "%s:%d: looking for attribute '%s'\n", -@@ -146,8 +148,14 @@ - for (i = 0; i < sk_X509_ATTRIBUTE_num(sig_attribs); i++) { - attr = sk_X509_ATTRIBUTE_value(sig_attribs, i); - if (OBJ_cmp(attr->object, asn1_obj) == 0) { -- if ((!attr->set) || (sk_ASN1_TYPE_num(attr->value.set) -- == 0)) { -+#if OPENSSL_VERSION_NUMBER < 0x00907000L -+ /* attr->set was replaced with attr->single (with opposite -+ meaning) somewhere between 0.9.6m-engine and 0.9.7d */ -+ single = !attr->set; -+#else -+ single = attr->single; -+#endif -+ if (single || (sk_ASN1_TYPE_num(attr->value.set) == 0)) { - BIO_printf(bio_err, "%s:%d: attr has no val\n", - __FILE__, __LINE__); - goto err; diff --git a/security/openscep/files/patch-scepd_Makefile.in b/security/openscep/files/patch-scepd_Makefile.in deleted file mode 100644 index 975147e37e41..000000000000 --- a/security/openscep/files/patch-scepd_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- scepd/Makefile.in.orig Thu May 19 16:41:14 2005 -+++ scepd/Makefile.in Thu May 19 16:41:26 2005 -@@ -132,7 +132,7 @@ - LDADD = ../lib/libscep.la - LDFLAGS = -R$(libdir) - --CPPFLAGS = -DOPENSCEPDIR=\"$(OPENSCEPDIR)\" -+CPPFLAGS += -DOPENSCEPDIR=\"$(OPENSCEPDIR)\" - - INCLUDES = $(INCLTDL) -I$(top_srcdir)/include -I$(OPENSSLDIR)/include - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/security/openscep/files/patch-scepd_dn2xid.c b/security/openscep/files/patch-scepd_dn2xid.c deleted file mode 100644 index 13b79fec6b1c..000000000000 --- a/security/openscep/files/patch-scepd_dn2xid.c +++ /dev/null @@ -1,10 +0,0 @@ ---- scepd/dn2xid.c.orig Mon Mar 26 14:36:47 2001 -+++ scepd/dn2xid.c Thu May 19 16:26:46 2005 -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/security/openscep/files/patch-scepd_scepconf.c b/security/openscep/files/patch-scepd_scepconf.c deleted file mode 100644 index 991ffe76e003..000000000000 --- a/security/openscep/files/patch-scepd_scepconf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- scepd/scepconf.c.orig 2001-03-03 23:23:22.000000000 +0100 -+++ scepd/scepconf.c 2014-07-10 22:26:24.326212726 +0200 -@@ -20,7 +20,11 @@ - int debug = 0; - - int main(int argc, char *argv[]) { -+#ifdef LHASH_OF -+ LHASH_OF(CONF_VALUE) *conf; -+#else - LHASH *conf; -+#endif - long eline; - char *section = NULL, *variable = NULL, *value; - int c, n; diff --git a/security/openscep/files/patch-scepd_sceplist.c b/security/openscep/files/patch-scepd_sceplist.c deleted file mode 100644 index 6fff4ae7bd07..000000000000 --- a/security/openscep/files/patch-scepd_sceplist.c +++ /dev/null @@ -1,32 +0,0 @@ ---- scepd/sceplist.c.orig Thu May 19 16:59:02 2005 -+++ scepd/sceplist.c Thu May 19 17:02:22 2005 -@@ -96,7 +96,6 @@ - /* - * convert ASN1 time string to a struct tm - */ --extern time_t timezone; /* compiler does not like it inside func */ - #ifdef HAVE_ALTZONE - extern time_t altzone; - #endif /* HAVE_ALTZONE */ -@@ -124,19 +123,15 @@ - rtm.tm_year = atoi(work); - if (rtm.tm_year < 70) - rtm.tm_year += 100; -+ rtm.tm_zone = 0; - -- /* set the time zone to GMT, as mktime uses the local time zone */ -- timezone = 0; - #ifdef HAVE_ALTZONE - altzone = 0; - #endif /* HAVE_ALTZONE */ - - /* use mktime to normalize the structure and t convert to a */ - /* time_t value */ -- rt = mktime(&rtm); -- -- /* reset the time zone to local settings */ -- tzset(); -+ rt = timegm(&rtm); - - return rt; - } diff --git a/security/openscep/files/pkg-message.in b/security/openscep/files/pkg-message.in deleted file mode 100644 index 4c68a3e7d0c4..000000000000 --- a/security/openscep/files/pkg-message.in +++ /dev/null @@ -1,18 +0,0 @@ -[ -{ type: install - message: <