[packages/ekg2] - updated to current git (last change on 20190315), fixes build with current gnutls

qboosh qboosh at pld-linux.org
Wed Jul 23 18:05:18 CEST 2025 

commit ba9d3c0a2631930b3edf112b9f4fcb9b7e90e2ea
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 23 18:07:01 2025 +0200

    - updated to current git (last change on 20190315), fixes build with current gnutls

 ekg2.spec     | 110 ++++++++++++++++++++++++++++------------------------------
 openssl.patch |  31 -----------------
 2 files changed, 53 insertions(+), 88 deletions(-)
---
diff --git a/ekg2.spec b/ekg2.spec
index 65b7532..39a8b7f 100644
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -7,24 +7,23 @@
 %bcond_without	gtk		# gtk plugin
 %bcond_without	jabber		# jabber plugin
 %bcond_without	gnutls		# TLS support in jabber plugin
-%bcond_with	libgsm		# libgsm plugin
+%bcond_with	libgsm		# gsm plugin (not supported by build system)
 %bcond_without	perl		# Perl plugin
 %bcond_without	python		# Python plugin
 %bcond_without	readline	# readline interface
 %bcond_with	sqlite		# SQLite 2 support in logsqlite plugin (conflicts with sqlite3)
 %bcond_without	sqlite3		# SQLite 3 support in logsqlite plugin
-%bcond_with	xosd		# xosd plugin
+%bcond_with	xosd		# xosd plugin (not supported by build system)
 %bcond_with	git		# checkout git master instead of Source0 - requested by ekg2 developer
 %bcond_with	irckeepalive	# patch that check irc connection and disconnect when server dies
 
 %if %{with git}
 %define		subver git.%(date +%Y%m%d)
 %else
-%define		subver 20180902
+%define	gitref	f427d083ee899d42532c046100490a915b0e8a82
+%define	subver	20190316
 %endif
 
-%define		rel 11
-
 %if %{with sqlite}
 %undefine sqlite3
 %endif
@@ -33,47 +32,48 @@ Summary:	Multi-protocol instant messaging and chat client
 Summary(pl.UTF-8):	Wieloprotokołowy komunikator internetowy
 Name:		ekg2
 Version:	0.4
+%define	rel	1
 Release:	0.%{subver}.%{rel}
 Epoch:		2
 License:	GPL v2+
 Group:		Applications/Communications
 %if %{without git}
-Source0:	https://github.com/ekg2/ekg2/archive/9cd1d7b/%{name}-%{subver}.tar.gz
-# Source0-md5:	2ce452ebcecc03532dee956c5648d890
+Source0:	https://github.com/ekg2/ekg2/archive/%{gitref}/%{name}-%{subver}.tar.gz
+# Source0-md5:	8229554ddeeda23d2a83c0ed35325453
 %endif
 Patch0:		%{name}-perl-install.patch
 Patch1:		%{name}-gtk.patch
 Patch2:		%{name}-bug-63.patch
 Patch3:		%{name}-keepalive_irc.patch
-Patch4:		openssl.patch
 URL:		https://github.com/ekg2/ekg2
 %{?with_aspell:BuildRequires:	aspell-devel}
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.6
 %if %{with rss} || %{with jabber}
-BuildRequires:	expat-devel
+BuildRequires:	expat-devel >= 1.95
 %endif
 BuildRequires:	gettext-tools >= 0.17-8
 %{?with_gadugadu:BuildRequires:	giflib-devel}
 %{?with_git:BuildRequires:	git-core}
+BuildRequires:	glib2-devel >= 1:2.24
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 1.2.5}
 %{?with_gpg:BuildRequires:	gpgme-devel}
 %{?with_gtk:BuildRequires:	gtk+2-devel >= 2:2.14.1}
 %{?with_gadugadu:BuildRequires:	libgadu-devel}
 %{?with_libgsm:BuildRequires:	libgsm-devel}
 %{?with_gadugadu:BuildRequires:	libjpeg-devel}
-BuildRequires:	libltdl-devel
-BuildRequires:	libtool
+BuildRequires:	libltdl-devel >= 2:2
+BuildRequires:	libtool >= 2:2
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 %{?with_perl:BuildRequires:	perl-devel}
 BuildRequires:	pkgconfig
-%{?with_python:BuildRequires:	python-devel}
+%{?with_python:BuildRequires:	python-devel >= 1:2.4}
 %{?with_readline:BuildRequires:	readline-devel}
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
-%{?with_sqlite3:BuildRequires:	sqlite3-devel}
+%{?with_sqlite3:BuildRequires:	sqlite3-devel >= 3}
 %{?with_xosd:BuildRequires:	xosd-devel}
 BuildRequires:	zlib-devel
 Obsoletes:	ekg2-plugin-ioctld < 2:0.4-0.20110305
@@ -313,8 +313,7 @@ git init
 git fetch $repo $branch
 git checkout FETCH_HEAD
 %else
-%setup -q -c -n %{name}-%{subver}
-%{__mv} ekg2-ekg2-*/* .
+%setup -q -n %{name}-%{gitref}
 %endif
 
 %patch -P0 -p1
@@ -325,8 +324,6 @@ git checkout FETCH_HEAD
 %patch -P3 -p1
 %endif
 
-%patch -P4 -p1
-
 touch po/Makefile.in.in
 find -name *.c > po/POTFILES.in
 
@@ -344,25 +341,24 @@ find -name *.c > po/POTFILES.in
 CFLAGS="%{rpmcflags} -D_GNU_SOURCE"
 CPPFLAGS="%{rpmcppflags} -DNCURSES_INTERNALS"
 %configure \
-	--enable-unicode \
-	--with%{!?with_aspell:out}-aspell \
-	--with%{!?with_gadugadu:out}-libgadu \
-	%{!?with_gpg:--without-gpg} \
-	--with%{!?with_gtk:out}-gtk \
-	--with%{!?with_gnutls:out}-libgnutls \
+	--disable-nntp \
+	--with-aspell%{!?with_aspell:=no} \
 %if %{with rss} || %{with jabber}
-		--with-expat \
+	--with-expat \
 %else
-		--without-expat \
+	--without-expat \
 %endif
-	--with%{!?with_libgsm:out}-libgsm \
+	%{!?with_gpg:--without-gpg} \
+	--with-gnutls%{!?with_gnutls:=no} \
+	--with-gtk%{!?with_gtk:=no} \
+	--with-libgadu%{!?with_gadugadu:=no} \
+	%{?with_libgsm:--with-libgsm} \
 	%{!?with_perl:--without-perl} \
-	--with%{!?with_python:out}-python \
-	--with%{!?with_readline:out}-readline \
-	--with%{!?with_sqlite:out}-sqlite \
-	--with%{!?with_sqlite3:out}-sqlite3 \
-	--with%{!?with_xosd:out}-xosd \
-	--disable-nntp
+	--with-python%{!?with_python:=no} \
+	--with-readline%{!?with_readline:=no} \
+	--with-sqlite%{!?with_sqlite:=no} \
+	--with-sqlite3%{!?with_sqlite3:=no} \
+	%{?with_xosd:--with-xosd}
 
 %{__make}
 
@@ -385,19 +381,19 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/autoresponder.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/autoresponder.la
+%{_libdir}/%{name}/plugins/autoresponder.la
 %{_datadir}/%{name}/plugins/autoresponder
 %attr(755,root,root) %{_libdir}/%{name}/plugins/logs.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/logs.la
+%{_libdir}/%{name}/plugins/logs.la
 %attr(755,root,root) %{_libdir}/%{name}/plugins/mail.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/mail.la
+%{_libdir}/%{name}/plugins/mail.la
 %{_datadir}/%{name}/plugins/mail
 %attr(755,root,root) %{_libdir}/%{name}/plugins/ncurses.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/ncurses.la
+%{_libdir}/%{name}/plugins/ncurses.la
 %attr(755,root,root) %{_libdir}/%{name}/plugins/rc.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/rc.la
+%{_libdir}/%{name}/plugins/rc.la
 %attr(755,root,root) %{_libdir}/%{name}/plugins/sms.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/sms.la
+%{_libdir}/%{name}/plugins/sms.la
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/*.txt
@@ -411,13 +407,13 @@ rm -rf $RPM_BUILD_ROOT
 %files plugin-rss
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/rss.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/rss.la
+%{_libdir}/%{name}/plugins/rss.la
 
 %if %{with gpg}
 %files plugin-gpg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/gpg.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/gpg.la
+%{_libdir}/%{name}/plugins/gpg.la
 %dir %{_datadir}/ekg2/plugins/gpg
 %{_datadir}/ekg2/plugins/gpg/commands-en.txt
 %{_datadir}/ekg2/plugins/gpg/commands-pl.txt
@@ -427,69 +423,69 @@ rm -rf $RPM_BUILD_ROOT
 %files plugin-gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/gtk.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/gtk.la
+%{_libdir}/%{name}/plugins/gtk.la
 %endif
 
 %files plugin-jogger
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/jogger.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/jogger.la
+%{_libdir}/%{name}/plugins/jogger.la
 
 %if %{with sqlite} || %{with sqlite3}
 %files plugin-logsqlite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/logsqlite.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/logsqlite.la
+%{_libdir}/%{name}/plugins/logsqlite.la
 %{_datadir}/%{name}/plugins/logsqlite
 %endif
 
 %files plugin-protocol-gg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/gg.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/gg.la
+%{_libdir}/%{name}/plugins/gg.la
 %{_datadir}/%{name}/plugins/gg
 
 %if %{with libgsm}
 %files plugin-protocol-gsm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/gsm.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/gsm.la
+%{_libdir}/%{name}/plugins/gsm.la
 %endif
 
 %files plugin-protocol-icq
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/icq.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/icq.la
+%{_libdir}/%{name}/plugins/icq.la
 
 %files plugin-protocol-irc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/irc.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/irc.la
+%{_libdir}/%{name}/plugins/irc.la
 %{_datadir}/%{name}/plugins/irc
 
 %if %{with jabber}
 %files plugin-protocol-jabber
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/jabber.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/jabber.la
+%{_libdir}/%{name}/plugins/jabber.la
 %{_datadir}/%{name}/plugins/jabber
 %endif
 
 %files plugin-protocol-polchat
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/polchat.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/polchat.la
+%{_libdir}/%{name}/plugins/polchat.la
 
 %files plugin-protocol-rivchat
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/rivchat.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/rivchat.la
+%{_libdir}/%{name}/plugins/rivchat.la
 
 %if %{with readline}
 %files plugin-readline
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/readline.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/readline.la
+%{_libdir}/%{name}/plugins/readline.la
 %{_datadir}/%{name}/plugins/readline
 %endif
 
@@ -497,7 +493,7 @@ rm -rf $RPM_BUILD_ROOT
 %files plugin-scripting-perl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/perl.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/perl.la
+%{_libdir}/%{name}/plugins/perl.la
 %{perl_vendorarch}/Ekg2.pm
 %dir %{perl_vendorarch}/Ekg2
 %{perl_vendorarch}/Ekg2/Irc.pm
@@ -512,7 +508,7 @@ rm -rf $RPM_BUILD_ROOT
 %files plugin-scripting-python
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/python.la
+%{_libdir}/%{name}/plugins/python.la
 %{_datadir}/%{name}/scripts/*.py
 %dir %{_datadir}/ekg2/plugins/python
 %{_datadir}/ekg2/plugins/python/commands-en.txt
@@ -522,13 +518,13 @@ rm -rf $RPM_BUILD_ROOT
 %files plugin-sim
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/sim.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/sim.la
+%{_libdir}/%{name}/plugins/sim.la
 %{_datadir}/%{name}/plugins/sim
 
 %if %{with xosd}
 %files plugin-xosd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/xosd.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/xosd.la
+%{_libdir}/%{name}/plugins/xosd.la
 %{_datadir}/%{name}/plugins/xosd
 %endif
diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644
index 8504dd9..0000000
--- a/openssl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ekg2-20180902/plugins/sim/simlite.c~	2018-08-01 15:34:40.000000000 +0200
-+++ ekg2-20180902/plugins/sim/simlite.c	2018-09-20 20:44:14.370347788 +0200
-@@ -185,7 +185,7 @@ char *sim_key_fingerprint(const char *ui
- 	RSA *key = sim_key_read(uid, NULL);
- 	unsigned char md_value[EVP_MAX_MD_SIZE], *buf, *newbuf;
- 	char *result = NULL;
--	EVP_MD_CTX ctx;
-+	EVP_MD_CTX *ctx;
- 	unsigned int md_len;
- 	int size, i;
- 
-@@ -208,10 +208,14 @@ char *sim_key_fingerprint(const char *ui
- 		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/ekg2.git/commitdiff/ba9d3c0a2631930b3edf112b9f4fcb9b7e90e2ea

More information about the pld-cvs-commit mailing list