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

2022-09-18 Thread Andreas Sturmlechner
commit: a225d84bd9545d4eefd0d138ea255c5fbcb8e995
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 28 15:02:17 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 18 18:36:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a225d84b

dev-libs/openssl-compat: drop 0.9.8z_p8-r2, EAPI-6--

Closes: https://bugs.gentoo.org/830942
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/openssl-compat/Manifest   |   1 -
 .../files/openssl-0.9.8e-bsd-sparc64.patch |  25 
 .../files/openssl-0.9.8h-ldflags.patch |  29 
 .../files/openssl-0.9.8m-binutils.patch|  24 ---
 .../files/openssl-0.9.8z_p8-perl-5.26.patch|  13 --
 .../openssl-compat-0.9.8z_p8-r2.ebuild | 165 -
 6 files changed, 257 deletions(-)

diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 09c469292b13..a1d91620a616 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -1,4 +1,3 @@
-DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 
610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364
 SHA512 
b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 
6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24
 SHA512 
5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B 
b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4
 SHA512 
a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B 
b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57
 SHA512 
c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32

diff --git a/dev-libs/openssl-compat/files/openssl-0.9.8e-bsd-sparc64.patch 
b/dev-libs/openssl-compat/files/openssl-0.9.8e-bsd-sparc64.patch
deleted file mode 100644
index a798164a9069..
--- a/dev-libs/openssl-compat/files/openssl-0.9.8e-bsd-sparc64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
 a/Configure
-+++ b/Configure
-@@ -365,7 +365,7 @@
- # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
- # simply *happens* to work around a compiler bug in gcc 3.3.3,
- # triggered by RIPEMD160 code.
--"BSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int 
-Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR 
DES_RISC2 BF_PTR:::des_enc-sparc.o 
fcrypt_b.o:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int 
-Wall::${BSDthreads}:ULTRASPARC::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT 
DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o 
fcrypt_b.o:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-ia64",   "gcc:-DL_ENDIAN -DTERMIOS -O3 
-Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG 
RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int 
-Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT 
DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
-
-the -B flag is a no-op nowadays
-
 a/crypto/des/Makefile
-+++ b/crypto/des/Makefile
-@@ -62,7 +62,7 @@
-   $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
- 
- des_enc-sparc.S:  asm/des_enc.m4
--  m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
-+  m4 asm/des_enc.m4 > des_enc-sparc.S
- 
- # ELF
- dx86-elf.s:   asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

diff --git a/dev-libs/openssl-compat/files/openssl-0.9.8h-ldflags.patch 
b/dev-libs/openssl-compat/files/openssl-0.9.8h-ldflags.patch
deleted file mode 100644
index 64cc7bde0504..
--- a/dev-libs/openssl-compat/files/openssl-0.9.8h-ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/181438
-http://bugs.gentoo.org/327421
-https://rt.openssl.org/Ticket/Display.html?id=3332=guest=guest
-
-make sure we respect LDFLAGS
-
-also make sure we don't add useless -rpath flags to the system libdir
-
 openssl-0.9.8h/Makefile.org
-+++ openssl-0.9.8h/Makefile.org
-@@ -180,6 +181,7 @@
-   MAKEDEPEND='{TOP}/util/domd {TOP} -MD ${MAKEDEPPROG}' \
-   DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'\
-   

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

2022-06-10 Thread Sam James
commit: f4106974d10ae6f195a40511fd92a8bda069ba84
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 11 03:38:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 11 03:39:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4106974

dev-libs/openssl-compat: add 1.1.1o

Needed for binaries which can't be rebuilt against openssl 3, like
dev-util/nvidia-cuda-toolkit.

Signed-off-by: Sam James  gentoo.org>

 dev-libs/openssl-compat/Manifest   |   3 +
 .../openssl-1.1.0j-parallel_install_fix.patch  |  21 ++
 .../files/openssl-1.1.1i-riscv32.patch |  61 +
 dev-libs/openssl-compat/metadata.xml   |   1 +
 .../openssl-compat/openssl-compat-1.1.1o.ebuild| 261 +
 5 files changed, 347 insertions(+)

diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 1d79926b78ff..09c469292b13 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -2,4 +2,7 @@ DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 
610bb4858900983cf4519fa8b63f1e03b384
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 
6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24
 SHA512 
5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B 
b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4
 SHA512 
a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B 
b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57
 SHA512 
c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
+DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 
23ef36d7bd05c98f7fab6de25681a53fa7a558d114548836b6cd90a57c4f4e45dc9fb622936053608b463320605b7df60db2d2caf3811b249f6ead3791a1c081
 SHA512 
577aec97fb31cd9efe3b30d82c560d3e7da57ae52c4de0f86e951b777a673830baaadcc5eb366c523024d37405531c6d32de26bbbc1e77df15c7822c72e937e6
+DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 
5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641
 SHA512 
75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
+DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B 
a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d
 SHA512 
da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 
6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71
 SHA512 
3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9

diff --git 
a/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch 
b/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch
new file mode 100644
index ..c837e208cf6a
--- /dev/null
+++ b/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch
@@ -0,0 +1,21 @@
+https://github.com/openssl/openssl/issues/7679
+
+--- a/Configurations/unix-Makefile.tmpl
 b/Configurations/unix-Makefile.tmpl
+@@ -77,8 +77,14 @@
+  # to. You're welcome.
+  sub dependmagic {
+  my $target = shift;
+-
+- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) 
_$target\n_$target";
++my $magic = <<"_";
++$target: build_generated depend
++   \$(MAKE) _$target
++_$target
++_
++   # Remove line ending
++   $magic =~ s|\R$||;
++   return $magic;
+  }
+  '';
+ -}

diff --git a/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch 
b/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch
new file mode 100644
index ..c94b0323eb43
--- /dev/null
+++ b/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch
@@ -0,0 +1,61 @@
+From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001
+From: Alistair Francis 
+Date: Thu, 29 Aug 2019 13:56:21 -0700
+Subject: [PATCH] Add support for io_pgetevents_time64 syscall
+
+32-bit architectures that are y2038 safe don't include syscalls that use
+32-bit time_t. Instead these architectures have suffixed syscalls that
+always use a 64-bit time_t. In the case of the io_getevents syscall the

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

2019-06-14 Thread Thomas Deutschmann
commit: cd72274be0151a5052b83d545e52647f96f51e6a
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May 28 18:59:32 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jun 14 17:46:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd72274b

dev-libs/openssl-compat: Split out of dev-libs/openssl

Signed-off-by: Michał Górny  gentoo.org>
Bug: https://bugs.gentoo.org/687984
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-libs/openssl-compat/Manifest   |   6 +
 dev-libs/openssl-compat/files/gentoo.config-0.9.8  | 144 +++
 dev-libs/openssl-compat/files/gentoo.config-1.0.2  | 169 
 .../files/openssl-0.9.8e-bsd-sparc64.patch |  25 ++
 .../files/openssl-0.9.8h-ldflags.patch |  29 +++
 .../files/openssl-0.9.8m-binutils.patch|  24 ++
 .../files/openssl-0.9.8z_p8-perl-5.26.patch|  13 +
 .../files/openssl-1.0.2p-hobble-ecc.patch  | 283 +
 dev-libs/openssl-compat/metadata.xml   |  19 ++
 .../openssl-compat-0.9.8z_p8-r1.ebuild | 164 
 .../openssl-compat/openssl-compat-1.0.2r.ebuild| 249 ++
 11 files changed, 1125 insertions(+)

diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
new file mode 100644
index 000..8fc04945964
--- /dev/null
+++ b/dev-libs/openssl-compat/Manifest
@@ -0,0 +1,6 @@
+DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 
610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364
 SHA512 
b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
+DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 
6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24
 SHA512 
5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
+DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 
9f9c2d2fe6eaf9acacab29b394a318f30c38e831a5f9c193b2da660f9d04acbf407d8b752274783765416c0f5ba557c24ee293ad7fb7d727771db289e6acc901
 SHA512 
6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235
+DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B 
d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb
 SHA512 
8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
+DIST openssl-1.0.2r_ectest.c 30735 BLAKE2B 
95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1
 SHA512 
f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
+DIST openssl-1.0.2r_hobble-openssl 1302 BLAKE2B 
647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960
 SHA512 
3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e

diff --git a/dev-libs/openssl-compat/files/gentoo.config-0.9.8 
b/dev-libs/openssl-compat/files/gentoo.config-0.9.8
new file mode 100644
index 000..02698250c19
--- /dev/null
+++ b/dev-libs/openssl-compat/files/gentoo.config-0.9.8
@@ -0,0 +1,144 @@
+#!/usr/bin/env bash
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# Openssl doesn't play along nicely with cross-compiling
+# like autotools based projects, so let's teach it new tricks.
+#
+# Review the bundled 'config' script to see why kind of targets
+# we can pass to the 'Configure' script.
+
+
+# Testing routines
+if [[ $1 == "test" ]] ; then
+   for c in \
+   "arm-gentoo-linux-uclibc  |linux-generic32 -DL_ENDIAN" \
+   "armv5b-linux-gnu |linux-generic32 -DB_ENDIAN" \
+   "x86_64-pc-linux-gnu  |linux-x86_64" \
+   "alphaev56-unknown-linux-gnu  |linux-alpha+bwx-gcc" \
+   "i686-pc-linux-gnu|linux-elf" \
+   "whatever-gentoo-freebsdX.Y   |BSD-generic32" \
+   "i686-gentoo-freebsdX.Y   |BSD-x86-elf" \
+   "sparc64-alpha-freebsdX.Y |BSD-sparc64" \
+   "ia64-gentoo-freebsd5.99234   |BSD-ia64" \
+   "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \
+   "hppa64-aldsF-linux-gnu5.3|linux-generic32 -DB_ENDIAN" \
+   "powerpc-gentOO-linux-uclibc  |linux-ppc" \
+   "powerpc64-unk-linux-gnu  |linux-ppc64" \
+   "x86_64-apple-darwinX |darwin64-x86_64-cc" \
+