sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (da1d7806fc054e484b893d320f356a1e34b9f497)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (da1d7806fc054e484b893d320f356a1e34b9f497)
Date: Fri, 24 May 2019 21:58:46 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

doc/docbook2x/HISTORY
| 9 -
doc/docbook2x/PRE_BUILD
| 2
doc/docbook2x/docbook2x.patch
| 14 -
doc/docbook2x/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.patch
| 27 +++
doc/docbook2x/patches/03_fix_420153_filename_whitespace_handling.patch
| 43 ++++
doc/docbook2x/patches/04_fix_442782_preprocessor_declaration_syntax.patch
| 90 ++++++++++
doc/docbook2x/patches/05_fix_439214_error_on_missing_refentry.patch
| 33 +++
doc/docbook2x/patches/06_fix_man_typo.patch
| 24 ++
doc/docbook2x/patches/docbook2x.patch
| 14 +
utils/lsof/BUILD
| 6
utils/lsof/HISTORY
| 4
11 files changed, 247 insertions(+), 19 deletions(-)

New commits:
commit da1d7806fc054e484b893d320f356a1e34b9f497
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lsof: Omit Inventory and AFS support

commit 0492c69bf926d3b17a2a31e0e08da229fa94ee7e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lsof: Fix passing of compiler flags to secondary Makefile

commit e22773740dab1909ed412e7c0036eb7fb872a755
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

docbook2x: Import patches from Debian

diff --git a/doc/docbook2x/HISTORY b/doc/docbook2x/HISTORY
index 23bf5c4..862472e 100644
--- a/doc/docbook2x/HISTORY
+++ b/doc/docbook2x/HISTORY
@@ -1,3 +1,11 @@
+2019-05-24 Ismael Luceno <ismael AT sourcemage.org>
+ * 02_fix_418703_dont_use_abbreviated_sfnet_address.patch,
+ 03_fix_420153_filename_whitespace_handling.patch,
+ 04_fix_442782_preprocessor_declaration_syntax.patch,
+ 05_fix_439214_error_on_missing_refentry.patch,
+ 06_fix_man_typo.patch: Imported from Debian
+ * PRE_BUILD, patches/*: Move patches to a separate directory
+
2017-06-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, docbook2x.patch: fix upstream bug #20
* DETAILS: PATCHLEVEL++
@@ -13,4 +21,3 @@

2006-07-12 Ladislav Hagara <hgr AT vabo.cz>
* *: created this spell, version 0.8.7
-
diff --git a/doc/docbook2x/PRE_BUILD b/doc/docbook2x/PRE_BUILD
index d905555..32c0555 100755
--- a/doc/docbook2x/PRE_BUILD
+++ b/doc/docbook2x/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SPELL_DIRECTORY/docbook2x.patch"
+apply_patch_dir patches
diff --git a/doc/docbook2x/docbook2x.patch b/doc/docbook2x/docbook2x.patch
deleted file mode 100644
index bf2f12b..0000000
--- a/doc/docbook2x/docbook2x.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- docbook2X-0.8.8-original/configure.ac 2007-03-03 07:44:14.000000000
-0600
-+++ docbook2X-0.8.8-fixed/configure.ac 2007-10-10 14:19:31.000000000 -0500
-@@ -149,6 +149,11 @@
- dnl Ensure that all static_* are fully expanded.
-
- eval static_datadir="$datadir"
-+old_val=""
-+until test "$static_datadir" = "$old_val"; do
-+ old_val="$static_datadir"
-+ eval static_datadir="$static_datadir"
-+done
-
- eval static_bindir="$bindir"
- old_val=""
diff --git
a/doc/docbook2x/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.patch

b/doc/docbook2x/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.patch
new file mode 100644
index 0000000..681047a
--- /dev/null
+++
b/doc/docbook2x/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.patch
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch by Daniel Leidert
(dale) <daniel.leidert AT wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ondrej Certik reported a resolver issue:
http://bugs.debian.org/418703.
+## DP: The error seems to be caused by using the abbreviated sf.net URLs. But
+## DP: it is possible, that this issue only occurs together with the issue
+## DP: described in 01_fix_static_datadir_evaluation.dpatch, because the path
+## DP: to the catalog also suffers from this issue.
+
+@DPATCH@
+diff -urNad docbook2x-0.8.8~/perl/db2x_xsltproc.pl
docbook2x-0.8.8/perl/db2x_xsltproc.pl
+--- docbook2x-0.8.8~/perl/db2x_xsltproc.pl 2004-08-18 16:21:52.000000000
+0200
++++ docbook2x-0.8.8/perl/db2x_xsltproc.pl 2007-04-12 16:07:20.000000000
+0200
+@@ -110,10 +110,10 @@
+
+ if($options->{'stylesheet'} eq 'texi') {
+ $options->{'stylesheet'} =
+- "http://docbook2x.sf.net/latest/xslt/texi/docbook.xsl";;
++ "http://docbook2x.sourceforge.net/latest/xslt/texi/docbook.xsl";;
+ } elsif($options->{'stylesheet'} eq 'man') {
+ $options->{'stylesheet'} =
+- "http://docbook2x.sf.net/latest/xslt/man/docbook.xsl";;
++ "http://docbook2x.sourceforge.net/latest/xslt/man/docbook.xsl";;
+ }
+
+ if(scalar(@argv) != 1) {
diff --git
a/doc/docbook2x/patches/03_fix_420153_filename_whitespace_handling.patch
b/doc/docbook2x/patches/03_fix_420153_filename_whitespace_handling.patch
new file mode 100644
index 0000000..26cdf8e
--- /dev/null
+++ b/doc/docbook2x/patches/03_fix_420153_filename_whitespace_handling.patch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_420153_filename_whitespace_handling.dpatch by
+## Daniel Leidert (dale) <daniel.leidert AT wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Peter Eisentraut reported a regression in the whitespace handling of
+## DP: refentrytitle content during filename creation:
+## DP: http://bugs.debian.org/420153. The problem is, that upstream first
+## DP: replaces all spaces (but not linebreaks btw) with underlines and then
+## DP: it tries to normalize the result. This means, that a linebreak with
+## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'.
+## DP: So what we basically do in this patch is, that we first normalize the
+## DP: refentrytitle and then replace any spaces left with underlines.
+
+@DPATCH@
+diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl
docbook2x-0.8.8/xslt/man/manpage.xsl
+--- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000
+0200
++++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000
+0200
+@@ -30,7 +30,7 @@
+
+ <xsl:template name="manpage-filename">
+ <xsl:param name="filename" />
+- <xsl:value-of select="normalize-space(translate($filename, "
/", "__"))" />
++ <xsl:value-of select="translate(normalize-space($filename), ' /', '__')"
/>
+ </xsl:template>
+
+
+diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl
docbook2x-0.8.8/xslt/man/refentry.xsl
+--- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000
+0200
++++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000
+0200
+@@ -38,7 +38,11 @@
+ <xsl:template name="refentry-filename">
+ <xsl:param name="title" />
+
+- <xsl:variable name="title2" select="translate($title, " /",
"__")" />
++ <xsl:variable name="title2">
++ <xsl:call-template name="manpage-filename">
++ <xsl:with-param name="filename" select="$title" />
++ </xsl:call-template>
++ </xsl:variable>
+
+ <!-- not using gentext here since man page names tend not to have
+ accented chars / non-Latin chars ...
diff --git
a/doc/docbook2x/patches/04_fix_442782_preprocessor_declaration_syntax.patch
b/doc/docbook2x/patches/04_fix_442782_preprocessor_declaration_syntax.patch
new file mode 100644
index 0000000..b6ddbfa
--- /dev/null
+++
b/doc/docbook2x/patches/04_fix_442782_preprocessor_declaration_syntax.patch
@@ -0,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_442782_preprocessor_declaration_syntax.dpatch by Colin Watson
<cjwatson AT debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Conventionally, preprocessor declarations should start with
+## DP: '\"
+## DP: rather than
+## DP: .\"
+## DP: Current man-db only supports the first (and recommended) syntax. So
+## DP: Colin Watson provided this patch to fix docbook2x.
+## DP:
+## DP: <URL:http://bugs.debian.org/442782>
+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
+
+@DPATCH@
+diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
+--- trunk~/perl/db2x_manxml.pl 2006-04-22 17:21:32.000000000 +0200
++++ trunk/perl/db2x_manxml.pl 2007-11-24 01:27:37.000000000 +0100
+@@ -342,6 +342,25 @@
+ $self->{line_start} = 1;
+ }
+
++#
++# Print a comment in the output, without causing a break.
++# Params: comment - the comment text.
++# May use any characters; they need not be escaped.
++#
++sub comment_nobreak
++{
++ my ($self, $comment) = @_;
++ $self->write("\n") unless $self->{line_start};
++
++ foreach my $line (split(/\n/, $comment)) {
++ $self->write('\'\" ');
++ $self->write($line);
++ $self->write("\n");
++ }
++
++ $self->{line_start} = 1;
++}
++
+
+ #
+ # Use a roff "escape" i.e. commands embedded in text starting with \
+@@ -510,16 +529,20 @@
+
+ $self->{'adjust-stack'} = [ 'b' ];
+
+- $self->{rw}->comment($elem->attr('preprocessors'))
+- if($elem->attr('preprocessors') ne '');
+-
++ my $preprocessors = $elem->attr('preprocessors');
+ # I've dug through the Internet to see if there was any
+ # standard way to specify encoding with man pages.
+ # The following seems to be a reasonable proposal:
+ # <URL:http://mail.nl.linux.org/linux-utf8/2001-04/msg00168.html>
+ my $encoding = $self->{options}->{'encoding'};
+ $encoding =~ s#//TRANSLIT$##i;
+- $self->{rw}->comment("-*- coding: $encoding -*-");
++ $encoding = "-*- coding: $encoding -*-";
++ if ($preprocessors eq '') {
++ $preprocessors = $encoding;
++ } else {
++ $preprocessors = "$preprocessors $encoding";
++ }
++ $self->{rw}->comment_nobreak($preprocessors);
+
+ # Define escapes for switching to and from monospace fonts (groff only)
+ $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});
+diff -urNad trunk~/xslt/backend/db2x_manxml.xsl
trunk/xslt/backend/db2x_manxml.xsl
+--- trunk~/xslt/backend/db2x_manxml.xsl 2006-04-23 16:44:52.000000000
+0200
++++ trunk/xslt/backend/db2x_manxml.xsl 2007-11-24 01:27:37.000000000 +0100
+@@ -528,7 +528,7 @@
+ <exslt:document method="text"
+ encoding="{$encoding}"
+ href="{$path}">
+- <xsl:text>.\" -*- coding: </xsl:text>
++ <xsl:text>'\" -*- coding: </xsl:text>
+ <xsl:value-of select="$encoding" />
+ <xsl:text> -*-
</xsl:text>
+ <xsl:copy-of select="$content" />
+@@ -538,7 +538,7 @@
+ <saxon:output method="text"
+ encoding="{$encoding}"
+ href="{$path}">
+- <xsl:text>.\" -*- coding: </xsl:text>
++ <xsl:text>'\" -*- coding: </xsl:text>
+ <xsl:value-of select="$encoding" />
+ <xsl:text> -*-
</xsl:text>
+ <xsl:copy-of select="$content" />
diff --git
a/doc/docbook2x/patches/05_fix_439214_error_on_missing_refentry.patch
b/doc/docbook2x/patches/05_fix_439214_error_on_missing_refentry.patch
new file mode 100644
index 0000000..b8a493b
--- /dev/null
+++ b/doc/docbook2x/patches/05_fix_439214_error_on_missing_refentry.patch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_439214_error_on_missing_refentry.dpatch by Daniel Leidert
<daniel.leidert AT wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: If there is no refentry element, the manpage stylesheets silently
+## DP: "ignores" this. It has been requested to print at least a
+## DP: warning.
+## DP:
+## DP: <URL:http://bugs.debian.org/439214>
+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
+
+@DPATCH@
+diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl
+--- trunk~/xslt/man/docbook.xsl 2006-04-11 21:00:19.000000000 +0200
++++ trunk/xslt/man/docbook.xsl 2008-02-05 03:31:48.000000000 +0100
+@@ -111,11 +111,15 @@
+ <xsl:when test="child::refentry">
+ <xsl:apply-templates />
+ </xsl:when>
+-
+- <xsl:otherwise>
++ <xsl:when test="descendant-or-self::refentry">
+ <manpageset>
+ <xsl:apply-templates select="descendant-or-self::refentry" />
+ </manpageset>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:message terminate="no">
++ <xsl:text>WARNING: Sorry, but I cannot find a refentry element in
your source!</xsl:text>
++ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
diff --git a/doc/docbook2x/patches/06_fix_man_typo.patch
b/doc/docbook2x/patches/06_fix_man_typo.patch
new file mode 100644
index 0000000..5be21bd
--- /dev/null
+++ b/doc/docbook2x/patches/06_fix_man_typo.patch
@@ -0,0 +1,24 @@
+Author: Gianfranco Costamagna <costamagnagianfranco AT yahoo.it>
+
+--- docbook2x-0.8.8.orig/doc/docbook2man.1
++++ docbook2x-0.8.8/doc/docbook2man.1
+@@ -187,7 +187,7 @@ parameter instead.
+
+ However, inside a custom stylesheet
+ (\fInot on the command-line\fR)
+-this paramter can be set to the XPath expression
++this parameter can be set to the XPath expression
+ \*(T<document('')\*(T>,
+ which will cause the custom translations
+ directly embedded inside the custom stylesheet to be read.
+--- docbook2x-0.8.8.orig/doc/docbook2texi.1
++++ docbook2x-0.8.8/doc/docbook2texi.1
+@@ -230,7 +230,7 @@ parameter instead.
+
+ However, inside a custom stylesheet
+ (\fInot on the command-line\fR)
+-this paramter can be set to the XPath expression
++this parameter can be set to the XPath expression
+ \*(T<document('')\*(T>,
+ which will cause the custom translations
+ directly embedded inside the custom stylesheet to be read.
diff --git a/doc/docbook2x/patches/docbook2x.patch
b/doc/docbook2x/patches/docbook2x.patch
new file mode 100644
index 0000000..bf2f12b
--- /dev/null
+++ b/doc/docbook2x/patches/docbook2x.patch
@@ -0,0 +1,14 @@
+--- docbook2X-0.8.8-original/configure.ac 2007-03-03 07:44:14.000000000
-0600
++++ docbook2X-0.8.8-fixed/configure.ac 2007-10-10 14:19:31.000000000 -0500
+@@ -149,6 +149,11 @@
+ dnl Ensure that all static_* are fully expanded.
+
+ eval static_datadir="$datadir"
++old_val=""
++until test "$static_datadir" = "$old_val"; do
++ old_val="$static_datadir"
++ eval static_datadir="$static_datadir"
++done
+
+ eval static_bindir="$bindir"
+ old_val=""
diff --git a/utils/lsof/BUILD b/utils/lsof/BUILD
index c0383b2..fc1b360 100755
--- a/utils/lsof/BUILD
+++ b/utils/lsof/BUILD
@@ -1,4 +1,4 @@
cd ${SPELL}_${VERSION}_src &&
-yes | ./Configure linux &&
-sedit "s/-O/$CFLAGS/" Makefile &&
-make
+yes | ./Configure -n linux &&
+sedit 's/{MAKE} /&CC="${CC}" /' Makefile &&
+make CC="$CC" DEBUG="$CFLAGS"
diff --git a/utils/lsof/HISTORY b/utils/lsof/HISTORY
index 1e57418..31b5088 100644
--- a/utils/lsof/HISTORY
+++ b/utils/lsof/HISTORY
@@ -1,3 +1,7 @@
+2019-05-24 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fixed passing of compiler flags to secondary Makefile
+ Omit Inventory and AFS support
+
2018-07-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.91

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (da1d7806fc054e484b893d320f356a1e34b9f497), Ismael Luceno, 05/24/2019