[PR PATCH] gkrellm: update to 2.3.11

[PR PATCH] gkrellm: update to 2.3.11

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages gkrellm
https://github.com/void-linux/void-packages/pull/17944

gkrellm: update to 2.3.11
Tested mail after my LibreSSL workaround, and it worked fine. Current version in repo did not
Signed-off-by: Nathan Owens <ndowens04@gmail.com>

A patch file from https://github.com/void-linux/void-packages/pull/17944.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gkrellm-17944.patch --]
[-- Type: text/x-diff, Size: 2527 bytes --]

From 7838946dfb5ff2da002cff76bebaf4ba72fd1131 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Tue, 31 Dec 2019 14:51:34 -0600
Subject: [PATCH] gkrellm: update to 2.3.11

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 srcpkgs/gkrellm/patches/libressl.patch | 34 ++++++++++++++++++++++++++
 srcpkgs/gkrellm/template               |  6 ++---
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gkrellm/patches/libressl.patch

diff --git a/srcpkgs/gkrellm/patches/libressl.patch b/srcpkgs/gkrellm/patches/libressl.patch
new file mode 100644
index 00000000000..f744c9e5a66
--- /dev/null
+++ b/srcpkgs/gkrellm/patches/libressl.patch
@@ -0,0 +1,34 @@
+diff --git src/mail.c src/mail.c
+index 6615f31..205b56f 100644
+--- src/mail.c
++++ src/mail.c
+-#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+ static void
+ ssl_locking_cb(int mode, int n, const char *file, int line)
+ 	{
+@@ -452,7 +452,7 @@ update_tooltip(void)
+ 	MailAccount	*account;
+ 	GString		*mboxes = NULL;
+ 	gchar		buf[128];
+-
++
+ 	if (show_tooltip)
+ 		{
+ 		mboxes = g_string_sized_new(512);
+@@ -4399,8 +4399,10 @@ gkrellm_init_mail_monitor(void)
+ 		ssl_locks[i] = g_new(GMutex, 1);
+ 		g_mutex_init(ssl_locks[i]);
+ 		}
++#ifndef LIBRESSL_VERSION_NUMBER
+ 	CRYPTO_set_locking_callback(ssl_locking_cb);
+ #endif
++#endif
+ #endif
+
+ 	mail_fetch = g_new0(Mailbox, 1);
+@@ -4526,4 +4528,3 @@ gkrellm_destroy_external_mbox(gpointer mbox_ptr)
+ 	}
+
+   /* =======================================================================*/
+-
diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index 0ab29be396c..c530c7182f0 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,7 +1,7 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
-version=2.3.10
-revision=7
+version=2.3.11
+revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"
 homepage="http://gkrellm.srcbox.net"
 distfiles="${homepage}/releases/gkrellm-${version}.tar.bz2"
-checksum=8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766
+checksum=1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06
 
 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} STRIP= install

Re: [PR PATCH] [Merged]: gkrellm: update to 2.3.11

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

There's a merged pull request on the void-packages repository

gkrellm: update to 2.3.11
https://github.com/void-linux/void-packages/pull/17944

Description:
Tested mail after my LibreSSL workaround, and it worked fine. Current version in repo did not
Signed-off-by: Nathan Owens <ndowens04@gmail.com>