From a80b51369fb718a1a811fb9c0c9a81e4e9e3b4e3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 16:46:47 +0100
Subject: fix musl compile

---
 package/gkrellm/Makefile                           |  6 ++---
 package/gkrellm/patches/patch-server_Makefile      | 30 ----------------------
 package/gkrellm/patches/patch-server_main_c        | 24 +++++++++++++++++
 .../gkrellm/patches/patch-server_sysdeps-unix_c    | 10 ++++++++
 4 files changed, 37 insertions(+), 33 deletions(-)
 delete mode 100644 package/gkrellm/patches/patch-server_Makefile
 create mode 100644 package/gkrellm/patches/patch-server_main_c
 create mode 100644 package/gkrellm/patches/patch-server_sysdeps-unix_c

(limited to 'package/gkrellm')

diff --git a/package/gkrellm/Makefile b/package/gkrellm/Makefile
index 1b4a6b118..e8efdabd4 100644
--- a/package/gkrellm/Makefile
+++ b/package/gkrellm/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gkrellm
-PKG_VERSION:=		2.3.4
+PKG_VERSION:=		2.3.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		600f4daa395112ed19a3633deb0829ff
-PKG_DESCR:=		The GNU Krell Monitors Server
+PKG_MD5SUM:=		05d00fa8d6376038b0c7e967583c0b8d
+PKG_DESCR:=		GNU krell monitors server
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		glib libpthread
 PKG_BUILDDEP:=		glib
diff --git a/package/gkrellm/patches/patch-server_Makefile b/package/gkrellm/patches/patch-server_Makefile
deleted file mode 100644
index a1a8747e7..000000000
--- a/package/gkrellm/patches/patch-server_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- gkrellm-2.3.4.orig/server/Makefile	2008-10-03 23:52:48.000000000 +0200
-+++ gkrellm-2.3.4/server/Makefile	2011-05-17 11:34:14.926610183 +0200
-@@ -26,7 +26,7 @@ SMANDIR ?= $(INSTALLROOT)/share/man/man1
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+LINK_FLAGS ?= -Wl,-E $(LDFLAGS)
- EXTRAOBJS =
- 
- SHARED_PATH = ../shared
-@@ -109,15 +109,15 @@ endif
- 
- override CC += -Wall $(FLAGS)
- 
--OS_NAME=$(shell uname -s)
--OS_RELEASE=$(shell uname -r)
-+OS_NAME=Linux
-+OS_RELEASE=2.6
- 
- OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o
- 
- all:	gkrellmd
- 
- gkrellmd: $(OBJS) $(EXTRAOBJS)
--	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)
-+	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LINK_FLAGS) $(LIBS)
- 
- static: $(OBJS) $(EXTRAOBJS)
- 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
diff --git a/package/gkrellm/patches/patch-server_main_c b/package/gkrellm/patches/patch-server_main_c
new file mode 100644
index 000000000..c02fb8930
--- /dev/null
+++ b/package/gkrellm/patches/patch-server_main_c
@@ -0,0 +1,24 @@
+--- gkrellm-2.3.5.orig/server/main.c	2010-10-02 18:13:29.000000000 +0200
++++ gkrellm-2.3.5/server/main.c	2014-03-23 16:06:59.000000000 +0100
+@@ -39,21 +39,6 @@
+ 	#include <syslog.h>
+ #endif // !WIN32
+ 
+-// win32 defines addrinfo but only supports getaddrinfo call on winxp or newer
+-#if !defined(HAVE_GETADDRINFO) && !defined(WIN32)
+-struct addrinfo
+-	{
+-	int		ai_flags;		/* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
+-	int		ai_family;		/* PF_xxx */
+-	int		ai_socktype;	/* SOCK_xxx */
+-	int		ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+-	size_t	ai_addrlen;		/* length of ai_addr */
+-	char	*ai_canonname;	/* canonical name for hostname */
+-	struct	sockaddr *ai_addr;	/* binary address */
+-	struct	addrinfo *ai_next;	/* next structure in linked list */
+-	};
+-#endif // !HAVE_GETADDRINFO
+-
+ #if !defined(IPV6_V6ONLY) && defined(IPV6_BINDV6ONLY)
+ #define	IPV6_V6ONLY	IPV6_BINDV6ONLY
+ #endif
diff --git a/package/gkrellm/patches/patch-server_sysdeps-unix_c b/package/gkrellm/patches/patch-server_sysdeps-unix_c
new file mode 100644
index 000000000..e69631735
--- /dev/null
+++ b/package/gkrellm/patches/patch-server_sysdeps-unix_c
@@ -0,0 +1,10 @@
+--- gkrellm-2.3.5.orig/server/sysdeps-unix.c	2010-09-14 18:34:34.000000000 +0200
++++ gkrellm-2.3.5/server/sysdeps-unix.c	2014-03-23 16:13:57.000000000 +0100
+@@ -145,6 +145,7 @@ gkrellm_sensors_linux_name_fix(gchar *id
+ #endif
+ 	}
+ 
++#define HAVE_GETADDRINFO 1
+ #ifdef SENSORS_COMMON
+ gint
+ gkrellm_connect_to(gchar *server, gint server_port)
-- 
cgit v1.2.3