From owner-svn-src-all@FreeBSD.ORG  Fri Jan  9 00:12:21 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 978C89CF;
 Fri,  9 Jan 2015 00:12:21 +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 83324F69;
 Fri,  9 Jan 2015 00:12:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t090CLHK091684;
 Fri, 9 Jan 2015 00:12:21 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t090CLMT091682;
 Fri, 9 Jan 2015 00:12:21 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201501090012.t090CLMT091682@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org
 using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 9 Jan 2015 00:12:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r276862 - in vendor-crypto/openssl/dist: crypto util
X-SVN-Group: vendor-crypto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2015 00:12:21 -0000

Author: jkim
Date: Fri Jan  9 00:12:20 2015
New Revision: 276862
URL: https://svnweb.freebsd.org/changeset/base/276862

Log:
  Fix build failure on Windows due to undefined cflags identifier.
  
  https://github.com/openssl/openssl/commit/5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb

Modified:
  vendor-crypto/openssl/dist/crypto/cversion.c
  vendor-crypto/openssl/dist/util/mkbuildinf.pl

Modified: vendor-crypto/openssl/dist/crypto/cversion.c
==============================================================================
--- vendor-crypto/openssl/dist/crypto/cversion.c	Thu Jan  8 23:42:41 2015	(r276861)
+++ vendor-crypto/openssl/dist/crypto/cversion.c	Fri Jan  9 00:12:20 2015	(r276862)
@@ -77,7 +77,7 @@ const char *SSLeay_version(int t)
 	if (t == SSLEAY_CFLAGS)
 		{
 #ifdef CFLAGS
-		return(cflags);
+		return(CFLAGS);
 #else
 		return("compiler: information not available");
 #endif

Modified: vendor-crypto/openssl/dist/util/mkbuildinf.pl
==============================================================================
--- vendor-crypto/openssl/dist/util/mkbuildinf.pl	Thu Jan  8 23:42:41 2015	(r276861)
+++ vendor-crypto/openssl/dist/util/mkbuildinf.pl	Fri Jan  9 00:12:20 2015	(r276862)
@@ -7,7 +7,7 @@ $date = localtime();
 print <<"END_OUTPUT";
 #ifndef MK1MF_BUILD
     /* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */
-    #define CFLAGS
+    #define CFLAGS cflags
     /*
      * Generate CFLAGS as an array of individual characters. This is a
      * workaround for the situation where CFLAGS gets too long for a C90 string