svn commit: r354330 - in head/net/freeradius3: . files

[Ryan Steinmetz]

Author: zi
Date: Sat May 17 15:50:50 2014
New Revision: 354330
URL: http://svnweb.freebsd.org/changeset/ports/354330
QAT: https://qat.redports.org/buildarchive/r354330/

Log:
  - Merge in upstream patch
  - Add another notice for 10.0 users/OpenSSL
  - Bump PORTREVISION
  
  PR:		ports/189881
  Submitted by: 	Olli Hauer <ohauer at FreeBSD.org>

Added:
  head/net/freeradius3/files/patch-src__main__mainconfig.c   (contents, props changed)
Modified:
  head/net/freeradius3/Makefile
  head/net/freeradius3/files/pkg-message.in
  head/net/freeradius3/pkg-plist

Modified: head/net/freeradius3/Makefile
==============================================================================
--- head/net/freeradius3/Makefile	Sat May 17 15:48:50 2014	(r354329)
+++ head/net/freeradius3/Makefile	Sat May 17 15:50:50 2014	(r354330)
@@ -3,6 +3,7 @@
 
 PORTNAME=	freeradius
 DISTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -344,7 +345,15 @@ SUB_LIST+=	RADIUS_USER="${RADIUS_USER}" 
 		RADDB="${PREFIX}/etc/raddb" \
 		LOGDIR="${LOGDIR}" \
 		LIBDIR="${PREFIX}/${FREERADIUS_LIBDIR}"
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
+SUB_LIST+=	REQUIRE="${_REQUIRE}" OPENSSL1XMSG="${OPENSSL1XMSG}"
+
+.if ${OSVERSION} > 1000000
+OPENSSL1XMSG=	"If you are running FreeBSD 10.0-RELEASE or higher, you will receive an OpenSSL warning."
+OPENSSL1XMSG+=	"Please verify that your system is patched and then add the following to your config:"
+OPENSSL1XMSG+=	"security.allow_vulnerable_openssl = 'CVE-2014-0160'"
+.else
+OPENSSL1XMSG=	""
+.endif
 
 post-patch:
 # never try to find execinfo.h (needed until we can enable/disable backtrace

Added: head/net/freeradius3/files/patch-src__main__mainconfig.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/freeradius3/files/patch-src__main__mainconfig.c	Sat May 17 15:50:50 2014	(r354330)
@@ -0,0 +1,14 @@
+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;

Modified: head/net/freeradius3/files/pkg-message.in
==============================================================================
--- head/net/freeradius3/files/pkg-message.in	Sat May 17 15:48:50 2014	(r354329)
+++ head/net/freeradius3/files/pkg-message.in	Sat May 17 15:50:50 2014	(r354330)
@@ -49,5 +49,6 @@ well break things!
 Useful configuration advice can be found in the FreeRADIUS Wiki at
 http://wiki.freeradius.org
 
+%%OPENSSL1XMSG%%
 ===============================================================================
 

Modified: head/net/freeradius3/pkg-plist
==============================================================================
--- head/net/freeradius3/pkg-plist	Sat May 17 15:48:50 2014	(r354329)
+++ head/net/freeradius3/pkg-plist	Sat May 17 15:50:50 2014	(r354330)
@@ -832,66 +832,66 @@ sbin/radmin
 %%DATADIR%%/dictionary.zeus
 %%DATADIR%%/dictionary.zte
 %%DATADIR%%/dictionary.zyxel
- at unexec rmdir "/var/run/radiusd" >/dev/null 2>&1 || :
- at unexec rmdir "/var/log/radacct" >/dev/null 2>&1 || :
- at dirrm %%DATADIR%%
- at dirrm %%EXAMPLESDIR%%/raddb/sites-enabled
- at dirrm %%EXAMPLESDIR%%/raddb/sites-available
- at dirrm %%EXAMPLESDIR%%/raddb/policy.d
- at dirrm %%EXAMPLESDIR%%/raddb/mods-enabled
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/unbound
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql/extras
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/oracle
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/ndb
+ at dirrm include/freeradius
+ at dirrm %%LIBDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/concepts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/configuration
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/deployment
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/developer
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas/ldap
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/vendor
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%EXAMPLESDIR%%/raddb/certs
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-available
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/attr_filter
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/files
+%%RLMPERL%%@dirrm %%EXAMPLESDIR%%/raddb/mods-config/perl
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/preprocess
+%%RLMPYTHON%%@dirrm %%EXAMPLESDIR%%/raddb/mods-config/python
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/mysql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/postgresql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/sqlite
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/mysql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/postgresql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/sqlite
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/mysql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/oracle
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/postgresql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/sqlite
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/mysql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/oracle
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/sqlite
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/mssql
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/mysql/extras/wimax
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/mysql/extras
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/mysql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/mssql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/ndb
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/oracle
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql/extras
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/sqlite
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/postgresql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/oracle
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/mysql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/sqlite
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/oracle
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/mysql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/sqlite
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/postgresql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/mysql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/sqlite
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/postgresql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/mysql
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql
-%%RLMPYTHON%%@dirrm %%EXAMPLESDIR%%/raddb/mods-config/python
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/preprocess
-%%RLMPERL%%@dirrm %%EXAMPLESDIR%%/raddb/mods-config/perl
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/files
- at dirrm %%EXAMPLESDIR%%/raddb/mods-config/attr_filter
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-config/unbound
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config
- at dirrm %%EXAMPLESDIR%%/raddb/mods-available
- at dirrm %%EXAMPLESDIR%%/raddb/certs
+ at dirrm %%EXAMPLESDIR%%/raddb/mods-enabled
+ at dirrm %%EXAMPLESDIR%%/raddb/policy.d
+ at dirrm %%EXAMPLESDIR%%/raddb/sites-available
+ at dirrm %%EXAMPLESDIR%%/raddb/sites-enabled
 @dirrm %%EXAMPLESDIR%%/raddb
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/vendor
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas/ldap
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/schemas
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/developer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/deployment
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/configuration
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/concepts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%LIBDIR%%
- at dirrm include/freeradius
+ at dirrm %%DATADIR%%
 @exec if ! [ -d %D/etc/raddb -o -L %D/etc/raddb ]; then cp -RP %D/%%EXAMPLESDIR%%/raddb %D/etc/raddb; echo '===> Bootstrapping default certificates, please wait...'; %D/etc/raddb/certs/bootstrap >/dev/null 2>&1; fi
 @exec chmod -R g-w,o-rwx %D/etc/raddb
 @exec if [ ! -d /var/log/radacct ]; then mkdir -p /var/log/radacct; chmod -R go= /var/log/radacct; fi
 @exec for i in /var/log/radius.log /var/log/radutmp /var/log/radwtmp; do if [ ! -f ${i} ]; then touch ${i}; chmod go= ${i}; fi; done
 @exec mkdir -p /var/run/radiusd
+ at unexec rmdir "/var/log/radacct" >/dev/null 2>&1 || :
+ at unexec rmdir "/var/run/radiusd" >/dev/null 2>&1 || :