Merge remote-tracking branch 'alpine/master'

7 files changed, 19 insertions, 18 deletions

diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index f22e43109f..c84ecfb145 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bind
-pkgver=9.7.3
+pkgver=9.8.0
 _ver=${pkgver%_p*}
 _p=${pkgver#*_p}
 [ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p"
@@ -94,7 +94,7 @@ tools() {
 	done
 }
 
-md5sums="207477c4cf95f2db5be0ded8a22669e0  bind-9.7.3.tar.gz
+md5sums="e802ac97ca419c2ddfc043509bcb17bc  bind-9.8.0.tar.gz
 f270a5b0a28ab6e818840c5c368ddbcc  bind.so_bsdcompat.patch
 92914193cc603d8d81ef00534ce9c1c9  bind.initd
 8b05a287976d66d51c18b73ee7523671  bind.confd
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 109272419b..b6d736bb84 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcp
-pkgver=4.2.0_p2
-_realver=4.2.0
+pkgver=4.2.1
+_realver=${pkgver/_p/-P}
 pkgrel=0
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
@@ -75,7 +75,7 @@ dhcrelay() {
 		"$subpkgdir"/etc/conf.d/dhcrelay
 }
 
-md5sums="83abd7c4f9c24d8dd024ca5a71380c0a  dhcp-4.2.0.tar.gz
+md5sums="bddce8a23551f009fd0ac840afc89780  dhcp-4.2.1.tar.gz
 37abf1fb047a353e91b022fafdabf39a  linux_ipv6_discover.patch
 a9eaf182dae3984670da52f20ae10fba  dhcp-3.0-fix-perms.patch
 1597c012bb1a2c0828254c87f0a904ad  dhcrelay.initd
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD
index 1565906664..208c28a712 100644
--- a/main/firefox/APKBUILD
+++ b/main/firefox/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=firefox
-pkgver=3.6.13
-_xulver=1.9.2.13
+pkgver=3.6.14
+_xulver=1.9.2.14
 pkgrel=2
 pkgdesc="firefox web browser (unofficial branding)"
 url="http://www.firefox.com"
@@ -86,7 +86,7 @@ package() {
 	install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/firefox-safe.desktop
 }
 
-md5sums="d7c90aed8209beefa74badf02e8eeae1  firefox-3.6.13.source.tar.bz2
+md5sums="ab0d00cd33e6b2388429dda1c01abd01  firefox-3.6.14.source.tar.bz2
 7938f0054456f3767d2427dff137ab34  mozconfig
 f437e94acff8f810991271ef4677d859  firefox-agent.patch
 1807651225b021e043154f8bba715a19  firefox-defaults.patch
diff --git a/main/fts/APKBUILD b/main/fts/APKBUILD
index ef76582937..1abcf6b05b 100644
--- a/main/fts/APKBUILD
+++ b/main/fts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=fts
 pkgver=0
-pkgrel=2
+pkgrel=3
 pkgdesc="keith bostic's POSIX file tree stream operations library"
 url="http://bostic.com/"
 arch="all"
@@ -12,6 +12,7 @@ depends_dev=
 makedepends="$depends_dev wget"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
+replaces_doc="man-pages"
 source="saveas-https://sites.google.com/a/bostic.com/keithbostic/files/fts.tar.gz?attredirects=0/fts.tar.gz
 	fts-uclibc.patch
 	fts-header-correctness.patch"
diff --git a/main/perl-dbd-sqlite/APKBUILD b/main/perl-dbd-sqlite/APKBUILD
index cfae4580fc..f98daa2a35 100644
--- a/main/perl-dbd-sqlite/APKBUILD
+++ b/main/perl-dbd-sqlite/APKBUILD
@@ -2,15 +2,15 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=perl-dbd-sqlite
 _realpkgname=DBD-SQLite
-pkgver=0.31
-pkgrel=1
+pkgver=1.31
+pkgrel=0
 pkgdesc="Perl CPAN DBD::SQLite module"
 url="http://search.cpan.org/dist/${_realpkgname}"
 arch="all"
 license="GPL PerlArtistic"
 depends="perl-dbi"
 makedepends="perl perl-dev"
-source="http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/${_realpkgname}-$pkgver.tar.gz"
+source="http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_realpkgname}-$pkgver.tar.gz"
 
 _builddir="$srcdir"/${_realpkgname}-$pkgver
 
@@ -31,4 +31,4 @@ package() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="4aa99c39104b7cd39129aec548e7d3e4  DBD-SQLite-0.31.tar.gz"
+md5sums="67b3575104efd606c8093bc416e3338d  DBD-SQLite-1.31.tar.gz"
diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index 5e1b26258a..94efa6ab8c 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wireshark
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=0
 pkgdesc="network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
@@ -75,6 +75,6 @@ tshark() {
 	mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
 }
 
-md5sums="ac3dcc8c128c38d9ef3d9c93d1dec83e  wireshark-1.4.3.tar.bz2
+md5sums="11ce019d85d9822597b163ce5b4da858  wireshark-1.4.4.tar.bz2
 504ede44c02b2a52f6cbd3bffdf93b8d  wireshark.desktop
 e771800a8c977fe223583a453bc27397  wireshark.png"
diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 8c47f2e8e3..b8408260a4 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xulrunner
-pkgver=1.9.2.13
-pkgrel=9
+pkgver=1.9.2.14
+pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -102,7 +102,7 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="211464d0b19b21ce0db63f7bd6549466  xulrunner-1.9.2.13.source.tar.bz2
+md5sums="41c7a79027258df59f29eca49582e4ee  xulrunner-1.9.2.14.source.tar.bz2
 d0908177f4c3879817f5dc7287cbb2b2  mozconfig
 faecc31fd371db93311109117f6bcc40  enable-x86_64-tracemonkey.patch
 86d33a17286131d9ef4cdfb35ee56f1f  fix-xulrunner-launcher.patch