From 3fbd9748a313969957a03017b9d9b5476080b129 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 19 May 2019 01:10:53 +0000
Subject: Sun May 19 01:10:53 UTC 2019

a/file-5.37-x86_64-1.txz:  Upgraded.
l/python-requests-2.22.0-x86_64-1.txz:  Upgraded.
n/iputils-20190515-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-60.7.0-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/60.7.0/releasenotes/
---
 .../l/python-requests/python-requests.SlackBuild   |   6 +-
 .../python-requests/requests.urllib3.version.diff  |  26 ----
 source/n/iputils/iputils.SlackBuild                |   2 +
 source/n/iputils/iputils.docbook.revert.diff       | 164 +++++++++++++++++++++
 4 files changed, 168 insertions(+), 30 deletions(-)
 delete mode 100644 source/l/python-requests/requests.urllib3.version.diff
 create mode 100644 source/n/iputils/iputils.docbook.revert.diff

(limited to 'source')

diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild
index 8ba18ea1..5f241d5b 100755
--- a/source/l/python-requests/python-requests.SlackBuild
+++ b/source/l/python-requests/python-requests.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2017  Heinz Wiesinger, Amsterdam, NL
 # All rights reserved.
 #
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=python-requests
 VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 SRCNAM=requests
 
@@ -55,8 +55,6 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
 cd $SRCNAM-$VERSION || exit 1
 
-zcat $CWD/requests.urllib3.version.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/source/l/python-requests/requests.urllib3.version.diff b/source/l/python-requests/requests.urllib3.version.diff
deleted file mode 100644
index 59f55c84..00000000
--- a/source/l/python-requests/requests.urllib3.version.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./setup.py.orig	2018-12-10 00:13:32.000000000 -0600
-+++ ./setup.py	2019-04-28 13:11:33.836514225 -0500
-@@ -44,7 +44,7 @@
- requires = [
-     'chardet>=3.0.2,<3.1.0',
-     'idna>=2.5,<2.9',
--    'urllib3>=1.21.1,<1.25',
-+    'urllib3>=1.21.1,<1.26',
-     'certifi>=2017.4.17'
- 
- ]
---- ./requests/__init__.py.orig	2018-12-10 00:13:32.000000000 -0600
-+++ ./requests/__init__.py	2019-04-28 13:13:44.711502000 -0500
-@@ -57,10 +57,10 @@
-     # Check urllib3 for compatibility.
-     major, minor, patch = urllib3_version  # noqa: F811
-     major, minor, patch = int(major), int(minor), int(patch)
--    # urllib3 >= 1.21.1, <= 1.24
-+    # urllib3 >= 1.21.1, < 1.26
-     assert major == 1
-     assert minor >= 21
--    assert minor <= 24
-+    assert minor < 26
- 
-     # Check chardet for compatibility.
-     major, minor, patch = chardet_version.split('.')[:3]
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index 9984e160..715b2ebf 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -74,6 +74,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/iputils.docbook.revert.diff.gz | patch -p1 -R --verbose || exit 1
+
 # Configure and build:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/n/iputils/iputils.docbook.revert.diff b/source/n/iputils/iputils.docbook.revert.diff
new file mode 100644
index 00000000..a6cdc35b
--- /dev/null
+++ b/source/n/iputils/iputils.docbook.revert.diff
@@ -0,0 +1,164 @@
+diff -u -r --new-file iputils-s20190324/doc/arping.xml iputils-s20190515/doc/arping.xml
+--- iputils-s20190324/doc/arping.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/arping.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.arping">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/clockdiff.xml iputils-s20190515/doc/clockdiff.xml
+--- iputils-s20190324/doc/clockdiff.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/clockdiff.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.clockdiff">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/custom-html.xsl iputils-s20190515/doc/custom-html.xsl
+--- iputils-s20190324/doc/custom-html.xsl	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/custom-html.xsl	2019-05-15 15:14:10.000000000 -0500
+@@ -2,7 +2,7 @@
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ 
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
+ <!--
+   - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID.
+   - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values.
+diff -u -r --new-file iputils-s20190324/doc/custom-man.xsl iputils-s20190515/doc/custom-man.xsl
+--- iputils-s20190324/doc/custom-man.xsl	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/custom-man.xsl	2019-05-15 15:14:10.000000000 -0500
+@@ -5,7 +5,7 @@
+                 extension-element-prefixes="exsl"
+                 version="1.0">
+ 
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
+ 
+ <xsl:template name="top.comment" />
+ 
+diff -u -r --new-file iputils-s20190324/doc/meson.build iputils-s20190515/doc/meson.build
+--- iputils-s20190324/doc/meson.build	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/meson.build	2019-05-15 15:14:10.000000000 -0500
+@@ -38,7 +38,7 @@
+ 	manpages += ['ninfod']
+ endif
+ 
+-xsltproc = find_program('xsltproc', required : false)
++xsltproc = find_program('xsltproc', required : true)
+ xsltproc_args = [
+ 	'--nonet',
+ 	'--stringparam', 'man.output.quietly', '1',
+@@ -48,15 +48,22 @@
+ ]
+ 
+ if xsltproc.found()
+-	testrun = run_command([xsltproc, '--nonet',
+-		'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'])
++	xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
++	testrun = run_command([xsltproc, '--nonet', xsl])
+ 	xsltproc_works = testrun.returncode() == 0
++	if xsltproc_works == false
++		warning('xsltproc: cannot process ' + xsl)
++	endif
+ else
+ 	warning('No docbook stylesheet found for generating man pages')
+ 	xsltproc_works = false
+ endif
+ 
+-if build_mans and xsltproc_works
++if xsltproc_works == false
++	error('Man pages cannot be built: xsltproc does not work correctly')
++endif
++
++if build_mans
+ 	foreach man : manpages
+ 		custom_target(man + '.8',
+ 			output : man + '.8',
+@@ -74,7 +81,7 @@
+ 	endforeach
+ endif
+ 
+-if build_html_mans and xsltproc_works
++if build_html_mans
+ 	foreach man : manpages
+ 		custom_target(man + '.html',
+ 			output : man + '.html',
+diff -u -r --new-file iputils-s20190324/doc/ninfod.xml iputils-s20190515/doc/ninfod.xml
+--- iputils-s20190324/doc/ninfod.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/ninfod.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ninfod">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/ping.xml iputils-s20190515/doc/ping.xml
+--- iputils-s20190324/doc/ping.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/ping.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ping">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/rarpd.xml iputils-s20190515/doc/rarpd.xml
+--- iputils-s20190324/doc/rarpd.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/rarpd.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rarpd">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/rdisc.xml iputils-s20190515/doc/rdisc.xml
+--- iputils-s20190324/doc/rdisc.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/rdisc.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rdisc">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/tftpd.xml iputils-s20190515/doc/tftpd.xml
+--- iputils-s20190324/doc/tftpd.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/tftpd.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tftpd">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/tracepath.xml iputils-s20190515/doc/tracepath.xml
+--- iputils-s20190324/doc/tracepath.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/tracepath.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tracepath">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/doc/traceroute6.xml iputils-s20190515/doc/traceroute6.xml
+--- iputils-s20190324/doc/traceroute6.xml	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/doc/traceroute6.xml	2019-05-15 15:14:10.000000000 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.traceroute6">
+ 
+   <refentryinfo>
+diff -u -r --new-file iputils-s20190324/meson.build iputils-s20190515/meson.build
+--- iputils-s20190324/meson.build	2019-03-24 09:28:37.000000000 -0500
++++ iputils-s20190515/meson.build	2019-05-15 15:14:10.000000000 -0500
+@@ -3,7 +3,7 @@
+ 		'c_std=c99',
+ 		'warning_level=3',
+ 	],
+-	version : 's20190324') # keep in sync with: git describe | awk -F- '{print $1}'
++	version : 's20190515') # keep in sync with: git describe | awk -F- '{print $1}'
+ 
+ cc = meson.get_compiler('c')
+ 
-- 
cgit v1.2.3