From owner-svn-ports-head@FreeBSD.ORG Tue Jul 29 20:31:49 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5FCAB34; Tue, 29 Jul 2014 20:31:49 +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 887BF2182; Tue, 29 Jul 2014 20:31:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6TKVnLB038986; Tue, 29 Jul 2014 20:31:49 GMT (envelope-from zi@svn.freebsd.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6TKVmvx038983; Tue, 29 Jul 2014 20:31:48 GMT (envelope-from zi@svn.freebsd.org) Message-Id: <201407292031.s6TKVmvx038983@svn.freebsd.org> From: Ryan Steinmetz Date: Tue, 29 Jul 2014 20:31:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363386 - 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-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2014 20:31:49 -0000 Author: zi Date: Tue Jul 29 20:31:48 2014 New Revision: 363386 URL: http://svnweb.freebsd.org/changeset/ports/363386 QAT: https://qat.redports.org/buildarchive/r363386/ Log: - Add SQLITE3 OPTION - Disable heartbleed test (requested by des@) Added: head/net/freeradius3/files/patch-src__main__tls.c (contents, props changed) Modified: head/net/freeradius3/Makefile head/net/freeradius3/pkg-plist Modified: head/net/freeradius3/Makefile ============================================================================== --- head/net/freeradius3/Makefile Tue Jul 29 20:08:39 2014 (r363385) +++ head/net/freeradius3/Makefile Tue Jul 29 20:31:48 2014 (r363386) @@ -42,10 +42,11 @@ MAKE_JOBS_SAFE= yes PLIST_SUB= PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g} +OPTIONS_SUB= yes OPTIONS_DEFINE= USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \ PGSQL UNIXODBC FIREBIRD REDIS PYTHON RUBY \ EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \ - FREETDS IDN SSL_PORT DOCS + FREETDS IDN SSL_PORT DOCS SQLITE3 OPTIONS_DEFAULT=USER PERL USER_DESC= Run as user freeradius, group freeradius @@ -60,6 +61,9 @@ EDIR_DESC= Enable eDirectory support (i REST_DESC= Enable RESTful API support SSL_PORT_DESC= Use OpenSSL from the ports collection +SQLITE3_CONFIGURE_WITH=rlm_sql_sqlite +SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 + .include # Default requirements for rc script @@ -327,7 +331,6 @@ CONFIGURE_ARGS+=--with-logdir=${LOGDIR} --without-rlm_opendirectory \ --without-rlm_sql_db2 \ --without-rlm_sql_iodbc \ - --without-rlm_sql_sqlite \ --without-rlm_sql_sybase \ --without-rlm_yubikey \ --without-rlm_sql_oracle \ Added: head/net/freeradius3/files/patch-src__main__tls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/freeradius3/files/patch-src__main__tls.c Tue Jul 29 20:31:48 2014 (r363386) @@ -0,0 +1,16 @@ +--- ./src/main/tls.c.orig 2014-07-29 15:55:29.000000000 -0400 ++++ ./src/main/tls.c 2014-07-29 15:57:18.000000000 -0400 +@@ -62,13 +62,6 @@ + /* Record critical defects in libssl here (newest first)*/ + static libssl_defect_t libssl_defects[] = + { +- { +- .low = 0x010001000, /* 1.0.1 */ +- .high = 0x01000106f, /* 1.0.1f */ +- .id = "CVE-2014-0160", +- .name = "Heartbleed", +- .comment = "For more information see http://heartbleed.com" +- } + }; + + /* record */ Modified: head/net/freeradius3/pkg-plist ============================================================================== --- head/net/freeradius3/pkg-plist Tue Jul 29 20:08:39 2014 (r363385) +++ head/net/freeradius3/pkg-plist Tue Jul 29 20:31:48 2014 (r363386) @@ -238,6 +238,9 @@ include/freeradius/udpfromto.h %%LIBDIR%%/rlm_sqlippool.a %%LIBDIR%%/rlm_sqlippool.la %%LIBDIR%%/rlm_sqlippool.so +%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.a +%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.la +%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.so %%LIBDIR%%/rlm_unix.a %%LIBDIR%%/rlm_unix.la %%LIBDIR%%/rlm_unix.so