[gentoo-commits] repo/gentoo:master commit in: dev-libs/openpace/files/, dev-libs/openpace/

2023-08-10 Thread David Seifert
commit: 7ecfdd498575da6be434947ccbb81637d6920305
Author: David Seifert  gentoo  org>
AuthorDate: Thu Aug 10 14:33:44 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Aug 10 14:33:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ecfdd49

dev-libs/openpace: drop 1.1.2

Signed-off-by: David Seifert  gentoo.org>

 dev-libs/openpace/Manifest |  1 -
 .../files/openpace-1.1.2-openssl-3.0-1.patch   | 25 ---
 .../files/openpace-1.1.2-openssl-3.0-2.patch   | 76 --
 .../files/openpace-1.1.2-openssl-3.0-3.patch   | 23 ---
 dev-libs/openpace/openpace-1.1.2.ebuild| 52 ---
 5 files changed, 177 deletions(-)

diff --git a/dev-libs/openpace/Manifest b/dev-libs/openpace/Manifest
index b0d5d962c0df..42119cdbeff5 100644
--- a/dev-libs/openpace/Manifest
+++ b/dev-libs/openpace/Manifest
@@ -1,2 +1 @@
-DIST openpace-1.1.2.tar.gz 3040254 BLAKE2B 
4320b0ec01e80379f8c6b1812af6e7b09a8305a448caf432735554d05380b2f29133e92bffab62ad31077c410eceb5d0c68d65343394ebc24aa92dbefe321549
 SHA512 
812852300cee2ba021809b6c1caa686ecb7fe3eb23bcc7f4c0ce34258460f685bd70027f62f046643710bc549c0037af80d26d7089dd71341818ec7ec1db8d94
 DIST openpace-1.1.3.tar.gz 3472674 BLAKE2B 
1b3785935d51c987f2cdc27126de632296690601d7cd5bce6cbc157e7161d0eff0885081d5da81df5a0cfb0616050bda01b7895d9069f4c2a61871f261b1fd4f
 SHA512 
ae6cde02e49f13070cff83393972a3433303f1372acfde295f86e7049d9e8da9e8e9b74a85374ff99d0c15d9c68d3670fd8badc963232712c5cc27c863eb385f

diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch 
b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch
deleted file mode 100644
index 8802c2528f18..
--- a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8b2c8a76873da4862dbf4240c901f3e6d4bc040a Mon Sep 17 00:00:00 2001
-From: Frank Morgner 
-Date: Sat, 18 Dec 2021 00:15:39 +0100
-Subject: [PATCH] fixed outdated API usage of BN_zero
-
-returns void since 0.9.8

- src/eac.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/eac.c b/src/eac.c
-index ea84253..9dccd79 100644
 a/src/eac.c
-+++ b/src/eac.c
-@@ -105,7 +105,9 @@ int EAC_reset_ssc(const EAC_CTX *ctx)
- if (!ctx)
- return 0;
- 
--return BN_zero(ctx->ssc);
-+BN_zero(ctx->ssc);
-+
-+return 1;
- }
- 
- int EAC_set_ssc(const EAC_CTX *ctx, unsigned long ssc)

diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch 
b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch
deleted file mode 100644
index d2ac244a1a7d..
--- a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 2d94a152dd36543d2a713f1abe20717fdaafae0a Mon Sep 17 00:00:00 2001
-From: Frank Morgner 
-Date: Sat, 18 Dec 2021 00:15:04 +0100
-Subject: [PATCH] added basic compatibility with OpenSSL 3.0
-
-deprecated warnings are not handled for now
-
-fixes https://github.com/frankmorgner/openpace/issues/53

- src/eac/cv_cert.h |  6 +-
- src/eac_util.c| 14 ++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/src/eac/cv_cert.h b/src/eac/cv_cert.h
-index f8c6565..595eb9c 100644
 a/src/eac/cv_cert.h
-+++ b/src/eac/cv_cert.h
-@@ -341,7 +341,11 @@ CVC_CERT *CVC_d2i_CVC_CERT(CVC_CERT **cert, const 
unsigned char **in, long len);
-  * @return Number of bytes successfully encoded or a negative value if an
-  * error occured.
-  */
--int i2d_CVC_CERT(CVC_CERT *a, unsigned char **out);
-+int i2d_CVC_CERT(
-+#if OPENSSL_VERSION_NUMBER >= 0x3000L
-+  const
-+#endif
-+  CVC_CERT *a, unsigned char **out);
- 
- /**
-  * @brief Duplicate a CV certificate
-diff --git a/src/eac_util.c b/src/eac_util.c
-index e87293c..6e518e0 100644
 a/src/eac_util.c
-+++ b/src/eac_util.c
-@@ -321,6 +321,8 @@ randb(int numbytes)
- return NULL;
- }
- 
-+#include 
-+
- BUF_MEM *
- retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
- {
-@@ -331,6 +333,11 @@ retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
- 
- check(key, "Invalid arguments");
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x3000L
-+OSSL_PROVIDER *legacy;
-+legacy = OSSL_PROVIDER_load(NULL, "legacy");
-+#endif
-+
- len = EVP_CIPHER_block_size(EVP_des_cbc());
- check(key->length >= 2*len, "Key too short");
- 
-@@ -369,6 +376,9 @@ retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
- BUF_MEM_free(c_tmp);
- BUF_MEM_free(d_tmp);
- EVP_CIPHER_CTX_free(ctx);
-+#if OPENSSL_VERSION_NUMBER >= 0x3000L
-+OSSL_PROVIDER_unload(legacy);
-+#endif
- 
- return mac;
- 
-@@ -381,6 +391,10 @@ retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
- BUF_MEM_free(d_tmp);
- if (ctx)
- EVP_CIPHER_CTX_free(ctx);
-+#if OPENSSL_VERSION_NUMBER >= 0x3000L
-+if (legacy)
-+OSSL_PROVIDER_unload(legacy);
-+#endif
- 
- return NULL;
- }

diff --git 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/openpace/files/, dev-libs/openpace/

2022-10-03 Thread David Seifert
commit: 31e47e54f33d6aea9cd40b72be0775e9102b19aa
Author: David Seifert  gentoo  org>
AuthorDate: Mon Oct  3 10:07:22 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct  3 10:07:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e47e54

dev-libs/openpace: fix openssl conditional include

Closes: https://bugs.gentoo.org/872518
Signed-off-by: David Seifert  gentoo.org>

 ...sl.patch => openpace-1.1.2-openssl-3.0-1.patch} |  0
 0.patch => openpace-1.1.2-openssl-3.0-2.patch} |  0
 .../files/openpace-1.1.2-openssl-3.0-3.patch   | 23 ++
 dev-libs/openpace/openpace-1.1.2.ebuild|  5 +++--
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl.patch 
b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch
similarity index 100%
rename from dev-libs/openpace/files/openpace-1.1.2-openssl.patch
rename to dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch

diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0.patch 
b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch
similarity index 100%
rename from dev-libs/openpace/files/openpace-1.1.2-openssl-3.0.patch
rename to dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch

diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch 
b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch
new file mode 100644
index ..9ae0221adb7b
--- /dev/null
+++ b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch
@@ -0,0 +1,23 @@
+From 4c22789d264bd249cfff1c3e69466991e58a76cf Mon Sep 17 00:00:00 2001
+From: Frank Morgner 
+Date: Mon, 20 Dec 2021 02:32:58 +0100
+Subject: [PATCH] fixed openssl 3 include
+
+---
+ src/eac_util.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/eac_util.c b/src/eac_util.c
+index 6e518e0..c9196fd 100644
+--- a/src/eac_util.c
 b/src/eac_util.c
+@@ -321,7 +321,9 @@ randb(int numbytes)
+ return NULL;
+ }
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x3000L
+ #include 
++#endif
+ 
+ BUF_MEM *
+ retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)

diff --git a/dev-libs/openpace/openpace-1.1.2.ebuild 
b/dev-libs/openpace/openpace-1.1.2.ebuild
index 308f5d566c47..71a45675d0f0 100644
--- a/dev-libs/openpace/openpace-1.1.2.ebuild
+++ b/dev-libs/openpace/openpace-1.1.2.ebuild
@@ -21,8 +21,9 @@ DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-   "${FILESDIR}"/${P}-openssl.patch
-   "${FILESDIR}"/${P}-openssl-3.0.patch
+   "${FILESDIR}"/${P}-openssl-3.0-1.patch
+   "${FILESDIR}"/${P}-openssl-3.0-2.patch
+   "${FILESDIR}"/${P}-openssl-3.0-3.patch
 )
 
 src_prepare() {