diff options
| author | Rosen Penev <rosenp@gmail.com> | 2018-12-13 14:39:55 -0800 |
|---|---|---|
| committer | tripolar <tripolar@users.noreply.github.com> | 2019-02-18 00:29:15 +0100 |
| commit | 41a431cd568ef5ce31b184bc5b29dd7a1770d416 (patch) | |
| tree | 3d335561641af7c5b5766b7b075c411bb890915b /net/git | |
| parent | d89cd30a79c7219b25e0d81d6f3faabcad9bb544 (diff) | |
git: Fix compilation without deprecated OpenSSL APIs
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/git')
| -rw-r--r-- | net/git/Makefile | 2 | ||||
| -rw-r--r-- | net/git/patches/300-openssl-deprecated.patch | 32 |
2 files changed, 33 insertions, 1 deletions
diff --git a/net/git/Makefile b/net/git/Makefile index 3b8017948..f6257b9d2 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git PKG_VERSION:=2.20.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ diff --git a/net/git/patches/300-openssl-deprecated.patch b/net/git/patches/300-openssl-deprecated.patch new file mode 100644 index 000000000..e3a9ad831 --- /dev/null +++ b/net/git/patches/300-openssl-deprecated.patch @@ -0,0 +1,32 @@ +From fa37195d8378ac958d1f9bd884b47bd73730040e Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Thu, 27 Dec 2018 09:58:07 -0800 +Subject: [PATCH] imap-send: Fix compilation without deprecated OpenSSL APIs + +Initialization in OpenSSL has been deprecated in version 1.1. This makes +compilation fail when deprecated APIs for OpenSSL are compile-time +disabled. + +Signed-off-by: Rosen Penev <rosenp@gmail.com> +--- + imap-send.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/imap-send.c b/imap-send.c +index b4eb886e2..877a4e368 100644 +--- a/imap-send.c ++++ b/imap-send.c +@@ -284,8 +284,10 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve + int ret; + X509 *cert; + ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + SSL_library_init(); + SSL_load_error_strings(); ++#endif + + meth = SSLv23_method(); + if (!meth) { +-- +2.20.1 + |