reinit the tree, so we can have metadata

13 files changed, 244 insertions, 0 deletions

diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
new file mode 100644
index 000000000000..cf36a9817110
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
@@ -0,0 +1,10 @@
+--- gkrellm-2.3.5.old/src/sysdeps/linux.c	2010-10-06 03:27:33.000000000 +1100
++++ gkrellm-2.3.5/src/sysdeps/linux.c	2011-11-24 02:07:30.926450485 +1100
+@@ -1439,6 +1439,7 @@
+ 			|| !strcmp(type, "usbdevfs")
+ 			|| !strcmp(type, "usbfs")
+ 			|| !strcmp(type, "sysfs")
++			|| !strcmp(type, "autofs")
+ 		   )
+ 			continue;
+ 		/* Strip trailing / from the directory.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
new file mode 100644
index 000000000000..83bf0b0d7d20
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
@@ -0,0 +1,30 @@
+From a6983649c997dffd71d365792fa665cc135e696a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+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
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
new file mode 100644
index 000000000000..fa35ef672798
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
@@ -0,0 +1,24 @@
+--- gkrellm-2.3.5.old/server/monitor.c	2010-10-06 03:46:59.000000000 +1100
++++ gkrellm-2.3.5/server/monitor.c	2011-11-24 02:01:30.871402778 +1100
+@@ -1329,7 +1329,8 @@
+ static gchar *remote_fs_types[] =
+ 	{
+ 	"nfs",
+-	"smbfs"
++	"smbfs",
++	"cifs"
+ 	};
+ 
+ void
+--- gkrellm-2.3.5.old/src/fs.c	2010-09-15 02:25:51.000000000 +1000
++++ gkrellm-2.3.5/src/fs.c	2011-11-24 02:00:17.347088370 +1100
+@@ -163,7 +163,8 @@
+ static gchar *remote_fs_types[]	=
+ 	{
+ 	"nfs",
+-	"smbfs"
++	"smbfs",
++	"cifs"
+ 	};
+ 
+ 
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
new file mode 100644
index 000000000000..c6230598c80e
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
@@ -0,0 +1,43 @@
+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.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
new file mode 100644
index 000000000000..3a24baafe7df
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
@@ -0,0 +1,32 @@
+From 2c839bf2703e99c3851b58695545fed90b6226fc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 29 Aug 2012 22:28:47 -0400
+Subject: [PATCH] Explicitly link to libgmodule-2.0
+
+With >=gdk-pixbuf-2.24 and >=pango-1.30, libgmodule-2.0 is no longer
+provided by "pkg-config --libs gtk+-2.0 gthread-2.0", so link to it
+explicitly (as is already done in server/).
+
+Fixes build failure with gnu ld.gold in gkrellm-2.3.5.
+
+https://bugs.gentoo.org/show_bug.cgi?id=428532
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 6d482a7..19b0c29 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -69,7 +69,7 @@ STRIP ?= -s
+ GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
+ 
+ PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
+-PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
++PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0`
+ 
+ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
+  ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
+-- 
+1.7.12
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
new file mode 100644
index 000000000000..3e0265af482c
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
@@ -0,0 +1,12 @@
+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()
+ 
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
new file mode 100644
index 000000000000..460eb5ebc29a
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
@@ -0,0 +1,17 @@
+--- 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");
+ 	}
+ 
+ 
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
new file mode 100644
index 000000000000..c7fc22060b85
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
@@ -0,0 +1,11 @@
+--- 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.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
new file mode 100644
index 000000000000..a699b80e5b2b
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
@@ -0,0 +1,11 @@
+--- gkrellm-2.3.7/Makefile
++++ gkrellm-2.3.7/Makefile
+@@ -131,7 +131,7 @@
+ 	(cd server && ${MAKE} gkrellmd)
+ 
+ gkrellm.pc: Makefile
+-	echo 'prefix=$(INSTALLROOT)\n'\
++	printf 'prefix=$(INSTALLROOT)\n'\
+ 	'Name: GKrellM\n'\
+ 	'Description: Extensible GTK system monitoring application\n'\
+ 	'Version: $(VERSION)\n'\
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
new file mode 100644
index 000000000000..93743c57b7df
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	after lm_sensors
+	after hddtemp
+}
+
+start() {
+	ebegin "Starting GNU Krell Monitor daemon"
+	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd -- ${GKRELLMD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping GNU Krell Monitor daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/gkrellmd.pid --name gkrellmd
+	eend $?
+}
diff --git a/app-admin/gkrellm/files/gkrellmd.conf b/app-admin/gkrellm/files/gkrellmd.conf
new file mode 100644
index 000000000000..6b0d90df1092
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.conf
@@ -0,0 +1,8 @@
+# Config file for gkrellmd init script
+
+# If you need to pass extra options to gkrellmd, you may set them here.
+# See 'gkrellmd --help' for a list of options.
+#
+# Note: Many options can be configured in /etc/gkrellmd.conf as well
+#
+#GKRELLMD_OPTS=""
diff --git a/app-admin/gkrellm/files/gkrellmd.initd b/app-admin/gkrellm/files/gkrellmd.initd
new file mode 100644
index 000000000000..fe295128e4ea
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="gkrell system monitor daemon"
+pidfile="/var/run/gkrellmd.pid"
+command="/usr/bin/gkrellmd"
+command_args="${GKRELLMD_OPTS}"
+command_background="true"
+
+depend() {
+	need net
+	after lm_sensors
+	after hddtemp
+}
diff --git a/app-admin/gkrellm/files/gkrellmd.service b/app-admin/gkrellm/files/gkrellmd.service
new file mode 100644
index 000000000000..f1df0c6420ad
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=GNU Krell Monitors server
+Documentation=man:gkrellmd(1)
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/gkrellmd
+
+[Install]
+WantedBy=multi-user.target