[packages/ekg] - release 16 (openssl-1.1 build fix)

adamg adamg at pld-linux.org
Sun Sep 23 16:31:20 CEST 2018


commit ec750642e44e3f02aeabdb5091190f4b1a23cf9f
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Sun Sep 23 16:30:39 2018 +0200

    - release 16 (openssl-1.1 build fix)

 ekg-openssl.patch | 30 ++++++++++++++++++++++++++++++
 ekg.spec          |  4 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/ekg.spec b/ekg.spec
index 6167f14..c072c3c 100644
--- a/ekg.spec
+++ b/ekg.spec
@@ -14,7 +14,7 @@ Summary(it.UTF-8):	Un cliente compatibile con Gadu-Gadu
 Summary(pl.UTF-8):	Klient kompatybilny z Gadu-Gadu
 Name:		ekg
 Version:	1.7
-Release:	15
+Release:	16
 Epoch:		4
 License:	GPL v2
 Group:		Applications/Communications
@@ -25,6 +25,7 @@ Patch0:		%{name}-LDFLAGS.patch
 Patch1:		%{name}-lock_reason.patch
 Patch2:		%{name}-external_libgadu.patch
 Patch3:		%{name}-giflib.patch
+Patch4:		%{name}-openssl.patch
 URL:		http://ekg.chmurka.net/
 BuildRequires:	%{_bindir}/perl
 %{?with_aspell:BuildRequires:	aspell-devel}
@@ -100,6 +101,7 @@ polsku (jednak komendy są w języku angielskim).
 %endif
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal} -I m4
diff --git a/ekg-openssl.patch b/ekg-openssl.patch
new file mode 100644
index 0000000..995c862
--- /dev/null
+++ b/ekg-openssl.patch
@@ -0,0 +1,30 @@
+--- ekg-1.7/src/simlite.c.orig	2018-09-23 16:27:02.621928366 +0200
++++ ekg-1.7/src/simlite.c	2018-09-23 16:28:33.260028046 +0200
+@@ -180,7 +180,7 @@
+ 	RSA *key = sim_key_read(uin);
+ 	unsigned char md_value[EVP_MAX_MD_SIZE], *buf, *newbuf;
+ 	char *result = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	int md_len, size, i;
+ 
+ 	if (!key)
+@@ -200,10 +200,14 @@
+ 		size = i2d_RSAPublicKey(key, &newbuf);
+ 	else
+ 		size = i2d_RSAPrivateKey(key, &newbuf);
+-	
+-	EVP_DigestInit(&ctx, EVP_sha1());	
+-	EVP_DigestUpdate(&ctx, buf, size);
+-	EVP_DigestFinal(&ctx, md_value, &md_len);
++
++	ctx = EVP_MD_CTX_create();
++	if (!ctx)
++		return NULL;
++	EVP_DigestInit(ctx, EVP_sha1());	
++	EVP_DigestUpdate(ctx, buf, size);
++	EVP_DigestFinal(ctx, md_value, &md_len);
++	EVP_MD_CTX_free(ctx);
+ 
+ 	free(buf);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ekg.git/commitdiff/ec750642e44e3f02aeabdb5091190f4b1a23cf9f



More information about the pld-cvs-commit mailing list