Merge branch '3.0' into 3.1

Conflicts: ncurses-ruby/Pkgfile
2014-06-20 02:15:56 +02:00 · 2014-06-20 02:15:56 +02:00 · 31821f0240
commit 31821f0240
parent d32eba8796 8e47a5844d
31 changed files with 262 additions and 155 deletions
--- a/boehm-gc/.md5sum
+++ b/boehm-gc/.md5sum
@ -1,2 +1,2 @@
-f40d9a47c90d60791eeecb484f8df5ee  gc-7.4.0.tar.gz
-59f9a7cc845dcc775e7b7901eb582766  libatomic_ops-7.4.0.tar.gz
+12c05fd2811d989341d8c6d81f66af87  gc-7.4.2.tar.gz
+9c7f41e98cbf4b9dfa54392bc5d9ed65  libatomic_ops-7_4_2.tar.gz
--- a/boehm-gc/Pkgfile
+++ b/boehm-gc/Pkgfile
@ -4,14 +4,15 @@
 # Packager: Han Boetes, han at mijncomputer dot dl

 name=boehm-gc
-version=7.4.0
+version=7.4.2
 release=1
-source=(http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz http://www.hboehm.info/gc/gc_source/libatomic_ops-$version.tar.gz)
+source=(http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz
+        https://github.com/ivmai/libatomic_ops/archive/libatomic_ops-${version//\./_}.tar.gz)

 build () {
    cd gc-$version
    
-    ln -s ../libatomic_ops-$version libatomic_ops
+    ln -s ../libatomic_ops-libatomic_ops-${version//\./_} libatomic_ops

    ./configure \
        --prefix=/usr \
--- a/mupdf/.footprint
+++ b/mupdf/.footprint
@ -5,6 +5,78 @@ drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/mupdf -> mupdf-x11-curl
 -rwxr-xr-x	root/root	usr/bin/mupdf-x11-curl
 -rwxr-xr-x	root/root	usr/bin/mutool
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/mupdf/
+-rwxr-xr-x	root/root	usr/include/mupdf/cbz.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz.h
+drwxr-xr-x	root/root	usr/include/mupdf/fitz/
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/annotation.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/bitmap.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/buffer.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/colorspace.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/compressed-buffer.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/context.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/crypt.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/device.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/display-list.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/document.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/filter.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/font.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/function.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/getopt.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/glyph-cache.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/glyph.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/hash.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/image.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/link.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/math.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/meta.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/outline.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/output-pcl.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/output-png.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/output-pnm.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/output-pwg.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/output-svg.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/output-tga.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/output.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/path.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/pixmap.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/shade.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/store.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/stream.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/string.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/structured-text.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/system.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/text.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/transition.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/tree.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/version.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/write-document.h
+-rwxr-xr-x	root/root	usr/include/mupdf/fitz/xml.h
+-rwxr-xr-x	root/root	usr/include/mupdf/img.h
+-rwxr-xr-x	root/root	usr/include/mupdf/memento.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf.h
+drwxr-xr-x	root/root	usr/include/mupdf/pdf/
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/annot.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/appearance.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/cmap.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/crypt.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/document.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/event.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/field.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/font.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/javascript.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/object.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/output-pdf.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/page.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/parse.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/resource.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/widget.h
+-rwxr-xr-x	root/root	usr/include/mupdf/pdf/xref.h
+-rwxr-xr-x	root/root	usr/include/mupdf/tiff.h
+-rwxr-xr-x	root/root	usr/include/mupdf/xps.h
+drwxr-xr-x	root/root	usr/lib/
+-rwxr-xr-x	root/root	usr/lib/libmupdf.a
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rwxr-xr-x	root/root	usr/man/man1/mudraw.1.gz
--- a/mupdf/.md5sum
+++ b/mupdf/.md5sum
@ -1,2 +1 @@
-0f6840a7020db0c833b0c090ca1864ec  mupdf-1.4-source.tar.gz
-a08fdfe8af29d40eda40a8258d3c686d  mupdf-sys_curl.patch
+89bd4ddc74c266062ebf2702741bb173  mupdf-1.5-source.tar.gz
--- a/mupdf/Pkgfile
+++ b/mupdf/Pkgfile
@ -4,21 +4,18 @@
 # Depends on:  curl freetype libjpeg xorg-libxext

 name=mupdf
-version=1.4
+version=1.5
 release=1
-source=(http://mupdf.com/download/$name-$version-source.tar.gz
-        $name-sys_curl.patch)
+source=(http://mupdf.com/download/$name-$version-source.tar.gz)

 build() {
    cd $name-$version-source
    
-    patch -p1 -i $SRC/$name-sys_curl.patch
-
    rm -r thirdparty/{freetype*,jpeg*,zlib,curl}
    make build=release 
    make prefix=$PKG/usr mandir=$PKG/usr/man install
   
    ln -s mupdf-x11-curl $PKG/usr/bin/mupdf
    rm $PKG/usr/bin/mupdf-x11
-    rm -r $PKG/usr/{include,lib,share}
-}
+    rm -r $PKG/usr/share
+} 
--- a/mupdf/mupdf-sys_curl.patch
+++ b/mupdf/mupdf-sys_curl.patch
@ -1,29 +0,0 @@
-diff -Nru mupdf-1.4rc1-source.orig/Makerules mupdf-1.4rc1-source/Makerules
--- mupdf-1.4rc1-source.orig/Makerules	2014-04-08 15:47:54.229773268 +0200
-+++ mupdf-1.4rc1-source/Makerules	2014-04-08 16:12:39.293770693 +0200
-@@ -76,6 +76,8 @@
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
- 
- endif
- 
-diff -Nru mupdf-1.4rc1-source.orig/Makethird mupdf-1.4rc1-source/Makethird
--- mupdf-1.4rc1-source.orig/Makethird	2014-04-08 15:47:54.329769765 +0200
-+++ mupdf-1.4rc1-source/Makethird	2014-04-08 16:17:27.233759450 +0200
-@@ -454,6 +454,13 @@
- CURL_LIBS := $(SYS_CURL_DEPS)
- 
- HAVE_CURL := yes
-+
-+else
-+
-+CURL_CFLAGS := $(SYS_CURL_CFLAGS)
-+CURL_LIBS := $(SYS_CURL_LIBS)
-+HAVE_CURL := yes
-+
- endif
- 
- # --- X11 ---
--- a/ncurses-ruby/Pkgfile
+++ b/ncurses-ruby/Pkgfile
@ -6,7 +6,7 @@
 name=ncurses-ruby
 version=1.3.1
 release=2
-source=(http://download.berlios.de/$name/$name-$version.tar.bz2
+source=(http://downloads.sourceforge.net/project/ncurses-ruby.berlios/$name-$version.tar.bz2
        http://pkgs.fedoraproject.org/cgit/ruby-ncurses.git/plain/0001-STR2CSTR-deprecated.patch)

 build () {
--- a/nvidia/.footprint
+++ b/nvidia/.footprint
@ -6,7 +6,11 @@ drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/modules/
 drwxr-xr-x	root/root	lib/modules/<kernel-version>/
 drwxr-xr-x	root/root	lib/modules/<kernel-version>/extra/
+-rw-r--r--	root/root	lib/modules/<kernel-version>/extra/nvidia-uvm.ko
 -rw-r--r--	root/root	lib/modules/<kernel-version>/extra/nvidia.ko
+drwxr-xr-x	root/root	lib/udev/
+drwxr-xr-x	root/root	lib/udev/rules.d/
+-rw-r--r--	root/root	lib/udev/rules.d/90-nvidia-uvm.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/nvidia-debugdump
@ -17,6 +21,7 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libGL.so.331.79
 lrwxrwxrwx	root/root	usr/lib/libGL_so_1_2_nvidia -> libGL.so.331.79
+lrwxrwxrwx	root/root	usr/lib/libOpenCL.so -> libOpenCL.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libOpenCL.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libcuda.so.331.79
 lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so -> libnvcuvid.so.331.79
--- a/nvidia/.md5sum
+++ b/nvidia/.md5sum
@ -1 +1,2 @@
+4511024cc556d0c6e7c467b6789524e2  90-nvidia-uvm.rules
 1f0708b913403b4f5b494b0daf0415eb  NVIDIA-Linux-x86_64-331.79-no-compat32.run
--- a/nvidia/90-nvidia-uvm.rules
+++ b/nvidia/90-nvidia-uvm.rules
@ -0,0 +1 @@
+KERNEL=="nvidia_uvm", RUN+="/bin/bash -c '/bin/mknod -m 660 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0; /bin/chgrp video /dev/nvidia-uvm'"
--- a/nvidia/Pkgfile
+++ b/nvidia/Pkgfile
@ -5,8 +5,9 @@

 name=nvidia
 version=331.79
-release=1
-source=(ftp://download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run)
+release=2
+source=(ftp://download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run \
+    90-nvidia-uvm.rules)

 build() {
    sh NVIDIA-Linux-x86_64-$version-no-compat32.run --extract-only
@ -29,19 +30,21 @@ build() {
    install -m 0755 libnvcuvid.so.$version         $PKG/usr/lib
    install -m 0755 tls/libnvidia-tls.so.$version  $PKG/usr/lib/tls
    install -m 0755 libvdpau_nvidia.so.$version    $PKG/usr/lib/vdpau
-    
+
    ln -s libvdpau_nvidia.so.$version $PKG/usr/lib/vdpau/libvdpau_nvidia.so.1
    ln -s libvdpau_nvidia.so.$version $PKG/usr/lib/vdpau/libvdpau_nvidia.so

    ln -s libnvcuvid.so.$version $PKG/usr/lib/libnvcuvid.so.1
    ln -s libnvcuvid.so.$version $PKG/usr/lib/libnvcuvid.so

+    ln -s libOpenCL.so.1.0.0 $PKG/usr/lib/libOpenCL.so
+
    # xorg driver/extensions
    install -d $PKG/usr/lib/xorg/modules/{drivers,extensions}
    install -m 0755 nvidia_drv.so                  $PKG/usr/lib/xorg/modules/drivers
    install -m 0755 libglx.so.$version             $PKG/usr/lib/xorg/modules/extensions
    install -m 0755 libnvidia-wfb.so.$version      $PKG/usr/lib/xorg/modules
-    
+
    # nvidia programs amd man-pages
    install -d $PKG/usr/{bin,man/man1}
    install -m 0755 nvidia-{debugdump,persistenced,settings,smi,xconfig} \
@ -62,8 +65,17 @@ build() {
    # opencl icd file
    install -m 0644 -D nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd

+    # nvidia-uvm module udev rule
+    install -d $PKG/lib/udev/rules.d
+    install -m 0644 $SRC/90-nvidia-uvm.rules $PKG/lib/udev/rules.d/90-nvidia-uvm.rules
+
    # kernel module
    cd kernel
    IGNORE_CC_MISMATCH=1 make module
    install -D -m 0644 nvidia.ko $PKG/lib/modules/`uname -r`/extra/nvidia.ko
+
+    # nvidia-uvm module
+    cd uvm
+    IGNORE_CC_MISMATCH=1 make module
+    install -D -m 0644 nvidia-uvm.ko $PKG/lib/modules/`uname -r`/extra/nvidia-uvm.ko
 }
--- a/qt4/.footprint
+++ b/qt4/.footprint
@ -269,6 +269,7 @@ drwxr-xr-x	root/root	usr/share/qt4/include/Qt/
 -rw-r--r--	root/root	usr/share/qt4/include/Qt/qatomic_i386.h
 -rw-r--r--	root/root	usr/share/qt4/include/Qt/qatomic_ia64.h
 -rw-r--r--	root/root	usr/share/qt4/include/Qt/qatomic_integrity.h
+-rw-r--r--	root/root	usr/share/qt4/include/Qt/qatomic_m68k.h
 -rw-r--r--	root/root	usr/share/qt4/include/Qt/qatomic_macosx.h
 -rw-r--r--	root/root	usr/share/qt4/include/Qt/qatomic_mips.h
 -rw-r--r--	root/root	usr/share/qt4/include/Qt/qatomic_parisc.h
@ -1487,6 +1488,7 @@ drwxr-xr-x	root/root	usr/share/qt4/include/QtCore/
 -rw-r--r--	root/root	usr/share/qt4/include/QtCore/qatomic_i386.h
 -rw-r--r--	root/root	usr/share/qt4/include/QtCore/qatomic_ia64.h
 -rw-r--r--	root/root	usr/share/qt4/include/QtCore/qatomic_integrity.h
+-rw-r--r--	root/root	usr/share/qt4/include/QtCore/qatomic_m68k.h
 -rw-r--r--	root/root	usr/share/qt4/include/QtCore/qatomic_macosx.h
 -rw-r--r--	root/root	usr/share/qt4/include/QtCore/qatomic_mips.h
 -rw-r--r--	root/root	usr/share/qt4/include/QtCore/qatomic_parisc.h
@ -3102,104 +3104,104 @@ drwxr-xr-x	root/root	usr/share/qt4/include/QtXmlPatterns/
 drwxr-xr-x	root/root	usr/share/qt4/lib/
 -rw-r--r--	root/root	usr/share/qt4/lib/libQt3Support.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQt3Support.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQt3Support.so -> libQt3Support.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQt3Support.so.4 -> libQt3Support.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQt3Support.so.4.8 -> libQt3Support.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQt3Support.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQt3Support.so -> libQt3Support.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQt3Support.so.4 -> libQt3Support.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQt3Support.so.4.8 -> libQt3Support.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQt3Support.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtCLucene.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtCLucene.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCLucene.so -> libQtCLucene.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCLucene.so.4 -> libQtCLucene.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCLucene.so.4.8 -> libQtCLucene.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtCLucene.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCLucene.so -> libQtCLucene.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCLucene.so.4 -> libQtCLucene.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCLucene.so.4.8 -> libQtCLucene.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtCLucene.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtCore.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtCore.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCore.so -> libQtCore.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCore.so.4 -> libQtCore.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCore.so.4.8 -> libQtCore.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtCore.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCore.so -> libQtCore.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCore.so.4 -> libQtCore.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtCore.so.4.8 -> libQtCore.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtCore.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtDBus.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtDBus.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDBus.so -> libQtDBus.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDBus.so.4 -> libQtDBus.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDBus.so.4.8 -> libQtDBus.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtDBus.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDBus.so -> libQtDBus.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDBus.so.4 -> libQtDBus.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDBus.so.4.8 -> libQtDBus.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtDBus.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtDeclarative.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtDeclarative.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDeclarative.so -> libQtDeclarative.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDeclarative.so.4 -> libQtDeclarative.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDeclarative.so.4.8 -> libQtDeclarative.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtDeclarative.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDeclarative.so -> libQtDeclarative.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDeclarative.so.4 -> libQtDeclarative.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDeclarative.so.4.8 -> libQtDeclarative.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtDeclarative.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtDesigner.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesigner.so -> libQtDesigner.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesigner.so.4 -> libQtDesigner.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesigner.so.4.8 -> libQtDesigner.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtDesigner.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesigner.so -> libQtDesigner.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesigner.so.4 -> libQtDesigner.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesigner.so.4.8 -> libQtDesigner.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtDesigner.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtDesignerComponents.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesignerComponents.so -> libQtDesignerComponents.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesignerComponents.so.4 -> libQtDesignerComponents.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesignerComponents.so.4.8 -> libQtDesignerComponents.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtDesignerComponents.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesignerComponents.so -> libQtDesignerComponents.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesignerComponents.so.4 -> libQtDesignerComponents.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtDesignerComponents.so.4.8 -> libQtDesignerComponents.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtDesignerComponents.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtGui.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtGui.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtGui.so -> libQtGui.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtGui.so.4 -> libQtGui.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtGui.so.4.8 -> libQtGui.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtGui.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtGui.so -> libQtGui.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtGui.so.4 -> libQtGui.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtGui.so.4.8 -> libQtGui.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtGui.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtHelp.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtHelp.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtHelp.so -> libQtHelp.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtHelp.so.4 -> libQtHelp.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtHelp.so.4.8 -> libQtHelp.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtHelp.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtHelp.so -> libQtHelp.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtHelp.so.4 -> libQtHelp.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtHelp.so.4.8 -> libQtHelp.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtHelp.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtMultimedia.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtMultimedia.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtMultimedia.so -> libQtMultimedia.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtMultimedia.so.4 -> libQtMultimedia.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtMultimedia.so.4.8 -> libQtMultimedia.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtMultimedia.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtMultimedia.so -> libQtMultimedia.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtMultimedia.so.4 -> libQtMultimedia.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtMultimedia.so.4.8 -> libQtMultimedia.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtMultimedia.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtNetwork.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtNetwork.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtNetwork.so -> libQtNetwork.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtNetwork.so.4 -> libQtNetwork.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtNetwork.so.4.8 -> libQtNetwork.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtNetwork.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtNetwork.so -> libQtNetwork.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtNetwork.so.4 -> libQtNetwork.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtNetwork.so.4.8 -> libQtNetwork.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtNetwork.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtOpenGL.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtOpenGL.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtOpenGL.so -> libQtOpenGL.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtOpenGL.so.4 -> libQtOpenGL.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtOpenGL.so.4.8 -> libQtOpenGL.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtOpenGL.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtOpenGL.so -> libQtOpenGL.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtOpenGL.so.4 -> libQtOpenGL.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtOpenGL.so.4.8 -> libQtOpenGL.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtOpenGL.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtScript.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtScript.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScript.so -> libQtScript.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScript.so.4 -> libQtScript.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScript.so.4.8 -> libQtScript.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtScript.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScript.so -> libQtScript.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScript.so.4 -> libQtScript.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScript.so.4.8 -> libQtScript.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtScript.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtScriptTools.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtScriptTools.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScriptTools.so -> libQtScriptTools.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScriptTools.so.4 -> libQtScriptTools.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScriptTools.so.4.8 -> libQtScriptTools.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtScriptTools.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScriptTools.so -> libQtScriptTools.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScriptTools.so.4 -> libQtScriptTools.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtScriptTools.so.4.8 -> libQtScriptTools.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtScriptTools.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtSql.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtSql.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSql.so -> libQtSql.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSql.so.4 -> libQtSql.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSql.so.4.8 -> libQtSql.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtSql.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSql.so -> libQtSql.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSql.so.4 -> libQtSql.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSql.so.4.8 -> libQtSql.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtSql.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtSvg.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtSvg.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSvg.so -> libQtSvg.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSvg.so.4 -> libQtSvg.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSvg.so.4.8 -> libQtSvg.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtSvg.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSvg.so -> libQtSvg.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSvg.so.4 -> libQtSvg.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtSvg.so.4.8 -> libQtSvg.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtSvg.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtTest.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtTest.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtTest.so -> libQtTest.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtTest.so.4 -> libQtTest.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtTest.so.4.8 -> libQtTest.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtTest.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtTest.so -> libQtTest.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtTest.so.4 -> libQtTest.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtTest.so.4.8 -> libQtTest.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtTest.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtUiTools.a
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtUiTools.prl
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtWebKit.la
@ -3210,16 +3212,16 @@ lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtWebKit.so.4.9 -> libQtWebKit.so.4.9.
 -rwxr-xr-x	root/root	usr/share/qt4/lib/libQtWebKit.so.4.9.4
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtXml.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtXml.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXml.so -> libQtXml.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXml.so.4 -> libQtXml.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXml.so.4.8 -> libQtXml.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtXml.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXml.so -> libQtXml.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXml.so.4 -> libQtXml.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXml.so.4.8 -> libQtXml.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtXml.so.4.8.6
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtXmlPatterns.la
 -rw-r--r--	root/root	usr/share/qt4/lib/libQtXmlPatterns.prl
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXmlPatterns.so -> libQtXmlPatterns.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXmlPatterns.so.4 -> libQtXmlPatterns.so.4.8.5
-lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXmlPatterns.so.4.8 -> libQtXmlPatterns.so.4.8.5
-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtXmlPatterns.so.4.8.5
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXmlPatterns.so -> libQtXmlPatterns.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXmlPatterns.so.4 -> libQtXmlPatterns.so.4.8.6
+lrwxrwxrwx	root/root	usr/share/qt4/lib/libQtXmlPatterns.so.4.8 -> libQtXmlPatterns.so.4.8.6
+-rwxr-xr-x	root/root	usr/share/qt4/lib/libQtXmlPatterns.so.4.8.6
 drwxr-xr-x	root/root	usr/share/qt4/mkspecs/
 drwxr-xr-x	root/root	usr/share/qt4/mkspecs/common/
 drwxr-xr-x	root/root	usr/share/qt4/mkspecs/common/aix/
@ -3473,6 +3475,7 @@ drwxr-xr-x	root/root	usr/share/qt4/translations/
 -rw-r--r--	root/root	usr/share/qt4/translations/assistant_cs.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/assistant_da.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/assistant_de.qm
+-rw-r--r--	root/root	usr/share/qt4/translations/assistant_eu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/assistant_fr.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/assistant_hu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/assistant_ja.qm
@ -3497,6 +3500,7 @@ drwxr-xr-x	root/root	usr/share/qt4/translations/
 -rw-r--r--	root/root	usr/share/qt4/translations/designer_zh_TW.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/linguist_cs.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/linguist_de.qm
+-rw-r--r--	root/root	usr/share/qt4/translations/linguist_eu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/linguist_fr.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/linguist_hu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/linguist_ja.qm
@ -3512,6 +3516,7 @@ drwxr-xr-x	root/root	usr/share/qt4/translations/
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_da.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_de.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_es.qm
+-rw-r--r--	root/root	usr/share/qt4/translations/qt_eu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_fa.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_fr.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_gl.qm
@ -3519,6 +3524,7 @@ drwxr-xr-x	root/root	usr/share/qt4/translations/
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_help_cs.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_help_da.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_help_de.qm
+-rw-r--r--	root/root	usr/share/qt4/translations/qt_help_eu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_help_fr.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_help_gl.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_help_hu.qm
@ -3543,6 +3549,8 @@ drwxr-xr-x	root/root	usr/share/qt4/translations/
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_uk.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_zh_CN.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qt_zh_TW.qm
+-rw-r--r--	root/root	usr/share/qt4/translations/qtconfig_eu.qm
+-rw-r--r--	root/root	usr/share/qt4/translations/qtconfig_he.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qtconfig_hu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qtconfig_ja.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qtconfig_ko.qm
@ -3552,6 +3560,8 @@ drwxr-xr-x	root/root	usr/share/qt4/translations/
 -rw-r--r--	root/root	usr/share/qt4/translations/qtconfig_uk.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qtconfig_zh_CN.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qtconfig_zh_TW.qm
+-rw-r--r--	root/root	usr/share/qt4/translations/qtscript_eu.qm
+-rw-r--r--	root/root	usr/share/qt4/translations/qvfb_eu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qvfb_hu.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qvfb_ja.qm
 -rw-r--r--	root/root	usr/share/qt4/translations/qvfb_ko.qm
--- a/qt4/.md5sum
+++ b/qt4/.md5sum
@ -1 +1 @@
-1864987bdbb2f58f8ae8b350dfdbe133  qt-everywhere-opensource-src-4.8.5.tar.gz
+2edbe4d6c2eff33ef91732602f3518eb  qt-everywhere-opensource-src-4.8.6.tar.gz
--- a/qt4/Pkgfile
+++ b/qt4/Pkgfile
@ -5,7 +5,7 @@
 # Depends on: fontconfig glib libmng libpng mesa3d xorg-libxcursor xorg-libxi xorg-libxinerama xorg-libxrandr dbus gst-plugins-base

 name=qt4
-version=4.8.5
+version=4.8.6
 release=1
 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/qt-everywhere-opensource-src-$version.tar.gz)

--- a/stunnel/.md5sum
+++ b/stunnel/.md5sum
@ -1,3 +1,3 @@
 20d8078911733e4de22903034e725db6  stunnel
-7b63266b6fa05da696729e245100da65  stunnel-5.01.tar.gz
-e7c5ad19e0c7268a571f3b1b95435fef  stunnel-config.patch
+bb48b1c18cfc0a42708ef996b1a26926  stunnel-5.02.tar.gz
+1b60ebc3897072a5169d178483950f5b  stunnel-config.patch
--- a/stunnel/Pkgfile
+++ b/stunnel/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  openssl tcp_wrappers zlib

 name=stunnel
-version=5.01
+version=5.02
 release=1
 source=(http://stunnel.cybermirror.org/archive/5.x/$name-$version.tar.gz \
        $name-config.patch $name)
--- a/stunnel/stunnel-config.patch
+++ b/stunnel/stunnel-config.patch
@ -1,6 +1,6 @@
-diff -Nru stunnel-5.00.orig/src/Makefile.in stunnel-5.00/src/Makefile.in
--- stunnel-5.00.orig/src/Makefile.in	2014-03-07 10:30:11.982768737 +0100
-+++ stunnel-5.00/src/Makefile.in	2014-03-07 10:31:17.433779070 +0100
+diff -Nru stunnel-5.02.orig/src/Makefile.in stunnel-5.02/src/Makefile.in
+--- stunnel-5.02.orig/src/Makefile.in	2014-06-12 20:42:46.103102496 +0200
+++ stunnel-5.02/src/Makefile.in	2014-06-12 20:43:19.441948681 +0200
@@ -310,7 +310,7 @@
 
 # Additional preprocesor definitions
@ -10,14 +10,14 @@ diff -Nru stunnel-5.00.orig/src/Makefile.in stunnel-5.00/src/Makefile.in
 
 # Win32 executable
 EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \
-diff -Nru stunnel-5.00.orig/tools/stunnel.conf-sample.in stunnel-5.00/tools/stunnel.conf-sample.in
--- stunnel-5.00.orig/tools/stunnel.conf-sample.in	2014-03-07 10:30:11.986101953 +0100
-+++ stunnel-5.00/tools/stunnel.conf-sample.in	2014-03-07 10:30:40.365094717 +0100
+diff -Nru stunnel-5.02.orig/tools/stunnel.conf-sample.in stunnel-5.02/tools/stunnel.conf-sample.in
+--- stunnel-5.02.orig/tools/stunnel.conf-sample.in	2014-06-12 20:42:46.106435713 +0200
+++ stunnel-5.02/tools/stunnel.conf-sample.in	2014-06-12 20:43:34.534759673 +0200
@@ -9,25 +9,33 @@
 
 ; A copy of some devices and system files is needed within the chroot jail
 ; Chroot conflicts with configuration file reload and many other features
-chroot = @prefix@/var/lib/stunnel/
+-;chroot = @prefix@/var/lib/stunnel/
 +chroot = /var/run/stunnel/
 ; Chroot jail can be escaped if setuid option is not used
 -setuid = nobody
@ -25,17 +25,18 @@ diff -Nru stunnel-5.00.orig/tools/stunnel.conf-sample.in stunnel-5.00/tools/stun
 +setuid = stunnel
 +setgid = stunnel
 
- ; PID is created inside the chroot jail
- pid = /stunnel.pid
+ ; PID file is created inside the chroot jail (if enabled)
+-;pid = @prefix@/var/run/stunnel.pid
+pid = /stunnel.pid
 
- ; Debugging stuff (may useful for troubleshooting)
+ ; Debugging stuff (may be useful for troubleshooting)
 ;debug = 7
 +; logfile is created inside the chroot jail
 ;output = stunnel.log
 +; without chroot
 +;output = /var/log/stunnel.log
 +; log via syslog
-+syslog = yes
+syslog =yes
 +
 +; Enable or disable the use of libwrap
 +libwrap = yes
@ -47,8 +48,8 @@ diff -Nru stunnel-5.00.orig/tools/stunnel.conf-sample.in stunnel-5.00/tools/stun
 ; Certificate/key is needed in server mode and optional in client mode
 -cert = @prefix@/etc/stunnel/mail.pem
 -;key = @prefix@/etc/stunnel/mail.pem
-+cert = /etc/ssl/certs/stunnel.crt
-+key  = /etc/ssl/keys/stunnel.key
+cert = /etc/ssl/stunnel.crt
+key = /etc/ssl/stunnel.key
 
 ; Authentication stuff needs to be configured to prevent MITM attacks
 ; It is not enabled by default!
--- a/sylpheed/.md5sum
+++ b/sylpheed/.md5sum
@ -1 +1 @@
-9071bb341a6d96244fe7cd5ff013c70d  sylpheed-3.4.1.tar.bz2
+d4e53489763ff2cb575ab02890d91dc9  sylpheed-3.4.2.tar.bz2
--- a/sylpheed/Pkgfile
+++ b/sylpheed/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  gtk, openssl

 name=sylpheed
-version=3.4.1
+version=3.4.2
 release=1
 source=(http://sylpheed.sraoss.jp/sylpheed/v3.4/$name-$version.tar.bz2)

--- a/tdb/.md5sum
+++ b/tdb/.md5sum
@ -1,2 +1,3 @@
+6d0ef98fea354de03c423c6ada908c86  0001-tdb-include-include-stdbool.h-in-tdb.h.patch
 f18cd6afc4f5670edfe58f72d2665f94  tdb-1.3.0.tar.gz
 5b28be5fb8107988aaa0ff4b650fb296  tdb-man-1.3.0.tar.xz
--- a/tdb/0001-tdb-include-include-stdbool.h-in-tdb.h.patch
+++ b/tdb/0001-tdb-include-include-stdbool.h-in-tdb.h.patch
@ -0,0 +1,27 @@
+From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 23 May 2014 10:08:14 -0700
+Subject: [PATCH] tdb/include: include stdbool.h in tdb.h
+
+Commit db5bda56bf08 (tdb: add TDB_MUTEX_LOCKING support) adds a bool, but does
+not include stdbool.h. This causes any build including tdb.h to fail, at least
+for me with GCC 4.9.0.
+---
+ lib/tdb/include/tdb.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h
+index 5ea5e60..03e429c 100644
+--- a/lib/tdb/include/tdb.h
+++ b/lib/tdb/include/tdb.h
+@@ -31,6 +31,7 @@ extern "C" {
+ #endif
+ 
+ #include <signal.h>
+#include <stdbool.h>
+ 
+ /**
+  * @defgroup tdb The tdb API
+-- 
+1.9.3
+
--- a/tdb/Pkgfile
+++ b/tdb/Pkgfile
@ -5,12 +5,14 @@

 name=tdb
 version=1.3.0
-release=1
+release=2
 source=(http://www.samba.org/ftp/$name/$name-$version.tar.gz
-        $name-man-$version.tar.xz)
+        $name-man-$version.tar.xz
+        0001-tdb-include-include-stdbool.h-in-tdb.h.patch)

 build () {
    cd $name-$version
+    patch -p3 -i $SRC/0001-tdb-include-include-stdbool.h-in-tdb.h.patch
    ./configure --prefix=/usr --mandir=/usr/man
    make
    make DESTDIR=$PKG install
--- a/u-boot-tools/.md5sum
+++ b/u-boot-tools/.md5sum
@ -1 +1 @@
-e531307578f6d32a7ccb1d04f1e08cbc  u-boot-2014.01.tar.bz2
+6d2116d1385a66e9a59742caa9d62a54  u-boot-2014.04.tar.bz2
--- a/u-boot-tools/Pkgfile
+++ b/u-boot-tools/Pkgfile
@ -5,7 +5,7 @@
 # Depends on:

 name=u-boot-tools
-version=2014.01
+version=2014.04
 release=1
 source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$version.tar.bz2)

@ -13,8 +13,9 @@ build() {
  cd u-boot-$version

  # use custom compiler flags
-  sed -e "/^HOSTCFLAGS/ s/-O2/\$(CUSTOMCFLAGS)/" -i config.mk
+  sed -e "/^HOSTCFLAGS/ s/-O2/\$(CUSTOMCFLAGS)/" -i Makefile

+  make sandbox_config
  make V=1 tools CUSTOMCFLAGS="$CFLAGS" TOOLSUBDIRS=""

  install -d -m 0755 $PKG/usr/{bin,man/man1}
--- a/unrar/.md5sum
+++ b/unrar/.md5sum
@ -1 +1 @@
-809db67b74942af7cf1d40edcec92976  unrarsrc-5.1.5.tar.gz
+be9607c59d62c3b101a70cd62c681515  unrarsrc-5.1.6.tar.gz
--- a/unrar/Pkgfile
+++ b/unrar/Pkgfile
@ -5,7 +5,7 @@
 # Depends on:

 name=unrar
-version=5.1.5
+version=5.1.6
 release=1
 source=(http://www.rarlab.com/rar/${name}src-$version.tar.gz)

--- a/wine/.footprint
+++ b/wine/.footprint
@ -1270,6 +1270,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/msacm32.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/msacm32.drv
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/msadp32.acm
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/msasn1.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mscat32.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mscms.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/mscoree.dll
@ -1649,6 +1650,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/libmpr.def
 -rw-r--r--	root/root	usr/lib/wine/libmprapi.def
 -rw-r--r--	root/root	usr/lib/wine/libmsacm32.def
+-rw-r--r--	root/root	usr/lib/wine/libmsasn1.def
 -rw-r--r--	root/root	usr/lib/wine/libmscms.def
 -rw-r--r--	root/root	usr/lib/wine/libmsdmo.def
 -rw-r--r--	root/root	usr/lib/wine/libmshtml.def
@ -1770,6 +1772,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib/wine/msacm32.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/msacm32.drv.so
 -rwxr-xr-x	root/root	usr/lib/wine/msadp32.acm.so
+-rwxr-xr-x	root/root	usr/lib/wine/msasn1.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/mscat32.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/mscms.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/mscoree.dll.so
@ -2528,6 +2531,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/msacm32.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/msacm32.drv
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/msadp32.acm
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/msasn1.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mscat32.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mscms.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/mscoree.dll
@ -2956,6 +2960,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/libmpr.def
 -rw-r--r--	root/root	usr/lib32/wine/libmprapi.def
 -rw-r--r--	root/root	usr/lib32/wine/libmsacm32.def
+-rw-r--r--	root/root	usr/lib32/wine/libmsasn1.def
 -rw-r--r--	root/root	usr/lib32/wine/libmscms.def
 -rw-r--r--	root/root	usr/lib32/wine/libmsdmo.def
 -rw-r--r--	root/root	usr/lib32/wine/libmshtml.def
@ -3084,6 +3089,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib32/wine/msacm32.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/msacm32.drv.so
 -rwxr-xr-x	root/root	usr/lib32/wine/msadp32.acm.so
+-rwxr-xr-x	root/root	usr/lib32/wine/msasn1.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/mscat32.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/mscms.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/mscoree.dll.so
--- a/wine/.md5sum
+++ b/wine/.md5sum
@ -1,4 +1,4 @@
-31bec293e8c87ce3696f1e78730f5d4d  wine-1.7.19.tar.bz2
+439a9b275be4953fde194ca949568da1  wine-1.7.20.tar.bz2
 582a32cde40c165c20d1b4790abab4cd  wine-mono-4.5.2.msi
 766bb034172f7f0a97443951a02a0df8  wine_gecko-2.24-x86.msi
 1912fd191872c72d5f562283e44e8ab4  wine_gecko-2.24-x86_64.msi
--- a/wine/Pkgfile
+++ b/wine/Pkgfile
@ -5,7 +5,7 @@
 # Depends on: fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-32 prelink gnutls-32

 name=wine
-version=1.7.19
+version=1.7.20
 release=1
 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
 	http://downloads.sourceforge.net/wine/wine_gecko-2.24-x86.msi
--- a/xterm/.md5sum
+++ b/xterm/.md5sum
@ -1,2 +1,2 @@
 2bc971a1753fe57aca05fde7c005a16c  configure.diff
-8a9460d848cf4ed244fcfc9b07d1c3d0  xterm-304.tgz
+4ec3183d153087aee9cc20f90acdf2f6  xterm-306.tgz
--- a/xterm/Pkgfile
+++ b/xterm/Pkgfile
@ -5,7 +5,7 @@
 # Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc

 name=xterm
-version=304
+version=306
 release=1
 source=(ftp://invisible-island.net/$name/$name-$version.tgz \
        configure.diff)
				`@ -0,0 +1 @@`
				`KERNEL=="nvidia_uvm", RUN+="/bin/bash -c '/bin/mknod -m 660 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices \| cut -d \ -f 1) 0; /bin/chgrp video /dev/nvidia-uvm'"`