CVS commit: pkgsrc/textproc/p5-XML-SAX

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Sep  7 17:21:34 UTC 2020

Modified Files:
        pkgsrc/textproc/p5-XML-SAX: Makefile distinfo
Added Files:
        pkgsrc/textproc/p5-XML-SAX/patches: patch-lib_XML_SAX_PurePerl.pm
Removed Files:
        pkgsrc/textproc/p5-XML-SAX/patches: patch-ab

Log Message:
p5-XML-SAX: update to 1.02.

1.02  14 Jun 2019  Grant McLean
    - Spelling fixes (patch from Ville Skyttä)
    - Add repo location to metadata (patches from Ville Skyttä & Martin McGrath)
    - Reorganise module files under lib/XML
    - Regenerate MANIFEST using 'make manifest' to include missing test files


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/textproc/p5-XML-SAX/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/p5-XML-SAX/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/p5-XML-SAX/patches/patch-ab
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/p5-XML-SAX/patches/patch-lib_XML_SAX_PurePerl.pm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/p5-XML-SAX/Makefile
diff -u pkgsrc/textproc/p5-XML-SAX/Makefile:1.47 pkgsrc/textproc/p5-XML-SAX/Makefile:1.48
--- pkgsrc/textproc/p5-XML-SAX/Makefile:1.47    Mon Aug 31 18:12:12 2020
+++ pkgsrc/textproc/p5-XML-SAX/Makefile Mon Sep  7 17:21:34 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2020/08/31 18:12:12 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2020/09/07 17:21:34 wiz Exp $
 
-DISTNAME=      XML-SAX-1.00
+DISTNAME=      XML-SAX-1.02
 PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    textproc perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=XML/}
 

Index: pkgsrc/textproc/p5-XML-SAX/distinfo
diff -u pkgsrc/textproc/p5-XML-SAX/distinfo:1.12 pkgsrc/textproc/p5-XML-SAX/distinfo:1.13
--- pkgsrc/textproc/p5-XML-SAX/distinfo:1.12    Tue Feb 20 09:58:50 2018
+++ pkgsrc/textproc/p5-XML-SAX/distinfo Mon Sep  7 17:21:34 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2018/02/20 09:58:50 wen Exp $
+$NetBSD: distinfo,v 1.13 2020/09/07 17:21:34 wiz Exp $
 
-SHA1 (XML-SAX-1.00.tar.gz) = 1151e38f305dd1362372c6f9834fae2200d90dbc
-RMD160 (XML-SAX-1.00.tar.gz) = 5c95ce88c83a2732c97f66459147e2b1e93745ca
-SHA512 (XML-SAX-1.00.tar.gz) = 95553c9693d8a310747b4b86d4e80a58d4056b18cfc334f6979c98d0e9034a34253bfb17daecfc5bb28b1bd65e6baf52136f5135a969fadba86aa4148ea9bc1d
-Size (XML-SAX-1.00.tar.gz) = 46808 bytes
+SHA1 (XML-SAX-1.02.tar.gz) = c8447c13391225a53a3a87353db840b2eb07e049
+RMD160 (XML-SAX-1.02.tar.gz) = 6f827524245cf82b38bd5ef11378d8c991141389
+SHA512 (XML-SAX-1.02.tar.gz) = bb30ddbbcf27803825d2f0936257e102999a197cb14bd77fa8b7a469f3a24fb7d861ef4eb03230e5581e4ed88beb8676cbb907b2cb63e9ef1a64b2c211ebdc5a
+Size (XML-SAX-1.02.tar.gz) = 47318 bytes
 SHA1 (patch-aa) = d474262178b0a36da51ed0cdfd56e75272f25d71
-SHA1 (patch-ab) = a1850ba4918732f58da4fb53b2cf07104182b96b
+SHA1 (patch-lib_XML_SAX_PurePerl.pm) = 69e8237ba254bbec5b3ae0af67ca2410fd391752

Added files:

Index: pkgsrc/textproc/p5-XML-SAX/patches/patch-lib_XML_SAX_PurePerl.pm
diff -u /dev/null pkgsrc/textproc/p5-XML-SAX/patches/patch-lib_XML_SAX_PurePerl.pm:1.1
--- /dev/null   Mon Sep  7 17:21:34 2020
+++ pkgsrc/textproc/p5-XML-SAX/patches/patch-lib_XML_SAX_PurePerl.pm    Mon Sep  7 17:21:34 2020
@@ -0,0 +1,39 @@
+$NetBSD: patch-lib_XML_SAX_PurePerl.pm,v 1.1 2020/09/07 17:21:34 wiz Exp $
+
+--- lib/XML/SAX/PurePerl.pm.orig       2019-06-14 01:57:58.000000000 +0000
++++ lib/XML/SAX/PurePerl.pm
+@@ -308,21 +308,27 @@ sub CDSect {
+     
+     $self->start_cdata({});
+     
+-    $data = $reader->data;
++    my $chars;
+     while (1) {
+-        $self->parser_error("EOF looking for CDATA section end", $reader)
+-            unless length($data);
++        # do not miss "]]>", so try to read at least 3 chars
++        $data = $reader->data(3);
++        $self->parser_error
++                ("EOF looking for CDATA section end", $reader)
++                unless length($data) >= 3;
+         
+         if ($data =~ /^(.*?)\]\]>/s) {
+-            my $chars = $1;
++            $chars = $1;
+             $reader->move_along(length($chars) + 3);
+             $self->characters({Data => $chars});
+             last;
+         }
+         else {
+-            $self->characters({Data => $data});
+-            $reader->move_along(length($data));
+-            $data = $reader->data;
++            # the last one or two "]" could be the beginning of a "]]>",
++            # so do no eat them
++            $data =~ /^(.*?)\]{0,2}+$/s;
++            $chars = $1;
++            $reader->move_along(length($chars));
++            $self->characters({Data => $chars});
+         }
+     }
+     $self->end_cdata({});