Merge git://dev.alpinelinux.org/aports

31 files changed, 364 insertions, 71 deletions

diff --git a/main/alpine-conf/0001-lbu-check-permissions-when-generating-apkovl.patch b/main/alpine-conf/0001-lbu-check-permissions-when-generating-apkovl.patch
new file mode 100644
index 000000000..7eceeaa8c
--- /dev/null
+++ b/main/alpine-conf/0001-lbu-check-permissions-when-generating-apkovl.patch
@@ -0,0 +1,28 @@
+From 9a18a800011faf018ff49220ae368c673c690bdc Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 17 Jul 2012 10:52:54 +0000
+Subject: [PATCH] lbu: check permissions when generating apkovl
+
+We want include files and dirs that have changed permissions.
+
+ref #1241
+---
+ lbu.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lbu.in b/lbu.in
+index 3fa157e..a0e68ed 100644
+--- a/lbu.in
++++ b/lbu.in
+@@ -278,7 +278,7 @@ If <dirname> nor <filename> is not specified, a package named
+ }
+ 
+ _gen_filelist() {
+-	apk audit --backup --quiet --recursive
++	apk audit --backup --quiet --recursive --check-permissions
+ }
+ 
+ cmd_package() {
+-- 
+1.7.11.2
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index b2867c980..2d4a638b9 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=2.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
 	0001-lbu-do-not-use-xargs.patch
+	0001-lbu-check-permissions-when-generating-apkovl.patch
 	"
 
 arch="all"
@@ -38,4 +39,5 @@ package() {
 	done
 }
 md5sums="47e37f6211817acc12aa637798da0437  alpine-conf-2.11.2.tar.bz2
-a49569f9eb9bfa630efaca4988bde07c  0001-lbu-do-not-use-xargs.patch"
+a49569f9eb9bfa630efaca4988bde07c  0001-lbu-do-not-use-xargs.patch
+97db0e60d1fd534a613e3d6cbca23a14  0001-lbu-check-permissions-when-generating-apkovl.patch"
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 477e2fba9..1549cb199 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=asciidoc
-pkgver=8.6.7
+pkgver=8.6.8
 pkgrel=0
 pkgdesc="Text based documentation"
 url="http://www.methods.co.nz/asciidoc/"
@@ -38,5 +38,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="edcf05b28ce21a4d27b1cd3028930021  asciidoc-8.6.7.tar.gz
+md5sums="6ffff1ab211f30481741ce4d1e4b12bf  asciidoc-8.6.8.tar.gz
 7e98fd7aa3fb61af56814e214bd1ab8a  vim.patch"
diff --git a/main/awstats/APKBUILD b/main/awstats/APKBUILD
index 6822ce607..cc20825bd 100644
--- a/main/awstats/APKBUILD
+++ b/main/awstats/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=awstats
-pkgver=7.0
+pkgver=7.1
 pkgrel=0
 pkgdesc="AWStats is short for Advanced Web Statistics."
 url="http://awstats.sourceforge.net/"
@@ -8,7 +8,7 @@ arch="noarch"
 license="GPL-2"
 depends="perl perl-uri"
 subpackages="$pkgname-doc"
-source="http://prdownloads.sourceforge.net/awstats/awstats-$pkgver.tar.gz"
+source="http://www.awstats.org/files/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -56,4 +56,4 @@ package() {
 	cp tools/*.pl "$pkgdir"/usr/bin/ || return 1
 	ln -s /usr/lib/awstats/cgi-bin/awstats.pl "$pkgdir"/usr/bin/
 }
-md5sums="3e8e09b9ebe74513bb34290dbcd37b45  awstats-7.0.tar.gz"
+md5sums="cf11203c660bc8baea18b605ff700e8b  awstats-7.1.tar.gz"
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 23a4c3704..0d329748b 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=bash
-pkgver=4.2.029
+pkgver=4.2.036
 _patchlevel=${pkgver##*.}
 _myver=${pkgver%.*}
 _patchbase=${_myver%.*}${_myver#*.}
@@ -96,4 +96,11 @@ c7d2493e44490f01dd20bdc8feb0a6a7  bash42-025
 9f19c199dd8d1fa9254eebe738759272  bash42-026
 a6ed82daf034587aee2f2581ba5fe829  bash42-027
 da9265aa2527fd4a7481baa3e0550287  bash42-028
-ec444d229e8899fbaaf6fc7de2d82ae6  bash42-029"
+ec444d229e8899fbaaf6fc7de2d82ae6  bash42-029
+b4bc1c4dc1b508ff9cdfc44f1a5039b5  bash42-030
+89390ff6a3c2ef7e09dd4b8b097a8e56  bash42-031
+eee08003395c417f677d1a4bf8c548ee  bash42-032
+2fe070dd6d75d8ff16f269184a16e9c4  bash42-033
+4e610506c1711bf3483b965800ac3d5d  bash42-034
+7cd9bfdf7cbfd45274d07620ee94c8d9  bash42-035
+9c3142956064d175a880bcb186e51ef9  bash42-036"
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index a19514289..d3453f3cb 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+3.0
-pkgver=3.4.3
+pkgver=3.4.4
 pkgrel=0
 pkgdesc="The GTK+ Toolkit (v3)"
 url="http://www.gtk.org/"
@@ -74,4 +74,4 @@ package() {
 	find "$pkgdir" -name *.la -delete
 }
 
-md5sums="e552d52c3b0824eb99842dc9c5f4875f  gtk+-3.4.3.tar.xz"
+md5sums="1b2cf29502a6394e8d4b30f7f5bb9131  gtk+-3.4.4.tar.xz"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index e83f7e80b..b263c2227 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.7.8.0
+pkgver=6.7.8.3
 _abiver=5
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
@@ -63,4 +63,4 @@ _cxx() {
 	mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="43bf6de047bbdc4b909747b198d3deb8  ImageMagick-6.7.8-0.tar.xz"
+md5sums="2bd5087654a4e6cde9bc15c95923dd50  ImageMagick-6.7.8-3.tar.xz"
diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD
index 49c87fc67..cc87bd9c0 100644
--- a/main/libdrm/APKBUILD
+++ b/main/libdrm/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdrm
 pkgver=2.4.37
-pkgrel=0
+pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 url="http://dri.freedesktop.org/"
 arch="all"
@@ -24,7 +24,8 @@ build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure --prefix=/usr \
 		--enable-udev \
-		--enable-nouveau-experimental-api || return 1
+		--enable-vmwgfx-experimental-api \
+		|| return 1
 
 	# temp workaround. problem appears to be with
 	# uclibc open_memstream() and stdio.h
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index b36c3f7c0..5f5e92209 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mc
-pkgver=4.8.3
+pkgver=4.8.1.4
 pkgrel=0
 pkgdesc="A filemanager/shell that emulates Norton Commander"
 url="http://www.ibiblio.org/mc/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="12d38ad4969df3f8bbf66c3967a191ee  mc-4.8.3.tar.bz2"
+md5sums="c8928e1f04a8250097c01b893056f523  mc-4.8.1.4.tar.bz2"
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 00276f10c..df4227007 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=8.0.3
-pkgrel=0
+pkgver=8.0.4
+pkgrel=1
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
 arch="all"
@@ -11,21 +11,25 @@ subpackages="$pkgname-dev
 	$pkgname-dri-ati:ati
 	$pkgname-dri-intel:intel
 	$pkgname-dri-swrast:swrast
-	$pkgname-dri-nouveau:nouveau
 	$pkgname-dri-vmwgfx:vmwgfx
-	$pkgname-egl $pkgname-glu $pkgname-gl $pkgname-gles
+	$pkgname-glapi $pkgname-egl $pkgname-glu $pkgname-gl $pkgname-gles
+	$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
 	"
+#	$pkgname-dri-nouveau:nouveau
 
 depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
 	libxdamage-dev libxfixes-dev libxcb-dev glproto"
 makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend
-	talloc-dev py-libxml2 flex bison llvm-dev
+	talloc-dev py-libxml2 flex bison llvm-dev udev-dev
 	autoconf automake"
 source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
 	mesa-8.0.3-uclibc-strtod.patch
+	mesa-8.0.3-llvm-3.1-fixes.patch
 	mesa-7.10-uclibc-gallium.patch
 	imports-uclibc.patch
 	glx_ro_text_segm.patch
+	ccache.patch
+	parallel.patch
 	"
 
 
@@ -63,15 +67,34 @@ build() {
 	./configure --prefix=/usr \
 		--with-dri-driverdir=$_dri_driverdir \
 		--disable-asm \
-		--disable-glx-tls \
-		--with-driver=dri \
-		--enable-egl \
-		--enable-gles2 \
-		--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast \
-		--disable-gallium-egl \
+		--enable-pic \
 		--enable-glx-rts \
+		--with-gallium-drivers=r300,r600,svga,swrast \
+		--with-dri-drivers=i915,i965,r200,radeon,swrast \
+		--enable-gallium-llvm \
+		--enable-gallium-egl \
+		--enable-shared-glapi \
+		--enable-gbm \
+		--enable-glx-tls \
+		--enable-dri \
+		--enable-glx \
+		--enable-osmesa \
+		--enable-gles1 \
+		--enable-gles2 \
+		--enable-egl \
+		--enable-texture-float \
+		--enable-xa \
+		--enable-shared-dricore \
 		|| return 1
 
+#		--with-driver=dri \
+#		--enable-egl \
+#		--enable-gles2 \
+#		--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast \
+#		--enable-gallium-llvm \
+#		--enable-gallium-egl \
+#		--enable-glx-rts \
+	make -C src/mesa depend || return 1
 	make || return 1
 	
 	# check so we dont have any bind NOW
@@ -88,14 +111,19 @@ egl() {
 	replaces="mesa"
 	pkgdesc="Mesa libEGL runtime libraries"
 	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libEGL.so* "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libEGL.so* \
+		"$pkgdir"/usr/lib/egl \
+		"$subpkgdir"/usr/lib/
 }
 
 gl() {
 	replaces="mesa"
 	pkgdesc="Mesa libGL runtime libraries"
 	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libGL.so* \
+		"$pkgdir"/$_dri_driverdir/libglsl.so \
+		"$pkgdir"/$_dri_driverdir/libdricore.so \
+		"$subpkgdir"/usr/lib/
 }
 
 glu() {
@@ -105,12 +133,40 @@ glu() {
 	mv "$pkgdir"/usr/lib/libGLU.so* "$subpkgdir"/usr/lib/
 }
 
+glapi() {
+	replaces="$pkgname-gles"
+	pkgdesc="Mesa shared glapi"
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libglapi.so.* \
+		"$subpkgdir"/usr/lib/
+}
+
 gles() {
 	replaces="mesa"
 	pkgdesc="Mesa libGLESv2 runtime libraries"
 	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libGLESv2.so* \
-		"$pkgdir"/usr/lib/libglapi.so.* \
+	mv "$pkgdir"/usr/lib/libGLES*.so* \
+		"$subpkgdir"/usr/lib/
+}
+
+xatracker() {
+	pkgdesc="Mesa XA state tracker for vmware"
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libxatracker*.so.* \
+		"$subpkgdir"/usr/lib/
+}
+
+osmesa() {
+	pkgdesc="Mesa offscreen rendering libraries"
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libOSMesa.so.* \
+		"$subpkgdir"/usr/lib/
+}
+
+gbm() {
+	pkgdesc="Mesa gbm library"
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgbm.so.* \
 		"$subpkgdir"/usr/lib/
 }
 
@@ -131,8 +187,11 @@ nouveau() {	_mv_dri nouveau_dri nouveau_vieux_dri; }
 swrast() {	_mv_dri swrast_dri; }
 vmwgfx() {	_mv_dri vmwgfx_dri; }
 
-md5sums="cc5ee15e306b8c15da6a478923797171  MesaLib-8.0.3.tar.bz2
+md5sums="d546f988adfdf986cff45b1efa2d8a46  MesaLib-8.0.4.tar.bz2
 13cc91257dac1311013f681705bcf3aa  mesa-8.0.3-uclibc-strtod.patch
+c452ed3392468170726c004c2f4e02ca  mesa-8.0.3-llvm-3.1-fixes.patch
 90a2ea438ff328443a0436a91a74d518  mesa-7.10-uclibc-gallium.patch
 bc2d3e144f7577be016b44b514d0b923  imports-uclibc.patch
-a1a766b4c6a96d67cad9bd7ad5c578e8  glx_ro_text_segm.patch"
+a1a766b4c6a96d67cad9bd7ad5c578e8  glx_ro_text_segm.patch
+1f30bf8340114b455f005cc9b134c414  ccache.patch
+d6319aa729775249541550154ebf7d8f  parallel.patch"
diff --git a/main/mesa/ccache.patch b/main/mesa/ccache.patch
new file mode 100644
index 000000000..c75d659fa
--- /dev/null
+++ b/main/mesa/ccache.patch
@@ -0,0 +1,11 @@
+--- ./src/gallium/targets/xa-vmwgfx/Makefile.orig
++++ ./src/gallium/targets/xa-vmwgfx/Makefile
+@@ -59,7 +59,7 @@
+ # Make the library
+ $(TOP)/$(LIB_DIR)/gallium/$(XA_LIB_NAME): depend $(OBJECTS) $(XA_LIB_DEPS) \
+ 	xa_symbols
+-	$(MKLIB) -o $(XA_LIB) -linker $(LD) -ldflags '$(LDFLAGS)' \
++	$(MKLIB) -o $(XA_LIB) -linker '$(LD)' -ldflags '$(LDFLAGS)' \
+ 		-major $(XA_MAJOR) -minor $(XA_MINOR) -patch $(XA_TINY) \
+ 		$(MKLIB_OPTIONS) \
+ 		-exports xa_symbols \
diff --git a/main/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/main/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
new file mode 100644
index 000000000..a567b5926
--- /dev/null
+++ b/main/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
@@ -0,0 +1,46 @@
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index a50a51d..f1bb4d9 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
+    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
+ #endif
+ 
+-#if HAVE_LLVM >= 0x0300
++#if HAVE_LLVM >= 0x0301
++   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
++   if (!MRI) {
++      debug_printf("error: no register info for target %s\n", Triple.c_str());
++      return;
++   }
++
++   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
++   if (!MII) {
++      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
++      return;
++   }
++#endif
++
++#if HAVE_LLVM >= 0x0301
++   OwningPtr<MCInstPrinter> Printer(
++         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
++#elif HAVE_LLVM == 0x0300
+    OwningPtr<MCInstPrinter> Printer(
+          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
+ #elif HAVE_LLVM >= 0x0208
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index fe7616b..68f8808 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -62,7 +62,11 @@
+ extern "C" void
+ lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
+ {
++#if HAVE_LLVM >= 0x0301
++   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
++#else
+    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
++#endif
+ }
+ 
+ 
diff --git a/main/mesa/parallel.patch b/main/mesa/parallel.patch
new file mode 100644
index 000000000..44bd7b11f
--- /dev/null
+++ b/main/mesa/parallel.patch
@@ -0,0 +1,14 @@
+--- src/mesa/Makefile.orig
++++ ./src/mesa/Makefile
+@@ -65,7 +65,10 @@
+ 
+ # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
+ # then convenience libs (.a) and finally the device drivers:
+-default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
++default: $(DEPENDS)
++	@for i in asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs; do \
++		$(MAKE) $$i || exit 1; \
++	done
+ 
+ # include glapi_gen.mk for generating glapi headers for GLES
+ GLAPI := $(TOP)/src/mapi/glapi/gen
diff --git a/main/perl-datetime-timezone/APKBUILD b/main/perl-datetime-timezone/APKBUILD
index ccf85b558..0d0801aa1 100644
--- a/main/perl-datetime-timezone/APKBUILD
+++ b/main/perl-datetime-timezone/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-datetime-timezone
-pkgver=1.42
+pkgver=1.46
 pkgrel=0
 pkgdesc="DateTime::TimeZone perl module"
 url="http://search.cpan.org/dist/DateTime-TimeZone/"
@@ -36,4 +36,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="e11c4f93eb1a9fcbd2cfab364335aa72  DateTime-TimeZone-1.42.tar.gz"
+md5sums="e83f412286d7787e3dfd5427a1943569  DateTime-TimeZone-1.46.tar.gz"
diff --git a/main/perl-email-address/APKBUILD b/main/perl-email-address/APKBUILD
index d35e7a595..1a11cfa40 100644
--- a/main/perl-email-address/APKBUILD
+++ b/main/perl-email-address/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-email-address
-pkgver=1.892
+pkgver=1.895
 pkgrel=0
 pkgdesc="RFC 2822 Address Parsing and Creation"
 url="http://search.cpan.org/dist/Email-Address/"
@@ -36,4 +36,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="047e982b0ab7434406a32759164bfe1e  Email-Address-1.892.tar.gz"
+md5sums="57a05d45498f5dc6dc28ebb075706b91  Email-Address-1.895.tar.gz"
diff --git a/main/perl-file-next/APKBUILD b/main/perl-file-next/APKBUILD
index b3231b457..184c68bb2 100644
--- a/main/perl-file-next/APKBUILD
+++ b/main/perl-file-next/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-next
 _pkgreal=File-Next
-pkgver=1.06
-pkgrel=1
+pkgver=1.10
+pkgrel=0
 pkgdesc="Perl module for taint-safe file-finding"
 url="http://search.cpan.org/dist/File-Next/"
 arch="noarch"
@@ -28,4 +28,4 @@ package() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="8d901b18e40c477acd18a6ea0fd7de64  File-Next-1.06.tar.gz"
+md5sums="dcaade658846c8100b0a5e43fae8920d  File-Next-1.10.tar.gz"
diff --git a/main/perl-image-exiftool/APKBUILD b/main/perl-image-exiftool/APKBUILD
index f7dfd6c6f..5c4396213 100644
--- a/main/perl-image-exiftool/APKBUILD
+++ b/main/perl-image-exiftool/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-image-exiftool
-pkgver=8.90
+pkgver=8.97
 pkgrel=0
 pkgdesc="Perl module for editing exif meta info in files"
 url="http://www.sno.phy.queensu.ca/~phil/exiftool/"
@@ -45,4 +45,4 @@ exiftool() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="c34f2138af14e7ab75bddb12d9e8e726  Image-ExifTool-8.90.tar.gz"
+md5sums="24232211deb55908818efe0341b2cee4  Image-ExifTool-8.97.tar.gz"
diff --git a/main/perl-io-socket-ssl/APKBUILD b/main/perl-io-socket-ssl/APKBUILD
index 4eb258b92..31eed1d5f 100644
--- a/main/perl-io-socket-ssl/APKBUILD
+++ b/main/perl-io-socket-ssl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-io-socket-ssl
 _pkgreal=IO-Socket-SSL
-pkgver=1.66
+pkgver=1.76
 pkgrel=0
 pkgdesc="Nearly transparent SSL encapsulation for IO::Socket::INET."
 url="http://search.cpan.org/dist/IO-Socket-SSL/"
@@ -35,4 +35,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="0f104165ff7da7f46aa8d9c10ac61bdf  IO-Socket-SSL-1.66.tar.gz"
+md5sums="27796a16df658aa3b3d2defd0fe3ac61  IO-Socket-SSL-1.76.tar.gz"
diff --git a/main/perl-xml-simple/APKBUILD b/main/perl-xml-simple/APKBUILD
index 0ebe336d8..edd304805 100644
--- a/main/perl-xml-simple/APKBUILD
+++ b/main/perl-xml-simple/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-xml-simple
-pkgver=2.18
-pkgrel=2
+pkgver=2.20
+pkgrel=0
 pkgdesc="Simple XML parser for perl"
 url="http://search.cpan.org/dist/XML-Simple/"
 arch="noarch"
@@ -23,4 +23,4 @@ package() {
 	find "$pkgdir" -name '.packlist' -delete
 	find "$pkgdir" -name 'perllocal.pod' -delete
 }
-md5sums="593aa8001e5c301cdcdb4bb3b63abc33  XML-Simple-2.18.tar.gz"
+md5sums="4d10964e123b76eca36678464daa63cd  XML-Simple-2.20.tar.gz"
diff --git a/main/poppler-gtk/APKBUILD b/main/poppler-gtk/APKBUILD
index 8009721af..1db518360 100644
--- a/main/poppler-gtk/APKBUILD
+++ b/main/poppler-gtk/APKBUILD
@@ -3,7 +3,7 @@
 # this aport only includes glib/gtk support in order to break the
 # circular make dependency: gtk <- cups <- poppler <- gtk
 
-_ver=0.20.1
+_ver=0.20.2
 # get the pkgver from poppler
 if [ -r ../poppler/APKBUILD ]; then
 	. ../poppler/APKBUILD
@@ -62,4 +62,4 @@ demo() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="a61e3b844061f5324512a16d6d16984c  poppler-0.20.1.tar.gz"
+md5sums="45dd2c16c8c4d1a39e830e45745c4e25  poppler-0.20.2.tar.gz"
diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD
index 858ef6baf..9d6171e80 100644
--- a/main/poppler/APKBUILD
+++ b/main/poppler/APKBUILD
@@ -4,7 +4,7 @@
 # circular make dependency: gtk <- cups <- poppler <- gtk
 # So we build gtk support in poppler-gtk
 pkgname=poppler
-pkgver=0.20.1
+pkgver=0.20.2
 pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="http://poppler.freedesktop.org/"
@@ -44,4 +44,4 @@ utils() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="a61e3b844061f5324512a16d6d16984c  poppler-0.20.1.tar.gz"
+md5sums="45dd2c16c8c4d1a39e830e45745c4e25  poppler-0.20.2.tar.gz"
diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD
index 5954f4f5f..bb0fee056 100644
--- a/main/readline/APKBUILD
+++ b/main/readline/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=readline
-pkgver=6.2.002
+pkgver=6.2.003
 _myver=${pkgver%.*}
 _patchver=${pkgver##*.}
 _suff=${_myver%.*}${_myver#*.}
@@ -49,4 +49,5 @@ package() {
 }
 md5sums="67948acb2ca081f23359d0256e9a271c  readline-6.2.tar.gz
 83287d52a482f790dfb30ec0a8746669  readline62-001
-0665020ea118e8434bd145fb71f452cc  readline62-002"
+0665020ea118e8434bd145fb71f452cc  readline62-002
+c9d5d79718856e711667dede87cb7622  readline62-003"
diff --git a/main/smartmontools/APKBUILD b/main/smartmontools/APKBUILD
index e6f5da5e2..27dae9650 100644
--- a/main/smartmontools/APKBUILD
+++ b/main/smartmontools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=smartmontools
-pkgver=5.42
-pkgrel=1
+pkgver=5.43
+pkgrel=0
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
 url="http://smartmontools.sourceforge.net"
 arch="all"
@@ -27,6 +27,6 @@ package() {
 	install -Dm755 ../smartd.initd "$pkgdir"/etc/init.d/smartd
 	install -Dm644 ../smartd.confd "$pkgdir"/etc/conf.d/smartd
 }
-md5sums="4460bf9a79a1252ff5c00ba52cf76b2a  smartmontools-5.42.tar.gz
+md5sums="a1cb2c3d8cc2de377037fe9e7cef40a9  smartmontools-5.43.tar.gz
 b33edf355a83149119d768f0d75787c8  smartd.initd
 371cdb7cc9dc924b6d12224d66b193c6  smartd.confd"
diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index b683786ed..6f407d89a 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=snort
-pkgver=2.9.2.3
+pkgver=2.9.3
 pkgrel=0
 pkgdesc="An open source network intrusion prevention and detection system"
 url="http://www.snort.org/"
@@ -44,6 +44,6 @@ package() {
         install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort
 }
 
-md5sums="9ddb26005d864577fca66a9a1cdfdc8a  snort-2.9.2.3.tar.gz
+md5sums="e128f5d5d14dad335dc0c549c7fe2e98  snort-2.9.3.tar.gz
 ffda56f7c20f5cea1c37c971e0f1d6c9  snort.initd
 446f8d2b3435b8a6be738da978670605  snort.confd"
diff --git a/main/squark/APKBUILD b/main/squark/APKBUILD
index 34b6a2d26..bef596671 100644
--- a/main/squark/APKBUILD
+++ b/main/squark/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=squark
-pkgver=0.4.3
-pkgrel=1
+pkgver=0.4.4
+pkgrel=0
 pkgdesc="Squark - Squid User Authentication and Rating Kit"
 subpackages=
 depends="haserl lua"
@@ -35,4 +35,4 @@ package() {
 	make FULL_VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir" install
 }
 
-md5sums="dd4d19f01a4d5864e74962b28b39537c  squark-0.4.3.tar.bz2"
+md5sums="13231e4dd44b0dd70b326c7c35690106  squark-0.4.4.tar.bz2"
diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD
index 3ae221422..fb55b9253 100644
--- a/main/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=usbutils
-pkgver=005
+pkgver=006
 pkgrel=0
 pkgdesc="USB Device Utilities"
 url="http://linux-usb.sourceforge.net/"
@@ -9,7 +9,7 @@ license="GPL"
 subpackags="$pkgname-doc"
 depends=
 makedepends="pkgconfig libusb-compat-dev"
-source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2"
+source="http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -31,4 +31,4 @@ package() {
 		"$pkgdir"/usr/lib/
 }
 
-md5sums="6a21f7b6c02b76df5e8a7c208d746654  usbutils-005.tar.bz2"
+md5sums="c9aa14ee3d6c991fda183f42cf72a8a8  usbutils-006.tar.xz"
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index d80398c45..5e65888fd 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vim
-pkgver=7.3.547
+pkgver=7.3.600
 _srcver=${pkgver%.*}
 _patchver=${pkgver##*.}
 pkgrel=0
@@ -610,4 +610,57 @@ f2282f6c276031b5ac10b1c26b249259  7.3.542
 b36f4a6d591216074f059e30185b795b  7.3.544
 4477450c8ebc25f53c69849fde47961a  7.3.545
 5ca25f97d2e8248b0d6063a9ac6067a0  7.3.546
-f5eb24c91a950cbb8bb4197a0c9576c9  7.3.547"
+f5eb24c91a950cbb8bb4197a0c9576c9  7.3.547
+dc458cfe8ffc6b9398c1e2ce9f53d03b  7.3.548
+ad975396a8c6ff6072726a22a449d82b  7.3.549
+1b9a430451c381730566b6997989226c  7.3.550
+46562714604afdaea878000c4c3d207e  7.3.551
+e9ec165f500549d7df5ba1dca13afc9d  7.3.552
+23a5ab0155214e8f0f2c1aaa71950cbc  7.3.553
+dfffb7b5c54c5d9ec8b0dc71e67a2658  7.3.554
+f6c9f15f23e28773411d643afea566e2  7.3.555
+0ea7e9762a526fc078579429e5cb5204  7.3.556
+37b4e98e68f9168dbe170d45cfaee752  7.3.557
+d55e7cb7d754eaa45becba8997f63e1d  7.3.558
+29f57c3b174c62a113a89fd670476e45  7.3.559
+601e5ae0b7aab3e9bfd740913b4de6ad  7.3.560
+eebc28cbb5b8b50152381389714255c5  7.3.561
+9bfdb1b2c2ad5507709e5d087f73cd69  7.3.562
+02e44731e5a40f1f513e1bab93e0c922  7.3.563
+7dab4d26defce84174fc1ce40968f7cd  7.3.564
+bab851bc6d1cacc5b2aa9357091b5850  7.3.565
+a7fc27c3f13890f7985efbf21f436984  7.3.566
+118aea4f408d18c39594ffe2be2d5654  7.3.567
+d222ae3e9bdcfe27e7e56706196afb07  7.3.568
+4fad201269a1868121088104ba2e2cf8  7.3.569
+b0c8bcdb5bca31cda0e3347ed2707e11  7.3.570
+94a1e5061ed54d8c284bf9e9a7a80893  7.3.571
+c8d48801d35d30965c6bef1617271c0d  7.3.572
+d564977f585a6beadc81f3cced20365d  7.3.573
+df348e7ad84f9eb22a90965de5c33799  7.3.574
+749c07df5e36cbd342c3cd9c27d37753  7.3.575
+bafb6e85f0ed5cdb2bb6fa66d83e5219  7.3.576
+e2167696fe85109810cdc8dac0319882  7.3.577
+ce1cd1adadf03ccea372b31059e456ef  7.3.578
+1069ca066d1677e6a4d8e6bc7cda9c1a  7.3.579
+2c8c1c8c879e23f67c7148ee295720f3  7.3.580
+da732dc847b52e0a79a7a95b5496c653  7.3.581
+c81f20d3e7cfe5329a713737fbe6b3a7  7.3.582
+237ca7dc39ffce18d36e778ffd02ef36  7.3.583
+f379b5fb12af3de41d9d966dd6a00bf7  7.3.584
+f4198c4adb7e8746419fbbef68e0a359  7.3.585
+c9f9ee1f94ca881ff6d6640d448a11f1  7.3.586
+f719b5433676977fc5be497cf63b7741  7.3.587
+1669475093547d2f1acc962913528ba9  7.3.588
+c29b13cc89b6c9d72b7d6ae7a92992eb  7.3.589
+352429b56533ba2435e9cf0580097816  7.3.590
+0aee68dbfaaf1afca1244aac3f0b8e6e  7.3.591
+0324c77762c95a4e5668e1b16b4db6c6  7.3.592
+43cd0694cf7ffb60df7d0c34fd631f1f  7.3.593
+966985f5120f5b19080572a4c7958e6b  7.3.594
+d8ecce5da4c377575ce716aeb5f8087c  7.3.595
+e26f6a6804528d875fc3c3241a87f1b3  7.3.596
+c8aebdb727582e57af6be60072f72dae  7.3.597
+9e8b68256c897ef68b33b5d1e268d567  7.3.598
+48920cdf55ae40362efea9fb3c837296  7.3.599
+76222146210a1a5c4ee01d6bf892febb  7.3.600"
diff --git a/testing/open-lldp/APKBUILD b/testing/open-lldp/APKBUILD
new file mode 100644
index 000000000..b2b0c6ce1
--- /dev/null
+++ b/testing/open-lldp/APKBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+pkgname=open-lldp
+_realname=lldpad
+pkgver=0.9.38
+pkgrel=0
+pkgdesc="Open Source implementation of the IEEE standard 802.1AB Link Layer Discovery Protocol (LLDP)"
+url="http://www.open-lldp.org"
+arch="all"
+license="GPL"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://www.open-lldp.org/open-lldp/downloads/$_realname-$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.confd"
+
+_builddir="$srcdir"/$_realname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	sed -i 's/ln -T -s/ln -s/' Makefile.am || exit 1
+	sed -i 's/ln -T -s/ln -s/' Makefile.in || exit 1
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	mkdir -p "$pkgdir"/usr/include/dcbd
+	# ln -s /usr/include/lldpad "$pkgdir"/usr/include/dcbd
+	ln -s /usr/include/lldpad/lldp_dcbx_cmds.h "$pkgdir"/usr/include/dcbd/clif_cmds.h
+	install -m755 -D ../../$pkgname.initd "$pkgdir"/etc/init.d/$_realname
+	install -m644 -D ../../$pkgname.confd "$pkgdir"/etc/conf.d/$_realname
+}
+
+md5sums="a55178979b523c02d0bb90bb36f3a693  lldpad-0.9.38.tar.gz
+4d226f4520fec36afee8e6b6eebf46f1  open-lldp.initd
+a1d2e351028d39193fc0a3466ba4db33  open-lldp.confd"
diff --git a/testing/open-lldp/open-lldp.confd b/testing/open-lldp/open-lldp.confd
new file mode 100644
index 000000000..a4d4b1de8
--- /dev/null
+++ b/testing/open-lldp/open-lldp.confd
@@ -0,0 +1,2 @@
+# Remove existing pid file at startup
+OPTS="-d -f /etc/lldpad.conf"
diff --git a/testing/open-lldp/open-lldp.initd b/testing/open-lldp/open-lldp.initd
new file mode 100755
index 000000000..ed9807d51
--- /dev/null
+++ b/testing/open-lldp/open-lldp.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+
+NAME="lldpad"
+DAEMON="/usr/sbin/$NAME"
+pidfile=/var/run/$NAME.pid
+
+depend() {
+	need net
+	after firewall
+}
+
+start() {
+	ebegin "Starting ${NAME}"
+	start-stop-daemon --start --quiet --pidfile ${pidfile} \
+		--exec ${DAEMON} -- ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${NAME}"
+	start-stop-daemon --stop --exec ${DAEMON}
+	eend $?
+}
+
diff --git a/testing/poppler-qt4/APKBUILD b/testing/poppler-qt4/APKBUILD
index 8ab7f7bea..ea6c85222 100644
--- a/testing/poppler-qt4/APKBUILD
+++ b/testing/poppler-qt4/APKBUILD
@@ -3,7 +3,7 @@
 # this aport only includes glib/gtk support in order to break the
 # circular make dependency: gtk <- cups <- poppler <- gtk
 
-_ver=0.20.1
+_ver=0.20.2
 # get the pkgver from poppler
 if [ -r ../../main/poppler/APKBUILD ]; then
 	. ../../main/poppler/APKBUILD
@@ -38,14 +38,12 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
-		--disable-gdk \
 		--disable-poppler-glib \
 		--enable-cairo-output \
 		--enable-xpdf-headers \
 		--enable-libjpeg \
 		--enable-zlib \
 		--enable-poppler-qt4 \
-		--disable-poppler-qt \
 		--disable-utils \
 		|| return 1
 	make || return 1
@@ -59,4 +57,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
-md5sums="a61e3b844061f5324512a16d6d16984c  poppler-0.20.1.tar.gz"
+md5sums="45dd2c16c8c4d1a39e830e45745c4e25  poppler-0.20.2.tar.gz"