Ticket #48022: openssl1.patch

dports/devel/openssl/Portfile

@@ -6 +6 @@
 
 name                openssl
 epoch               1
-version             1.0.2a
+version             1.0.2b
 
 # Please revbump these ports when updating OpenSSL.
 #  - freeradius (#43461)
-#  - tor (#44256)
+#  - tor, tor-devel (#44256)
 
 categories          devel security
 platforms           darwin
@@ -25 +25 @@
                     Security (TLS v1) protocols as well as \
                     a full-strength general purpose cryptography \
                     library.
-homepage            http://www.openssl.org/
+homepage            http://www.openssl.org
 
 depends_lib         port:zlib
 
-master_sites        http://www.openssl.org/source/
-checksums           md5     a06c547dac9044161a477211049f60ef \
-                    sha1    46ecd325b8e587fa491f6bb02ad4a9fb9f382f5f \
-                    rmd160  2974a0a8cc469d85a5391a64aa0a2b2c5b00acfa \
-                    sha256  15b6393c20030aab02c8e2fe0243cb1d1d18062f6c095d67bca91871dc7f324a
+master_sites        http://www.openssl.org/source
+checksums           md5     7729b259e2dea7d60b32fc3934d6984b \
+                    sha1    9006e53ca56a14d041e3875320eedfa63d82aba7 \
+                    rmd160  543a4d9d4fe08ddcae0937334224d8479d9b602a \
+                    sha256  d5d488cc9f0a07974195a7427094ea3cab9800a4e90178b989aa621fbc238e3f
 
 patchfiles          patch-bn_internal.pod.diff \
                     patch-crypto-Makefile.diff \
                     patch-Makefile.org-parallel.diff \
                     patch-crypto-perlasm-x86_64-xlate.pl.diff
 
-# We've tried patching some, but we're not there yet, see #46719
-use_parallel_build  no
-
 configure.ccache    no
 configure.perl      /usr/bin/perl
 configure.cmd       ./Configure
-configure.args      -L${prefix}/lib \
+configure.args     -L${prefix}/lib \
                     no-krb5 \
-                    --openssldir=${prefix}/etc/openssl \
+                  --openssldir=${prefix}/etc/openssl \
                     shared \
                     zlib
 # Use SDK if necessary.
@@ -57 +54 @@
                             -Wl,-syslibroot,${configure.sdkroot}
 }
 
-destroot.args       MANDIR=${prefix}/share/man MANSUFFIX=ssl
-destroot.destdir    INSTALL_PREFIX=${destroot}
-
-test.run            yes
-test.dir            ${worksrcpath}/test
-test.target         alltests
-
-livecheck.type      regex
-livecheck.url       ${master_sites}
-livecheck.regex     ${name}-(\[0-9.\]+\[a-z\]?)\\.tar\\.gz
-
-# code for universal build
+set merger_arch_compiler no
 array set merger_configure_args {
     ppc     darwin-ppc-cc
     i386    darwin-i386-cc
     ppc64   darwin64-ppc-cc
     x86_64  darwin64-x86_64-cc
 }
+# Don't use i386 assembly on Tiger (#38015, #43303).
 platform darwin 8 {
-    append merger_configure_args(i386) " " no-asm
+    append merger_configure_args(i386) { no-asm}
 }
+# Don't use x86-64 assembly on Leopard.
+platform darwin 9 {
+    append merger_configure_args(x86_64) { no-asm}
+}
+# Don't pass --host to configure.
+array set merger_host {ppc {} i386 {} ppc64 {} x86_64 {}}
 
-if {[variant_isset universal]} {
-    set merger_arch_compiler "no"
+if {![variant_isset universal]
+        && [info exists merger_configure_args(${configure.build_arch})]} {
+    configure.args-append $merger_configure_args(${configure.build_arch})
+}
+configure.universal_args-delete --disable-dependency-tracking
 
-    configure.universal_args-delete --disable-dependency-tracking
+# Parallel builds don't quite work (#46719).
+use_parallel_build  no
+
+test.run            yes
 
+if {[variant_isset universal]} {
     pre-destroot {
         global merger_dont_diff
         if {[llength ${universal_archs_to_use}] > 2} {
             lappend merger_dont_diff ${prefix}/include/openssl/opensslconf.h
         }
     }
-
-    # Do not set --host.
-    array set merger_host {
-        ppc     {}
-        i386    {}
-        ppc64   {}
-        x86_64  {}
-    }
-} elseif {[info exists merger_configure_args($build_arch)]} {
-    configure.args-append   $merger_configure_args($build_arch)
 }
 
+destroot.args       MANDIR=${prefix}/share/man MANSUFFIX=ssl
+destroot.destdir    INSTALL_PREFIX=${destroot}
+
 variant rfc3779 description {enable RFC 3779: X.509 Extensions for IP Addresses and AS Identifiers} {
     configure.args-append   enable-rfc3779
 }
+
+livecheck.type      regex
+livecheck.url       [lindex ${master_sites} 0]
+livecheck.regex     ${name}-(\[0-9.\]+\[a-z\]?)\\.tar\\.gz