[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3b8033f3f593ac06aaea5d050960366001ef99f0 (commit)
       via  f3d6a3644679d37e791408ff3750d0baa76d1206 (commit)
      from  cd4c83b52423008391b50abcccf18a7d8fcce03b (commit)


- Log -----------------------------------------------------------------
commit 3b8033f3f593ac06aaea5d050960366001ef99f0
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 27 14:20:20 2019 +0200

    Configurations/unix-Makefile.tmpl: not -v for rm
    
    Not all Unixen know the -v option
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/9012)

commit f3d6a3644679d37e791408ff3750d0baa76d1206
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 27 14:16:47 2019 +0200

    Configure: link AIX modules correctly
    
    Use -bnoentry, not -bexpall
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/9012)

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

Summary of changes:
 Configurations/10-main.conf       | 2 +-
 Configurations/unix-Makefile.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 27e587f..0cda720 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1097,7 +1097,7 @@ my %targets = (
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "aix",
-        module_ldflags   => "-Wl,-G,-bsymbolic,-bexpall",
+        module_ldflags   => "-Wl,-G,-bsymbolic,-bnoentry",
         shared_ldflag    => "-Wl,-G,-bsymbolic,-bnoentry",
         shared_defflag   => "-Wl,-bE:",
         perl_platform    => 'AIX',
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 2561c47..8a1ec49 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -422,7 +422,7 @@ uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
 install_docs: install_man_docs install_html_docs
 
 uninstall_docs: uninstall_man_docs uninstall_html_docs
-	$(RM) -r -v $(DESTDIR)$(DOCDIR)
+	$(RM) -r $(DESTDIR)$(DOCDIR)
 
 install_ssldirs:
 	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs