[Pkg-openssl-changes] r899 - in openssl/branches/1.1.0/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2017-05-25 19:17:54 +0000 (Thu, 25 May 2017)
New Revision: 899

Modified:
   openssl/branches/1.1.0/debian/changelog
   openssl/branches/1.1.0/debian/libssl1.1.symbols
   openssl/branches/1.1.0/debian/patches/man-section.patch
Log:
1.1.0f


Modified: openssl/branches/1.1.0/debian/changelog
===================================================================
--- openssl/branches/1.1.0/debian/changelog	2017-05-02 19:54:39 UTC (rev 898)
+++ openssl/branches/1.1.0/debian/changelog	2017-05-25 19:17:54 UTC (rev 899)
@@ -1,3 +1,14 @@
+openssl (1.1.0f-1) unstable; urgency=medium
+
+  * New upstream version
+    - Fix regression in req -x509 (Closes: #839575)
+    - Properly detect features on the AMD Ryzen processor (Closes: #861145)
+    - Don't mention -tls1_3 in the manpage (Closes: #859191)
+  * Update libssl1.1.symbols for new symbols
+  * Update man-section.patch
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Thu, 25 May 2017 18:29:01 +0200
+
 openssl (1.1.0e-2) unstable; urgency=medium
 
   * Make openssl depend on perl-base (Closes: #860254)

Modified: openssl/branches/1.1.0/debian/libssl1.1.symbols
===================================================================
--- openssl/branches/1.1.0/debian/libssl1.1.symbols	2017-05-02 19:54:39 UTC (rev 898)
+++ openssl/branches/1.1.0/debian/libssl1.1.symbols	2017-05-25 19:17:54 UTC (rev 899)
@@ -3,6 +3,7 @@
  *@OPENSSL_1_1_0a 1.1.0a
  *@OPENSSL_1_1_0c 1.1.0c
  *@OPENSSL_1_1_0d 1.1.0d
+ *@OPENSSL_1_1_0f 1.1.0f
 libssl.so.1.1 libssl1.1 #MINVER#
  *@OPENSSL_1_1_0 1.1.0
  *@OPENSSL_1_1_0d 1.1.0d

Modified: openssl/branches/1.1.0/debian/patches/man-section.patch
===================================================================
--- openssl/branches/1.1.0/debian/patches/man-section.patch	2017-05-02 19:54:39 UTC (rev 898)
+++ openssl/branches/1.1.0/debian/patches/man-section.patch	2017-05-25 19:17:54 UTC (rev 899)
@@ -2,8 +2,10 @@
  Configurations/unix-Makefile.tmpl |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
---- a/Configurations/unix-Makefile.tmpl
-+++ b/Configurations/unix-Makefile.tmpl
+Index: openssl-1.1.0f/Configurations/unix-Makefile.tmpl
+===================================================================
+--- openssl-1.1.0f.orig/Configurations/unix-Makefile.tmpl
++++ openssl-1.1.0f/Configurations/unix-Makefile.tmpl
 @@ -164,7 +164,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,
@@ -14,12 +16,34 @@
  HTMLSUFFIX=html
  
  
-@@ -630,7 +631,7 @@ UNINSTALL_DOCS=\
- 	@\
- 	OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \
- 	OUTTOP="$(DESTDIR)$(MANDIR)"; \
--	GENERATE='pod2man --name=$$NAME --section=$$SEC --center=OpenSSL --release=$(VERSION)'; \
-+	GENERATE='pod2man --name=$$NAME --section="$$SEC""$(MANSECTION)" --center=OpenSSL --release=$(VERSION)'; \
- 	$(PROCESS_PODS)
+@@ -554,7 +555,8 @@ 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"
+Index: openssl-1.1.0f/util/process_docs.pl
+===================================================================
+--- openssl-1.1.0f.orig/util/process_docs.pl
++++ openssl-1.1.0f/util/process_docs.pl
+@@ -36,6 +36,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+',
+@@ -98,7 +99,7 @@ foreach my $subdir (keys %{$options{subd
+         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=apps:crypto:ssl \"--infile=$podpath\" \"--title=$podname\""
+                          } -> {$options{type}};
+         my $output_dir = catdir($options{destdir}, "man$podinfo{section}");