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
