Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65cdf57dbee631550c23789fec7deeeea0a445a1
commit 65cdf57dbee631550c23789fec7deeeea0a445a1 Author: DeX77 <[email protected]> Date: Wed Aug 23 09:38:53 2017 +0200 imaging-1.1.7-9-x86_64 - remove diff --git a/source/devel-extra/imaging/CVE-2014-193x.patch b/source/devel-extra/imaging/CVE-2014-193x.patch deleted file mode 100644 index b2e4cfa..0000000 --- a/source/devel-extra/imaging/CVE-2014-193x.patch +++ /dev/null @@ -1,95 +0,0 @@ -Backport of: - -From 1e331e3e6a40141ca8eee4f5da9f74e895423b66 Mon Sep 17 00:00:00 2001 -From: wiredfool <[email protected]> -Date: Fri, 14 Mar 2014 15:56:41 -0700 -Subject: [PATCH] Removed tempfile.mktemp, fixes CVE-2014-1932 CVE-2014-1933, - debian bug #737059 - ---- - PIL/EpsImagePlugin.py | 6 ++++-- - PIL/Image.py | 9 ++++++--- - PIL/IptcImagePlugin.py | 4 ++-- - PIL/JpegImagePlugin.py | 12 ++++++++---- - 4 files changed, 20 insertions(+), 11 deletions(-) - -Index: python-imaging-1.1.7+2.0.0/PIL/EpsImagePlugin.py -=================================================================== ---- python-imaging-1.1.7+2.0.0.orig/PIL/EpsImagePlugin.py 2014-03-31 10:19:26.172250673 -0400 -+++ python-imaging-1.1.7+2.0.0/PIL/EpsImagePlugin.py 2014-03-31 10:20:06.668251330 -0400 -@@ -59,7 +59,8 @@ - - import tempfile, os - -- file = tempfile.mktemp() -+ fd, file = tempfile.mkstemp() -+ os.close(fd) - - # Build ghostscript command - command = ["gs", -Index: python-imaging-1.1.7+2.0.0/PIL/Image.py -=================================================================== ---- python-imaging-1.1.7+2.0.0.orig/PIL/Image.py 2014-03-31 10:19:26.172250673 -0400 -+++ python-imaging-1.1.7+2.0.0/PIL/Image.py 2014-03-31 10:19:26.164250673 -0400 -@@ -484,14 +484,17 @@ - self.readonly = 0 - - def _dump(self, file=None, format=None): -- import tempfile -+ import tempfile, os - if not file: -- file = tempfile.mktemp() -+ f, file = tempfile.mkstemp(format or '') -+ os.close(f) -+ - self.load() - if not format or format == "PPM": - self.im.save_ppm(file) - else: -- file = file + "." + format -+ if file.endswith(format): -+ file = file + "." + format - self.save(file, format) - return file - -Index: python-imaging-1.1.7+2.0.0/PIL/IptcImagePlugin.py -=================================================================== ---- python-imaging-1.1.7+2.0.0.orig/PIL/IptcImagePlugin.py 2014-03-31 10:19:26.172250673 -0400 -+++ python-imaging-1.1.7+2.0.0/PIL/IptcImagePlugin.py 2014-03-31 10:19:26.164250673 -0400 -@@ -172,8 +172,8 @@ - self.fp.seek(offset) - - # Copy image data to temporary file -- outfile = tempfile.mktemp() -- o = open(outfile, "wb") -+ o_fd, outfile = tempfile.mkstemp(text=False) -+ o = os.fdopen(o_fd) - if encoding == "raw": - # To simplify access to the extracted file, - # prepend a PPM header -Index: python-imaging-1.1.7+2.0.0/PIL/JpegImagePlugin.py -=================================================================== ---- python-imaging-1.1.7+2.0.0.orig/PIL/JpegImagePlugin.py 2014-03-31 10:19:26.172250673 -0400 -+++ python-imaging-1.1.7+2.0.0/PIL/JpegImagePlugin.py 2014-03-31 10:19:26.168250673 -0400 -@@ -343,13 +343,17 @@ - # ALTERNATIVE: handle JPEGs via the IJG command line utilities - - import tempfile, os -- file = tempfile.mktemp() -- os.system("djpeg %s >%s" % (self.filename, file)) -+ f, path = tempfile.mkstemp() -+ os.close(f) -+ if os.path.exists(self.filename): -+ os.system("djpeg '%s' >'%s'" % (self.filename, path)) -+ else: -+ raise ValueError("Invalid Filename") - - try: -- self.im = Image.core.open_ppm(file) -+ self.im = Image.core.open_ppm(path) - finally: -- try: os.unlink(file) -+ try: os.unlink(path) - except: pass - - self.mode = self.im.mode diff --git a/source/devel-extra/imaging/CVE-2014-3589.patch b/source/devel-extra/imaging/CVE-2014-3589.patch deleted file mode 100644 index 51a70de..0000000 --- a/source/devel-extra/imaging/CVE-2014-3589.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -Naur Imaging-1.1.7/libImaging/Imaging.h Imaging-1.1.7.new/libImaging/Imaging.h ---- Imaging-1.1.7/libImaging/Imaging.h 2009-11-01 01:44:12.000000000 +0100 -+++ Imaging-1.1.7.new/libImaging/Imaging.h 2014-08-26 08:21:21.800293098 +0200 -@@ -75,7 +75,7 @@ - struct ImagingMemoryInstance { - - /* Format */ -- char mode[4+1]; /* Band names ("1", "L", "P", "RGB", "RGBA", "CMYK") */ -+ char mode[6+1]; /* Band names ("1", "L", "P", "RGB", "RGBA", "CMYK", "YCbCr", "BGR;xy") */ - int type; /* Data type (IMAGING_TYPE_*) */ - int depth; /* Depth (ignored in this version) */ - int bands; /* Number of bands (1, 2, 3, or 4) */ -diff -Naur Imaging-1.1.7/PIL/IcnsImagePlugin.py Imaging-1.1.7.new/PIL/IcnsImagePlugin.py ---- Imaging-1.1.7/PIL/IcnsImagePlugin.py 2009-11-01 01:44:11.000000000 +0100 -+++ Imaging-1.1.7.new/PIL/IcnsImagePlugin.py 2014-08-26 08:21:21.801293127 +0200 -@@ -115,6 +115,8 @@ - i = HEADERSIZE - while i < filesize: - sig, blocksize = nextheader(fobj) -+ if blocksize <= 0: -+ raise SyntaxError('invalid block header') - i = i + HEADERSIZE - blocksize = blocksize - HEADERSIZE - dct[sig] = (i, blocksize) -diff -Naur Imaging-1.1.7/PIL/Image.py Imaging-1.1.7.new/PIL/Image.py ---- Imaging-1.1.7/PIL/Image.py 2009-11-15 16:51:25.000000000 +0100 -+++ Imaging-1.1.7.new/PIL/Image.py 2014-08-26 08:21:21.800293098 +0200 -@@ -1494,11 +1494,11 @@ - def split(self): - "Split image into bands" - -+ self.load() - if self.im.bands == 1: - ims = [self.copy()] - else: - ims = [] -- self.load() - for i in range(self.im.bands): - ims.append(self._new(self.im.getband(i))) - return tuple(ims) -diff -Naur Imaging-1.1.7/Scripts/pilfont.py Imaging-1.1.7.new/Scripts/pilfont.py ---- Imaging-1.1.7/Scripts/pilfont.py 2009-11-01 01:44:12.000000000 +0100 -+++ Imaging-1.1.7.new/Scripts/pilfont.py 2014-08-26 08:21:21.800293098 +0200 -@@ -1,3 +1,5 @@ -+#! /usr/bin/python -+ - # - # The Python Imaging Library - # $Id$ -diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.new/setup.py ---- Imaging-1.1.7/setup.py 2009-11-15 17:06:10.000000000 +0100 -+++ Imaging-1.1.7.new/setup.py 2014-08-26 08:21:21.800293098 +0200 -@@ -6,6 +6,8 @@ - # - - import glob, os, re, struct, string, sys -+import subprocess -+from distutils.spawn import find_executable - - # make it possible to run the setup script from another directory - try: -@@ -147,6 +149,16 @@ - add_directory(library_dirs, "/opt/local/lib") - add_directory(include_dirs, "/opt/local/include") - -+ elif find_executable('dpkg-architecture'): -+ # Debian/Ubuntu multiarch support. -+ proc = subprocess.Popen( -+ 'dpkg-architecture -qDEB_HOST_MULTIARCH'.split(), -+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT) -+ stdout, stderr = proc.communicate() -+ multiarch_path = stdout.strip() -+ add_directory(include_dirs, '/usr/include/' + multiarch_path) -+ add_directory(library_dirs, '/usr/lib/' + multiarch_path) -+ - add_directory(library_dirs, "/usr/local/lib") - # FIXME: check /opt/stuff directories here? - -diff -Naur Imaging-1.1.7/Tests/check_icns_dos.py Imaging-1.1.7.new/Tests/check_icns_dos.py ---- Imaging-1.1.7/Tests/check_icns_dos.py 1970-01-01 01:00:00.000000000 +0100 -+++ Imaging-1.1.7.new/Tests/check_icns_dos.py 2014-08-26 08:21:21.800293098 +0200 -@@ -0,0 +1,10 @@ -+# Tests potential DOS of IcnsImagePlugin with 0 length block. -+# Run from anywhere that PIL is importable. -+ -+from PIL import Image -+from io import BytesIO -+ -+if bytes is str: -+ Image.open(BytesIO(bytes('icns\x00\x00\x00\x10hang\x00\x00\x00\x00'))) -+else: -+ Image.open(BytesIO(bytes('icns\x00\x00\x00\x10hang\x00\x00\x00\x00', 'latin-1'))) diff --git a/source/devel-extra/imaging/FrugalBuild b/source/devel-extra/imaging/FrugalBuild deleted file mode 100644 index 19bf6d3..0000000 --- a/source/devel-extra/imaging/FrugalBuild +++ /dev/null @@ -1,37 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: kikadf <[email protected]> -# Contributor: AlexExtreme <[email protected]> - - -pkgname=imaging -realname=${pkgname/imaging/Imaging} -pkgver=1.1.7 -pkgrel=9 -pkgdesc="Python Imaging Library" -url="http://www.pythonware.com/products/pil/index.htm" -depends=('python>=2.7.12-2' 'libjpeg>=9b-2' 'zlib' 'freetype2>=2.7' 'sane-backends>=1.0.25' 'libgphoto2>=2.5.9') -makedepends=('tk') -conflicts=('pil') -replaces=('pil') -groups=('devel-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump $url | grep -m1 current | sed 's/.*L \(.*\)\. T.*/\1/;q'" -source=(http://www.effbot.org/downloads/$realname-$pkgver.tar.gz) -_F_cd_path="$realname-$pkgver" -sha1sums=('76c37504251171fda8da8e63ecb8bc42a69a5c81') - -CFLAGS+=" -fno-strict-aliasing" -# FSA fix *** -source=(${source[@]} CVE-2014-193x.patch CVE-2014-3589.patch) -sha1sums=(${sha1sums[@]} '3dec2eb288a197f9665c805122c9f7e12313601b' \ - '8c0c27409831c098ce0efa489135a22b14b39f31') -# *********** - -build() { - Fbuild - pushd Sane > /dev/null || Fdie - python setup.py install --root=$Fdestdir || Fdie - popd > /dev/null || Fdie -} - -# optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
