r54800 - /trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch

[dottedmag-guest at users.alioth.debian.org]

Author: dottedmag-guest
Date: Fri Mar 26 06:31:33 2010
New Revision: 54800

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54800
Log:
Update patch fixing https://rt.cpan.org/Public/Bug/Display.html?id=50060

Modified:
    trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch

Modified: trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch?rev=54800&op=diff
==============================================================================
--- trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch (original)
+++ trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch Fri Mar 26 06:31:33 2010
@@ -1,9 +1,6 @@
-- Adds NoExpand option to avoid expanding entities in XML files
-- Adds ErrorContext option to allow better reporting of error locations.
-Origin: Fedora
-Status: to be submitted upstream
---- a/Changes
-+++ b/Changes
+diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/Changes XML-TreeBuilder-patched/Changes
+--- XML-TreeBuilder-3.09/Changes	2004-06-11 14:28:41.000000000 +1000
++++ XML-TreeBuilder-patched/Changes	2009-03-16 14:30:51.000000000 +1000
 @@ -1,5 +1,10 @@
 -# Time-stamp: "2004-06-10 20:28:41 ADT"
 +2009-16-03 Jeff Fearn <jfearn at redhat.com>
@@ -16,9 +13,10 @@
  
  2004-06-10   Sean M. Burke <sburke at cpan.org>
  
---- a/lib/XML/TreeBuilder.pm
-+++ b/lib/XML/TreeBuilder.pm
-@@ -5,6 +5,7 @@
+diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
+--- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm	2004-06-11 13:59:14.000000000 +1000
++++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-29 09:21:18.000000000 +1000
+@@ -5,6 +7,7 @@
  use strict;
  use XML::Element ();
  use XML::Parser ();
@@ -26,7 +24,7 @@
  use vars qw(@ISA $VERSION);
  
  $VERSION = '3.09';
-@@ -12,8 +13,15 @@
+@@ -12,8 +15,15 @@
  
  #==========================================================================
  sub new {
@@ -35,7 +33,7 @@
 +    my ( $this, $arg ) = @_;
 +    my $class = ref($this) || $this;
 +
-+    my $NoExpand = ( delete $arg->{'NoExpand'} || undef );
++    my $NoExpand     = ( delete $arg->{'NoExpand'}     || undef );
 +    my $ErrorContext = ( delete $arg->{'ErrorContext'} || undef );
 +
 +    if ( %{$arg} ) {
@@ -44,7 +42,7 @@
    
    my $self = XML::Element->new('NIL');
    bless $self, $class; # and rebless
-@@ -21,44 +29,51 @@
+@@ -21,57 +31,76 @@
    $self->{'_store_comments'}     = 0;
    $self->{'_store_pis'}          = 0;
    $self->{'_store_declarations'} = 0;
@@ -111,7 +109,20 @@
         return;
      },
      
-@@ -67,11 +82,11 @@
++            'Final' => sub {
++                $self->root()->traverse(
++                    sub {
++                        my ( $node, $start ) = @_;
++                        if ( ref $node ) {    # it's an element
++                            $node->attr( 'NoExpand',     undef );
++                            $node->attr( 'ErrorContext', undef );
++                        }
++                    }
++                );
++            },
++
+     # And now, declarations:
+     
      'Attlist' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -128,7 +139,7 @@
           )
         );
         return;
-@@ -80,11 +95,11 @@
+@@ -80,11 +109,11 @@
      'Element' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -145,7 +156,7 @@
           )
         );
         return;
-@@ -93,32 +108,47 @@
+@@ -93,17 +122,32 @@
      'Doctype' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -184,6 +195,7 @@
    
    return $self;
  }
+@@ -110,15 +155,15 @@
  #==========================================================================
  sub _elem # universal accessor...
  {
@@ -203,8 +215,9 @@
  
  #==========================================================================
  
---- a/t/10main.t
-+++ b/t/10main.t
+diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
+--- XML-TreeBuilder-3.09/t/10main.t	2009-09-28 14:00:50.000000000 +1000
++++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 14:00:54.000000000 +1000
 @@ -2,7 +2,7 @@
  # Time-stamp: "2004-06-10 20:22:53 ADT" 
  
@@ -224,7 +237,7 @@
  
  unless( $ENV{'HARNESS_ACTIVE'} ) {
    $x->dump;
-@@ -45,6 +44,28 @@
+@@ -43,6 +44,27 @@
  $x->delete;
  $y->delete;
  
@@ -239,7 +252,6 @@
 +
 +$y = XML::Element->new_from_lol(
 + ['Gee',
-+   { 'NoExpand' => "1", 'ErrorContext' => "2" },
 +   ['~comment', {'text' => ' myorp '}],
 +   ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'],
 +   ['lor'],