From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 7 Feb 2012 15:31:48 +0000 (+0000)
Subject: [packages_10.03.2] radsecproxy: merge r30360
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=96e056184214714f5c906e594ebd74fe52c2a495

[packages_10.03.2] radsecproxy: merge r30360

SVN-Revision: 30361
---

diff --git a/net/radsecproxy/Makefile b/net/radsecproxy/Makefile
index 67d5e12716..65b72173d5 100644
--- a/net/radsecproxy/Makefile
+++ b/net/radsecproxy/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-20211 OpenWrt.org
+# Copyright (C) 2008-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radsecproxy
 PKG_VERSION:=1.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://software.uninett.no/radsecproxy/
diff --git a/net/radsecproxy/patches/100-missing-return.patch b/net/radsecproxy/patches/100-missing-return.patch
new file mode 100644
index 0000000000..871fc6e104
--- /dev/null
+++ b/net/radsecproxy/patches/100-missing-return.patch
@@ -0,0 +1,58 @@
+--- a/dtls.c
++++ b/dtls.c
+@@ -523,6 +523,7 @@ void *udpdtlsserverrd(void *arg) {
+ 	free(params);
+ 	cacheexpire(sessioncache, &lastexpiry);
+     }
++    return NULL;
+ }
+ 
+ int dtlsconnect(struct server *server, struct timeval *when, int timeout, char *text) {
+@@ -642,6 +643,7 @@ void *udpdtlsclientrd(void *arg) {
+ 	if (udp2bio(s, conf->servers->rbios, cnt))
+ 	    debug(DBG_DBG, "radudpget: got DTLS in UDP from %s", addr2string((struct sockaddr *)&from));
+     }
++    return NULL;
+ }
+ 
+ void *dtlsclientrd(void *arg) {
+--- a/radsecproxy.c
++++ b/radsecproxy.c
+@@ -3203,6 +3203,8 @@ void *sighandler(void *arg) {
+             debug(DBG_WARN, "sighandler: ignoring signal %d", sig);
+         }
+     }
++
++    return NULL;
+ }
+ 
+ int createpidfile(const char *pidfile) {
+@@ -3289,6 +3291,8 @@ int radsecproxy_main(int argc, char **ar
+     /* just hang around doing nothing, anything to do here? */
+     for (;;)
+ 	sleep(1000);
++
++    return 0;
+ }
+ 
+ /* Local Variables: */
+--- a/udp.c
++++ b/udp.c
+@@ -266,6 +266,8 @@ void *udpclientrd(void *arg) {
+ 	buf = radudpget(*s, NULL, &server, NULL);
+ 	replyh(server, buf);
+     }
++
++    return NULL;
+ }
+ 
+ void *udpserverrd(void *arg) {
+@@ -310,6 +312,8 @@ void *udpserverwr(void *arg) {
+ 	debug(DBG_DBG, "udpserverwr: refcount %d", reply->refcount);
+ 	freerq(reply);
+     }
++
++    return NULL;
+ }
+ 
+ void addclientudp(struct client *client) {