[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4605b34d567c408c5b238b2d91f3fb4e022c9037 (commit)
       via  d9c22dde295eb3163a168c81688a7425d4db1902 (commit)
      from  c27e7922211ac4f7aee5573f605c3b3cbef0d0bc (commit)


- Log -----------------------------------------------------------------
commit 4605b34d567c408c5b238b2d91f3fb4e022c9037
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Jan 23 11:57:08 2021 +0100

    Github CI: Add a job for out-of-source build + install
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13935)

commit d9c22dde295eb3163a168c81688a7425d4db1902
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jan 22 23:01:18 2021 +0100

    Unix Makefile generator: Fix empty basename calls
    
    Fixes #13933
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13935)

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/ci.yml          | 21 +++++++++++++++++++++
 Configurations/unix-Makefile.tmpl | 30 +++++++++++++++++-------------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc4549fd57..9e99a9b97b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -123,3 +123,24 @@ jobs:
       run: make -s -j4
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
+
+  out-of-source-and-install:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout at v2
+    - name: extra preparations
+      run: |
+        mkdir ./build
+        mkdir ./install
+    - name: config
+      run: ../config --strict-warnings --prefix=$(cd ../install; pwd) && perl configdata.pm --dump
+      working-directory: ./build
+    - name: make
+      run: make -s -j4
+      working-directory: ./build
+    - name: make test
+      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
+      working-directory: ./build
+    - name: make install
+      run: make install
+      working-directory: ./build
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index a331368311..174e52871e 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -654,20 +654,22 @@ install_dev: install_runtime_libs
 		s1=`echo "$$s" | cut -f1 -d";"`; \
 		s2=`echo "$$s" | cut -f2 -d";"`; \
 		s3=`echo "$$s" | cut -f3 -d";"`; \
-		fn1=`basename $$s1`; \
-		fn2=`basename $$s2`; \
-		fn3=`basename $$s3`; \
+		fn1=`basename "$$s1"`; \
+		fn2=`basename "$$s2"`; \
+		fn3=`basename "$$s3"`; \
 		: {- output_off(); output_on() unless windowsdll() or sharedaix(); "" -}; \
 		if [ "$$fn2" != "" ]; then \
 			$(ECHO) "link $(DESTDIR)$(libdir)/$$fn2 -> $(DESTDIR)$(libdir)/$$fn1"; \
 			ln -sf $$fn1 $(DESTDIR)$(libdir)/$$fn2; \
 		fi; \
 		: {- output_off() unless windowsdll() or sharedaix(); output_on() if windowsdll(); "" -}; \
-		$(ECHO) "install $$s3 -> $(DESTDIR)$(libdir)/$$fn3"; \
-		cp $$s3 $(DESTDIR)$(libdir)/$$fn3.new; \
-		chmod 755 $(DESTDIR)$(libdir)/$$fn3.new; \
-		mv -f $(DESTDIR)$(libdir)/$$fn3.new \
-		      $(DESTDIR)$(libdir)/$$fn3; \
+		if [ "$$fn3" != "" ]; then \
+			$(ECHO) "install $$s3 -> $(DESTDIR)$(libdir)/$$fn3"; \
+			cp $$s3 $(DESTDIR)$(libdir)/$$fn3.new; \
+			chmod 755 $(DESTDIR)$(libdir)/$$fn3.new; \
+			mv -f $(DESTDIR)$(libdir)/$$fn3.new \
+			      $(DESTDIR)$(libdir)/$$fn3; \
+		fi; \
 		: {- output_off() if windowsdll(); output_on() if sharedaix(); "" -}; \
 		a=$(DESTDIR)$(libdir)/$$fn2; \
 		$(ECHO) "install $$s1 -> $$a"; \
@@ -721,9 +723,9 @@ uninstall_dev: uninstall_runtime_libs
 		s1=`echo "$$s" | cut -f1 -d";"`; \
 		s2=`echo "$$s" | cut -f2 -d";"`; \
 		s3=`echo "$$s" | cut -f3 -d";"`; \
-		fn1=`basename $$s1`; \
-		fn2=`basename $$s2`; \
-		fn3=`basename $$s3`; \
+		fn1=`basename "$$s1"`; \
+		fn2=`basename "$$s2"`; \
+		fn3=`basename "$$s3"`; \
 		: {- output_off() if windowsdll(); "" -}; \
 		$(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn1"; \
 		$(RM) $(DESTDIR)$(libdir)/$$fn1; \
@@ -732,8 +734,10 @@ uninstall_dev: uninstall_runtime_libs
 			$(RM) $(DESTDIR)$(libdir)/$$fn2; \
 		fi; \
 		: {- output_on() if windowsdll(); "" -}{- output_off() unless windowsdll(); "" -}; \
-		$(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn3"; \
-		$(RM) $(DESTDIR)$(libdir)/$$fn3; \
+		if [ -n "$$fn3" ]; then \
+			$(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn3"; \
+			$(RM) $(DESTDIR)$(libdir)/$$fn3; \
+		fi; \
 		: {- output_on() unless windowsdll(); "" -}; \
 	done
 	@ : {- output_on() if $disabled{shared}; "" -}