aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2020-12-09 02:11:58 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2020-12-09 02:11:58 +0000
commitdeed5672eb3f74baeb67c91c9b899f14e6cca3f3 (patch)
tree347b21eda8c3c889697950fcba3c87e431a26ed0
parent970a464089066970886f0bce6d1c9dcfbcb2e8ea (diff)
downloadsrc-deed5672eb3f74baeb67c91c9b899f14e6cca3f3.tar.gz
src-deed5672eb3f74baeb67c91c9b899f14e6cca3f3.zip
Update OpenSSL upgrade procedure.
Notes
Notes: svn path=/vendor-crypto/openssl/dist/; revision=368474
-rw-r--r--FREEBSD-upgrade13
1 files changed, 4 insertions, 9 deletions
diff --git a/FREEBSD-upgrade b/FREEBSD-upgrade
index e3b02f0327cd..19d10b86a194 100644
--- a/FREEBSD-upgrade
+++ b/FREEBSD-upgrade
@@ -11,7 +11,7 @@ First, read http://wiki.freebsd.org/SubversionPrimer/VendorImports
# Xlist
setenv XLIST /FreeBSD/work/openssl/svn-FREEBSD-files/FREEBSD-Xlist
setenv FSVN "svn+ssh://repo.freebsd.org/base"
-setenv OSSLVER 1.1.1h
+setenv OSSLVER 1.1.1i
###setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
@@ -64,17 +64,12 @@ cd secure/lib/libcrypto
# Regen assembly files if necessary
make -f Makefile.asm all
-mv *.[Ss] ${MACHINE_CPUARCH}
+mv *.S sys/crypto/openssl/${MACHINE_CPUARCH}
make -f Makefile.asm clean
-
-# Regen manual pages
-make man-makefile-update && make man-update
-cd ../libssl
-make man-makefile-update && make man-update
-cd ../../usr.bin/openssl
-make man-makefile-update && make man-update
cd ../../..
+# Regen manual pages and update makefiles accordingly
+
# Commit!
svn ci crypto/openssl secure/lib/libcrypto secure/lib/libssl secure/usr.bin/openssl