Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6fb0f068787cc513bf52104e42960a6e9ec2b1cc
commit 6fb0f068787cc513bf52104e42960a6e9ec2b1cc Author: Marius Cirsta <[email protected]> Date: Tue Dec 8 22:34:57 2015 +0200 Revert "graphicsmagick-1.3.20-2-x86_64" This reverts commit 3978b3527fd13d07cc6d6ea8a18e865a37a878d1. I still need this and will maintain it diff --git a/source/xapps-extra/graphicsmagick/CVE-2014-1947.patch b/source/xapps-extra/graphicsmagick/CVE-2014-1947.patch new file mode 100644 index 0000000..da4e021 --- /dev/null +++ b/source/xapps-extra/graphicsmagick/CVE-2014-1947.patch @@ -0,0 +1,25 @@ +diff -up GraphicsMagick-1.3.20/coders/psd.c.CVE-2014-1947 GraphicsMagick-1.3.20/coders/psd.c +--- GraphicsMagick-1.3.20/coders/psd.c.CVE-2014-1947 2014-08-16 15:33:23.000000000 -0500 ++++ GraphicsMagick-1.3.20/coders/psd.c 2014-08-20 07:30:08.767862041 -0500 +@@ -1719,8 +1719,7 @@ static unsigned int WritePSDImage(const + i; + + unsigned char +- *pixels, +- layer_name[4]; ++ *pixels; + + unsigned int + packet_size, +@@ -1944,8 +1943,9 @@ static unsigned int WritePSDImage(const + (void) WriteBlob(image, 3, &layer_name[1]); + */ + } else { +- (void) sprintf((char *) layer_name, "L%02d", layer_count++ ); +- WritePascalString( image, (char*)layer_name, 4 ); ++ char layer_name[MaxTextExtent]; ++ (void) sprintf(layer_name, "L%02d", layer_count++ ); ++ WritePascalString( image, layer_name, 4 ); + } + tmp_image = tmp_image->next; + }; diff --git a/source/xapps-extra/graphicsmagick/FrugalBuild b/source/xapps-extra/graphicsmagick/FrugalBuild new file mode 100644 index 0000000..9f3a713 --- /dev/null +++ b/source/xapps-extra/graphicsmagick/FrugalBuild @@ -0,0 +1,43 @@ +# Compiling Time: 1.13 SBU +# Contributor: kikadf <[email protected]> +# Contributor: crazy <[email protected]> + +options+=('asneeded') + +pkgname=graphicsmagick +pkgver=1.3.20 +pkgrel=2 +pkgdesc="A collection of tools and libraries for many image formats" +url="http://www.graphicsmagick.org/"; +depends=('libxext>=1.3.1' 'libsm' 'lcms' 'freetype2' 'libxml2' 'bzip2' \ + 'jasper>=1.900.1' 'libpng>=1.4.8' 'perl' 'urw-fonts' 'ghostscript') +_F_sourceforge_dirname="$pkgname" +_F_archive_name="GraphicsMagick" +_F_sourceforge_ext=".tar.xz" +Finclude sourceforge +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('73042eee48e17d074f68f6f70fc81b221481255a') + +subpkgs=("$pkgname-docs") +subdescs=('GraphicsMagick Documentation') +subdepends=('') +subgroups=('xapps-extra') +subarchs=('i686 x86_64') + +# FSA fix *** +source=(${source[@]} CVE-2014-1947.patch) +sha1sums=(${sha1sums[@]} '7a34fe56f09b362369248c894596062ffa83cd6c') +# *********** + +build() +{ + Fbuild \ + --disable-dependency-tracking --with-modules --without-fpx \ + --with-gs-font-dir=/usr/share/ghostscript/fonts \ + --enable-shared --with-threads --with-quantum-depth=32 + Frm /usr/share/GraphicsMagick-$pkgver/*.txt + Fsplit $pkgname-docs usr/share/doc/$pkgname-$pkgver/www +} + +# optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
