6 files changed, 29 insertions, 53 deletions
diff --git a/net/freeradius-client/files/patch-configure b/net/freeradius-client/files/patch-configure
index c8a300ba563f..c361fa31a30f 100644
--- a/net/freeradius-client/files/patch-configure
+++ b/net/freeradius-client/files/patch-configure
@@ -1,26 +1,22 @@
---- configure
+--- configure.orig	2015-01-19 16:18:26 UTC
 +++ configure
-@@ -19728,23 +19728,6 @@
+@@ -12503,19 +12503,6 @@ fi
  gethostbyaddrrstyle=""
- echo "$as_me:$LINENO: checking gethostbyaddr_r() syntax" >&5
- echo $ECHO_N "checking gethostbyaddr_r() syntax... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyaddr_r() syntax" >&5
+ $as_echo_n "checking gethostbyaddr_r() syntax... " >&6; }
 -case "$host" in
 -*-freebsd*)
 -
--cat >>confdefs.h <<\_ACEOF
--#define GETHOSTBYADDR_R
--_ACEOF
+-$as_echo "#define GETHOSTBYADDR_R /**/" >>confdefs.h
 -
 -
--cat >>confdefs.h <<\_ACEOF
--#define GETHOSTBYADDRRSTYLE_BSD
--_ACEOF
+-$as_echo "#define GETHOSTBYADDRRSTYLE_BSD /**/" >>confdefs.h
 -
 -        gethostbyaddrrstyle=BSD
--        { echo "$as_me:$LINENO: WARNING: FreeBSD overridden to BSD-style" >&5
--echo "$as_me: WARNING: FreeBSD overridden to BSD-style" >&2;}
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FreeBSD overridden to BSD-style" >&5
+-$as_echo "$as_me: WARNING: FreeBSD overridden to BSD-style" >&2;}
 -        ;;
 -esac
  if test "x$gethostbyaddrrstyle" = "x"; then
-         cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/net/freeradius-client/files/patch-configure.in b/net/freeradius-client/files/patch-configure.in
index 8bae89febb8d..29cc13e45c68 100644
--- a/net/freeradius-client/files/patch-configure.in
+++ b/net/freeradius-client/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in
+--- configure.in.orig	2015-01-19 16:18:26 UTC
 +++ configure.in
-@@ -66,14 +66,6 @@
+@@ -66,14 +66,6 @@ dnl     http://h30097.www3.hp.com/docs/base_doc/DOCUME
  dnl We need #stdio.h to define NULL on FreeBSD (at least)
  gethostbyaddrrstyle=""
  AC_MSG_CHECKING([gethostbyaddr_r() syntax])
diff --git a/net/freeradius-client/files/patch-lib__config.c b/net/freeradius-client/files/patch-lib__config.c
index 337918e4c654..fd564f2c8e21 100644
--- a/net/freeradius-client/files/patch-lib__config.c
+++ b/net/freeradius-client/files/patch-lib__config.c
@@ -1,6 +1,6 @@
---- lib/config.c
+--- lib/config.c.orig	2015-01-19 16:18:26 UTC
 +++ lib/config.c
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ static int set_option_srv(char const *filename, int li
  	serv = (SERVER *) option->val;
  	if (serv == NULL) {
  		DEBUG(LOG_ERR, "option->val / server is NULL, allocating memory");
@@ -9,10 +9,10 @@
  		if (serv == NULL) {
  			rc_log(LOG_CRIT, "read_config: out of memory");
  			free(p_dupe);
-@@ -313,8 +313,8 @@
+@@ -319,8 +319,8 @@ rc_config_init(rc_handle *rh)
  
-         authservers = rc_conf_srv(rh, "authserver"); 
- 	acctservers = rc_conf_srv(rh, "acctserver");
+ 	acct = find_option(rh, "acctserver", OT_ANY);
+ 	auth = find_option(rh, "authserver", OT_ANY);
 -	authservers = malloc(sizeof(SERVER));
 -	acctservers = malloc(sizeof(SERVER));
 +	authservers = calloc(1, sizeof(SERVER));
@@ -20,16 +20,16 @@
  
  	if(authservers == NULL || acctservers == NULL)
  	{
-@@ -491,7 +491,7 @@
- 	option = find_option(rh, optname, OT_INT|OT_AUO);
+@@ -504,7 +504,7 @@ int rc_conf_int(rc_handle const *rh, char const *optna
  
  	if (option != NULL) {
--		return *((int *)option->val);
-+		return option->val ? *((int *)option->val) : 0;
- 	} else {
- 		rc_log(LOG_CRIT, "rc_conf_int: unkown config option requested: %s", optname);
- 		abort();
-@@ -528,17 +528,21 @@
+ 		if (option->val) {
+-			return *((int *)option->val);
++			return option->val ? *((int *)option->val) : 0;
+ 		} else {
+ 			rc_log(LOG_ERR, "rc_conf_int: config option %s was not set", optname);
+ 			return 0;
+@@ -545,17 +545,21 @@ int test_config(rc_handle const *rh, char const *filen
  	struct stat st;
  	char	    *file;
  #endif
diff --git a/net/freeradius-client/files/patch-lib__ip_util.c b/net/freeradius-client/files/patch-lib__ip_util.c
index 657b540fbe95..1f2e72d19836 100644
--- a/net/freeradius-client/files/patch-lib__ip_util.c
+++ b/net/freeradius-client/files/patch-lib__ip_util.c
@@ -1,6 +1,6 @@
---- lib/ip_util.c
+--- lib/ip_util.c.orig	2015-01-19 16:18:26 UTC
 +++ lib/ip_util.c
-@@ -350,6 +350,36 @@
+@@ -348,6 +348,36 @@ uint32_t rc_own_bind_ipaddress(rc_handle *rh)
  }
  
  /*
diff --git a/net/freeradius-client/files/patch-lib__options.h b/net/freeradius-client/files/patch-lib__options.h
index 5d2f000fc16c..d0d444479e11 100644
--- a/net/freeradius-client/files/patch-lib__options.h
+++ b/net/freeradius-client/files/patch-lib__options.h
@@ -1,6 +1,6 @@
---- lib/options.h
+--- lib/options.h.orig	2015-01-19 16:18:26 UTC
 +++ lib/options.h
-@@ -50,6 +50,7 @@
+@@ -50,6 +50,7 @@ static OPTION config_options_default[] = {
  {"radius_retries",	OT_INT,	ST_UNDEF, NULL},
  {"radius_deadtime",	OT_INT, ST_UNDEF, NULL},
  {"bindaddr",		OT_STR, ST_UNDEF, NULL},
diff --git a/net/freeradius-client/files/patch-lib__sendserver.c b/net/freeradius-client/files/patch-lib__sendserver.c
deleted file mode 100644
index 5d47a599a085..000000000000
--- a/net/freeradius-client/files/patch-lib__sendserver.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/sendserver.c
-+++ lib/sendserver.c
-@@ -196,6 +196,7 @@
- 	char            send_buffer[BUFFER_LEN];
- 	int		retries;
- 	VALUE_PAIR 	*vp;
-+	unsigned long	nasaddr;
- 
- 	server_name = data->server;
- 	if (server_name == NULL || server_name[0] == '\0')
-@@ -259,6 +262,9 @@
- 	/*
- 	 * Fill in NAS-IP-Address
- 	 */
-+	nas_ipaddr = rc_nasaddress(rh);
-+	if (nas_ipaddr != 0)
-+		sinlocal.sin_addr.s_addr = htonl(nas_ipaddr);
- 	if (sinlocal.sin_addr.s_addr == htonl(INADDR_ANY)) {
- 		if (rc_get_srcaddr(SA(&sinlocal), SA(&sinremote)) != 0) {
- 			close (sockfd);