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

9 files changed, 48 insertions, 41 deletions

diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index f1370457e..2d6a5bf3c 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-alpine-conf
-pkgver=0.3.15
+pkgver=0.3.16
 pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-conf"
 url="http://git.alpinelinux.org/cgit/acf-alpine-conf"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="13d455b2a28e84a2fa1478bb5566e1ef  acf-alpine-conf-0.3.15.tar.bz2"
+md5sums="8fa06c1857b362f65df93822089a1670  acf-alpine-conf-0.3.16.tar.bz2"
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 8ef3a37b7..07653b891 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cmake
-pkgver=2.6.4
-pkgrel=1
+pkgver=2.8.0
+pkgrel=0
 pkgdesc="CMake is a cross-platform open-source make system"
 url="http://www.cmake.org"
 license="CMake"
-depends="uclibc libgcc g++ ncurses"
+depends=
 makedepends="ncurses-dev"
-source="http://www.$pkgname.org/files/v2.6/$pkgname-$pkgver.tar.gz"
+source="http://www.$pkgname.org/files/v${pkgver%.*}/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 
 
@@ -26,15 +26,20 @@ build ()
 	cd $startdir/src/$pkgname-$pkgver
 	# bug in cmake.
 	# http://www.mail-archive.com/cmake@cmake.org/msg09515.html
-	export CC="gcc"
-	export CXX="g++"
+#	export CC="gcc"
+#	export CXX="g++"
 
 	./bootstrap --prefix=/usr \
 		--mandir=/share/man \
-		--docdir=/share/cmake-2.6/doc \
+		--docdir=/share/cmake-${pkgver%.*}/doc \
 		$(parallel_opt)
 
 	make || return 1
+}
+
+package() {
+	cd $startdir/src/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 }
-md5sums="50f387d0436696c4a68b5512a72c9cde  cmake-2.6.4.tar.gz"
+
+md5sums="3b3679b8a6afaedc38a8c15dd7ff4fcf  cmake-2.8.0.tar.gz"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index b9f3052c4..d9aaf42f8 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=1.2.7
+pkgver=1.2.8
 pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
@@ -65,5 +65,5 @@ sqlite() {
 	_mv $(cd "$pkgdir" && find usr -name '*sqlite.so')
 }
 
-md5sums="76e82536fc7010770acd9f969f845b79  dovecot-1.2.7.tar.gz
+md5sums="c6d6c061413d299ccea7b55c3e4faa0a  dovecot-1.2.8.tar.gz
 c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 7a525832f..3efd01a7d 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.5.7.5
+pkgver=6.5.7.10
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
 pkgdesc="A collection of tools and libraries for many image formats"
@@ -36,4 +36,4 @@ package() {
 
 }
 
-md5sums="875b12626e3210eb2f5ee3d3217aceb0  ImageMagick-6.5.7-5.tar.gz"
+md5sums="090c6cde21312aa1883cde72b0641bea  ImageMagick-6.5.7-10.tar.gz"
diff --git a/main/libexif/APKBUILD b/main/libexif/APKBUILD
index c9f244b09..ba829f8b8 100644
--- a/main/libexif/APKBUILD
+++ b/main/libexif/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libexif
-pkgver=0.6.17
+pkgver=0.6.19
 pkgrel=0
 pkgdesc="A library to parse an EXIF file and read the data from those tags"
 url="http://sourceforge.net/projects/libexif"
@@ -10,11 +10,14 @@ depends=
 makedepends=
 source="http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
 
-build () 
-{ 
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure --prefix=/usr || return 1
-	make || return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="f7cf4e623a48c9a3b13f7f95f0a41015  libexif-0.6.17.tar.bz2"
+md5sums="56144a030a4c875c600b1ccf713f69f7  libexif-0.6.19.tar.bz2"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index c9a0cdfa1..aa178e2bb 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lighttpd
-pkgver=1.4.24
+pkgver=1.4.25
 pkgrel=0
 pkgdesc="a secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
@@ -8,7 +8,7 @@ license="custom"
 install="$pkgname.pre-install $pkgname.post-install"
 depends=
 makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev pkgconfig"
-source="http://www.$pkgname.net/download/$pkgname-$pkgver.tar.bz2
+source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.bz2
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
@@ -70,7 +70,7 @@ package() {
 		install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i
 	done
 }
-md5sums="e2324a24e4a5bce74663c21c58ddd200  lighttpd-1.4.24.tar.bz2
+md5sums="2027c49fb46530e45338c5e2da13c02f  lighttpd-1.4.25.tar.bz2
 36c4ddbc266017dc193fcb0cdd1d84e1  lighttpd.initd
 0dede109282bfe685bdec6b35f0e4b6b  lighttpd.confd
 ad091c9157134890499f26d170352c9f  lighttpd.logrotate
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index 76c10fab3..0312d4663 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
-pkgver=5.1.40
+pkgver=5.1.41
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
@@ -72,6 +72,6 @@ client() {
 	done
 }
 
-md5sums="32e7373c16271606007374396e6742ad  mysql-5.1.40.tar.gz
+md5sums="b5d39e8789174753f3c782959729e68c  mysql-5.1.41.tar.gz
 25d08b02bff6aa379dc45859b7a3f28a  mysql.initd
 15a7e3ddd6a40bf5a1eb3a8c69d9c34c  mysql.mycnf"
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 86fe3f707..666f81555 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=php
-pkgver=5.3.0
-_suhosinver=${pkgver}-0.9.8
-pkgrel=3
+pkgver=5.3.1
+_suhosinver=${pkgver}RC1-0.9.8
+pkgrel=0
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -63,7 +63,6 @@ subpackages="$pkgname-dev $pkgname-doc
 
 source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
         http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
-	gd-info-segfault.patch
 	"
 
 build() {
@@ -73,9 +72,6 @@ build() {
 	gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \
 		| patch -p1 || return 1
 
-	# fix gd segfault; http://bugs.php.net/bug.php?id=49193
-	patch -p0 -i ${srcdir}/gd-info-segfault.patch || return 1
-
 	phpextensions="--enable-bcmath=shared \
 		--enable-calendar=shared \
 		--enable-dba=shared \
@@ -236,6 +232,5 @@ dev() {
 	mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/
 }
 
-md5sums="846760cd655c98dfd86d6d97c3d964b0  php-5.3.0.tar.bz2
-a23a3d54e177ac0ad30f78d928ba8177  suhosin-patch-5.3.0-0.9.8.patch.gz
-1c1a50aae7207b12d27bdecd8967e7ce  gd-info-segfault.patch"
+md5sums="63e97ad450f0f7259e785100b634c797  php-5.3.1.tar.bz2
+c3ff0cb5fa728420d56f8ed139446647  suhosin-patch-5.3.1RC1-0.9.8.patch.gz"
diff --git a/main/tcl/APKBUILD b/main/tcl/APKBUILD
index 32a9eff63..d815acdd5 100644
--- a/main/tcl/APKBUILD
+++ b/main/tcl/APKBUILD
@@ -1,24 +1,28 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=tcl
-pkgver=8.5.7
+pkgver=8.5.8
 pkgrel=0
 pkgdesc="The Tcl scripting language"
 url="http://tcl.sourceforge.net/"
 license="custom"
-depends="uclibc"
+depends=
 makedepends=""
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname$pkgver-src.tar.gz"
 subpackages="$pkgname-doc $pkgname-dev"
 
 build ()
 {
-        cd ${srcdir}/tcl${pkgver}/unix
+        cd "$srcdir"/tcl${pkgver}/unix
         ./configure --prefix=/usr \
         --mandir=/usr/share/man \
         --disable-64bit
         make || return 1
-        make INSTALL_ROOT=${pkgdir} install install-private-headers
-        ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh
+}
+
+package() {
+        cd "$srcdir"/tcl${pkgver}/unix
+        make INSTALL_ROOT="${pkgdir}" install install-private-headers
+        ln -sf tclsh8.5 "${pkgdir}"/usr/bin/tclsh
         install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
         sed -i \
         -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
@@ -28,6 +32,6 @@ build ()
         -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \
         -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \
         -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \
-        ${pkgdir}/usr/lib/tclConfig.sh
+        "${pkgdir}"/usr/lib/tclConfig.sh
 }
-md5sums="f70ad8f78b5e4a9f792fe101f22b125f  tcl8.5.7-src.tar.gz"
+md5sums="7f123e53b3daaaba2478d3af5a0752e3  tcl8.5.8-src.tar.gz"