summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/apache-mod-auth-ntlm-winbind/APKBUILD2
-rw-r--r--main/duplicity/APKBUILD (renamed from testing/duplicity/APKBUILD)0
-rw-r--r--main/mysql/APKBUILD41
-rw-r--r--main/nsd/0010-stop-unlink-pid-error.patch (renamed from testing/nsd/0010-stop-unlink-pid-error.patch)0
-rw-r--r--main/nsd/APKBUILD (renamed from testing/nsd/APKBUILD)8
-rw-r--r--main/nsd/nsd.confd (renamed from testing/nsd/nsd.confd)0
-rw-r--r--main/nsd/nsd.initd (renamed from testing/nsd/nsd.initd)0
-rw-r--r--main/nsd/nsd.post-deinstall (renamed from testing/nsd/nsd.post-deinstall)0
-rw-r--r--main/nsd/nsd.pre-install (renamed from testing/nsd/nsd.pre-install)0
-rw-r--r--main/nsd/nsdc (renamed from testing/nsd/nsdc)0
-rw-r--r--main/pdnsd/APKBUILD (renamed from testing/pdnsd/APKBUILD)0
-rw-r--r--main/pdnsd/pdnsd.conf (renamed from testing/pdnsd/pdnsd.conf)0
-rw-r--r--main/pdnsd/pdnsd.confd (renamed from testing/pdnsd/pdnsd.confd)0
-rw-r--r--main/pdnsd/pdnsd.initd (renamed from testing/pdnsd/pdnsd.initd)0
-rw-r--r--main/pdnsd/pdnsd.post-deinstall (renamed from testing/pdnsd/pdnsd.post-deinstall)0
-rw-r--r--main/pdnsd/pdnsd.pre-install (renamed from testing/pdnsd/pdnsd.pre-install)0
-rw-r--r--main/py-boto/APKBUILD (renamed from testing/py-boto/APKBUILD)0
-rw-r--r--testing/apache-mod-auth-kerb/APKBUILD2
-rw-r--r--testing/apache-mod-backtrace/APKBUILD2
19 files changed, 28 insertions, 27 deletions
diff --git a/main/apache-mod-auth-ntlm-winbind/APKBUILD b/main/apache-mod-auth-ntlm-winbind/APKBUILD
index c9f2f7d01..abc0a9022 100644
--- a/main/apache-mod-auth-ntlm-winbind/APKBUILD
+++ b/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"
diff --git a/testing/duplicity/APKBUILD b/main/duplicity/APKBUILD
index 2562ee2d4..2562ee2d4 100644
--- a/testing/duplicity/APKBUILD
+++ b/main/duplicity/APKBUILD
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index d559876b8..b77e322c3 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.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"
diff --git a/testing/nsd/0010-stop-unlink-pid-error.patch b/main/nsd/0010-stop-unlink-pid-error.patch
index 24175df33..24175df33 100644
--- a/testing/nsd/0010-stop-unlink-pid-error.patch
+++ b/main/nsd/0010-stop-unlink-pid-error.patch
diff --git a/testing/nsd/APKBUILD b/main/nsd/APKBUILD
index 758570294..a110b94a8 100644
--- a/testing/nsd/APKBUILD
+++ b/main/nsd/APKBUILD
@@ -1,8 +1,8 @@
# 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
diff --git a/testing/nsd/nsd.confd b/main/nsd/nsd.confd
index e37f716ba..e37f716ba 100644
--- a/testing/nsd/nsd.confd
+++ b/main/nsd/nsd.confd
diff --git a/testing/nsd/nsd.initd b/main/nsd/nsd.initd
index f40008049..f40008049 100644
--- a/testing/nsd/nsd.initd
+++ b/main/nsd/nsd.initd
diff --git a/testing/nsd/nsd.post-deinstall b/main/nsd/nsd.post-deinstall
index 4d5fc4093..4d5fc4093 100644
--- a/testing/nsd/nsd.post-deinstall
+++ b/main/nsd/nsd.post-deinstall
diff --git a/testing/nsd/nsd.pre-install b/main/nsd/nsd.pre-install
index daabc70b3..daabc70b3 100644
--- a/testing/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
diff --git a/testing/nsd/nsdc b/main/nsd/nsdc
index ff4cb5c6b..ff4cb5c6b 100644
--- a/testing/nsd/nsdc
+++ b/main/nsd/nsdc
diff --git a/testing/pdnsd/APKBUILD b/main/pdnsd/APKBUILD
index cdc494cb4..cdc494cb4 100644
--- a/testing/pdnsd/APKBUILD
+++ b/main/pdnsd/APKBUILD
diff --git a/testing/pdnsd/pdnsd.conf b/main/pdnsd/pdnsd.conf
index f3e6ae4b7..f3e6ae4b7 100644
--- a/testing/pdnsd/pdnsd.conf
+++ b/main/pdnsd/pdnsd.conf
diff --git a/testing/pdnsd/pdnsd.confd b/main/pdnsd/pdnsd.confd
index 8f8820c8d..8f8820c8d 100644
--- a/testing/pdnsd/pdnsd.confd
+++ b/main/pdnsd/pdnsd.confd
diff --git a/testing/pdnsd/pdnsd.initd b/main/pdnsd/pdnsd.initd
index 355163ce1..355163ce1 100644
--- a/testing/pdnsd/pdnsd.initd
+++ b/main/pdnsd/pdnsd.initd
diff --git a/testing/pdnsd/pdnsd.post-deinstall b/main/pdnsd/pdnsd.post-deinstall
index f5cb9e80c..f5cb9e80c 100644
--- a/testing/pdnsd/pdnsd.post-deinstall
+++ b/main/pdnsd/pdnsd.post-deinstall
diff --git a/testing/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install
index 1ae14a9a5..1ae14a9a5 100644
--- a/testing/pdnsd/pdnsd.pre-install
+++ b/main/pdnsd/pdnsd.pre-install
diff --git a/testing/py-boto/APKBUILD b/main/py-boto/APKBUILD
index 8663a6de0..8663a6de0 100644
--- a/testing/py-boto/APKBUILD
+++ b/main/py-boto/APKBUILD
diff --git a/testing/apache-mod-auth-kerb/APKBUILD b/testing/apache-mod-auth-kerb/APKBUILD
index 9197a6eaa..3740f7a86 100644
--- a/testing/apache-mod-auth-kerb/APKBUILD
+++ b/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"
diff --git a/testing/apache-mod-backtrace/APKBUILD b/testing/apache-mod-backtrace/APKBUILD
index 4e4cf80d7..e4f908633 100644
--- a/testing/apache-mod-backtrace/APKBUILD
+++ b/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"