Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-xml-conduit for openSUSE:Factory
checked in at 2023-06-22 23:25:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-xml-conduit (Old)
and /work/SRC/openSUSE:Factory/.ghc-xml-conduit.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-xml-conduit"
Thu Jun 22 23:25:39 2023 rev:12 rq:1094456 version:1.9.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-xml-conduit/ghc-xml-conduit.changes
2023-04-04 21:25:14.742836573 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-xml-conduit.new.15902/ghc-xml-conduit.changes
2023-06-22 23:26:12.473886502 +0200
@@ -1,0 +2,7 @@
+Wed Jun 21 10:51:42 UTC 2023 - Peter Simons <[email protected]>
+
+- Update xml-conduit to version 1.9.1.3.
+ Upstream has not updated the file "ChangeLog.md" since the last
+ release.
+
+-------------------------------------------------------------------
Old:
----
xml-conduit-1.9.1.2.tar.gz
New:
----
xml-conduit-1.9.1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-xml-conduit.spec ++++++
--- /var/tmp/diff_new_pack.F0pgwI/_old 2023-06-22 23:26:14.669897701 +0200
+++ /var/tmp/diff_new_pack.F0pgwI/_new 2023-06-22 23:26:14.673897722 +0200
@@ -20,7 +20,7 @@
%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.9.1.2
+Version: 1.9.1.3
Release: 0
Summary: Pure-Haskell utilities for dealing with XML with the conduit
package
License: MIT
++++++ xml-conduit-1.9.1.2.tar.gz -> xml-conduit-1.9.1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xml-conduit-1.9.1.2/src/Text/XML/Stream/Parse.hs
new/xml-conduit-1.9.1.3/src/Text/XML/Stream/Parse.hs
--- old/xml-conduit-1.9.1.2/src/Text/XML/Stream/Parse.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/xml-conduit-1.9.1.3/src/Text/XML/Stream/Parse.hs 2001-09-09
03:46:40.000000000 +0200
@@ -82,6 +82,7 @@
, psDecodeIllegalCharacters
, psRetainNamespaces
, psEntityExpansionSizeLimit
+ , psIgnoreInternalEntityDeclarations
-- *** Entity decoding
, decodeXmlEntities
, decodeHtmlEntities
@@ -465,6 +466,10 @@
-- Default: @8192@
--
-- Since 1.9.1
+ , psIgnoreInternalEntityDeclarations :: Bool
+ -- ^ Whether to resolve any but the predefined entities.
+ --
+ -- Default: @False@
}
instance Default ParseSettings where
@@ -473,6 +478,7 @@
, psRetainNamespaces = False
, psDecodeIllegalCharacters = const Nothing
, psEntityExpansionSizeLimit = 8192
+ , psIgnoreInternalEntityDeclarations = False
}
conduitToken :: MonadThrow m => ParseSettings -> ConduitT T.Text
(PositionRange, Token) m ()
@@ -536,7 +542,10 @@
do char' '['
ents <- parseDeclarations id
skipSpace
- return ents
+ if psIgnoreInternalEntityDeclarations settings then
+ return []
+ else
+ return ents
_ -> return []
char' '>'
newline <|> return ()
@@ -626,13 +635,15 @@
valid '/' = False
valid ';' = False
valid '#' = False
+ valid '[' = False
+ valid ']' = False
valid c = not $ isXMLSpace c
parseContent :: ParseSettings
-> Bool -- break on double quote
-> Bool -- break on single quote
-> Parser Content
-parseContent (ParseSettings decodeEntities _ decodeIllegalCharacters _)
breakDouble breakSingle = parseReference <|> (parseTextContent <?> "text
content") where
+parseContent (ParseSettings decodeEntities _ decodeIllegalCharacters _ _)
breakDouble breakSingle = parseReference <|> (parseTextContent <?> "text
content") where
parseReference = do
char' '&'
t <- parseEntityRef <|> parseHexCharRef <|> parseDecCharRef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xml-conduit-1.9.1.2/test/unit.hs
new/xml-conduit-1.9.1.3/test/unit.hs
--- old/xml-conduit-1.9.1.2/test/unit.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/xml-conduit-1.9.1.3/test/unit.hs 2001-09-09 03:46:40.000000000
+0200
@@ -88,6 +88,7 @@
it "identifies unresolved entities" resolvedIdentifies
it "decodeHtmlEntities" testHtmlEntities
it "works for resolvable entities" resolvedAllGood
+ it "ignores custom entities when psResolveEntities is False"
dontResolveEntities
it "merges adjacent content nodes" resolvedMergeContent
it "understands inline entity declarations" resolvedInline
it "understands complex inline with markup" resolvedInlineComplex
@@ -671,8 +672,8 @@
cursorAnyElement, cursorElement, cursorLaxElement, cursorContent,
cursorAttribute, cursorLaxAttribute, cursorHasAttribute,
cursorAttributeIs, cursorDeep, cursorForce, cursorForceM,
- resolvedIdentifies, resolvedAllGood, resolvedMergeContent,
- testHtmlEntities
+ resolvedIdentifies, resolvedAllGood, dontResolveEntities,
+ resolvedMergeContent, testHtmlEntities
:: Assertion
cursorParent = name (Cu.parent bar2) @?= ["foo"]
cursorAncestor = name (Cu.ancestor baz2) @?= ["bar2", "foo"]
@@ -749,6 +750,25 @@
where
xml = "<foo><bar/><baz/></foo>"
+dontResolveEntities =
+ D.parseLBS_ settings xml @=? expectedDocument
+ where
+ settings = def { P.psIgnoreInternalEntityDeclarations = True }
+ xml = mconcat
+ [ "<!DOCTYPE mydt [ <!ENTITY foo \"fooby\" > ]>"
+ , "<root>>&foo;&bar;</root>"
+ ]
+
+ expectedDocument =
+ Document
+ (Prologue [] (Just (Doctype "mydt" Nothing)) [])
+ (Element "root" mempty
+ [ NodeContent (ContentText ">")
+ , NodeContent (ContentEntity "foo")
+ , NodeContent (ContentEntity "bar")
+ ])
+ []
+
resolvedMergeContent =
Res.documentRoot (Res.parseLBS_ def xml) @=?
Res.Element "foo" Map.empty [Res.NodeContent "bar&baz"]
@@ -778,7 +798,7 @@
resolvedInline :: Assertion
resolvedInline = do
- Res.Document _ root _ <- return $ Res.parseLBS_ Res.def "<!DOCTYPE foo
[<!ENTITY bar \"baz\">]><foo>&bar;</foo>"
+ Res.Document _ root _ <- return $ Res.parseLBS_ Res.def "<!DOCTYPE
foo[<!ENTITY bar \"baz\">]><foo>&bar;</foo>"
root @?= Res.Element "foo" Map.empty [Res.NodeContent "baz"]
Res.Document _ root2 _ <- return $ Res.parseLBS_ Res.def "<!DOCTYPE foo
[<!ENTITY bar \"baz\">]><foo bar='&bar;'/>"
root2 @?= Res.Element "foo" (Map.singleton "bar" "baz") []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xml-conduit-1.9.1.2/xml-conduit.cabal
new/xml-conduit-1.9.1.3/xml-conduit.cabal
--- old/xml-conduit-1.9.1.2/xml-conduit.cabal 2001-09-09 03:46:40.000000000
+0200
+++ new/xml-conduit-1.9.1.3/xml-conduit.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,7 +1,7 @@
cabal-version: 1.14
name: xml-conduit
-version: 1.9.1.2
+version: 1.9.1.3
license: MIT
license-file: LICENSE
author: Michael Snoyman <[email protected]>, Aristid Breitkreuz
<[email protected]>
