update for new repository layout

author: Brent Cook <bcook@openbsd.org> 2016-09-02 12:43:30 -0500
committer: Brent Cook <bcook@openbsd.org> 2016-09-02 12:43:30 -0500
commit: 22dcefee4e1b0660d7312bd438c8291c9588c3ff (patch)
tree: 2524eeaf804a91ffe7c72639b7f148e851d3b74b /update.sh
parent: 5ea2a55cc7b412062913138fef421c34b8bd1269 (diff)
download: portable-22dcefee4e1b0660d7312bd438c8291c9588c3ff.tar.gz
portable-22dcefee4e1b0660d7312bd438c8291c9588c3ff.tar.bz2
portable-22dcefee4e1b0660d7312bd438c8291c9588c3ff.zip
1 files changed, 21 insertions, 21 deletions
diff --git a/update.sh b/update.sh
index 14082a1..1130c2b 100755
--- a/update.sh
+++ b/update.sh
@@ -29,12 +29,12 @@ libtls_regress=$CWD/openbsd/src/regress/lib/libtls
 app_src=$CWD/openbsd/src/usr.bin
 # load library versions
-. $libcrypto_src/crypto/shlib_version
+. $libcrypto_src/shlib_version
 libcrypto_version=$major:$minor:0
 echo "libcrypto version $libcrypto_version"
 echo $libcrypto_version > crypto/VERSION
-. $libssl_src/ssl/shlib_version
+. $libssl_src/shlib_version
 libssl_version=$major:$minor:0
 echo "libssl version $libssl_version"
 echo $libssl_version > ssl/VERSION
@@ -62,11 +62,11 @@ CP_LIBC='do_cp_libc'
 CP='cp -p'
-$CP $libssl_src/src/LICENSE COPYING
+$CP $libssl_src/LICENSE COPYING
-$CP $libcrypto_src/crypto/arch/amd64/opensslconf.h include/openssl
+$CP $libcrypto_src/arch/amd64/opensslconf.h include/openssl
-$CP $libssl_src/src/crypto/opensslfeatures.h include/openssl
+$CP $libcrypto_src/opensslfeatures.h include/openssl
-$CP $libssl_src/src/ssl/pqueue.h include
+$CP $libssl_src/pqueue.h include
 $CP $libtls_src/tls.h include
 $CP $libtls_src/tls.h libtls-standalone/include
@@ -84,8 +84,8 @@ for i in crypto/compat libtls-standalone/compat; do
            $libc_src/string/strnlen.c \
            $libc_src/string/timingsafe_bcmp.c \
            $libc_src/string/timingsafe_memcmp.c \
-            $libcrypto_src/crypto/getentropy_*.c \
+            $libcrypto_src/arc4random/getentropy_*.c \
-            $libcrypto_src/crypto/arc4random_*.h; do
+            $libcrypto_src/arc4random/arc4random_*.h; do
                $CP_LIBC $j $i
        done
 done
@@ -99,20 +99,20 @@ $CP crypto/compat/arc4random*.h \
        crypto/compat/bsd-asprintf.c \
        libtls-standalone/compat
-(cd $libssl_src/src/crypto/objects/;
+(cd $libcrypto_src/objects/;
        perl objects.pl objects.txt obj_mac.num obj_mac.h;
        perl obj_dat.pl obj_mac.h obj_dat.h )
 mkdir -p include/openssl crypto/objects
-$MV $libssl_src/src/crypto/objects/obj_mac.h ./include/openssl/obj_mac.h
+$MV $libcrypto_src/objects/obj_mac.h ./include/openssl/obj_mac.h
-$MV $libssl_src/src/crypto/objects/obj_dat.h ./crypto/objects/obj_dat.h
+$MV $libcrypto_src/objects/obj_dat.h ./crypto/objects/obj_dat.h
 copy_hdrs() {
        for file in $2; do
-                $CP $libssl_src/src/$1/$file include/openssl
+                $CP $1/$file include/openssl
        done
 }
-copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h
+copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
        ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h
        objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
        ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
@@ -126,9 +126,9 @@ copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h
        chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h
        gost/gost.h"
-copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
+copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
-$CP $libssl_src/src/crypto/opensslv.h include/openssl
+$CP $libcrypto_src/opensslv.h include/openssl
 awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 > VERSION
 echo "LibreSSL version `cat VERSION`"
@@ -139,8 +139,8 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
        dir=`dirname $i`
        mkdir -p crypto/$dir
        if [ $dir != "compat" ]; then
-                if [ -e $libssl_src/src/crypto/$i ]; then
+                if [ -e $libcrypto_src/$i ]; then
-                        $CP $libssl_src/src/crypto/$i crypto/$i
+                        $CP $libcrypto_src/$i crypto/$i
                fi
        fi
 done
@@ -148,7 +148,7 @@ $CP crypto/compat/b_win.c crypto/bio
 $CP crypto/compat/ui_openssl_win.c crypto/ui
 # generate assembly crypto algorithms
-asm_src=$libssl_src/src/crypto
+asm_src=$libcrypto_src
 gen_asm_stdout() {
        perl $asm_src/$2 $1 > $3.tmp
        [ $1 = "elf" ] && cat <<-EOF >> $3.tmp
@@ -238,7 +238,7 @@ done
 echo "copying libssl source"
 rm -f ssl/*.c ssl/*.h
 for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
-        $CP $libssl_src/src/ssl/$i ssl
+        $CP $libssl_src/$i ssl
 done
 # copy libcrypto tests
@@ -320,7 +320,7 @@ echo "dist_man_MANS += tls_init.3" >> man/Makefile.am
 (cd man
        # update new-style manpages
-        for i in `ls -1 $libssl_src/src/doc/ssl/*.3 | sort`; do
+        for i in `ls -1 $libssl_src/doc/*.3 | sort`; do
                NAME=`basename "$i"`
                $CP $i .
                echo "dist_man_MANS += $NAME" >> Makefile.am
@@ -333,7 +333,7 @@ echo "dist_man_MANS += tls_init.3" >> man/Makefile.am
        done
        # convert remaining POD manpages
-        for i in `ls -1 $libssl_src/src/doc/crypto/*.pod | sort`; do
+        for i in `ls -1 $libcrypto_src/doc/*.pod | sort`; do
                BASE=`echo $i|sed -e "s/\.pod//"`
                NAME=`basename "$BASE"`
                # reformat file if new
author	Brent Cook <bcook@openbsd.org>	2016-09-02 12:43:30 -0500
committer	Brent Cook <bcook@openbsd.org>	2016-09-02 12:43:30 -0500
commit	22dcefee4e1b0660d7312bd438c8291c9588c3ff (patch)
tree	2524eeaf804a91ffe7c72639b7f148e851d3b74b /update.sh
parent	5ea2a55cc7b412062913138fef421c34b8bd1269 (diff)
download	portable-22dcefee4e1b0660d7312bd438c8291c9588c3ff.tar.gz portable-22dcefee4e1b0660d7312bd438c8291c9588c3ff.tar.bz2 portable-22dcefee4e1b0660d7312bd438c8291c9588c3ff.zip

diff --git a/update.sh b/update.sh index 14082a1..1130c2b 100755 --- a/update.sh +++ b/update.sh
@@ -29,12 +29,12 @@ libtls_regress=$CWD/openbsd/src/regress/lib/libtls
29	app_src=$CWD/openbsd/src/usr.bin	29	app_src=$CWD/openbsd/src/usr.bin
30		30
31	# load library versions	31	# load library versions
32	. $libcrypto_src/crypto/shlib_version	32	. $libcrypto_src/shlib_version
33	libcrypto_version=$major:$minor:0	33	libcrypto_version=$major:$minor:0
34	echo "libcrypto version $libcrypto_version"	34	echo "libcrypto version $libcrypto_version"
35	echo $libcrypto_version > crypto/VERSION	35	echo $libcrypto_version > crypto/VERSION
36		36
37	. $libssl_src/ssl/shlib_version	37	. $libssl_src/shlib_version
38	libssl_version=$major:$minor:0	38	libssl_version=$major:$minor:0
39	echo "libssl version $libssl_version"	39	echo "libssl version $libssl_version"
40	echo $libssl_version > ssl/VERSION	40	echo $libssl_version > ssl/VERSION
@@ -62,11 +62,11 @@ CP_LIBC='do_cp_libc'
62		62
63	CP='cp -p'	63	CP='cp -p'
64		64
65	$CP $libssl_src/src/LICENSE COPYING	65	$CP $libssl_src/LICENSE COPYING
66		66
67	$CP $libcrypto_src/crypto/arch/amd64/opensslconf.h include/openssl	67	$CP $libcrypto_src/arch/amd64/opensslconf.h include/openssl
68	$CP $libssl_src/src/crypto/opensslfeatures.h include/openssl	68	$CP $libcrypto_src/opensslfeatures.h include/openssl
69	$CP $libssl_src/src/ssl/pqueue.h include	69	$CP $libssl_src/pqueue.h include
70		70
71	$CP $libtls_src/tls.h include	71	$CP $libtls_src/tls.h include
72	$CP $libtls_src/tls.h libtls-standalone/include	72	$CP $libtls_src/tls.h libtls-standalone/include
@@ -84,8 +84,8 @@ for i in crypto/compat libtls-standalone/compat; do
84	$libc_src/string/strnlen.c \	84	$libc_src/string/strnlen.c \
85	$libc_src/string/timingsafe_bcmp.c \	85	$libc_src/string/timingsafe_bcmp.c \
86	$libc_src/string/timingsafe_memcmp.c \	86	$libc_src/string/timingsafe_memcmp.c \
87	$libcrypto_src/crypto/getentropy_*.c \	87	$libcrypto_src/arc4random/getentropy_*.c \
88	$libcrypto_src/crypto/arc4random_*.h; do	88	$libcrypto_src/arc4random/arc4random_*.h; do
89	$CP_LIBC $j $i	89	$CP_LIBC $j $i
90	done	90	done
91	done	91	done
@@ -99,20 +99,20 @@ $CP crypto/compat/arc4random*.h \
99	crypto/compat/bsd-asprintf.c \	99	crypto/compat/bsd-asprintf.c \
100	libtls-standalone/compat	100	libtls-standalone/compat
101		101
102	(cd $libssl_src/src/crypto/objects/;	102	(cd $libcrypto_src/objects/;
103	perl objects.pl objects.txt obj_mac.num obj_mac.h;	103	perl objects.pl objects.txt obj_mac.num obj_mac.h;
104	perl obj_dat.pl obj_mac.h obj_dat.h )	104	perl obj_dat.pl obj_mac.h obj_dat.h )
105	mkdir -p include/openssl crypto/objects	105	mkdir -p include/openssl crypto/objects
106	$MV $libssl_src/src/crypto/objects/obj_mac.h ./include/openssl/obj_mac.h	106	$MV $libcrypto_src/objects/obj_mac.h ./include/openssl/obj_mac.h
107	$MV $libssl_src/src/crypto/objects/obj_dat.h ./crypto/objects/obj_dat.h	107	$MV $libcrypto_src/objects/obj_dat.h ./crypto/objects/obj_dat.h
108		108
109	copy_hdrs() {	109	copy_hdrs() {
110	for file in $2; do	110	for file in $2; do
111	$CP $libssl_src/src/$1/$file include/openssl	111	$CP $1/$file include/openssl
112	done	112	done
113	}	113	}
114		114
115	copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h	115	copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
116	ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h	116	ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h
117	objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h	117	objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
118	ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h	118	ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
@@ -126,9 +126,9 @@ copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h
126	chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h	126	chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h
127	gost/gost.h"	127	gost/gost.h"
128		128
129	copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"	129	copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
130		130
131	$CP $libssl_src/src/crypto/opensslv.h include/openssl	131	$CP $libcrypto_src/opensslv.h include/openssl
132	awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h \| cut -d\" -f1 > VERSION	132	awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h \| cut -d\" -f1 > VERSION
133	echo "LibreSSL version `cat VERSION`"	133	echo "LibreSSL version `cat VERSION`"
134		134
@@ -139,8 +139,8 @@ for i in `awk '/SOURCES\|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
139	dir=`dirname $i`	139	dir=`dirname $i`
140	mkdir -p crypto/$dir	140	mkdir -p crypto/$dir
141	if [ $dir != "compat" ]; then	141	if [ $dir != "compat" ]; then
142	if [ -e $libssl_src/src/crypto/$i ]; then	142	if [ -e $libcrypto_src/$i ]; then
143	$CP $libssl_src/src/crypto/$i crypto/$i	143	$CP $libcrypto_src/$i crypto/$i
144	fi	144	fi
145	fi	145	fi
146	done	146	done
@@ -148,7 +148,7 @@ $CP crypto/compat/b_win.c crypto/bio
148	$CP crypto/compat/ui_openssl_win.c crypto/ui	148	$CP crypto/compat/ui_openssl_win.c crypto/ui
149		149
150	# generate assembly crypto algorithms	150	# generate assembly crypto algorithms
151	asm_src=$libssl_src/src/crypto	151	asm_src=$libcrypto_src
152	gen_asm_stdout() {	152	gen_asm_stdout() {
153	perl $asm_src/$2 $1 > $3.tmp	153	perl $asm_src/$2 $1 > $3.tmp
154	[ $1 = "elf" ] && cat <<-EOF >> $3.tmp	154	[ $1 = "elf" ] && cat <<-EOF >> $3.tmp
@@ -238,7 +238,7 @@ done
238	echo "copying libssl source"	238	echo "copying libssl source"
239	rm -f ssl/.c ssl/.h	239	rm -f ssl/.c ssl/.h
240	for i in `awk '/SOURCES\|HEADERS/ { print $3 }' ssl/Makefile.am` ; do	240	for i in `awk '/SOURCES\|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
241	$CP $libssl_src/src/ssl/$i ssl	241	$CP $libssl_src/$i ssl
242	done	242	done
243		243
244	# copy libcrypto tests	244	# copy libcrypto tests
@@ -320,7 +320,7 @@ echo "dist_man_MANS += tls_init.3" >> man/Makefile.am
320		320
321	(cd man	321	(cd man
322	# update new-style manpages	322	# update new-style manpages
323	for i in `ls -1 $libssl_src/src/doc/ssl/*.3 \| sort`; do	323	for i in `ls -1 $libssl_src/doc/*.3 \| sort`; do
324	NAME=`basename "$i"`	324	NAME=`basename "$i"`
325	$CP $i .	325	$CP $i .
326	echo "dist_man_MANS += $NAME" >> Makefile.am	326	echo "dist_man_MANS += $NAME" >> Makefile.am
@@ -333,7 +333,7 @@ echo "dist_man_MANS += tls_init.3" >> man/Makefile.am
333	done	333	done
334		334
335	# convert remaining POD manpages	335	# convert remaining POD manpages
336	for i in `ls -1 $libssl_src/src/doc/crypto/*.pod \| sort`; do	336	for i in `ls -1 $libcrypto_src/doc/*.pod \| sort`; do
337	BASE=`echo $i\|sed -e "s/\.pod//"`	337	BASE=`echo $i\|sed -e "s/\.pod//"`
338	NAME=`basename "$BASE"`	338	NAME=`basename "$BASE"`
339	# reformat file if new	339	# reformat file if new