From 4451d8a097b1fa6ef358692bdf40ca03bc86ae19 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 16:00:18 +0000
Subject: [PATCH] [packages_10.03.2] radsecproxy: merge r29052, r29199, r29503

SVN-Revision: 30247
---
 net/radsecproxy/Makefile               | 15 ++++++++++++---
 net/radsecproxy/files/radsecproxy.init | 10 +++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/net/radsecproxy/Makefile b/net/radsecproxy/Makefile
index e1b06193c4..67d5e12716 100644
--- a/net/radsecproxy/Makefile
+++ b/net/radsecproxy/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2009 OpenWrt.org
+# Copyright (C) 2008-20211 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radsecproxy
-PKG_VERSION:=1.4.2
+PKG_VERSION:=1.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://software.uninett.no/radsecproxy/
-PKG_MD5SUM:=ccdff609c72c0862235b9119323345a8
+PKG_MD5SUM:=c65742a1b471c572ca7f6d11000d41f5
 
 PKG_INSTALL:=1
 
@@ -35,6 +35,11 @@ endef
 CONFIGURE_ARGS+= \
 	--with-ssl="$(STAGING_DIR)/usr"
 
+#TARGET_CFLAGS += -ansi
+#TARGET_CFLAGS += -std=c99
+TARGET_CFLAGS += -Wno-long-long
+
+
 define Package/radsecproxy/install
 	$(INSTALL_DIR) $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radsecproxy $(1)/usr/sbin/
@@ -44,5 +49,9 @@ define Package/radsecproxy/install
 	$(INSTALL_BIN) ./files/radsecproxy.init $(1)/etc/init.d/radsecproxy
 endef
 
+define Package/radsecproxy/conffiles
+/etc/radsecproxy.conf
+endef
+
 $(eval $(call BuildPackage,radsecproxy))
 
diff --git a/net/radsecproxy/files/radsecproxy.init b/net/radsecproxy/files/radsecproxy.init
index 9576d96896..b1b4f8ecd1 100644
--- a/net/radsecproxy/files/radsecproxy.init
+++ b/net/radsecproxy/files/radsecproxy.init
@@ -1,16 +1,12 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=50
 
-DEFAULT=/etc/default/radsecproxy
-OPTIONS=""
-
 start() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	/usr/sbin/radsecproxy $OPTIONS
+	service_start /usr/sbin/radsecproxy
 }
 
 stop() {
-	killall radsecproxy
+	service_stop /usr/sbin/radsecproxy
 }
-- 
2.30.2