From owner-svn-ports-all@FreeBSD.ORG Sat May 17 15:50:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2044609; Sat, 17 May 2014 15:50:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CF66E2E9A; Sat, 17 May 2014 15:50:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HFopCs014066; Sat, 17 May 2014 15:50:51 GMT (envelope-from zi@svn.freebsd.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4HFooUL013835; Sat, 17 May 2014 15:50:50 GMT (envelope-from zi@svn.freebsd.org) Message-Id: <201405171550.s4HFooUL013835@svn.freebsd.org> From: Ryan Steinmetz Date: Sat, 17 May 2014 15:50:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354330 - in head/net/freeradius3: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 15:50:52 -0000 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 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 -@unexec rmdir "/var/run/radiusd" >/dev/null 2>&1 || : -@unexec rmdir "/var/log/radacct" >/dev/null 2>&1 || : -@dirrm %%DATADIR%% -@dirrm %%EXAMPLESDIR%%/raddb/sites-enabled -@dirrm %%EXAMPLESDIR%%/raddb/sites-available -@dirrm %%EXAMPLESDIR%%/raddb/policy.d -@dirrm %%EXAMPLESDIR%%/raddb/mods-enabled -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/unbound -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql/extras -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/oracle -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/ndb +@dirrm include/freeradius +@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%% +@dirrm %%EXAMPLESDIR%%/raddb/certs +@dirrm %%EXAMPLESDIR%%/raddb/mods-available +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/attr_filter +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/files +%%RLMPERL%%@dirrm %%EXAMPLESDIR%%/raddb/mods-config/perl +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/preprocess +%%RLMPYTHON%%@dirrm %%EXAMPLESDIR%%/raddb/mods-config/python +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/mysql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/postgresql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/sqlite +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/mysql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/postgresql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/sqlite +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/mysql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/oracle +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/postgresql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/sqlite +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/mysql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/oracle +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/sqlite +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp +@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 -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/mssql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/ndb +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/oracle +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql/extras +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/sqlite -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/postgresql -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/oracle -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool/mysql -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/sqlite -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/oracle -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp/mysql -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool-dhcp -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/ippool -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/sqlite -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/postgresql -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui/mysql -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/cui -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/sqlite -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/postgresql -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/mysql -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/counter @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql -%%RLMPYTHON%%@dirrm %%EXAMPLESDIR%%/raddb/mods-config/python -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/preprocess -%%RLMPERL%%@dirrm %%EXAMPLESDIR%%/raddb/mods-config/perl -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/files -@dirrm %%EXAMPLESDIR%%/raddb/mods-config/attr_filter +@dirrm %%EXAMPLESDIR%%/raddb/mods-config/unbound @dirrm %%EXAMPLESDIR%%/raddb/mods-config -@dirrm %%EXAMPLESDIR%%/raddb/mods-available -@dirrm %%EXAMPLESDIR%%/raddb/certs +@dirrm %%EXAMPLESDIR%%/raddb/mods-enabled +@dirrm %%EXAMPLESDIR%%/raddb/policy.d +@dirrm %%EXAMPLESDIR%%/raddb/sites-available +@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%% -@dirrm %%LIBDIR%% -@dirrm include/freeradius +@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 +@unexec rmdir "/var/log/radacct" >/dev/null 2>&1 || : +@unexec rmdir "/var/run/radiusd" >/dev/null 2>&1 || :