[libxml-xpath-perl] 09/11: Make xpath work without internet connection

[Axel Beckert]

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

abe pushed a commit to branch master
in repository libxml-xpath-perl.

commit 73ce1ae2d85b4f62441262490cbff9411678ce29
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Jan 16 00:03:47 2016 +0100

    Make xpath work without internet connection
    
    Patch by Niko Tyni.
    
    Closes: #337584
---
 debian/changelog                                   |  2 +
 debian/patches/series                              |  1 +
 ...ption-to-work-without-internet-connection.patch | 75 ++++++++++++++++++++++
 3 files changed, 78 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 600580d..73f5bb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ libxml-xpath-perl (1.22-1) UNRELEASED; urgency=low
     broken stringification as suggested by Niko Tyni. (Closes: #315628)
   * Add patch (plus test, yay!) by Niko Tyni to make "and" in XPath
     commutative. (Closes: #187583)
+  * Add patch by Niko Tyni to make xpath work without internet
+    connection. (Closes: #337584)
 
   [ gregor herrmann ]
   * Strip trailing slash from metacpan URLs.
diff --git a/debian/patches/series b/debian/patches/series
index 79e4f4a..21b65ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ example.patch
 test.patch
 fix-stringification-overload.patch
 make-and-commutative.patch
+xpath-option-to-work-without-internet-connection.patch
diff --git a/debian/patches/xpath-option-to-work-without-internet-connection.patch b/debian/patches/xpath-option-to-work-without-internet-connection.patch
new file mode 100644
index 0000000..8677c8e
--- /dev/null
+++ b/debian/patches/xpath-option-to-work-without-internet-connection.patch
@@ -0,0 +1,75 @@
+Description: Make xpath work without internet connection
+Bug-Debian: https://bugs.debian.org/337584
+Author: Niko Tyni <ntyni at debian.org>
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?filename=xpath-external.patch;msg=42;bug=337584;att=1
+
+Index: libxml-xpath-perl/examples/xpath
+===================================================================
+--- libxml-xpath-perl.orig/examples/xpath	2016-01-15 23:57:26.985257542 +0100
++++ libxml-xpath-perl/examples/xpath	2016-01-15 23:59:41.125018246 +0100
+@@ -37,6 +37,11 @@
+ 			shift;
+ 			last OPTIONS;
+ 		}
++		if ($ARGV[0] eq "-n") {
++			$XML::XPath::ParseParamEnt = 0;
++			shift;
++			last OPTIONS;
++		}
+ 		print STDERR "Unknown option ignore: ", shift;
+ 	}
+ }
+@@ -55,6 +60,7 @@
+ 	-q		quiet. Only output the resulting PATH
+ 	-s suffix	use suffix instead of linefeed.
+ 	-p postfix	use prefix instead of nothing.
++	-n		Don't use an external DTD.
+ );
+ 	exit;
+ }
+@@ -131,7 +137,7 @@
+ 
+ =head1 SYNOPSIS
+ 
+-B<xpath [-s suffix] [-p prefix] [-q] -e query [-e query] ... [file] ...>
++B<xpath [-s suffix] [-p prefix] [-n] [-q] -e query [-e query] ... [file] ...>
+ 
+ =head1 DESCRIPTION
+ 
+@@ -154,6 +160,11 @@
+ 
+ Be quiet. Output only errors (and no separator) on stderr.
+ 
++=head2 B<-e>
++
++Never use an external DTD, ie. instantiate the XML::Parser module
++with 'ParseParamEnt => 0'.
++
+ =head2 B<-s suffix>
+ 
+ Place C<suffix> at the end of each entry. Default is a linefeed.
+Index: libxml-xpath-perl/lib/XML/XPath.pm
+===================================================================
+--- libxml-xpath-perl.orig/lib/XML/XPath.pm	2016-01-15 22:09:20.320815980 +0100
++++ libxml-xpath-perl/lib/XML/XPath.pm	2016-01-15 23:59:41.125018246 +0100
+@@ -15,6 +15,7 @@
+ 
+ $VERSION = '1.22';
+ $XML::XPath::Namespaces = 1;
++$XML::XPath::ParseParamEnt = 1;
+ $XML::XPath::Debug = 0;
+ 
+ use Data::Dumper;
+Index: libxml-xpath-perl/lib/XML/XPath/XMLParser.pm
+===================================================================
+--- libxml-xpath-perl.orig/lib/XML/XPath/XMLParser.pm	2016-01-15 22:09:20.328815966 +0100
++++ libxml-xpath-perl/lib/XML/XPath/XMLParser.pm	2016-01-15 23:59:41.125018246 +0100
+@@ -53,7 +53,7 @@
+ 
+     my $parser = $self->get_parser || XML::Parser->new(
+             ErrorContext => 2,
+-            ParseParamEnt => 1,
++            ParseParamEnt => $XML::XPath::ParseParamEnt,
+             );
+ 
+     $parser->setHandlers(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libxml-xpath-perl.git