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

main/apache-mod-auth-ntlm-winbind/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=apache-mod-auth-ntlm-winbind
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Authentication module for Apache using NTLM protocol with winbind helper"
 url="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/"
 arch="all"

main/mysql/APKBUILD

 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
-pkgver=5.1.54
+pkgver=5.1.56
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
@@ -41,53 +41,54 @@ build() {
 		--with-plugins=partition,archive,blackhole,csv,federated,heap,innobase,innodb_plugin,ndbcluster \
 		--mandir=/usr/share/man \
 		|| return 1
-        make
+        make || return 1
 }
 
 package() {
         cd $_builddir
-        make -j1 DESTDIR="$pkgdir/" install
-        install -Dm 755 "$startdir"/$pkgname.initd $pkgdir/etc/init.d/$pkgname
-        install -Dm 644 "$startdir"/$pkgname.mycnf $pkgdir/etc/mysql/my.cnf
-        install -dDo mysql $pkgdir/var/log/mysql
-        install -dDo mysql $pkgdir/var/run/mysqld
+        make -j1 DESTDIR="$pkgdir/" install || return 1
+        install -Dm 755 "$startdir"/$pkgname.initd $pkgdir/etc/init.d/$pkgname \
+		|| return 1
+        install -Dm 644 "$startdir"/$pkgname.mycnf $pkgdir/etc/mysql/my.cnf \
+		|| return 1
+        install -dDo mysql $pkgdir/var/log/mysql || return 1
+        install -dDo mysql $pkgdir/var/run/mysqld || return 1
 }
 
 libmysqlclient() {
 	pkgdesc="MySQL client library"
 	# some files moved
 	replaces="mysql"
-	mkdir -p "$subpkgdir"/usr/lib/mysql
+	mkdir -p "$subpkgdir"/usr/lib/mysql || return 1
 	mv "$pkgdir"/usr/lib/mysql/libmysqlclient.so* \
 		"$pkgdir"/usr/lib/mysql/libmysqlclient_r.so* \
-		"$subpkgdir"/usr/lib/mysql
+		"$subpkgdir"/usr/lib/mysql || return 1
 	# make symlinks
-	cd "$subpkgdir"/usr/lib
+	cd "$subpkgdir"/usr/lib || return 1
 	for i in mysql/*; do
-		ln -s "$i" "${i##*/}"
+		ln -s "$i" "${i##*/}" || return 1
 	done
 }
 
 test() {
-        mkdir -p "$subpkgdir"/usr
-        mv "$pkgdir"/usr/mysql-test "$subpkgdir"/usr/
+        mkdir -p "$subpkgdir"/usr || return 1
+        mv "$pkgdir"/usr/mysql-test "$subpkgdir"/usr/ || return 1
 }
 
 client() {
 	pkgdesc="client for the MySQL database"
 	install=""
-	local bins="myisam_ftdump mysql mysqlaccess mysqladmin mysqlbug mysqlcheck
-	mysql_client_test mysqldump mysqldumpslow mysql_explain_log mysql_find_rows
-	mysql_fix_extensions mysqlimport mysqlshow mysql_tableinfo mysqltestmanagerc
-	mysqltestmanager-pwgen mysql_waitpid"
+	local bins="myisam_ftdump mysql mysqlaccess mysqladmin mysqlbug
+	mysqlcheck mysql_client_test mysqldump mysqldumpslow mysql_find_rows
+	mysql_fix_extensions mysqlimport mysqlshow mysql_waitpid"
 	
-	mkdir -p "$subpkgdir"/usr/bin/
+	mkdir -p "$subpkgdir"/usr/bin/ || return 1
 
 	for i in $bins; do
-		mv "$pkgdir"/usr/bin/${i} "$subpkgdir"/usr/bin/
+		mv "$pkgdir"/usr/bin/${i} "$subpkgdir"/usr/bin/ || return 1
 	done
 }
 
-md5sums="2a0f45a2f8b5a043b95ce7575796a30b  mysql-5.1.54.tar.gz
+md5sums="15161d67f4830aad3a8a89e083749d49  mysql-5.1.56.tar.gz
 25d08b02bff6aa379dc45859b7a3f28a  mysql.initd
 15a7e3ddd6a40bf5a1eb3a8c69d9c34c  mysql.mycnf"

testing/nsd/APKBUILD → main/nsd/APKBUILD

 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=nsd
-pkgver=3.2.7
-pkgrel=1
+pkgver=3.2.8
+pkgrel=0
 pkgdesc="NSD is an authoritative only, high performance, simple and open source name server."
 url="http://www.nlnetlabs.nl/projects/nsd/"
 arch="all"
@@ -14,7 +14,7 @@ install="$pkgname.pre-install $pkgname.post-deinstall"
 subpackages="$pkgname-doc"
 pkgusers="nsd"
 pkggroups="nsd"
-source="http://www.nlnetlabs.nl/downloads/nsd/nsd-3.2.7.tar.gz
+source="http://www.nlnetlabs.nl/downloads/$pkgname/$pkgname-$pkgver.tar.gz
 	0010-stop-unlink-pid-error.patch
 	nsdc
 	nsd.initd
@@ -69,7 +69,7 @@ doc() {
 		"$subpkgdir"/usr/share/man || return 1
 }
 
-md5sums="b5aca8a207f77db566b08db25bf77d74  nsd-3.2.7.tar.gz
+md5sums="963c2123853e7759ffb772da40c68838  nsd-3.2.8.tar.gz
 cc592572846b978a6f52130a8e518ab3  0010-stop-unlink-pid-error.patch
 3aa94004a39319db89a329e9f24fb9da  nsdc
 4c0eef07caac9083aeeb9b15602d014d  nsd.initd

testing/apache-mod-auth-kerb/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=apache-mod-auth-kerb
 _pkgname=mod_auth_kerb
 pkgver=5.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A Kerberos authentication module for the Apache Http Server"
 url="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/"
 arch="all"

testing/apache-mod-backtrace/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=apache-mod-backtrace
 pkgver=0
-pkgrel=0
+pkgrel=1
 pkgdesc="A module which uses system functions to format a backtrace to show what code did the dirty deed."
 url="http://people.apache.org/~trawick/exception_hook.html"
 arch="all"