From owner-svn-src-all@FreeBSD.ORG  Sun Jun  7 20:02:33 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B41861065672;
	Sun,  7 Jun 2009 20:02:32 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 877CA8FC12;
	Sun,  7 Jun 2009 20:02:32 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n57K2Wt3003785;
	Sun, 7 Jun 2009 20:02:32 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n57K2Wf3003784;
	Sun, 7 Jun 2009 20:02:32 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906072002.n57K2Wf3003784@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sun, 7 Jun 2009 20:02:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193647 - vendor-crypto/openssl/dist
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 07 Jun 2009 20:02:33 -0000

Author: simon
Date: Sun Jun  7 20:02:32 2009
New Revision: 193647
URL: http://svn.freebsd.org/changeset/base/193647

Log:
  Add current WIP version of OpenSSL import documentation.

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

Modified: vendor-crypto/openssl/dist/FREEBSD-upgrade
==============================================================================
--- vendor-crypto/openssl/dist/FREEBSD-upgrade	Sun Jun  7 19:59:34 2009	(r193646)
+++ vendor-crypto/openssl/dist/FREEBSD-upgrade	Sun Jun  7 20:02:32 2009	(r193647)
@@ -4,21 +4,48 @@ the FreeBSD base system.  It is not expe
 contain some hints for imports.  Note that this doesn't actually deal
 with getting OpenSSL to compile...
 
-setenv OSSLVER 0.9.8e
-# OSSLTAG format: v0_9_8e
-setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
+XXX This file currently partly contain CVS and SVN instructions.
+
+First, read http://wiki.freebsd.org/SubversionPrimer/VendorImports
+
+# Xlist
+setenv XLIST /FreeBSD/work/openssl/svn-FREEBSD-files/FREEBSD-Xlist
+setenv FSVN "svn+ssh://svn.freebsd.org/base"
+setenv OSSLVER 0.9.8k
+# OSSLTAG format: v0_9_8k
+
+###setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
+
+cd /FreeBSD/work/openssl/merge
 fetch  http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz \
 	http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc
 gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz
-tar xf openssl-${OSSLVER}.tar.gz
-mv openssl-${OSSLVER} openssl
-cd openssl
-find . -type l -delete
-sh -c 'while read glob ; do rm -rvf $glob ; done' </usr/src/crypto/openssl/FREEBSD-Xlist
-# Check for new files
-cvs -n import src/crypto/openssl OPENSSL x | grep \^N
-cvs import -m "Vendor import of OpenSSL ${OSSLVER}." src/crypto/openssl OPENSSL ${OSSLTAG}
-cvs checkout -j<prev_rel_tag> -j${OSSLTAG} src/crypto/openssl
+
+svn co $FSVN/vendor-crypto/openssl/dist dist
+tar -x -X $XLIST -f openssl-${OSSLVER}.tar.gz
+
+cd dist
+svn list -R | grep -v '/$' | sort >../old
+cd ../openssl-${OSSLVER}
+find . -type f -or -type l | cut -c 3- | sort >../new
+cd ..
+
+# See that files to remove makes sense
+# FREEBSD-Xlist FREEBSD-upgrade will show up - ignore that.
+comm -23 old new
+# See that files to add makes sense
+comm -13 old new
+
+tar -cf - -C openssl-${OSSLVER} . | tar xf - -C dist
+cd dist
+comm -23 ../old ../new | xargs svn rm
+comm -13 ../old ../new | xargs svn --parents add
+
+svn ci
+echo svn cp $FSVN/vendor-crypto/openssl/dist $FSVN/vendor-crypto/openssl/$OSSLVER
+
+# XXX, below this point it's very WIP.
+
 # Resolve conflicts manually
 cd src/crypto/openssl
 cvs ci -m "Resolve conflicts after import of OpenSSL ${OSSLVER}."