Date: Sunday, August 15, 2010 @ 02:45:18 Author: eric Revision: 87507
upgpkg: libwmf 0.2.8.4-8 Added security fix (close FS#20476), Removed leading slash in install scriptlet, Added libxt makedepends to build wmf2x, PKGBUILD cleanup Added: libwmf/trunk/libwmf-0.2.8.4-useafterfree.patch Modified: libwmf/trunk/PKGBUILD libwmf/trunk/libwmf.install -----------------------------------+ PKGBUILD | 39 +++++++++++++++++++++--------------- libwmf-0.2.8.4-useafterfree.patch | 10 +++++++++ libwmf.install | 7 ------ 3 files changed, 34 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-08-15 02:53:49 UTC (rev 87506) +++ PKGBUILD 2010-08-15 06:45:18 UTC (rev 87507) @@ -1,34 +1,41 @@ # $Id$ # Maintainer: Jan de Groot <[email protected]> # Contributor: FJ <[email protected]> + pkgname=libwmf pkgver=0.2.8.4 -pkgrel=7 -pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)." -arch=(i686 x86_64) +pkgrel=8 +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=('libpng>=1.4.0' 'libx11' 'freetype2' 'libjpeg>=8' 'gsfonts' 'expat>=2.0') -makedepends=('gtk2>=2.18.6' 'pkgconfig') -options=(!libtool) +depends=('libpng' 'libx11' 'freetype2' 'libjpeg' 'gsfonts' 'expat') +makedepends=('gtk2' 'libxt' 'pkg-config') +options=('!libtool' '!docs' '!emptydirs') install=libwmf.install source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz - libpng14.patch) -md5sums=('d1177739bf1ceb07f57421f0cee191e0' - '33d3c07a1be9f99fd88de220930c5550') + libpng14.patch libwmf-0.2.8.4-useafterfree.patch) +md5sums=('d1177739bf1ceb07f57421f0cee191e0' '33d3c07a1be9f99fd88de220930c5550'\ + '0f02c1cb8a87bf7158634503bf0537e2') +sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' '15edb94eec7c9cea988e83660b334e56bf1fe897'\ + 'ea6d28880840e86c96f9079bfd591da54dcffa5c') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/libpng14.patch" || return 1 - sed -i -e 's/src include fonts doc/src include fonts/g' Makefile.in + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/libpng14.patch" + patch -Np1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" ./configure --prefix=/usr \ --with-gsfontdir=/usr/share/fonts/Type1 \ --with-fontdir=/usr/share/fonts/Type1 \ --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS - make || return 1 - make DESTDIR=${pkgdir} install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install #Remove fonts, these are in gsfonts - rm -rf ${pkgdir}/usr/share/fonts + rm -rf "${pkgdir}/usr/share/fonts" #Remove static GTK loader, can't use it anyways - rm -f ${pkgdir}/usr/lib/gtk-2.0/*/loaders/*.a + rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a } Added: libwmf-0.2.8.4-useafterfree.patch =================================================================== --- libwmf-0.2.8.4-useafterfree.patch (rev 0) +++ libwmf-0.2.8.4-useafterfree.patch 2010-08-15 06:45:18 UTC (rev 87507) @@ -0,0 +1,10 @@ +--- 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++; Modified: libwmf.install =================================================================== --- libwmf.install 2010-08-15 02:53:49 UTC (rev 87506) +++ libwmf.install 2010-08-15 06:45:18 UTC (rev 87507) @@ -1,6 +1,6 @@ post_install() { if [ -x /usr/bin/gdk-pixbuf-query-loaders ]; then - /usr/bin/gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders + gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders fi } @@ -11,8 +11,3 @@ post_remove() { post_install $1 } - -op=$1 -shift - -$op $*
