Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

4 files changed, 120 insertions, 82 deletions

diff --git a/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff b/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff
new file mode 100644
index 00000000..2bdc7de4
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff
@@ -0,0 +1,80 @@
+--- a/asciidoc.py       2010-10-17 14:01:35.000000000 +0800
++++ b/asciidoc.py       2010-10-17 14:11:07.000000000 +0800
+@@ -4260,10 +4260,12 @@
+         self.include1 = {}      # Holds include1::[] files for {include1:}.
+         self.dumping = False    # True if asciidoc -c option specified.
+
+-    def load_file(self,fname,dir=None):
++    def load_file(self, fname, dir=None, include=[]):
+         """
+         Loads sections dictionary with sections from file fname.
+         Existing sections are overlaid.
++        The 'include' list contains the section names to be loaded,
++        if 'inlude' is not specified all sections are loaded.
+         Return False if no file was found in any of the locations.
+         """
+         if dir:
+@@ -4317,9 +4319,14 @@
+             else:
+                 sections[section] = contents
+         rdr.close()
++        if include:
++            for s in set(sections) - set(include):
++                del sections[s]
+         attrs = {}
+         self.load_sections(sections,attrs)
+-        self.loaded.append(os.path.realpath(fname))
++        if not include:
++            # If all sections are loaded mark this file as loaded.
++            self.loaded.append(os.path.realpath(fname))
+         document.update_attributes(attrs) # So they are available immediately.
+         return True
+
+@@ -5314,13 +5321,17 @@
+             if o == '-c': config.dumping = True
+             if o == '-s': config.header_footer = False
+             if o == '-v': config.verbose = True
+-        # Check the infile exists.
+-        if infile != '<stdin>' and not os.path.isfile(infile):
+-            raise EAsciiDoc,'input file %s missing' % infile
+-        document.infile = infile
+         # Load asciidoc.conf files.
+         if not config.load_from_dirs('asciidoc.conf'):
+             raise EAsciiDoc,'configuration file asciidoc.conf missing'
++        # Check the infile exists.
++        if infile != '<stdin>':
++            if not os.path.isfile(infile):
++                raise EAsciiDoc,'input file %s missing' % infile
++            indir = os.path.dirname(infile)
++            config.load_file('asciidoc.conf', indir,
++                            ['attributes','titles','specialchars'])
++        document.infile = infile
+         AttributeList.initialize()
+         # Open input file and parse document header.
+         reader.tabsize = config.tabsize
+@@ -5343,10 +5354,9 @@
+             document.load_lang()
+         # Load local conf files (conf files in the input file directory).
+         if infile != '<stdin>':
+-            d =os.path.dirname(infile)
+-            config.load_from_dirs('asciidoc.conf', [d])
+-            config.load_backend([d])
+-            config.load_filters([d])
++            config.load_file('asciidoc.conf', indir)
++            config.load_backend([indir])
++            config.load_filters([indir])
+             # Load document specific configuration files.
+             f = os.path.splitext(infile)[0]
+             config.load_file(f + '.conf')
+--- a/doc/asciidoc.txt  2010-10-17 14:11:34.000000000 +0800
++++ b/doc/asciidoc.txt  2010-10-17 14:13:21.000000000 +0800
+@@ -3632,6 +3632,8 @@
+ the following order:
+
+ - `asciidoc.conf` from locations 1, 2, 3.
++- 'attributes', 'titles' and 'specialcharacters' sections from the
++  `asciidoc.conf` in location 4.
+ - The document header is parsed at this point.
+ - `<backend>.conf` and `<backend>-<doctype>.conf` from locations 1,
+   2,3.
+
diff --git a/source/ap/linuxdoc-tools/sources/gtk-doc.patch b/source/ap/linuxdoc-tools/sources/gtk-doc.patch
new file mode 100644
index 00000000..bf32d557
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/gtk-doc.patch
@@ -0,0 +1,25 @@
+From 2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 Mon Sep 17 00:00:00 2001
+From: Stefan Kost <ensonic@users.sf.net>
+Date: Thu, 19 Aug 2010 14:45:54 +0000
+Subject: fixxref: tweak the vim invocation
+
+Use specific output-filename to ensure we get what we'll late use. Use "-u NONE"
+instead of -u /dev/null.
+Fixes #627223
+---
+diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
+index 33a31b8..9f53852 100755
+--- a/gtkdoc-fixxref.in
++++ b/gtkdoc-fixxref.in
+@@ -464,7 +464,7 @@ sub HighlightSourceVim {
+     close (NEWFILE);
+ 
+     # format source
+-    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null";
++    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|w! $temp_source_file.html|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null";
+ 
+     my $highlighted_source;
+     {
+--
+cgit v0.8.3.1
+
diff --git a/source/ap/linuxdoc-tools/sources/gtkdoc-1.13-fixref.patch b/source/ap/linuxdoc-tools/sources/gtkdoc-1.13-fixref.patch
deleted file mode 100644
index 89b062de..00000000
--- a/source/ap/linuxdoc-tools/sources/gtkdoc-1.13-fixref.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref gtk-doc-1.13/gtkdoc-fixxref.in
---- gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref	2009-12-17 14:36:51.000000000 -0500
-+++ gtk-doc-1.13/gtkdoc-fixxref.in	2010-01-06 17:56:55.457121567 -0500
-@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
-     }
- }
- 
--open (INPUT, "$MODULE-sections.txt")
--	|| die "Can't open $MODULE-sections.txt: $!";
--my $subsection = "";
--while (<INPUT>) {
--    if (m/^#/) {
--        next;
--
--    } elsif (m/^<SECTION>/) {
--        $subsection = "";
--    } elsif (m/^<SUBSECTION\s*(.*)>/i) {
--        $subsection = $1;
--    } elsif (m/^<SUBSECTION>/) {
--        next;
--    } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
--        next;
--    } elsif (m/^<FILE>(.*)<\/FILE>/) {
--        next;
--    } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
--        next;
--    } elsif (m/^<\/SECTION>/) {
--        next;
--    } elsif (m/^(\S+)/) {
--        my $symbol=CreateValidSGMLID($1);
--
--        if ($subsection eq "Standard" || $subsection eq "Private") {
--            $NoLinks{$symbol} = 1;
-+if (defined($MODULE)) {
-+    open (INPUT, "$MODULE-sections.txt")
-+            || die "Can't open $MODULE-sections.txt: $!";
-+    my $subsection = "";
-+    while (<INPUT>) {
-+        if (m/^#/) {
-+            next;
-+
-+        } elsif (m/^<SECTION>/) {
-+            $subsection = "";
-+        } elsif (m/^<SUBSECTION\s*(.*)>/i) {
-+            $subsection = $1;
-+        } elsif (m/^<SUBSECTION>/) {
-+            next;
-+        } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
-+            next;
-+        } elsif (m/^<FILE>(.*)<\/FILE>/) {
-+            next;
-+        } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
-+            next;
-+        } elsif (m/^<\/SECTION>/) {
-+            next;
-+        } elsif (m/^(\S+)/) {
-+            my $symbol=CreateValidSGMLID($1);
-+
-+            if ($subsection eq "Standard" || $subsection eq "Private") {
-+                $NoLinks{$symbol} = 1;
-+            }
-         }
-     }
-+    close (INPUT);
- }
--close (INPUT);
- 
- &FixCrossReferences ($MODULE_DIR);
- 
diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download
index 41000902..40e05d21 100755
--- a/source/ap/linuxdoc-tools/sources/source.download
+++ b/source/ap/linuxdoc-tools/sources/source.download
@@ -7,8 +7,7 @@
 
 # linuxdoc-tools:
 # This provides things such as sgml2txt.
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/linuxdoc-tools-0.9.66-4.fc13.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/linuxdoc-tools-0.9.66-6.fc14.src.rpm
 
 # OpenSP:
 # http://openjade.sourceforge.net/download.html
@@ -25,7 +24,7 @@ wget -c http://downloads.sourceforge.net/openjade/openjade-1.3.3-pre1.tar.gz
 # sgmltools-common.
 # It's broken and needs patching so we'll use Fedora's.
 #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/sgml-common-0.6.3-31.fc13.src.rpm
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/sgml-common-0.6.3-33.fc14.src.rpm
 
 
 # DocBook docs:
@@ -44,14 +43,12 @@ wget -c ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/docbook-dsssl-1.79.tar
 wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2
 # Why don't they put the patches into the distributed source...???
 #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-utils-0.6.14-23.fc13.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-utils-0.6.14-24.fc14.src.rpm
 
 #
 wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
 # https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-style-xsl-1.75.2-5.fc13.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-style-xsl-1.75.2-6.fc14.src.rpm
 
 # We use the Fedora "docbook-style-xsl" SRPM for this rather than the original source which is why
 # these "docbook-xsl*" files aren't in our sources directory.
@@ -60,15 +57,18 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/
 
 
 # gnome-doc-utils, needed to build gtk-doc:
-wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.19/gnome-doc-utils-0.19.1.tar.bz2
-
+# Recompressed with LZMA after download.
+# I guess this mirror is out of date now.  It's easier to just look at Fedora's development
+# directory anyway :-)
+# wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.0.tar.bz2
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/gnome-doc-utils-0.20.1-1.fc14.src.rpm
 
 # gtk-doc:
 # When upgrading this, it's worth checking the Fedora SRPM.  For version 1.13
 # we're carrying a fix for gtk-doc-fixref.  Make sure newer versions don't need
 # any patches!
-wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2
-
+wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2
+# http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0
 
 # sgmlspl
 # http://www.cs.indiana.edu/~asengupt/sgml/SGMLSpm/DOC/HTML/sgmlspl/sgmlspl.html
@@ -79,9 +79,11 @@ wget -c http://ftp.de.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-pe
 
 # xmlto
 # https://fedorahosted.org/releases/x/m/xmlto
-wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2
+# wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2
+# Fedora 14 includes a patch, so we'll take it:
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/xmlto-0.0.23-3.fc13.src.rpm
 
 
 # AsciiDoc
 # http://www.methods.co.nz/asciidoc/
-wget -c "http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.5.2/asciidoc-8.5.2.tar.gz?use_mirror=ignum"
+wget -c "http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.2/asciidoc-8.6.2.tar.gz/download"