[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/files/, app-admin/conserver/

[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/files/, app-admin/conserver/

[Georgy Yakovlev]

commit:     cff9a317b7d3d0b4f5d5e550fa0ef36696dd53e3
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 04:35:54 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 04:36:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff9a317

app-admin/conserver: backport libressl patch to 8.2.3

does not affect openssl users, hence no rebvump

Bug: https://bugs.gentoo.org/687542
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-admin/conserver/conserver-8.2.3.ebuild     |  2 ++
 app-admin/conserver/files/8.2.3-libressl.patch | 31 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
index 9a067d23f71..d9a7265bfba 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
 
+PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
+
 src_prepare() {
 	default
 	sed -e '/^INSTALL_PROGRAM/s:-s::' \

diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch
new file mode 100644
index 00000000000..8b04acb7b88
--- /dev/null
+++ b/app-admin/conserver/files/8.2.3-libressl.patch
@@ -0,0 +1,31 @@
+From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Thu, 6 Jun 2019 21:30:16 -0700
+Subject: [PATCH] libressl
+
+backport of https://github.com/conserver/conserver/pull/26
+---
+ conserver/cutil.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/conserver/cutil.h b/conserver/cutil.h
+index 63aef65..07aa6d4 100644
+--- a/conserver/cutil.h
++++ b/conserver/cutil.h
+@@ -12,10 +12,12 @@
+ # include <openssl/err.h>
+ # if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #  define TLS_method SSLv23_method
++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ #  define CIPHER_SEC0
+ # else
+ #  define CIPHER_SEC0 ":@SECLEVEL=0"
+-# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
+ #endif
+ #if HAVE_GSSAPI
+ # include <gssapi/gssapi.h>
+-- 
+2.21.0
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/files/, app-admin/conserver/

[Sam James]

commit:     038193aedf12586f89cca32768cacb4ef0d2991b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 17:29:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  1 18:06:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038193ae

app-admin/conserver: drop obsolete LibreSSL patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/conserver/conserver-8.2.3-r1.ebuild  |  2 --
 app-admin/conserver/files/8.2.3-libressl.patch | 31 --------------------------
 2 files changed, 33 deletions(-)

diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild b/app-admin/conserver/conserver-8.2.3-r1.ebuild
index bbd550947e0..063cb719746 100644
--- a/app-admin/conserver/conserver-8.2.3-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.3-r1.ebuild
@@ -30,8 +30,6 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
 
-PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
-
 src_prepare() {
 	default
 	sed -e '/^INSTALL_PROGRAM/s:-s::' \

diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch
deleted file mode 100644
index 8b04acb7b88..00000000000
--- a/app-admin/conserver/files/8.2.3-libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Thu, 6 Jun 2019 21:30:16 -0700
-Subject: [PATCH] libressl
-
-backport of https://github.com/conserver/conserver/pull/26
----
- conserver/cutil.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/conserver/cutil.h b/conserver/cutil.h
-index 63aef65..07aa6d4 100644
---- a/conserver/cutil.h
-+++ b/conserver/cutil.h
-@@ -12,10 +12,12 @@
- # include <openssl/err.h>
- # if OPENSSL_VERSION_NUMBER < 0x10100000L
- #  define TLS_method SSLv23_method
-+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- #  define CIPHER_SEC0
- # else
- #  define CIPHER_SEC0 ":@SECLEVEL=0"
--# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
- #endif
- #if HAVE_GSSAPI
- # include <gssapi/gssapi.h>
--- 
-2.21.0
-