public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/files/
@ 2021-03-22 14:05 Joonas Niilola
  0 siblings, 0 replies; only message in thread
From: Joonas Niilola @ 2021-03-22 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     cbdd192532694a211f8e50b6c06d5ab5f5e79a2c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 21 12:34:21 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 14:03:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbdd1925

app-admin/conserver: remove unused patch

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20031
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-admin/conserver/files/8.2.4-libressl.patch | 27 --------------------------
 1 file changed, 27 deletions(-)

diff --git a/app-admin/conserver/files/8.2.4-libressl.patch b/app-admin/conserver/files/8.2.4-libressl.patch
deleted file mode 100644
index 9151d697e75..00000000000
--- a/app-admin/conserver/files/8.2.4-libressl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d3ffe500c934573115e313ac01b8fab5cb4d2e9f Mon Sep 17 00:00:00 2001
-From: Stuart Henderson <stu@spacehopper.org>
-Date: Wed, 27 Mar 2019 23:29:31 +0000
-Subject: [PATCH] fix TLS with LibreSSL, it doesn't have :@SECLEVEL=0
-
----
- conserver/cutil.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/conserver/cutil.h b/conserver/cutil.h
-index d21abc5..db4df7f 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>


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-03-22 14:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-22 14:05 [gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/files/ Joonas Niilola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox