jlec 15/03/24 20:01:43
Added: gkrellm-2.3.5-format-security.patch
gkrellm-2.3.5-config.patch
gkrellm-2.3.5-width.patch
gkrellm-2.3.5-sansfont.patch
gkrellm-2.3.5-binding.patch
Log:
Bump to EAPI=5; add missing dependency on x11-libs/pango, #382235; fix for
format-security, #520556; import various patches from fedora
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.1 app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch?rev=1.1&content-type=text/plain
Index: gkrellm-2.3.5-format-security.patch
===================================================================
diff -up gkrellm-2.3.5/server/main.c~ gkrellm-2.3.5/server/main.c
--- gkrellm-2.3.5/server/main.c~ 2010-10-02 19:13:29.000000000 +0300
+++ gkrellm-2.3.5/server/main.c 2013-12-06 22:56:38.690534043 +0200
@@ -187,7 +187,7 @@ static void gkrellmd_syslog_log(GLogLeve
if (log_level & G_LOG_LEVEL_CRITICAL)
facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT);
- syslog(facility_priority, message);
+ syslog(facility_priority, "%s", message);
#endif // defined(WIN32)
} // gkrellmd_syslog_log()
1.1 app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch?rev=1.1&content-type=text/plain
Index: gkrellm-2.3.5-config.patch
===================================================================
diff -up gkrellm-2.3.5/server/gkrellmd.conf.config
gkrellm-2.3.5/server/gkrellmd.conf
--- gkrellm-2.3.5/server/gkrellmd.conf.config 2010-09-14 17:26:19.000000000
+0300
+++ gkrellm-2.3.5/server/gkrellmd.conf 2011-06-19 19:17:56.398591498 +0300
@@ -22,16 +22,17 @@
# List of hosts allowed to connect. If no hosts are specified in a
# gkrellmd.conf file or on the command line, all hosts will be allowed.
#
-#allow-host localhost
-#allow-host 127.0.0.1
+allow-host localhost
+allow-host 127.0.0.1
+allow-host ::ffff:127.0.0.1
#allow-host ::1
#allow-host 192.168.0.*
# Drop privileges after startup (you must start gkrellmd as root to do it).
# NOTE: Option ignored on Windows
#
-#user nobody
-#group proc
+user gkrellmd
+group gkrellmd
# Create a PID file for the running gkrellmd. Default is no PID file.
# NOTE: Option ignored on Windows
@@ -76,7 +77,7 @@
# Minimum is 2 (less than 2 for no I/O disconnecting and is the default).
# Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
#
-#io-timeout 5
+io-timeout 5
# Configure gkrellm clients to attempt automatic reconnects to a
# gkrellmd server every reconnect-timeout seconds after a disconnected
@@ -85,7 +86,7 @@
# Minimum is 2 (less than 2 for no automatic reconnecting and is the default).
# Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
#
-#reconnect-timeout 5
+reconnect-timeout 5
# Server side local mailbox counts can be sent to gkrellm clients. List here
# paths to mbox, MH mail, or Maildir style mailboxes.
1.1 app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch?rev=1.1&content-type=text/plain
Index: gkrellm-2.3.5-width.patch
===================================================================
--- gkrellm-2.2.7/src/gkrellm.h.width 2005-06-09 12:48:34.000000000 +0200
+++ gkrellm-2.2.7/src/gkrellm.h 2005-06-09 12:48:37.000000000 +0200
@@ -518,7 +518,7 @@
GkrellmCallback;
-#define CHART_WIDTH_MAX 1000
+#define CHART_WIDTH_MAX 1600
#define CHART_WIDTH_MIN 25
/* Each chart must have a GkrellmChartconfig struct associated with it.
1.1 app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch?rev=1.1&content-type=text/plain
Index: gkrellm-2.3.5-sansfont.patch
===================================================================
--- gkrellm-2.2.4/src/gui.c.font 2005-05-17 15:37:16.000000000 +0200
+++ gkrellm-2.2.4/src/gui.c 2005-05-17 15:37:46.000000000 +0200
@@ -1575,11 +1575,11 @@
if (!_GK.theme_path || !g_file_test(_GK.theme_path, G_FILE_TEST_IS_DIR))
gkrellm_dup_string(&_GK.theme_path, "");
if (!large_font.string)
- gkrellm_dup_string(&large_font.string, "Serif 11");
+ gkrellm_dup_string(&large_font.string, "Sans 11");
if (!normal_font.string)
- gkrellm_dup_string(&normal_font.string, "Serif 9");
+ gkrellm_dup_string(&normal_font.string, "Sans 9");
if (!small_font.string)
- gkrellm_dup_string(&small_font.string, "Serif 8");
+ gkrellm_dup_string(&small_font.string, "Sans 8");
}
1.1 app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch?rev=1.1&content-type=text/plain
Index: gkrellm-2.3.5-binding.patch
===================================================================
>From a6983649c997dffd71d365792fa665cc135e696a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <[email protected]>
Date: Fri, 10 Jan 2014 09:34:59 +0200
Subject: [PATCH] Allow binding to a listen address that doesn't exist yet
---
server/main.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/server/main.c b/server/main.c
index a5a9e4e..b2f460b 100644
--- a/server/main.c
+++ b/server/main.c
@@ -1003,6 +1003,13 @@ socksetup(int af)
#endif
continue;
}
+
+#ifdef IP_FREEBIND
+ if (setsockopt(*s, SOL_IP, IP_FREEBIND, &on,
sizeof(on)) < 0)
+ {
+ g_warning("gkrellmd: setsockopt (IP_FREEBIND)
failed\n");
+ }
+#endif
}
#ifdef IPV6_V6ONLY
--
1.8.3.1
