Date: Friday, October 25, 2013 @ 02:03:57 Author: eric Revision: 197277
archrelease: copy trunk to extra-i686, extra-x86_64 Deleted: libwmf/repos/extra-i686/PKGBUILD libwmf/repos/extra-i686/libwmf-0.2.8.4-libpng-1.5.patch libwmf/repos/extra-i686/libwmf-0.2.8.4-useafterfree.patch libwmf/repos/extra-i686/libwmf.install libwmf/repos/extra-x86_64/PKGBUILD libwmf/repos/extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch libwmf/repos/extra-x86_64/libwmf-0.2.8.4-useafterfree.patch libwmf/repos/extra-x86_64/libwmf.install ------------------------------------------------+ extra-i686/PKGBUILD | 42 ----------------------- extra-i686/libwmf-0.2.8.4-libpng-1.5.patch | 12 ------ extra-i686/libwmf-0.2.8.4-useafterfree.patch | 10 ----- extra-i686/libwmf.install | 14 ------- extra-x86_64/PKGBUILD | 42 ----------------------- extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch | 12 ------ extra-x86_64/libwmf-0.2.8.4-useafterfree.patch | 10 ----- extra-x86_64/libwmf.install | 14 ------- 8 files changed, 156 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-10-25 00:02:36 UTC (rev 197276) +++ extra-i686/PKGBUILD 2013-10-25 00:03:57 UTC (rev 197277) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <[email protected]> - -pkgname=libwmf -pkgver=0.2.8.4 -pkgrel=11 -pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" -arch=('i686' 'x86_64') -url="http://wvware.sourceforge.net/libwmf.html" -license=('LGPL') -depends=('libx11' 'libjpeg' 'gsfonts') -makedepends=('gtk2' 'libxt') -optdepends=('gdk-pixbuf2: for pixbuf loader') -options=('!docs' '!emptydirs') -install=libwmf.install -source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz - libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch) -sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' - '42aa4c2a82e4e14044c875a7f439baea732a355a' - 'ea6d28880840e86c96f9079bfd591da54dcffa5c') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch" - patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --with-gsfontdir=/usr/share/fonts/Type1 \ - --with-fontdir=/usr/share/fonts/Type1 \ - --with-gsfontmap=/usr/share/ghostscript/9.07/Resource/Init/Fontmap.GS - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - #Remove fonts, these are in gsfonts - rm -rf "${pkgdir}/usr/share/fonts" -} Deleted: extra-i686/libwmf-0.2.8.4-libpng-1.5.patch =================================================================== --- extra-i686/libwmf-0.2.8.4-libpng-1.5.patch 2013-10-25 00:02:36 UTC (rev 197276) +++ extra-i686/libwmf-0.2.8.4-libpng-1.5.patch 2013-10-25 00:03:57 UTC (rev 197277) @@ -1,12 +0,0 @@ -diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h ---- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h 2011-05-23 19:14:23.000000000 +0200 -+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2011-05-23 19:15:11.000000000 +0200 -@@ -66,7 +66,7 @@ - return; - } - -- if (setjmp (png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)"); - png_destroy_write_struct (&png_ptr,&info_ptr); - wmf_free (API,buffer); Deleted: extra-i686/libwmf-0.2.8.4-useafterfree.patch =================================================================== --- extra-i686/libwmf-0.2.8.4-useafterfree.patch 2013-10-25 00:02:36 UTC (rev 197276) +++ extra-i686/libwmf-0.2.8.4-useafterfree.patch 2013-10-25 00:03:57 UTC (rev 197277) @@ -1,10 +0,0 @@ ---- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list 2009-04-24 04:06:44.000000000 -0400 -+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c 2009-04-24 04:08:30.000000000 -0400 -@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe - { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); - if (more == 0) return; - im->clip->max += 8; -+ im->clip->list = more; - } - im->clip->list[im->clip->count] = (*rect); - im->clip->count++; Deleted: extra-i686/libwmf.install =================================================================== --- extra-i686/libwmf.install 2013-10-25 00:02:36 UTC (rev 197276) +++ extra-i686/libwmf.install 2013-10-25 00:03:57 UTC (rev 197277) @@ -1,14 +0,0 @@ -post_install() { - if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then - install -d etc/gtk-2.0 - gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-10-25 00:02:36 UTC (rev 197276) +++ extra-x86_64/PKGBUILD 2013-10-25 00:03:57 UTC (rev 197277) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <[email protected]> - -pkgname=libwmf -pkgver=0.2.8.4 -pkgrel=11 -pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" -arch=('i686' 'x86_64') -url="http://wvware.sourceforge.net/libwmf.html" -license=('LGPL') -depends=('libx11' 'libjpeg' 'gsfonts') -makedepends=('gtk2' 'libxt') -optdepends=('gdk-pixbuf2: for pixbuf loader') -options=('!docs' '!emptydirs') -install=libwmf.install -source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz - libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch) -sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' - '42aa4c2a82e4e14044c875a7f439baea732a355a' - 'ea6d28880840e86c96f9079bfd591da54dcffa5c') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch" - patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --with-gsfontdir=/usr/share/fonts/Type1 \ - --with-fontdir=/usr/share/fonts/Type1 \ - --with-gsfontmap=/usr/share/ghostscript/9.07/Resource/Init/Fontmap.GS - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - #Remove fonts, these are in gsfonts - rm -rf "${pkgdir}/usr/share/fonts" -} Deleted: extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch =================================================================== --- extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch 2013-10-25 00:02:36 UTC (rev 197276) +++ extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch 2013-10-25 00:03:57 UTC (rev 197277) @@ -1,12 +0,0 @@ -diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h ---- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h 2011-05-23 19:14:23.000000000 +0200 -+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2011-05-23 19:15:11.000000000 +0200 -@@ -66,7 +66,7 @@ - return; - } - -- if (setjmp (png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)"); - png_destroy_write_struct (&png_ptr,&info_ptr); - wmf_free (API,buffer); Deleted: extra-x86_64/libwmf-0.2.8.4-useafterfree.patch =================================================================== --- extra-x86_64/libwmf-0.2.8.4-useafterfree.patch 2013-10-25 00:02:36 UTC (rev 197276) +++ extra-x86_64/libwmf-0.2.8.4-useafterfree.patch 2013-10-25 00:03:57 UTC (rev 197277) @@ -1,10 +0,0 @@ ---- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list 2009-04-24 04:06:44.000000000 -0400 -+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c 2009-04-24 04:08:30.000000000 -0400 -@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe - { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); - if (more == 0) return; - im->clip->max += 8; -+ im->clip->list = more; - } - im->clip->list[im->clip->count] = (*rect); - im->clip->count++; Deleted: extra-x86_64/libwmf.install =================================================================== --- extra-x86_64/libwmf.install 2013-10-25 00:02:36 UTC (rev 197276) +++ extra-x86_64/libwmf.install 2013-10-25 00:03:57 UTC (rev 197277) @@ -1,14 +0,0 @@ -post_install() { - if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then - install -d etc/gtk-2.0 - gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -}
