Update patch to fix whitespace handling in xpath regexps, bug #188114.

Package-Manager: portage-2.1.3.9

3 files changed, 42 insertions, 18 deletions

diff --git a/app-emacs/nxml-mode/ChangeLog b/app-emacs/nxml-mode/ChangeLog
index 5257f41a8fc8..4c416a65cc0d 100644
--- a/app-emacs/nxml-mode/ChangeLog
+++ b/app-emacs/nxml-mode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/nxml-mode
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.25 2007/09/09 10:00:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.26 2007/09/12 15:04:56 ulm Exp $
+
+  12 Sep 2007; Ulrich Mueller <ulm@gentoo.org>
+  files/nxml-mode-xmlschema-xpath.patch:
+  Update patch to fix whitespace handling in xpath regexps, bug #188114.
 
 *nxml-mode-20041004-r2 (09 Sep 2007)
 
diff --git a/app-emacs/nxml-mode/Manifest b/app-emacs/nxml-mode/Manifest
index c3ddc30b3014..61e0e100e994 100644
--- a/app-emacs/nxml-mode/Manifest
+++ b/app-emacs/nxml-mode/Manifest
@@ -9,10 +9,10 @@ AUX nxml-mode-info-gentoo.patch 412 RMD160 85cd39acefb9d0478d0ae93703788f9379672
 MD5 b6c0ed2561e83b43a58c2bd8cae88b55 files/nxml-mode-info-gentoo.patch 412
 RMD160 85cd39acefb9d0478d0ae93703788f9379672973 files/nxml-mode-info-gentoo.patch 412
 SHA256 482756e6a3f64f078839d4387f0847f9834130ed8ccf5e687c5d18e16a1d9c75 files/nxml-mode-info-gentoo.patch 412
-AUX nxml-mode-xmlschema-xpath.patch 1681 RMD160 ebbd07cf8a9eee9f20ef6d6a76c207eeedffba37 SHA1 2d46a5388044a5821112cad886dd9cda80e3b3c7 SHA256 147be365b3e6330ab7169e50c55cf4d2329b24dab0bb36b6d95e7804e1009353
-MD5 115e2dff6862926d3fa7fd29fc265748 files/nxml-mode-xmlschema-xpath.patch 1681
-RMD160 ebbd07cf8a9eee9f20ef6d6a76c207eeedffba37 files/nxml-mode-xmlschema-xpath.patch 1681
-SHA256 147be365b3e6330ab7169e50c55cf4d2329b24dab0bb36b6d95e7804e1009353 files/nxml-mode-xmlschema-xpath.patch 1681
+AUX nxml-mode-xmlschema-xpath.patch 2410 RMD160 26268357c40fe5f1132fbdc4a8e1b1c7663e76d3 SHA1 b05b47bb96af3a44f17b437339174bb2f373830d SHA256 9137f3d5754399acfc0c75c54af0f2db030fd4f7eb81276558afa42da91f9ec5
+MD5 9141738ab898b289c4a16cd786742014 files/nxml-mode-xmlschema-xpath.patch 2410
+RMD160 26268357c40fe5f1132fbdc4a8e1b1c7663e76d3 files/nxml-mode-xmlschema-xpath.patch 2410
+SHA256 9137f3d5754399acfc0c75c54af0f2db030fd4f7eb81276558afa42da91f9ec5 files/nxml-mode-xmlschema-xpath.patch 2410
 AUX xsd-regexp.el.2006-01-26.patch 768 RMD160 b9e2d5873377365898218bbc8887553d699ff5ac SHA1 2d1d28a85b675ece6e4bd63632a373e5cf4d9fca SHA256 b2bb3df2b735ffef1ca7409af8231cba8b163e6a3b8ab7c88f77aa1d0773dcd6
 MD5 a8173e46710e3c4092ee1115c21c3482 files/xsd-regexp.el.2006-01-26.patch 768
 RMD160 b9e2d5873377365898218bbc8887553d699ff5ac files/xsd-regexp.el.2006-01-26.patch 768
@@ -31,10 +31,10 @@ EBUILD nxml-mode-20041004.ebuild 1150 RMD160 9e5295c7470248313ee7e1ee9b09ff48f8d
 MD5 a0a381a6a30b91702c4beaffae0780ad nxml-mode-20041004.ebuild 1150
 RMD160 9e5295c7470248313ee7e1ee9b09ff48f8d20631 nxml-mode-20041004.ebuild 1150
 SHA256 0c87108e29ecf8c6ce19e10d92fdcf7d56096430fc43a400d408ffb120ba8449 nxml-mode-20041004.ebuild 1150
-MISC ChangeLog 3622 RMD160 b4b41d6a3b4ece4f739cdb1b718f50fedce0276c SHA1 be08e7b03657e4b5581101e8c99add4f3116669b SHA256 9470cbab1f89e36738ab6b00c86d7ce0418a645d6b2c476ca97df9fdb2063545
-MD5 927ee456bcce27a3407c577ae7e4785a ChangeLog 3622
-RMD160 b4b41d6a3b4ece4f739cdb1b718f50fedce0276c ChangeLog 3622
-SHA256 9470cbab1f89e36738ab6b00c86d7ce0418a645d6b2c476ca97df9fdb2063545 ChangeLog 3622
+MISC ChangeLog 3784 RMD160 66f9b82cbdd3998431165a12cf2f6054ad1c093a SHA1 c49683782ba329c95dffa4ad6ae93028f540c88e SHA256 7458c0054a2c3e612950b6f113d66120c5f47104f7b485e890f62a8327134feb
+MD5 85b90a43de49dd21ab997f295c21eab3 ChangeLog 3784
+RMD160 66f9b82cbdd3998431165a12cf2f6054ad1c093a ChangeLog 3784
+SHA256 7458c0054a2c3e612950b6f113d66120c5f47104f7b485e890f62a8327134feb ChangeLog 3784
 MISC metadata.xml 420 RMD160 5b5de5a4392980dacfad737f6e4dae478317ecef SHA1 4abf6b71618f34d7358329761a18f741cbd151e1 SHA256 81071efdca44f52f577f8c0b698e54546d95b84240602b946e41aba3b869af32
 MD5 103177d81841ac7a82af69df80b2fa31 metadata.xml 420
 RMD160 5b5de5a4392980dacfad737f6e4dae478317ecef metadata.xml 420
@@ -51,7 +51,7 @@ SHA256 cd61c99b668487d3839fafb5c881f1b38ba6dba0e3fbfb6b631215103394edfc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG48Q8Oeoy/oIi7uwRAjr6AJ0So5PAzu6Vm/uamS/HL4X3mukBjgCggq7B
-2WFCqGKzwGxJ2HEv7yLj4F8=
-=949C
+iD8DBQFG6AAnOeoy/oIi7uwRAtIXAJ44dHnqWWfruypuDsmK53Ff1EHo/QCdEpLK
+DV0CdOL6s3BS/i2nE4wVPCs=
+=eg+t
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/nxml-mode/files/nxml-mode-xmlschema-xpath.patch b/app-emacs/nxml-mode/files/nxml-mode-xmlschema-xpath.patch
index b1a00240bc47..97d81a7950f0 100644
--- a/app-emacs/nxml-mode/files/nxml-mode-xmlschema-xpath.patch
+++ b/app-emacs/nxml-mode/files/nxml-mode-xmlschema-xpath.patch
@@ -1,13 +1,33 @@
---- nxml-mode-20041004-orig/schema/xmlschema.rnc	2007-09-09 11:50:06.000000000 +0200
-+++ nxml-mode-20041004/schema/xmlschema.rnc	2007-09-09 11:50:19.000000000 +0200
+Avoid size limit for xpath regular expressions by using two patterns.
+See https://bugs.gentoo.org/show_bug.cgi?id=188114 for discussion
+and references.
+The following bash script will recreate the long patterns:
+
+S="\\s*"
+NCName='[^./|:*@\s]+'
+QName="${NCName}:${NCName}"
+NameTest="(child::${S})?(${NCName}:)?(${NCName}|\\*)"
+Step="${S}(\\.|${NameTest})${S}"
+Path="(${S}\\.${S}//)?${Step}(/${Step})*"
+Selector="${Path}(\\|${Path})*"
+echo "selector: ${Selector}"
+LastStep="${Step}|${S}(@|attribute::)${S}${NameTest}${S}"
+Path="(${S}\\.${S}//)?(${Step}/)*(${LastStep})"
+Selector="${Path}(\\|${Path})*"
+echo "field: ${Selector}"
+
+2007-09-12 Martin von Gagern <Martin.vGagern@gmx.net>
+
+--- nxml-mode-20041004.orig/schema/xmlschema.rnc	2007-08-10 01:56:18.000000000 +0200
++++ nxml-mode-20041004/schema/xmlschema.rnc	2007-09-12 11:31:26.000000000 +0200
 @@ -809,8 +809,9 @@
      annotated,
      attribute xpath {
        xsd:token {
-+        pattern = "[./|:*@]*([^\I:][^\C:]*[./|:*@]+)*([^\I:][^\C:]*)?"
++        pattern = "[./|:*@\s]*([^\I:][^\C:]*[./|:*@\s]+)*([^\I:][^\C:]*)?"
          pattern =
 -          "(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*"
-+          "(\s*\.\s*//)?\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*(/\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*)*(\|(\s*\.\s*//)?\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*(/\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*)*)*"
++          "(\s*\.\s*//)?\s*(\.|(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*))\s*(/\s*(\.|(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*))\s*)*(\|(\s*\.\s*//)?\s*(\.|(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*))\s*(/\s*(\.|(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*))\s*)*)*"
        }
      }
    }
@@ -15,10 +35,10 @@
      annotated,
      attribute xpath {
        xsd:token {
-+        pattern = "[./|:*@]*([^\I:][^\C:]*[./|:*@]+)*([^\I:][^\C:]*)?"
++        pattern = "[./|:*@\s]*([^\I:][^\C:]*[./|:*@\s]+)*([^\I:][^\C:]*)?"
          pattern =
 -          "(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*))))(\|(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*)))))*"
-+          "(\s*\.\s*//)?(\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*/)*(\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*|\s*(@|attribute::)\s*(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*)\s*)(\|(\s*\.\s*//)?(\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*/)*(\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*|\s*(@|attribute::)\s*(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*)\s*))*"
++          "(\s*\.\s*//)?(\s*(\.|(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*))\s*/)*(\s*(\.|(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*))\s*|\s*(@|attribute::)\s*(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*)\s*)(\|(\s*\.\s*//)?(\s*(\.|(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*))\s*/)*(\s*(\.|(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*))\s*|\s*(@|attribute::)\s*(child::\s*)?([^./|:*@\s]+:)?([^./|:*@\s]+|\*)\s*))*"
        }
      }
    }