[arch-commits] Commit in libwmf/trunk (3 files)

2010-08-15 Thread Eric Bélanger
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
===
--- PKGBUILD2010-08-15 02:53:49 UTC (rev 87506)
+++ PKGBUILD2010-08-15 06:45:18 UTC (rev 87507)
@@ -1,34 +1,41 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
 # Contributor: FJ joos...@gmail.com
+
 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.0 -0400
 libwmf-0.2.8.4/src/extra/gd/gd_clip.c  2009-04-24 04:08:30.0 
-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 $*



[arch-commits] Commit in libwmf/repos (extra-i686)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 02:45:35
  Author: eric
Revision: 87508

archrelease: remove extra-i686

Deleted:
  libwmf/repos/extra-i686/



[arch-commits] Commit in libwmf/repos (extra-i686)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 02:45:55
  Author: eric
Revision: 87509

archrelease: copy trunk to extra-i686

Added:
  libwmf/repos/extra-i686/



[arch-commits] Commit in libwmf/repos (extra-x86_64)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 02:46:06
  Author: eric
Revision: 87510

archrelease: remove extra-x86_64

Deleted:
  libwmf/repos/extra-x86_64/



[arch-commits] Commit in libwmf/repos (extra-x86_64)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 02:46:22
  Author: eric
Revision: 87511

archrelease: copy trunk to extra-x86_64

Added:
  libwmf/repos/extra-x86_64/



[arch-commits] Commit in libwmf/trunk (libwmf.install)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 03:05:06
  Author: eric
Revision: 87512

upgpkg: libwmf 0.2.8.4-8
Removed leading slash in install scriptlet

Modified:
  libwmf/trunk/libwmf.install

+
 libwmf.install |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: libwmf.install
===
--- libwmf.install  2010-08-15 06:46:22 UTC (rev 87511)
+++ libwmf.install  2010-08-15 07:05:06 UTC (rev 87512)
@@ -1,5 +1,5 @@
 post_install() {
-  if [ -x /usr/bin/gdk-pixbuf-query-loaders ]; then
+  if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then
 gdk-pixbuf-query-loaders  etc/gtk-2.0/gdk-pixbuf.loaders
   fi
 }



[arch-commits] Commit in libwmf/repos (extra-i686)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 03:05:14
  Author: eric
Revision: 87513

archrelease: remove extra-i686

Deleted:
  libwmf/repos/extra-i686/



[arch-commits] Commit in libwmf/repos (extra-i686)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 03:05:23
  Author: eric
Revision: 87514

archrelease: copy trunk to extra-i686

Added:
  libwmf/repos/extra-i686/



[arch-commits] Commit in libwmf/repos (extra-x86_64)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 03:05:30
  Author: eric
Revision: 87515

archrelease: remove extra-x86_64

Deleted:
  libwmf/repos/extra-x86_64/



[arch-commits] Commit in libwmf/repos (extra-x86_64)

2010-08-15 Thread Eric Bélanger
Date: Sunday, August 15, 2010 @ 03:05:39
  Author: eric
Revision: 87516

archrelease: copy trunk to extra-x86_64

Added:
  libwmf/repos/extra-x86_64/



[arch-commits] Commit in telepathy-butterfly/trunk (PKGBUILD)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 04:00:14
  Author: ibiru
Revision: 87517

upgpkg: telepathy-butterfly 0.5.13-1 update 0.5.13

Modified:
  telepathy-butterfly/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-15 07:05:39 UTC (rev 87516)
+++ PKGBUILD2010-08-15 08:00:14 UTC (rev 87517)
@@ -2,7 +2,7 @@
 # Maintainer:  Ionut Biru ib...@archlinux.org
 # Contributor: Daniel Balieiro dan...@balieiro.com
 pkgname=telepathy-butterfly
-pkgver=0.5.12
+pkgver=0.5.13
 pkgrel=1
 pkgdesc=A MSN connection manager for Telepathy
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
 depends=('papyon=0.4.9' 'python-telepathy=0.15.17')
 
source=(http://telepathy.freedesktop.org/releases/telepathy-butterfly/telepathy-butterfly-$pkgver.tar.gz)
 install=telepathy-butterfly.install
-md5sums=('e9bff0085eca377df70b37e46798b9f3')
+md5sums=('2f99fb2752f3f2102386316864872cab')
 
 build() {
   cd $srcdir/$pkgname-$pkgver



[arch-commits] Commit in telepathy-butterfly/repos (extra-i686)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 04:00:20
  Author: ibiru
Revision: 87518

archrelease: remove extra-i686

Deleted:
  telepathy-butterfly/repos/extra-i686/



[arch-commits] Commit in telepathy-butterfly/repos (extra-i686)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 04:00:33
  Author: ibiru
Revision: 87519

archrelease: copy trunk to extra-i686

Added:
  telepathy-butterfly/repos/extra-i686/



[arch-commits] Commit in telepathy-butterfly/repos (extra-x86_64)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 04:00:39
  Author: ibiru
Revision: 87520

archrelease: remove extra-x86_64

Deleted:
  telepathy-butterfly/repos/extra-x86_64/



[arch-commits] Commit in telepathy-butterfly/repos (extra-x86_64)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 04:00:52
  Author: ibiru
Revision: 87521

archrelease: copy trunk to extra-x86_64

Added:
  telepathy-butterfly/repos/extra-x86_64/



[arch-commits] Commit in syslog-ng/repos (core-i686)

2010-08-15 Thread Allan McRae
Date: Sunday, August 15, 2010 @ 05:10:50
  Author: allan
Revision: 87522

db-move: syslog-ng removed by allan for move to core

Deleted:
  syslog-ng/repos/core-i686/



[arch-commits] Commit in syslog-ng/repos (core-i686 testing-i686)

2010-08-15 Thread Allan McRae
Date: Sunday, August 15, 2010 @ 05:10:52
  Author: allan
Revision: 87523

db-move: moved syslog-ng from [testing] to [core] (i686)

Added:
  syslog-ng/repos/core-i686/
Deleted:
  syslog-ng/repos/testing-i686/



[arch-commits] Commit in syslog-ng/repos (core-x86_64)

2010-08-15 Thread Allan McRae
Date: Sunday, August 15, 2010 @ 05:11:07
  Author: allan
Revision: 87524

db-move: syslog-ng removed by allan for move to core

Deleted:
  syslog-ng/repos/core-x86_64/



[arch-commits] Commit in syslog-ng/repos (core-x86_64 testing-x86_64)

2010-08-15 Thread Allan McRae
Date: Sunday, August 15, 2010 @ 05:11:09
  Author: allan
Revision: 87525

db-move: moved syslog-ng from [testing] to [core] (x86_64)

Added:
  syslog-ng/repos/core-x86_64/
Deleted:
  syslog-ng/repos/testing-x86_64/



[arch-commits] Commit in lcms/trunk (PKGBUILD)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 09:47:09
  Author: ibiru
Revision: 87526

upgpkg: lcms 1.19-1 update to 1.19. fixes a security vulnerability FS#20483

Modified:
  lcms/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-15 09:11:09 UTC (rev 87525)
+++ PKGBUILD2010-08-15 13:47:09 UTC (rev 87526)
@@ -3,21 +3,21 @@
 # Contributor: Ben contrasu...@myrealbox.com
 
 pkgname=lcms
-pkgver=1.18
-pkgrel=3
+pkgver=1.19
+pkgrel=1
 pkgdesc=Lightweight color management development library/engine
 arch=(i686 x86_64)
 license=('custom')
-depends=('libtiff=3.9.2-2')
+depends=('libtiff=3.9.4')
 url=http://www.littlecms.com;
 options=('!libtool')
-source=(http://littlecms.com/${pkgname}-${pkgver}a.tar.gz)
-md5sums=('f4abfe1c57ea3f633c2e9d034e74e3e8')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('8af94611baf20d9646c7c2c285859818')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
   make DESTDIR=${pkgdir} install
   install -Dm 644 COPYING \
 ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE



[arch-commits] Commit in lcms/repos (extra-i686)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 09:47:15
  Author: ibiru
Revision: 87527

archrelease: remove extra-i686

Deleted:
  lcms/repos/extra-i686/



[arch-commits] Commit in lcms/repos (extra-i686)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 09:47:30
  Author: ibiru
Revision: 87528

archrelease: copy trunk to extra-i686

Added:
  lcms/repos/extra-i686/



[arch-commits] Commit in lcms/repos (extra-x86_64)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 09:47:37
  Author: ibiru
Revision: 87529

archrelease: remove extra-x86_64

Deleted:
  lcms/repos/extra-x86_64/



[arch-commits] Commit in lcms/repos (extra-x86_64)

2010-08-15 Thread Ionut Biru
Date: Sunday, August 15, 2010 @ 09:47:51
  Author: ibiru
Revision: 87530

archrelease: copy trunk to extra-x86_64

Added:
  lcms/repos/extra-x86_64/



[arch-commits] Commit in scons/repos (extra-i686)

2010-08-15 Thread Ray Rashif
Date: Sunday, August 15, 2010 @ 16:30:29
  Author: schiv
Revision: 87531

db-move: scons removed by schiv for move to extra

Deleted:
  scons/repos/extra-i686/



[arch-commits] Commit in scons/repos (extra-i686 testing-i686)

2010-08-15 Thread Ray Rashif
Date: Sunday, August 15, 2010 @ 16:30:32
  Author: schiv
Revision: 87532

db-move: moved scons from [testing] to [extra] (i686)

Added:
  scons/repos/extra-i686/
Deleted:
  scons/repos/testing-i686/



[arch-commits] Commit in scons/repos (extra-x86_64)

2010-08-15 Thread Ray Rashif
Date: Sunday, August 15, 2010 @ 16:30:52
  Author: schiv
Revision: 87533

db-move: scons removed by schiv for move to extra

Deleted:
  scons/repos/extra-x86_64/



[arch-commits] Commit in scons/repos (extra-x86_64 testing-x86_64)

2010-08-15 Thread Ray Rashif
Date: Sunday, August 15, 2010 @ 16:30:54
  Author: schiv
Revision: 87534

db-move: moved scons from [testing] to [extra] (x86_64)

Added:
  scons/repos/extra-x86_64/
Deleted:
  scons/repos/testing-x86_64/