- Update to 3.0.4

7 files changed, 33 insertions, 53 deletions

diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index f3a45d8a5eb2..4eb0092b2a23 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeradius
-DISTVERSION=	3.0.3
-PORTREVISION=	5
+DISTVERSION=	3.0.4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
diff --git a/net/freeradius3/distinfo b/net/freeradius3/distinfo
index 7b1530f2e899..a4e1d17b9e1b 100644
--- a/net/freeradius3/distinfo
+++ b/net/freeradius3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeradius-server-3.0.3.tar.bz2) = 781488e18f7b80e241bb5dafa07fcf8f2f7fbe897b337a07367e3f73749ae729
-SIZE (freeradius-server-3.0.3.tar.bz2) = 2762771
+SHA256 (freeradius-server-3.0.4.tar.bz2) = 12183dc7eecb08fc4f1c7e6c71200aa03c16c8757aac381fda028ae39326947d
+SIZE (freeradius-server-3.0.4.tar.bz2) = 2797626
diff --git a/net/freeradius3/files/patch-src__lib__udpfromto.c b/net/freeradius3/files/patch-src__lib__udpfromto.c
deleted file mode 100644
index f145db90dfdf..000000000000
--- a/net/freeradius3/files/patch-src__lib__udpfromto.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/lib/udpfromto.c.orig	2014-03-21 08:27:25.000000000 -0400
-+++ ./src/lib/udpfromto.c	2014-03-29 09:59:57.000000000 -0400
-@@ -316,7 +316,7 @@
- 		break;
- 
- 	case AF_INET6:
--		if (!IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *) &bound)->sin6_addr))) {
-+		if (!IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *) &bound)->sin6_addr)) {
- 			from = NULL;
- 		}
- 		break;
diff --git a/net/freeradius3/files/patch-src__lib__valuepair.c b/net/freeradius3/files/patch-src__lib__valuepair.c
deleted file mode 100644
index 45a070df4363..000000000000
--- a/net/freeradius3/files/patch-src__lib__valuepair.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/lib/valuepair.c.orig	2014-03-29 10:01:05.000000000 -0400
-+++ ./src/lib/valuepair.c	2014-03-29 10:01:14.000000000 -0400
-@@ -2331,7 +2331,7 @@
-  */
- int paircmp_op(VALUE_PAIR const *one, FR_TOKEN op, VALUE_PAIR const *two)
- {
--	int compare;
-+	int compare = 0;
- 
- 	VERIFY_VP(one);
- 	VERIFY_VP(two);
diff --git a/net/freeradius3/files/patch-src__main__mainconfig.c b/net/freeradius3/files/patch-src__main__mainconfig.c
deleted file mode 100644
index 69fc11988d3a..000000000000
--- a/net/freeradius3/files/patch-src__main__mainconfig.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix FreeRADIUS 3.0.3 crash
-https://github.com/FreeRADIUS/freeradius-server/issues/634
-==================================================================
---- ./src/main/mainconfig.c.orig	2014-05-17 11:19:37.000000000 +0200
-+++ ./src/main/mainconfig.c	2014-05-17 11:20:09.000000000 +0200
-@@ -83,7 +83,7 @@
-  */
- static char const	*localstatedir = NULL;
- static char const	*prefix = NULL;
--static char		my_name;
-+static char const	*my_name = NULL;
- static char const	*sbindir = NULL;
- static char const	*run_dir = NULL;
- static char		*syslog_facility = NULL;
diff --git a/net/freeradius3/files/patch-src__main__version.c b/net/freeradius3/files/patch-src__main__version.c
index 069fbc7bd36d..41ea17c7e434 100644
--- a/net/freeradius3/files/patch-src__main__version.c
+++ b/net/freeradius3/files/patch-src__main__version.c
@@ -1,10 +1,10 @@
---- ./src/main/version.c.orig	2014-08-16 16:06:51.000000000 -0400
-+++ ./src/main/version.c	2014-08-16 16:07:43.000000000 -0400
-@@ -53,7 +53,6 @@
+--- src/main/version.c.orig	2014-09-21 18:29:42 UTC
++++ src/main/version.c
+@@ -62,7 +62,6 @@
  		       (unsigned long) ssl_built,
  		       (unsigned long) ssl_linked);
  
 -		return -1;
- 	};
+ 	}
  
- 	return 0;
+ 	/*
diff --git a/net/freeradius3/pkg-plist b/net/freeradius3/pkg-plist
index fc467be98a42..d8a22c34f288 100644
--- a/net/freeradius3/pkg-plist
+++ b/net/freeradius3/pkg-plist
@@ -15,6 +15,7 @@ bin/radwho
 bin/radzap
 bin/rlm_ippool_tool
 bin/smbencrypt
+include/freeradius/attributes.h
 include/freeradius/base64.h
 include/freeradius/build.h
 include/freeradius/conf.h
@@ -315,8 +316,8 @@ sbin/radmin
 %%PORTDOCS%%%%DOCSDIR%%/deployment/performance-testing
 %%PORTDOCS%%%%DOCSDIR%%/deployment/supervise-radiusd.rst
 %%PORTDOCS%%%%DOCSDIR%%/deployment/tuning_guide
-%%PORTDOCS%%%%DOCSDIR%%/developer/DIFFS.rst
 %%PORTDOCS%%%%DOCSDIR%%/developer/coding-methods.rst
+%%PORTDOCS%%%%DOCSDIR%%/developer/contributing.rst
 %%PORTDOCS%%%%DOCSDIR%%/developer/module_interface.rst
 %%PORTDOCS%%%%DOCSDIR%%/developer/release-method.rst
 %%PORTDOCS%%%%DOCSDIR%%/index.rst
@@ -326,6 +327,7 @@ sbin/radmin
 %%PORTDOCS%%%%DOCSDIR%%/modules/rlm_dbm
 %%PORTDOCS%%%%DOCSDIR%%/modules/rlm_eap
 %%PORTDOCS%%%%DOCSDIR%%/modules/rlm_expiration
+%%PORTDOCS%%%%DOCSDIR%%/modules/rlm_krb5
 %%PORTDOCS%%%%DOCSDIR%%/modules/rlm_pam
 %%PORTDOCS%%%%DOCSDIR%%/modules/rlm_passwd
 %%PORTDOCS%%%%DOCSDIR%%/modules/rlm_python
@@ -407,13 +409,13 @@ sbin/radmin
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc6911.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc6929.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc6930.txt
-%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/iplanet.ldif
-%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/iplanet.schema
-%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/openldap.ldif
-%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/openldap.schema
-%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/radiusclients-edirectory.ldif
-%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/radiusclients-openldap.ldif
-%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/radiusclients-openldap.schema
+%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/edir/freeradius-clients.ldif
+%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/iplanet/freeradius.ldif
+%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/iplanet/freeradius.schema
+%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/openldap/freeradius-clients.ldif
+%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/openldap/freeradius-clients.schema
+%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/openldap/freeradius.ldif
+%%PORTDOCS%%%%DOCSDIR%%/schemas/ldap/openldap/freeradius.schema
 %%PORTDOCS%%%%DOCSDIR%%/schemas/sql
 %%PORTDOCS%%%%DOCSDIR%%/vendor/ascend
 %%PORTDOCS%%%%DOCSDIR%%/vendor/bay
@@ -463,6 +465,7 @@ sbin/radmin
 %%EXAMPLESDIR%%/raddb/mods-available/cache_eap
 %%EXAMPLESDIR%%/raddb/mods-available/chap
 %%EXAMPLESDIR%%/raddb/mods-available/counter
+%%EXAMPLESDIR%%/raddb/mods-available/couchbase
 %%EXAMPLESDIR%%/raddb/mods-available/cui
 %%EXAMPLESDIR%%/raddb/mods-available/date
 %%EXAMPLESDIR%%/raddb/mods-available/detail
@@ -550,6 +553,7 @@ sbin/radmin
 %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/sqlite/queries.conf
 %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/sqlite/schema.sql
 %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/mysql/queries.conf
+%%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/mysql/schema.sql
 %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/oracle/queries.conf
 %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/oracle/schema.sql
 %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/sqlite/queries.conf
@@ -619,6 +623,7 @@ sbin/radmin
 %%EXAMPLESDIR%%/raddb/policy.d/canonicalization
 %%EXAMPLESDIR%%/raddb/policy.d/control
 %%EXAMPLESDIR%%/raddb/policy.d/cui
+%%EXAMPLESDIR%%/raddb/policy.d/debug
 %%EXAMPLESDIR%%/raddb/policy.d/dhcp
 %%EXAMPLESDIR%%/raddb/policy.d/eap
 %%EXAMPLESDIR%%/raddb/policy.d/filter
@@ -627,6 +632,7 @@ sbin/radmin
 %%EXAMPLESDIR%%/raddb/radiusd.conf
 %%EXAMPLESDIR%%/raddb/sites-available/README
 %%EXAMPLESDIR%%/raddb/sites-available/buffered-sql
+%%EXAMPLESDIR%%/raddb/sites-available/channel_bindings
 %%EXAMPLESDIR%%/raddb/sites-available/check-eap-tls
 %%EXAMPLESDIR%%/raddb/sites-available/coa
 %%EXAMPLESDIR%%/raddb/sites-available/control-socket
@@ -694,20 +700,24 @@ sbin/radmin
 %%DATADIR%%/dictionary.cisco.bbsm
 %%DATADIR%%/dictionary.cisco.vpn3000
 %%DATADIR%%/dictionary.cisco.vpn5000
+%%DATADIR%%/dictionary.citrix
 %%DATADIR%%/dictionary.clavister
 %%DATADIR%%/dictionary.colubris
 %%DATADIR%%/dictionary.columbia_university
 %%DATADIR%%/dictionary.compat
+%%DATADIR%%/dictionary.compatible
 %%DATADIR%%/dictionary.cosine
 %%DATADIR%%/dictionary.dante
 %%DATADIR%%/dictionary.dhcp
 %%DATADIR%%/dictionary.digium
 %%DATADIR%%/dictionary.dlink
+%%DATADIR%%/dictionary.dragonwave
 %%DATADIR%%/dictionary.efficientip
 %%DATADIR%%/dictionary.eltex
 %%DATADIR%%/dictionary.epygi
 %%DATADIR%%/dictionary.equallogic
 %%DATADIR%%/dictionary.ericsson
+%%DATADIR%%/dictionary.ericsson.packet.core.networks
 %%DATADIR%%/dictionary.erx
 %%DATADIR%%/dictionary.extreme
 %%DATADIR%%/dictionary.f5
@@ -795,8 +805,11 @@ sbin/radmin
 %%DATADIR%%/dictionary.rfc6929
 %%DATADIR%%/dictionary.rfc6930
 %%DATADIR%%/dictionary.rfc7055
+%%DATADIR%%/dictionary.rfc7268
+%%DATADIR%%/dictionary.riverbed
 %%DATADIR%%/dictionary.riverstone
 %%DATADIR%%/dictionary.roaringpenguin
+%%DATADIR%%/dictionary.ruckus
 %%DATADIR%%/dictionary.sg
 %%DATADIR%%/dictionary.shasta
 %%DATADIR%%/dictionary.shiva
@@ -807,6 +820,7 @@ sbin/radmin
 %%DATADIR%%/dictionary.springtide
 %%DATADIR%%/dictionary.starent
 %%DATADIR%%/dictionary.starent.vsa1
+%%DATADIR%%/dictionary.surfnet
 %%DATADIR%%/dictionary.symbol
 %%DATADIR%%/dictionary.t_systems_nova
 %%DATADIR%%/dictionary.telebit
@@ -843,6 +857,9 @@ sbin/radmin
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/developer
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/modules
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas/ldap/edir
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas/ldap/iplanet
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas/ldap/openldap
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas/ldap
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/vendor