diff options
Diffstat (limited to 'FREEBSD-upgrade')
| -rw-r--r-- | FREEBSD-upgrade | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/FREEBSD-upgrade b/FREEBSD-upgrade index bd3c1314a796..f3ee6b02f42a 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 1.0.1p -# OSSLTAG format: v1_0_1p +setenv OSSLVER 1.0.1q +# OSSLTAG format: v1_0_1q ###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-1.0.1 dist-1.0.1 tar -x -X $XLIST -f openssl-${OSSLVER}.tar.gz -cd dist +cd dist-1.0.1 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,21 +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 -cd dist +tar -cf - -C openssl-${OSSLVER} . | tar -xf - -C dist-1.0.1 +cd dist-1.0.1 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 ^/vendor-crypto/openssl/dist ^/vendor-crypto/openssl/$OSSLVER +svn cp ^/vendor-crypto/openssl/dist-1.0.1 ^/vendor-crypto/openssl/$OSSLVER # Merge to head mkdir ../head cd ../head svn co $FSVN/head/crypto/openssl crypto/openssl -svn merge ^/vendor-crypto/openssl/dist crypto/openssl +svn merge ^/vendor-crypto/openssl/dist-1.0.1 crypto/openssl # Resolve conflicts manually |