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