| 1 |
commit: 038193aedf12586f89cca32768cacb4ef0d2991b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 1 17:29:56 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 1 18:06:23 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038193ae |
| 7 |
|
| 8 |
app-admin/conserver: drop obsolete LibreSSL patch |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
app-admin/conserver/conserver-8.2.3-r1.ebuild | 2 -- |
| 13 |
app-admin/conserver/files/8.2.3-libressl.patch | 31 -------------------------- |
| 14 |
2 files changed, 33 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild b/app-admin/conserver/conserver-8.2.3-r1.ebuild |
| 17 |
index bbd550947e0..063cb719746 100644 |
| 18 |
--- a/app-admin/conserver/conserver-8.2.3-r1.ebuild |
| 19 |
+++ b/app-admin/conserver/conserver-8.2.3-r1.ebuild |
| 20 |
@@ -30,8 +30,6 @@ RDEPEND="${DEPEND} |
| 21 |
|
| 22 |
DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts) |
| 23 |
|
| 24 |
-PATCHES=( "${FILESDIR}/${PV}-libressl.patch" ) |
| 25 |
- |
| 26 |
src_prepare() { |
| 27 |
default |
| 28 |
sed -e '/^INSTALL_PROGRAM/s:-s::' \ |
| 29 |
|
| 30 |
diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index 8b04acb7b88..00000000000 |
| 33 |
--- a/app-admin/conserver/files/8.2.3-libressl.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,31 +0,0 @@ |
| 36 |
-From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001 |
| 37 |
-From: Georgy Yakovlev <gyakovlev@g.o> |
| 38 |
-Date: Thu, 6 Jun 2019 21:30:16 -0700 |
| 39 |
-Subject: [PATCH] libressl |
| 40 |
- |
| 41 |
-backport of https://github.com/conserver/conserver/pull/26 |
| 42 |
---- |
| 43 |
- conserver/cutil.h | 4 +++- |
| 44 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
| 45 |
- |
| 46 |
-diff --git a/conserver/cutil.h b/conserver/cutil.h |
| 47 |
-index 63aef65..07aa6d4 100644 |
| 48 |
---- a/conserver/cutil.h |
| 49 |
-+++ b/conserver/cutil.h |
| 50 |
-@@ -12,10 +12,12 @@ |
| 51 |
- # include <openssl/err.h> |
| 52 |
- # if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 53 |
- # define TLS_method SSLv23_method |
| 54 |
-+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
| 55 |
-+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
| 56 |
- # define CIPHER_SEC0 |
| 57 |
- # else |
| 58 |
- # define CIPHER_SEC0 ":@SECLEVEL=0" |
| 59 |
--# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
| 60 |
-+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ |
| 61 |
- #endif |
| 62 |
- #if HAVE_GSSAPI |
| 63 |
- # include <gssapi/gssapi.h> |
| 64 |
--- |
| 65 |
-2.21.0 |
| 66 |
- |
Archives