Tue Sep 29 05:45:04 2020 UTC ()
Fix the build on sparc64 (and other architectures that use m4 to generate
asm files).


(martin)
diff -r1.144 -r1.145 pkgsrc/security/openssl/distinfo
diff -r1.2 -r1.3 pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl
cvs diff -r1.144 -r1.145 pkgsrc/security/openssl/distinfo (expand / switch to unified diff)

--- pkgsrc/security/openssl/distinfo 2020/07/22 20:41:30 1.144
+++ pkgsrc/security/openssl/distinfo 2020/09/29 05:45:04 1.145
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.144 2020/07/22 20:41:30 sjmulder Exp $ 1$NetBSD: distinfo,v 1.145 2020/09/29 05:45:04 martin Exp $
2 2
3SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997 3SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
4RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d 4RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
5SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab 5SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
6Size (openssl-1.1.1g.tar.gz) = 9801502 bytes 6Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
7SHA1 (patch-Configurations_10-main.conf) = d27643187e0b71041f47a9a7c7eec811f7539085 7SHA1 (patch-Configurations_10-main.conf) = d27643187e0b71041f47a9a7c7eec811f7539085
8SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c 8SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
9SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da 9SHA1 (patch-Configurations_unix-Makefile.tmpl) = cf6b46c6e10e84100beb468bbe6f85c5e62cbe7a
10SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2 10SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
11SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956 11SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956
cvs diff -r1.2 -r1.3 pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl (expand / switch to unified diff)

--- pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl 2020/03/31 15:02:31 1.2
+++ pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl 2020/09/29 05:45:04 1.3
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.2 2020/03/31 15:02:31 sevan Exp $ 1$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.3 2020/09/29 05:45:04 martin Exp $
2 2
3Use pkgsrc layout. 3Use pkgsrc layout.
4Do not install HTML documentation. 4Do not install HTML documentation.
 5Avoid -B $NUM argument to m4 (ignored by most m4 implementations, not
 6supported by others)
5 7
6--- Configurations/unix-Makefile.tmpl.orig 2020-03-31 14:23:39.098512410 +0000 8--- Configurations/unix-Makefile.tmpl.orig 2020-04-21 14:22:39.000000000 +0200
7+++ Configurations/unix-Makefile.tmpl 9+++ Configurations/unix-Makefile.tmpl 2020-09-28 15:17:07.747914097 +0200
8@@ -274,8 +274,9 @@ libdir={- File::Spec::Win32->file_name_i 10@@ -274,8 +274,9 @@
9 ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -} 11 ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
10 {- output_on() if $config{target} !~ /^mingw/; "" -} 12 {- output_on() if $config{target} !~ /^mingw/; "" -}
11  13
12-MANDIR=$(INSTALLTOP)/share/man 14-MANDIR=$(INSTALLTOP)/share/man
13+MANDIR=$(INSTALLTOP)/$(PKGMANDIR) 15+MANDIR=$(INSTALLTOP)/$(PKGMANDIR)
14 DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME) 16 DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
15+EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl 17+EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl
16 HTMLDIR=$(DOCDIR)/html 18 HTMLDIR=$(DOCDIR)/html
17  19
18 # MANSUFFIX is for the benefit of anyone who may want to have a suffix 20 # MANSUFFIX is for the benefit of anyone who may want to have a suffix
19@@ -544,54 +545,54 @@ install_sw: install_dev install_engines  21@@ -544,54 +545,54 @@
20  22
21 uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev 23 uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
22  24
23-install_docs: install_man_docs install_html_docs 25-install_docs: install_man_docs install_html_docs
24+install_docs: install_man_docs 26+install_docs: install_man_docs
25  27
26 uninstall_docs: uninstall_man_docs uninstall_html_docs 28 uninstall_docs: uninstall_man_docs uninstall_html_docs
27 $(RM) -r "$(DESTDIR)$(DOCDIR)" 29 $(RM) -r "$(DESTDIR)$(DOCDIR)"
28  30
29 install_ssldirs: 31 install_ssldirs:
30- @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/certs" 32- @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/certs"
31- @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/private" 33- @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/private"
32- @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/misc" 34- @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/misc"
@@ -90,13 +92,22 @@ Do not install HTML documentation. @@ -90,13 +92,22 @@ Do not install HTML documentation.
90- cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \ 92- cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
91- chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \ 93- chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
92+ @$(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.dist" 94+ @$(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.dist"
93+ @cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new" 95+ @cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new"
94+ @chmod 644 "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new" 96+ @chmod 644 "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new"
95+ @mv -f "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new" "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.dist" 97+ @mv -f "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.new" "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf.dist"
96+ @if [ ! -f "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf" ]; then \ 98+ @if [ ! -f "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf" ]; then \
97+ $(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \ 99+ $(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \
98+ cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \ 100+ cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \
99+ chmod 644 "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \ 101+ chmod 644 "$(DESTDIR)$(EXAMPLEDIR)/ct_log_list.cnf"; \
100 fi 102 fi
101  103
102 install_dev: install_runtime_libs 104 install_dev: install_runtime_libs
 105@@ -1058,7 +1059,7 @@
 106 if ($args{generator}->[0] =~ /\.pl$/) {
 107 $generator = 'CC="$(CC)" $(PERL)'.$generator_incs.' '.$generator;
 108 } elsif ($args{generator}->[0] =~ /\.m4$/) {
 109- $generator = 'm4 -B 8192'.$generator_incs.' '.$generator.' >'
 110+ $generator = 'm4 '.$generator_incs.' '.$generator.' >'
 111 } elsif ($args{generator}->[0] =~ /\.S$/) {
 112 $generator = undef;
 113 } else {