aboutsummaryrefslogtreecommitdiffstats
path: root/FREEBSD-upgrade
diff options
context:
space:
mode:
Diffstat (limited to 'FREEBSD-upgrade')
-rw-r--r--FREEBSD-upgrade16
1 files changed, 8 insertions, 8 deletions
diff --git a/FREEBSD-upgrade b/FREEBSD-upgrade
index bce7ac58c65e..3195417f24b9 100644
--- a/FREEBSD-upgrade
+++ b/FREEBSD-upgrade
@@ -11,8 +11,8 @@ 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.8x
-# OSSLTAG format: v0_9_8x
+setenv OSSLVER 0.9.8y
+# OSSLTAG format: v0_9_8y
###setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
@@ -21,10 +21,10 @@ 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
-svn co $FSVN/vendor-crypto/openssl/dist dist
+svn co $FSVN/vendor-crypto/openssl/dist-0.9.8 dist-0.9.8
tar -x -X $XLIST -f openssl-${OSSLVER}.tar.gz
-cd dist
+cd dist-0.9.8
svn list -R | egrep -v -e '/$' -e '^FREEBSD-(Xlist|upgrade)$' | sort >../old
cd ../openssl-${OSSLVER}
find . -type f -or -type l | cut -c 3- | sort >../new
@@ -35,20 +35,20 @@ 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
+tar -cf - -C openssl-${OSSLVER} . | tar xf - -C dist-0.9.8
+cd dist-0.9.8
comm -23 ../old ../new | xargs svn rm
comm -13 ../old ../new | xargs svn --parents add
svn stat
svn ci
-svn cp $FSVN/vendor-crypto/openssl/dist $FSVN/vendor-crypto/openssl/$OSSLVER
+svn cp $FSVN/vendor-crypto/openssl/dist-0.9.8 $FSVN/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 crypto/openssl
+svn merge $FSVN/vendor-crypto/openssl/dist-0.9.8 crypto/openssl
# Resolve conflicts manually