Fix compilation with glibc-2.10 (Bug #270682)

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 29 insertions, 90 deletions

diff --git a/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch b/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch
deleted file mode 100644
index 0648d3d0bc5e..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 \
diff --git a/app-admin/gkrellm/files/gkrellm-2.3-build.patch b/app-admin/gkrellm/files/gkrellm-2.3-build.patch
deleted file mode 100644
index 38de713aa64b..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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)
diff --git a/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch b/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch
deleted file mode 100644
index 54d86000ca37..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.2-getline-fix.patch b/app-admin/gkrellm/files/gkrellm-2.3.2-getline-fix.patch
new file mode 100644
index 000000000000..7d0cd88acc92
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.2-getline-fix.patch
@@ -0,0 +1,29 @@
+--- src/client.c.org	2008-10-04 04:33:37.000000000 +0400
++++ src/client.c	2009-05-21 12:54:22.000000000 +0400
+@@ -1620,7 +1620,7 @@
+ 
+ 
+ static gint
+-getline(gint fd, gchar *buf, gint len)
++getline_(gint fd, gchar *buf, gint len)
+ 	{
+ 	fd_set			read_fds;
+ 	struct timeval	tv;
+@@ -1714,7 +1714,7 @@
+ 
+ 	while (1)
+ 		{
+-		rs=getline(fd, buf, sizeof(buf));
++		rs=getline_(fd, buf, sizeof(buf));
+         if(rs<0)
+             return FALSE;
+ 		if (!strcmp(buf, "</gkrellmd_setup>"))
+@@ -1732,7 +1732,7 @@
+ 	table_size = sizeof(update_table) / sizeof(KeyTable);
+ 	while (1)
+ 		{
+-		rs=getline(fd, buf, sizeof(buf));
++		rs=getline_(fd, buf, sizeof(buf));
+         if(rs<0)
+             return FALSE;
+ 		if (!strcmp(buf, "</initial_update>"))