CVS commit: pkgsrc/security/openssl

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security/openssl
From: "Sevan Janiyan" <sevan%netbsd.org@localhost>
Date: Tue, 31 Mar 2020 15:02:31 +0000

Module Name:    pkgsrc
Committed By:   sevan
Date:           Tue Mar 31 15:02:31 UTC 2020

Modified Files:
        pkgsrc/security/openssl: Makefile distinfo
        pkgsrc/security/openssl/patches:
            patch-Configurations_unix-Makefile.tmpl

Log Message:
Update to openssl 1.1.1f

Changes between 1.1.1e and 1.1.1f

* Revert the unexpected EOF reporting via SSL_ERROR_SSL


To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.138 -r1.139 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.255 pkgsrc/security/openssl/Makefile:1.256
--- pkgsrc/security/openssl/Makefile:1.255      Sun Mar 22 18:23:34 2020
+++ pkgsrc/security/openssl/Makefile    Tue Mar 31 15:02:31 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.255 2020/03/22 18:23:34 wiz Exp $
+# $NetBSD: Makefile,v 1.256 2020/03/31 15:02:31 sevan Exp $
 
-DISTNAME=      openssl-1.1.1e
+DISTNAME=      openssl-1.1.1f
 CATEGORIES=    security
 MASTER_SITES=  https://www.openssl.org/source/
 

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.138 pkgsrc/security/openssl/distinfo:1.139
--- pkgsrc/security/openssl/distinfo:1.138      Sun Mar 22 18:23:34 2020
+++ pkgsrc/security/openssl/distinfo    Tue Mar 31 15:02:31 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.138 2020/03/22 18:23:34 wiz Exp $
+$NetBSD: distinfo,v 1.139 2020/03/31 15:02:31 sevan Exp $
 
-SHA1 (openssl-1.1.1e.tar.gz) = e7105567d3e7e6353a0110f1adc81f69dbc8f732
-RMD160 (openssl-1.1.1e.tar.gz) = 54a5963b9eca73f502d0a821ed2aa85b51b8a464
-SHA512 (openssl-1.1.1e.tar.gz) = dbc2124f6ce9f1927e2f5e03101ed565d4e52ef09d620200f5cd9372c88c65dd7d74b24b31a8bf404713a5adfab80e0c3b25bf538c52702c4c3af1d80aef16c2
-Size (openssl-1.1.1e.tar.gz) = 9792634 bytes
-SHA1 (patch-Configurations_unix-Makefile.tmpl) = 160466226b58f391c5096e0ba38ee298002296dc
+SHA1 (openssl-1.1.1f.tar.gz) = 238e001ea1fbf19ede43e36209c37c1a636bb51f
+RMD160 (openssl-1.1.1f.tar.gz) = e858b844fe68e679f9701acbcf514410e4189c73
+SHA512 (openssl-1.1.1f.tar.gz) = b00bd9b5ad5298fbceeec6bb19c1ab0c106ca5cfb31178497c58bf7e0e0cf30fcc19c20f84e23af31cc126bf2447d3e4f8461db97bafa7bd78f69561932f000c
+Size (openssl-1.1.1f.tar.gz) = 9792828 bytes
+SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da

Index: pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl
diff -u pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.1 pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.2
--- pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.1 Thu Jan 16 13:30:29 2020
+++ pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl     Tue Mar 31 15:02:31 2020
@@ -1,9 +1,9 @@
-$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.1 2020/01/16 13:30:29 jperkin Exp $
+$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.2 2020/03/31 15:02:31 sevan Exp $
 
 Use pkgsrc layout.
 Do not install HTML documentation.
 
---- Configurations/unix-Makefile.tmpl.orig     2019-09-10 13:13:07.000000000 +0000
+--- Configurations/unix-Makefile.tmpl.orig     2020-03-31 14:23:39.098512410 +0000
 +++ Configurations/unix-Makefile.tmpl
 @@ -274,8 +274,9 @@ libdir={- File::Spec::Win32->file_name_i
            ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
@@ -16,7 +16,7 @@ Do not install HTML documentation.
  HTMLDIR=$(DOCDIR)/html
  
  # MANSUFFIX is for the benefit of anyone who may want to have a suffix
-@@ -544,54 +545,54 @@ install_sw: install_dev install_engines
+@@ -544,54 +545,54 @@ install_sw: install_dev install_engines 
  
  uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
  
@@ -24,79 +24,79 @@ Do not install HTML documentation.
 +install_docs: install_man_docs
  
  uninstall_docs: uninstall_man_docs uninstall_html_docs
-       $(RM) -r $(DESTDIR)$(DOCDIR)
+       $(RM) -r "$(DESTDIR)$(DOCDIR)"
  
  install_ssldirs:
--      @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs
--      @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/private
--      @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/misc
-+      @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(EXAMPLEDIR)/certs
-+      @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(EXAMPLEDIR)/private
-+      @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(EXAMPLEDIR)/misc
+-      @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/certs"
+-      @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/private"
+-      @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/misc"
++      @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(EXAMPLEDIR)/certs"
++      @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(EXAMPLEDIR)/private"
++      @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(EXAMPLEDIR)/misc"
        @set -e; for x in dummy $(MISC_SCRIPTS); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                x1=`echo "$$x" | cut -f1 -d:`; \
                x2=`echo "$$x" | cut -f2 -d:`; \
                fn=`basename $$x1`; \
 -              $(ECHO) "install $$x1 -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
--              cp $$x1 $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new; \
--              chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new; \
--              mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new \
--                    $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \
+-              cp $$x1 "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new"; \
+-              chmod 755 "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new"; \
+-              mv -f "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new" \
+-                    "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
 +              $(ECHO) "install $$x1 -> $(DESTDIR)$(EXAMPLEDIR)/misc/$$fn"; \
-+              cp $$x1 $(DESTDIR)$(EXAMPLEDIR)/misc/$$fn.new; \
-+              chmod 755 $(DESTDIR)$(EXAMPLEDIR)/misc/$$fn.new; \
-+              mv -f $(DESTDIR)$(EXAMPLEDIR)/misc/$$fn.new \
-+                    $(DESTDIR)$(EXAMPLEDIR)/misc/$$fn; \
++              cp $$x1 "$(DESTDIR)$(EXAMPLEDIR)/misc/$$fn.new"; \
++              chmod 755 "$(DESTDIR)$(EXAMPLEDIR)/misc/$$fn.new"; \
++              mv -f "$(DESTDIR)$(EXAMPLEDIR)/misc/$$fn.new" \
++                    "$(DESTDIR)$(EXAMPLEDIR)/misc/$$fn"; \
                if [ "$$x1" != "$$x2" ]; then \
                        ln=`basename "$$x2"`; \
                        : {- output_off() unless windowsdll(); "" -}; \
 -                      $(ECHO) "copy $(DESTDIR)$(OPENSSLDIR)/misc/$$ln -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
--                      cp $(DESTDIR)$(OPENSSLDIR)/misc/$$fn $(DESTDIR)$(OPENSSLDIR)/misc/$$ln; \
+-                      cp "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn" "$(DESTDIR)$(OPENSSLDIR)/misc/$$ln"; \
 +                      $(ECHO) "copy $(DESTDIR)$(EXAMPLEDIR)/misc/$$ln -> $(DESTDIR)$(EXAMPLEDIR)/misc/$$fn"; \
-+                      cp $(DESTDIR)$(EXAMPLEDIR)/misc/$$fn $(DESTDIR)$(EXAMPLEDIR)/misc/$$ln; \
++                      cp "$(DESTDIR)$(EXAMPLEDIR)/misc/$$fn" "$(DESTDIR)$(EXAMPLEDIR)/misc/$$ln"; \
                        : {- output_on() unless windowsdll();
                             output_off() if windowsdll(); "" -}; \
 -                      $(ECHO) "link $(DESTDIR)$(OPENSSLDIR)/misc/$$ln -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
--                      ln -sf $$fn $(DESTDIR)$(OPENSSLDIR)/misc/$$ln; \
+-                      ln -sf $$fn "$(DESTDIR)$(OPENSSLDIR)/misc/$$ln"; \
 +                      $(ECHO) "link $(DESTDIR)$(EXAMPLEDIR)/misc/$$ln -> $(DESTDIR)$(EXAMPLEDIR)/misc/$$fn"; \
-+                      ln -sf $$fn $(DESTDIR)$(EXAMPLEDIR)/misc/$$ln; \
++                      ln -sf $$fn "$(DESTDIR)$(EXAMPLEDIR)/misc/$$ln"; \
                        : {- output_on() if windowsdll(); "" -}; \
                fi; \
        done
 -      @$(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
--      @cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
--      @chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
--      @mv -f  $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist
+-      @cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new"
+-      @chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new"
+-      @mv -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new" "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
 -      @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \
 -              $(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
--              cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
--              chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
+-              cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
+-              chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
 +      @$(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.dist"
-+      @cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.new
-+      @chmod 644 $(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.new
-+      @mv -f  $(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.new $(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.dist
++      @cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.new"
++      @chmod 644 "$(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.new"
++      @mv -f "$(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.new" "$(DESTDIR)$(EXAMPLEDIR)/openssl.cnf.dist"
 +      @if [ ! -f "$(DESTDIR)$(EXAMPLEDIR)/openssl.cnf" ]; then \
 +              $(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(EXAMPLEDIR)/openssl.cnf"; \
-+              cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(EXAMPLEDIR)/openssl.cnf; \
-+              chmod 644 $(DESTDIR)$(EXAMPLEDIR)/openssl.cnf; \
++              cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(EXAMPLEDIR)/openssl.cnf"; \
++              chmod 644 "$(DESTDIR)$(EXAMPLEDIR)/openssl.cnf"; \
        fi
 -      @$(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist"
--      @cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new
--      @chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new
--      @mv -f  $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist
+-      @cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new"
+-      @chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new"
+-      @mv -f "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new" "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist"
 -      @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf" ]; then \
 -              $(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
--              cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
--              chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
+-              cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
+-              chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
 +      @$(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.dist"
-+      @cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new
-+      @chmod 644 $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new
-+      @mv -f  $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.dist
++      @cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new"
++      @chmod 644 "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new"
++      @mv -f "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new" "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.dist"
 +      @if [ ! -f "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf" ]; then \
 +              $(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \
-+              cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf; \
-+              chmod 644 $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf; \
++              cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \
++              chmod 644 "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \
        fi
  
  install_dev: install_runtime_libs

Prev by Date: CVS commit: pkgsrc/databases/mongodb3
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/databases/mongodb3
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index