[pycsw] 06/07: Drop libxml2-xee.patch, applied upstream. Refresh remaining patches.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Jan 24 20:32:08 UTC 2016 

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pycsw.

commit 20831db761baabd512e9f2a3132573a075b9fbd0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 31 21:34:36 2015 +0100

    Drop libxml2-xee.patch, applied upstream. Refresh remaining patches.
---
 debian/changelog                                   |  1 +
 debian/patches/0001-Remove-google-analytics.patch  |  2 -
 .../0002-Remove-externally-linked-files.patch      |  4 +-
 ...look-for-configuration-in-correct-etc-pat.patch |  2 -
 ...g-open-instead-of-firefox-in-desktop-file.patch |  2 -
 ...5-Set-default-configuration-path-for-wsgi.patch |  2 -
 ...n-t-include-external-references-to-images.patch | 20 ++++-----
 debian/patches/libxml2-xee.patch                   | 51 ----------------------
 debian/patches/series                              |  1 -
 9 files changed, 11 insertions(+), 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dae0a55..98559b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pycsw (1.10.3+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop libxml2-xee.patch, applied upstream. Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 31 Oct 2015 21:23:22 +0100
 
diff --git a/debian/patches/0001-Remove-google-analytics.patch b/debian/patches/0001-Remove-google-analytics.patch
index 7358ea5..8d5d509 100644
--- a/debian/patches/0001-Remove-google-analytics.patch
+++ b/debian/patches/0001-Remove-google-analytics.patch
@@ -6,8 +6,6 @@ Subject: Remove google analytics
  docs/_templates/layout.html | 15 ---------------
  1 file changed, 15 deletions(-)
 
-diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
-index 631e4ee..0a95a9d 100644
 --- a/docs/_templates/layout.html
 +++ b/docs/_templates/layout.html
 @@ -3,21 +3,6 @@
diff --git a/debian/patches/0002-Remove-externally-linked-files.patch b/debian/patches/0002-Remove-externally-linked-files.patch
index 88941d5..a085edf 100644
--- a/debian/patches/0002-Remove-externally-linked-files.patch
+++ b/debian/patches/0002-Remove-externally-linked-files.patch
@@ -7,8 +7,6 @@ W3C and jquery
  tests/index.html | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/tests/index.html b/tests/index.html
-index 936fc72..ec7d095 100644
 --- a/tests/index.html
 +++ b/tests/index.html
 @@ -15,7 +15,7 @@
@@ -20,7 +18,7 @@ index 936fc72..ec7d095 100644
          <script type="text/javascript">
              $(document).ready(function() {
                  $('.xml').change(function() {
-@@ -359,8 +359,6 @@
+@@ -362,8 +362,6 @@
              </ul>
          <hr/>
          <footer>
diff --git a/debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch b/debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
index af1f294..966cac9 100644
--- a/debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
+++ b/debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
@@ -6,8 +6,6 @@ Subject: Make pycsw look for configuration in correct /etc path
  csw.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/csw.py b/csw.py
-index 79fb7a7..e623c6e 100755
 --- a/csw.py
 +++ b/csw.py
 @@ -36,7 +36,7 @@ import sys
diff --git a/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch b/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
index 37ce556..16218c6 100644
--- a/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
+++ b/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
@@ -6,8 +6,6 @@ Subject: Use xdg-open instead of firefox in desktop file
  etc/pycsw.desktop | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/etc/pycsw.desktop b/etc/pycsw.desktop
-index 5c5b5f7..cdbe940 100644
 --- a/etc/pycsw.desktop
 +++ b/etc/pycsw.desktop
 @@ -4,7 +4,7 @@ Encoding=UTF-8
diff --git a/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch b/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch
index 1c861c1..93ee074 100644
--- a/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch
+++ b/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch
@@ -6,8 +6,6 @@ Subject: Set default configuration path for wsgi
  csw.wsgi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/csw.wsgi b/csw.wsgi
-index ca9ac1f..d6d31f1 100644
 --- a/csw.wsgi
 +++ b/csw.wsgi
 @@ -64,7 +64,7 @@ from pycsw import server
diff --git a/debian/patches/0006-Don-t-include-external-references-to-images.patch b/debian/patches/0006-Don-t-include-external-references-to-images.patch
index 0098edd..ddcdeb2 100644
--- a/debian/patches/0006-Don-t-include-external-references-to-images.patch
+++ b/debian/patches/0006-Don-t-include-external-references-to-images.patch
@@ -6,26 +6,24 @@ Subject: Don't include external references to images
  docs/_templates/indexsidebar.html | 9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)
 
-diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
-index fabcb43..a1bde77 100644
 --- a/docs/_templates/indexsidebar.html
 +++ b/docs/_templates/indexsidebar.html
-@@ -1,15 +1,12 @@
--<p>
--    <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1104"><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Serv [...]
--</p>
- 
+@@ -1,15 +1,11 @@
  <p>
--    <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1104"><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Serv [...]
+-    <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1104"><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Serv [...]
 +    <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1104"><span title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue S [...]
  </p>
  
  <p>
--    <a title="OSGeo Project in Incubation" href="https://github.com/geopython/pycsw/wiki/OSGeo-Incubation"><img alt="OSGeo Project in Incubation" src="http://svn.osgeo.org/osgeo/marketing/logo/png8/150/OSGeo_incubation.png" height="64"/></a>
-+    <a title="OSGeo Project in Incubation" href="https://github.com/geopython/pycsw/wiki/OSGeo-Incubation">OSGeo Project in Incubation</a>
+-    <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1104"><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Serv [...]
++    <a title="OSGeo Project" href="http://osgeo.org">OSGeo Project</a>
  </p>
  
  <p>
+-    <img alt="OSGeo Project" src="http://svn.osgeo.org/osgeo/marketing/logo/png8/150/OSGeo_project.png" height="64"/>
+-</p>
+-
+-<p>
 -    <script type="text/javascript" src="https://www.openhub.net/p/488022/widgets/project_thin_badge.js"></script> 
-+<a href="https://www.openhub.net/p/pycsw">Open HUB</a> 
++    <a href="https://www.openhub.net/p/pycsw">Open HUB</a>
  </p>
diff --git a/debian/patches/libxml2-xee.patch b/debian/patches/libxml2-xee.patch
deleted file mode 100644
index ccb7b0e..0000000
--- a/debian/patches/libxml2-xee.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Fixing libxml < 2.9 xee vulnerability
- .
- pycsw (1.10.1+dfsg-2~trusty1) trusty; urgency=medium
- .
-   * Fixed libxml < 2.9 XEE vulnerability
-Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- a/pycsw/admin.py
-+++ b/pycsw/admin.py
-@@ -556,7 +556,7 @@ def validate_xml(xml, xsd):
-     LOGGER.info('Validating %s against schema %s', xml, xsd)
- 
-     schema = etree.XMLSchema(file=xsd)
--    parser = etree.XMLParser(schema=schema)
-+    parser = etree.XMLParser(schema=schema, resolve_entities=False)
- 
-     try:
-         valid = etree.parse(xml, parser)
---- a/pycsw/server.py
-+++ b/pycsw/server.py
-@@ -1285,7 +1285,7 @@ class Csw(object):
-                         LOGGER.debug('Validating Filter %s.' %
-                         self.kvp['constraint'])
-                         schema = etree.XMLSchema(file=schema)
--                        parser = etree.XMLParser(schema=schema)
-+                        parser = etree.XMLParser(schema=schema, resolve_entities=False)
-                         doc = etree.fromstring(self.kvp['constraint'], parser)
-                         LOGGER.debug('Filter is valid XML.')
-                         self.kvp['constraint'] = {}
-@@ -1976,7 +1976,7 @@ class Csw(object):
- 
-                 LOGGER.debug('Validating %s.' % postdata)
-                 schema = etree.XMLSchema(file=schema)
--                parser = etree.XMLParser(schema=schema)
-+                parser = etree.XMLParser(schema=schema, resolve_entities=False)
-                 if hasattr(self, 'soap') and self.soap:
-                 # validate the body of the SOAP request
-                     doc = etree.fromstring(etree.tostring(doc), parser)
diff --git a/debian/patches/series b/debian/patches/series
index 5baf84c..a92dfd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
 0005-Set-default-configuration-path-for-wsgi.patch
 0006-Don-t-include-external-references-to-images.patch
-libxml2-xee.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.git

More information about the Pkg-grass-devel mailing list