diff options
| -rwxr-xr-x | crypto/openssl/DETAILS | 2 | ||||
| -rw-r--r-- | crypto/openssl/HISTORY | 4 | ||||
| -rwxr-xr-x | crypto/openssl/PRE_BUILD | 5 | ||||
| -rw-r--r-- | crypto/openssl/man-section.patch | 57 |
4 files changed, 5 insertions, 63 deletions
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS index a97dff0683..dd1f4bcf5f 100755 --- a/crypto/openssl/DETAILS +++ b/crypto/openssl/DETAILS @@ -1,5 +1,5 @@ SPELL=openssl - VERSION=1.1.1l + VERSION=3.0.0 SECURITY_PATCH=49 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY index aba8a6eb86..422961d32f 100644 --- a/crypto/openssl/HISTORY +++ b/crypto/openssl/HISTORY @@ -1,3 +1,7 @@ +2021-09-18 Florian Franzmann <bwlf@bandrate.org> + * DETAILS: version 3.0.0 + * PRE_BUILD, man-section.patch: remove obsolete patch + 2021-08-29 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 1.1.1l, SECURITY_PATCH++, fixes CVE-2021-3711, CVE-2021-3712 diff --git a/crypto/openssl/PRE_BUILD b/crypto/openssl/PRE_BUILD deleted file mode 100755 index 42981a6bc8..0000000000 --- a/crypto/openssl/PRE_BUILD +++ /dev/null @@ -1,5 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && - -patch -p1 < "$SPELL_DIRECTORY/man-section.patch" - diff --git a/crypto/openssl/man-section.patch b/crypto/openssl/man-section.patch deleted file mode 100644 index 6a953a4152..0000000000 --- a/crypto/openssl/man-section.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7042262b52d2b7b40e2600d9ea727882a5374245 Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <bwlf@bandrate.org> -Date: Sat, 25 Jul 2020 16:22:52 +0200 -Subject: [PATCH] Put manpages into their proper section - ---- - Configurations/unix-Makefile.tmpl | 5 +++-- - util/process_docs.pl | 3 ++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index 3a24d55..dc760ab 100644 ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -281,7 +281,8 @@ HTMLDIR=$(DOCDIR)/html - # MANSUFFIX is for the benefit of anyone who may want to have a suffix - # appended after the manpage file section number. "ssl" is popular, - # resulting in files such as config.5ssl rather than config.5. --MANSUFFIX= -+MANSUFFIX=ssl -+MANSECTION=SSL - HTMLSUFFIX=html - - # For "optional" echo messages, to get "real" silence -@@ -824,7 +825,7 @@ install_man_docs: - @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(ECHO) "*** Installing manpages" - $(PERL) $(SRCDIR)/util/process_docs.pl \ -- "--destdir=$(DESTDIR)$(MANDIR)" --type=man --suffix=$(MANSUFFIX) -+ "--destdir=$(DESTDIR)$(MANDIR)" --type=man --suffix=$(MANSUFFIX) --mansection=$(MANSECTION) - - uninstall_man_docs: - @$(ECHO) "*** Uninstalling manpages" -diff --git a/util/process_docs.pl b/util/process_docs.pl -index 30b149e..b3f8aa8 100755 ---- a/util/process_docs.pl -+++ b/util/process_docs.pl -@@ -37,6 +37,7 @@ GetOptions(\%options, - 'type=s', # The result type, 'man' or 'html' - 'suffix:s', # Suffix to add to the extension. - # Only used with type=man -+ 'mansection:s', # Section to put to manpage in - 'remove', # To remove files rather than writing them - 'dry-run|n', # Only output file names on STDOUT - 'debug|D+', -@@ -97,7 +98,7 @@ foreach my $section (sort @{$options{section}}) { - my $name = uc $podname; - my $suffix = { man => ".$podinfo{section}".($options{suffix} // ""), - html => ".html" } -> {$options{type}}; -- my $generate = { man => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"", -+ my $generate = { man => "pod2man --name=$name --section=$podinfo{section}$options{mansection} --center=OpenSSL --release=$config{version} \"$podpath\"", - html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man3:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet" - } -> {$options{type}}; - my $output_dir = catdir($options{destdir}, "man$podinfo{section}"); --- -2.27.0 - |