From 3db41f6c7650f0cff2bb0010c9db60bfb74e6b02 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 19 Jul 2019 18:26:45 +0000
Subject: Fri Jul 19 18:26:45 UTC 2019

a/aaa_elflibs-15.0-x86_64-9.txz:  Rebuilt.
  Upgraded: libbz2.so.1.0.8, libexpat.so.1.6.9, libglib-2.0.so.0.6000.5,
  libgmodule-2.0.so.0.6000.5, libgobject-2.0.so.0.6000.5,
  libgthread-2.0.so.0.6000.5, libidn2.so.0.3.6.
  Removed: libicudata.so.63.1, libicui18n.so.63.1, libicuio.so.63.1,
  libicutest.so.63.1, libicutu.so.63.1, libicuuc.so.63.1.
  Added: libpcre2-8.so.0.8.0, libpsl.so.5.3.2. These are needed by wget which
  is used by slackpkg, so they should be in here. Thanks to OutSiderBR.
ap/lxc-2.0.11_fad08f383-x86_64-1.txz:  Upgraded.
  Updated from 2.0 git branch.
  Ported init script updates from sysvinit-scripts.
d/ccache-3.7.2-x86_64-1.txz:  Upgraded.
l/libsigc++-2.10.2-x86_64-1.txz:  Upgraded.
n/curl-7.65.3-x86_64-1.txz:  Upgraded.
  This is a bugfix release:
  Fix a regression that caused the progress meter not to appear.
  For more information, see:
    https://curl.haxx.se/changes.html
n/iputils-20190709-x86_64-1.txz:  Upgraded.
---
 source/n/iputils/iputils.SlackBuild          |   2 +-
 source/n/iputils/iputils.docbook.revert.diff | 219 +++++++++++----------------
 2 files changed, 91 insertions(+), 130 deletions(-)

(limited to 'source/n/iputils')

diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index 137ec39b..b4fee0c8 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -74,7 +74,7 @@ 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
+zcat $CWD/iputils.docbook.revert.diff.gz | patch -p1 --verbose || exit 1
 
 # Configure and build:
 export CFLAGS="$SLKCFLAGS"
diff --git a/source/n/iputils/iputils.docbook.revert.diff b/source/n/iputils/iputils.docbook.revert.diff
index a6cdc35b..1658f89b 100644
--- a/source/n/iputils/iputils.docbook.revert.diff
+++ b/source/n/iputils/iputils.docbook.revert.diff
@@ -1,164 +1,125 @@
-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
+--- ./doc/rarpd.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/rarpd.xml	2019-07-19 11:58:31.999331384 -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">
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rarpd">
  
    <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
+--- ./doc/custom-man.xsl.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/custom-man.xsl	2019-07-19 11:58:31.966331383 -0500
+@@ -5,7 +5,7 @@
+                 extension-element-prefixes="exsl"
+                 version="1.0">
+ 
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
+ 
+ <xsl:template name="top.comment" />
+ 
+--- ./doc/ninfod.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/ninfod.xml	2019-07-19 11:58:31.996331384 -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">
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ninfod">
  
    <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 @@
+--- ./doc/traceroute6.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/traceroute6.xml	2019-07-19 11:58:32.004331384 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.traceroute6">
  
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+   <refentryinfo>
+--- ./doc/rdisc.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/rdisc.xml	2019-07-19 11:58:32.001331384 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rdisc">
  
--<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">
+   <refentryinfo>
+--- ./doc/clockdiff.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/clockdiff.xml	2019-07-19 11:58:31.962331383 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.clockdiff">
  
--<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"/>
+   <refentryinfo>
+--- ./doc/arping.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/arping.xml	2019-07-19 11:58:31.960331383 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.arping">
  
- <xsl:template name="top.comment" />
+   <refentryinfo>
+--- ./doc/ping.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/ping.xml	2019-07-19 11:58:31.998331384 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ping">
  
-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
+   <refentryinfo>
+--- ./doc/meson.build.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/meson.build	2019-07-19 12:01:49.464337710 -0500
 @@ -38,7 +38,7 @@
  	manpages += ['ninfod']
  endif
  
--xsltproc = find_program('xsltproc', required : false)
-+xsltproc = find_program('xsltproc', required : true)
+-xsltproc = find_program('xsltproc', required : build_mans or build_html_mans)
++xsltproc = find_program('xsltproc', required : false)
  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
+@@ -59,10 +59,6 @@
+ 	foreach doc_target : doc_targets
+ 		xsl = 'http://docbook.sourceforge.net/release/xsl-ns/current/' + doc_target + '/docbook.xsl'
+ 		testrun = run_command([xsltproc, '--nonet', xsl])
+-		if testrun.returncode() != 0
+-			xsltproc_works = false
+-			message('WARNING: xsltproc: cannot process ' + xsl)
+-		endif
+ 	endforeach
  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 @@
+@@ -88,7 +84,7 @@
  	endforeach
  endif
  
--if build_html_mans and xsltproc_works
-+if build_html_mans
+-if build_html_mans
++if build_html_mans and xsltproc_works
  	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">
+--- ./doc/custom-html.xsl.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/custom-html.xsl	2019-07-19 11:58:31.964331383 -0500
+@@ -2,7 +2,7 @@
  
-   <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">
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  
-   <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
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/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.
+--- ./doc/tracepath.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/tracepath.xml	2019-07-19 11:58:32.003331384 -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"
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="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
+--- ./doc/tftpd.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/tftpd.xml	2019-07-19 11:58:32.002331384 -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">
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tftpd">
  
    <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