From owner-svn-src-all@FreeBSD.ORG  Thu Aug  7 17:05:26 2014
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5ACE9E62
 for <svn-src-all@freebsd.org>; Thu,  7 Aug 2014 17:05:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 324272900
 for <svn-src-all@freebsd.org>; Thu,  7 Aug 2014 17:05:26 +0000 (UTC)
Received: from jkim (uid 1068) (envelope-from jkim@FreeBSD.org) id 2a92
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Thu, 07 Aug 2014 17:05:26 +0000
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 7 Aug 2014 17:05:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r269676 - vendor-crypto/openssl/dist-0.9.8
X-SVN-Group: vendor-crypto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e3b1d6.2a92.6a1ecdfb@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
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: Thu, 07 Aug 2014 17:05:26 -0000

Author: jkim
Date: Thu Aug  7 17:05:25 2014
New Revision: 269676
URL: http://svnweb.freebsd.org/changeset/base/269676

Log:
  Sync. with ^/vendor-crypto/openssl/dist/FREEBSD-upgrade.

Modified:
  vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade

Modified: vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade	Thu Aug  7 17:00:50 2014	(r269675)
+++ vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade	Thu Aug  7 17:05:25 2014	(r269676)
@@ -35,20 +35,21 @@ comm -23 old new
 # See that files to add makes sense
 comm -13 old new
 
-tar -cf - -C openssl-${OSSLVER} . | tar xf - -C dist-0.9.8
+tar -cf - -C openssl-${OSSLVER} . | tar -xf - -C dist-0.9.8
 cd dist-0.9.8
 comm -23 ../old ../new | xargs svn rm
+# Make sure to remove empty directories
 comm -13 ../old ../new | xargs svn --parents add
 
 svn stat
 svn ci
-svn cp $FSVN/vendor-crypto/openssl/dist-0.9.8 $FSVN/vendor-crypto/openssl/$OSSLVER
+svn cp ^/vendor-crypto/openssl/dist-0.9.8 ^/vendor-crypto/openssl/$OSSLVER
 
 # Merge to head
 mkdir ../head
 cd ../head
 svn co $FSVN/head/crypto/openssl crypto/openssl
-svn merge $FSVN/vendor-crypto/openssl/dist-0.9.8 crypto/openssl
+svn merge ^/vendor-crypto/openssl/dist-0.9.8 crypto/openssl
 
 # Resolve conflicts manually