r38342 - in /trunk/libhtml-parser-perl: Changes META.yml Parser.pm TODO debian/changelog debian/control debian/copyright debian/patches/fix_hanchors_description.patch debian/patches/series debian/rules eg/hanchors hparser.c t/skipped-text.t

carnil-guest at users.alioth.debian.org carnil-guest at users.alioth.debian.org
Sun Jun 21 15:00:47 UTC 2009


Author: carnil-guest
Date: Sun Jun 21 15:00:41 2009
New Revision: 38342

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=38342
Log:
* New upstream release
* Bump Standards-Version to 3.8.2 (no changes) 
* Use minimal debian/rules and adjust Build-Depends for debhelper and quilt
  to required versions. 
* Adjust copyright information for debian/* 
* Drop patch fix_hanchors_description.patch (fixed upstream). 
* Add myself to Uploaders. 

Removed:
    trunk/libhtml-parser-perl/debian/patches/fix_hanchors_description.patch
Modified:
    trunk/libhtml-parser-perl/Changes
    trunk/libhtml-parser-perl/META.yml
    trunk/libhtml-parser-perl/Parser.pm
    trunk/libhtml-parser-perl/TODO
    trunk/libhtml-parser-perl/debian/changelog
    trunk/libhtml-parser-perl/debian/control
    trunk/libhtml-parser-perl/debian/copyright
    trunk/libhtml-parser-perl/debian/patches/series
    trunk/libhtml-parser-perl/debian/rules
    trunk/libhtml-parser-perl/eg/hanchors
    trunk/libhtml-parser-perl/hparser.c
    trunk/libhtml-parser-perl/t/skipped-text.t

Modified: trunk/libhtml-parser-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/Changes?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/Changes (original)
+++ trunk/libhtml-parser-perl/Changes Sun Jun 21 15:00:41 2009
@@ -1,3 +1,18 @@
+_______________________________________________________________________________
+2009-06-20  Release 3.61
+
+Gisle Aas (2):
+      Test that triggers the crash that Chip fixed
+      Complete documented list of literal tags
+
+Chip Salzenberg (1):
+      Avoid crash (referenced pend_text instead of skipped_text)
+
+Antonio Radici (1):
+      Reference HTML::LinkExttor [RT#43164]
+
+
+
 _______________________________________________________________________________
 2009-02-09  Release 3.60
 

Modified: trunk/libhtml-parser-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/META.yml?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/META.yml (original)
+++ trunk/libhtml-parser-perl/META.yml Sun Jun 21 15:00:41 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               HTML-Parser
-version:            3.60
+version:            3.61
 abstract:           HTML parser class
 author:
     - Gisle Aas <gisle at activestate.com>

Modified: trunk/libhtml-parser-perl/Parser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/Parser.pm?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/Parser.pm (original)
+++ trunk/libhtml-parser-perl/Parser.pm Sun Jun 21 15:00:41 2009
@@ -9,7 +9,7 @@
 use strict;
 use vars qw($VERSION @ISA);
 
-$VERSION = "3.60";
+$VERSION = "3.61";
 
 require HTML::Entities;
 
@@ -690,7 +690,7 @@
 Dtext causes the decoded text to be passed.  General entities are
 automatically decoded unless the event was inside a CDATA section or
 was between literal start and end tags (C<script>, C<style>,
-C<xmp>, C<iframe> and C<plaintext>).
+C<xmp>, C<iframe>, C<title>, C<textarea> and C<plaintext>).
 
 The Unicode character set is assumed for entity decoding.  With Perl
 version 5.6 or earlier only the Latin-1 range is supported, and
@@ -709,7 +709,7 @@
 
 Is_cdata causes a TRUE value to be passed if the event is inside a CDATA
 section or between literal start and end tags (C<script>,
-C<style>, C<xmp>, C<iframe> and C<plaintext>).
+C<style>, C<xmp>, C<iframe>, C<title>, C<textarea> and C<plaintext>).
 
 if the flag is FALSE for a text event, then you should normally
 either use C<dtext> or decode the entities yourself before the text is

Modified: trunk/libhtml-parser-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/TODO?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/TODO (original)
+++ trunk/libhtml-parser-perl/TODO Sun Jun 21 15:00:41 2009
@@ -7,7 +7,8 @@
  - implement backslash escapes in literal argspec string
  - <![%app1;[...]]> (parameter entities)
  - make literal tags configurable.  The current list is hardcoded
-   to be ""script", "style", "title", "textarea", "xmp", and "plaintext".
+   to be "script", "style", "title", "iframe", "textarea", "xmp",
+   and "plaintext".
 
 SGML FEATURES WE WILL PROBABLY IGNORE FOREVER
  - Empty tags: <> </>  (repeat previous start tag)

Modified: trunk/libhtml-parser-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/debian/changelog?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/debian/changelog (original)
+++ trunk/libhtml-parser-perl/debian/changelog Sun Jun 21 15:00:41 2009
@@ -1,4 +1,4 @@
-libhtml-parser-perl (3.60-2) UNRELEASED; urgency=low
+libhtml-parser-perl (3.61-1) unstable; urgency=low
 
   [ gregor herrmann ]
   * Remove Florian Ragwitz from Uploaders (closes: #523284).
@@ -6,7 +6,16 @@
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- gregor herrmann <gregoa at debian.org>  Thu, 09 Apr 2009 16:07:57 +0200
+  [ Salvatore Bonaccorso ]
+  * New upstream release
+  * Bump Standards-Version to 3.8.2 (no changes) 
+  * Use minimal debian/rules and adjust Build-Depends for debhelper and quilt
+    to required versions. 
+  * Adjust copyright information for debian/* 
+  * Drop patch fix_hanchors_description.patch (fixed upstream). 
+  * Add myself to Uploaders. 
+
+ -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>  Sun, 21 Jun 2009 16:46:01 +0200
 
 libhtml-parser-perl (3.60-1) unstable; urgency=low
 

Modified: trunk/libhtml-parser-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/debian/control?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/debian/control (original)
+++ trunk/libhtml-parser-perl/debian/control Sun Jun 21 15:00:41 2009
@@ -4,12 +4,13 @@
  Kenneth J. Pronovici <pronovic at debian.org>,
  Damyan Ivanov <dmn at debian.org>,
  Antonio Radici <antonio at dyne.org>,
- Rene Mayorga <rmayorga at debian.org>
+ Rene Mayorga <rmayorga at debian.org>,
+ Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), perl (>= 5.8.1), libhtml-tagset-perl,
- libtest-pod-perl, liburi-perl, quilt
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.8), perl (>= 5.8.1), libhtml-tagset-perl,
+ libtest-pod-perl, liburi-perl, quilt (>= 0.46-7)
+Standards-Version: 3.8.2
 Homepage: http://search.cpan.org/dist/HTML-Parser/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-parser-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhtml-parser-perl/

Modified: trunk/libhtml-parser-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/debian/copyright?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/debian/copyright (original)
+++ trunk/libhtml-parser-perl/debian/copyright Sun Jun 21 15:00:41 2009
@@ -14,7 +14,8 @@
 Copyright: © 1998-2001 Michael Alan Dorman <mdorman at debian.org>
            © 2003-2005 Kenneth J. Pronovici <pronovic at debian.org>
 	   © 2005-2007 Krzysztof Krzyzaniak (eloy) <eloy at debian.org> 
-	   © 2008 Damyan Ivanov <dmn at debian.org> 
+	   © 2008 Damyan Ivanov <dmn at debian.org>
+	   © 2009 Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com> 
 License: Artistic | GPL-1+
 
 License: Artistic

Modified: trunk/libhtml-parser-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/debian/patches/series?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/debian/patches/series (original)
+++ trunk/libhtml-parser-perl/debian/patches/series Sun Jun 21 15:00:41 2009
@@ -1,2 +1,1 @@
 debian_examples_location.patch
-fix_hanchors_description.patch

Modified: trunk/libhtml-parser-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/debian/rules?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/debian/rules (original)
+++ trunk/libhtml-parser-perl/debian/rules Sun Jun 21 15:00:41 2009
@@ -1,25 +1,4 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh build
-	touch $@
-
-clean: unpatch
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch: install
-	dh $@
-
-binary-indep:
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
+%:
+	dh --with quilt $@

Modified: trunk/libhtml-parser-perl/eg/hanchors
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/eg/hanchors?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/eg/hanchors (original)
+++ trunk/libhtml-parser-perl/eg/hanchors Sun Jun 21 15:00:41 2009
@@ -2,6 +2,8 @@
 
 # This program will print out all <a href=".."> links in a
 # document together with the text that goes with it.
+#
+# See also HTML::LinkExtor
 
 use HTML::Parser;
 

Modified: trunk/libhtml-parser-perl/hparser.c
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/hparser.c?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/hparser.c (original)
+++ trunk/libhtml-parser-perl/hparser.c Sun Jun 21 15:00:41 2009
@@ -658,7 +658,7 @@
 	else {
 	    SV *tmp = newSVpvn(beg, end - beg);
 	    sv_utf8_upgrade(tmp);
-	    sv_catsv(p_state->pend_text, tmp);
+	    sv_catsv(p_state->skipped_text, tmp);
 	    SvREFCNT_dec(tmp);
 	}
 #endif

Modified: trunk/libhtml-parser-perl/t/skipped-text.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-parser-perl/t/skipped-text.t?rev=38342&op=diff
==============================================================================
--- trunk/libhtml-parser-perl/t/skipped-text.t (original)
+++ trunk/libhtml-parser-perl/t/skipped-text.t Sun Jun 21 15:00:41 2009
@@ -1,4 +1,4 @@
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 use strict;
 use HTML::Parser;
@@ -72,3 +72,18 @@
 #diag join(":", @x);
 is(join(":", @x), "X::a a:X:<a>:b bc c:X:<x>:d de:Y:");
 
+#
+# The crash that Chip found
+#
+
+my $skipped;
+$p = HTML::Parser->new(
+    ignore_tags => ["foo"],
+    start_h => [sub {$skipped = shift}, "skipped_text"],
+);
+
+$p->parse("\x{100}<foo>");
+$p->parse("plain");
+$p->parse("<bar>");
+$p->eof;
+is($skipped, "\x{100}<foo>plain");




More information about the Pkg-perl-cvs-commits mailing list