summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2019-05-06 21:46:15 +0200
committerDirkjan Ochtman <djc@gentoo.org>2019-05-06 21:46:15 +0200
commit1b71d712064b76fd4b04d184948528528479b242 (patch)
treed4674623c84045111ee8401e2443c16b024e1b16 /dev-php/twig/files
parentgames-puzzle/sgt-puzzles: Drop old (diff)
downloadgentoo-1b71d712064b76fd4b04d184948528528479b242.tar.gz
gentoo-1b71d712064b76fd4b04d184948528528479b242.tar.bz2
gentoo-1b71d712064b76fd4b04d184948528528479b242.zip
dev-php/twig: version bump to 1.40.1 (fixes CVE-2019-9942)
Closes: https://bugs.gentoo.org/681862 Signed-off-by: Dirkjan Ochtman <djc@gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'dev-php/twig/files')
-rw-r--r--dev-php/twig/files/1.40.1-autoloader-path.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/dev-php/twig/files/1.40.1-autoloader-path.patch b/dev-php/twig/files/1.40.1-autoloader-path.patch
new file mode 100644
index 000000000000..8c236883e070
--- /dev/null
+++ b/dev-php/twig/files/1.40.1-autoloader-path.patch
@@ -0,0 +1,16 @@
+--- a/lib/Twig/Autoloader.php 2019-04-29 16:12:28.000000000 +0200
++++ b/lib/Twig/Autoloader.php.new 2019-05-06 21:37:39.955238245 +0200
+@@ -43,9 +43,11 @@
+ return;
+ }
+
+- if (is_file($file = __DIR__.'/../'.str_replace(['_', "\0"], ['/', ''], $class).'.php')) {
++ if (is_file($file = __DIR__.'/../'.str_replace(['Twig_', "\0"], ['lib/', ''], $class).'.php')) {
+ require $file;
+- } elseif (is_file($file = __DIR__.'/../../src/'.str_replace(['Twig\\', '\\', "\0"], ['', '/', ''], $class).'.php')) {
++ } elseif (is_file($file = __DIR__.'/../'.str_replace(['_', "\0"], ['/', ''], $class).'.php')) {
++ require $file;
++ } elseif (is_file($file = __DIR__.'/../src/'.str_replace(['Twig\\', '\\', "\0"], ['', '/', ''], $class).'.php')) {
+ require $file;
+ }
+ }