[gentoo-commits] gentoo-x86 commit in app-admin/gkrellm/files: gkrellmd gkrellm-2.3-Makefile.patch gkrellm-2.3-build.patch gkrellmd.conf gkrellm-2.3-gnutls.patch gkrellm-2.3.0-gnutls.patch gkrellm-2.3.0-Makefile.patch gkrellm-2.3.0-build.patch

[Jim Ramsay (lack)]

lack        08/02/28 15:17:04

  Modified:             gkrellmd
  Added:                gkrellm-2.3-Makefile.patch gkrellm-2.3-build.patch
                        gkrellmd.conf gkrellm-2.3-gnutls.patch
  Removed:              gkrellm-2.3.0-gnutls.patch
                        gkrellm-2.3.0-Makefile.patch
                        gkrellm-2.3.0-build.patch
  Log:
  Version bump - 2.3.1 is released (Bug #209937)
  (Portage version: 2.1.4.1)

Revision  Changes    Path
1.7                  app-admin/gkrellm/files/gkrellmd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellmd?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellmd?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellmd?r1=1.6&r2=1.7

Index: gkrellmd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellmd	2 Nov 2006 10:44:06 -0000	1.6
+++ gkrellmd	28 Feb 2008 15:17:04 -0000	1.7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.6 2006/11/02 10:44:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.7 2008/02/28 15:17:04 lack Exp $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@
 
 start() {
 	ebegin "Starting GNU Krell Monitor daemon"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd
+	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd ${GKRELLM_OPTS}
 	eend $?
 }
 



1.1                  app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch?rev=1.1&content-type=text/plain

Index: gkrellm-2.3-Makefile.patch
===================================================================
diff -Nru gkrellm-2.2.10/src/Makefile gkrellm-2.2.10_patched/src/Makefile
--- gkrellm-2.2.10/src/Makefile	2007-02-15 17:50:03 +0100
+++ gkrellm-2.2.10_patched/src/Makefile	2007-02-15 17:50:49 +0100
@@ -95,7 +95,7 @@
 endif
 
 
-override CC += -Wall $(FLAGS)
+CFLAGS += -Wall $(FLAGS)
 
 OBJS =	main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \
 	hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \



1.1                  app-admin/gkrellm/files/gkrellm-2.3-build.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3-build.patch?rev=1.1&content-type=text/plain

Index: gkrellm-2.3-build.patch
===================================================================
--- server/Makefile
+++ server/Makefile
@@ -21,7 +21,7 @@
 MANMODE ?= 644
 MANDIRMODE ?= 755
 INSTALL ?= install
-LINK_FLAGS ?= -Wl,-E
+LINK_FLAGS ?= $(LDFLAGS) -Wl,-E
 EXTRAOBJS =
 
 
@@ -41,7 +41,7 @@
 
 
 CC ?= gcc
-STRIP ?= -s
+STRIP ?=
 
 GKRELLMD_INCLUDES = gkrellmd.h
 
@@ -51,7 +51,7 @@
 GLIB12_INCLUDE = `glib-config --cflags`
 GLIB12_LIB = `glib-config --libs glib gmodule`
 
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
 ifeq ($(glib12),1)
 FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
 endif
--- src/Makefile
+++ src/Makefile
@@ -18,7 +18,7 @@
 MANMODE ?= 644
 MANDIRMODE ?= 755
 INSTALL ?= install
-LINK_FLAGS ?= -Wl,-E
+LINK_FLAGS ?= $(LDFLAGS) -Wl,-E
 SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
 
 ifeq ($(without-gnutls),1)
@@ -62,7 +62,7 @@
 endif
 
 CC ?= gcc
-STRIP ?= -s
+STRIP ?=
 
 GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h
 
@@ -70,7 +70,7 @@
 
 PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
 
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
 FLAGS+= $(PTHREAD_INC)
 
 LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)



1.1                  app-admin/gkrellm/files/gkrellmd.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellmd.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellmd.conf?rev=1.1&content-type=text/plain

Index: gkrellmd.conf
===================================================================
# Config file for gkrellmd

# If you need to pass extra options to gkrellmd, you may set them here.
# See 'gkrellmd --help' for a list of options.
# GKRELLMD_OPTS=""



1.1                  app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch?rev=1.1&content-type=text/plain

Index: gkrellm-2.3-gnutls.patch
===================================================================
--- src/configure
+++ src/configure
@@ -37,6 +37,7 @@
 #include <gnutls/openssl.h>
 #include <errno.h>
 #include <pthread.h>
+#include <gcrypt.h>
 
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
--- src/mail.c
+++ src/mail.c
@@ -40,6 +40,7 @@
 #if defined(HAVE_GNUTLS)
 #include <gnutls/openssl.h>
 #include <pthread.h>
+#include <gcrypt.h>
 #define MD5Init		MD5_Init
 #define MD5Update	MD5_Update
 #define MD5Final	MD5_Final



-- 
gentoo-commits@l.g.o mailing list