Merge branch 'master' of git://git.alpinelinux.org/aports

19 files changed, 86 insertions, 49 deletions

diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD
index 903055131d..ec8ae99f88 100644
--- a/main/audacious-plugins/APKBUILD
+++ b/main/audacious-plugins/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=audacious-plugins
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)"
 url="http://audacious-media-player.org/"
 arch="all"
@@ -45,7 +45,8 @@ makedepends="libmowgli-dev
 install=
 subpackages=
 source="http://distfiles.atheme.org/$pkgname-$pkgver.tgz
-	ffaudio-linker-fix.patch"
+	ffaudio-linker-fix.patch
+	lyricwiki-memory-leak-fix.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -85,4 +86,5 @@ package() {
 }
 
 md5sums="d2c76253e7a5d83dbd87319790f3c7a5  audacious-plugins-2.4.3.tgz
-ce7f401fce3904e81ac8c190c92fb641  ffaudio-linker-fix.patch"
+ce7f401fce3904e81ac8c190c92fb641  ffaudio-linker-fix.patch
+2fece903e66869d86d10528e1c4cd58c  lyricwiki-memory-leak-fix.patch"
diff --git a/main/audacious-plugins/lyricwiki-memory-leak-fix.patch b/main/audacious-plugins/lyricwiki-memory-leak-fix.patch
new file mode 100644
index 0000000000..b5c78c9cb2
--- /dev/null
+++ b/main/audacious-plugins/lyricwiki-memory-leak-fix.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User William Pitcock <nenolod@atheme.org>
+# Date 1296458093 21600
+# Node ID 84dff6f177a9e286fa074dfbcb8e3f20722da88f
+# Parent  e55f7361877bc9d213413959f254b6c0de351553
+lyricwiki: memory leak cleanups
+
+diff -r e55f7361877b -r 84dff6f177a9 src/lyricwiki/lyricwiki.c
+--- a/src/lyricwiki/lyricwiki.c	Mon Jan 31 14:11:35 2011 +0900
++++ b/src/lyricwiki/lyricwiki.c	Mon Jan 31 01:14:53 2011 -0600
+@@ -120,10 +120,14 @@
+ 					g_free(ret);
+ 					ret = NULL;
+ 				}
++
++				g_regex_unref(reg);
+ 			}
+ 
+ 			xmlFree(lyric);
+ 		}
++
++		xmlFreeDoc(doc);
+ 	}
+ 
+ 	return ret;
+@@ -169,6 +173,8 @@
+ 				xmlFree(lyric);
+ 			}
+ 		}
++
++		xmlFreeDoc(doc);
+ 	}
+ 
+ 	return uri;
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index 660fe4cab0..19f152b19a 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cairo
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Cairo vector graphics library"
 url="http://cairographics.org/"
 arch="all"
@@ -12,7 +12,7 @@ makedepends="pkgconfig libpng-dev libxrender-dev fontconfig pixman-dev
 	xcb-util-dev fontconfig-dev freetype-dev expat-dev zlib-dev
 	libiconv-dev mesa-dev glib-dev"
 depends_dev="fontconfig-dev freetype-dev libpng-dev libxrender-dev pixman-dev
-	xcb-util-dev mesa-dev"
+	xcb-util-dev mesa-dev glib-dev"
 source="http://cairographics.org/releases/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 1f5e508254..820e4a7ddc 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.7.3.5
-pkgrel=1
+pkgver=1.7.4
+pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
 arch="all"
@@ -51,7 +51,7 @@ perl() {
 }
 
 
-md5sums="8a8cd93b8a4dff0a03c0fdc77253af3e  git-1.7.3.5.tar.bz2
+md5sums="fa24dc1ef0b663327ea0fe1981365b39  git-1.7.4.tar.bz2
 e63a201556c4f089de790805c09a2e5b  bb-tar.patch
 3f0bdf6ca73bf4f015bc8565ab787969  git-daemon.initd
 2258e95d389ccc6de0b5111d53d9eed6  git-daemon.confd"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index d507f64e17..b7d1b2e1fe 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imagemagick
-pkgver=6.6.7.0
+pkgver=6.6.7.4
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
 pkgdesc="A collection of tools and libraries for many image formats"
@@ -48,4 +48,4 @@ dev() {
 		"$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/
 }
 
-md5sums="35258bfc2b30f5d5419d36401a1c4572  ImageMagick-6.6.7-0.tar.gz"
+md5sums="1bbe165518137fbcacdb76ec0940a75b  ImageMagick-6.6.7-4.tar.gz"
diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD
index 19eee12d0e..39885550ba 100644
--- a/main/mplayer/APKBUILD
+++ b/main/mplayer/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mplayer
-pkgver=1.0_rc4_p20100612
-_svnver=SVN-r30554
-pkgrel=1
+pkgver=1.0_rc4
+_ver=${pkgver%_*}${pkgver#*_}
+pkgrel=0
 pkgdesc="A movie player for linux"
 url="http://www.mplayerhq.hu/"
 arch="all"
@@ -11,16 +11,17 @@ depends=
 subpackages="$pkgname-doc"
 makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev
 	libtheora-dev xvidcore-dev zlib-dev sdl-dev freetype-dev
-	x264-dev faac-dev ttf-dejavu libxvmc-dev alsa-lib-dev live-media-dev"
+	x264-dev faac-dev ttf-dejavu libxvmc-dev alsa-lib-dev live-media-dev
+	mesa-dev"
 
 # cdparanoia libcaca lirc-utils libgl-dev smbclient-dev 
 # aalib-dev jack-audio-connection-kit libmng-dev libxss-dev
 
-source="http://dev.alpinelinux.org/distfiles/$pkgname-$pkgver.tar.bz2"
+source="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$_ver.tar.bz2"
+_builddir="$srcdir"/MPlayer-$_ver
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	sed -i "s/UNKNOWN/$_svnver/" version.sh
+	cd "$_builddir"
 
 	export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
 	./configure --prefix=/usr \
@@ -31,7 +32,7 @@ build() {
 		--enable-runtime-cpudetection \
 		--confdir=/etc/mplayer \
 		--disable-nas \
-		--disable-gl \
+		--enable-gl \
 		--enable-tv-v4l1 \
 		--enable-tv-v4l2 \
 		--enable-largefiles \
@@ -57,7 +58,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	install -Dm644 etc/codecs.conf etc/input.conf etc/example.conf \
 		"$pkgdir"/etc/mplayer/ || return 1
@@ -66,4 +67,4 @@ package() {
 		"$pkgdir"/usr/share/mplayer/subfont.ttf || return 1
 	rm -rf "$pkgdir"/usr/share/mplayer/font
 }
-md5sums="9b2cf68e1f2a20dec54fc6cb22f7e025  mplayer-1.0_rc4_p20100612.tar.bz2"
+md5sums="1699c94de39da9c4c5d34e8f58e418f0  MPlayer-1.0rc4.tar.bz2"
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index 199894e74f..c9bd0cd1de 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=nmap 
-pkgver=5.21
-pkgrel=2
+pkgver=5.50
+pkgrel=0
 pkgdesc="A network exploration tool and security/port scanner"
 url="http:/nmap.org"
 arch="all"
@@ -35,4 +35,4 @@ package() {
 	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
  
-md5sums="8ce773d70a65007452161e0bde32990c  nmap-5.21.tgz"
+md5sums="7d7496db6e0f326bb97ddb4c1784cc57  nmap-5.50.tgz"
diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD
index 4bfd4d5363..3961d77854 100644
--- a/main/pcre/APKBUILD
+++ b/main/pcre/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pcre
-pkgver=8.11
-pkgrel=1
+pkgver=8.12
+pkgrel=0
 pkgdesc="Perl-compatible regular expression library"
 url="http://pcre.sourceforge.net"
 arch="all"
@@ -46,5 +46,5 @@ libpcrecpp() {
 	mv "$pkgdir"/usr/lib/libpcrecpp.so* "$subpkgdir"/usr/lib/
 }
 
-md5sums="ef907b8792ec7f90f0dcd773848f0b3b  pcre-8.11.tar.bz2
+md5sums="f14a9fef3c92f3fc6c5ac92d7a2c7eb3  pcre-8.12.tar.bz2
 6276c5cdbecaa14256b50ce9a9333500  uclibc-strtoq.patch"
diff --git a/main/poppler-gtk/APKBUILD b/main/poppler-gtk/APKBUILD
index 822189a0cd..b516dc0afc 100644
--- a/main/poppler-gtk/APKBUILD
+++ b/main/poppler-gtk/APKBUILD
@@ -11,7 +11,7 @@ fi
 pkgname=poppler-gtk
 _realname=poppler
 pkgver=$pkgver
-pkgrel=1
+pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="http://poppler.freedesktop.org/"
 arch="all"
@@ -54,4 +54,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="654f8e8debf028085173d76e3c34b652  poppler-0.16.0.tar.gz"
+md5sums="0e68e4a894a4234d5468560bcd79baa9  poppler-0.16.2.tar.gz"
diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD
index f02e1d1358..fe18bfd600 100644
--- a/main/poppler/APKBUILD
+++ b/main/poppler/APKBUILD
@@ -4,7 +4,7 @@
 # circular make dependency: gtk <- cups <- poppler <- gtk
 # So we build gtk support in poppler-gtk
 pkgname=poppler
-pkgver=0.16.0
+pkgver=0.16.2
 pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="http://poppler.freedesktop.org/"
@@ -45,4 +45,4 @@ utils() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="654f8e8debf028085173d76e3c34b652  poppler-0.16.0.tar.gz"
+md5sums="0e68e4a894a4234d5468560bcd79baa9  poppler-0.16.2.tar.gz"
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
index 731efa8199..f1016d7d53 100644
--- a/main/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postgresql
-pkgver=9.0.2
+pkgver=9.0.3
 pkgrel=0
 pkgdesc="A sophisticated object-relational DBMS"
 url="http://www.postgresql.org/"
@@ -57,7 +57,7 @@ client() {
 }
 
 
-md5sums="fc79ef32b602f75f2ccd37647bc008e9  postgresql-9.0.2.tar.bz2
+md5sums="928df8c40bb012ad10756e58b70516fb  postgresql-9.0.3.tar.bz2
 66c197b8186a6df0752fe2aed40c90c4  postgresql.initd
 c56a4db0c3757f5dc7f9d59132b428ba  postgresql.confd
 7f8de63848c51c8a30c39bec6b1b1606  pg-restore.initd
diff --git a/main/sylpheed/APKBUILD b/main/sylpheed/APKBUILD
index d73ddd42e6..9645f386f9 100644
--- a/main/sylpheed/APKBUILD
+++ b/main/sylpheed/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sylpheed
-pkgver=3.0.3
+pkgver=3.1.0
 pkgrel=0
 pkgdesc="Lightweight and user-friendly e-mail client"
 url="http://sylpheed.sraoss.jp/en/"
@@ -23,4 +23,4 @@ package() {
 	cd "$srcdir/sylpheed-$pkgver"
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="c69e5787868c7a8b5fe74cc24ffca189  sylpheed-3.0.3.tar.bz2"
+md5sums="311847d73d0dda63a48e5ec107538424  sylpheed-3.1.0.tar.bz2"
diff --git a/main/terminal/APKBUILD b/main/terminal/APKBUILD
index 941f335cee..eb7def9995 100644
--- a/main/terminal/APKBUILD
+++ b/main/terminal/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=terminal
-pkgver=0.4.5
-pkgrel=2
+pkgver=0.4.6
+pkgrel=0
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 url="http://www.xfce.org/projects/terminal/"
 arch="all"
@@ -29,4 +29,4 @@ package() {
 	cd "$srcdir"/Terminal-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="3c707628e2e97c6d9566cd74d400036a  Terminal-0.4.5.tar.bz2"
+md5sums="e5c592b56d260b4a7b57039882e18b81  Terminal-0.4.6.tar.bz2"
diff --git a/main/thunar/APKBUILD b/main/thunar/APKBUILD
index 574240d0e9..3f788af174 100644
--- a/main/thunar/APKBUILD
+++ b/main/thunar/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=thunar
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=0
 pkgdesc="File manager for Xfce"
 url="http://thunar.xfce.org"
@@ -38,4 +38,4 @@ package() {
 	sed -i 's:x-directory/gnome-default-handler;::' "$pkgdir"/usr/share/applications/Thunar-folder-handler.desktop
 }
 
-md5sums="3f270cfbb83a057e6db46cdea549af8b  Thunar-1.2.0.tar.bz2"
+md5sums="d8dce796890619d67aed0cd7ef84c7b1  Thunar-1.2.1.tar.bz2"
diff --git a/main/xfce-utils/APKBUILD b/main/xfce-utils/APKBUILD
index 4d248219f6..533292e981 100644
--- a/main/xfce-utils/APKBUILD
+++ b/main/xfce-utils/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce-utils
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=0
 pkgdesc="Utilities for Xfce"
 url="http://www.xfce.org/"
@@ -27,4 +27,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="c49af3e718048d70b3fdd45fd4a8d281  xfce-utils-4.8.0.tar.bz2"
+md5sums="e39866365a45f7a1e7284b93eb4f92f0  xfce-utils-4.8.1.tar.bz2"
diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD
index 76d641bc12..3ff9c8c2c1 100644
--- a/main/xfce4-panel/APKBUILD
+++ b/main/xfce4-panel/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-panel
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=0
 pkgdesc="Panel for the Xfce desktop environment"
 url="http://www.xfce.org/"
@@ -39,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="ed80fc48817bfcc0058e7baf8603ee3c  xfce4-panel-4.8.0.tar.bz2"
+md5sums="449e37624da9b1f4d980a11d2073e6cc  xfce4-panel-4.8.1.tar.bz2"
diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD
index 52d9bbf5e7..ec68215f99 100644
--- a/main/xfce4-settings/APKBUILD
+++ b/main/xfce4-settings/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-settings
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=0
 pkgdesc="Settings manager for xfce"
 url="http://www.xfce.org/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="fc5b7d044876256148628a791b817783  xfce4-settings-4.8.0.tar.bz2"
+md5sums="0097476baadcc9bc9841d6b8e687b8eb  xfce4-settings-4.8.1.tar.bz2"
diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD
index 724092fa91..03210ceb38 100644
--- a/main/xfdesktop/APKBUILD
+++ b/main/xfdesktop/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfdesktop
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=0
 pkgdesc="A desktop manager for Xfce"
 url="http://www.xfce.org/"
@@ -38,4 +38,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="828223bc0a2b311b2f6aa529b1b7a87d  xfdesktop-4.8.0.tar.bz2"
+md5sums="a3a255cc7756ddc2a0a6fdee9fb8b2c9  xfdesktop-4.8.1.tar.bz2"
diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD
index 9726f1e2f2..cb5c16e4f4 100644
--- a/main/xfwm4/APKBUILD
+++ b/main/xfwm4/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfwm4
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=0
 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3"
 url="http://www.xfce.org/"
@@ -28,4 +28,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="e0a6ac8a8997d5bf9d5b8a202e03f84b  xfwm4-4.8.0.tar.bz2"
+md5sums="447433dca613180ebd6cfed4beb1c1c9  xfwm4-4.8.1.tar.bz2"