[gentoo-commits] repo/gentoo:master commit in: net-libs/neon/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Mikle Kolyada" <zlogene@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/neon/
Date: Mon,  3 May 2021 08:51:50 +0000 (UTC)	[thread overview]
Message-ID: <1620031879.629d3356501ab24dd091a47d713f1724912a6831.zlogene@gentoo> (raw)

commit:     629d3356501ab24dd091a47d713f1724912a6831
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 08:51:19 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May  3 08:51:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629d3356

net-libs/neon: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-libs/neon/neon-0.30.2.ebuild | 12 ++----------
 net-libs/neon/neon-0.31.0.ebuild | 12 ++----------
 net-libs/neon/neon-0.31.1.ebuild | 12 ++----------
 net-libs/neon/neon-0.31.2.ebuild | 12 ++----------
 4 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 863f2e38958..0579d7c523d 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/27"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
 		)
 		!gnutls? (
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
 	)
@@ -46,13 +45,6 @@ src_prepare() {
 	# Fix compatibility with OpenSSL >=1.1.
 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
 
-	if has_version "<dev-libs/libressl-3.0.0"; then
-		# Support LibreSSL.
-		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
-		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
-		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
-	fi
-
 	eapply_user
 
 	AT_M4DIR="macros" eautoreconf

diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
index 1a5b84fea67..adbc8e2dcc7 100644
--- a/net-libs/neon/neon-0.31.0.ebuild
+++ b/net-libs/neon/neon-0.31.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/27"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
 		)
 		!gnutls? (
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
 	)
@@ -46,13 +45,6 @@ src_prepare() {
 	# Fix compatibility with OpenSSL >=1.1.
 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
 
-	if has_version "<dev-libs/libressl-3.0.0"; then
-		# Support LibreSSL.
-		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
-		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
-		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
-	fi
-
 	eapply_user
 
 	AT_M4DIR="macros" eautoreconf

diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild
index 06d89576f8d..a6ad1025fb5 100644
--- a/net-libs/neon/neon-0.31.1.ebuild
+++ b/net-libs/neon/neon-0.31.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/27"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
 		)
 		!gnutls? (
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
 	)
@@ -46,13 +45,6 @@ src_prepare() {
 	# Fix compatibility with OpenSSL >=1.1.
 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
 
-	if has_version "<dev-libs/libressl-3.0.0"; then
-		# Support LibreSSL.
-		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
-		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
-		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
-	fi
-
 	eapply_user
 
 	AT_M4DIR="macros" eautoreconf

diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild
index 0cfe9882b5e..27109c64f22 100644
--- a/net-libs/neon/neon-0.31.2.ebuild
+++ b/net-libs/neon/neon-0.31.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/27"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
 		)
 		!gnutls? (
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
 	)
@@ -46,13 +45,6 @@ src_prepare() {
 	# Fix compatibility with OpenSSL >=1.1.
 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
 
-	if has_version "<dev-libs/libressl-3.0.0"; then
-		# Support LibreSSL.
-		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
-		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
-		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
-	fi
-
 	eapply_user
 
 	AT_M4DIR="macros" eautoreconf

next             reply	other threads:[~2021-05-03  8:51 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-03  8:51 Mikle Kolyada [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-25 22:57 [gentoo-commits] repo/gentoo:master commit in: net-libs/neon/ Sam James
2024-11-24  8:03 Joonas Niilola
2024-11-24  8:03 Joonas Niilola
2024-11-23 16:32 Sam James
2024-11-23 16:29 Sam James
2024-11-23 16:27 Sam James
2024-11-23 16:27 Sam James
2024-02-28  6:55 Joonas Niilola
2023-06-05  5:39 Sam James
2023-05-04 19:04 Jakov Smolić
2023-01-25  6:44 Jakov Smolić
2022-10-20 10:56 Jakov Smolić
2022-10-16  8:55 Agostino Sarubbo
2022-10-16  8:55 Agostino Sarubbo
2022-10-15 14:28 Arthur Zamarin
2022-10-15 14:28 Arthur Zamarin
2022-10-15 14:28 Arthur Zamarin
2022-09-11 14:18 Craig Andrews
2022-09-06 13:42 Jakov Smolić
2022-09-06 12:47 Craig Andrews
2022-08-12 12:26 WANG Xuerui
2022-06-08  7:42 Jakov Smolić
2022-02-11 12:25 Sam James
2022-02-08  7:24 Agostino Sarubbo
2022-02-08  7:23 Agostino Sarubbo
2022-02-08  7:22 Agostino Sarubbo
2022-02-08  2:02 Sam James
2022-02-07  9:05 Jakov Smolić
2022-02-07  9:05 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-02-01 18:19 Jakov Smolić
2022-01-12 18:49 Craig Andrews
2021-10-25 19:29 Arthur Zamarin
2021-09-24 23:40 Sam James
2021-02-28 20:40 Sergei Trofimovich
2021-01-20  9:30 Sam James
2021-01-20  9:29 Sam James
2021-01-20  9:28 Sam James
2021-01-20  0:52 Sam James
2021-01-20  0:52 Sam James
2021-01-20  0:05 Sam James
2020-12-27 17:52 Fabian Groffen
2020-06-20 14:31 Craig Andrews
2020-04-17 14:43 Craig Andrews
2020-04-17 14:43 Craig Andrews
2020-04-17 14:43 Craig Andrews
2020-03-29  2:01 Craig Andrews
2020-03-28 22:08 Craig Andrews
2020-03-28 21:24 Craig Andrews
2019-09-29  2:56 Mike Gilbert
2019-09-29  2:56 Mike Gilbert
2019-08-09 18:39 Mike Gilbert
2019-05-05 19:05 Mike Gilbert
2019-02-25 21:25 Mike Gilbert
2018-12-19 17:59 Mike Gilbert
2018-08-05 21:48 Patrice Clement
2017-03-16 18:36 Jeroen Roovers
2017-03-11 17:07 Agostino Sarubbo
2017-03-11  3:04 Mike Gilbert
2017-03-04 14:02 Agostino Sarubbo
2017-03-02 10:47 Agostino Sarubbo
2017-03-01  7:55 Michael Weber
2017-03-01  1:16 Michael Weber
2017-02-28 11:22 Tobias Klausmann
2017-02-27  8:24 Agostino Sarubbo
2017-02-24 22:11 Michael Weber
2017-02-02 20:06 Mike Gilbert
2017-01-27 17:34 Mike Gilbert
2015-10-04 20:03 Julian Ospald

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:863f2e3895 dfblob:0579d7c523 dfblob:1a5b84fea6
dfblob:adbc8e2dcc dfblob:06d89576f8 dfblob:a6ad1025fb dfblob:0cfe9882b5
dfblob:27109c64f2 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-libs/neon/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1620031879.629d3356501ab24dd091a47d713f1724912a6831.zlogene@gentoo \
    --to=zlogene@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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