Merge branch 'master' into perl-5.20

2014-09-28 09:37:38 +02:00 · 2014-09-28 09:37:38 +02:00 · 3765a86768
commit 3765a86768
parent 9126b026d8 9395c06f96
67 changed files with 764 additions and 528 deletions
--- a/common/environment/configure/pkg-config.sh
+++ b/common/environment/configure/pkg-config.sh
@ -1,15 +1,5 @@
 # This snippet setups pkg-config vars.

-set -a
-
 if [ -z "$CHROOT_READY" ]; then
-	PKG_CONFIG_PATH="${XBPS_MASTERDIR}/usr/lib/pkgconfig:${XBPS_MASTERDIR}/usr/share/pkgconfig"
+	export PKG_CONFIG_PATH="${XBPS_MASTERDIR}/usr/lib/pkgconfig:${XBPS_MASTERDIR}/usr/share/pkgconfig"
 fi
-
-if [ "$CROSS_BUILD" ]; then
-	PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
-	PKG_CONFIG_PATH="$XBPS_CROSS_BASE/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig"
-	PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/lib/pkgconfig"
-fi
-
-set +a
--- a/common/hooks/post-install/03-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/03-strip-and-debug-pkgs.sh
@ -64,6 +64,10 @@ hook() {
 	fi

 	find ${PKGDESTDIR} -type f | while read f; do
+		if [[ $f =~ ^/usr/lib/debug/ ]]; then
+			continue
+		fi
+
 		fname=$(basename "$f")
 		for x in ${nostrip_files}; do
 			if [ "$x" = "$fname" ]; then
@ -77,6 +81,7 @@ hook() {
 		fi
 		case "$(file -bi "$f")" in
 		application/x-executable*)
+			chmod 755 "$f"
 			if echo "$(file $f)" | grep -q "statically linked"; then
 				# static binary
 				$STRIP "$f"
@ -97,6 +102,7 @@ hook() {
 			fi
 			;;
 		application/x-sharedlib*)
+			chmod 755 "$f"
 			# shared library
 			make_debug "$f"
 			$STRIP --strip-unneeded "$f"
@ -116,6 +122,7 @@ hook() {
 			attach_debug "$f"
 			;;
 		application/x-archive*)
+			chmod 644 "$f"
 			$STRIP --strip-debug "$f"
 			if [ $? -ne 0 ]; then
 				msg_red "$pkgver: failed to strip ${f#$PKGDESTDIR}\n"
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@ -44,14 +44,16 @@ generic_wrapper3() {

 	cp ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ${WRAPPERDIR}
 	sed -e "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" -i ${WRAPPERDIR}/${wrapper}
-	sed -e "s,/usr/lib,${XBPS_CROSS_BASE}/usr/lib,g" -i ${WRAPPERDIR}/${wrapper}
+	sed -e "s,libdir=/usr/lib,libdir=${XBPS_CROSS_BASE}/usr/lib,g" -i ${WRAPPERDIR}/${wrapper}
 	sed -e "s,^prefix=/usr,prefix=${XBPS_CROSS_BASE}/usr," -i ${WRAPPERDIR}/${wrapper}
+
 	chmod 755 ${WRAPPERDIR}/${wrapper}
 }

 python_wrapper() {
 	local wrapper="$1" version="$2"

+	[ -x ${WRAPPERDIR}/${wrapper} ] && return 0
 	cat >>${WRAPPERDIR}/${wrapper}<<_EOF
 #!/bin/sh
 if [ "\$1" = "--includes" ]; then
@ -62,12 +64,30 @@ _EOF
 	chmod 755 ${WRAPPERDIR}/${wrapper}
 }

+pkgconfig_wrapper() {
+	if [ ! -x /usr/bin/pkg-config ]; then
+		return 0
+	fi
+	[ -x ${WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config ] && return 0
+	cat >>${WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config<<_EOF
+#!/bin/sh
+
+export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/lib/pkgconfig"
+exec /usr/bin/pkg-config "\$@"
+_EOF
+	chmod 755 ${WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config
+	ln -sf ${XBPS_CROSS_TRIPLET}-pkg-config ${WRAPPERDIR}/pkg-config
+}
+
 hook() {
 	[ -z "$CROSS_BUILD" ] && return 0

 	mkdir -p ${WRAPPERDIR}

 	# create wrapers
+	pkgconfig_wrapper
 	generic_wrapper icu-config
 	generic_wrapper libgcrypt-config
 	generic_wrapper freetype-config
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@ -262,6 +262,7 @@ install_pkg_deps() {
    #
    # Target build dependencies.
    #
+    checkver="version"
    for i in ${build_depends} "RDEPS" ${run_depends}; do
        if [ "$i" = "RDEPS" ]; then
            rundep="runtime"
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@ -170,6 +170,7 @@ chroot_handler() {
    if [ ! -d $XBPS_MASTERDIR/xbps-packages ]; then
        mkdir -p $XBPS_MASTERDIR/xbps-packages
    fi
+    ln -sf xbps-packages $XBPS_MASTERDIR/void-packages
    _chargs+=" -D ${XBPS_DISTDIR}"

    [ -z "$action" -a -z "$pkg" ] && return 1
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@ -339,6 +339,14 @@ setup_pkg() {

    export BUILD_CC="cc"
    export BUILD_CFLAGS="$XBPS_CFLAGS"
+    export CC_FOR_BUILD="cc"
+    export CXX_FOR_BUILD="g++"
+    export CPP_FOR_BUILD="cpp"
+    export LD_FOR_BUILD="ld"
+    export CFLAGS_FOR_BUILD="$XBPS_CFLAGS"
+    export CXXFLAGS_FOR_BUILD="$XBPS_CXXFLAGS"
+    export CPPFLAGS_FOR_BUILD="$XBPS_CPPFLAGS"
+    export LDFLAGS_FOR_BUILD="$XBPS_LDFLAGS"

    if [ -n "$cross" ]; then
        export CC="${XBPS_CROSS_TRIPLET}-gcc"
@ -386,4 +394,6 @@ setup_pkg() {
        msg_red "$pkgver: cannot be built, it's currently broken; exiting...\n"
        exit 0
    fi
+
+    export XBPS_WRAPPERDIR="${wrksrc}/.xbps/bin"
 }
--- a/srcpkgs/at-spi2-atk/template
+++ b/srcpkgs/at-spi2-atk/template
@ -1,24 +1,24 @@
 # Template file for 'at-spi2-atk'
 pkgname=at-spi2-atk
-version=2.12.1
+version=2.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool glib-devel"
-makedepends="libglib-devel atk-devel>=2.12 at-spi2-core-devel>=2.12"
-depends="at-spi2-core>=2.10"
+makedepends="libglib-devel atk-devel>=2.14 at-spi2-core-devel>=2.14"
+depends="at-spi2-core>=2.14"
 short_desc="A GTK+ module that bridges ATK to D-Bus at-spi"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="LGPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336
+checksum=56b40ef16d9f1b1630d32addb0cc941372a1e97d8ddafd369f912c7d125688e7

 pre_configure() {
 	autoreconf -fi
 }

 at-spi2-atk-devel_package() {
-	depends="libglib-devel at-spi2-core-devel>=2.10 ${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@ -1,9 +1,10 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.12.0
+version=2.14.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool dbus glib-devel"
+configure_args="$(vopt_enable gir introspection)"
+hostmakedepends="pkg-config intltool dbus glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel libXevie-devel dbus-devel"
 conf_files="/etc/at-spi2/accessibility.conf"
 short_desc="Assistive Technology Service Provider Interface"
@ -11,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89
+checksum=5807b02e6ef695b52fde7ff26d675dd94a0707df3c42fe7fd224828e092514c8

 # Package build options
 build_options="gir"
@ -21,13 +22,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi

-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	makedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 at-spi2-core-devel_package() {
 	depends="dbus-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
--- a/srcpkgs/bash/patches/funcdef-import-4.3.patch
+++ b/srcpkgs/bash/patches/funcdef-import-4.3.patch
@ -1,93 +0,0 @@
-CVE-2014-6271: remote code execution through bash
-
-*** builtins/common.h	2013-07-08 16:54:47.000000000 -0400
--- builtins/common.h	2014-09-12 14:25:47.000000000 -0400
-***************
-*** 34,37 ****
--- 49,54 ----
-  #define SEVAL_PARSEONLY	0x020
-  #define SEVAL_NOLONGJMP 0x040
-+ #define SEVAL_FUNCDEF	0x080		/* only allow function definitions */
-+ #define SEVAL_ONECMD	0x100		/* only allow a single command */
-  
-  /* Flags for describe_command, shared between type.def and command.def */
-*** builtins/evalstring.c	2014-02-11 09:42:10.000000000 -0500
--- builtins/evalstring.c	2014-09-14 14:15:13.000000000 -0400
-***************
-*** 309,312 ****
--- 313,324 ----
-  	      struct fd_bitmap *bitmap;
-  
-+ 	      if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
-+ 		{
-+ 		  internal_warning ("%s: ignoring function definition attempt", from_file);
-+ 		  should_jump_to_top_level = 0;
-+ 		  last_result = last_command_exit_value = EX_BADUSAGE;
-+ 		  break;
-+ 		}
-+ 
-  	      bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
-  	      begin_unwind_frame ("pe_dispose");
-***************
-*** 369,372 ****
--- 381,387 ----
-  	      dispose_fd_bitmap (bitmap);
-  	      discard_unwind_frame ("pe_dispose");
-+ 
-+ 	      if (flags & SEVAL_ONECMD)
-+ 		break;
-  	    }
-  	}
-*** variables.c	2014-05-15 08:26:50.000000000 -0400
--- variables.c	2014-09-14 14:23:35.000000000 -0400
-***************
-*** 359,369 ****
-  	  strcpy (temp_string + char_index + 1, string);
-  
-! 	  if (posixly_correct == 0 || legal_identifier (name))
-! 	    parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST);
-! 
-! 	  /* Ancient backwards compatibility.  Old versions of bash exported
-! 	     functions like name()=() {...} */
-! 	  if (name[char_index - 1] == ')' && name[char_index - 2] == '(')
-! 	    name[char_index - 2] = '\0';
-  
-  	  if (temp_var = find_function (name))
--- 364,372 ----
-  	  strcpy (temp_string + char_index + 1, string);
-  
-! 	  /* Don't import function names that are invalid identifiers from the
-! 	     environment, though we still allow them to be defined as shell
-! 	     variables. */
-! 	  if (legal_identifier (name))
-! 	    parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
-  
-  	  if (temp_var = find_function (name))
-***************
-*** 382,389 ****
-  	      report_error (_("error importing function definition for `%s'"), name);
-  	    }
- 
- 	  /* ( */
- 	  if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
- 	    name[char_index - 2] = '(';		/* ) */
-  	}
-  #if defined (ARRAY_VARS)
--- 385,388 ----
-*** subst.c	2014-08-11 11:16:35.000000000 -0400
--- subst.c	2014-09-12 15:31:04.000000000 -0400
-***************
-*** 8048,8052 ****
-  	  goto return0;
-  	}
-!       else if (var = find_variable_last_nameref (temp1))
-  	{
-  	  temp = nameref_cell (var);
--- 8118,8124 ----
-  	  goto return0;
-  	}
-!       else if (var && (invisible_p (var) || var_isset (var) == 0))
-! 	temp = (char *)NULL;
-!       else if ((var = find_variable_last_nameref (temp1)) && var_isset (var) && invisible_p (var) == 0)
-  	{
-  	  temp = nameref_cell (var);
--- a/srcpkgs/bash/patches/patch-shell.c
+++ b/srcpkgs/bash/patches/patch-shell.c
@ -0,0 +1,22 @@
+$NetBSD: patch-shell.c,v 1.1 2014/09/25 20:28:32 christos Exp $
+
+Add flag to disable importing of function unless explicitly enabled
+
+--- shell.c.christos	2014-01-14 08:04:32.000000000 -0500
+++ shell.c	2014-09-25 16:11:51.000000000 -0400
+@@ -229,6 +229,7 @@
+ #else
+ int posixly_correct = 0;	/* Non-zero means posix.2 superset. */
+ #endif
+int import_functions = 0;	/* Import functions from environment */
+ 
+ /* Some long-winded argument names.  These are obviously new. */
+ #define Int 1
+@@ -248,6 +249,7 @@
+   { "help", Int, &want_initial_help, (char **)0x0 },
+   { "init-file", Charp, (int *)0x0, &bashrc_file },
+   { "login", Int, &make_login_shell, (char **)0x0 },
+  { "import-functions", Int, &import_functions, (char **)0x0 },
+   { "noediting", Int, &no_line_editing, (char **)0x0 },
+   { "noprofile", Int, &no_profile, (char **)0x0 },
+   { "norc", Int, &no_rc, (char **)0x0 },
--- a/srcpkgs/bash/patches/patch-variables.c
+++ b/srcpkgs/bash/patches/patch-variables.c
@ -0,0 +1,23 @@
+$NetBSD: patch-variables.c,v 1.1 2014/09/25 20:28:32 christos Exp $
+
+Only read functions from environment if flag is set.
+
+--- variables.c.christos	2014-09-25 16:09:41.000000000 -0400
+++ variables.c	2014-09-25 16:12:10.000000000 -0400
+@@ -105,6 +105,7 @@
+ extern int assigning_in_environment;
+ extern int executing_builtin;
+ extern int funcnest_max;
+extern int import_functions;
+ 
+ #if defined (READLINE)
+ extern int no_line_editing;
+@@ -349,7 +350,7 @@
+ 
+       /* If exported function, define it now.  Don't import functions from
+ 	 the environment in privileged mode. */
+-      if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
+      if (import_functions && privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
+ 	{
+ 	  string_length = strlen (string);
+ 	  temp_string = (char *)xmalloc (3 + string_length + char_index);
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@ -1,7 +1,7 @@
 # Template build file for 'bash'.
 pkgname=bash
 _bash_distver=4.3
-_bash_patchlevel=024
+_bash_patchlevel=026
 version=${_bash_distver}.${_bash_patchlevel}
 revision=2
 wrksrc=${pkgname}-${_bash_distver}
@ -22,7 +22,6 @@ pre_configure() {
 	local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches"
 	local ver=$(echo ${_bash_distver}|sed "s|\.||g")

-	cd ${XBPS_SRCDISTDIR}/${pkgname}-${version}
 	if [ "${_bash_patchlevel}" -gt 000 ]; then
 		for p in $(seq -w 001 ${_bash_patchlevel}); do
 			if [ -f bash${ver}-${p} ]; then
@ -34,7 +33,7 @@ pre_configure() {
 	fi
 	cd ${wrksrc}
 	for p in $(seq -w 001 ${_bash_patchlevel}); do
-		patch -sNp0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/bash${ver}-${p}
+		patch -sNp0 -i bash${ver}-${p}
 		msg_normal " Applying patch bash${ver}-$p.\n"
 	done
 }
--- a/srcpkgs/chromium/patches/linker-no-keep-memory.patch
+++ b/srcpkgs/chromium/patches/linker-no-keep-memory.patch
@ -0,0 +1,13 @@
+Building with -g on x86 can use more than 4G memory, so try to
+lower the memory requirement by forcing ld(1) --no-keep-memory.
+
+--- build/common.gypi.orig	2014-09-26 11:50:55.381056525 +0200
+++ build/common.gypi	2014-09-26 11:51:58.281560018 +0200
+@@ -3287,6 +3287,7 @@
+         'ldflags': [
+           '-Wl,-z,now',
+           '-Wl,-z,relro',
+	   '-Wl,--no-keep-memory',
+         ],
+       },
+     }],
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@ -1,14 +1,14 @@
 # Template file for 'chromium'
 pkgname=chromium
 #See http://www.chromium.org/developers/calendar for the latest version
-version=37.0.2062.94
+version=37.0.2062.124
 revision=1
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.chromium.org/"
 license="BSD"
 distfiles="https://commondatastorage.googleapis.com/${pkgname}-browser-official/${pkgname}-${version}.tar.xz"
-checksum=d27c19580b74cbe143131f0bc097557b3b2fb3d2be966e688d8af51a779ce533
+checksum=5a7ca0b1e9b4c51555cf82d8bebf5a8cc5b5810ccacd1087ba82a17b8ac830d8

 lib32disabled=yes
 nocross=yes
@ -52,7 +52,7 @@ do_configure() {
 	local conf=""

 	unset CC CXX
-	export -n CFLAGS CXXFLAGS
+	export -n CFLAGS CXXFLAGS LDFLAGS

 	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 	# Note: These are for Void Linux use ONLY.
@ -142,7 +142,6 @@ do_configure() {
 		esac
 		conf+=" -Dtarget_arch=${arch}"
 	fi
-
 	# https://code.google.com/p/chromium/issues/detail?id=386097
 	third_party/libaddressinput/chromium/tools/update-strings.py

@ -152,7 +151,7 @@ do_configure() {

 do_build() {
 	unset CC CXX
-	export -n CFLAGS CXXFLAGS
+	export -n CFLAGS CXXFLAGS LDFLAGS
 	ninja -C out/Release ${makejobs} chrome chrome_sandbox chromedriver
 }

--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@ -1,15 +1,17 @@
 # Template build file for 'chroot-bash'.
 pkgname=chroot-bash
-version=4.3
-revision=3
-wrksrc="bash-${version}"
+_bash_distver=4.3
+_bash_patchlevel=026
+version=${_bash_distver}.${_bash_patchlevel}
+revision=2
+wrksrc="bash-${_bash_distver}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --without-curses --without-installed-readline --disable-nls"
 short_desc="The GNU Bourne Again Shell -- for xbps-src use"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/bash/bash.html"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/bash/bash-${version}.tar.gz"
+distfiles="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}.tar.gz"
 checksum=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4

 broken_as_needed=yes
@ -17,6 +19,25 @@ bootstrap=yes
 provides="bash-${version}_${revision}"
 conflicts="bash>=0"

+pre_configure() {
+	local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches"
+	local ver=$(echo ${_bash_distver}|sed "s|\.||g")
+
+	if [ "${_bash_patchlevel}" -gt 000 ]; then
+		for p in $(seq -w 001 ${_bash_patchlevel}); do
+			if [ -f bash${ver}-${p} ]; then
+				continue
+			fi
+			msg_normal " Fetching ${url}/bash${ver}-$p ...\n"
+			$XBPS_FETCH_CMD ${url}/bash${ver}-$p
+		done
+	fi
+	cd ${wrksrc}
+	for p in $(seq -w 001 ${_bash_patchlevel}); do
+		patch -sNp0 -i bash${ver}-${p}
+		msg_normal " Applying patch bash${ver}-$p.\n"
+	done
+}
 post_install() {
 	ln -s /bin/bash ${DESTDIR}/usr/bin/sh
 	rm -rf ${DESTDIR}/usr/share
--- a/srcpkgs/clipit/template
+++ b/srcpkgs/clipit/template
@ -0,0 +1,13 @@
+# Template file for 'clipit'
+pkgname=clipit
+version=1.4.2
+revision=2
+build_style=gnu-configure
+hostmakedepends="intltool pkg-config"
+makedepends="gtk+-devel librsvg-devel"
+short_desc="Lightweight GTK+ clipboard manager"
+maintainer="Enno Boland <eb@s01.de>"
+license="GPL-3"
+homepage="http://sourceforge.net/projects/gtkclipit/"
+distfiles="$SOURCEFORGE_SITE/gtkclipit/Version%201/${pkgname}-${version}.tar.gz"
+checksum=6a63c7c4c39b423a266907e5b76f7d16301b164437dc7635cf25ace730b23c4b
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
-version=1.0.58
-revision=4
+version=1.0.59
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
 --with-browseremoteprotocols=DNSSD,CUPS"
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1, MIT"
 homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 distfiles="http://www.openprinting.org/download/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6e704e0eac6968076d0596e0c9512f8c88bc9e0dbc934c8846f6375c93b80b2e
+checksum=e8b24ed708a83018a068cf4838277543aaaa6bbb0a76485206d782d83bab0ad4

 lib32disabled=yes
 disable_parallel_build=yes
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@ -1,6 +1,6 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.62
+version=1.0.63
 revision=1
 build_style=fetch
 depends="wget"
@ -9,7 +9,7 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="custom"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb"
-checksum=98b35842ca2d0e8fddc821904aa07b95f70c40ff8c4c36751290f1abfd676fc0
+checksum=7f21933450d8b97b1ad969d31d57f724bc2284651b51d0d2510bb9e2b301da96

 do_install() {
 	ar p ${pkgname}_${version}_all.deb data.tar.xz | tar xJf - -C ${DESTDIR}
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@ -1,6 +1,6 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=6.4.5
+version=6.4.7
 revision=1
 lib32disabled=yes
 build_options="systemd"
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="Simplified BSD"
 homepage="http://roy.marples.name/projects/dhcpcd"
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2"
-checksum=c19daec78e36eac170df9633c238ab519645fa4b7469a4053fb09b5e0c4fd107
+checksum=bb0880968671436b2cf85dcda4d4cf9b9e25045a274832bf18e28534bb25e187

 post_install() {
 	chmod 755 ${DESTDIR}/usr/sbin/dhcpcd
--- a/srcpkgs/edbrowse/patches/libressl.patch
+++ b/srcpkgs/edbrowse/patches/libressl.patch
@ -1,15 +0,0 @@
--- src/tcp.c	2014-07-26 17:30:51.582554891 +0200
-+++ src/tcp.c	2014-07-26 17:31:07.547555086 +0200
-@@ -436,12 +436,6 @@
- ssl_init(void)
- {
- /* I don't understand any of this. */
-    char f_randfile[ABSPATH];
-    if(RAND_egd(RAND_file_name(f_randfile, sizeof (f_randfile))) < 0) {
-	/* Not an EGD, so read and write to it */
-	if(RAND_load_file(f_randfile, -1))
-	    RAND_write_file(f_randfile);
-    }
-     SSLeay_add_ssl_algorithms();
-     sslcx = SSL_CTX_new(SSLv23_client_method());
-     SSL_CTX_set_options(sslcx, SSL_OP_ALL);
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@ -1,18 +1,18 @@
 # Template file for 'edbrowse'
 pkgname=edbrowse
-version=3.4.10
+version=3.5.1
 revision=1
 hostmakedepends="unzip pkg-config"
-makedepends="js-devel libressl-devel pcre-devel libcurl-devel readline-devel"
+makedepends="mozjs24-devel libressl-devel pcre-devel libcurl-devel readline-devel"
 short_desc="line-oriented text editor and web browser similar to ed(1)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-3"
 homepage="http://the-brannons.com/edbrowse/"
 distfiles="http://the-brannons.com/${pkgname}/${pkgname}-${version}.zip"
-checksum=58089879c31b571792f76fc53c41374fcbe8386ea82fe451737ae72e8a78e826
+checksum=e379cffb1098cfedf56ceedaaa7e20064551a0737ad6cd8ad5124fdfb18d9a5f

 do_build() {
-	make ${makejobs} -C src	JS_CPPFLAGS="$(pkg-config mozjs185 --cflags)"
+	make ${makejobs} -C src	JS_CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/mozjs-24"
 }

 do_install() {
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=17.1
+version=17.3
 revision=1
 wrksrc=otp_src_${version}
 build_style=gnu-configure
@ -14,8 +14,8 @@ license="custom"
 homepage="http://www.erlang.org/"
 distfiles="http://www.erlang.org/download/otp_src_${version}.tar.gz
 http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"
-checksum="b806f5b2b5cc2d0c0d5dd1a65657c21c10dc3a0535ef60adecdac9cd73b9c356
- 4a230277f135e3730593e7bffdd5ca92596568340f02a5b3134f1d083b34eaab"
+checksum="d4be03eb346016f4ca95d53eb9437ffaa6106762f153620dd98cd7f7733b76e4
+ 3fabdac0b0594432fdd8186fa2c74ff49a629a9bcc4174e3bd605a3d4002dab7"

 build_options="x11"

--- a/srcpkgs/fatrace/template
+++ b/srcpkgs/fatrace/template
@ -1,6 +1,6 @@
 # Template file for 'fatrace'
 pkgname=fatrace
-version=0.7
+version=0.8
 revision=1
 build_style=gnu-makefile
 short_desc="Report system wide file access events"
@ -8,4 +8,4 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-3"
 homepage="http://launchpad.net/fatrace"
 distfiles="http://launchpad.net/fatrace/trunk/$version/+download/$pkgname-$version.tar.bz2"
-checksum=201943c021146b6b563751e93e388093ed0264d9eb05767454f6f122beada728
+checksum=58e76bd60edca4d7948525a219cb9880b781c26ab5c31a3a7c2472bf0f4d1081
--- a/srcpkgs/fingerprint-gui/template
+++ b/srcpkgs/fingerprint-gui/template
@ -1,7 +1,7 @@
 # Template file for 'fingerprint-gui'
 pkgname=fingerprint-gui
-version=1.05
-revision=3
+version=1.06
+revision=1
 make_dirs="/var/lib/fingerprint-gui 0755 root input
 /var/upek_data 0750 root input"
 hostmakedepends="qt-qmake"
@ -12,7 +12,7 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-2"
 homepage="http://www.ullrich-online.cc/fingerprint/"
 distfiles="http://www.ullrich-online.cc/fingerprint/download/${pkgname}-${version}.tar.gz"
-checksum=4058ffa55de8ea346ae8747ec88828d2312656b3d8a54c57198b04e4032097db
+checksum=f5021d4c446b65ce62de63b9b2874b05a62318b386f35577ca0322b722a1920f

 do_build() {
 	sed -i 's/plugdev/input/g' \
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=32.0.2
+version=32.0.3
 revision=1
 homepage="http://www.mozilla.com/"
 short_desc="Firefox language packs"
@ -23,16 +23,16 @@ _languages=(
  'af     "Afrikaans"'
  'an     "Aragonese"'
  'ar     "Arabic"'
-  'as     "Assamese"'
  'ast    "Asturian"'
+  'as     "Assamese"'
  'be     "Belarusian"'
  'bg     "Bulgarian"'
  'bn-BD  "Bengali (Bangladesh)"'
  'br     "Breton"'
  'bs     "Bosnian"'
  'ca     "Catalan"'
-  'cs     "Czech"'
  'csb    "Kashubian"'
+  'cs     "Czech"'
  'cy     "Welsh"'
  'da     "Danish"'
  'de     "German"'
@ -130,87 +130,87 @@ _pkgtmpl() {
 }

 checksum="
-b3a1df4452ae27d90d3e1690760d6436b4d0de130c726b8172784d727b4cb081
-43055a6aebbc72c5f5def27bf671968482279087b0c08ddbb603ac956760d952
-44f5deee991eda3e21946005d48e012cfab961f01f6813a43bfa3250341067a1
-39be83c8c2b2b14538d226b77c47a5dd2c87ad70a3b6a71dddb3068594e2dfbc
-1f61119d750e2067bd9518aa782aa32cf5c9dce50fe6a23bbb94f0eddf5bd34f
-3812808aa0b14128c2a4de106f67f8ab893c80ea5a864ad13462ded26a4d1675
-e607e32cf9758314655b59c5171bc3f5acb2bddc41fa931067b0a926710a8dc8
-69fec1817b9b24a89d5e316232c29a814ee726c0351c3ad60dafd74443bbf582
-618a5440e3dd3acabb78f227f7f538bef732e681f6dde1d8948f182eaa197bfa
-309f0f07b78f51d4b005a56ae3355b91dc13d88540bf5d297c2d332214f745fd
-472b8302bca7d919c1732cc5153ad43cd5a7317b9be22cee1eb66bcb0d2a5cd1
-bf33ad776bcda2b41540d5d9833ed2fb54383ccc79e0e4de1bfe58d4d2b83396
-bb5b7a29e99084e921a3423779cd5995c59725d0fcdb07da6bc5f89693143204
-f3a4aa1efc52f17f16a8f8e9761adea8eac4a1e6d5c71e3c9a38221ee156b7ab
-d796c5b121e089d40a619ab36266f2c686b9723641b5effbb327c78c5c877d77
-ab3fef27a2a9d7ad7a53a8197a868418bff1b1fd299bfad88772e5bab002456d
-3b21850c366a27d7afaf256effe0e04392d0d36d9d875569e122388b3c08084d
-4cc9451f5876499c8130cdb9e38e0e0718cd22d4934e968cb4526ef466751766
-77eed519237687134db60afee4826e37eef3adee77661b53facfd8c2d691e041
-f4b841f91820905f8f19e98c8205e5f83f7e903161ce9f032d5849a752cc93ad
-0e2288b5bbbffb5a876427606f208740ce59d4fc6710689df40343ef65088fca
-ca8c4b5e5e531f2c7a5926541f91a989c15dcc0b34c7ddd3bd28df31407a68af
-48db1fc2bf9e19fc47988a3e38e750fd3810db7dd16272ed1fca1d351d09713e
-eafa582ff3e389d8d97c6d969abec02c46cc7c21969e1e53e13762155ac7b699
-fb88b03fa9463e41aeaf59d3762e4965f966f562d0e2e38d83b2a897fbc81ca9
-bec462a19c5b9380891b7bc01c48eb06774c59cdb0d67f0c41668d68e59b3460
-71d26932f0f454055a0a2e752e0de7ea8816291b3614313d737500c5c7408914
-397881bac7c7112a53383335eec6464f78d17b5bf84b89339603f83cc0c7e9a9
-870a12fa2b4e9b2b28f3de8b81f6abeb41b33b8acf5fdcd856f3741313b74adb
-d26525de80fac1d0a150240043bbd5c13478099da7c26b034320408534cd3f8f
-6802e96635829cd60613ed7b1eec83cb98d00f0b4c55c253a80ad68f98df3330
-327a62f803c6459b671058c773a85425ab84fd2446300e4d03a9f4d6cff2434a
-3c59e98118c5866daecc021e15c4264afe7f3c31a9fe54fc74b13fa4c3f8d745
-03963a61a327baf0c855cacb0693b63ece7880535a87e6ae5993e8a0c0eecf66
-dc7309cba3a62b2b7a6eeb4bd9b5a79390901fe440e858111377b47acd404212
-ce4ae2e6a7d3c7009e026823849628d1dcdaf59d822b1a1f9cb392b118690c44
-f4dd8498b822bbc67ce5443763097cbd1886fcadb33e5be7f686630cdaf30e2a
-7688b19b770d3d1315a79ccdbe4dcd5ed7b93e1f574cc9996792184296326cfd
-5efc6075a352e4c5f1a04757c5e809c5f27f41b686d2e69c9e4e4b440ef1b8fa
-b6b3c824aa5c415da71e47ca05853c591d6aca20517377740b3d09eaba8c4c3d
-977b229855182474fd0eb9a1f43f02c5cfbd18dd2ccd318a637c9d8213fe27d6
-3fe0f54b74c84e6aa3d73e21a4c7d849bca3c4753c1e5534a896375d12ddb79b
-bca438bb1547d29e481a6b2533802980d356fceeb41a480789c03646b23e77c9
-4b40fa4a67e1076f1185acb157f4fd3606b33a1150fe4817258f260780a5f517
-ded50eb9b9b1e4c440f06875c13cb3ae1f51759ba8261d241c7996755d719f7a
-c50fbfc22ff6fcdbfb02b99a75059a19c4e2a04e21224bdb9cb4c39ab8be00d3
-06712779e16a31da1cf7730fe1aba6d4c1d23c603ca057e4f4370fece7979b88
-b1ff78c850e1dfdf4bd49cad6a499e238a9df061cfb2a9f362dc67a4d11bb6f0
-ae8749ab165c3efadf3c6ff71b381988748e1fedb7137ba983acda79f200b5e4
-12bf30b4de6fa42289d581ac610c2a138e8dea083ac3a2aff68c335a5925723c
-17fb8f8c59ca0217ec3efcdf6e8b8c35a34596babf393f686156f98f5297ac61
-37132b9109f65e4236d36c758bedb86a56a32adf540cb714c9e5057c84fac599
-bbbe45a3f335762d0fac604d819a833d4bb3dac6540f6f1e5aba6a01f7c577f7
-7d528b8a3269e74a41c0ab6c9310fbb056025d5399e2df4b2236613b722b6ae6
-f8b4d74359fd7b26ea9ca6d7363f0b51fd366a27ed165132d54a968ca355b073
-69fc177ff6947504e0a1ad47a4a06eedde2427094bf4e9f2d597135039ee50f9
-4620424f96680330c26fd090cc72608a23e44ec00c5304823cea26517518f090
-a7e8af44d8d5226a5f38ccace03182426eaecba0bd01d90f8e263c46964d25a5
-59504411cc63e21dffa9ac48bd349613e3cb7bc7e1a8650d24136ad17aa8aca6
-ae6cf0feb31e5acda6dd664df382303cbbfc7e2360daa8520f91cf2c463e5fd8
-6cc6e4115140887bf27977f8d14a3fb8ae28768359759c8bd8d561058457a996
-e130ad8f61bdf9dfc3cc2dabef80768f2083886da05bcd1aaaa433c41cb0f2d5
-2365d4c5081183a9a793d99b3fdd50abf7a82ec8cad168e0a233c9e471cb52f2
-40ee58447bfeeb0476af44fc227f156c8c206f87ac9eb110067bd7dbbc9f6ab2
-cf054d8765f198f32f73b863ae126fd014ae6d5e1ef4c4563cc02ffa76a5dc28
-cc3276620775af1a662a2f28364f1909a3804e2ff67d3049ab9895d963b93d48
-7c6abd4cd178065ca8652b49bb6774a28f44ee8979dc92b8ad1c99e13c737421
-e4a61ad50d87eaf54e6488943aae63cb7646e5ba0cebb4d494ecc6ace0b19dec
-e4d53e64512e444c51605d70e88edc36baefaabea1001d6f929fc95bdc60d0db
-54671f7065dd07b2f18637059d7e150b5329d9e6a006970749cf10b1fa554066
-ae43e792bbd760d51775baeb1742fd12d43265ab43cb0863f3c52a6670b9c001
-3869506e7ed28640c2d12aa2fa4fae6579ec6ca2fd94ab3e956817074789c230
-1190767ec6ce0d99497279b50d8c02d72167d81fcd90878e8de2daee94c03177
-f613e10447bb362b0fbd121a2ebf95276b1ad42069c252a23c015b4502b18208
-a06c016bba3f86b0387311904b4c6279603d25da2ae99599e9a811c86bfd4d43
-a8e0711e7f089a93632d8ef05a34cfb14e132ace37bfe4198cb4309f557c0a79
-27e6fdec786a26cd783016d5340bb15ac5fff46abaf3b71f19b8d5467e40de24
-573af1f2eb8ff900415cbda273a5bb052588e1cb4b8dae434a0512763e554230
-c5bb381f821ad67011af88b150c8a1bb4b5efeee4511b87250048af3753db45d
-3a3283958f08885fdad7d3e77e8bdde432b7bf3584e9ec5028a6b47ef6596a0b
-dadfac55b0531b55c00e405059c18000dca4cffbb7f7711229a709ecf263c571
-51ca5254d80d88ecc846a0862c702ba10def054caa177f034310409f64e452a3
-6ce32fd0e43b7f92ea4af92c5784fcc2cfb147504d74adcede71da16e3dc4fee
+6a799e37c40839ec811fb4c98b04e62c1e0dfb6ff2d9c24d726614ca21108c40
+b9f61c11d8e0423a3fadc5495f8473a5c9aa91843d2243921fd39da2d3ed03a1
+c6de3bfcafcd9d14f47a361cfc8cf096f00ed89fe61e77caf7b97064bfb5e81c
+9d523839755d51c02e124c3cd019dce435c0627e9aef91e0f97a0032f5e140e4
+0baf73ed3bbf9b286da70a5d2d51a3eb397f77efb702c6f27b3b3c89318e2579
+75377422097f79e712815499656edda109f92a1e8b7fdc1a194e5186874767c8
+ef1e2efeb90dce6f70c32cf8ce2bcd8822864fa2b31b953610e4376529817fe9
+f7fa78a76a4a899bafbec016f45a63877be5b5ecbb2797dadaaf3c5a9aa9a63e
+fe4d84d02b3a58bdec1ef51369c3f4142debd9eee1426217795985933fba2155
+96b5ec704ad70ea51512b0d62f7dca5da0745ee2861aeadf444152bf3d03b6c9
+c29a949880dc2580847d984b9a59d3287055805894854d308ae14a2515ffcee4
+d60933364184c7120957323795e5dfa91ede4b9bd8a1c2aceee53605dbce86c6
+4a89defb2d3aac88a866dccaedacf83d0a01bc221d78bbad992359c20f5389aa
+dc8fa2099740c479a995aff199264355feadad80567ac0772cb7660cd4f08c05
+0de57e2e2f1bb6670ffbbc518b0c7882c9e8ad812d83386d4d3e86f3c3730877
+dd4f42808e784be4c091072f52b0315362c8f6ffc93819d502a78f32c0a6480d
+c64d23f78ed58fc91d10c5bdcb040bcbb2c659df36f3db3cadf0084235640c3a
+a51ce41651947d894eb7255e273422dff6015654f8771c9fe56036ea2051ec96
+f21981b92428149c98f898575256649268ca166a035e8b8b4b02adcf2078fd2e
+769bead0520c98c5a4b5ea5d00a81d3fcfccbfc1de5a7764be114df46ed3b661
+2810a1aea1c5cc5b6cdb43e51255c0f392c73572f382f613d38af42029430479
+c237d84266bcc9badf30ece29eba71cc622d38a9de37da3edb182b895502c92e
+adce3f176c3edc6899ebbb2d39e7a74a3de09cc34708f58b5958dfa78876de82
+e4fd278a55837782f63f6e0048eeda2f59748b63118886c6bcabe453ca17e6d5
+681badfa9b4741a23b086aeb2479b560bc12ca1032ca158260d04a6b21a8aa32
+90e0017d72777ab5c58c3f124464e6f99d1fdb3b15a0a805275309d5a493eef7
+a28a495f9066de957961ea4228a05afdd4405a62175381375b1aee27b8b71437
+4f30fc0218e9a0ab7b2772de3a4ae8ffe57261ede46fef27cce39b93e11af85e
+1d982f0de9d8a682ab5def442e0dd7180b87091d8c19e477cefe3b1ff62b74b0
+e5aacc3390adcf346bf86a2f4692b8ed6b196c2079d0b0c855aca9200d7a6a97
+6d748132061a4dec880e0924ded7129d54a84521d22f127461b9416bb9d2ddfd
+a9c0160129cf0e3e8d7b6129bca124c9043532c841eed262866c47d42a85b649
+fe3003bceda3384ee3331b48a21087b598e7320f45757921dcc5621400d92f82
+2238d2d717e0df4c41ca1d473bdb92154db9a11498579597ee05a1566edb1b5a
+80033231d68571d848a2a153a1f370333196965867a0ff1973cf9275648cd46e
+01c26cc356e8fc1c17633aa7c736a8ffa1c2abb7d98efbf2e39025b51d171377
+a116a91ea35487b2a5becb286034737ecc5798c927dfb5e00f70bc3d3e0cfa64
+724cc2e7cd568e34d98330475d4e6880cac3fb37d7211b65a333e98a41c68134
+e6687282cd5f62301bb00c76d703168387cc8ab7489ad6539d4e4c946bff50df
+cf5dc58fbfcf05712c6700a6224bd85097cec506c7887b5107ba35d271c5f5e6
+c20ecd12f5848bc73b028b166a9fd8d6492343abee155ce9585107f483d77a22
+71269f1fcc174073729d69889fdcc591c20aece7f76393492434a5ba936e5775
+ea44cd38b0960fc1aa6d9748cccbcc851d663b3657581b173657cf8681923f6b
+12fcad7afc4c87093e97c4da42183f13935a230bf7dac3fdd8403a23083eab0c
+33e5533a156009debf0f59c9367b771c212de11f522f232549fd2038a472af99
+713832222a9962cf38f113e00dcd1674234244664a6edc35b99757015dff1953
+8e68fb50bf725efc5faadfbe5fb9d75e47f833c2e827c52da64cd90ca76cd2a2
+60aa0386d23a6298ccf41c7d322f1fa395c6d176579c6908d30550cdb32012ea
+15229a3a79afa6460884c0fd75c10e700fc9bcc9e212a70165b73e5b321541e0
+b14aa0056bc9b23e1fe3a56830e5269ed7112ddb2762edbce358337a52fb85c2
+d144df6da0de7fd252ad4d98c75367338d124e5a92cded0d23ea7aa0251a98f9
+8e15f1283ed31abb40006e521a6b2aa8c5e37539e8076e9210f3f0dca9cad2df
+405c62dbfe23bf68662273979153a83cb03930734874357149e55dfe0e9824f7
+22fe21b21733bcd2489bf985c706f86215d3cf2092971f57517b95d043cd8a73
+d93fc065ef71700298548c227b5b07afc5de332529e1d383f0f83c30ba968a9e
+d5b24aade5b5f941a8748394d30dd7815e5dedf78adb9ebb578b5f5c075ebd65
+feca35ba06f7c443b89ceb9ed19ef41d95f09fbe9fa2336f0abf92fb867a8769
+bce8286d41b61c03464547fcc3ec064ef432a473cc430727131723e605336505
+dce65ecd03e0479c7a74586c4d27ad8ecb6468f2ea0e3e65f128ed27ff78a2dc
+c4cefbdb23bc924585a0451fdd72f2b585a4d83c49be5afa22fc897a37c8866c
+3274414e2f8c7c1d46cd78021de8ba531fffce50df336593e9c22a651c83723d
+487e6412ca53437ca0f47c6a28c36b2665ccffdd2833e87665b674759cc1cf4c
+49d555bf8529fa0673971a0194d35e3fd3c00db94408021dbcb5d8c08f227379
+f29e440395e4d381eb437cc0c053993780c987feb4884d9660cf1845fc809fe4
+dd8503916a9bac9c68484e6a635a331b8a09a71f8d4915693f656ee90848a232
+4f9a861e7f7984faf182032bee3601c1fd32c6303b247e1669be8eeeeb0b45fa
+dec662011401eabc64142832ef4ff126e6a5c6db4bdbf2333d83090992e8c812
+74ee5b86a2dd02522b674f06f4e69886806f0ebdb997d7db4c2baf461ecf5db9
+bf4aa46870626819689339e6192e3baf09ed3fadbfe435d45fbe09b0ccb93cd4
+4b20e84b9a5419f100d3f90d9309824ae3595eb684e8e00b6c036bfaa7a3fa4d
+efdd07464ec8de35a3c0edf70f7c1c16006c81341037d760b776eaa184f8c892
+b533a07f9d3b3eb89ab4f68368eb6dbc9b3d2938d85f097ffba477605a6c032a
+222e17ff93666c51935458043615c74597603272497b48b42f6533840244167f
+c045ee40fd098d2598670bf76b9406c82d60663543309b0ceadda366c5bd8f20
+a5fc43bd5b0b4dd236cb9517df76e303a33c43bb3cb1d44f21897d53c732b58e
+5cd0cf04d7c5a72d24145dc8fc3827cb4322c3d9d6c81dacce089fb143bda396
+55f78b101e90ca7a43870864053ecf83f09863228adf0322366592b4be49dfc3
+3b5bf0678394a1596aeb7d242b7f87ed5be8bbf894941696eb16d3f1ace1ebd3
+3583596aad04f5b2d582c0e8bd3dcd3a5fbd4e5c4dd693e344f42e756cb5bacf
+60bd533ab3b0cae1a1484419ac62fb8764e2aa19fe3c04e64a092a9029c46203
+75c295a829b109005032f892fb2a44259dd11c2c606dde7ac5d63f553b9b20d3
+6df16f0a840d9565183ae0bdbebe6318d0e81cba7787023f4c4531f6591210c4
+e8db4474106740c2f843532e83c101c95cca8a6a4574c7af5c7f93f6bfa7a8be
 "
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@ -1,6 +1,6 @@
 # Template build file for 'firefox'.
 pkgname=firefox
-version=32.0.2
+version=32.0.3
 revision=1
 wrksrc=mozilla-release
 short_desc="Lightweight gecko-based web browser"
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://www.mozilla.org/firefox/"
 license="MPL-1.1, GPL-2, LGPL-2.1"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
-checksum=c6c9e89c2af24a3e0ee994e8a499889d169c986678ee00f62bfee0e216ab21e2
+checksum=ae2aa20538d03b392a04663593fb106c0aec2d8bbb78ddac84a88ce7617b1efe

 lib32disabled=yes

--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@ -1,7 +1,7 @@
 # Template build file for "git".
 pkgname=git
-version=2.1.0
-revision=3
+version=2.1.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --without-tcltk
 ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no"
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://git-scm.com/"
 license="GPL-2"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=8dd712dc1a23929110443816a7eeed5c37c01d8f8c19feaa8b9e40b9845601a7
+checksum=66cdbf7c714d71599892dc853a40f09418b3856af953a32c22f6f3e7f41f3030

 post_build() {
 	make ${makejobs} -C Documentation man
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@ -1,6 +1,6 @@
 # Template build file for 'glib'
 pkgname=glib
-version=2.41.5
+version=2.42.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-fam --with-pcre=system --enable-static"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-$version.tar.xz"
-checksum=e76a6bd1456749bdd05db19a8f0f174e787e612ed443d30cc9cf02237dd58e16
+checksum=94fbc0a7d10633433ff383e540607de649c1b46baaa59dea446a50977a6c4472

 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
--- a/srcpkgs/gnome-themes-standard/template
+++ b/srcpkgs/gnome-themes-standard/template
@ -1,6 +1,6 @@
 # Template build file for 'gnome-themes-standard'.
 pkgname=gnome-themes-standard
-version=3.12.0
+version=3.14.0
 revision=1
 lib32disabled=yes
 build_style=gnu-configure
@ -12,10 +12,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217
-
-post_install() {
-	for f in ${gtk_iconcache_dirs}; do
-		rm -f ${DESTDIR}/${f}/*.cache
-	done
-}
+checksum=addd469f4ba746f8ebb03da8b5c67b7d8b6b2c979f7f07958455c7e33fbdbe09
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@ -1,7 +1,7 @@
 # Template file for 'go'
 pkgname=go
-version=1.3.1
-revision=2
+version=1.3.2
+revision=1
 wrksrc=go
 hostmakedepends="mercurial ca-certificates"
 depends="perl"
@ -10,7 +10,7 @@ maintainer="Dominik Honnef <dominik@honnef.co>"
 homepage="http://golang.org/"
 license="BSD"
 distfiles="http://golang.org/dl/go${version}.src.tar.gz"
-checksum=fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8
+checksum=3e7488241c2bf30833629ecbef61e423fe861c6d6d69d2d21a16d2c29eef06fb

 nostrip=yes
 noverifyrdeps=yes
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@ -1,24 +1,24 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.4.4
+version=1.5.1
 revision=1
 build_style=gnu-configure
-configure_args="--enable-fd-passing --with-gpg=/usr/bin/gpg
- --with-gpgsm=/usr/bin/gpgsm --with-gpgconf=/usr/bin/gpgconf
- --with-g13=/usr/bin/g13 --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
+configure_args="--enable-fd-passing --disable-gpgconf-test
+ --disable-gpg-test --disable-gpgsm-test
+ --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
 --with-libassuan-prefix=$XBPS_CROSS_BASE/usr"
 hostmakedepends="gnupg"
-makedepends="libgpg-error-devel libassuan-devel gnupg"
+makedepends="libgpg-error-devel libassuan-devel"
 depends="libassuan>=2.0.3 gnupg"
 short_desc="GnuPG Made Easy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.gnupg.org/related_software/gpgme/"
 distfiles="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$version.tar.bz2"
-checksum=3d594ed4040e11f66be2f48e8bbfc0a831f68321b5d8940d9fdafb1b30542948
+checksum=6c2f3af8ceeb303277d44ec0216d9a1271701f65b91d5942264cf7cefb4a11e3

 gpgme-devel_package() {
-	depends="libgpg-error-devel libassuan-devel gpgme>=${version}_${revision}"
+	depends="${makedepends} gpgme>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin
--- a/srcpkgs/gtk+3/files/settings.ini
+++ b/srcpkgs/gtk+3/files/settings.ini
@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = gnome
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
--- a/srcpkgs/gtk+3/patches/cross.patch
+++ b/srcpkgs/gtk+3/patches/cross.patch
@ -0,0 +1,11 @@
+--- util/Makefile.am.orig	2014-09-25 16:26:55.646426018 +0200
+++ util/Makefile.am	2014-09-25 16:27:20.637300308 +0200
+@@ -2,6 +2,8 @@
+ 
+ noinst_PROGRAMS = extract-strings
+ 
+CC = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS_FOR_BUILD@
+ extract_strings_SOURCES = extract-strings.c
+ extract_strings_CFLAGS = $(GLIB_CFLAGS_FOR_BUILD)
+ extract_strings_LDADD = $(GLIB_LIBS_FOR_BUILD)
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@ -1,7 +1,7 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
-version=3.12.2
-revision=3
+version=3.14.0
+revision=2
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --enable-gtk2-dependency"
@ -10,13 +10,14 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0
+checksum=68d6b57d15c16808d0045e96b303f3dd439cc22a9c06fdffb07025cd713a82bc

-hostmakedepends="libtool pkg-config glib-devel>=2.40 gtk-update-icon-cache"
-makedepends="libglib-devel>=2.40 atk-devel>=2.12 at-spi2-atk-devel>=2.12
+hostmakedepends="automake gettext-devel libtool pkg-config
+ glib-devel>=2.42 gtk-doc gobject-introspection gtk-update-icon-cache"
+makedepends="libglib-devel>=2.42 atk-devel>=2.14 at-spi2-atk-devel>=2.14
 libpng-devel fontconfig-devel cairo-devel pango-devel>=1.36
- gdk-pixbuf-devel>=2.30 gtk-update-icon-cache"
-depends="gtk-update-icon-cache shared-mime-info glib>=2.38 atk>=2.10"
+ gdk-pixbuf-devel>=2.30"
+depends="gtk-update-icon-cache shared-mime-info glib>=2.42 atk>=2.14"
 triggers="gtk3-immodules"
 conf_files="/etc/gtk-3.0/im-multipress.conf"

@ -78,24 +79,15 @@ else
 fi

 pre_configure() {
-	libtoolize -f
+	rm -f ${XBPS_WRAPPERDIR}/pkg-config
+	NOCONFIGURE=1 ./autogen.sh
 }
-
 post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1
-	# Provide a default (icon)theme.
-	vinstall ${FILESDIR}/settings.ini 644 usr/share/gtk-3.0
 }

 gtk+3-devel_package() {
-	depends="libglib-devel>=2.40 atk-devel>=2.12 cairo-devel gdk-pixbuf-devel>=2.30
-		pango-devel>=1.36 at-spi2-atk-devel>=2.12 gtk+3>=${version}_${revision}"
-	if [ "$build_option_x11" ]; then
-		depends+=" libXcomposite-devel libXcursor-devel libXrandr-devel libXi-devel libXinerama-devel libXdamage-devel"
-	fi
-	if [ "$build_option_wayland" ]; then
-		depends+=" libxkbcommon-devel wayland-devel"
-	fi
+	depends="${makedepends} gtk+3>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@ -108,17 +100,18 @@ gtk+3-devel_package() {
 		vmove usr/share/aclocal
 	}
 }
-
 gtk+3-demo_package() {
 	short_desc+=" - demonstration application"
 	pkg_install() {
 		vmove usr/bin/gtk3-demo
 		vmove usr/bin/gtk3-widget-factory
 		vmove usr/bin/gtk3-demo-application
+		vmove usr/share/man/man1/gtk3-widget-factory.1
 		vmove usr/share/gtk-3.0/gtkbuilder.rng
 		vmove usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
 		vmove usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
-		vmove usr/share/applications
+		vmove usr/share/applications/gtk3-widget-factory.desktop
+		vmove usr/share/applications/gtk3-demo.desktop
 		vmove usr/share/icons
 	}
 }
--- a/srcpkgs/liferea/template
+++ b/srcpkgs/liferea/template
@ -0,0 +1,16 @@
+# Template file for 'liferea'
+pkgname=liferea
+version=1.11.1
+revision=1
+build_style=gnu-configure
+makedepends="gtk+3-devel libxslt-devel libsoup-devel webkitgtk-devel
+ json-glib-devel gobject-introspection gsettings-desktop-schemas-devel
+ libpeas-devel python-devel sqlite-devel"
+hostmakedepends="pkg-config intltool"
+short_desc="GTK news aggregator"
+maintainer="Enno Boland <eb@s01.de>"
+license="GPL-2"
+homepage="http://lzone.de/liferea/"
+distfiles="https://github.com/lwindolf/liferea/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
+checksum=fd41c1b0be19e6f04e0df89626b6af9661a8abb85aff7190b5a443bff820b544
+lib32disabled=yes
--- a/srcpkgs/mksh/patches/patch-mksh.1
+++ b/srcpkgs/mksh/patches/patch-mksh.1
@ -0,0 +1,28 @@
+$NetBSD: patch-mksh.1,v 1.6 2014/09/07 12:46:31 bsiegert Exp $
+
+Kill the .Dt override and restore installation a normal man page.
+--- mksh.1.orig	2014-07-29 17:26:49.000000000 +0000
+++ mksh.1
+@@ -60,21 +60,11 @@
+ .	ds en \(em
+ .\}
+ .\"
+-.\" Implement .Dd with the Mdocdate RCS keyword
+-.\"
+-.rn Dd xD
+-.de Dd
+-.ie \\$1$Mdocdate: \{\
+-.	xD \\$2 \\$3, \\$4
+-.\}
+-.el .xD \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+-..
+-.\"
+ .\" .Dd must come before definition of .Mx, because when called
+ .\" with -mandoc, it might implement .Mx itself, but we want to
+ .\" use our own definition. And .Dd must come *first*, always.
+ .\"
+-.Dd $Mdocdate: July 29 2014 $
+.Dd July 29, 2014
+ .\"
+ .\" Check which macro package we use, and do other -mdoc setup.
+ .\"
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@ -1,7 +1,7 @@
 # Template file for 'mksh'
 pkgname=mksh
 version=R50b
-revision=2
+revision=3
 wrksrc=mksh
 register_shell="/bin/mksh"
 short_desc="The MirBSD Korn Shell"
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.5.3
+version=0.5.4
 revision=1
 short_desc="Video player based on MPlayer/mplayer2"
 maintainer="Juan RP <xtraeme@gmail.com>"
@ -16,7 +16,7 @@ makedepends="
 depends="desktop-file-utils hicolor-icon-theme"
 conf_files="/etc/mpv/encoding-profiles.conf"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=04de4375f5ca69849927f23657358734ff1c02c54a15667ab3623ccb00ab6fa7
+checksum=b793d48938b57f4e37a410f61a98935d5b80b552ad0862983c025aeab71529d9

 pre_configure() {
 	python bootstrap.py
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@ -1,6 +1,6 @@
 # Template build file for 'pango'.
 pkgname=pango
-version=1.36.7
+version=1.36.8
 revision=1
 build_style=gnu-configure
 configure_args="--with-included-modules=basic-fc $(vopt_enable gir introspection)"
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pango.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/pango/1.36/${pkgname}-${version}.tar.xz"
-checksum=1f7b527423a1b3044fd9ae7fbe054107b06723ff1c73e0b5f7bf9b84358d404a
+checksum=18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07

 # Package build options
 build_options="gir"
--- a/srcpkgs/pax-utils/template
+++ b/srcpkgs/pax-utils/template
@ -0,0 +1,18 @@
+# Template file for 'pax-utils'
+pkgname=pax-utils
+version=0.8.1
+revision=1
+build_style=gnu-makefile
+make_build_args="USE_CAP=yes"
+makedepends="libcap-devel"
+short_desc="PaX aware and related utilities for ELF binaries"
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+license="GPL-2"
+homepage="http://hardened.gentoo.org/pax-utils.xml"
+distfiles="http://distfiles.gentoo.org/distfiles/${pkgname}-${version}.tar.xz"
+checksum=844ff25b1a11bcef92ef34b22f576f226a772b67196818656f8874513438f5b9
+
+do_install() {
+	make ${make_build_args} DESTDIR="${DESTDIR}" install
+	rm -rf "${DESTDIR}/usr/share/doc"
+}
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@ -0,0 +1,19 @@
+# Template file for 'pmount'
+pkgname=pmount
+version=0.9.23
+revision=2
+conf_files="/etc/pmount.allow"
+build_style=gnu-configure
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <eb@s01.de>"
+license="GPL"
+hostmakedepends="intltool"
+makedepends="libblkid-devel"
+homepage="http://pmount.alioth.debian.org/"
+distfiles="http://ftp.de.debian.org/debian/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
+checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+configure_args="--with-cryptsetup-prog=/usr/sbin/cryptsetup"
+
+pre_configure() {
+	sed -i -e 's/-o root -g root //' src/Makefile.in
+}
--- a/srcpkgs/python-urllib3/patches/unbundle.patch
+++ b/srcpkgs/python-urllib3/patches/unbundle.patch
@ -1,15 +1,6 @@
-diff -Nur dev-requirements.txt dev-requirements.txt
--- dev-requirements.txt	2014-07-07 22:56:01.000000000 +0200
-+++ dev-requirements.txt	2014-08-19 02:10:38.507546859 +0200
-@@ -3,3 +3,5 @@
- tornado==3.2.2
- coverage==3.7.1
- tox==1.7.1
-+six
-+backports.ssl_match_hostname
 diff -Nur dummyserver/handlers.py dummyserver/handlers.py
--- dummyserver/handlers.py	2014-07-07 22:56:01.000000000 +0200
-+++ dummyserver/handlers.py	2014-08-19 02:03:31.933539957 +0200
+--- dummyserver/handlers.py	2014-08-06 20:02:49.000000000 +0200
+++ dummyserver/handlers.py	2014-09-26 00:31:08.077758800 +0200
@@ -211,7 +211,7 @@
     """
     import tornado.httputil
@ -20,8 +11,8 @@ diff -Nur dummyserver/handlers.py dummyserver/handlers.py
         line = line.encode('utf-8')
     parts = tornado.httputil._parseparam(';' + line)
 diff -Nur setup.py setup.py
--- setup.py	2014-07-07 22:56:01.000000000 +0200
-+++ setup.py	2014-08-19 01:51:36.502528381 +0200
+--- setup.py	2014-08-06 20:38:12.000000000 +0200
+++ setup.py	2014-09-26 00:35:06.139782615 +0200
@@ -42,7 +42,6 @@
       url='http://urllib3.readthedocs.org/',
       license='MIT',
@ -30,9 +21,31 @@ diff -Nur setup.py setup.py
                 'urllib3.contrib', 'urllib3.util',
                 ],
       requires=[],
+diff -Nur test/__init__.py test/__init__.py
+--- test/__init__.py	2014-08-06 20:02:49.000000000 +0200
+++ test/__init__.py	2014-09-26 00:33:32.762949986 +0200
+@@ -7,7 +7,7 @@
+ from nose.plugins.skip import SkipTest
+ 
+ from urllib3.exceptions import MaxRetryError, HTTPWarning
+-from urllib3.packages import six
+import six
+ 
+ # We need a host that will not immediately close the connection with a TCP
+ # Reset. SO suggests this hostname
+diff -Nur test/contrib/test_pyopenssl.py test/contrib/test_pyopenssl.py
+--- test/contrib/test_pyopenssl.py	2014-09-13 20:18:29.000000000 +0200
+++ test/contrib/test_pyopenssl.py	2014-09-26 00:33:50.301730721 +0200
+@@ -1,5 +1,5 @@
+ from nose.plugins.skip import SkipTest
+-from urllib3.packages import six
+import six
+ 
+ if six.PY3:
+     raise SkipTest('Testing of PyOpenSSL disabled on PY3')
 diff -Nur test/test_collections.py test/test_collections.py
--- test/test_collections.py	2014-03-15 01:05:07.000000000 +0100
-+++ test/test_collections.py	2014-08-19 01:52:16.527529028 +0200
+--- test/test_collections.py	2014-08-06 20:38:12.000000000 +0200
+++ test/test_collections.py	2014-09-26 00:28:36.830649649 +0200
@@ -4,7 +4,7 @@
     HTTPHeaderDict,
     RecentlyUsedContainer as Container
@ -43,8 +56,8 @@ diff -Nur test/test_collections.py test/test_collections.py
 
 
 diff -Nur test/test_connectionpool.py test/test_connectionpool.py
--- test/test_connectionpool.py	2014-07-07 22:56:01.000000000 +0200
-+++ test/test_connectionpool.py	2014-08-19 01:54:30.020531188 +0200
+--- test/test_connectionpool.py	2014-08-06 20:38:12.000000000 +0200
+++ test/test_connectionpool.py	2014-09-26 00:36:12.962947210 +0200
@@ -6,7 +6,10 @@
     HTTPConnectionPool,
 )
@ -58,8 +71,8 @@ diff -Nur test/test_connectionpool.py test/test_connectionpool.py
     ClosedPoolError,
     EmptyPoolError,
 diff -Nur test/test_fields.py test/test_fields.py
--- test/test_fields.py	2014-03-04 20:08:03.000000000 +0100
-+++ test/test_fields.py	2014-08-19 01:54:57.941531640 +0200
+--- test/test_fields.py	2014-08-06 20:38:12.000000000 +0200
+++ test/test_fields.py	2014-09-26 00:31:39.324368163 +0200
@@ -1,7 +1,7 @@
 import unittest
 
@ -70,8 +83,8 @@ diff -Nur test/test_fields.py test/test_fields.py
 
 class TestRequestField(unittest.TestCase):
 diff -Nur test/test_filepost.py test/test_filepost.py
--- test/test_filepost.py	2014-03-15 01:05:07.000000000 +0100
-+++ test/test_filepost.py	2014-08-19 01:55:14.829531913 +0200
+--- test/test_filepost.py	2014-08-06 20:38:12.000000000 +0200
+++ test/test_filepost.py	2014-09-26 00:30:35.582165050 +0200
@@ -2,7 +2,7 @@
 
 from urllib3.filepost import encode_multipart_formdata, iter_fields
@ -82,8 +95,8 @@ diff -Nur test/test_filepost.py test/test_filepost.py
 
 BOUNDARY = '!! test boundary !!'
 diff -Nur test/test_retry.py test/test_retry.py
--- test/test_retry.py	2014-07-07 22:56:01.000000000 +0200
-+++ test/test_retry.py	2014-08-19 01:56:07.295532762 +0200
+--- test/test_retry.py	2014-08-06 20:38:12.000000000 +0200
+++ test/test_retry.py	2014-09-26 00:33:15.642164025 +0200
@@ -1,6 +1,6 @@
 import unittest
 
@ -93,8 +106,8 @@ diff -Nur test/test_retry.py test/test_retry.py
 from urllib3.exceptions import (
     ConnectTimeoutError,
 diff -Nur urllib3/_collections.py urllib3/_collections.py
--- urllib3/_collections.py	2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/_collections.py	2014-08-19 02:07:34.678543884 +0200
+--- urllib3/_collections.py	2014-08-06 20:38:12.000000000 +0200
+++ urllib3/_collections.py	2014-09-26 00:36:59.802361637 +0200
@@ -10,11 +10,8 @@
             pass
 
@ -109,9 +122,33 @@ diff -Nur urllib3/_collections.py urllib3/_collections.py
 
 
 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
+diff -Nur urllib3/connection.py urllib3/connection.py
+--- urllib3/connection.py	2014-09-13 20:18:29.000000000 +0200
+++ urllib3/connection.py	2014-09-26 00:39:41.684337834 +0200
+@@ -3,7 +3,7 @@
+ import socket
+ from socket import timeout as SocketTimeout
+ import warnings
+-from .packages import six
+import six
+ 
+ try:  # Python 3
+     from http.client import HTTPConnection as _HTTPConnection, HTTPException
+@@ -39,7 +39,10 @@
+     ConnectTimeoutError,
+     SystemTimeWarning,
+ )
+-from .packages.ssl_match_hostname import match_hostname
+try:
+    from ssl import match_hostname
+except ImportError:
+    from backports.ssl_match_hostname import match_hostname
+ 
+ from .util.ssl_ import (
+     resolve_cert_reqs,
 diff -Nur urllib3/connectionpool.py urllib3/connectionpool.py
--- urllib3/connectionpool.py	2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/connectionpool.py	2014-08-19 01:57:57.899534552 +0200
+--- urllib3/connectionpool.py	2014-09-13 20:18:29.000000000 +0200
+++ urllib3/connectionpool.py	2014-09-26 00:37:59.884610505 +0200
@@ -26,8 +26,11 @@
     TimeoutError,
     InsecureRequestWarning,
@ -126,26 +163,9 @@ diff -Nur urllib3/connectionpool.py urllib3/connectionpool.py
 from .connection import (
     port_by_scheme,
     DummyConnection,
-diff -Nur urllib3/connection.py urllib3/connection.py
--- urllib3/connection.py	2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/connection.py	2014-08-19 01:59:00.332535562 +0200
-@@ -27,8 +27,11 @@
- from .exceptions import (
-     ConnectTimeoutError,
- )
-from .packages.ssl_match_hostname import match_hostname
-from .packages import six
-+try:
-+    from ssl import match_hostname
-+except ImportError:
-+    from backports.ssl_match_hostname import match_hostname
-+import six
- 
- from .util.ssl_ import (
-     resolve_cert_reqs,
 diff -Nur urllib3/fields.py urllib3/fields.py
--- urllib3/fields.py	2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/fields.py	2014-08-19 01:59:25.757535973 +0200
+--- urllib3/fields.py	2014-08-06 20:38:12.000000000 +0200
+++ urllib3/fields.py	2014-09-26 00:46:37.117144209 +0200
@@ -1,7 +1,7 @@
 import email.utils
 import mimetypes
@ -156,8 +176,8 @@ diff -Nur urllib3/fields.py urllib3/fields.py
 
 def guess_content_type(filename, default='application/octet-stream'):
 diff -Nur urllib3/filepost.py urllib3/filepost.py
--- urllib3/filepost.py	2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/filepost.py	2014-08-19 02:00:05.271536613 +0200
+--- urllib3/filepost.py	2014-08-06 20:38:12.000000000 +0200
+++ urllib3/filepost.py	2014-09-26 00:29:56.885648823 +0200
@@ -3,8 +3,8 @@
 from uuid import uuid4
 from io import BytesIO
@ -170,8 +190,8 @@ diff -Nur urllib3/filepost.py urllib3/filepost.py
 
 writer = codecs.lookup('utf-8')[3]
 diff -Nur urllib3/response.py urllib3/response.py
--- urllib3/response.py	2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/response.py	2014-08-19 02:00:38.448537150 +0200
+--- urllib3/response.py	2014-09-13 20:18:29.000000000 +0200
+++ urllib3/response.py	2014-09-26 00:30:18.828374502 +0200
@@ -4,7 +4,7 @@
 
 from ._collections import HTTPHeaderDict
@ -182,8 +202,8 @@ diff -Nur urllib3/response.py urllib3/response.py
 from .util.response import is_fp_closed
 
 diff -Nur urllib3/util/request.py urllib3/util/request.py
--- urllib3/util/request.py	2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/util/request.py	2014-08-19 02:00:57.616537460 +0200
+--- urllib3/util/request.py	2014-08-06 20:38:12.000000000 +0200
+++ urllib3/util/request.py	2014-09-26 00:32:27.729763013 +0200
@@ -1,6 +1,6 @@
 from base64 import b64encode
 
@ -193,8 +213,8 @@ diff -Nur urllib3/util/request.py urllib3/util/request.py
 ACCEPT_ENCODING = 'gzip,deflate'
 
 diff -Nur urllib3/util/retry.py urllib3/util/retry.py
--- urllib3/util/retry.py	2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/util/retry.py	2014-08-19 02:01:18.385537796 +0200
+--- urllib3/util/retry.py	2014-09-13 20:18:29.000000000 +0200
+++ urllib3/util/retry.py	2014-09-26 00:32:56.069408718 +0200
@@ -7,7 +7,7 @@
     ReadTimeoutError,
     MaxRetryError,
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@ -1,25 +1,24 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
-version=1.9
+version=1.9.1
 revision=1
 noarch=yes
-wrksrc="${pkgname#*-}-${version}"
-build_style="python-module"
+wrksrc="urllib3-${version}"
+build_style=python-module
 python_versions="2.7 3.4"
 hostmakedepends="python-setuptools python3.4-setuptools"
-makedepends="python-backports-ssl-match-hostname python-six python3.4-six"
-depends="python python-backports-ssl-match-hostname python-six ca-certificates"
+depends="python-backports-ssl-match-hostname python-six ca-certificates"
 pycompile_module="urllib3"
 short_desc="HTTP library with thread-safe connection pooling (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://github.com/shazow/urllib3"
 license="MIT"
-distfiles="https://pypi.python.org/packages/source/u/urllib3/urllib3-${version}.tar.gz"
-checksum=4e400b2e2f53652dd0d8062ca5ecc425b6af6e96989b8d31f5dd875186aa247b
+distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
+checksum=d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b

 python3.4-urllib3_package() {
 	noarch=yes
-	depends="python3.4 python3.4-six ca-certificates"
+	depends="python3.4-six ca-certificates"
 	pycompile_version="3.4"
 	pycompile_module="urllib3"
 	short_desc="${short_desc/Python2/Python3.4}"
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@ -1,6 +1,6 @@
 # Template file for 'qemu-user-static'
 pkgname=qemu-user-static
-version=2.1.1
+version=2.1.2
 revision=1
 wrksrc="qemu-${version}"
 hostmakedepends="pkg-config automake python"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://qemu.org"
 license="GPL-2, LGPL-2.1"
 distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=be57bac8a8a1b47d76eecaa58b7eda390b7be8e5fdcbecfdf1a174380fc493e9
+checksum=fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885

 do_configure() {
 	./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec \
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@ -1,13 +1,13 @@
 # Template file for 'qemu'
 pkgname=qemu
-version=2.1.1
-revision=3
+version=2.1.2
+revision=1
 short_desc="Open Source Processor Emulator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://qemu.org"
 license="GPL-2, LGPL-2.1"
 distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=be57bac8a8a1b47d76eecaa58b7eda390b7be8e5fdcbecfdf1a174380fc493e9
+checksum=fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885

 nostrip=yes
 hostmakedepends="pkg-config perl python automake libtool flex"
@ -36,7 +36,6 @@ do_configure() {

 	if [ "$CROSS_BUILD" ]; then
 		args+=" --cross-prefix=${XBPS_CROSS_TRIPLET}-"
-		export PKG_CONFIG=pkg-config
 		export LIBTOOL=libtool
 	fi

--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@ -0,0 +1,34 @@
+# Template file for 'qpdfview'
+pkgname=qpdfview
+version=0.4.11.1
+revision=1
+hostmakedepends="pkg-config qt-qmake"
+makedepends="qt-devel poppler-qt4-devel libspectre-devel djvulibre-devel file-devel cups-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="A tabbed document viewer using Qt and the poppler library"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="https://launchpad.net/qpdfview"
+license="GPL-2"
+distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.gz"
+checksum=e8ffbe23d30bd04e9178277f48154053d98154a219d10b60e9e910d3328fe60b
+
+pre_configure() {
+	sed -i '/^Icon=/s|=.*|=qpdfview|' miscellaneous/${pkgname}.desktop.in
+}
+
+do_configure() {
+	lrelease ${pkgname}.pro
+	qmake QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP="" ${pkgname}.pro
+}
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+}
+
+post_install() {
+	install -Dm644 icons/${pkgname}.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg
+}
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@ -1,6 +1,6 @@
 # Template file for 'runit-void'
 pkgname=runit-void
-version=20140923
+version=20140928
 revision=1
 build_style=gnu-makefile
 homepage="http://www.voidlinux.eu"
--- a/srcpkgs/schedule/template
+++ b/srcpkgs/schedule/template
@ -1,6 +1,6 @@
 # Template file for 'schedule'
 pkgname=schedule
-version=6.0.1
+version=6.0.2
 revision=1
 noarch=yes
 hostmakedepends="perl"
@ -9,8 +9,8 @@ short_desc="framework to schedule jobs in a multiuser multitasking environment"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="BSD"
 homepage="https://github.com/vaeth/schedule/"
-distfiles="https://github.com/vaeth/schedule/archive/v6.0.1.tar.gz"
-checksum=639ccf1a559e3f79e7a5a83b9d7e00db9d71500815e3a580de94e92927c9b7e6
+distfiles="https://github.com/vaeth/schedule/archive/v${version}.tar.gz"
+checksum=2ea26c24688ace0595f9203f314ddeae7ad21f188e40d72b7707ade3385f5a9e

 do_install() {
 	for bin in bin/*; do
--- a/srcpkgs/spacefm/patches/glib-2.41.patch
+++ b/srcpkgs/spacefm/patches/glib-2.41.patch
@ -0,0 +1,13 @@
+glib-2.41 is stricter checking for (un)locking mutexes, and aborts()
+when attempting to unrelease an unlocked mutex.
+
+--- src/main.c.orig	2014-09-25 11:34:24.970339238 +0200
+++ src/main.c	2014-09-25 11:34:39.034443191 +0200
+@@ -1442,6 +1442,7 @@ int main ( int argc, char *argv[] )
+ #endif
+     g_thread_init( NULL );
+     gdk_threads_init ();
+    gdk_threads_enter ();
+ 
+ #if HAVE_HAL
+     /* If the user wants to mount/umount/eject a device */
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@ -1,7 +1,7 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=0.9.4
-revision=1
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel startup-notification-devel libudev-devel"
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@ -1,12 +1,12 @@
 # Template build file for 'sudo'.
 pkgname=sudo
-version=1.8.10p3
-revision=2
+version=1.8.11
+revision=1
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--with-ignore-dot -with-all-insults --with-env-editor
 --enable-shell-sets-home --enable-noargs-shell --without-sendmail
- --with-logfac=auth --disable-root-mailer --enable-pie"
+ --with-logfac=auth --disable-root-mailer --enable-pie --with-mdoc"
 hostmakedepends="groff"
 makedepends="zlib-devel pam-devel"
 conf_files="/etc/pam.d/sudo /etc/sudoers"
@ -15,8 +15,11 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gratisoft.us/sudo/"
 license="ISC, BSD, zlib"
 distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version.tar.gz"
-checksum=6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400
+checksum=a3177de7b5fbebfb43b32fc30aecaaf434762bf23e313de4c4a39e5ff715c845

+pre_install() {
+	find ${wrksrc} -type f -name Makefile -exec sed -i 's,$(INSTALL_OWNER),,g' {} \;
+}
 post_install() {
 	vinstall ${FILESDIR}/sudo.pam 644 etc/pam.d sudo
 	vmkdir usr/share/licenses/sudo
--- a/srcpkgs/sxhkd/template
+++ b/srcpkgs/sxhkd/template
@ -0,0 +1,21 @@
+# Template file for 'sxhkd'
+pkgname=sxhkd
+version=0.5.4
+revision=1
+build_style=gnu-makefile
+hostmakedepends="git"
+makedepends="libxcb-devel xcb-util-devel xcb-util-keysyms-devel"
+short_desc="Simple X HotKey Daemon"
+maintainer="Eivind Uggedal <eivind@uggedal.com>"
+license="BSD"
+homepage="https://github.com/baskerville/sxhkd"
+
+do_fetch() {
+	local url="git://github.com/baskerville/sxhkd"
+	msg_normal "Fetching source from $url ...\n"
+	git clone -b${version} ${url} ${pkgname}-${version}
+}
+
+post_install() {
+	vlicense LICENSE
+}
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=31.1.0
+version=31.1.2
 revision=1
 homepage="http://www.mozilla.com/"
 short_desc="Thunderbird language packs"
@ -101,58 +101,58 @@ _pkgtmpl() {
 }

 checksum="
-3bdd4b046604dd43b2d29cf51045e2d37f77dcbf6f8f80072c9dbc41582a4229
-0c19b6dc4f06069b4d89edb03fc1cf6c43adf3de92b629a22683282a616ada0e
-f640832e434fc13c3e4fc86395a5dad8b4281ef5bc008708bbfc239dce558e56
-6f77a52a6d86e109a8555e085c0f917f7dc9c7038e8d1099424d68916341e513
-3589d16d373d4b8fd4364317bf43ab1b0ce61b4d627bcb85b12e9b0ecd28b1c3
-7c0160a2e9115f11a98f0571f8e85495ed9d9afcf2dc5d30b4b3f557d551a519
-e5daa36ddf547a065816c67bae89b1637364fde044a03899a2f1f51bb1bb9161
-926a631f22534cd475a2ca488a9b6ca9a749d50ae9bc4ec287bc57ca8fb58944
-c5bda3505df4de80cef6d5f0269bc1622f8be4c51d74658f37f3ce987381ff62
-16ee968e3c6d8d9f5a652a93ede4b5a399c871e2595b135617479cd7d3792315
-80e078d8ed6be3481431d698925611391728e303d9a86afb8cecdc918e51b072
-baa60e58a02c3d3b8ad65839cf1f65332561f3341f7739a9c4d5a77e5387dcfe
-29443d68c3bd260cf104ba64dfd302687ed272569f5840cc8cdee3cec88d3499
-fa810d84e57445dc842413b4eee41ff2cda0a685c46799a92740436bb72a4d9b
-380563fa13b9387fcc48067f9f5a9224e671c6b1a5d6417f93b460a75964a714
-3ef7f838cbee111a2031a4acad6dea5077c111860f49bb7f7866827b943de3d3
-a0943d85b3255d6bb17fcf92f512d91ad21208ef6251de556012e07819ebba5d
-f03066aa7db8e1efeb40d0fd7b8a22e1ebeef86ea3e2ee349413fdf29381b4a0
-8649d6923dbd8997be6b7f1736571cfc751b7f2b3f13fabbf7a9dc77c33bb47a
-0b11553a7795585462f983cf329322bc08665a168c1af8a14bbe563d80225bef
-948440485b1c97d753d035c1095734db50a224236306d1d9f23e064197ff9f8d
-0aab77a9ccafa20dae350a173b7d4a9abffedc6d720a0d49855ac193b53db306
-865a6474c146b29fb0469b3a99b3f5b6492ae594cdcf0b5dd9df081529634f53
-9cbdf3cb6e4a576fece60636bc6d47fc5c1f98521021edfc21fcbe4c50627a4d
-a44318d8ecc80da9ac306cdc4bc804185cbf4556bc772c48ff73286f12bf5bca
-1817ec0921a34b5facbcbdf9eb631aeb08c163cda86d0d570eddf9d36f66d836
-ba15083ecdd2a5b56f45f7c2fee486f006e1d686c0554acae884479457808b56
-b7fdef3f352700a889ab7715fb34461567fb8e40b14c1c631aaff42a4693f831
-20930236af265efe0826b1f1c2266e60a197812131c9ce659859a15f24149462
-69766a4bdd55feab8d73df0ce36a8f5116a7c8c91b6d26e32ca18ca9adee1d42
-e1b7633b1691ee36271312ecdbe5e2907ca8b9e2b46fdba26003d54c1daa8b40
-2225b22692faf76945e9c6ec7e240f8cd7ba76704c1ac9e2f6cef45da6f86ef9
-da100c0594b57277b5ea8084eebeb9faa1dd4e4b23c9977d41422f6e129dcbcf
-65878db5a493cc3228f2048a9628aeee117282a53db2a30f00fff69ce722e187
-f9ec7b3d25962ea316da43eed789044a6eba41c22595fda0ce71254efff41798
-55c1fcbeafeedbef2d974924ab19283b9049ae5f2f46b1fcb2903c631f54d028
-2f01bce3c7a6c2e39d76d5e7ec8757cb805d7e42d9b32deb5d3fa29502686c54
-f5d737033597bd560a503b68cb7e58343a23533a18ac182f1f08a9c56a57aa68
-fdeddd53df5cb650253383e10558d493714dc059ac6a2ab114a552db8f733859
-e93691ec54708ff10fbccb43f766f0a6ef8996c0302046d75966abeabde7341c
-7672a6fb5d7e68e54463a9778262f3a988aa02d45bda8ce5e295d5b18d5436b6
-79fd5f430a6946679fb58a3609b10dd8e9119acad1d3cc79370c1b5ef8d1ca1e
-04f21ff5c10a75cd4f333269b71f3375c7e79894af0784c0940676a6586618f6
-813a638a3d8a9d123887a473aee5775f4389ae5d5bafca69f84ced3ec74391bb
-4eb1d225c047114803c2b2b43d78fecd75eaadcc47e8aebfd824f421cf2ecca5
-905cb92682a6c3cd62545942699803d70d2fa0280b110565240d1b788757cc39
-5ecc9feb46824c72a325fe4d6a7591b61b10ee41f2f2f872a74fd6d0ff5caa46
-e58f032465419beb1327e2ab1f4cdd06ad1dec72fca1aa2e521ddd3d8bf5be18
-b2206f4464d40a0fac5ca583deb0927381acf725a7673ceb0561b7b89f37592c
-8789a90e44469ecdddbd48b0d5f4e2539a1e1b67d02358b46c2c8f98d834603a
-b082f8232355a147e9350b0f3ec5f4637d2ead8a1a63a0770104a8e054481b97
-6ea664760588a68d9e3157fe3eea238c107067ab287e122bf63f902a564b9340
-38e3636d46a8f80245f4ccd07e8e7c5812f8743552fdc5edb2cc5ba3205add3d
-5b204c71f1453ae9a2a6e793967dc432266b7e498e6c8129ef89c1c99ed0f9d5
+d7f7f5fa42bc7dbeeb67ea312cd1390f9daf38cf22db2d29acebcd1d3e74d1fa
+635422fbc96177f43cb01c292a3b0a06ceb3040355d00880a6ddeffb4dcfeb4a
+a8a48f464b3a44a5724096995431606b740af3247bb325f47a63c065f626c1d7
+e5dd2c1c5a97cc90514a1d0e0852e8579e625d689964b198036a6ac6f33e446c
+461fac71d5d8a3910d68740def12b2235374b39f5cfa01ab912021e295cbd3c2
+3c1d248c517de97d559a85f127e6871afd1a8c245cb4999be80626a258bdbb49
+fff999721e7b388880a7a9c64d73add479e2a2f9e447b8d4e506a318efde9069
+40c16d650c2f48ea945daca989f24cc293343794c45c5cde3f7ffe1305b8f159
+fdfd890e09e23004cc1ba4c0df38648cd74f1c8d9d8d336c15a2aee8f75d98fc
+da60f2a84ca8cb6b4e15393046ae43adac368dac35327f04bf89d31e8e0f829e
+975fdb6134fe5436d0459eb89dc6e8ae3d8829f2b8f7b5a3387011215184cef5
+87ac86fac2b341286e9789c1037404588813bb858e9cd718f7de5e401ddade6e
+f96739de83f760ee65727e9a68ad59e13cc60d2272b6a03bc80b5153fa0a365a
+d50ef569c6f74ceac8d9eb128cd98c3b2bb0af4853d1bf7a26265d5f31a8d452
+6a9ec42a0f90b1d59fb61e47e533b5c79df41e13d8452d2fba5e5a649527cffe
+7763519e3c74f37afa026a8fe7214a2b99e9d0f86391031eaa66869e3ef74870
+233ce00a457754f2454f26e618cc01f1736671a717a96b63cc7bea3d72193172
+833ce0403ed46f87cb2730d2a0a4f3cdaa383295f84e7beeb90d6e48b2a0ddf7
+daf99b99c3fa73679801750bfbd33ac007edc05621ad663e4e26ddfee17b5dd2
+f775a2236591a18d84fcf36e5b5a5d1bb8a5864b91faa29c2b39e0bee599ff0e
+6eed7b3ac1e4f9ac89b138041c2a10d7fae0ef5492035397bfafe771952526db
+0576fb35d74a20624581b4fe53ef916032e77e3c7bfd9a7b86fdf687a413c923
+274c45fe7bffe038a9c846359e99847193672e7c4dcec4c47e65720a8d16e3c0
+784505dd220387ff2b569118380957882feabf61366a9cde1e794e4fc08414f7
+4908835dafeb9bef43f4fa294f254bcd64c611c40f1aa35716730f179a3af554
+210f50f948c726744ffdfa33cdb1fd9f4434698bd6c131257984f2e2cdcc1ecc
+8acd553aacfdf9f4ed66fdd50454f473146fa1762309ff48104a941e62cff995
+8388260bdb9d7d715e7cfdfe21826e5d390bcb1f48d1e649d82d0142f360d42d
+cebe06ca5e72448ffe8e5d97c61b2be3a898b1ceb9726f9a0bfa7cec714f8eb2
+d5bab57141fbae37f3a983ed85983d91fff71f005da1dcf89682563c92baf3f3
+06a62d4ef79c2a7006b15fae6882b7919b10843c2b93cd23decf9e4d07151555
+fb40e186e31bc836a8f18be6df4dc654b793a782f1b79f4b143ff3830781dca2
+80dc6b4ba4fef803776e3634682cded4ae4df1a35771d30ed0c2a1f4af6a6e30
+be32cfc7192a3836f48c11022ec58d28091f568f1bf2fc25e1d7667ac6222603
+0607fe516735fea3763154f63bc2212f1b76ea3cfae26f1748e7d3f05b5a1301
+31782ee5743442de756d7eb6dc601ec5843af0d6f45254f946fedca23dfbf9f5
+4f3849fb31c8fe4f65869b35595621df22d2491d08df259d9fdb14ee89b9df04
+ea31936122f377d83c6d059435c28c3e990cadd6d1332d97ac3a7bb196ad085b
+74501df72d4747944fafafde1fedf2214c86c4f4ba594d276f5efec437f14a28
+43f0d1a2a6187e3f01e75c091c599341b0895e71e3c76b7e6cd040fd95d69482
+5c8c153c5f36e7237605fcbaa2d66df0e72b7c6a20f793b9113c3e16c87240b8
+381a1f57aa7e3646dcd29aa28eec1bd951cff1e378d5fe795a5e87556fd286ae
+667ffecf4065352a0e6b32ed5d4535dc9758167cb431b01b13bac9d4027719e5
+5bb7054dc79e73852f39464b3cabeb28ef45dd814a2fbef699fd8ac0d28cfa15
+e8f13c479e58e7858ef82864927bb48d013d3f1b7c04b26b525504cb475ba02e
+4e2c3392ae516d34f2568a6de607e86e641eda8e1dd211420ab9c569354757b2
+f38d505b006a209c28fbe2497e2840b1402f15659ab8850b96e401b37439aa43
+0ea7ab963f7316a8c99c4ede0d2604532b8e9c640d1c1ad17b5aef52410efb6a
+2990c01eccc33ba92e4bd4a5b6bc6a862a3d4ba038187193862aee20590f222f
+7c28f5337d0f5265ffc264e06b7f18b733358ba040d36cccc14586e4b2b212d5
+711e037fe115f63b560e59ca33f26fe89b021587d3ade4706df0fe5c4822af16
+9889f4d9ebf9d298b7a5076879bf34e71dd00665a6be69ff2331df49fdc0b620
+b29c35c9b4de9678f8f15d5910b23b842553b80763f41f2340e823a03b44700e
+9c76eae686d8a72ceb11a24ad155521aa02ee65ade6a068a4dfe6df5f7ba4698
 "
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@ -1,6 +1,6 @@
 # Template build file for 'thunderbird'.
 pkgname=thunderbird
-version=31.1.0
+version=31.1.2
 revision=1
 lib32disabled=yes
 wrksrc="comm-esr${version/.*/}"
@ -9,7 +9,7 @@ maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.mozilla.org/thunderbird/"
 license="MPL-1.1, GPL-2, LGPL-2.1"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
-checksum=f6a8f2fce1958c692dce7351caf5a7d78433c7be30e2a89a414e0ef6727081ea
+checksum=86b18e7642ad8e6004cb4826daec586a24fae8a27da59df49f0039495dd5d7b5

 hostmakedepends="unzip zip perl python yasm pkg-config"
 makedepends="python-devel cairo-devel libjpeg-turbo-devel pixman-devel
--- a/srcpkgs/tlsdate/files/tlsdated/run
+++ b/srcpkgs/tlsdate/files/tlsdated/run
@ -0,0 +1,2 @@
+#!/bin/sh
+exec tlsdated 2>/dev/null
--- a/srcpkgs/tlsdate/files/tlsdated/supervise
+++ b/srcpkgs/tlsdate/files/tlsdated/supervise
@ -0,0 +1 @@
+/run/runit/supervise.tlsdated
--- a/srcpkgs/tlsdate/template
+++ b/srcpkgs/tlsdate/template
@ -0,0 +1,32 @@
+# Template file for 'tlsdate'
+pkgname=tlsdate
+version=0.0.10
+revision=1
+wrksrc="${pkgname}-${pkgname}-${version}"
+build_style=gnu-configure
+configure_args="--sbindir=/usr/bin
+ --with-polarssl=no ac_cv_func_clock_gettime=yes"
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	configure_args+=" --disable-seccomp-filter"
+fi
+conf_files="/etc/tlsdate/tlsdated.conf"
+make_dirs="/var/cache/tlsdated 0755 root root"
+hostmakedepends="automake pkg-config libtool"
+makedepends="libressl-devel dbus-devel libevent-devel"
+short_desc="Secure parasitic rdate replacement using HTTPS"
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+license="BSD"
+homepage="https://github.com/ioerror/tlsdate"
+distfiles="https://github.com/ioerror/tlsdate/archive/${pkgname}-${version}.tar.gz"
+checksum=f2e5b16cb2e85348ee0958467a1f575d1f5f9027bc0c759c78854586cdfbdd1d
+
+pre_configure() {
+	sh ./autogen.sh
+}
+
+post_install() {
+	vlicense LICENSE
+	rm ${DESTDIR}/usr/share/doc/${pkgname}/{TODO,LICENSE}
+	vmkdir etc/sv
+	vcopy ${FILESDIR}/tlsdated etc/sv
+}
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@ -1,6 +1,6 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
-version=20140923
+version=20140928
 revision=1
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
--- a/srcpkgs/xbps-triggers/files/system-accounts
+++ b/srcpkgs/xbps-triggers/files/system-accounts
@ -14,13 +14,6 @@ PKGNAME="$3"
 VERSION="$4"
 UPDATE="$5"

-USERADD=usr/sbin/useradd
-USERDEL=usr/sbin/userdel
-GROUPADD=usr/sbin/groupadd
-GROUPDEL=usr/sbin/groupdel
-PASSWD=usr/bin/passwd
-GETENT=usr/bin/getent
-
 group_add() {
 	local _grname _gid use_gid

@ -31,11 +24,11 @@ group_add() {
 		use_gid="gid ${_gid}"
 	fi

-	if ! $GETENT group ${_grname} >/dev/null; then
+	if ! getent group ${_grname} >/dev/null; then
 		if [ -n "$use_gid" ]; then
-			$GROUPADD -r ${_grname} -g ${_gid} >/dev/null 2>&1
+			groupadd -r ${_grname} -g ${_gid} >/dev/null 2>&1
 		else
-			$GROUPADD -r ${_grname} >/dev/null 2>&1
+			groupadd -r ${_grname} >/dev/null 2>&1
 		fi
 		if [ $? -eq 0 ]; then
 			echo "Created ${_grname} ($use_gid) system group."
@ -51,31 +44,33 @@ targets)
 	echo "post-install pre-remove"
 	;;
 run)
-	if [ ! -x $USERADD -a ! -x $GROUPADD -a ! -x $PASSWD -a ! -x $GETENT ]; then
-	       exit 0
-	fi
-
 	if [ -z "$system_accounts" -a -z "$system_groups" ]; then
 		exit 0
 	fi

-	HOST_ARCH=$(uname -m)
-
-	if [ -n "$XBPS_TARGET_ARCH" -a "$XBPS_TARGET_ARCH" != "$HOST_ARCH" ]; then
-		USERADD=useradd
-		USERDEL=userdel
-		GROUPADD=groupadd
-		GROUPDEL=groupdel
-		PASSWD=passwd
-		GETENT=getent
+	if [ -x sbin/useradd ]; then
+		USERADD=1
+	fi
+	if [ -x sbin/userdel ]; then
+		USERDEL=1
+	fi
+	if [ -x sbin/groupadd ]; then
+		GROUPADD=1
+	fi
+	if [ -x sbin/groupdel ]; then
+		GROUPDEL=1
+	fi
+	if [ -x sbin/getent ]; then
+		GETENT=1
 	fi

 	case "$TARGET" in
 	post-install)
 		# System groups required by a package.
 		for grp in ${system_groups}; do
-			if [ ! -x "$GROUPADD" ]; then
-				echo "WARNING: cannot create ${grp} system group (missing groupadd)"
+			if [ -z "$GROUPADD" -a -z "$GETENT" ]; then
+				echo "WARNING: cannot create ${grp} system group (missing groupadd/getent)"
+				echo "The following group must be created manually: $grp"
 				continue
 			fi
 			group_add $grp
@ -87,23 +82,31 @@ run)
 			_uid="${acct#*:}"
 			[ "${_uid}" != "${_uname}" ] && use_id="-u ${_uid} -g ${_uid}"

-			if [ ! -x "$USERADD" ]; then
-				echo "WARNING: cannot create ${acct} system user/group (missing useradd)"
-				continue
-			fi
 			eval homedir="\$${_uname}_homedir"
 			eval shell="\$${_uname}_shell"
 			eval descr="\$${_uname}_descr"
 			eval groups="\$${_uname}_groups"
 			[ -z "$homedir" ] && homedir="/"
 			[ -z "$shell" ] && shell="/sbin/nologin"
-			[ -z "$descr" ] && descr="${_uname} unpriviledged user"
+			[ -z "$descr" ] && descr="${_uname} unprivileged user"
 			[ -n "$groups" ] && user_groups="-G $groups"

+			if [ -z "$USERADD" -a -z "$GETENT" ]; then
+				echo "WARNING: cannot create ${acct} system user/group (missing useradd/getent)"
+				echo "The following system account must be created:"
+				echo "   Account: ${uname:-${_uid}} (uid: '${_uid}')"
+				echo "   Description: '${descr}'"
+				echo "   Homedir: '${homedir}'"
+				echo "   Shell: '${shell}'"
+				echo "   Additional groups: '${groups}'"
+				continue
+			fi
+
 			group_add ${acct}

-			if ! $GETENT passwd ${_uname} >/dev/null; then
-				$USERADD -c "$descr" -d "$homedir" -s "$shell" ${user_groups} ${use_id:=-g ${_uname}} -r ${_uname} && \
+			if ! getent passwd ${_uname} >/dev/null; then
+				useradd -c "$descr" -d "$homedir" -s "$shell" \
+					${user_groups} ${use_id:=-g ${_uname}} -r ${_uname} && \
 					$PASSWD -l ${_uname} >/dev/null 2>&1
 				if [ $? -eq 0 ]; then
 					echo "Created ${_uname} (${_uid}) system user."
@ -122,11 +125,11 @@ run)
 			for acct in ${system_accounts}; do
 				_uname="${acct%:*}"
 				_uid="${acct#*:}"
-				if [ ! -x "$USERDEL" ]; then
+				if [ -z "$USERDEL" ]; then
 					echo "WARNING: cannot remove ${acct} system user/group (missing userdel)"
 					continue
 				fi
-				$USERDEL ${_uname} >/dev/null 2>&1
+				userdel ${_uname} >/dev/null 2>&1
 				if [ $? -eq 0 ]; then
 					echo "Removed ${_uname} (${_uid}) system user/group."
 				fi
@ -134,11 +137,11 @@ run)
 			for grp in ${system_groups}; do
 				_uname="${acct%:*}"
 				_uid="${acct#*:}"
-				if [ ! -x "$GROUPDEL" ]; then
+				if [ -z "$GROUPDEL" ]; then
 					echo "WARNING: cannot remove ${acct} system group (missing groupdel)"
 					continue
 				fi
-				$GROUPDEL ${_uname} >/dev/null 2>&1
+				groupdel ${_uname} >/dev/null 2>&1
 				if [ $? -eq 0 ]; then
 					echo "Removed ${_uname} (${_uid}) system group."
 				fi
@ -153,3 +156,4 @@ run)
 esac

 exit 0
+# end
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.84
+version=0.87
 revision=1
 noarch=yes
 bootstrap=yes
@ -17,8 +17,4 @@ do_install() {
 		vinstall ${FILESDIR}/${_trigger} 750 ${_triggersdir}
 		echo "# end" >> ${DESTDIR}/${_triggersdir}/${_trigger}
 	done
-	# Create compat symlink.
-	vmkdir var/db/xbps
-	cd ${DESTDIR}/var/db/xbps
-	ln -sf ../../../${_triggersdir} triggers
 }
--- a/srcpkgs/xen/patches/gcc4.9.patch
+++ b/srcpkgs/xen/patches/gcc4.9.patch
@ -1,29 +0,0 @@
--- Config.mk.orig	2014-04-29 20:54:43.117010822 +0100
-+++ Config.mk	2014-04-29 20:58:23.100055325 +0100
-@@ -188,6 +188,8 @@
- CFLAGS += -std=gnu99
- 
- CFLAGS += -Wall -Wstrict-prototypes
-+
-+CFLAGS += -Wno-error=maybe-uninitialized
- 
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
- # and is over-zealous with the printf format lint
--- tools/blktap2/drivers/block-qcow.c.orig	2014-03-10 10:43:57.000000000 +0000
-+++ tools/blktap2/drivers/block-qcow.c	2014-04-30 21:10:26.270699187 +0100
-@@ -427,6 +427,7 @@
- 
- 		if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) {
- 			DPRINTF("ERROR allocating memory for L1 table\n");
-+			return -1;
- 		}
- 		memcpy(tmp_ptr, l1_ptr, 4096);
- 
-@@ -600,6 +601,7 @@
- 		
- 		if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) {
- 			DPRINTF("ERROR allocating memory for L1 table\n");
-+			return -1;
- 		}
- 		memcpy(tmp_ptr2, l2_ptr, 4096);
- 		lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET);
--- a/srcpkgs/xen/patches/xsa105.patch
+++ b/srcpkgs/xen/patches/xsa105.patch
@ -0,0 +1,37 @@
+x86/emulate: check cpl for all privileged instructions
+
+Without this, it is possible for userspace to load its own IDT or GDT.
+
+This is XSA-105.
+
+Reported-by: Andrei LUTAS <vlutas@bitdefender.com>
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+Tested-by: Andrei LUTAS <vlutas@bitdefender.com>
+
+--- xen/arch/x86/x86_emulate/x86_emulate.c
+++ xen/arch/x86/x86_emulate/x86_emulate.c
+@@ -3314,6 +3314,7 @@ x86_emulate(
+         goto swint;
+ 
+     case 0xf4: /* hlt */
+        generate_exception_if(!mode_ring0(), EXC_GP, 0);
+         ctxt->retire.flags.hlt = 1;
+         break;
+ 
+@@ -3710,6 +3711,7 @@ x86_emulate(
+             break;
+         case 2: /* lgdt */
+         case 3: /* lidt */
+            generate_exception_if(!mode_ring0(), EXC_GP, 0);
+             generate_exception_if(ea.type != OP_MEM, EXC_UD, -1);
+             fail_if(ops->write_segment == NULL);
+             memset(&reg, 0, sizeof(reg));
+@@ -3738,6 +3740,7 @@ x86_emulate(
+         case 6: /* lmsw */
+             fail_if(ops->read_cr == NULL);
+             fail_if(ops->write_cr == NULL);
+            generate_exception_if(!mode_ring0(), EXC_GP, 0);
+             if ( (rc = ops->read_cr(0, &cr0, ctxt)) )
+                 goto done;
+             if ( ea.type == OP_REG )
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@ -1,14 +1,14 @@
 # Template file for 'xen'
 pkgname=xen
-version=4.4.0
+version=4.4.1
 wrksrc=xen-${version}
-revision=3
+revision=2
 short_desc="The Xen hypervisor utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xen.org"
 license="GPL-2"
 distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
-checksum=6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021
+checksum=55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25

 only_for_archs="x86_64"

@ -18,9 +18,9 @@ makedepends="
 libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel
 ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel
 dev86 acpica-utils pixman-devel gcc-multilib"
-
 depends="iproute2 bridge-utils xen-hypervisor"

+build_options="systemd"
 make_dirs="
 	/var/lib/xenstored	755	root 	root
 	/var/lib/xen/xenpaging	755	root	root
@ -87,12 +87,14 @@ do_install() {
 		${DESTDIR}/usr/share/bash-completion/completions

 	# Install systemd services.
-	vmkdir usr/lib/systemd/system
-	install -m644 ${FILESDIR}/*.{mount,service} ${DESTDIR}/usr/lib/systemd/system
-	vmkdir usr/lib/modules-load.d
-	install -m644 ${FILESDIR}/xen.conf ${DESTDIR}/usr/lib/modules-load.d
-	install -Dm644 ${FILESDIR}/tmpfiles.d-xen.conf \
-		${DESTDIR}/usr/lib/tmpfiles.d/xen.conf
+	if [ "$build_option_systemd" ]; then
+		vmkdir usr/lib/systemd/system
+		install -m644 ${FILESDIR}/*.{mount,service} ${DESTDIR}/usr/lib/systemd/system
+		vmkdir usr/lib/modules-load.d
+		install -m644 ${FILESDIR}/xen.conf ${DESTDIR}/usr/lib/modules-load.d
+		install -Dm644 ${FILESDIR}/tmpfiles.d-xen.conf \
+			${DESTDIR}/usr/lib/tmpfiles.d/xen.conf
+	fi

 	# Move bins to /usr/bin.
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin/
@ -115,7 +117,6 @@ xen-hypervisor_package() {
 		vmove boot
 	}
 }
-
 xen-devel_package() {
 	short_desc+=" - development files"
 	depends="xen-libs>=${version}_${revision}"
@ -125,7 +126,6 @@ xen-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
 xen-libs_package() {
 	short_desc+=" - runtime libraries"
 	replaces="xen<4.3.1_2"
--- a/srcpkgs/xinit/patches/dont-use-active-vt.patch
+++ b/srcpkgs/xinit/patches/dont-use-active-vt.patch
@ -0,0 +1,24 @@
+Revert this change that was committed to fix an issue with systemd.
+
+We want to keep the original behaviour, i.e use the first unused vt.
+
+--- startx.cpp.orig	2014-09-26 14:22:23.954772539 +0200
+++ startx.cpp	2014-09-26 14:22:32.993723320 +0200
+@@ -188,17 +188,6 @@ XCOMM process server arguments
+ if [ x"$server" = x ]; then
+     server=$defaultserver
+ 
+-#ifdef __linux__
+-    XCOMM When starting the defaultserver start X on the current tty to avoid
+-    XCOMM the startx session being seen as inactive:
+-    XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
+-    tty=$(tty)
+-    if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
+-        tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+-        vtarg="vt$tty_num"
+-    fi
+-#endif
+-
+     XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
+     if [ x"$serverargs" = x -a x"$display" = x ]; then
+ 	if [ -f "$userserverrc" ]; then
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@ -1,7 +1,7 @@
 # Template build file for 'xinit'.
 pkgname=xinit
 version=1.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-xinitdir=/etc/X11/xinit"
 hostmakedepends="pkg-config"
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2014.09.22.1
+version=2014.09.25
 revision=1
 noarch=yes
 wrksrc="${pkgname}"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://rg3.github.com/youtube-dl/"
 license="Public Domain"
 distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=9f03840f034a601487deef98992d22fbb9bb02b7609eb20db47ed73d1999612f
+checksum=1fa2669cfa905fe11c25a1c4b9177d93e67b433a322fbb253725837912f424a2

 do_install() {
 	vbin ${pkgname}
--- a/2
+++ b/2
@ -430,7 +430,7 @@ readonly XBPS_DIGEST_CMD="xbps-uhelper digest"
 readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver"

 XBPS_TARGET="$1"
-XBPS_TARGET_PKG="$2"
+XBPS_TARGET_PKG="${2##*/}"

 # Check if stdout is a tty; if false disable colors.
 test -t 1 || export NOCOLORS=1