rpms/docbook-dtds
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use system rewrite for web URL's in sgml catalogs to prevent reading from

Browse Source 
the network(#478680)
This commit is contained in:
Ondrej Vasik 2009-02-05 16:25:46 +00:00
parent 7317eca585
commit 15674f22ba
2 changed files with 235 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
docbook-dtds.spec
View File

@ -2,7 +2,7 @@
Name: docbook-dtds Name: docbook-dtds
Version: 1.0 Version: 1.0
Release: 41%{?dist} Release: 42%{?dist}
Group: Applications/Text Group: Applications/Text
Summary: SGML and XML document type definitions for DocBook Summary: SGML and XML document type definitions for DocBook
@ -16,11 +16,11 @@ Obsoletes: docbook-dtd40-sgml <= %{version}-%{release}
Obsoletes: docbook-dtd41-sgml <= %{version}-%{release} Obsoletes: docbook-dtd41-sgml <= %{version}-%{release}
Obsoletes: docbook-dtd412-xml <= %{version}-%{release} Obsoletes: docbook-dtd412-xml <= %{version}-%{release}
Provides: docbook-dtd-xml = %{version}-%{release} Provides: docbook-dtd-xml = %{version}-%{release}
Provides: docbook-dtd-sgml = %{version}-%{release} Provides: docbook-dtd-sgml = %{version}-%{release}
Provides: docbook-dtd30-sgml = %{version}-%{release} Provides: docbook-dtd30-sgml = %{version}-%{release}
Provides: docbook-dtd31-sgml = %{version}-%{release} Provides: docbook-dtd31-sgml = %{version}-%{release}
Provides: docbook-dtd40-sgml = %{version}-%{release} Provides: docbook-dtd40-sgml = %{version}-%{release}
Provides: docbook-dtd41-sgml = %{version}-%{release} Provides: docbook-dtd41-sgml = %{version}-%{release}
Provides: docbook-dtd412-xml = %{version}-%{release} Provides: docbook-dtd412-xml = %{version}-%{release}
Provides: docbook-dtd42-sgml = %{version}-%{release} Provides: docbook-dtd42-sgml = %{version}-%{release}
@ -41,8 +41,8 @@ Requires(postun): libxml2 >= 2.4.8
# later. # later.
Requires: sgml-common >= 0.6.3-4 Requires: sgml-common >= 0.6.3-4
# We provide the directory layout expected by 0.6.3-5 or later of # We provide the directory layout expected by 0.6.3-5 or later of
# xml-common. Earlier versions won't understand. Additionally # xml-common. Earlier versions won't understand. Additionally
# require xml-common >= 0.6.3-24 to workaround issue with F9 # require xml-common >= 0.6.3-24 to workaround issue with F9
# install+update and empty xmlcatalog # install+update and empty xmlcatalog
Requires: xml-common >= 0.6.3-24 Requires: xml-common >= 0.6.3-24
@ -69,13 +69,14 @@ Patch3: docbook-dtd41-sgml-1.0.catalog.patch
Patch4: docbook-dtd42-sgml-1.0.catalog.patch Patch4: docbook-dtd42-sgml-1.0.catalog.patch
Patch5: docbook-4.2-euro.patch Patch5: docbook-4.2-euro.patch
Patch6: docbook-dtds-ents.patch Patch6: docbook-dtds-ents.patch
Patch7: docbook-sgml-systemrewrite.patch
BuildRequires: unzip BuildRequires: unzip
%description %description
The DocBook Document Type Definition (DTD) describes the syntax of The DocBook Document Type Definition (DTD) describes the syntax of
technical documentation texts (articles, books and manual pages). technical documentation texts (articles, books and manual pages).
This syntax is XML-compliant and is developed by the OASIS consortium. This syntax is XML-compliant and is developed by the OASIS consortium.
This package contains SGML and XML versions of the DocBook DTD. This package contains SGML and XML versions of the DocBook DTD.
%prep %prep
@ -169,6 +170,9 @@ cd ..
# Fix ISO entities in 4.3/4.4 SGML # Fix ISO entities in 4.3/4.4 SGML
%patch6 -p1 %patch6 -p1
# Rewrite SYSTEM to use local catalog instead web ones (#478680)
%patch7 -p1
# Increase NAMELEN (bug #36058, bug #159382). # Increase NAMELEN (bug #36058, bug #159382).
sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
@ -1068,7 +1072,7 @@ fi
/usr/bin/xmlcatalog --sgml --noout --add \ /usr/bin/xmlcatalog --sgml --noout --add \
/etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog /usr/share/sgml/openjade-%{openjadever}/catalog
# DocBook V4.1 # DocBook V4.1
/usr/bin/xmlcatalog --sgml --noout --add \ /usr/bin/xmlcatalog --sgml --noout --add \
/etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
@ -1108,7 +1112,7 @@ fi
/usr/bin/xmlcatalog --sgml --noout --add \ /usr/bin/xmlcatalog --sgml --noout --add \
/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \ /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog /usr/share/sgml/openjade-%{openjadever}/catalog
# DocBook V4.5 # DocBook V4.5
/usr/bin/xmlcatalog --sgml --noout --add \ /usr/bin/xmlcatalog --sgml --noout --add \
/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
@ -1137,7 +1141,7 @@ fi
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del \
/etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog /usr/share/sgml/openjade-%{openjadever}/catalog
# DocBook V4.1 # DocBook V4.1
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del \
/etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
@ -1177,7 +1181,7 @@ fi
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del \
/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \ /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog /usr/share/sgml/openjade-%{openjadever}/catalog
# DocBook V4.5 # DocBook V4.5
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del \
/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
@ -1189,7 +1193,7 @@ fi
/usr/share/sgml/openjade-%{openjadever}/catalog /usr/share/sgml/openjade-%{openjadever}/catalog
#openjade unregistration trigger end #openjade unregistration trigger end
%postun %postun
## ##
## SGML catalog ## SGML catalog
@ -1581,12 +1585,16 @@ then
fi fi
%changelog %changelog
* Thu Feb 05 2009 Ondrej Vasik <ovasik@redhat.com> - 1.0-42
- Use SYSTEM rewrite for web URL's in sgml catalogs to
prevent reading from the network(#478680)
* Fri Sep 26 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-41 * Fri Sep 26 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-41
- Removed openjade requirement - registration reworked to - Removed openjade requirement - registration reworked to
triggers(#234345) triggers(#234345)
* Wed Sep 24 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-40 * Wed Sep 24 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-40
- Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 - Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5
iso entities(#461206) iso entities(#461206)
- /ent/iso-cyr1.ent now correctly registered in xml catalog - /ent/iso-cyr1.ent now correctly registered in xml catalog
(there was /ent/iso-cyrl.ent typo) (there was /ent/iso-cyrl.ent typo)
@ -1594,18 +1602,18 @@ fi
(missing CAT_DIR variable) (missing CAT_DIR variable)
* Fri Aug 29 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-39 * Fri Aug 29 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-39
- rebuild with F9 spec file to fix some heavy-weight black - rebuild with F9 spec file to fix some heavy-weight black
magic causing failures of sgml documents magic causing failures of sgml documents
* Fri Jul 11 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-38 * Fri Jul 11 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-38
- fixed typo in post scriptlet(causing mishandling of DocBook - fixed typo in post scriptlet(causing mishandling of DocBook
4.4 and 4.5 DTDs,#453513) 4.4 and 4.5 DTDs,#453513)
* Wed Jul 09 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-37 * Wed Jul 09 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-37
- use full paths in xmlcatalog registration - use full paths in xmlcatalog registration
* Tue May 13 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-36 * Tue May 13 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-36
- changed License(#445008) - changed License(#445008)
* Mon Nov 26 2007 Ondrej Vasik <ovasik@redhat.com> - 1.0-35 * Mon Nov 26 2007 Ondrej Vasik <ovasik@redhat.com> - 1.0-35
- fixed bug causing typo in spec file(#397651) - fixed bug causing typo in spec file(#397651)

210
docbook-sgml-systemrewrite.patch Normal file
View File

@ -0,0 +1,210 @@
diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat
--- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
+++ docbook-dtds-1.0/3.0-sgml/docbook.cat 2009-02-05 16:48:58.000000000 +0100
@@ -30,6 +30,12 @@
SGMLDECL "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat
--- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
+++ docbook-dtds-1.0/3.1-sgml/docbook.cat 2009-02-05 16:56:51.000000000 +0100
@@ -22,6 +22,12 @@
SGMLDECL "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
+++ docbook-dtds-1.0/4.0-sgml/docbook.cat 2009-02-05 16:49:06.000000000 +0100
@@ -22,6 +22,12 @@
SGMLDECL "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
Binární soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou různé
diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
+++ docbook-dtds-1.0/4.1-sgml/docbook.cat 2009-02-05 16:49:27.000000000 +0100
@@ -22,6 +22,12 @@
SGMLDECL "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd"
+ "docbook.dtd"
+
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat 2000-08-27 17:19:42.000000000 +0200
+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-05 16:52:16.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat 2009-02-05 16:44:17.000000000 +0100
+++ docbook-dtds-1.0/4.2-sgml/docbook.cat 2009-02-05 16:50:10.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.2-xml/docbook.cat 2002-07-17 18:14:41.000000000 +0200
+++ docbook-dtds-1.0/4.2-xml/docbook.cat 2009-02-05 16:52:53.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
+++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2009-02-05 16:50:37.000000000 +0100
@@ -17,6 +17,13 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd"
+ "docbook.dtd"
+
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.3-xml/docbook.cat 2004-03-31 13:22:18.000000000 +0200
+++ docbook-dtds-1.0/4.3-xml/docbook.cat 2009-02-05 16:53:12.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
+++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2009-02-05 16:50:57.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.4-xml/docbook.cat 2005-01-27 14:57:19.000000000 +0100
+++ docbook-dtds-1.0/4.4-xml/docbook.cat 2009-02-05 16:53:30.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2006-10-03 15:27:50.000000000 +0200
+++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-05 16:51:22.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.5-xml/docbook.cat 2006-10-03 15:26:00.000000000 +0200
+++ docbook-dtds-1.0/4.5-xml/docbook.cat 2009-02-05 16:55:45.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"