CVS commit: pkgsrc/security/openssl

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jan 11 11:10:40 UTC 2022

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

Log Message:
Omit "-MT $@" from generated make rules, as it breaks SunPro builds and
"-o $@" is already sufficient.

Also for SunPro, set OPENSSL_HOST.SunOS-x86_64=solaris64-x86_64-cc
(that's cc, not gcc) to avoid this error linking libcrypto.so:

    cc: Warning: Option --libgcc passed to ld, if ld is invoked,
    ignored otherwise
    cc: No valid input files specified, no output generated

"make package" succeeds on:

- Solaris 11 with "Studio 12.6 Sun C 5.15"
- Tribblix m25.1 with pkgsrc gcc7
- CentOS 7 with pkgsrc gcc7
- FreeBSD 13 with system clang
- OpenBSD 7.0 with system clang
- NetBSD 9.2 and -current with system gcc
- CentOS 8 with system gcc
- Debian 11, 10, 9 with system gcc
- Devuan 4 with system gcc
- Ubuntu 21, 18, 16, 14 with system gcc
- Void with system gcc
- Gentoo with system gcc


To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.154 -r1.155 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    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.276 pkgsrc/security/openssl/Makefile:1.277
--- pkgsrc/security/openssl/Makefile:1.276      Wed Aug 25 15:22:05 2021
+++ pkgsrc/security/openssl/Makefile    Tue Jan 11 11:10:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.276 2021/08/25 15:22:05 adam Exp $
+# $NetBSD: Makefile,v 1.277 2022/01/11 11:10:39 schmonz Exp $
 
 # Remember to upload-distfiles when updating OpenSSL -- otherwise it
 # is not possible for users who have bootstrapped without OpenSSL
@@ -45,7 +45,11 @@ CONFIGURE_ENV+=              PERL=${PERL5:Q}
 # If the config script cannot guess the host system correctly then we need to
 # specify it manually and call the Configure script directly.
 OPENSSL_HOST.SunOS-i386=       solaris-x86-gcc
+.if ${PKGSRC_COMPILER:Msunpro}
+OPENSSL_HOST.SunOS-x86_64=     solaris64-x86_64-cc
+.else
 OPENSSL_HOST.SunOS-x86_64=     solaris64-x86_64-gcc
+.endif
 OPENSSL_HOST.Darwin-aarch64=   darwin64-arm64-cc
 
 LDFLAGS.SunOS+=                -lrt

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.154 pkgsrc/security/openssl/distinfo:1.155
--- pkgsrc/security/openssl/distinfo:1.154      Tue Oct 26 11:17:22 2021
+++ pkgsrc/security/openssl/distinfo    Tue Jan 11 11:10:39 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.154 2021/10/26 11:17:22 nia Exp $
+$NetBSD: distinfo,v 1.155 2022/01/11 11:10:39 schmonz Exp $
 
 BLAKE2s (openssl-1.1.1l.tar.gz) = a011562eff4d77dab8d1e80753fa06cb87945783b4dd9ca111e37a59209f1df6
 SHA512 (openssl-1.1.1l.tar.gz) = d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0
 Size (openssl-1.1.1l.tar.gz) = 9834044 bytes
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
-SHA1 (patch-Configurations_unix-Makefile.tmpl) = cf6b46c6e10e84100beb468bbe6f85c5e62cbe7a
+SHA1 (patch-Configurations_unix-Makefile.tmpl) = 3f47dd453381485aeb6c37dc53f932428fdcef50
 SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
 SHA1 (patch-crypto_rand_rand__unix.c) = 758489083f8698cb725e4c2b93a21cfa650c715c

Index: pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl
diff -u pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.3 pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.4
--- pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.3 Tue Sep 29 05:45:04 2020
+++ pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl     Tue Jan 11 11:10:39 2022
@@ -1,13 +1,15 @@
-$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.3 2020/09/29 05:45:04 martin Exp $
+$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.4 2022/01/11 11:10:39 schmonz Exp $
 
 Use pkgsrc layout.
 Do not install HTML documentation.
 Avoid -B $NUM argument to m4 (ignored by most m4 implementations, not
 supported by others)
+Omit "-MT $@" from generated make rules, as it breaks SunPro builds and
+"-o $@" is already sufficient.
 
---- Configurations/unix-Makefile.tmpl.orig     2020-04-21 14:22:39.000000000 +0200
-+++ Configurations/unix-Makefile.tmpl  2020-09-28 15:17:07.747914097 +0200
-@@ -274,8 +274,9 @@
+--- Configurations/unix-Makefile.tmpl.orig     2021-08-24 13:38:47.000000000 +0000
++++ Configurations/unix-Makefile.tmpl
+@@ -274,8 +274,9 @@ libdir={- File::Spec::Win32->file_name_i
            ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
  {- output_on() if $config{target} !~ /^mingw/; "" -}
  
@@ -18,7 +20,7 @@ supported by others)
  HTMLDIR=$(DOCDIR)/html
  
  # MANSUFFIX is for the benefit of anyone who may want to have a suffix
-@@ -544,54 +545,54 @@
+@@ -543,54 +544,54 @@ install_sw: install_dev install_engines 
  
  uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
  
@@ -102,7 +104,7 @@ supported by others)
        fi
  
  install_dev: install_runtime_libs
-@@ -1058,7 +1059,7 @@
+@@ -1057,7 +1058,7 @@ EOF
            if ($args{generator}->[0] =~ /\.pl$/) {
                $generator = 'CC="$(CC)" $(PERL)'.$generator_incs.' '.$generator;
            } elsif ($args{generator}->[0] =~ /\.m4$/) {
@@ -111,3 +113,12 @@ supported by others)
            } elsif ($args{generator}->[0] =~ /\.S$/) {
                $generator = undef;
            } else {
+@@ -1138,7 +1139,7 @@ EOF
+                && !grep /\.rc$/, @srcs) {
+           $recipe .= <<"EOF";
+ $obj$objext: $deps
+-      $cmd $incs $cmdflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs
++      $cmd $incs $cmdflags -MMD -MF $obj$depext.tmp -c -o \$\@ $srcs
+       \@touch $obj$depext.tmp
+       \@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
+               rm -f $obj$depext.tmp; \\