Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package graphite-web [ Reason ] Debian release -2 adds support for pyparsing 3, which is currenly in Bookworm. Without this patch, graphite-web doesn't work. [ Impact ] Without this patch, graphite-web doesn't work in Bookworm. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing unblock graphite-web/1.1.8-2
diff -Nru graphite-web-1.1.8/debian/changelog graphite-web-1.1.8/debian/changelog --- graphite-web-1.1.8/debian/changelog 2023-02-07 15:42:01.000000000 +0100 +++ graphite-web-1.1.8/debian/changelog 2023-03-17 14:24:47.000000000 +0100 @@ -1,3 +1,9 @@ +graphite-web (1.1.8-2) unstable; urgency=medium + + * Add fix-compat-with-pyparsing-3.patch. + + -- Thomas Goirand <z...@debian.org> Fri, 17 Mar 2023 14:24:47 +0100 + graphite-web (1.1.8-1.1) unstable; urgency=medium * NMU diff -Nru graphite-web-1.1.8/debian/patches/fix-compat-with-pyparsing-3.patch graphite-web-1.1.8/debian/patches/fix-compat-with-pyparsing-3.patch --- graphite-web-1.1.8/debian/patches/fix-compat-with-pyparsing-3.patch 1970-01-01 01:00:00.000000000 +0100 +++ graphite-web-1.1.8/debian/patches/fix-compat-with-pyparsing-3.patch 2023-03-17 14:24:47.000000000 +0100 @@ -0,0 +1,27 @@ +Description: Fix compat with pyparsing 3 +Author: Viacheslav Chimishuk +Forwarded: no +Last-Update: 2023-03-17 + +--- graphite-web-1.1.8.orig/webapp/graphite/render/evaluator.py ++++ graphite-web-1.1.8/webapp/graphite/render/evaluator.py +@@ -58,7 +58,7 @@ def evaluateTokens(requestContext, token + return evaluateTokens(requestContext, tokens.template, arglist) + + if tokens.expression: +- if tokens.expression.pipedCalls: ++ if tokens.expression.pipedCalls.asList(): + # when the expression has piped calls, we pop the right-most call and pass the remaining + # expression into it via pipedArg, to get the same result as a nested call + rightMost = tokens.expression.pipedCalls.pop() +--- graphite-web-1.1.8.orig/webapp/graphite/render/grammar_unsafe.py ++++ graphite-web-1.1.8/webapp/graphite/render/grammar_unsafe.py +@@ -80,7 +80,7 @@ kwargs = delimitedList(kwarg) + + + def setRaw(s, loc, toks): +- toks[0].raw = s[toks[0].start:toks[0].end] ++ toks[0]['raw'] = s[toks[0].start:toks[0].end] + + + call = Group( diff -Nru graphite-web-1.1.8/debian/patches/series graphite-web-1.1.8/debian/patches/series --- graphite-web-1.1.8/debian/patches/series 2023-02-07 15:42:01.000000000 +0100 +++ graphite-web-1.1.8/debian/patches/series 2023-03-17 14:24:47.000000000 +0100 @@ -1,3 +1,4 @@ local_settings.patch settings_debian.patch CVE-2022-4728-CVE-2022-4729-CVE-2022-4730.patch +fix-compat-with-pyparsing-3.patch
