Attachment 207108 Details for Bug 240283 – fix options and man7

[patch] fix options and man7

openssl111.patch (text/plain), 3.39 KB, created by Adam Weinberger on 2019-09-02 16:38:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2019-09-02 16:38:48 UTC

Size: 3.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 510812)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	openssl
> PORTVERSION=	1.1.1c
>+PORTREVISION=	1
> CATEGORIES=	security devel
> MASTER_SITES=	https://www.openssl.org/source/ \
> 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
>@@ -97,7 +98,8 @@
> 
> # Upstream default enabled options
> .for _option in aria asm async ct des gost idea md4 mdc2 nextprotoneg \
>-	rfc3779 rmd160 shared sm2 sm3 sm4 sse2 threads tls1 tls1_1 tls1_2
>+	rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 sse2 threads \
>+	tls1 tls1_1 tls1_2
> ${_option:tu}_CONFIGURE_OFF=	no-${_option}
> .endfor
> 
>Index: files/extra-patch-util_process__docs.pl
>===================================================================
>--- files/extra-patch-util_process__docs.pl	(revision 510812)
>+++ files/extra-patch-util_process__docs.pl	(working copy)
>@@ -5,7 +5,7 @@
>  
>  unless ($options{section}) {
> -    $options{section} = [ 1, 3, 5, 7 ];
>-+    $options{section} = [ 1, 5, 7 ];
>++    $options{section} = [ 1, 5, ];
>  }
>  unless ($options{sourcedir}) {
>      $options{sourcedir} = catdir($config{sourcedir}, "doc");
>@@ -14,7 +14,7 @@
>                         html => ".html" } -> {$options{type}};
>          my $generate = { man  => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"",
> -                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man3:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet"
>-+                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet"
>++                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man5 \"--infile=$podpath\" \"--title=$podname\" --quiet"
>                           } -> {$options{type}};
>          my $output_dir = catdir($options{destdir}, "man$podinfo{section}");
>          my $output_file = $podname . $suffix;
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 510812)
>+++ pkg-plist	(working copy)
>@@ -4012,25 +4012,25 @@
> %%MAN3%%man/man3/ssl_ct_validation_cb.3.gz
> man/man5/config.5.gz
> man/man5/x509v3_config.5.gz
>-man/man7/Ed25519.7.gz
>-man/man7/Ed448.7.gz
>-man/man7/RAND.7.gz
>-man/man7/RAND_DRBG.7.gz
>-man/man7/RSA-PSS.7.gz
>-man/man7/SM2.7.gz
>-man/man7/X25519.7.gz
>-man/man7/X448.7.gz
>-man/man7/bio.7.gz
>-man/man7/crypto.7.gz
>-man/man7/ct.7.gz
>-man/man7/des_modes.7.gz
>-man/man7/evp.7.gz
>-man/man7/ossl_store.7.gz
>-man/man7/ossl_store-file.7.gz
>-man/man7/passphrase-encoding.7.gz
>-man/man7/scrypt.7.gz
>-man/man7/ssl.7.gz
>-man/man7/x509.7.gz
>+%%MAN3%%man/man7/Ed25519.7.gz
>+%%MAN3%%man/man7/Ed448.7.gz
>+%%MAN3%%man/man7/RAND.7.gz
>+%%MAN3%%man/man7/RAND_DRBG.7.gz
>+%%MAN3%%man/man7/RSA-PSS.7.gz
>+%%MAN3%%man/man7/SM2.7.gz
>+%%MAN3%%man/man7/X25519.7.gz
>+%%MAN3%%man/man7/X448.7.gz
>+%%MAN3%%man/man7/bio.7.gz
>+%%MAN3%%man/man7/crypto.7.gz
>+%%MAN3%%man/man7/ct.7.gz
>+%%MAN3%%man/man7/des_modes.7.gz
>+%%MAN3%%man/man7/evp.7.gz
>+%%MAN3%%man/man7/ossl_store.7.gz
>+%%MAN3%%man/man7/ossl_store-file.7.gz
>+%%MAN3%%man/man7/passphrase-encoding.7.gz
>+%%MAN3%%man/man7/scrypt.7.gz
>+%%MAN3%%man/man7/ssl.7.gz
>+%%MAN3%%man/man7/x509.7.gz
> %%OPENSSLDIR%%/misc/CA.pl
> %%OPENSSLDIR%%/misc/tsget
> @comment %%OPENSSLDIR%%/misc/tsget.pl

Flags:

brnrd: maintainer-approval+

Actions: View | Diff

Attachments on bug 240283: 207108