commit efb76240e8bf816fbf3b230295b0c709714b6ed3
Author: Jan Rękorajski <[email protected]>
Date: Thu Jan 2 13:56:48 2014 +0100
- fix format string error
- fix linking with current glib2/gmodule
- rel 5
format-security.patch | 11 +++++++++++
gkrellm.spec | 6 +++++-
glib2-link.patch | 26 ++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/gkrellm.spec b/gkrellm.spec
index db090c7..19f12c4 100644
--- a/gkrellm.spec
+++ b/gkrellm.spec
@@ -10,7 +10,7 @@ Summary(ru.UTF-8): GKrellM - это стек системных мониторо
Summary(uk.UTF-8): GKrellM - це стек системних моніторів у рамках одного
процесу
Name: gkrellm
Version: 2.3.5
-Release: 4
+Release: 5
License: GPL v3+
Group: X11/Applications
Source0:
http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.gz
@@ -26,6 +26,8 @@ Patch3: %{name}-lm_sensors.patch
Patch4: %{name}-ldflags.patch
Patch5: myflags.patch
Patch6: %{name}-plugins_dir_lib64.patch
+Patch7: glib2-link.patch
+Patch8: format-security.patch
URL: http://www.gkrellm.net/
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 2.2.0
@@ -142,6 +144,8 @@ Componentes para desenvolvimento de plugins para o gkrellm.
%ifarch %{x8664} ia64 ppc64 sparc64
%patch6 -p1
%endif
+%patch7 -p1
+%patch8 -p1
%build
%{__make} \
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..8286361
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- gkrellm-2.3.5/server/main.c~ 2010-10-02 18:13:29.000000000 +0200
++++ gkrellm-2.3.5/server/main.c 2014-01-02 13:55:48.722813858 +0100
+@@ -187,7 +187,7 @@
+ 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/glib2-link.patch b/glib2-link.patch
new file mode 100644
index 0000000..ba80347
--- /dev/null
+++ b/glib2-link.patch
@@ -0,0 +1,26 @@
+--- gkrellm-2.3.5/server/Makefile~ 2014-01-02 13:47:46.000000000 +0100
++++ gkrellm-2.3.5/server/Makefile 2014-01-02 13:51:41.626148979 +0100
+@@ -54,8 +54,8 @@
+
+ GKRELLMD_INCLUDES = gkrellmd.h $(SHARED_PATH)/log.h
+
+-PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0`
+-PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
++PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0 gmodule-2.0`
++PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0 gmodule-2.0`
+
+ GLIB12_INCLUDE = `glib-config --cflags`
+ GLIB12_LIB = `glib-config --libs glib gmodule`
+--- gkrellm-2.3.5/src/Makefile~ 2014-01-02 13:47:46.000000000 +0100
++++ gkrellm-2.3.5/src/Makefile 2014-01-02 13:52:53.649481792 +0100
+@@ -68,8 +68,8 @@
+
+ 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_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 gmodule-2.0`
++PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 gmodule-2.0`
+
+ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE)
$(PTHREAD_INC)\
+ ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT ${MYFLAGS}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gkrellm.git/commitdiff/efb76240e8bf816fbf3b230295b0c709714b6ed3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
