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

7 files changed, 30 insertions, 25 deletions

diff --git a/core/gmp/APKBUILD b/core/gmp/APKBUILD
index 2d669c2b..71a61e81 100644
--- a/core/gmp/APKBUILD
+++ b/core/gmp/APKBUILD
@@ -1,18 +1,18 @@
 pkgname=gmp
-pkgver=4.2.4
-pkgrel=1
+pkgver=4.3.1
+pkgrel=0
 pkgdesc="A free library for arbitrary precision arithmetic"
 url="http://gmplib.org/"
 license="LGPL3"
 makedepends="m4 texinfo"
 subpackages="$pkgname-doc $pkgname-dev"
-source="ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.4.tar.bz2
+source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2
 	gmp-4.1.4-noexecstack.patch
 	"
 
-build () 
-{ 
-	cd "${srcdir}/${pkgname}-${pkgver}";
+build ()
+{
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 < ../gmp-4.1.4-noexecstack.patch || return 1 
 
 	ABI="32" ./configure --prefix=/usr \
@@ -29,5 +29,5 @@ build ()
 	make || return 1
 	make -j1 DESTDIR="${pkgdir}" install || return 1
 }
-md5sums="fc1e3b3a2a5038d4d74138d0b9cf8dbe  gmp-4.2.4.tar.bz2
+md5sums="26cec15a90885042dd4a15c4003b08ae  gmp-4.3.1.tar.bz2
 13c34f00e77ded6673270cfea06c35c3  gmp-4.1.4-noexecstack.patch"
diff --git a/core/module-init-tools/APKBUILD b/core/module-init-tools/APKBUILD
index 363b7dcc..1441c2fd 100644
--- a/core/module-init-tools/APKBUILD
+++ b/core/module-init-tools/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanel Copa <ncopa@alpinelinux.org>
 pkgname=module-init-tools
-pkgver=3.5
+pkgver=3.8
 pkgrel=0
 pkgdesc="Utilities for inserting and removing modules from the Linux kernel"
 url="http://www.kernel.org"
 license='GPL'
-depends='uclibc'
+depends=
 source="http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2"
 
 build() {
@@ -21,4 +21,4 @@ build() {
 	rm -r "$pkgdir/usr"
 }
 
-md5sums="2b47686247fc9a99bfdb9dd1d1d80e6f  module-init-tools-3.5.tar.bz2"
+md5sums="470d7830fd263d29a92149da6ae9f122  module-init-tools-3.8.tar.bz2"
diff --git a/extra/dnsmasq/APKBUILD b/extra/dnsmasq/APKBUILD
index 257583d7..328d54df 100644
--- a/extra/dnsmasq/APKBUILD
+++ b/extra/dnsmasq/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dnsmasq
-pkgver=2.47
+pkgver=2.49
 pkgrel=0
 pkgdesc="Small forwarding DNS server"
 url="http://www.thekelleys.org.uk/dnsmasq/"
 license="GPL-2"
-depends="uclibc"
+depends=
 subpackages="$pkgname-doc"
 source="http://www.thekelleys.org.uk/dnsmasq/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
@@ -32,6 +32,6 @@ build() {
 	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 	install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf
 }
-md5sums="4524081e56d0b935717d493e8e8d3e11  dnsmasq-2.47.tar.gz
+md5sums="7ccc861d8a733474f9c0a0a127006ee9  dnsmasq-2.49.tar.gz
 fbea3f4a794a6a00cc6fe79c6d44606a  dnsmasq.initd
 5990c2d2cb92209feacf8f3a5a7d0831  dnsmasq.confd"
diff --git a/extra/dovecot/APKBUILD b/extra/dovecot/APKBUILD
index 95491d4d..ae9101db 100644
--- a/extra/dovecot/APKBUILD
+++ b/extra/dovecot/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=1.1.15
+pkgver=1.1.16
 pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 license="LGPL-2.1"
-depends="uclibc libcap zlib openssl"
+depends=
 makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev"
 install="dovecot.pre-install"
 subpackages="$pkgname-doc $pkgname-dev"
@@ -32,6 +32,6 @@ build() {
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="90562401bbf6bd052b23b89f7f5a700f  dovecot-1.1.15.tar.gz
+md5sums="2e20c761416b16aa0fe9cac260ca0d2d  dovecot-1.1.16.tar.gz
 573e14589a6f8424d55753a2794ab99a  dovecot.initd
 f0f8893411f5e482e14f40a81a177b19  dovecot.pre-install"
diff --git a/extra/gnutls/APKBUILD b/extra/gnutls/APKBUILD
index 849f8e78..f8dd61f2 100644
--- a/extra/gnutls/APKBUILD
+++ b/extra/gnutls/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnutls
-pkgver=2.6.6
+pkgver=2.8.1
 pkgrel=0
 pkgdesc="A library which provides a secure connection"
 url="http://www.gnu.org/software/gnutls/"
 license="GPL"
-depends="uclibc zlib libgpg-error libgcrypt"
+depends=
 makedepends="libgcrypt-dev libgpg-error-dev zlib-dev"
 install=
 subpackages="$pkgname-doc $pkgname-dev"
@@ -25,4 +25,4 @@ build() {
 
 }
 
-md5sums="ca2489e29f9dc313a79b9747bb1090e5  gnutls-2.6.6.tar.bz2"
+md5sums="be209095e12cff0dd5e15c3cc08d2851  gnutls-2.8.1.tar.bz2"
diff --git a/extra/heimdal/APKBUILD b/extra/heimdal/APKBUILD
index a7b52ae0..d35d2e03 100644
--- a/extra/heimdal/APKBUILD
+++ b/extra/heimdal/APKBUILD
@@ -2,12 +2,13 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=heimdal
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An implementation of Kerberos 5"
 url="http://www.h5l.org/"
 license="BSD"
-depends="uclibc sqlite readline openssl e2fsprogs"
-makedepends="gawk readline-dev e2fsprogs-dev"
+depends=
+makedepends="gawk readline-dev e2fsprogs-dev sqlite-dev autoconf automake
+	libtool"
 install=
 subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \
 $pkgname-su $pkgname-rsh $pkgname-rcp $pkgname-pagsh $pkgname-kf"
@@ -24,6 +25,9 @@ heimdal-r23235-kb5-libwind_la.patch
 heimdal-r23238-kb5_locl_h-wind_h.patch
 "
 
+# krb5.h needs com_err.h
+depends_dev="e2fsprogs-dev"
+
 build() {
 	[ -e /usr/lib/libasn1.so ] && echo "## remove old heimdal pkg first ##" && return 1
 
@@ -47,6 +51,7 @@ build() {
 	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
 	lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
 
+	sh ./autogen.sh || return 1
 
 	export LDFLAGS="${LDFLAGS} -Wl,--as-needed"
 
diff --git a/extra/libtasn1/APKBUILD b/extra/libtasn1/APKBUILD
index c4148df9..27f71e80 100644
--- a/extra/libtasn1/APKBUILD
+++ b/extra/libtasn1/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtasn1
-pkgver=2.1
+pkgver=2.2
 pkgrel=0
 pkgdesc="The ASN.1 library used in GNUTLS"
 url="http://www.gnu.org/software/gnutls/"
 license="GPL3 LGPL"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc"
+depends=
 makedepends="texinfo"
 install=
 source="ftp://ftp.gnu.org/gnu/gnutls/$pkgname-$pkgver.tar.gz"
@@ -17,4 +17,4 @@ build() {
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="9c6869cca08b7392415c7939ffd2bbae  libtasn1-2.1.tar.gz"
+md5sums="14cc361500d2e768a8a6ec538ce3fecb  libtasn1-2.2.tar.gz"