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

13 files changed, 262 insertions, 28 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 0000000000..7eceeaa8c7
--- /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 b2867c980b..2d4a638b9a 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/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index a19514289d..d3453f3cbb 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 e83f7e80bd..b263c22270 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 49c87fc67a..cc87bd9c09 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/mesa/APKBUILD b/main/mesa/APKBUILD
index 00276f10ca..df42270073 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 0000000000..c75d659fa2
--- /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 0000000000..a567b59263
--- /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 0000000000..44bd7b11f5
--- /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/squark/APKBUILD b/main/squark/APKBUILD
index 34b6a2d26f..bef596671c 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/testing/open-lldp/APKBUILD b/testing/open-lldp/APKBUILD
new file mode 100644
index 0000000000..b2b0c6ce18
--- /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 0000000000..a4d4b1de80
--- /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 0000000000..ed9807d514
--- /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 $?
+}
+