diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-06-07 21:46:55 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-06-07 21:46:55 +0000 |
| commit | d59442dc50da4b237da98b760489c4022b308501 (patch) | |
| tree | 0b7f618fae5e15af4ace159c77e13e13f0194610 /www | |
| parent | 840d1044f373df49cb2e0650f5150930796af328 (diff) | |
| download | pkgsrc-d59442dc50da4b237da98b760489c4022b308501.tar.gz | |
patch-lib_wiki-plugins_wikiplugin__snarf.php is not needed anymore.
Diffstat (limited to 'www')
| -rw-r--r-- | www/php-tiki6/distinfo | 3 | ||||
| -rw-r--r-- | www/php-tiki6/patches/patch-lib_wiki-plugins_wikiplugin__snarf.php | 22 |
2 files changed, 1 insertions, 24 deletions
diff --git a/www/php-tiki6/distinfo b/www/php-tiki6/distinfo index ab82bd84061..817ec552993 100644 --- a/www/php-tiki6/distinfo +++ b/www/php-tiki6/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.6 2012/06/07 12:56:34 ryoon Exp $ +$NetBSD: distinfo,v 1.7 2012/06/07 21:46:55 ryoon Exp $ SHA1 (tiki-6.7.tar.bz2) = be464dda11e934cd8701fb949f9e15ba5a96d1bb RMD160 (tiki-6.7.tar.bz2) = e7889de5930a7431bcfbdbf211c3e8220dae9787 Size (tiki-6.7.tar.bz2) = 19038029 bytes -SHA1 (patch-lib_wiki-plugins_wikiplugin__snarf.php) = cd34e0a5a031a91b304c16ac2fd2e5ec12dcc541 SHA1 (patch-setup.sh) = b0e7c905700b97bdcb8b040679d477b4865fefc7 diff --git a/www/php-tiki6/patches/patch-lib_wiki-plugins_wikiplugin__snarf.php b/www/php-tiki6/patches/patch-lib_wiki-plugins_wikiplugin__snarf.php deleted file mode 100644 index 8300cf5ef9e..00000000000 --- a/www/php-tiki6/patches/patch-lib_wiki-plugins_wikiplugin__snarf.php +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-lib_wiki-plugins_wikiplugin__snarf.php,v 1.1 2011/12/26 19:05:32 ryoon Exp $ - -* Fix security bug, http://dev.tiki.org/item4059 . - ---- lib/wiki-plugins/wikiplugin_snarf.php.orig 2011-07-14 22:36:39.000000000 +0000 -+++ lib/wiki-plugins/wikiplugin_snarf.php -@@ -178,8 +178,13 @@ function wikiplugin_snarf($data, $params - } - - // If the user specified a more specialized regex -- if ( isset($params['regex']) && isset($params['regexres']) && preg_match('/^(.)(.)+\1[^e]*$/', $params['regex']) ) { -- $snarf = preg_replace( $params['regex'], $params['regexres'], $snarf ); -+ if (isset($params['regex']) && isset($params['regexres'])) { -+ // fixes http://dev.tiki.org/item4059 -+ $params['regex'] = str_replace("\0", "", $params['regex']); -+ -+ if (preg_match('/^(.)(.)+\1[^e]*$/', $params['regex'])) { -+ $snarf = preg_replace($params['regex'], $params['regexres'], $snarf); -+ } - } - - if ( $data == '' ) $data = NULL; |