fix packages to be compile with stack protector

- libtool do not pass -fstack-protector while linking,
  but this is required to successfully link libraries or
  executables with SSP
- pass LDFLAGS for non-libtool packages

4 files changed, 83 insertions, 0 deletions

diff --git a/package/gkrellm/Makefile b/package/gkrellm/Makefile
new file mode 100644
index 000000000..1b4a6b118
--- /dev/null
+++ b/package/gkrellm/Makefile
@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		gkrellm
+PKG_VERSION:=		2.3.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		600f4daa395112ed19a3633deb0829ff
+PKG_DESCR:=		The GNU Krell Monitors Server
+PKG_SECTION:=		net/misc
+PKG_DEPENDS:=		glib libpthread
+PKG_BUILDDEP:=		glib
+PKG_URL:=		http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html
+PKG_SITES:=		http://members.dslextreme.com/users/billw/gkrellm/
+
+WRKSRC=			${WRKDIR}/gkrellm-${PKG_VERSION}/server
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,GKRELLMD,gkrellmd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-install:
+	${INSTALL_DIR} ${IDIR_GKRELLMD}/usr/bin ${IDIR_GKRELLMD}/etc
+	${INSTALL_BIN} ${WRKBUILD}/gkrellmd ${IDIR_GKRELLMD}/usr/bin/
+	${INSTALL_DATA} ${WRKSRC}/gkrellmd.conf ${IDIR_GKRELLMD}/etc
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gkrellm/files/gkrellmd.init b/package/gkrellm/files/gkrellmd.init
new file mode 100644
index 000000000..54c42665c
--- /dev/null
+++ b/package/gkrellm/files/gkrellmd.init
@@ -0,0 +1,27 @@
+#!/bin/sh
+#PKG gkrellmd
+#INIT 80
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${gkrellmd:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/bin/gkrellmd -d
+	;;
+stop)
+	kill $(pgrep -f /usr/bin/gkrellmd)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/gkrellm/files/gkrellmd.postinst b/package/gkrellm/files/gkrellmd.postinst
new file mode 100644
index 000000000..56b7b06cc
--- /dev/null
+++ b/package/gkrellm/files/gkrellmd.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf gkrellmd gkrellmd NO
diff --git a/package/gkrellm/patches/patch-server_Makefile b/package/gkrellm/patches/patch-server_Makefile
new file mode 100644
index 000000000..9f070e275
--- /dev/null
+++ b/package/gkrellm/patches/patch-server_Makefile
@@ -0,0 +1,22 @@
+--- gkrellm-2.3.4.orig/server/Makefile	2008-10-03 23:52:48.000000000 +0200
++++ gkrellm-2.3.4/server/Makefile	2011-01-15 18:37:40.000000000 +0100
+@@ -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,8 +109,8 @@ 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
+