diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/py-jinja2/Makefile | 8 | ||||
| -rw-r--r-- | textproc/py-jinja2/distinfo | 9 | ||||
| -rw-r--r-- | textproc/py-jinja2/patches/patch-jinja2_bccache.py | 42 |
3 files changed, 8 insertions, 51 deletions
diff --git a/textproc/py-jinja2/Makefile b/textproc/py-jinja2/Makefile index 79f857c1171..fdbc5299f18 100644 --- a/textproc/py-jinja2/Makefile +++ b/textproc/py-jinja2/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2014/05/14 23:17:46 mspo Exp $ +# $NetBSD: Makefile,v 1.16 2014/06/09 12:36:51 wiz Exp $ -DISTNAME= Jinja2-2.7.2 +DISTNAME= Jinja2-2.7.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} CATEGORIES= textproc python MASTER_SITES= http://pypi.python.org/packages/source/J/Jinja2/ -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://jinja.pocoo.org/2/ @@ -17,7 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe SUBST_CLASSES+= unicode SUBST_FILES.unicode= jinja2/*.py jinja2/testsuite/*.py -SUBST_SED.unicode+= -e "s,u',',g" -e 's,u",",g' +SUBST_SED.unicode+= -e "s,u',',g" +SUBST_SED.unicode+= -e 's,u",",g' SUBST_STAGE.unicode= pre-install .include "../../lang/python/egg.mk" diff --git a/textproc/py-jinja2/distinfo b/textproc/py-jinja2/distinfo index c21a4605f31..dd25a2d0c84 100644 --- a/textproc/py-jinja2/distinfo +++ b/textproc/py-jinja2/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.8 2014/05/14 02:28:18 mspo Exp $ +$NetBSD: distinfo,v 1.9 2014/06/09 12:36:51 wiz Exp $ -SHA1 (Jinja2-2.7.2.tar.gz) = 1ce4c8bc722444ec3e77ef9db76faebbd17a40d8 -RMD160 (Jinja2-2.7.2.tar.gz) = 7bf0278d6fd75fc402b5dba785b29badeb507650 -Size (Jinja2-2.7.2.tar.gz) = 378300 bytes -SHA1 (patch-jinja2_bccache.py) = 0c1cab3fcc83d210569071ddb2e2c6713f8f9325 +SHA1 (Jinja2-2.7.3.tar.gz) = 25ab3881f0c1adfcf79053b58de829c5ae65d3ac +RMD160 (Jinja2-2.7.3.tar.gz) = e84a4c27dfb4cdd58c4f9625fcc48b0851a2b5c9 +Size (Jinja2-2.7.3.tar.gz) = 378470 bytes diff --git a/textproc/py-jinja2/patches/patch-jinja2_bccache.py b/textproc/py-jinja2/patches/patch-jinja2_bccache.py deleted file mode 100644 index 746829b3d1d..00000000000 --- a/textproc/py-jinja2/patches/patch-jinja2_bccache.py +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-jinja2_bccache.py,v 1.1 2014/05/14 02:28:18 mspo Exp $ - ---- jinja2/bccache.py-orig 2014-05-14 02:23:49.000000000 +0000 -+++ jinja2/bccache.py -@@ -16,6 +16,7 @@ - """ - from os import path, listdir - import os -+import stat - import sys - import errno - import marshal -@@ -215,7 +216,7 @@ class FileSystemBytecodeCache(BytecodeCa - - # On windows the temporary directory is used specific unless - # explicitly forced otherwise. We can just use that. -- if os.name == 'n': -+ if os.name == 'nt': - return tmpdir - if not hasattr(os, 'getuid'): - raise RuntimeError('Cannot determine safe temp directory. You ' -@@ -224,12 +225,18 @@ class FileSystemBytecodeCache(BytecodeCa - dirname = '_jinja2-cache-%d' % os.getuid() - actual_dir = os.path.join(tmpdir, dirname) - try: -- # 448 == 0700 -- os.mkdir(actual_dir, 448) -+ os.mkdir(actual_dir, stat.S_IRWXU) # 0o700 - except OSError as e: - if e.errno != errno.EEXIST: - raise - -+ actual_dir_stat = os.lstat(actual_dir) -+ if actual_dir_stat.st_uid != os.getuid() \ -+ or not stat.S_ISDIR(actual_dir_stat.st_mode) \ -+ or stat.S_IMODE(actual_dir_stat.st_mode) != stat.S_IRWXU: -+ raise RuntimeError('Temporary directory \'%s\' has an incorrect ' -+ 'owner, permissions, or type.' % actual_dir) -+ - return actual_dir - - def _get_cache_filename(self, bucket): |