rpms/gkrellm/devel .cvsignore, 1.5, 1.6 gkrellm-2.1.28-config.patch, 1.2, 1.3 gkrellm-2.3.1-netdb.patch, 1.1, 1.2 gkrellm.spec, 1.18, 1.19 gkrellmd.init, 1.2, 1.3 sources, 1.5, 1.6 gkrellm-2.2.9-libdir.patch, 1.1, NONE gkrellm-2.3.1-leak-fix.patch, 1.1, NONE gkrellm-openssl-license-exception.eml, 1.1, NONE
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Oct 23 18:43:07 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3095
Modified Files:
.cvsignore gkrellm-2.1.28-config.patch
gkrellm-2.3.1-netdb.patch gkrellm.spec gkrellmd.init sources
Removed Files:
gkrellm-2.2.9-libdir.patch gkrellm-2.3.1-leak-fix.patch
gkrellm-openssl-license-exception.eml
Log Message:
* Thu Oct 23 2008 Hans de Goede <hdegoede at redhat.com> 2.3.2-1
- New upstream release 2.3.2
- Drop upstreamed memleak patch
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 3 Dec 2007 20:34:00 -0000 1.5
+++ .cvsignore 23 Oct 2008 18:42:37 -0000 1.6
@@ -1 +1 @@
-gkrellm-2.3.1.tar.bz2
+gkrellm-2.3.2.tar.bz2
gkrellm-2.1.28-config.patch:
Index: gkrellm-2.1.28-config.patch
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm-2.1.28-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gkrellm-2.1.28-config.patch 22 Jul 2007 14:10:11 -0000 1.2
+++ gkrellm-2.1.28-config.patch 23 Oct 2008 18:42:37 -0000 1.3
@@ -1,7 +1,7 @@
-diff -up gkrellm-2.3.0/server/gkrellmd.conf.config gkrellm-2.3.0/server/gkrellmd.conf
---- gkrellm-2.3.0/server/gkrellmd.conf.config 2006-11-28 20:34:37.000000000 +0100
-+++ gkrellm-2.3.0/server/gkrellmd.conf 2007-07-22 14:00:54.000000000 +0200
-@@ -17,21 +17,22 @@ port 19150
+diff -up gkrellm-2.3.2/server/gkrellmd.conf.config gkrellm-2.3.2/server/gkrellmd.conf
+--- gkrellm-2.3.2/server/gkrellmd.conf.config 2008-10-04 03:40:30.000000000 +0200
++++ gkrellm-2.3.2/server/gkrellmd.conf 2008-10-23 18:45:04.000000000 +0200
+@@ -22,26 +22,27 @@ port 19150
# 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.
#
@@ -14,6 +14,7 @@
#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
@@ -21,16 +22,20 @@
+group gkrellmd
# Create a PID file for the running gkrellmd. Default is no PID file.
+ # NOTE: Option ignored on Windows
+ #
-#pidfile /var/run/gkrellmd.pid
+pidfile /var/run/gkrellmd.pid
# Run in background and detach from the controlling terminal
+ # NOTE: Option ignored on Windows
+ #
-#detach
+detach
- # Time interval between checks for various monitors. If nfs-interval
- # is <= 0 then gkrellmd will not read data for nfs file system types.
-@@ -61,7 +62,7 @@ port 19150
+ # Enable writing logging message to the system syslog file
+ #syslog
+@@ -74,7 +75,7 @@ port 19150
# 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.
#
@@ -39,7 +44,7 @@
# Configure gkrellm clients to attempt automatic reconnects to a
# gkrellmd server every reconnect-timeout seconds after a disconnected
-@@ -70,7 +71,7 @@ port 19150
+@@ -83,7 +84,7 @@ port 19150
# 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.
#
gkrellm-2.3.1-netdb.patch:
Index: gkrellm-2.3.1-netdb.patch
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm-2.3.1-netdb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellm-2.3.1-netdb.patch 13 Feb 2008 19:26:02 -0000 1.1
+++ gkrellm-2.3.1-netdb.patch 23 Oct 2008 18:42:37 -0000 1.2
@@ -1,6 +1,7 @@
---- gkrellm-2.3.1/src/client.c~ 2008-02-13 20:23:09.000000000 +0100
-+++ gkrellm-2.3.1/src/client.c 2008-02-13 20:23:09.000000000 +0100
-@@ -1606,7 +1607,7 @@ KeyTable update_table[] =
+diff -up gkrellm-2.3.2/src/client.c.netdb gkrellm-2.3.2/src/client.c
+--- gkrellm-2.3.2/src/client.c.netdb 2008-10-04 02:33:37.000000000 +0200
++++ gkrellm-2.3.2/src/client.c 2008-10-23 18:48:02.000000000 +0200
+@@ -1620,7 +1620,7 @@ KeyTable update_table[] =
static gint
@@ -9,21 +10,21 @@
{
fd_set read_fds;
struct timeval tv;
-@@ -1698,7 +1699,7 @@ read_server_setup(gint fd)
+@@ -1714,7 +1714,7 @@ read_server_setup(gint fd)
while (1)
{
-- getline(fd, buf, sizeof(buf));
-+ gkrellm_getline(fd, buf, sizeof(buf));
+- rs=getline(fd, buf, sizeof(buf));
++ rs=gkrellm_getline(fd, buf, sizeof(buf));
+ if(rs<0)
+ return FALSE;
if (!strcmp(buf, "</gkrellmd_setup>"))
- break;
- process_server_line(&setup_table[0], table_size, buf);
-@@ -1714,7 +1715,7 @@ read_server_setup(gint fd)
+@@ -1732,7 +1732,7 @@ read_server_setup(gint fd)
table_size = sizeof(update_table) / sizeof(KeyTable);
while (1)
{
-- getline(fd, buf, sizeof(buf));
-+ gkrellm_getline(fd, buf, sizeof(buf));
+- rs=getline(fd, buf, sizeof(buf));
++ rs=gkrellm_getline(fd, buf, sizeof(buf));
+ if(rs<0)
+ return FALSE;
if (!strcmp(buf, "</initial_update>"))
- break;
- process_server_line(&update_table[0], table_size, buf);
Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gkrellm.spec 2 Oct 2008 20:10:23 -0000 1.18
+++ gkrellm.spec 23 Oct 2008 18:42:37 -0000 1.19
@@ -1,6 +1,6 @@
Name: gkrellm
-Version: 2.3.1
-Release: 6%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
Summary: Multiple stacked system monitors in one process
Group: Applications/System
License: GPLv3+
@@ -9,13 +9,10 @@
Source1: gkrellmd.init
Source2: gkrellm.desktop
Source3: gkrellm.png
-Source4: gkrellm-openssl-license-exception.eml
Patch1: gkrellm-2.1.28-config.patch
Patch2: gkrellm-2.2.4-sansfont.patch
Patch3: gkrellm-2.2.7-width.patch
-Patch4: gkrellm-2.2.9-libdir.patch
-Patch5: gkrellm-2.3.1-netdb.patch
-Patch6: gkrellm-2.3.1-leak-fix.patch
+Patch4: gkrellm-2.3.1-netdb.patch
BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
BuildRequires: lm_sensors-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,10 +60,7 @@
%patch1 -p1 -z .config
%patch2 -p1 -z .sansfont
%patch3 -p1 -z .width
-%patch4 -p1 -z .libdir2
-%patch5 -p1 -z .netdb
-%patch6 -p1 -z .leakfix
-cp -a %{SOURCE4} .
+%patch4 -p1 -z .netdb
for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -80,8 +74,8 @@
%build
make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
- INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
- without-gnutls=1
+ INCLUDEDIR=%{_includedir} \
+ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DSYSTEM_PLUGINS_DIR='\"%{_libdir}/gkrellm2/plugins\"'"
%install
@@ -153,7 +147,6 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYRIGHT Changelog README Themes.html
-%doc gkrellm-openssl-license-exception.eml
%{_bindir}/%{name}
%{_libdir}/gkrellm2
%{_datadir}/gkrellm2
@@ -175,6 +168,10 @@
%changelog
+* Thu Oct 23 2008 Hans de Goede <hdegoede at redhat.com> 2.3.2-1
+- New upstream release 2.3.2
+- Drop upstreamed memleak patch
+
* Thu Oct 2 2008 Hans de Goede <hdegoede at redhat.com> 2.3.1-6
- Fix a small memory leak (which would accumulate over time) thanks to
Daniel Colascione for the patch (rh 464040)
Index: gkrellmd.init
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellmd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gkrellmd.init 5 Sep 2007 15:01:26 -0000 1.2
+++ gkrellmd.init 23 Oct 2008 18:42:37 -0000 1.3
@@ -13,6 +13,7 @@
# Should-Start: hddtemp
# Should-Stop: hddtemp
# Short-Description: GNU Krell Monitors Server
+# Description: GNU Krell Monitors Server
### END INIT INFO
# source function library
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 3 Dec 2007 20:34:00 -0000 1.5
+++ sources 23 Oct 2008 18:42:37 -0000 1.6
@@ -1 +1 @@
-009d8dddd3ce5cc83a4bb4d559ee922d gkrellm-2.3.1.tar.bz2
+d5543a439ee77950282d06b000048be7 gkrellm-2.3.2.tar.bz2
--- gkrellm-2.2.9-libdir.patch DELETED ---
--- gkrellm-2.3.1-leak-fix.patch DELETED ---
--- gkrellm-openssl-license-exception.eml DELETED ---
More information about the scm-commits
mailing list