update all the packages, remove some unneeded ones

2018-06-01 08:08:14 -04:00 · 2018-06-01 08:08:14 -04:00 · 9fce20fc6d
parent 1ac473c02c
commit 9fce20fc6d
142 changed files with 2965 additions and 1333 deletions
--- a/src/ampache-git/PKGBUILD
+++ b/src/ampache-git/PKGBUILD
@ -3,8 +3,8 @@

 pkgname=ampache-git
 _gitname=ampache
-pkgver=3.8.2.291.g10b5a63f
-pkgrel=1
+pkgver=3.8.1.7.g799165a
+pkgrel=2
 pkgdesc="A PHP-based tool for managing and playing your audio/video files via a web interface"
 arch=('i686' 'x86_64')
 url="http://www.ampache.org/"
--- a/src/aurutils/0001-aurbuild-backport-fix-for-236.patch
+++ b/src/aurutils/0001-aurbuild-backport-fix-for-236.patch
@ -1,7 +1,7 @@
-From 07d302de1d48e2daea193d9a3a2931331c8abce0 Mon Sep 17 00:00:00 2001
+From 9c28c606c12b244a1034fbc7693ffe7894d86d7b Mon Sep 17 00:00:00 2001
 From: Alad Wenter <alad@mailbox.org>
 Date: Fri, 6 Oct 2017 23:03:14 +0200
-Subject: [PATCH 1/2] aurbuild: backport fix for #236
+Subject: [PATCH 1/7] aurbuild: backport fix for #236

 ---
 bin/aurbuild | 10 ++++++++--
@ -36,5 +36,4 @@ index 05df8b0..4672372 100755
 
     if ((chroot)); then
 -- 
-2.14.2
-
+2.11.0
--- a/src/aurutils/0002-aurbuild-disable-verbose-signing.patch
+++ b/src/aurutils/0002-aurbuild-disable-verbose-signing.patch
@ -1,25 +0,0 @@
-From 1e16b62746576f594a5da9859a8a58e5f5be74f1 Mon Sep 17 00:00:00 2001
-From: Alad Wenter <alad@mailbox.org>
-Date: Fri, 6 Oct 2017 23:10:04 +0200
-Subject: [PATCH 2/2] aurbuild: disable verbose signing
-
---
- bin/aurbuild | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/aurbuild b/bin/aurbuild
-index 4672372..951a9ba 100755
--- a/bin/aurbuild
-+++ b/bin/aurbuild
-@@ -4,7 +4,7 @@ readonly basedir=$PWD
- readonly PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
- set -e
- 
-declare -a gpg_args=(--detach-sign --no-armor --verbose --batch)
-+declare -a gpg_args=(--detach-sign --no-armor --batch)
- declare -a makechrootpkg_args=(-cnu) makepkg_args=(-Lcrs)
- declare -i chroot=0 sign_pkg=0
- 
-- 
-2.14.2
-
--- a/src/aurutils/0002-aursync-make-L-optional-281.patch
+++ b/src/aurutils/0002-aursync-make-L-optional-281.patch
@ -0,0 +1,69 @@
+From 74d0496ad357ca8c65562a028cb5b95888ea71cf Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Sat, 27 Jan 2018 03:21:37 +0100
+Subject: [PATCH 2/7] aursync: make -L optional (#281)
+
+---
+ bin/aursync    | 7 ++++---
+ man1/aursync.1 | 7 ++++++-
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/bin/aursync b/bin/aursync
+index fdf485d..1a96c0d 100755
+--- a/bin/aursync
+++ b/bin/aursync
+@@ -58,9 +58,9 @@ if getopt -T || (($? != 4)); then
+     exit 22
+ fi
+ 
+-longopts=allan,bind:,chroot,container:,force,help,ignore:,no-confirm,no-ver,no-view,print,rmdeps,sign,tar,temp,repo:,root:,update
+longopts=allan,bind:,chroot,container:,force,help,ignore:,no-confirm,no-ver,no-view,print,rmdeps,sign,tar,temp,repo:,root:,update,log
+ 
+-if TEMP=$(getopt -o B:cC:fhnprstTu -l "$longopts" -n "$argv0" -- "$@"); then
+if TEMP=$(getopt -o B:cC:fhLnprstTu -l "$longopts" -n "$argv0" -- "$@"); then
+     eval set -- "$TEMP"
+ else
+     usage
+@@ -78,6 +78,7 @@ while true; do
+         -f|--force)      local_args+=(-f);           shift   ;;
+         -n|--no-confirm) local_args+=(--noconfirm);  shift   ;;
+         -r|--rmdeps)     local_args+=(-r);           shift   ;;
+        -L|--log)        local_args+=(-L);           shift   ;;
+         -p|--print)      printonly=1;                shift   ;;
+         -t|--tar)        snapshot=1;                 shift   ;;
+         -u|--update)     update=1;                   shift   ;;
+@@ -103,7 +104,7 @@ fi
+ if ((chroot)); then
+     makepkg_args=(-cnu "${chroot_args[@]}")
+ else
+-    makepkg_args=(-Lcs "${local_args[@]}")
+    makepkg_args=(-cs "${local_args[@]}")
+ fi
+ 
+ if ! (($# + update)); then
+diff --git a/man1/aursync.1 b/man1/aursync.1
+index 5569c36..834afd7 100644
+--- a/man1/aursync.1
+++ b/man1/aursync.1
+@@ -78,13 +78,18 @@ value of the configured repository.
+ .RE
+ 
+ .SS makepkg
+-The default set of options is \fImakepkg -Lcrs\fR.
+The default set of options is \fImakepkg -cs\fR.
+ 
+ .B \-f, --force
+ .RS
+ Overwrite built packages. (\fImakepkg -f\fR)
+ .RE
+ 
+.B \-L, --log
+.RS
+Enable logging to a text file in the build directory. (\fImakepkg -L\fR)
+.RE
+
+ .B \-n, --no-confirm
+ .RS
+ Do not wait for user input. (\fImakepkg --noconfirm\fR)
+-- 
+2.11.0
--- a/src/aurutils/0003-aurbuild-update-default-options.patch
+++ b/src/aurutils/0003-aurbuild-update-default-options.patch
@ -0,0 +1,27 @@
+From 4a7ef4e264162909f3ceb1debccb5cb23aebcba3 Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Sat, 27 Jan 2018 13:57:37 +0100
+Subject: [PATCH 3/7] aurbuild: update default options
+
+Remove gpg --verbose, makepkg -L
+---
+ bin/aurbuild | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/aurbuild b/bin/aurbuild
+index 4672372..f5ca92c 100755
+--- a/bin/aurbuild
+++ b/bin/aurbuild
+@@ -4,8 +4,8 @@ readonly basedir=$PWD
+ readonly PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
+ set -e
+ 
+-declare -a gpg_args=(--detach-sign --no-armor --verbose --batch)
+-declare -a makechrootpkg_args=(-cnu) makepkg_args=(-Lcrs)
+declare -a gpg_args=(--detach-sign --no-armor --batch)
+declare -a makechrootpkg_args=(-cnu) makepkg_args=(-crs)
+ declare -i chroot=0 sign_pkg=0
+ 
+ conf_chroot() {
+-- 
+2.11.0
--- a/src/aurutils/0003-aursync-1-r-is-not-a-default-option.patch
+++ b/src/aurutils/0003-aursync-1-r-is-not-a-default-option.patch
@ -1,25 +0,0 @@
-From 20dc81ad04a647ef66b08c274590666554df40c9 Mon Sep 17 00:00:00 2001
-From: Alad Wenter <alad@mailbox.org>
-Date: Sat, 14 Oct 2017 16:59:57 +0200
-Subject: [PATCH] aursync(1): -r is not a default option
-
---
- man1/aursync.1 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man1/aursync.1 b/man1/aursync.1
-index 5569c36..82b8d82 100644
--- a/man1/aursync.1
-+++ b/man1/aursync.1
-@@ -78,7 +78,7 @@ value of the configured repository.
- .RE
- 
- .SS makepkg
-The default set of options is \fImakepkg -Lcrs\fR.
-+The default set of options is \fImakepkg -Lcs\fR.
- 
- .B \-f, --force
- .RS
-- 
-2.14.2
-
--- a/src/aurutils/0004-aurfetch-specify-git-work-tree-git-dir-274.patch
+++ b/src/aurutils/0004-aurfetch-specify-git-work-tree-git-dir-274.patch
@ -0,0 +1,53 @@
+From ecc173230584327d74ea2d8899fec30d6ce6340c Mon Sep 17 00:00:00 2001
+From: Alad Wenter <AladW@users.noreply.github.com>
+Date: Mon, 22 Jan 2018 16:16:16 +0100
+Subject: [PATCH 4/7] aurfetch: specify git work-tree/git-dir (#274)
+
+Avoid "Stopping at filesystem boundary" issues with different file
+systems.
+---
+ bin/aurfetch | 21 +++++++++++----------
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/bin/aurfetch b/bin/aurfetch
+index 95c49c3..0a79287 100755
+--- a/bin/aurfetch
+++ b/bin/aurfetch
+@@ -8,24 +8,25 @@ declare -i aurball=0
+ declare logdir=/dev/null
+ 
+ clone() {
+-    declare -r logdir=$1 startdir=$PWD
+    declare -r logdir=$1
+ 
+     while IFS= read -r; do
+        # Avoid issues with exotic file system layouts (#274)
+        git_wrap() { git --work-tree="$REPLY" --git-dir="$REPLY"/.git "$@"; }
+        
+         if [[ -d $REPLY/.git ]]; then
+-            cd_safe "$REPLY"
+            # returns 0 even if nothing was fetched
+            git_wrap fetch -v
+ 
+-            git fetch -v # returns 0 even if nothing was fetched
+-
+-            if [[ $(git rev-parse HEAD) != $(git rev-parse '@{upstream}') ]]; then
+            if [[ $(git_wrap rev-parse HEAD) != $(git_wrap rev-parse '@{upstream}') ]]; then
+                 if [[ -d $logdir ]]; then
+-                    git --no-pager log --patch --stat '..@{upstream}' >> "$logdir/$REPLY".patch
+                    git_wrap --no-pager log --patch --stat '..@{upstream}' \
+                        >> "$logdir/$REPLY".patch
+                 fi
+ 
+-                git reset --hard HEAD
+-                git merge
+                git_wrap reset --hard HEAD
+                git_wrap merge
+             fi
+-
+-            cd_safe "$startdir"
+         else
+             git clone "$aurweb/$REPLY".git
+         fi
+-- 
+2.11.0
--- a/src/aurutils/0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch
+++ b/src/aurutils/0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch
@ -0,0 +1,33 @@
+From 1de27b86ea0cb2076a03167e838374dd6442809b Mon Sep 17 00:00:00 2001
+From: rafasc <rafa.almas@gmail.com>
+Date: Mon, 26 Mar 2018 19:37:43 +0100
+Subject: [PATCH 5/6] specify absolute paths for GIT_DIR & GIT_WORK_TREE
+
+Specifying a relative directory will trigger a regression under some
+circumstances.
+
+  $ GIT_DIR=spotify/.git GIT_WORK_TREE=spotify git reset HEAD
+  fatal: couldn't read spotify/.git/packed-refs: Not a directory
+
+  $ GIT_DIR=$PWD/spotify/.git GIT_WORK_TREE=$PWD/spotify git reset HEAD
+
+workaround for AladW/aurutils#332
+---
+ bin/aurfetch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/aurfetch b/bin/aurfetch
+index 0a79287..4e026fa 100755
+--- a/bin/aurfetch
+++ b/bin/aurfetch
+@@ -12,7 +12,7 @@ clone() {
+ 
+     while IFS= read -r; do
+         # Avoid issues with exotic file system layouts (#274)
+-        git_wrap() { git --work-tree="$REPLY" --git-dir="$REPLY"/.git "$@"; }
+        git_wrap() { git --work-tree="$PWD/$REPLY" --git-dir="$PWD/$REPLY"/.git "$@"; }
+         
+         if [[ -d $REPLY/.git ]]; then
+             # returns 0 even if nothing was fetched
+-- 
+2.11.0
--- a/src/aurutils/0006-aurfetch-aursearch-use-aria2-no-conf.patch
+++ b/src/aurutils/0006-aurfetch-aursearch-use-aria2-no-conf.patch
@ -0,0 +1,39 @@
+From da84181ae5b284557ec4d6afca7c8bcc7e87185a Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Tue, 27 Mar 2018 00:49:26 +0200
+Subject: [PATCH 6/7] aurfetch, aursearch: use aria2 --no-conf
+
+Avoid conflicts when a configuration file is used.
+---
+ bin/aurfetch  | 2 +-
+ bin/aursearch | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/aurfetch b/bin/aurfetch
+index 4e026fa..2cd5385 100755
+--- a/bin/aurfetch
+++ b/bin/aurfetch
+@@ -39,7 +39,7 @@ snapshot() {
+     cd_safe "$gzdir"
+ 
+     if type -P aria2c >/dev/null 2>&1; then
+-        aria2c --stderr=true -i -
+        aria2c --stderr=true -i --no-conf=true -
+     elif type -P parallel >/dev/null 2>&1; then
+         parallel --will-cite -X -j +5 --nice 10 --halt soon,fail=1 \
+ 		curl -fLsS --remote-name-all --cert-status {}
+diff --git a/bin/aursearch b/bin/aursearch
+index 5ff0a5c..dbb339e 100755
+--- a/bin/aursearch
+++ b/bin/aursearch
+@@ -20,7 +20,7 @@ split_info() {
+ 
+ dl_stdin() {
+     if type -P aria2c >/dev/null 2>&1; then
+-        aria2c --download-result=hide --console-log-level=error --stderr=true -d "$tmp"/aria2 -i - && cat "$tmp"/aria2/*
+        aria2c --download-result=hide --console-log-level=error --stderr=true -d "$tmp"/aria2 --no-conf=true -i - && cat "$tmp"/aria2/*
+     elif type -P parallel >/dev/null 2>&1; then
+         parallel --will-cite -X -j +8 --nice 10 --halt soon,fail=1 -r curl -fgLsS --compressed --cert-status {}
+     else
+-- 
+2.11.0
--- a/src/aurutils/0007-aurchain-do-not-sort-results-when-appending.patch
+++ b/src/aurutils/0007-aurchain-do-not-sort-results-when-appending.patch
@ -0,0 +1,31 @@
+From 5f779d382da346038996b877d320fa26c7d501c7 Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Tue, 27 Mar 2018 01:26:44 +0200
+Subject: [PATCH 7/7] aurchain: do not sort results when appending
+
+https://bbs.archlinux.org/viewtopic.php?pid=1761231#p1761231
+---
+ bin/aurchain | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/bin/aurchain b/bin/aurchain
+index 27a0808..e4b82ca 100755
+--- a/bin/aurchain
+++ b/bin/aurchain
+@@ -42,13 +42,11 @@ chain() {
+     for ((a = 1; a <= 30; ++a)); do
+         declare -i sub=$((a-1))
+ 
+-        pair json/$sub > tsv/$sub
+        pair json/$sub | tee -a tsv/n > tsv/$sub
+ 
+         fld 1 tsv/$sub >> pkgname
+         fld 1 tsv/$sub >> seen
+ 
+-        sort -u tsv/$sub >> tsv/n
+-
+         # Avoid querying duplicates (#4)
+         readarray -t target < <(fld 2 tsv/$sub | grep -Fxvf seen)
+ 
+-- 
+2.11.0
--- a/src/aurutils/PKGBUILD
+++ b/src/aurutils/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <alad@mailbox.org>
 pkgname=aurutils
 pkgver=1.5.3
-pkgrel=5
+pkgrel=10
 pkgdesc='helper tools for the arch user repository'
 arch=('any')
 url='https://github.com/AladW/aurutils'
@ -15,16 +15,24 @@ optdepends=('devtools: systemd-nspawn support'
            'expac: aursift script'
            'repose: repo-add alternative')
 _backports=('0001-aurbuild-backport-fix-for-236.patch'
-            '0002-aurbuild-disable-verbose-signing.patch'
-            '0003-aursync-1-r-is-not-a-default-option.patch')
+            '0002-aursync-make-L-optional-281.patch'
+            '0003-aurbuild-update-default-options.patch'
+            '0004-aurfetch-specify-git-work-tree-git-dir-274.patch'
+	    '0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch'
+	    '0006-aurfetch-aursearch-use-aria2-no-conf.patch'
+	    '0007-aurchain-do-not-sort-results-when-appending.patch')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
        "$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc"
        "${_backports[@]}")
 sha256sums=('a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5'
            'SKIP'
-            '5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86'
-            'f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb'
-            '43180210b22268ab5b54563541804dec74c08587e77870e527b736cb4f62d4a1')
+            '8bf1fe675284a8e91aa37bdbf035c0158f910446fdd10d21a705e89ff711c883'
+            '75326f1f932b545754eb05ef62ad637874367d276ee584ff9544f0c0178e39b8'
+            'bb03ef84bd3e7b28af9d2a829a61869c4845bdce65c897d267e691091033fe8a'
+            '40efaedd46cb98e0af0faf8cd61dc36eaa2638cf429d280beaf5c37f09a4369b'
+            '2fc7599245c53cad4b3b404a9ecf0ef122cf6be66d18a156e83ebfd1923b5359'
+            '8f4c9ea372827db3a4d4aa8e67e4fd962384197fc1684ba50e4f739d2917402f'
+            '1cb14e6605e38a1bc127d7ea576a02dfbc2d3c0e009597980fe4040a65b347f2')
 # Alad Wenter <alad@mailbox.org>
 validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A')

--- a/src/axtls/axtls-sni.patch
+++ b/src/axtls/axtls-sni.patch
@ -0,0 +1,69 @@
+diff -rU 4 a/ssl/Config.in b/ssl/Config.in
+--- a/ssl/Config.in	2014-10-27 13:30:33.000000000 +0300
+++ b/ssl/Config.in	2015-06-09 18:32:26.000000000 +0300
+@@ -314,8 +314,15 @@
+ 
+         Note: not all the API is implemented, so parts may still break. And
+         it's definitely not 100% compatible.
+ 
+config CONFIG_SSL_SNI
+    bool "Enable SNI"
+    default y
+    help
+        An extension to the TLS.
+        See 3.1 Server Name Indication at RFC 3546.
+
+ config CONFIG_PERFORMANCE_TESTING
+     bool "Build the bigint performance test tool"
+     default n
+     depends on CONFIG_SSL_CERT_VERIFICATION
+diff -rU 4 a/ssl/tls1_clnt.c b/ssl/tls1_clnt.c
+--- a/ssl/tls1_clnt.c	2014-11-07 03:24:28.000000000 +0300
+++ b/ssl/tls1_clnt.c	2015-06-09 18:32:26.000000000 +0300
+@@ -218,8 +218,30 @@
+     }
+ 
+     buf[offset++] = 1;              /* no compression */
+     buf[offset++] = 0;
+
+#ifdef CONFIG_SSL_SNI
+    if (ssl->host_name != NULL) {
+        unsigned int host_len = strlen(ssl->host_name);
+
+        buf[offset++] = 0;
+        buf[offset++] = host_len+9;     /* extensions length */
+
+        buf[offset++] = 0;
+        buf[offset++] = 0;              /* server_name(0) (65535) */
+        buf[offset++] = 0;
+        buf[offset++] = host_len+5;     /* server_name length */
+        buf[offset++] = 0;
+        buf[offset++] = host_len+3;     /* server_list length */
+        buf[offset++] = 0;              /* host_name(0) (255) */
+        buf[offset++] = 0;
+        buf[offset++] = host_len;       /* host_name length */
+        strncpy((char*) &buf[offset], ssl->host_name, host_len);
+        offset += host_len;
+    }
+#endif
+
+     buf[3] = offset - 4;            /* handshake size */
+ 
+     return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, offset);
+ }
+diff -rU 4 a/ssl/tls1.h b/ssl/tls1.h
+--- a/ssl/tls1.h	2015-04-30 08:41:49.000000000 +0300
+++ b/ssl/tls1.h	2015-06-09 18:32:26.000000000 +0300
+@@ -195,8 +195,12 @@
+     uint8_t server_mac[SHA1_SIZE];  /* for HMAC verification */
+     uint8_t read_sequence[8];       /* 64 bit sequence number */
+     uint8_t write_sequence[8];      /* 64 bit sequence number */
+     uint8_t hmac_header[SSL_RECORD_SIZE];    /* rx hmac */
+
+#ifdef CONFIG_SSL_SNI
+    const char* host_name;
+#endif
+ };
+ 
+ typedef struct _SSL SSL;
+ 
--- a/src/biboumi-git/PKGBUILD
+++ b/src/biboumi-git/PKGBUILD
@ -2,17 +2,17 @@

 _pkgname=biboumi
 pkgname="$_pkgname-git"
-pkgver=r1183.f3b1e39
+pkgver=r1207.044a1a0
 pkgrel=1
 pkgdesc="XMPP gateway to IRC"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url="https://biboumi.louiz.org/"
 license=('ZLIB')
-depends=('expat' 'libidn' 'udns' 'botan' 'sqlite')
+depends=('expat' 'libidn' 'udns' 'botan' 'sqlite' 'postgresql-libs')
 makedepends=('git' 'cmake' 'pandoc')
 backup=("etc/$_pkgname/$_pkgname.cfg")
 install="$_pkgname.install"
-source=("$_pkgname::git+https://git.louiz.org/biboumi.git"
+source=("$_pkgname::git+https://lab.louiz.org/louiz/biboumi.git"
        'biboumi.install'
        'sysuser.conf')
 md5sums=('SKIP'
--- a/src/bluez-utils-compat/PKGBUILD
+++ b/src/bluez-utils-compat/PKGBUILD
@ -1,14 +1,15 @@
-# Maintainer: David Thurstenson <thurstylark@gmail.com>
+# Maintainer:  twa022 <twa022 at gmail dot com>
+# Contributor: David Thurstenson <thurstylark@gmail.com>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>

 pkgname='bluez-utils-compat'
 _pkgbase='bluez'
-pkgver=5.45
+pkgver=5.49
 pkgrel=1
 url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
 license=('GPL2')
 pkgdesc="Development and debugging utilities for the bluetooth protocol stack. Includes deprecated tools."
 depends=('dbus' 'systemd' 'glib2')
@ -18,12 +19,12 @@ replaces=('bluez-hcidump' 'bluez<=4.101')
 makedepends=('dbus' 'libical' 'systemd')
 source=(https://www.kernel.org/pub/linux/bluetooth/${_pkgbase}-${pkgver}.tar.{xz,sign})
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('4cacb00703a6bc149cb09502257d321597d43952374a16f3558766ffa85364e9'
+sha256sums=('33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95'
            'SKIP')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel@holtmann.org>

 build() {
-  cd ${_pkgbase}-${pkgver}
+  cd "${_pkgbase}-${pkgver}"
  ./configure \
          --prefix=/usr \
          --mandir=/usr/share/man \
@ -38,32 +39,30 @@ build() {
 }

 check() {
-  cd ${_pkgbase}-${pkgver}
+  cd "${_pkgbase}-${pkgver}"
  make check
 }

 package() {
-
-  cd ${_pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
+  cd "${_pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" \
       install-binPROGRAMS \
       install-man1

  # add missing tools FS#41132, FS#41687, FS#42716
  for files in `find tools/ -type f -perm -755`; do
-    filename=$(basename $files)
-    install -Dm755 ${srcdir}/${_pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
+    filename="$(basename "$files")"
+    install -Dm755 "${srcdir}/${_pkgbase}-${pkgver}"/tools/$filename "${pkgdir}"/usr/bin/$filename
  done

  # add gatttool usefulbdaddr with Bluetooth 4.0LE 
-  install -Dm755 ${srcdir}/${_pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool
+  install -Dm755 "${srcdir}/${_pkgbase}-${pkgver}"/attrib/gatttool "${pkgdir}"/usr/bin/gatttool
  
  # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
  #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
  #rmdir ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/lib
+  rm -rf "${pkgdir}"/usr/lib
  
  # move the hid2hci man page out
-  mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
+  mv "${pkgdir}"/usr/share/man/man1/hid2hci.1 "${srcdir}"/
 }
-
--- a/src/ccextractor/PKGBUILD
+++ b/src/ccextractor/PKGBUILD
@ -7,7 +7,7 @@
 # https://github.com/cacack/pkgbuilds/tree/master/ccextractor

 pkgname=ccextractor
-pkgver=0.85
+pkgver=0.86
 pkgrel=1
 pkgdesc="A fast closed captions extractor for MPEG files."
 arch=('i686' 'x86_64')
@ -15,17 +15,17 @@ url="http://www.ccextractor.org"
 license=('GPL')
 depends=('gcc-libs' 'tesseract')
 source=(
-   http://downloads.sourceforge.net/ccextractor/$pkgname-src-nowin.$pkgver.zip
+   https://github.com/CCExtractor/ccextractor/archive/v$pkgver.tar.gz
 )
-sha512sums=('53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec')
+sha512sums=('50a501650f1b60ab54aba690ae211610975bd1894ae103d0a1e10b6348f93436c9fa974a16bff5c7b8ba4e011be1730aa890e3c96217b2a4b05384e598d850d0')

 build() {
-  cd "$srcdir/$pkgname/linux"
+  cd "$srcdir/$pkgname-$pkgver/linux"
  ./build
 }

 package() {
-  cd "$srcdir/$pkgname/linux"
+  cd "$srcdir/$pkgname-$pkgver/linux"
  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
 }

--- a/src/clean-chroot-manager/PKGBUILD
+++ b/src/clean-chroot-manager/PKGBUILD
@ -1,17 +1,17 @@
 # Maintainer: graysky <graysky AT archlinux DOT us>

-pkgname='clean-chroot-manager'
-pkgver=2.87
+pkgname=clean-chroot-manager
+pkgver=2.89
 pkgrel=1
-pkgdesc='Wrapper scripts for managing clean chroots (64-bit and 32-bit).'
+pkgdesc='Wrapper scripts for managing clean chroots.'
 arch=('any')
 url='https://github.com/graysky2/clean-chroot-manager'
 license=('MIT')
-depends=('devtools' 'rsync')
+depends=('devtools>=20180528-1' 'rsync')
 conflicts=('clean_chroot_manager')
 replaces=('clean_chroot_manager')
-source=("http://repo-ck.com/source/$pkgname/$pkgname-$pkgver.tar.xz")
-sha256sums=('bd314651616147c6bc3266fe64ee885974922655813ca3c36b13b2823e71b6c7')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/graysky2/clean-chroot-manager/archive/v$pkgver.tar.gz")
+sha256sums=('07b4fc355abf6c7310ef8b48b729f3311127922e041e8fc15e9e4090ba813465')
 install=ccm.install

 build() {
--- a/src/clean-chroot-manager/ccm.install
+++ b/src/clean-chroot-manager/ccm.install
@ -2,7 +2,7 @@
 ## arg 2:  the old package version

 post_upgrade() {
-	for test in 2.81-1 2.73-1 2.72-1 2.55-1 2.17-1 2.22-1 2.69-1; do
+	for test in 2.87-1 2.81-1 2.73-1 2.72-1 2.55-1 2.17-1 2.22-1 2.69-1; do
 		if [ "$(vercmp $2 $test)" -lt 1 ]; then
 			echo
 			echo '--> Please check ~/.config/clean-chroot-manager.conf against the'
--- a/src/clinfo-git/PKGBUILD
+++ b/src/clinfo-git/PKGBUILD
@ -0,0 +1,33 @@
+# Maintainer: Ivan Shapovalov <intelfx@intelfx.name>
+# Contributor: Zanny <lordzanny@gmail.com>
+
+pkgname=clinfo-git
+pkgver=2.2.17.08.25.r1.gf98c9ed
+pkgrel=1
+pkgdesc="Print all known information about all available OpenCL platforms and devices in the system"
+arch=(i686 x86_64)
+url="https://github.com/Oblomov/clinfo"
+license=('custom:Public Domain')
+depends=(opencl-icd-loader)
+makedepends=(opencl-headers)
+provides=(clinfo)
+conflicts=(clinfo)
+replaces=(clinfo)
+source=(git+https://github.com/oblomov/clinfo.git)
+md5sums=('SKIP')
+
+function pkgver() {
+	cd clinfo
+	git describe --long --tags | sed 's/-/.r/;s/-/./'
+}
+
+build() {
+	cd clinfo
+	make
+}
+
+package() {
+	cd clinfo
+	make PREFIX="${pkgdir}/usr" install
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
--- a/src/cloog/PKGBUILD
+++ b/src/cloog/PKGBUILD
@ -2,15 +2,16 @@
 # Contributor: Allan McRae <allan@archlinux.org>

 pkgname=cloog
-pkgver=0.18.5
+pkgver=0.19.0
 pkgrel=1
 pkgdesc="Library that generates loops for scanning polyhedra"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.bastoul.net/cloog/"
 license=('GPL')
-depends=('isl>=0.18' 'osl')
+depends=('osl' 'isl')
+makedepends=('texlive-core' 'texlive-bin')
 source=(https://github.com/periscop/cloog/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('48602a72aaec8e1dabc33ec0622739d3ad585b7f0ec480eebdc1d724822b7cfd')
+sha512sums=('a0646f31e7a2c1809c51b812f58dc3f733f3a7c4cdf84fa5fee4ed7a372b7bf649561c7eceb7bfc754f1aca519ec0fc3718e08775e7eb072a238ce341edda10a')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
--- a/src/cndrvcups-common-lb/PKGBUILD
+++ b/src/cndrvcups-common-lb/PKGBUILD
@ -1,119 +1,164 @@
-# Maintainer : Lone_Wolf lonewolf@xs4all.nl
+# Maintainer:  Chris Severance aur.severach aATt spamgourmet dott com
+# Maintainer:  Lone_Wolf <lonewolf@xs4all.nl>
 # Contributor: Steven She <mintcoffee@gmail.com>
-# Contributor: vbPadre <vbpadre@gmail.com>
+# Contributor: vbPadre <vbPadre@gmail.com>

-pkgbase=cndrvcups-common-lb
-pkgname=cndrvcups-common-lb
+# TODO: cndrvcups-common-lb and cndrvcups-lb should be a single split package
+
+set -u
+pkgbase='cndrvcups-common-lb'
+pkgname="${pkgbase}"
 # used this name to avoid conflict with the existing cndrvcups-common (no longer in aur) which was wrong version for cndrvcups-lb
-_pkgname=cndrvcups-common
-pkgver=3.80
-pkgrel=1
-pkgdesc="Common printer driver modules for cndrvcups-lb package, built from source"
+#_pkgname='cndrvcups-common'
+#_pkgver='3.40'; _commonver='3.80'; _dl='8/0100002708/17'
+_pkgver='3.50'; _commonver='3.90'; _dl='8/0100007658/05'
+pkgver="${_commonver}"
+pkgrel='1'
+pkgdesc='common printer driver modules for cndrvcups-lb package, built from source'
 arch=('i686' 'x86_64')
-url="http://support-au.canon.com.au/contents/AU/EN/0100270808.html"
+# Direct links to the download reference go bad on the next version. We want something that will persist for a while.
+url='https://www.canon.co.uk/for_work/products/office_print_copy_solutions/office_black_white/imagerunner_1730i/'
+#url='https://www.usa.canon.com/internet/portal/us/home/support/details/printers/black-and-white-laser/mf212w/imageclass-mf212w'
 license=('GPL' 'MIT' 'custom')
-depends_i686=('libglade' 'gcc-libs')
-depends_x86_64=('libglade' 'lib32-gcc-libs')
-makedepends=('automake' 'autoconf' 'glib2' 'gtk2')
-conflicts=('cndrvcups-lb-bin')
-# http://gdlp01.c-wss.com/gds/8/0100002708/17/linux-UFRII-drv-v340-uken.tar.gz
-source=(http://gdlp01.c-wss.com/gds/8/0100002708/17/linux-UFRII-drv-v340-uken.tar.gz)
-options=('!emptydirs' '!strip' 'staticlibs')
-sha512sums=('05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494')
+depends=('libglade')
+depends_i686=('gcc-libs')
+depends_x86_64=("${depends_i686[@]/#/lib32-}")
+makedepends=('autoconf' 'automake')
+makedepends+=('glib2' 'gtk2')
+options=('!emptydirs' '!strip')
+options+=('staticlibs')
+_srcdir="${pkgname%-lb}-${pkgver}"
+source=(
+  "http://gdlp01.c-wss.com/gds/${_dl}/linux-UFRII-drv-v${_pkgver//\./}-uken.tar.gz"
+)
+sha256sums=('c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f')
+sha512sums=('2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3')

-# build instructions are adapted from upstream cndrvcups-common.spec file
+# build instructions are adapted from upstream file
+# cndrvcups-common.spec

 prepare() {
-    cd "${srcdir}"/linux-UFRII-drv-v340-uken/Sources
-    bsdtar xf ${_pkgname}-${pkgver}-1.tar.gz -C "${srcdir}"
+  set -u
+  bsdtar -xf "linux-UFRII-drv-v${_pkgver//\./}-uken/Sources/${_srcdir}-1.tar.gz"
+  set +u
 }

 build() {
+  set -u

-    cd "${srcdir}"/${_pkgname}-${pkgver}/buftool
-    autoreconf -i
-    ./autogen.sh --prefix=/usr/ --enable-progpath=/usr/bin --libdir=/usr/lib
+  set +u; msg2 'Building buftool'; set -u
+  cd "${_srcdir}/buftool"
+  autoreconf -i
+  ./autogen.sh --prefix='/usr/' --enable-progpath='/usr/bin' --libdir='/usr/lib'

-    cd "${srcdir}"/${_pkgname}-${pkgver}/cngplp
-    autoreconf -i
-    LIBS="-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0" ./autogen.sh --prefix=/usr --libdir=/usr/lib
+  set +u; msg2 'Building cngplp'; set -u
+  cd '../cngplp'
+  autoreconf -i
+  LIBS='-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0' \
+  ./autogen.sh --prefix='/usr' --libdir='/usr/lib'

-    cd "${srcdir}"/${_pkgname}-${pkgver}/backend
-    autoreconf -i
-    ./autogen.sh --prefix=/usr --libdir=/usr/lib
+  set +u; msg2 'Building backend'; set -u
+  cd '../backend'
+  autoreconf -i
+  ./autogen.sh --prefix='/usr' --libdir='/usr/lib'

-    cd "${srcdir}"/${_pkgname}-${pkgver}
-    make
+  set +u; msg2 'Building all'; set -u
+  cd "${srcdir}/${_srcdir}"
+  make

-    cd "${srcdir}"/${_pkgname}-${pkgver}/c3plmod_ipc
-    make 
+  set +u; msg2 'Building c3plmod_ipc'; set -u
+  cd 'c3plmod_ipc'
+  make
+
+  set +u
 }
-package()
-{

-    cd "${srcdir}"/"${_pkgname}"-"${pkgver}"
-    mkdir -p "${pkgdir}"/usr/{bin,lib/cups/backend,include}
-    
-    if [[ ${CARCH} == "i686" ]]; then
-      _lib32dir="lib"
-    else
-      _lib32dir="lib32"
-      mkdir -p "${pkgdir}"/usr/${_lib32dir}
+package() {
+  set -u
+
+  cd "${_srcdir}"
+
+  declare -A _lib32dirs=([i686]='lib' [x86_64]='lib32')
+  local _lib32dir="${_lib32dirs[${CARCH}]}"
+
+  make install DESTDIR="${pkgdir}"
+
+  install -Dpm644 'Rule/canon-laser-printer.usb-quirks' -t "${pkgdir}/usr/share/cups/usb/"
+
+  cd 'c3plmod_ipc'
+  make install DESTDIR="${pkgdir}" LIBDIR='/usr/lib'
+  cd ..
+
+  cd 'libs'
+  install -s -Dpm755 'c3pldrv' -t "${pkgdir}/usr/bin/"
+  local _libs=(
+    'libcaiowrap.so.1.0.0'
+    'libcaiousb.so.1.0.0'
+    'libc3pl.so.0.0.1'
+    'libcaepcm.so.1.0'
+    'libColorGear.so.0.0.0'
+    'libColorGearC.so.1.0.0'
+    'libcanon_slim.so.1.0.0'
+  )
+  install -s -Dpm755 "${_libs[@]}" -t "${pkgdir}/usr/${_lib32dir}/"
+
+  cd '../data'
+  install -Dpm644 *.[Ii][Cc][Cc] *.PRF -t "${pkgdir}/usr/share/caepcm/"
+
+  local _lib _libt
+  cd "${pkgdir}/usr/${_lib32dir}"
+  for _lib in "${_libs[@]}"; do
+    echo "soname ${_lib}"
+    test -f "${_lib}" || echo "${}"
+    if [[ "${_lib}" =~ ^(lib[^.]+\.so\.[0-9]+)\. ]]; then
+      _libt="${BASH_REMATCH[1]}"
+      ln -s "${_lib}" "${_libt}"
+      _libt="${_libt%.*}"
+      ln -s "${_lib}" "${_libt}"
    fi
+  done

-    mkdir -p "${pkgdir}"/usr/share/{caepcm,cngplp,locale/ja/LC_MESSAGES}
-
-    make install DESTDIR="${pkgdir}"
-
-    cd c3plmod_ipc
-    make install DESTDIR="${pkgdir}" LIBDIR=/usr/lib
-    cd ..
-
-    install -m 755 libs/libcaiowrap.so.1.0.0   "${pkgdir}"/usr/${_lib32dir}
-    install -m 755 libs/libcaiousb.so.1.0.0    "${pkgdir}"/usr/${_lib32dir}
-
-    install -m 755 libs/libc3pl.so.0.0.1     "${pkgdir}"/usr/${_lib32dir}
-    install -m 755 libs/libcaepcm.so.1.0     "${pkgdir}"/usr/${_lib32dir}
-
-    install -m 755 libs/libColorGear.so.0.0.0    "${pkgdir}"/usr/${_lib32dir}
-    install -m 755 libs/libColorGearC.so.1.0.0    "${pkgdir}"/usr/${_lib32dir}
-
-
-    install -m 644 data/*.ICC  "${pkgdir}"/usr/share/caepcm
-    install -m 644 data/*.PRF  "${pkgdir}"/usr/share/caepcm
-
-    install -s -m 755 libs/c3pldrv     "${pkgdir}"/usr/bin
-
-    install -m 755 libs/libcanon_slim.so.1.0.0   "${pkgdir}"/usr/${_lib32dir}
-
-    cd "${pkgdir}"/usr/${_lib32dir}
-    ln -sf libc3pl.so.0.0.1     libc3pl.so.0
-    ln -sf libc3pl.so.0.0.1     libc3pl.so
-    ln -sf libcaepcm.so.1.0     libcaepcm.so.1
-    ln -sf libcaepcm.so.1.0     libcaepcm.so
-    ln -sf libcaiowrap.so.1.0.0   libcaiowrap.so.1
-    ln -sf libcaiowrap.so.1.0.0   libcaiowrap.so
-    ln -sf libcaiousb.so.1.0.0    libcaiousb.so.1
-    ln -sf libcaiousb.so.1.0.0    libcaiousb.so
-    ln -sf libcanon_slim.so.1.0.0   libcanon_slim.so.1
-    ln -sf libcanon_slim.so.1.0.0   libcanon_slim.so
-
-    ln -sf libColorGear.so.0.0.0    libColorGear.so.0
-    ln -sf libColorGear.so.0.0.0    libColorGear.so
-    ln -sf libColorGearC.so.0.0.0   libColorGearC.so.0
-    ln -sf libColorGearC.so.0.0.0   libColorGearC.so
-
-    cd "${pkgdir}"/usr/lib
-    ln -sf libcanonc3pl.so.1.0.0    libcanonc3pl.so
-    ln -sf libcanonc3pl.so.1.0.0    libcanonc3pl.so.1
-    
-    # according to gentoo ebuild (for 2.90 )c3pldrv dlopens the absolute path /usr/lib/libc3pl.so
-    # this is only needed for x86_64 build
-    if [[ ${CARCH} == "x86_64" ]]; then
-        ln -s /usr/lib32/libc3pl.so libc3pl.so
+  cd "${pkgdir}/usr/lib"
+  _libs=('libcanonc3pl.so.1.0.0')
+  for _lib in "${_libs[@]}"; do
+    echo "soname ${_lib}"
+    test -f "${_lib}" || echo "${}"
+    if [[ "${_lib}" =~ ^(lib[^.]+\.so\.[0-9]+)\. ]]; then
+      _libt="${BASH_REMATCH[1]}"
+      ln -s "${_lib}" "${_libt}"
+      _libt="${_libt%.*}"
+      ln -s "${_lib}" "${_libt}"
    fi
-    
-    cd "${srcdir}"/"${_pkgname}"-"${pkgver}"
-    install -m755 -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
-    install -m755 LICENSE-* "${pkgdir}"/usr/share/licenses/"${pkgname}"
+  done
+
+  # according to Gentoo ebuild v2.90 c3pldrv dlopens the absolute path
+  # /usr/lib/libc3pl.so
+  if [ "${CARCH}" = 'x86_64' ]; then
+    ln -s '../lib32/libc3pl.so' -t "${pkgdir}/usr/lib/"
+  fi
+
+  cd "${srcdir}/${_srcdir}"
+  if [ "$(vercmp "${pkgver}" '3.50')" -lt 0 ]; then
+    install -Dpm644 LICENSE-* -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  else
+    local _lics=(
+      $(find -type 'f' -name 'LICENSE.txt')
+    )
+    local _lic _licd _lico
+    for _lic in "${_lics[@]}"; do
+      _licd="$(dirname "${_lic}")"
+      _licd="$(basename "${_licd}")"
+      _lico="LICENSE.${_licd}.txt"
+      echo "license ${_lico}"
+      install -Dpm644 "${_lic}" "${pkgdir}/usr/share/licenses/${pkgname}/${_lico}"
+    done
+  fi
+  install -Dpm644 README* -t "${pkgdir}/usr/share/doc/${pkgname}/"
+
+  # The filter works in /usr/bin but it's expected in .../cups/filter/
+  install -d "${pkgdir}/usr/lib/cups/filter/"
+  ln -s '/usr/bin/c3pldrv' -t "${pkgdir}/usr/lib/cups/filter/"
+
+  set +u
 }
+set +u
--- a/src/cndrvcups-lb/PKGBUILD
+++ b/src/cndrvcups-lb/PKGBUILD
@ -1,117 +1,159 @@
-#Maintainer: Lone_Wolf <lonewolf@xs4all.nl>
+# Maintainer:  Chris Severance aur.severach aATt spamgourmet dott com
+# Maintainer:  Lone_Wolf <lonewolf@xs4all.nl>
 # Contributor: Steven She <mintcoffee@gmail.com>
 # Contributor: vbPadre <vbPadre@gmail.com>
-pkgbase=cndrvcups-lb
-pkgname=cndrvcups-lb
-pkgver=3.40
-pkgrel=1
-pkgdesc="Canon UFR II /LIPSLX Printer Driver build from source for LBP, iR & MF printers"
+
+# TODO: cndrvcups-common-lb and cndrvcups-lb should be a single split package
+
+set -u
+pkgbase='cndrvcups-lb'
+pkgname="${pkgbase}"
+#_pkgver='3.40'; _commonver='3.80'; _dl='8/0100002708/17'
+_pkgver='3.50'; _commonver='3.90'; _dl='8/0100007658/05'
+pkgver="${_pkgver}"
+pkgrel='1'
+pkgdesc='Canon UFR II /LIPSLX printer driver build from source for LBP iR MF ImageCLASS ImageRUNNER Laser Shot i-SENSYS ImagePRESS ADVANCE printers and copiers'
 arch=('i686' 'x86_64')
-url="http://support-au.canon.com.au/contents/AU/EN/0100270808.html"
+# Direct links to the download reference go bad on the next version. We want something that will persist for a while.
+url='https://www.canon.co.uk/for_work/products/office_print_copy_solutions/office_black_white/imagerunner_1730i/'
+#url='https://www.usa.canon.com/internet/portal/us/home/support/details/printers/black-and-white-laser/mf212w/imageclass-mf212w'
 license=('custom')
-install=${pkgname}.install
-depends_i686=('cndrvcups-common-lb=3.80' 'libxml2')
-depends_x86_64=('cndrvcups-common-lb=3.80' 'lib32-libxml2')
-makedepends=('autoconf' 'automake')
+depends=("cndrvcups-common-lb>=${_commonver}") # >= makes upgrades easier
+depends_i686=('libxml2')
+depends_x86_64=("${depends_i686[@]/#/lib32-}")
 optdepends_i686=('libjpeg6-turbo: improves printing results for color imageRUNNER/i-SENSYS LBP devices')
-optdepends_x86_64=('lib32-libjpeg6-turbo: improves printing results for color imageRUNNER/i-SENSYS LBP devices')
-conflicts=('cndrvcups-lb-bin' 'cndrvcups-lb-cpca')
-source=('http://gdlp01.c-wss.com/gds/8/0100002708/17/linux-UFRII-drv-v340-uken.tar.gz'
-       'how-to.txt')
-# http://gdlp01.c-wss.com/gds/8/0100002708/17/linux-UFRII-drv-v340-uken.tar.gz
-options=('!emptydirs' '!strip' '!libtool')
-sha512sums=('05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494'
+optdepends_x86_64=("${optdepends_i686[@]/#/lib32-}")
+makedepends=('autoconf' 'automake')
+makedepends+=('gzip')
+conflicts=('cndrvcups-lb-cpca')
+options=('!emptydirs' '!strip')
+options+=('!libtool')
+install="${pkgname}.install"
+_srcdir="${pkgbase}-${pkgver}"
+source=(
+  "http://gdlp01.c-wss.com/gds/${_dl}/linux-UFRII-drv-v${_pkgver//\./}-uken.tar.gz"
+  'how-to.txt'
+)
+sha256sums=('c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f'
+            '62c4bfe3e4155e5e805b51eaa4b9dd3581ba029259c2817d9ebe66077aad7280')
+sha512sums=('2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3'
            '736e1785c443c4d129c8801a127410012889f46691259e8a7f6a54106a0647beb5b6267aabb78b3ed0a1c7a9d8ce216e159515d3aad425812e5be52c8b58e4ee')
-         
-# build instructions are adapted from upstream cndrvcups-lb.spec file
+
+# build instructions are adapted from upstream file
+# cndrvcups-lb.spec
+
 prepare() {
-    cd "${srcdir}"/linux-UFRII-drv-v340-uken/Sources
-    bsdtar xf ${pkgbase}-${pkgver}-1.tar.gz -C "${srcdir}"
+  set -u
+  bsdtar -xf "linux-UFRII-drv-v${_pkgver//\./}-uken/Sources/${_srcdir}-1.tar.gz"
+  set +u
 }

 build() {
-    
-    cd "${srcdir}"/${pkgbase}-${pkgver}/ppd
-    autoreconf -fi
-    ./autogen.sh --prefix=/usr
-        
-    cd "${srcdir}"/${pkgbase}-${pkgver}/pstoufr2cpca
-    autoreconf -fi
-    ./autogen.sh --prefix=/usr --libdir=/usr/lib
+  set -u

-    cd "${srcdir}"/${pkgbase}-${pkgver}/cpca
-    autoreconf -fi
-    ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --libdir=/usr/lib
+  set +u; msg2 'Building ppd'; set -u
+  cd "${_srcdir}/ppd"
+  autoreconf -fi
+  ./autogen.sh --prefix='/usr'

-    cd "${srcdir}"/${pkgbase}-${pkgver}/cngplp
-    aclocal
-    autoreconf -fi
-    ./autogen.sh --prefix=/usr --libdir=/usr/lib
-    
-    cd files
-    autoreconf -fi
-    ./autogen.sh --prefix=/usr
+  set +u; msg2 'Building pstoufr2cpca'; set -u
+  cd '../pstoufr2cpca'
+  autoreconf -fi
+  ./autogen.sh --prefix='/usr' --libdir='/usr/lib'

-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    make
-    
+  set +u; msg2 'Building cpca'; set -u
+  cd '../cpca'
+  autoreconf -fi
+  ./autogen.sh --prefix='/usr' --enable-progpath='/usr/bin' --libdir='/usr/lib'
+
+  set +u; msg2 'Building cngplp'; set -u
+  cd '../cngplp'
+  aclocal
+  autoreconf -fi
+  ./autogen.sh --prefix='/usr' --libdir='/usr/lib'
+
+  set +u; msg2 'Building cngplp/files'; set -u
+  cd 'files'
+  autoreconf -fi
+  ./autogen.sh --prefix='/usr'
+
+  set +u; msg2 'Building all'; set -u
+  cd "${srcdir}/${_srcdir}"
+  make
+
+  set +u
 }

 package() {
-  
-    cd "${srcdir}"/${pkgbase}-${pkgver}
+  set -u

-    if [[ $CARCH == "i686" ]]; then
-      _lib32dir="lib"
-    else
-      _lib32dir="lib32"
-      mkdir -p "${pkgdir}"/usr/${_lib32dir}
+  cd "${_srcdir}"
+
+  declare -A _lib32dirs=([i686]='lib' [x86_64]='lib32')
+  local _lib32dir="${_lib32dirs[${CARCH}]}"
+
+  make install DESTDIR="${pkgdir}"
+  gzip "${pkgdir}/usr/share/cups/model"/*.ppd
+
+  cd 'libs'
+  install -s -Dpm755 'cnpkbidi' -t "${pkgdir}/usr/bin/"
+  install -Dpm4755 'cnpkmoduleufr2' -t "${pkgdir}/usr/bin/"
+
+  local _libs=(
+    'libcanonufr2.so.1.0.0'
+    'libufr2filter.so.1.0.0'
+    'libEnoJBIG.so.1.0.0'
+    'libEnoJPEG.so.1.0.0'
+    'libcaiocnpkbidi.so.1.0.0'
+    'libcnlbcm.so.1.0'
+  )
+  install -s -Dpm755 "${_libs[@]}" -t "${pkgdir}/usr/${_lib32dir}/"
+  install -Dpm755 'libcanonufr2.la' -t "${pkgdir}/usr/${_lib32dir}/"
+
+  install -Dpm644 cnpkbidi_info* -t "${pkgdir}/usr/share/cnpkbidi/"
+  install -Dpm644 ThLB* -t "${pkgdir}/usr/share/ufr2filter/"
+
+  cd '../data'
+  install -Dpm644 CnLB* -t "${pkgdir}/usr/share/caepcm/"
+
+  local _lib _libt
+  cd "${pkgdir}/usr/${_lib32dir}"
+  for _lib in "${_libs[@]}"; do
+    echo "soname ${_lib}"
+    test -f "${_lib}" || echo "${}"
+    if [[ "${_lib}" =~ ^(lib[^.]+\.so\.[0-9]+)\. ]]; then
+      _libt="${BASH_REMATCH[1]}"
+      ln -s "${_lib}" "${_libt}"
+      _libt="${_libt%.*}"
+      ln -s "${_lib}" "${_libt}"
    fi
+  done

-    mkdir -p "${pkgdir}"/usr/{bin,share/{caepcm,cnpkbidi,ufr2filter}}
-    make install DESTDIR="${pkgdir}"
-    
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    install -m 4755 libs/cnpkmoduleufr2  "${pkgdir}"/usr/bin
+  # according to Gentoo ebuild v2.90 c3pldrv dlopens the absolute path
+  # /usr/lib/libcnlbcm.so
+  if [ "${CARCH}" = 'x86_64' ]; then
+    ln -s '../lib32/libcnlbcm.so' -t "${pkgdir}/usr/lib/"
+  fi

-    install -m 755 libs/libcanonufr2.la  "${pkgdir}"/usr/${_lib32dir}
-    install -s -m 755 libs/libcanonufr2.so.1.0.0  "${pkgdir}"/usr/${_lib32dir}
-    install -s -m 755 libs/libufr2filter.so.1.0.0   "${pkgdir}"/usr/${_lib32dir}
-    install -s -m 755 libs/libEnoJBIG.so.1.0.0   "${pkgdir}"/usr/${_lib32dir}
-    install -s -m 755 libs/libEnoJPEG.so.1.0.0   "${pkgdir}"/usr/${_lib32dir}
-    install -s -m 755 libs/cnpkbidi   "${pkgdir}"/usr/bin
-    install -s -m 755 libs/libcaiocnpkbidi.so.1.0.0   "${pkgdir}"/usr/${_lib32dir}
+  cd "${srcdir}/${_srcdir}"
+  if [ "$(vercmp "${pkgver}" '3.50')" -lt 0 ]; then
+    install -Dpm644 LICENSE-*.txt -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+    install -Dpm644 "${srcdir}/linux-UFRII-drv-v340-uken/Documents/guide-ufr2-3.4xUK.tar.gz" -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  else
+    local _lics=(
+      $(find -type 'f' -name 'LICENSE*.txt')
+    )
+    local _lic _licd _lico
+    for _lic in "${_lics[@]}"; do
+      _licd="$(dirname "${_lic}")"
+      _licd="$(basename "${_licd}")"
+      _lico="LICENSE.${_licd}.txt"
+      echo "license ${_lico}"
+      install -Dpm644 "${_lic}" "${pkgdir}/usr/share/licenses/${pkgname}/${_lico}"
+    done
+  fi
+  install -Dpm644 README* -t "${pkgdir}/usr/share/doc/${pkgname}/"

-    install -m 644 data/CnLB*  "${pkgdir}"/usr/share/caepcm
-    install -m 644 libs/cnpkbidi_info* "${pkgdir}"/usr/share/cnpkbidi
-    install -m 644 libs/ThLB*  "${pkgdir}"/usr/share/ufr2filter
-
-    install -m 755 libs/libcnlbcm.so.1.0     "${pkgdir}"/usr/${_lib32dir}
-
-    cd "${pkgdir}"/usr/${_lib32dir}
-    ln -sf libcanonufr2.so.1.0.0 libcanonufr2.so
-    ln -sf libcanonufr2.so.1.0.0 libcanonufr2.so.1
-    ln -sf libufr2filter.so.1.0.0 libufr2filter.so
-    ln -sf libufr2filter.so.1.0.0 libufr2filter.so.1
-    ln -sf libEnoJBIG.so.1.0.0 libEnoJBIG.so
-    ln -sf libEnoJBIG.so.1.0.0 libEnoJBIG.so.1
-    ln -sf libEnoJPEG.so.1.0.0 libEnoJPEG.so
-    ln -sf libEnoJPEG.so.1.0.0 libEnoJPEG.so.1
-    ln -sf libcaiocnpkbidi.so.1.0.0 libcaiocnpkbidi.so
-    ln -sf libcaiocnpkbidi.so.1.0.0 libcaiocnpkbidi.so.1
-    ln -sf libcnlbcm.so.1.0     libcnlbcm.so.1
-    ln -sf libcnlbcm.so.1.0     libcnlbcm.so
-    
-    # according to Gentoo ebuild v2.90 c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so 
-    cd "${pkgdir}"/usr/lib
-    if [[ ${CARCH} == "x86_64" ]]; then
-        ln -s /usr/lib32/libcnlbcm.so libcnlbcm.so
-    fi
-
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    install -m755 -d "${pkgdir}"/usr/share/licenses/${pkgname}
-    install -m644 LICENSE-*.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
-    install -m755 -d "${pkgdir}"/usr/share/doc/${pkgname}
-    install -m644 README* "${pkgdir}"/usr/share/doc/${pkgname}
-    install -m644 "${srcdir}"/linux-UFRII-drv-v340-uken/Documents/guide-ufr2-3.4xUK.tar.gz "${pkgdir}"/usr/share/doc/${pkgname}
+  set +u
 }
+set +u
--- a/src/cndrvcups-lb/cndrvcups-lb.install
+++ b/src/cndrvcups-lb/cndrvcups-lb.install
@ -1,41 +1,42 @@
-post_install(){
-    if [ -d /usr/share/ppd ] ; then
-      cd /usr/share/cups/model
-      for fn in CN*ZK.ppd ; do \
-        ln -sf "/usr/share/cups/model/"$fn /usr/share/ppd/$fn ;
-      done
-    fi
-    chmod 4755 /usr/bin/cnpkmoduleufr2
-    cat << EOF
-    >>> Installation:
-    >>> 1) Make sure CUPS is running and your printer is turned on and connected to your computer.
-    >>> eg.
-    >>> systemctl start cups
-    >>>
-    >>> 2) Check the name of the device, udev created for you.
-    >>> eg. /dev/usb/lp0
-    >>>
-    >>> 3) /usr/sbin/lpadmin -p [Printer Name] -m [PPD file] -v usb:[device file location] -E
-    >>> eg.
-    >>> /usr/sbin/lpadmin -p LBP2900 -m CNCUPSLBP2900CAPTK.ppd -v usb:/dev/usblp0 -E 
-    >>> you can find ppds in the /usr/share/cups/model/ directory)
-    >>>
-    >>> 4) Now you can print. Consider using "systemctl enable cups" to have it start automatically on boot
-    
-EOF
-}
-
-post_upgrade(){
-	post_remove
-	post_install
-}
-
-post_remove(){
-  if [ -d /usr/share/ppd ] ; then
-    rm -rf /usr/share/ppd/CN*ZK.ppd
+post_remove() {
+  # Since this wasn't done in package() we need to leave this unsafe code in for who knows how long? 2018-04-18
+  if [ -d '/usr/share/ppd' ] ; then
+    rm -f /usr/share/ppd/CN*ZK.ppd
  fi
 }

-op=$1
-shift
-$op $*
+_fn_post_up() {
+  # This creates duplicate entries in CUPS. It should have been done in package()
+  #if [ -d '/usr/share/ppd' ] ; then
+  #  cd '/usr/share/cups/model'
+  #  for fn in CN*ZK.ppd ; do \
+  #    ln -sf "/usr/share/cups/model/$fn" "/usr/share/ppd/$fn"
+  #  done
+  #fi
+  chmod 4755 '/usr/bin/cnpkmoduleufr2'
+}
+
+post_upgrade() {
+  post_remove
+  _fn_post_up
+}
+
+post_install() {
+  _fn_post_up
+  echo '
+>>> Installation:
+>>> 1) Make sure CUPS is running and your printer is turned on and connected to your computer.
+>>> eg.
+>>> systemctl start cups
+>>>
+>>> 2) Check the name of the device, udev created for you.
+>>> eg. /dev/usb/lp0
+>>>
+>>> 3) /usr/bin/lpadmin -p [Printer Name] -m [PPD file] -v usb:[device file location] -E
+>>> eg.
+>>> /usr/bin/lpadmin -p LBP2900 -m CNCUPSLBP2900CAPTK.ppd -v usb:/dev/usblp0 -E
+>>> you can find ppds in the /usr/share/cups/model/ directory)
+>>>
+>>> 4) Now you can print. Consider using "systemctl enable cups" to have it start automatically on boot
+'
+}
--- a/src/cower/PKGBUILD
+++ b/src/cower/PKGBUILD
@ -1,8 +1,8 @@
 # Maintainer: Dave Reisner <d@falconindy.com>

 pkgname=cower
-pkgver=17
-pkgrel=2
+pkgver=18
+pkgrel=1
 pkgdesc="A simple AUR agent with a pretentious name"
 arch=('i686' 'x86_64')
 url="http://github.com/falconindy/cower"
@ -11,7 +11,7 @@ depends=('curl' 'pacman' 'yajl')
 makedepends=('perl')
 source=("https://pkgbuild.com/~dreisner/sources/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53')  # Dave Reisner
-md5sums=('263c216e6643751b6c96eebfdd70c359'
+md5sums=('ce5993a79d7e1cc33016e06e32af03e7'
         'SKIP')

 build() {
--- a/src/dislocker/PKGBUILD
+++ b/src/dislocker/PKGBUILD
@ -0,0 +1,37 @@
+# Maintainer: mrxx <mrxx at cyberhome dot at>
+
+pkgname=dislocker
+pkgver=0.7.1
+pkgrel=2
+pkgdesc="Read BitLocker encrypted volumes under Linux"
+arch=('i686' 'x86_64')
+url="http://www.hsc.fr/ressources/outils/dislocker"
+license=('GPL2')
+depends=('fuse' 'mbedtls' 'ruby')
+makedepends=('make' 'cmake')
+conflicts=('dislocker-git')
+optdepends=('ntfs-3g: NTFS file system support')
+source=(https://github.com/Aorimn/dislocker/archive/v$pkgver.tar.gz)
+sha1sums=('0c5c62f63ba587663eb0474f1bd6ca7e345fe977')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Fix v0.7 upstream path error
+  sed -i 's/DIS_MAN \${PROJECT_SOURCE_DIR}/DIS_MAN ../' src/CMakeLists.txt
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -Dlibdir=/usr/lib \
+        -D WARN_FLAGS:STRING="-Wall -Wextra" \
+        .
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+
+  install -Dm644 README.md ${pkgdir}/usr/share/doc/${pkgname}/README
+  install -Dm644 CHANGELOG.md ${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG
+  install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
--- a/src/displaylink/PKGBUILD
+++ b/src/displaylink/PKGBUILD
@ -2,28 +2,28 @@
 # Contributor: rhabbachi

 pkgname=displaylink
-pkgver=4.1.9
+pkgver=4.2.29
 pkgrel=1
 pkgdesc="Linux driver for DL-6xxx, DL-5xxx, DL-41xx and DL-3x00"
 arch=('i686' 'x86_64')
 url="http://www.displaylink.com/downloads/ubuntu.php"
 license=('custom' 'GPL2' 'LGPL2.1')
-depends=('evdi-git' 'libusb>=1.0.0')
+depends=('evdi>=1.5.0' 'libusb>=1.0.0')
 makedepends=('grep' 'gawk' 'wget')
 install=
 changelog="release-note.txt"
-source=(displaylink-driver-$pkgver.zip::http://www.displaylink.com/downloads/file?id=1087
+source=(displaylink-driver-$pkgver.zip::http://www.displaylink.com/downloads/file?id=1123
 	udev.sh
        99-displaylink.rules 
 	displaylink.service 
        displaylink-sleep.sh)
-md5sums=('d18b6512b6519a0e119c10c0acf14d0a'
+md5sums=('ab920bea23a265516e3d0097992c62f3'
         'd5de775e41af06edbd8073adc490139d'
         '20495d81c7d2540910ef86dc437b7fac'
         'c141a15e973481c7d961f8e135627ca4'
         '7cbd9ab2ac79ba66e8297689c6e5483e')

-DLAGENTS=('http::/usr/bin/wget -O %o --post-data=fileId=1087&accept_submit=Accept %u')
+DLAGENTS=('http::/usr/bin/wget -O %o --post-data=fileId=1123&accept_submit=Accept %u')

 # Update with > updpkgsums

--- a/src/displaylink/release-note.txt
+++ b/src/displaylink/release-note.txt
@ -0,0 +1,112 @@
+=============================================================================
+=============================================================================
+
+DisplayLink Ubuntu Software Release Note
+
+Version: 4.2.29
+Date: 23th Feb 2018
+
+DisplayLink DL-3xx0 / DL-5xx0 Firmware Version: 9.5.18.93117
+DisplayLink DL-41xx Firmware Version: 9.5.20.93215
+DisplayLink DL-6xxx Firmware Version: 9.5.18.93117
+Extensible Virtual Display Interface version included: 1.5.0-r2
+
+=============================================================================
+=============================================================================
+
+
+A. Introduction
+===============
+
+This is DisplayLink Driver Software 4.2.0 for Ubuntu. It provides production quality support for DisplayLink USB 3.0 devices on specific variants of desktop Ubuntu Linux.
+
+The driver enables video support for products using DisplayLink USB 3.0 technology. Standard native Ubuntu drivers provide support for DisplayLink audio and Ethernet interfaces.
+
+
+A1. Important notes about DL-6xxx, DL5xxx, DL-3x00 and DL-41xx Firmware
+=======================================================================
+
+This software release contains an embedded firmware image. DL-6xxx, DL-5xxx, DL-3xxx and DL-41xx devices will be automatically upgraded with this firmware upon connection if required.
+
+The upgrade is silent, therefore screens connected to DL-6xxx, DL-5xxx, DL-3xxx or DL-41xx devices may require a few seconds to appear when devices are connected for the first time, or after devices have been used on other platforms and OSes.
+
+B. Contents
+===========
+
+A.  Introduction
+A1. Important notes about DL-6xxx, DL-5xxx, DL-3xxx and DL-41xx Firmware
+B.  Contents
+C.  Issues fixed
+D.  Supported O/S variants
+E.  Release components
+F.  How to Install
+G.  Supported Features & Hardware
+H.  Limitations & Known issues
+I.  Future Development
+
+C. Issues fixed
+===============
+
+Issues fixed since DisplayLink Driver Software v4.1.0 for Ubuntu (4.1.9)
+--------------------------------------------------------------------------
+
+Sometimes PC may become unresponsive when a DisplayLink display is connected. (27139)
+
+D. Supported O/S variants
+=========================
+
+This release has been prepared to be compatible with Ubuntu 17.10 and Ubuntu 16.04. Other variants and editions may be compatible if they meet minimum O/S requirements, but are not supported by DisplayLink.
+
+The Software contains binaries which work on Intel x86 platform (32 bit and 64 bit).
+Minimum supported Linux Kernel version is 3.16.
+Minimum supported Xorg version is 1.16.
+
+E. Release components
+=====================
+The Software consists of an open-source kernel mode driver (EVDI) with an accompanying library (libevdi), and a supporting binary application compatible with Intel x86 platform.
+Source code for the open-source components can be found at DisplayLink's GitHub, https://github.com/DisplayLink
+
+F. How to Install
+=================
+
+To install the release, from a terminal window, with root permissions use the command:
+
+sudo ./displaylink-driver-XXXX.run
+
+Where displaylink-driver-XXXX.run is the name of the extracted DisplayLink driver.
+
+The dkms framework is required for installation of DisplayLink. This can be installed with the command: sudo apt-get install dkms
+
+More detailed information on installation can be found at http://support.displaylink.com/knowledgebase/articles/615714#ubuntu
+
+G. Supported Features & Hardware
+================================
+
+This driver will support up to 2 displays connected to DisplayLink devices. More than 2 DisplayLink displays may work, but not supported or tested by DisplayLink.
+
+Resolutions up to 4K are supported on the appropriate DisplayLink hardware.
+
+Device families supported:
+- DL-6xxx
+- DL-5xxx
+- DL-41xx
+- DL-3xxx
+
+DL-1x5 and DL-1x0 devices use the open source udl driver, which is not developed or maintained by DisplayLink.
+
+H. Limitations & Known issues
+=============================
+
+A list of limitations and known issues can be found here:
+http://support.displaylink.com/knowledgebase/articles/641668
+
+I. Future Development
+======================
+
+DisplayLink are open to suggestions and feedback on improving the proposed architecture and will gladly review patches or proposals from the developer community. Please find a current list of areas we identify as requiring attention below.
+
+- In this release, the user mode driver service is running with root permissions. In future versions, we would like to reduce the privilege level required for this process – e.g. by using a separate low-privileged user and a separate group, to ensure the permissions needed for driving DisplayLink screens are as low as possible.
+
+- The communication between the EVDI kernel module and the wrapper libevdi library is not access-controlled or authenticated. This could be improved in future releases, making it harder to compromise the data EVDI is sending and receiving.
+
+- EVDI kernel module driver is currently a platform_driver, for multiple reasons; most importantly because virtual displays are not discoverable, i.e. cannot be enumerated at the hardware level. EVDI is also a generic device, not tied to any particular kind of device, transport layer or a bus.
--- a/src/emulationstation-autoscraper/PKGBUILD
+++ b/src/emulationstation-autoscraper/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>

 pkgname=emulationstation-autoscraper
-pkgver=273.ca24b2b
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="An auto-scraper for EmulationStation written in Go using hashes"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
@ -9,22 +9,24 @@ url="https://github.com/sselph/scraper"
 license=('custom')
 makedepends=('git' 'go')

-source=("https://raw.githubusercontent.com/sselph/scraper/master/LICENSE")
-sha256sums=('SKIP')
+source=("https://github.com/sselph/scraper/archive/v${pkgver}.tar.gz")
+sha256sums=('5e7496b7634126f5be81fdd88a20fe108f40d4a8a0089b2d07ae82ea2cea812c')
+
+scraperdir="scraper-${pkgver}"

 build() {
-  cd "${srcdir}"
-  export GOPATH="${srcdir}"
-  echo $(go get github.com/sselph/scraper)
+  cd "${srcdir}/${scraperdir}"
+  echo $arch
  echo $(go build github.com/sselph/scraper)
 }

 package() {
-  strip "${srcdir}/scraper"
-  install -Dm755 "${srcdir}/scraper" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/src/github.com/sselph/scraper/LICENSE"		"${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
-  for LIC in $(find ./src/github.com/sselph/scraper/vendor/github.com -name LICENSE); do
+  cd "${srcdir}/${scraperdir}"
+  strip "scraper"
+  install -Dm755 "${srcdir}/${scraperdir}/scraper" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/${scraperdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+  for LIC in $(find vendor/github.com -name LICENSE); do
    PKGNAME="$(echo ${LIC} | awk -F "/" '{print $(NF-1)}')"
-    install -Dm644 "${srcdir}/${LIC}" "${pkgdir}/usr/share/licenses/${pkgname}/license.${PKGNAME}"
+    install -Dm644 "${srcdir}/${scraperdir}/${LIC}" "${pkgdir}/usr/share/licenses/${pkgname}/license.${PKGNAME}"
  done
 }
--- a/src/emulationstation-git/PKGBUILD
+++ b/src/emulationstation-git/PKGBUILD
@ -5,7 +5,7 @@
 pkgname=emulationstation-git
 _gitname=EmulationStation
 pkgrel=1
-pkgver=1126.ca046f7
+pkgver=1034.99c1ddb
 pkgdesc="A graphical front-end for emulators with controller navigation. Developed for the Raspbery Pi, but runs on most Linux systems."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/RetroPie/EmulationStation"
--- a/src/ethminer-bin/PKGBUILD
+++ b/src/ethminer-bin/PKGBUILD
@ -1,6 +1,6 @@
 # Maintainer: Adam Goldsmith <contact@adamgoldsmith.name>
 pkgname=ethminer-bin
-pkgver=0.12.0
+pkgver=0.14.0
 pkgrel=1
 pkgdesc="Ethereum miner with OpenCL, CUDA and stratum support (precompiled binary)"
 arch=('x86_64')
@ -9,7 +9,7 @@ license=('MIT')
 provides=('ethminer')
 conflicts=('ethminer')
 source=("https://github.com/ethereum-mining/ethminer/releases/download/v${pkgver}/ethminer-${pkgver}-Linux.tar.gz")
-md5sums=('f149b051e2cd6741a669f485e928476a')
+md5sums=('9b4f9700bbbd60348ab6d0cee876a483')

 package() {
  install -Dm755 "$srcdir/bin/ethminer" "$pkgdir/usr/bin/ethminer"
--- a/src/ethminer-git/PKGBUILD
+++ b/src/ethminer-git/PKGBUILD
@ -0,0 +1,67 @@
+# Maintainer: Rowan Decker <rdecker@scu.edu>
+# Contributor: Eric Toombs <ee double you toombs at you waterloo dot see eh?>
+# Contributor: Afri 5chdn <aur@cach.co>
+# Contributor: Andy Weidenbaum <archbaum@gmail.com>
+
+pkgname=ethminer-git
+pkgver=0.14.0.1.20180216.07f5d714e
+pkgrel=1
+pkgdesc="Ethereum miner with CUDA and stratum support. chfast's version."
+arch=('i686' 'x86_64')
+makedepends=(
+  'gcc6'
+  'cmake'
+  'git'
+  'opencl-headers'
+)
+optdepends=(
+  'solidity: The Solidity Contract-Oriented Programming Language'
+)
+groups=('ethereum')
+url="https://github.com/ethereum-mining/ethminer"
+license=('GPL')
+source=(
+  "$pkgname::git+https://github.com/ethereum-mining/ethminer"
+)
+sha256sums=(
+  "SKIP"
+)
+provides=(
+  'ethminer'
+)
+conflicts=(
+  'ethminer'
+  'ethereum'
+  'ethereum-git'
+  'cpp-ethereum'
+)
+
+pkgver() {
+  cd "$pkgname"
+  echo "`grep -m1 "PROJECT_VERSION" CMakeLists.txt | tr -cd '[[:digit:]].'`.`date +%Y%m%d`.`git log --pretty=format:%h -n 1`"
+}
+
+build() {
+  msg 'Updating...'
+  cd "$pkgname"
+  git submodule update --init --recursive
+
+  msg 'Building...'
+  mkdir -p build && pushd build
+  unset CFLAGS #march=native can break the build if set in makepkg.conf
+  unset CXXFLAGS
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DETHASHCUDA=ON \
+      -DCMAKE_C_COMPILER=/usr/bin/gcc-6 \
+      -DCMAKE_CXX_COMPILER=/usr/bin/g++-6 \
+      -DCMAKE_RANLIB=/usr/bin/gcc-ranlib-6 \
+      -DCMAKE_AR=/usr/bin/gcc-ar-6
+  cmake --build .
+  popd
+}
+
+package() {
+  cd "${pkgname}/build"
+
+  msg 'Installing...'
+  DESTDIR="${pkgdir}" make install
+}
--- a/src/evdi-git/PKGBUILD
+++ b/src/evdi-git/PKGBUILD
@ -1,43 +1,56 @@
-# Maintainer: ajs124
+# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com
+# Contributor: ajs124

-pkgname=evdi-git
-pkgver=1.5.0.r11.ga73092d
+set -u
+pkgname='evdi-git'
+pkgver=1.5.0_r2.r0.gdc3c9d6
+_pkgver="${pkgver%%.r*}"
 pkgrel=1
-pkgdesc="A Linux® kernel module that enables management of multiple screens. Git version."
+pkgdesc="A Linux® kernel module that enables management of multiple screens."
+pkgdesc+=' Git version.'
 arch=('i686' 'x86_64')
-url="https://github.com/DisplayLink/evdi"
+url='https://github.com/DisplayLink/evdi'
 license=('GPL')
-depends=(dkms)
-makedepends=(git libdrm)
-install=$pkgname.install
-changelog=$pkgname.Changelog
-source=(git+https://github.com/DisplayLink/evdi/)
-md5sums=(SKIP)
-conflicts=(evdi)
-provides=(evdi=$pkgver)
+depends=('dkms')
+makedepends=('git' 'libdrm')
+provides=("evdi=${_pkgver}")
+conflicts=('evdi')
+install=${pkgname}.install
+changelog="${pkgname}.Changelog"
+_srcdir="${pkgname%-git}"
+source=("git+https://github.com/DisplayLink/evdi/")
+sha256sums=('SKIP')

 pkgver() {
-	cd ${pkgname/-git/}
-	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  set -u
+  cd "${_srcdir}"
+  # extra -r interfers with version management
+  local _t1="$(git describe --tags)" # v1.5.0-r2
+  local _t1a="${_t1//-/_}"
+  local _t2="$(git describe --long --tags)" # v1.5.0-r2-0-gdc3c9d6
+  local _t2a="${_t2//${_t1}/${_t1a}}"
+  sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' <<< "${_t2a}"
+  set +u
 }

 build() {
-	# We only need to build the library in this step, dmks will build the module
-	cd ${pkgname/-git/}/library
-	# hotfix mentioned at https://github.com/DisplayLink/evdi/issues/117
-	sed -i -e 's/#if KERNEL_VERSION(4, 16, 0) <= LINUX_VERSION_CODE/#if KERNEL_VERSION(4, 15, 0) <= LINUX_VERSION_CODE/' ../module/evdi_connector.c
-	make
+  set -u
+  # We only need to build the library in this step, dmks will build the module
+  #cd "${_srcdir}/library"
+  # DKMS builds are hard to debug. We build it here and throw it away.
+  cd "${_srcdir}"
+  make
+  set +u
 }

 package() {
-	# Predfine some target folders
-	SRCDIR="$pkgdir/usr/src/${pkgname/-git/}-$pkgver"	# This one is needed for dkms
-	LIBNAME=lib${pkgname/-git/}
+  set -u
+  cd "${_srcdir}"
+  install -Dpm755 "library/lib${pkgname%-git}.so" -t "${pkgdir}/usr/lib/"

-	cd ${pkgname/-git/}
-
-	install -D -m 755 library/$LIBNAME.so $pkgdir/usr/lib/$LIBNAME.so
-
-	install -d $SRCDIR
-	install -D -m 755 module/* $SRCDIR
+  local _DKMS="${pkgdir}/usr/src/${pkgname%-git}-${_pkgver}"
+  install -Dpm644 module/* -t "${_DKMS}/"
+  make -j1 -C "${_DKMS}" clean
+  set +u
 }
+set +u
--- a/src/evdi-git/evdi-git.install
+++ b/src/evdi-git/evdi-git.install
@ -2,19 +2,20 @@
 # new version (without -$pkgrel): ${2%%-*}

 post_install() {
-    echo 'DKMS install...'
-    dkms install evdi/${1%%-*}
+  cat << EOF
+Steps:
+
+0. Install this package
+
+1. Install display driver package
+
+2.  Reboot or
+
+2a. sudo modprobe evdi
+2b. dmesg -w # watch for evdi messages
+2c. Replug USB display device
+
+3. Enable screen
+EOF
 }

-pre_upgrade() {
-    pre_remove ${2%%-*}
-}
-
-post_upgrade() {
-    post_install ${1%%-*}
-}
-
-pre_remove() {
-    echo 'DKMS remove...'
-    dkms remove evdi/${1%%-*} --all
-}
--- a/src/evdi/.gitignore
+++ b/src/evdi/.gitignore
@ -0,0 +1,4 @@
+*.tar.gz
+*.tar.xz
+pkg/
+src/
--- a/src/evdi/PKGBUILD
+++ b/src/evdi/PKGBUILD
@ -0,0 +1,43 @@
+# Maintainer: PlusMinus
+
+pkgname=evdi
+pkgver=1.5.0.2
+pkgrel=1
+pkgdesc="A Linux® kernel module that enables management of multiple screens."
+arch=('i686' 'x86_64')
+url="https://github.com/DisplayLink/evdi"
+license=('GPL')
+groups=()
+depends=(dkms libdrm)
+makedepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=$pkgname.install
+changelog=$pkgname.Changelog
+source=($pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/DisplayLink/evdi/archive/v$pkgver.tar.gz)
+noextract=()
+md5sums=('19c7dc3829b2ff84826007e7b4a3c961')
+
+build() {
+# We only need to build the library in this step, dmks will build the module
+cd "$pkgname-$pkgver/library"
+
+make
+}
+
+package() {
+# Predfine some target folders
+SRCDIR="$pkgdir/usr/src/$pkgname-$pkgver"	# This one is needed for dkms
+LIBNAME=lib$pkgname
+
+cd "$pkgname-$pkgver"
+
+install -D -m 755 library/$LIBNAME.so $pkgdir/usr/lib/$LIBNAME.so
+
+install -d $SRCDIR
+install -D -m 755 module/* $SRCDIR
+}
--- a/src/evdi/evdi.Changelog
+++ b/src/evdi/evdi.Changelog
@ -0,0 +1,32 @@
+v1.5.0.2
+Re-release v1.5.0-r2 as v1.5.0.2 for Chrome OS only.
+
+v1.5.0-r2
+EVDI driver used in DisplayLink Ubuntu Software v4.2.
+
+v1.5.0-r1
+In Makefile pass CC down to kernel make
+
+v1.5.0
+Fix compatibility with kernels post 4.13.
+Introduce changes for cursor API.
+
+v1.4.1
+Synchronisation of code base to make it in line with Chrome OS kernels
+
+v1.4.0
+Compilation fixes for kernel 4.10
+API compatibility enforcement between the library and module.
+
+v1.3.43
+Adding support for indicating an area limit a client that connects to EVDI has.
+
+v1.3.42
+Fixes for Kernels 4.9 and 4.10.
+API change: Extension of evdi_connect function, allowing to register modes that the client supports, regardless of the fact they are not necessarily listed in the EDID of a monitor.
+
+v1.2.64
+Highlights: fixes for kernel 4.8.
+
+v1.2.55
+Module and library code to be included in DisplayLink USB Graphics Software for Ubuntu, version 1.2.
--- a/src/evdi/evdi.install
+++ b/src/evdi/evdi.install
@ -0,0 +1,20 @@
+# old version (without -$pkgrel): ${1%%-*}
+# new version (without -$pkgrel): ${2%%-*}
+
+post_install() {
+    echo 'DKMS install...'
+    dkms install evdi/${1%%-*}
+}
+
+pre_upgrade() {
+    pre_remove ${2%%-*}
+}
+
+post_upgrade() {
+    post_install ${1%%-*}
+}
+
+pre_remove() {
+    echo 'DKMS remove...'
+    dkms remove evdi/${1%%-*} --all
+}
--- a/src/factorio-demo/PKGBUILD
+++ b/src/factorio-demo/PKGBUILD
@ -1,7 +1,8 @@
-# Maintainer: Sebastien Duthil <duthils@free.fr>
+# Maintainer: mickael9 <mickael9@gmail.com>
+# Contributor: Sebastien Duthil <duthils@free.fr>

 pkgname=factorio-demo
-pkgver=0.15.33
+pkgver=0.15.36
 pkgrel=1
 pkgdesc="A 2D game about building and maintaining factories."
 arch=('x86_64')
@ -13,9 +14,9 @@ makedepends=('xz')
 source=(factorio.desktop
        LICENSE)
 source_x86_64=(factorio_demo_x64_${pkgver}.tar.xz::http://www.factorio.com/get-download/${pkgver}/demo/linux64)
-sha256sums=('5f62aa7763f9ad367a051371bc16f3c174022bb3380eb221ba06bac395bf9815'
+sha256sums=('c3bbe51c3c35641d6064ff0f8470294f8a317f0413bb149f6bd47461b03804bf'
            '67ec2f88afff5d7e0ca5fd3301b5d98655269c161a394368fa0ec49fbc0c0e21')
-sha256sums_x86_64=('ccb780138a927982f1c0b56b3b01d6598cd839a9c25d7332c0187a3410b1dc0e')
+sha256sums_x86_64=('fcff6735880094ef3690c5c6a70261ec93c44c508cad2050f487f2a3e7438a29')

 # no modifications needed, the executable looks for:
 # - data in /usr/share/factorio
--- a/src/factorio-demo/factorio.desktop
+++ b/src/factorio-demo/factorio.desktop
@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Factorio
+Name=Factorio (demo)
 GenericName=Factorio
 Comment=A 2D game about building and maintaining factories.
 Exec=factorio
--- a/src/filebot/PKGBUILD
+++ b/src/filebot/PKGBUILD
@ -1,19 +1,22 @@
 # Maintainer: max.bra <max dot bra at alice dot it>
+# Contributor: nadolph
+# Contributor: dcelasun
 # Contributor: said
-# Contributor:  Kaurin <milos dot kaurin at gmail>
+# Contributor: Kaurin <milos dot kaurin at gmail>
 # Contributor: Nathan Owe <ndowens04 at gmail>

 pkgname=filebot
-pkgver=4.7.9
+pkgver=4.8.1
 pkgrel=1
-_jnaver=4.3.0
+_jnaver=4.5.1
+_fixedcommit=0761faded4cfacbb4005a5842d8b89ce0a36f811
 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="http://filebot.sourceforge.net/"
+url="https://github.com/filebot/filebot"
 license=('GPL')
 install=$pkgname.install
-depends=('java-runtime>=8' 'fontconfig' 'chromaprint')
-makedepends=('unzip')
+depends=('java-runtime>=9' 'fontconfig' 'chromaprint')
+makedepends=('unzip' 'apache-ivy' 'jdk>=9')

 [[ $CARCH == "i686" ]]   && _intarch=x86
 [[ $CARCH == "x86_64" ]] && _intarch=x86-64
@ -21,13 +24,13 @@ makedepends=('unzip')
 [[ $CARCH == "armv6h" ]] && _intarch=arm
 [[ $CARCH == "armv7h" ]] && _intarch=arm

-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/FileBot_$pkgver/FileBot_$pkgver-portable.tar.xz
+source=("${pkgname}::git+https://github.com/filebot/filebot.git"
        https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz
        $pkgname-arch.sh $pkgname.svg $pkgname.desktop)

-md5sums=('961dbdb7d6c62c133952df2f9f427d96'
-         '2de8ba99fc91809935e6c2ab02f49a82'
-         'd94b4245dd3b226872f05fd2bf75bd1c'
+md5sums=('SKIP'
+         '3cf5c206ba2246386af2e9248fa6f035'
+         '38c3f0029e094043cfca147981d41081'
         '04f46be047049448dba3f0de29fe192d'
         'f37edd0bba7570904d28ab1681c7a7f3')

@ -38,17 +41,35 @@ optdepends=('libzen: Support for additional subtitle search engines (Sublight)'

 #noextract=($(for i in ${source[@]}; do basename $i; done))

-build() {
-  /bin/true
-}
-
 prepare() {
-  cd jna-$_jnaver/lib/native/
+  cd "$srcdir/$pkgname/"
+  git checkout $_fixedcommit
+  sed -i -E 's/release="([^"]*)"/target="\1" source="\1"/' build.xml
+  sed -i -E 's/jre.version: 10/jre.version: 9/' app.properties
+  sed -i -E 's/jvm.version: 10/jvm.version: 9/' app.properties
+cat <<EOT >> app.properties
+url.data: https://app.filebot.net/data
+
+apikey.fanart.tv: 780b986b22c35e6f7a134a2f392c2deb
+apikey.thetvdb: 694FAD89942D3827
+apikey.themoviedb: 66308fb6e3fd850dde4c7d21df2e8306
+apikey.omdb: 49d311ec
+apikey.acoustid: 0B3qZnQc
+apikey.anidb: filebot
+apikey.opensubtitles: FileBot
+EOT
+  cd "$srcdir/jna-$_jnaver/lib/native/"
  unzip linux-$_intarch.jar 2>&1 >/dev/null
 }

+build() {
+  cd $pkgname
+  ant resolve
+  ant fatjar
+}
+
 package() {
-  install -Dm644 FileBot.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+  install -Dm644 $pkgname/dist/FileBot_$pkgver.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
  install -Dm644 jna-$_jnaver/lib/native/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
  install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
  install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
--- a/src/filebot/filebot-arch.sh
+++ b/src/filebot/filebot-arch.sh
@ -18,5 +18,5 @@ EXTRACTOR="ApacheVFS"			# use Apache Commons VFS2 with junrar plugin
 # EXTRACTOR="SevenZipNativeBindings"	# use the lib7-Zip-JBinding.so native library

 # start filebot
-java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=portable -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java $JAVA_OPTS -jar /usr/share/java/filebot/filebot.jar "$@"
+java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@"

--- a/src/freeradius-client/PKGBUILD
+++ b/src/freeradius-client/PKGBUILD
@ -0,0 +1,27 @@
+# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Contributor: Kalidarn
+
+pkgname=freeradius-client
+pkgver=1.1.7
+pkgrel=2
+pkgdesc="FreeRADIUS Client Software"
+arch=('x86_64' 'i686')
+url="http://wiki.freeradius.org/Radiusclient"
+license=('BSD')
+depends=('sh')
+#source=(ftp://ftp.freeradius.org/pub/radius/$pkgname-$pkgver.tar.bz2)
+source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRADIUS/freeradius-client/archive/release_${pkgver//./_}.tar.gz)
+md5sums=('caba9b9a0c15cfb7f204273f30fc83c3')
+
+build() {
+  cd "$srcdir"/freeradius-client-release_${pkgver//./_}
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
+  make
+}
+
+package() {
+  cd "$srcdir"/freeradius-client-release_${pkgver//./_}
+  make DESTDIR="$pkgdir" install
+  install -D -m0644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/license
+  mv "$pkgdir"/etc/radiusclient "$pkgdir"/etc/radiusclient.default
+}
--- a/src/gajim-plugin-omemo/PKGBUILD
+++ b/src/gajim-plugin-omemo/PKGBUILD
@ -2,27 +2,27 @@

 pkgname=gajim-plugin-omemo
 _pkgname=omemo
-pkgver=1.2.8
+pkgver=2.5.13
 pkgrel=1
 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption."
 arch=(any)
 url="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
 license=('GPL')
-depends=("gajim" "python2-qrcode" "python2-setuptools" "python2-cryptography" "python2-axolotl" "python2-future")
+depends=("gajim>=1.0.0" "python-qrcode" "python-setuptools" "python-cryptography" "python-axolotl")
 provides=('gajim-plugin-omemo')
 conflicts=('gajim-plugin-omemo-git')
-source=("https://dev.gajim.org/gajim/gajim-plugins/uploads/0bbc71f9c33d7a450c6bb7704006e0bc/omemo_1.2.8.zip")
-sha512sums=('bdc50faac655306cc5b791edd238518d52f31bda6739f1d0411757835491ee6bf7e87dfffff9b1a57b74b4ed3b0309c97d23cd1615f7f45ef530d3655636cfa4')
+source=("https://ftp.gajim.org/plugins_releases/${_pkgname}_${pkgver}.zip")
+sha512sums=('f5a22f2d7ee6c8b5c8e49df6bcbba05f8dfebff2c764470fa8c80c0ccf667f964fd33d5f4541cc1f6d5d4058c74ac9398b1e0c4ec10d37f3d40eb08d922180d9')

 package() {
  cd ${srcdir}/${_pkgname}

  # Remove unnecessary files
-  rm -r CHANGELOG COPYING setup.cfg
+  rm -r CHANGELOG COPYING

  # Install the plugin
-  install -d ${pkgdir}/usr/share/gajim/plugins/omemo
-  cp -r * ${pkgdir}/usr/share/gajim/plugins/omemo/
+  install -d ${pkgdir}/usr/lib/python3.6/site-packages/gajim/data/plugins/${_pkgname}
+  cp -r * ${pkgdir}/usr/lib/python3.6/site-packages/gajim/data/plugins/${_pkgname}/
 }

 # vim:set ts=2 sw=2 et:
--- a/src/gcc5/PKGBUILD
+++ b/src/gcc5/PKGBUILD
@ -0,0 +1,91 @@
+# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
+# Contributor: Sven-Hendrik Haase <svenstaro@gmail.com>
+# Contributor: Ruben Van Boxem <vanboxem.ruben@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+pkgname=('gcc5')
+pkgver=5.5.0
+_ver=5
+_islver=0.18
+pkgrel=2
+pkgdesc="The GNU Compiler Collection (5.x.x)"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="https://gcc.gnu.org/gcc-5/"
+depends=('glibc' 'binutils' 'libmpc')
+options=('!emptydirs')
+source=(https://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2)
+sha512sums=('670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1'
+            '85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94')
+
+prepare() {
+  cd gcc-$pkgver
+
+  # link isl for in-tree build
+  ln -s ../isl-${_islver} isl
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  # Arch Linux installs x86_64 libraries /lib
+  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+  mkdir ${srcdir}/gcc-build
+}
+
+build() {
+  cd gcc-build
+
+  # using -pipe causes spurious test-suite failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+  CFLAGS=${CFLAGS/-pipe/}
+  CXXFLAGS=${CXXFLAGS/-pipe/}
+
+  # This option exist in default makepkg.conf while it's not supported by gcc5
+  CFLAGS=${CFLAGS/-fno-plt/}
+  CXXFLAGS=${CXXFLAGS/-fno-plt/}
+
+  ${srcdir}/gcc-$pkgver/configure --prefix=/usr \
+      --build=${CHOST} \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,fortran,go,lto,objc,obj-c++ \
+      --enable-shared --enable-threads=posix --enable-libmpx \
+      --with-system-zlib --with-isl --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --disable-libstdcxx-pch --disable-libssp \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --enable-lto --enable-plugin \
+      --with-linker-hash-style=gnu --enable-gnu-indirect-function \
+      --disable-multilib --disable-werror \
+      --enable-checking=release \
+      --program-suffix=-${_ver} \
+      --enable-version-specific-runtime-libs
+      #--enable-install-libiberty
+
+  make
+}
+
+package() {
+  cd gcc-build
+
+  make -j1 DESTDIR=${pkgdir} install
+
+  # Lazy way of dealing with conflicting files...
+  rm -rf ${pkgdir}/usr/share/{info,locale,man}
+
+  # Move potentially conflicting stuff to version specific subdirectory
+  [[ -d ${pkgdir}/usr/lib ]] && mv ${pkgdir}/usr/lib/lib* ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/
+  [[ -d ${pkgdir}/usr/lib/gcc/${CHOST}/lib/ ]] && mv ${pkgdir}/usr/lib/gcc/${CHOST}/lib/lib* ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/
+
+  # Install Runtime Library Exception
+  install -Dm644 ${srcdir}/gcc-$pkgver/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
+}
--- a/src/gcc6/.gitignore
+++ b/src/gcc6/.gitignore
@ -0,0 +1,7 @@
+gcc6-*.pkg.tar.xz
+*.tar.*
+pkg/
+src/
+isl-*.tar.bz2
+gcc/
+*.log
--- a/src/gcc6/PKGBUILD
+++ b/src/gcc6/PKGBUILD
@ -0,0 +1,370 @@
+# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
+# Contributor: frankspace
+# Contributor: Renan Manola <rmanola@gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Joey Dumont <joey.dumont@gmail.com>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+pkgbase=gcc6
+pkgname=('gcc6' 'gcc6-libs' 'gcc6-fortran' 'gcc6-objc' 'gcc6-go' 'gcc6-gcj')
+pkgver=6.4.1
+_ver=6
+_svnrev=253363
+_islver=0.18
+_cloogver=0.18.4
+pkgrel=5
+pkgdesc="The GNU Compiler Collection (6.x.x)"
+arch=(x86_64)
+license=(GPL LGPL FDL custom)
+url="https://gcc.gnu.org/gcc-6/"
+makedepends=(binutils libmpc doxygen svn java-environment-common zip jdk8-openjdk gtk2 libart-lgpl libxtst)
+checkdepends=('dejagnu' 'inetutils')
+options=(!emptydirs)
+source=(gcc::svn://gcc.gnu.org/svn/gcc/branches/gcc-${_ver}-branch#revision=$_svnrev
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
+        http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz)
+sha512sums=('SKIP'
+            '85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94'
+            'd35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23')
+
+_libdir="/usr/lib/gcc/$CHOST/$pkgver"
+
+prepare() {
+  cd gcc
+
+  # Link isl/cloog for in-tree builds
+  ln -sf ../isl-${_islver} isl
+  ln -sf ../cloog-${_cloogver} cloog
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  # Arch Linux installs x86_64 libraries /lib
+  sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+  # Arch uses python version 3 as default python (for gcc6-gcj).
+  sed -i '1s+python+python2+' libjava/contrib/aot-compile.in
+
+  mkdir -p "${srcdir}/gcc-build"
+
+}
+
+build() {
+  cd gcc-build
+
+  # using -pipe causes spurious test-suite failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+  CFLAGS=${CFLAGS/-pipe/}
+  CXXFLAGS=${CXXFLAGS/-pipe/}
+
+  "${srcdir}/gcc/configure" --prefix=/usr \
+      --libdir=/usr/lib \
+      --libexecdir=/usr/lib \
+      --mandir=/usr/share/man \
+      --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,fortran,go,lto,objc,obj-c++,java \
+      --enable-shared \
+      --enable-threads=posix \
+      --enable-libmpx \
+      --with-system-zlib \
+      --with-isl \
+      --enable-__cxa_atexit \
+      --disable-libunwind-exceptions \
+      --enable-clocale=gnu \
+      --disable-libstdcxx-pch \
+      --disable-libssp \
+      --enable-gnu-unique-object \
+      --enable-linker-build-id \
+      --enable-lto \
+      --enable-plugin \
+      --with-linker-hash-style=gnu \
+      --enable-gnu-indirect-function \
+      --disable-multilib \
+      --disable-werror \
+      --enable-checking=release \
+      --enable-java-awt=gtk \
+      --with-java-home="$JAVA_HOME" \
+      --enable-libgcj-multifile \
+      --enable-default-pie \
+      --enable-default-ssp \
+      --enable-version-specific-runtime-libs \
+      --program-suffix=-${_ver} \
+      --build="${CHOST}"
+
+  make
+
+  # make documentation
+  make -C ${CHOST}/libstdc++-v3/doc doc-man-doxygen
+}
+
+check() {
+  cd gcc-build
+
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  ${srcdir}/gcc/contrib/test_summary
+}
+
+
+package_gcc6-libs() {
+  pkgdesc="Runtime libraries shipped by GCC"
+  depends=('glibc>=2.25')
+  options=('!emptydirs' '!strip')
+
+  cd gcc-build
+  make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  rm ${pkgdir}/${_libdir}/libgcc_eh.a
+
+  for lib in libatomic \
+             libcilkrts \
+             libjava \
+             libgfortran \
+             libgo \
+             libgomp \
+             libitm \
+             libquadmath \
+             libsanitizer/{a,l,ub}san \
+             libstdc++-v3/src \
+             libvtv
+  do
+    make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+
+  make -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+
+  make -C $CHOST/libobjc DESTDIR=${pkgdir} install-libs
+  make -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -C $CHOST/libmpx DESTDIR=${pkgdir} install
+  rm ${pkgdir}/${_libdir}/libmpx.spec
+
+  for lib in libgomp libitm libquadmath
+  do
+    make -C $CHOST/$lib DESTDIR=${pkgdir} install-info
+  done
+
+  # Lazy way of dealing with conflicting files...
+  rm -rf ${pkgdir}/usr/share/{info,locale,man}
+
+  # Remove libs that conflict with gcc6_go.
+  rm -rf ${pkgdir}/${_libdir}/libgo*
+
+  # Install Runtime Library Exception
+  install -Dm644 ${srcdir}/gcc/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc6() {
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  depends=("gcc6-libs=${pkgver}-${pkgrel}" 'binutils>=2.28' 'libmpc')
+  options=('staticlibs')
+
+  cd gcc-build
+
+  make -C gcc DESTDIR=${pkgdir} install-driver install-cpp install-gcc-ar \
+    c++.install-common install-headers install-plugin install-lto-wrapper
+
+  for _i in gcov gcov-dump gcov-tool collect2 collect-ld lto1
+  do
+    install -Dm755 gcc/$_i $pkgdir/usr/bin/${_i}-${_ver}
+  done
+
+  make -C $CHOST/libgcc DESTDIR=${pkgdir} install
+  rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/lib/libgcc_s.so*
+  rm -f ${pkgdir}/${_libdir}/libgcc_s.so*
+
+  make -C $CHOST/libstdc++-v3/src DESTDIR=${pkgdir} install
+  make -C $CHOST/libstdc++-v3/include DESTDIR=${pkgdir} install
+  make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR=${pkgdir} install
+  make -C $CHOST/libstdc++-v3/python DESTDIR=${pkgdir} install
+
+  make DESTDIR=${pkgdir} install-libcc1
+  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
+  #mv ${pkgdir}/${_libdir}/libstdc++.so.6.*-gdb.py \
+  #  ${pkgdir}/usr/share/gdb/auto-load/{_libdir}/
+  rm ${pkgdir}/${_libdir}/libstdc++.so*
+
+  make DESTDIR=${pkgdir} install-fixincludes
+  make -C gcc DESTDIR=${pkgdir} install-mkheaders
+
+  make -C lto-plugin DESTDIR=${pkgdir} install
+  install -dm755 ${pkgdir}/usr/lib/bfd-plugins/
+  ln -s ${_libdir}/liblto_plugin.so ${pkgdir}/usr/lib/bfd-plugins/
+
+  make -C $CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
+    install-nodist_cilkincludeHEADERS
+  make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
+    install-nodist_libsubincludeHEADERS
+  make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+  make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
+  make -C $CHOST/libsanitizer DESTDIR=${pkgdir} install-nodist_{saninclude,toolexeclib}HEADERS
+  make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+  make -C $CHOST/libmpx DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+
+  #make -C libiberty DESTDIR=${pkgdir} install
+  # install PIC version of libiberty
+  #install -m644 ${srcdir}/gcc-${_snapshot}/gcc-build/libiberty/pic/libiberty.a ${pkgdir}/${_libdir}/
+
+  make -C gcc DESTDIR=${pkgdir} install-man install-info
+  rm ${pkgdir}/usr/share/man/man1/{gccgo-${_ver},gfortran-${_ver}}.1
+  rm ${pkgdir}/usr/share/info/{gccgo,gfortran}.info
+
+  make -C libcpp DESTDIR=${pkgdir} install
+  make -C gcc DESTDIR=${pkgdir} install-po
+
+  # many packages expect this symlink
+  ln -s gcc-${_ver} ${pkgdir}/usr/bin/cc-${_ver}
+
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89-${_ver} <<"EOF"
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+            exit 1;;
+  esac
+done
+exec gcc-${_ver} $fl ${1+"$@"}
+EOF
+
+  cat > $pkgdir/usr/bin/c99-${_ver} <<"EOF"
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+            exit 1;;
+  esac
+done
+exec gcc-${_ver} $fl ${1+"$@"}
+EOF
+
+  chmod 755 $pkgdir/usr/bin/c{8,9}9-${_ver}
+
+  # Install Runtime Library Exception
+  install -d ${pkgdir}/usr/share/licenses/$pkgname/
+  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/$pkgname
+
+  # Lazy way of dealing with conflicting files...
+  rm -rf ${pkgdir}/usr/share/{info,locale,man}
+
+  # Move potentially conflicting stuff to version specific subdirectory
+  #[[ -d ${pkgdir}/usr/lib/gcc/${CHOST}/lib/ ]] && mv ${pkgdir}/usr/lib/gcc/${CHOST}/lib/lib* \
+  #               ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/
+  mv $pkgdir/usr/lib/bfd-plugins/liblto_plugin.so ${pkgdir}/usr/lib/bfd-plugins/liblto_plugin-${_ver}.so
+  mv ${pkgdir}/usr/lib/*.so* ${pkgdir}/${_libdir}/
+  install -Dm755 gcc/cc1     ${pkgdir}/${_libdir}/cc1
+  install -Dm755 gcc/cc1plus ${pkgdir}/${_libdir}/cc1plus
+}
+
+package_gcc6-fortran() {
+  pkgdesc="Fortran front-end for GCC"
+  depends=("gcc6=$pkgver-$pkgrel")
+  options=('!emptydirs')
+
+  cd gcc-build
+  make -C $CHOST/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
+    install-{toolexeclibDATA,nodist_fincludeHEADERS}
+  make -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -C gcc DESTDIR=$pkgdir fortran.install-common
+  install -Dm755 gcc/f951 $pkgdir/${_libdir}/f951
+
+  ln -s gfortran-6 ${pkgdir}/usr/bin/f95-${_ver}
+
+  # Install Runtime Library Exception
+  install -d ${pkgdir}/usr/share/licenses/$pkgname
+  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/$pkgname/
+}
+
+package_gcc6-objc() {
+  pkgdesc="Objective-C front-end for GCC"
+  depends=("gcc6=$pkgver-$pkgrel")
+
+  cd gcc-build
+  make DESTDIR=$pkgdir -C $CHOST/libobjc install-headers
+  install -dm755 $pkgdir/${_libdir}
+  install -m755 gcc/cc1obj     $pkgdir/${_libdir}/cc1obj
+  install -m755 gcc/cc1objplus $pkgdir/${_libdir}/cc1objplus
+
+  # Install Runtime Library Exception
+  install -d ${pkgdir}/usr/share/licenses/$pkgname/
+  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/$pkgname/
+}
+
+package_gcc6-go() {
+  pkgdesc="Go front-end for GCC"
+  depends=("gcc6=$pkgver-$pkgrel")
+  conflicts=('go')
+  options=('!emptydirs')
+
+  cd gcc-build/
+
+  make -C $CHOST/libgo DESTDIR=$pkgdir install-exec-am
+  rm ${pkgdir}/${_libdir}/libgo.so*
+  make -C gcc DESTDIR=$pkgdir go.install-common
+  install -Dm755 gcc/go1 $pkgdir/${_libdir}/go1
+
+  make DESTDIR=${pkgdir} install-gotools
+
+  # Install Runtime Library Exception
+  install -d ${pkgdir}/usr/share/licenses/$pkgname/
+  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/$pkgname/
+}
+
+package_gcc6-gcj() {
+  pkgdesc="Java front-end for GCC"
+  depends=("gcc6=$pkgver-$pkgrel")
+  replaces=('gcc-gcj')
+  options=('!emptydirs')
+
+  # Install libjava.
+  cd gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libjava
+
+  # Install java-common.
+  cd gcc
+  make -j1 DESTDIR=${pkgdir} java.install-common java.install-man
+
+  install -m755 jc1       ${pkgdir}/${_libdir}/
+  install -m755 jvgenmain ${pkgdir}/${_libdir}/
+
+  # Remove conflicting files.
+  rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/lib/libgcc_s.so*
+  rm -f ${pkgdir}/${_libdir}/libgcc_s.so*
+  rm ${pkgdir}/${_libdir}/libg{cj,ij}*.so*
+
+  # Rename two files to not conflict to classpath
+  mv ${pkgdir}/usr/share/info/cp-tools.info ${pkgdir}/usr/share/info/cp-tools-gcj.info
+
+  linkdir=`basename $pkgdir/usr/lib/gcj-${pkgver}*`
+  ln -sf $linkdir ${pkgdir}/usr/lib/gcj-${pkgver%.?}
+  ln -sf libgcj-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-${pkgver%.?}.jar
+  ln -sf libgcj-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj.jar
+  ln -sf libgcj-tools-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-tools-${pkgver%.?}.jar
+  ln -sf libgcj-tools-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-tools.jar
+
+  rm ${pkgdir}/${_libdir}/libgcc_eh.a
+  rm ${pkgdir}/${_libdir}/crtbegin.o
+  rm ${pkgdir}/${_libdir}/crtbeginS.o
+  rm ${pkgdir}/${_libdir}/crtbeginT.o
+  rm ${pkgdir}/${_libdir}/crtend.o
+  rm ${pkgdir}/${_libdir}/crtendS.o
+  rm ${pkgdir}/${_libdir}/crtfastmath.o
+  rm ${pkgdir}/${_libdir}/crtprec32.o
+  rm ${pkgdir}/${_libdir}/crtprec64.o
+  rm ${pkgdir}/${_libdir}/crtprec80.o
+  rm ${pkgdir}/${_libdir}/include/unwind.h
+  rm ${pkgdir}/${_libdir}/libgcc.a
+  rm ${pkgdir}/${_libdir}/libgcov.a
+}
--- a/src/hg-git-hg/PKGBUILD
+++ b/src/hg-git-hg/PKGBUILD
@ -0,0 +1,48 @@
+# -*- shell-script -*-
+# Arch Linux package build script
+#
+# Contributor: Vsevolod Balashov <vsevolod@balashov.name>
+# Contributor: Egor Kuropatkin <egor.k8n@gmail.com>
+# Contributor: Egor Laufer <egor.l4r@gmail.com>
+#
+name=hg-git
+pkgname=$name-hg
+pkgver=631.711baa274f78
+pkgrel=1
+pkgdesc="the Hg-Git mercurial plugin"
+arch=(any)
+url="http://hg-git.github.com/"
+license=('GPL2')
+depends=('mercurial' 'python2-dulwich')
+makedepends=('mercurial')
+provides=('hg-git')
+conflicts=('hg-git')
+source=('hg+https://bitbucket.org/durin42/hg-git'
+        'hggit.rc')
+md5sums=('SKIP'
+        '592a454e09f498074c57a5b7e383e808')
+
+pkgver() {
+    cd "$srcdir/$name"
+    hg identify -ni | awk 'BEGIN{OFS=".";} {print $2,$1}'
+}
+
+package() {
+    cd $srcdir/$name
+    python2 setup.py install --prefix=/usr --root=$pkgdir
+    install -m0644 -D "${srcdir}/hggit.rc" "${pkgdir}/etc/mercurial/hgrc.d/hggit.rc"
+}
+
+# Changelog
+################################################################################
+# * Sun Jul 19 2015 Egor Laufer <egor.l4r@gmail.com>
+# - Moved package to aur4
+#
+# * Fri Nov 29 2013 Egor Kuropatkin <egor.k8n@gmail.com>
+# - Replaced python-dulwich dependency with python2-dulwich
+#
+# * Thu Aug 08 2013 Egor Kuropatkin <egor.k8n@gmail.com>
+# - Add pkgver function.
+# - Add hggit.rc: this file will be placed to /etc/merucrial/hgrc.d/ to enable
+#   hggit extention by default.
+# - Remove .install file
--- a/src/hg-git-hg/hggit.rc
+++ b/src/hg-git-hg/hggit.rc
@ -0,0 +1,2 @@
+[extensions]
+hggit =
--- a/src/hivex/PKGBUILD
+++ b/src/hivex/PKGBUILD
@ -2,24 +2,25 @@
 # Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws>

 pkgname=hivex
-pkgver=1.3.14
-pkgrel=3
+pkgver=1.3.15
+pkgrel=2
 pkgdesc="System for extracting the contents of Windows Registry."
 arch=("i686" "x86_64")
 url="http://libguestfs.org"
 license=("LGPL2.1")
 depends=("libxml2" "perl")
-makedepends=("python2" "ruby" "perl-io-stringy" "perl-test-simple" "ocaml-findlib" "ocaml")
+makedepends=("python2" "ruby" "ruby-rake" "ruby-rdoc" "perl-io-stringy" "perl-test-simple" "ocaml-findlib" "ocaml")
 optdepends=("python2: for python bindings"
 	    "ruby: for ruby bindings"
 	    "ocaml: for ocaml bindings")
 options=("!emptydirs" "!libtool")
 source=("http://libguestfs.org/download/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('9fb5ed4525d30a84b216a05150be1558')
+md5sums=('7ba11dd842cf8dae9adeace6d3e58efc')

 build() {
    cd $pkgname-$pkgver
    unset PREFIX
+    unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
    ./configure \
 	--bindir=/usr/bin \
 	--libdir=/usr/lib \
--- a/src/intellij-idea-ultimate-edition/PKGBUILD
+++ b/src/intellij-idea-ultimate-edition/PKGBUILD
@ -1,9 +1,9 @@
 # Maintainer: Urs Wolfer <uwolfer @ fwo.ch>

 pkgbase=intellij-idea-ultimate-edition
-pkgname=(intellij-idea-ultimate-edition intellij-idea-ultimate-edition-jre)
-pkgver=2018.1.1
-_buildver=181.4445.78
+pkgname=intellij-idea-ultimate-edition
+pkgver=2018.1.4
+_buildver=181.5087.20
 pkgrel=1
 arch=('any')
 pkgdesc="An intelligent IDE for Java, Groovy and other programming languages with advanced refactoring features intensely focused on developer productivity."
@ -12,7 +12,7 @@ license=('Commercial')
 options=(!strip)
 source=("https://download.jetbrains.com/idea/ideaIU-$pkgver.tar.gz"
        "jetbrains-idea.desktop")
-sha256sums=('259ede8f233bdde5435ac2c800423428a4692e489fe4d764667c90a246ab0629'
+sha256sums=('fb16e1533902823e1a9c5eccd5193cc548c9ce9ba5687778446a3475266c4284'
            '83af2ba8f9f14275a6684e79d6d4bd9b48cd852c047dacfc81324588fa2ff92b')

 prepare() {
@ -20,7 +20,7 @@ prepare() {
  mv idea-IU-$_buildver/jre64 "$srcdir"/jre64
 }

-package_intellij-idea-ultimate-edition() {
+package() {
  backup=("opt/$pkgname/bin/idea.vmoptions" "opt/${pkgname}/bin/idea64.vmoptions" "opt/${pkgname}/bin/idea.properties")
  depends=('giflib' 'libxtst')
  optdepends=('intellij-idea-ultimate-edition-jre: JetBrains custom JRE (Recommended)' 'java-environment: Required if intellij-idea-ultimate-edition-jre is not installed')
@ -41,10 +41,4 @@ package_intellij-idea-ultimate-edition() {
  sed -i 's|lcd|on|'  "$pkgdir"/opt/$pkgname/bin/*.vmoptions
 }

-package_intellij-idea-ultimate-edition-jre() {
-  arch=('x86_64')
-  install -d -m 755 "$pkgdir"/opt/$pkgbase
-  mv "$srcdir"/jre64 "$pkgdir"/opt/$pkgbase
-}
-
 # vim:set ts=2 sw=2 et:
--- a/src/isl/PKGBUILD
+++ b/src/isl/PKGBUILD
@ -2,16 +2,16 @@
 # Contributor: Allan McRae <allan@archlinux.org>

 pkgname=isl
-pkgver=0.18
-pkgrel=3
+pkgver=0.19
+pkgrel=1
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
 arch=('i686' 'x86_64')
 url="http://isl.gforge.inria.fr/"
 depends=('gmp')
 license=('MIT')
-conflicts=('isl-git' 'isl15' 'isl14')
+conflicts=('isl-git' 'isl14' 'isl15' 'isl16' 'isl17')
 source=("http://isl.gforge.inria.fr/$pkgname-${pkgver}.tar.xz")
-sha256sums=('0f35051cc030b87c673ac1f187de40e386a1482a0cfdf2c552dd6031b307ddc4')
+sha256sums=('6d6c1aa00e2a6dfc509fa46d9a9dbe93af0c451e196a670577a148feecf6b8a5')

 build() {
  cd $pkgname-$pkgver
--- a/src/jdk-devel/PKGBUILD
+++ b/src/jdk-devel/PKGBUILD
@ -3,7 +3,7 @@
 _pkgname=jdk
 pkgname=jdk-devel
 _major=11
-_build=10
+_build=15
 _jname=${_pkgname}${_major}
 pkgver=${_major}b${_build}
 pkgrel=1
@ -24,21 +24,22 @@ backup=("etc/java-$_jname/management/jmxremote.access"
        "etc/java-$_jname/management/management.properties"
        "etc/java-$_jname/security/java.policy"
        "etc/java-$_jname/security/java.security"
-        "etc/java-$_jname/security/javaws.policy"
        "etc/java-$_jname/logging.properties"
        "etc/java-$_jname/net.properties"
        "etc/java-$_jname/sound.properties")
 options=('!strip') # JDK debug-symbols
 install=$pkgname.install
 source=("https://download.java.net/java/early_access/jdk${_major}/${_build}/BCL/${_pkgname}-${_major}-ea+${_build}_linux-x64_bin.tar.gz"
-        "jconsole.desktop"
-        "jmc.desktop"
-        "policytool.desktop"
+        'java.desktop'
+        'jconsole.desktop'
+        'java_16.png'
+        'java_48.png'
        'LICENSE-Early-Adopter-Development-Agreement.txt')
-sha256sums=('7d0268f2493fdc9607b665c0cb9bede7ff207d173908965dc7429ef32b90a18f'
-            '7fd81eced792aa76dac697b3daaa5d2699b15e8c6768ed4690a331e9f616b034'
-            'bef07cdacef3e25137ac6ec394f09bb683c3ceb30b894f4b0c5ea40b0f87e4d5'
-            '79fdffd1c3d6c0826a95d21e59392213c3a2e32709909629cfb4d222d349f2e1'
+sha256sums=('a41408895d2916cfb89a831ad2d8cb9440345a90ab1fa3a5e5310d9f17fb04e2'
+            'ed7392cbad258da943d39e9a5fab1ee6ab6a287ac0c20172805d5dbfc5accedb'
+            'e8544f5384d541c16973543ace0f812e2dea657eed551a70baebb1a0cd9f3771'
+            'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed'
+            '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176'
            '36d48f14c16f0dcc98a8ce2301fd2a111701e6f59a7da08b0e51fdb3e2f9ca89')

 package() {
@ -51,11 +52,8 @@ package() {
  install -d "$pkgdir"/usr/share/licenses/java$_major-$_pkgname

  msg2 "Removing redundancies..."
-  rm -rf lib/desktop/icons/HighContrast
-  rm -rf lib/desktop/icons/HighContrastInverse
-  rm -rf lib/desktop/icons/LowContrast
-  rm  -f lib/fontconfig.*.bfc
-  rm  -f lib/fontconfig.*.properties.src
+  rm  lib/fontconfig.*.bfc
+  rm  lib/fontconfig.*.properties.src

  msg2 "Moving contents..."
  mv * "$pkgdir"/$_jvmdir
@ -67,32 +65,19 @@ package() {
  # Create a placeholder 'jre' link
  ln -s . jre

-  # Fix bundled .desktops
-  sed -e '/JavaWS/!s|Name=Java|Name=Java '"$_major"'|' \
-      -e "s|Name=JavaWS|Name=JavaWS $_major|" \
-      -e "s|Comment=Java|Comment=Java $_major|" \
-      -e "s|Exec=|Exec=$_jvmdir/bin/|" \
-      -e "s|.png|-$_jname.png|" \
-      -i lib/desktop/applications/*
+  # Move + suffix .desktops
+  for i in $(printf -- '%s\n' "${source[@]}" | grep desktop | cut -d "." -f1); do
+    install -Dm644 "$srcdir"/$i.desktop "$pkgdir"/usr/share/applications/$i-$_jname.desktop
+  done

-  # Move .desktops + icons to /usr/share
-  mv lib/desktop/* "$pkgdir"/usr/share/
-  install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
-
-  # Suffix .desktops + icon (sun-jcontrol.png -> sun-jcontrol-$_jname.png)
-  for i in $(find "$pkgdir"/usr/share/ -type f); do
-    rename -- "." "-$_jname." $i
+  # Move + suffix icons
+  for i in 16 48; do
+    install -Dm644 "$srcdir"/java_$i.png "$pkgdir"/usr/share/icons/hicolor/${i}x$i/apps/java-$_jname.png
  done

  # Write versions to .desktops + .install
  sed -i "s/<version>/$_major/" "$pkgdir"/usr/share/applications/* "$startdir"/$pkgname.install

-  # Link missing icons
-  for i in $(find "$pkgdir"/usr/share/icons/ -name "sun-jcontrol-$_jname.png" -type f); do
-    ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/java}"
-    ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/javaws}"
-  done
-
  # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/conf -> /etc
  for sub_path in $(find conf/ -type f); do
    # New location
--- a/src/jdk-devel/java.desktop
+++ b/src/jdk-devel/java.desktop
@ -0,0 +1,25 @@
+#
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Use is subject to license terms.
+#
+# Desktop entry for automatic execution of files identified as either the
+# x-jar or x-java-archive (historical) mime type.
+#
+# Note: This file may be installed under both "control-center-2.0" and
+# "applications".  Depending upon the version of GNOME, the copy in
+# "applications" may take precedence.
+#
+# One might be tempted to add "Java" to the Catergories, but the definition
+# is "uses Swing/ATW" whhich may not be true.
+#
+[Desktop Entry]
+Encoding=UTF-8
+Name=Java <version>
+Comment=Java <version> Virtual Machine
+Exec=/usr/lib/jvm/java-<version>-jdk/bin/java -jar
+Icon=java-jdk<version>
+Terminal=false
+Type=Application
+NoDisplay=true
+Categories=Applications;
+MimeType=application/x-java-archive;application/x-jar;
--- a/src/jdk-devel/java_16.png
+++ b/src/jdk-devel/java_16.png
--- a/src/jdk-devel/java_48.png
+++ b/src/jdk-devel/java_48.png
--- a/src/jdk-devel/jconsole.desktop
+++ b/src/jdk-devel/jconsole.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-<version>-jdk/bin/jconsole
-Icon=sun-java-jdk<version>
 Name=Java <version> Monitoring and Management Console
+Exec=/usr/lib/jvm/java-<version>-jdk/bin/jconsole
+Icon=java-jdk<version>
 StartupNotify=true
 Terminal=false
 Type=Application
--- a/src/jdk-devel/jmc.desktop
+++ b/src/jdk-devel/jmc.desktop
@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-<version>-jdk/bin/jmc
-Icon=sun-java-jdk<version>
-Name=Java <version> Mission Control
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
--- a/src/jdk-devel/policytool.desktop
+++ b/src/jdk-devel/policytool.desktop
@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-<version>-jdk/bin/policytool
-Icon=sun-java-jdk<version>
-Name=Java <version> Policy Settings
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
--- a/src/jdk/jdk.install
+++ b/src/jdk/jdk.install
@ -1,4 +1,4 @@
-VERSION='10'
+VERSION='<version>'
 THIS_JAVA='java-${VERSION}-jdk'
 NAME='JDK'

--- a/src/jdk8/PKGBUILD
+++ b/src/jdk8/PKGBUILD
@ -3,9 +3,9 @@
 _pkgname=jdk
 pkgname=jdk8
 _major=8
-_minor=162
-_build=b12
-_hash=0da788060d494f5095bf8624735fa2f1
+_minor=172
+_build=b11
+_hash=a58eab1ec242421181065cdc37240b08
 pkgver=${_major}u${_minor}
 pkgrel=1
 pkgdesc="Oracle Java $_major Development Kit"
@ -48,7 +48,7 @@ source=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$_pk
        "jmc-$_jname.desktop"
        "jvisualvm-$_jname.desktop"
        "policytool-$_jname.desktop")
-md5sums=('781e3779f0c134fb548bde8b8e715e90'
+md5sums=('eda2945e8c02b84adbf78f46c37b71c1'
         'b3c7031bc65c28c2340302065e7d00d3'
         '8a66f50efdc867ffd6a27168bc93b210'
         '1cbde70639abd98db4bace284dbf2bc4'
--- a/src/jitsi/PKGBUILD
+++ b/src/jitsi/PKGBUILD
@ -3,7 +3,7 @@

 pkgname=jitsi
 pkgver=2.10.5550
-pkgrel=4
+pkgrel=5
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
 arch=('i686' 'x86_64')
 url="http://jitsi.org"
@ -15,7 +15,7 @@ source=("https://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
 		jitsi.desktop
 		jitsi.sh)
 sha256sums=('cdfc6f038d1b877c42d26dba1864ac7c6b554dd55c18767a29f2db3618647287'
-            '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
+            '40a411ec494280490a0e1a137735ef5efca434d8d10f18b0124df9e93302f959'
            'c47bfa98fe36378f2e7b947cd248582f5a90c1b169d53d158badb00439fdc6c7')

 build()
--- a/src/jitsi/jitsi.desktop
+++ b/src/jitsi/jitsi.desktop
@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Jitsi
 GenericName=jitsi
 Comment=VoIP and Instant Messaging client
-Icon=/usr/share/pixmaps/jitsi.svg
+Icon=jitsi
 Type=Application
 Categories=Network
 Exec=/usr/bin/jitsi
--- a/src/lgogdownloader/PKGBUILD
+++ b/src/lgogdownloader/PKGBUILD
@ -2,7 +2,7 @@

 pkgname=lgogdownloader
 pkgver=3.3
-pkgrel=1
+pkgrel=4
 pkgdesc="An open source downloader for GOG.com games, uses the GOG.com API"
 url="https://sites.google.com/site/gogdownloader/"
 arch=(i686 x86_64)
--- a/src/lib32-ncurses5-compat-libs/PKGBUILD
+++ b/src/lib32-ncurses5-compat-libs/PKGBUILD
@ -0,0 +1,52 @@
+# Maintainer: Kevin Brodsky <corax26 at gmail dot com>
+
+_pkgbasename=ncurses
+pkgname=lib32-${_pkgbasename}5-compat-libs
+pkgver=6.1
+pkgrel=1
+pkgdesc="System V Release 4.0 curses emulation library (32-bit), ABI 5"
+arch=('x86_64')
+url="http://www.gnu.org/software/ncurses/"
+license=('MIT')
+depends=('lib32-glibc' "lib32-${_pkgbasename}")
+makedepends=("gcc-multilib")
+source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$pkgver.tar.gz{,.sig})
+md5sums=('98c889aaf8d23910d2b92d65be2e737a'
+         'SKIP')
+validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # Thomas Dickey
+
+build() {
+  cd ${_pkgbasename}-${pkgver}
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+     --with-shared --with-normal --without-debug --without-ada \
+     --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32 \
+     --with-abi-version=5 --without-pkg-config --without-gpm
+   make
+}
+
+package() {
+  cd ${_pkgbasename}-${pkgver}
+  make install.libs
+
+  install -dm755 ${pkgdir}/usr/lib32
+
+  # fool packages looking to link to non-wide-character ncurses libraries
+  for lib in ncurses form panel menu; do
+    ln -s lib${lib}w.so.5 "$pkgdir"/usr/lib32/lib${lib}.so.5
+  done
+  # Also provide a libtinfo symlink
+  ln -s libncurses.so.5 "$pkgdir/usr/lib32/libtinfo.so.5"
+
+  # Remove .so symlinks and static libraries (conflicting with lib32-ncurses)
+  rm -f "${pkgdir}"/usr/{lib32/*.so,lib32/*.a}
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim: set et ts=2 sw=2:
--- a/src/libgcj17-bin/PKGBUILD
+++ b/src/libgcj17-bin/PKGBUILD
@ -4,7 +4,7 @@
 # Contributor: Roberto Calabrese <robertocalabrese75 [at] gmail.com>

 pkgname=libgcj17-bin
-pkgver=6.4.0_10
+pkgver=6.4.0_13
 pkgrel=1
 pkgdesc="Dynamically load and interpret java class files. Built from binary \
 executables available in Debian repositories."
@ -16,8 +16,8 @@ depends=(zlib)

 source_i686=(http://ftp.debian.org/debian/pool/main/g/gcc-6/${pkgname%-*}_${pkgver%_*}-${pkgver##*_}_i386.deb)
 source_x86_64=(http://ftp.debian.org/debian/pool/main/g/gcc-6/${pkgname%-*}_${pkgver%_*}-${pkgver##*_}_amd64.deb)
-sha1sums_i686=('214d53fc289dcaf55c8833f741a7f0838bbf3879')
-sha1sums_x86_64=('926132e3811d98cb5b47e601f6ddb2a91e20becf')
+sha1sums_i686=('949796af87b86f808b20818fde45b8a735fcad5a')
+sha1sums_x86_64=('2841f49b2f785d38367973b71ccd1907e1dc6c88')

 prepare() {
  tar xf data.tar.*
--- a/src/libguestfs/PKGBUILD
+++ b/src/libguestfs/PKGBUILD
@ -5,7 +5,7 @@
 # Maintainer: Nikos Skalkotos <skalkoto (at) Gmail.com>

 pkgname=libguestfs
-pkgver=1.36.11
+pkgver=1.38.2
 pkgver_short=${pkgver%.*}
 pkgrel=1
 pkgdesc="Access and modify virtual machine disk image"
@ -63,8 +63,8 @@ provides=("guestfish=${pkgver}")
 options=()
 source=("http://libguestfs.org/download/${pkgver_short}-stable/${pkgname}-${pkgver}.tar.gz"
        "update-libguestfs-appliance")
-sha512sums=('81217bc2be1755f108af815238f144ab72ecb5cc6a815bc50246463508bed739848b9b67c6cf8b1d68c3cfa0aca66857e9006c11e3a8fe20fc1ddcb22c562571'
-            'b16a8a15d39392ab2d5c51ac4cbbcd0fd1e6e8e064bf5b866e7c9f93a639fb8e96fc4328b05963ac24c3333e454b63a6a700e6e6fb1584c9d671f289ee1bcade')
+sha512sums=('1e9ed5d07baa25cab4ccc0c12c9f4c90ef35ff760814d672975952d098cd84b3e81c70cfe65a9c6c34de84725f29861bfe08ed72c9f9eb03f19313bdaacf2d05'
+            '436f85c20e5c596738fcadd08089ddf5923e3b51ab05fe0a80d0fea7f0f5a7b797aece70f05e7d0f68387632a4b816d688890e0e06af4c834ae000f0d4ad5aff')

 check() {
    # test-lock fails, perhaps related to:
@ -111,3 +111,4 @@ package() {
  mkdir -p "$pkgdir/usr/lib/guestfs" "$pkgdir/var/cache/guestfs"
  install -Dm755 "${srcdir}/update-libguestfs-appliance" "${pkgdir}/usr/bin/update-libguestfs-appliance"
 }
+
--- a/src/libguestfs/update-libguestfs-appliance
+++ b/src/libguestfs/update-libguestfs-appliance
@ -17,8 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-VERSION=1.36.1
-SHA512SUM="2af550078a0e6b37e97988018f579df0e19072d06cbb53eccd85c2873850b472cabf34bbfb4e0ef5f43b5a1af4155f014eeefb85a1b05035d7916c7b1187d722"
+VERSION=1.38.0
+SHA512SUM="a423fd54627ffb9c2ae05b26ad60b9089f8119a99d30612a33921a2662ba42332ad0a7a7ad6c33b7042fc02a5c4dc9b563158650c6cb4a3eaaae6b764f7d7082"

 set -e
 umask 022
--- a/src/libjson-rpc-cpp-git/PKGBUILD
+++ b/src/libjson-rpc-cpp-git/PKGBUILD
@ -0,0 +1,49 @@
+# Maintainer: Andy Weidenbaum <archbaum@gmail.com>
+# Contributor: Peter Spiess-Knafl <psk@autistici.org>
+# Contributor: Daniel Bomar <dbdaniel42@gmail.com>
+
+pkgname=libjson-rpc-cpp-git
+pkgver=1.0.0.r0.ge960bf5
+pkgrel=1
+pkgdesc="C++ framework for json-rpc 1.0 and 2.0"
+arch=('i686' 'x86_64')
+depends=('argtable' 'curl' 'jsoncpp' 'libmicrohttpd' 'hiredis')
+makedepends=('cmake' 'git')
+url="https://github.com/cinemast/libjson-rpc-cpp"
+license=('MIT')
+source=(git+https://github.com/cinemast/libjson-rpc-cpp)
+sha256sums=('SKIP')
+provides=('libjson-rpc-cpp')
+conflicts=('libjson-rpc-cpp')
+install=libjson-rpc-cpp.install
+
+pkgver() {
+  cd ${pkgname%-git}
+  ( set -o pipefail
+    git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
+}
+prepare() {
+ cd "${srcdir}"/${pkgname%-git}
+}
+
+build() {
+  msg2 "Creating build directories"
+  mkdir -p ${pkgname%-git}/build
+  cd ${pkgname%-git}/build
+  msg2 "Invoking cmake"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCOMPILE_TESTS=FALSE -DCOMPILE_EXAMPLES=FALSE ..
+  msg2 "Building the framework"
+  make
+}
+
+package() {
+  cd ${pkgname%-git}/build
+  msg2 "Packing all together"
+  make DESTDIR="${pkgdir}" install
+  msg2 "Add MIT License to package"
+  install -D -m644 "${srcdir}/${pkgname%-git}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  msg 'Cleaning up pkgdir...'
+  find "$pkgdir" -type d -name .git -exec rm -r '{}' +
+}
--- a/src/libjson-rpc-cpp-git/libjson-rpc-cpp.install
+++ b/src/libjson-rpc-cpp-git/libjson-rpc-cpp.install
@ -0,0 +1,11 @@
+post_install () {
+  ldconfig
+}
+
+post_upgrade () {
+  ldconfig
+}
+
+post_remove () {
+  ldconfig
+}
--- a/src/libpcl/PKGBUILD
+++ b/src/libpcl/PKGBUILD
@ -0,0 +1,23 @@
+# Maintainer: Brian Bidlock <bidulock@openss7.org>
+
+pkgname=libpcl
+pkgver=1.12
+pkgrel=4
+pkgdesc='The Portable Coroutine Library (PCL) implements the low level functionality for coroutines'
+license=(GPL2)
+url='http://xmailserver.org/libpcl.html'
+arch=('x86_64' 'i686')
+depends=(glibc)
+source=(http://xmailserver.org/pcl-$pkgver.tar.gz)
+sha1sums=('a206c8fb5a96e65005f414ac46aeccd4b3603c8d')
+
+build() {
+  cd pcl-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd pcl-$pkgver
+  make DESTDIR="$pkgdir" install
+}
--- a/src/libretro-atari800-git/PKGBUILD
+++ b/src/libretro-atari800-git/PKGBUILD
@ -1,41 +0,0 @@
-# Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
-
-pkgname=libretro-atari800-git
-pkgver=66.f892b44
-pkgrel=1
-pkgdesc="libretro implementation of Atari800 v3.1.0 (Atari 5200/400/800/XL/XE) (WIP)"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/libretro/libretro-atari800"
-license=('GPL2')
-groups=('libretro')
-depends=('zlib')
-makedepends=('git')
-
-_libname=atari800_libretro
-_gitname=libretro-atari800
-source=("git+https://github.com/libretro/${_gitname}.git"
-	"${_libname}.info"
-	"cfg.patch"
-	"joycfg.patch")
-sha256sums=('SKIP'
-	'2ff0e3a58e19b9532d92d1d93e55890a2de42475c144d8d4e58480a986c18ede'
-	'41e0c608d07cdc3228d37a7a29fd40b6629e964c13d14ba413fa84e956ef3777'
-	'd30794556b622c757dbafb5ce988547967004bd2d779c74e28802f9dd78a167f')
-
-pkgver() {
-  cd "${_gitname}"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-  cd ${_gitname}
-  # rename config file to not interfere with original atari800
-  patch -p0 < "../cfg.patch"
-  patch -p0 < "../joycfg.patch"
-  make -f Makefile
-}
-
-package() {
-  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
-}
--- a/src/libretro-atari800-git/atari800_libretro.info
+++ b/src/libretro-atari800-git/atari800_libretro.info
@ -1,22 +0,0 @@
-display_name = "Atari 5200/400/800/XL/XE (Atari800)"
-authors = "Petr Stehlik"
-supported_extensions = "xfd|atr|atx|cdm|cas|bin|a52|xex|zip"
-corename = "Atari800"
-manufacturer = "Atari"
-categories = "Emulator"
-systemname = "Atari 5200/400/800/XL/XE"
-license = "GPL"
-permissions = ""
-display_version = "3.1.0"
-supports_no_game = "false"
-firmware_count = 3
-firmware0_desc = "ATARIOSB.ROM (Atari OS-B BIOS)"
-firmware0_path = "ATARIOSB.ROM"
-firmware0_opt = "false"
-firmware1_desc = "ATARIXL.ROM (Atari-XL BIOS)"
-firmware1_path = "ATARIXL.ROM"
-firmware1_opt = "false"
-firmware2_desc = "5200.rom (5200 BIOS)"
-firmware2_path = "5200.rom"
-firmware2_opt = "false"
-notes = "(!) 5200.rom (md5): 281f20ea4320404ec820fb7ec0693b38"
--- a/src/libretro-atari800-git/cfg.patch
+++ b/src/libretro-atari800-git/cfg.patch
@ -1,17 +0,0 @@
-diff -uNr atari800.orig/src/cfg.c atari800/src/cfg.c
--- atari800.orig/src/cfg.c	2016-02-23 14:28:55.247008447 +0100
-+++ atari800/src/cfg.c	2016-02-23 14:29:07.360269454 +0100
-@@ -68,11 +68,11 @@
- /* If another default path config path is defined use it
-    otherwise use the default one */
- #ifndef DEFAULT_CFG_NAME
-#define DEFAULT_CFG_NAME ".atari800.cfg"
-+#define DEFAULT_CFG_NAME ".atari800.cfg.libretro"
- #endif
- 
- #ifndef SYSTEM_WIDE_CFG_FILE
-#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg"
-+#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg.libretro"
- #endif
- 
- static char rtconfig_filename[FILENAME_MAX];
--- a/src/libretro-atari800-git/joycfg.patch
+++ b/src/libretro-atari800-git/joycfg.patch
@ -1,37 +0,0 @@
-diff -uNr atari800.orig/src/joycfg.c atari800/src/joycfg.c
--- atari800.orig/src/joycfg.c	2016-02-23 14:17:28.000000000 +0100
-+++ atari800/src/joycfg.c	2016-02-23 14:24:09.282074155 +0100
-@@ -434,7 +434,7 @@
-   int i,no;
-   int bad=0;
- 
-  if ((fr=fopen("atari800.cfg","r"))==NULL)
-+  if ((fr=fopen("atari800.cfg.libretro","r"))==NULL)
-   {
-     printf("Error opening configuration file.\n"
-            "Execute this utility from atari800 dir after configuring it!\n");
-@@ -494,9 +494,9 @@
-   char string[256];
-   int i;
- 
-  if ((fr=fopen("atari800.cfg","r"))==NULL)
-+  if ((fr=fopen("atari800.cfg.libretro","r"))==NULL)
-   {
-    printf("Error opening atari800.cfg!\n");
-+    printf("Error opening atari800.cfg.libretro!\n");
-     return;
-   }
-   if ((fw=fopen("atari800.tmp","w"))==NULL)
-@@ -521,10 +521,10 @@
-   for (i=0;i<4;i++)
-     fprintf(fw,"JOYSTICK_%i=%s\n",i,joyparams[joytypes[i]]);
-   fclose(fw);
-  if (rename("atari800.tmp","atari800.cfg")==0)
-+  if (rename("atari800.tmp","atari800.cfg.libretro")==0)
-     printf("Configuration successfully saved.\n");
-   else
-    printf("Error when renaming atari800.tmp to atari800.cfg!\n");
-+    printf("Error when renaming atari800.tmp to atari800.cfg.libretro!\n");
- }
- /*------------------------------------------------------------------------*/
- int main()
--- a/src/libretro-handy-git/PKGBUILD
+++ b/src/libretro-handy-git/PKGBUILD
@ -1,34 +0,0 @@
-# Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
-
-pkgname=libretro-handy-git
-pkgver=107.a4de67f
-pkgrel=1
-pkgdesc="libretro implementation of Handy. (Atari Lynx)"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/libretro/libretro-handy"
-license=('GPL3')
-groups=('libretro')
-depends=('zlib')
-makedepends=('git')
-
-_libname=handy_libretro
-_gitname=libretro-handy
-source=("git+https://github.com/libretro/${_gitname}.git"
-	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
-sha256sums=('SKIP'
-	'SKIP')
-
-pkgver() {
-  cd "${_gitname}"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-  cd "${_gitname}"
-  make
-}
-
-package() {
-  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
-}
--- a/src/libretro-hatari-git/PKGBUILD
+++ b/src/libretro-hatari-git/PKGBUILD
@ -1,34 +0,0 @@
-# Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
-
-pkgname=libretro-hatari-git
-pkgver=5436.c19b7105
-pkgrel=1
-pkgdesc="libretro implementation of Hatari v1.8 (Atari ST/STE/TT/Falcon)"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/libretro/hatari"
-license=('GPL2')
-groups=('libretro')
-depends=('zlib')
-makedepends=('git')
-
-_libname=hatari_libretro
-_gitname=hatari
-source=("git+https://github.com/libretro/${_gitname}.git"
-	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
-sha256sums=('SKIP'
-	'SKIP')
-
-pkgver() {
-  cd "${_gitname}"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-  cd ${_gitname}
-  make -f Makefile.libretro
-}
-
-package() {
-  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
-}
--- a/src/libretro-prosystem-git/PKGBUILD
+++ b/src/libretro-prosystem-git/PKGBUILD
@ -1,34 +0,0 @@
-# Maintainer: Oliver Jaksch <arch-aur@com-in.de>
-
-pkgname=libretro-prosystem-git
-pkgver=150.bdc2a82
-pkgrel=1
-pkgdesc="libretro implementation of ProSystem. (Atari 7800)"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/libretro/prosystem-libretro"
-license=('GPL2')
-groups=('libretro')
-depends=('zlib')
-makedepends=('git')
-
-_libname=prosystem_libretro
-_gitname=prosystem-libretro
-source=("git+https://github.com/libretro/${_gitname}.git"
-	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
-sha256sums=('SKIP'
-	'SKIP')
-
-pkgver() {
-  cd "${_gitname}"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-  cd "${_gitname}"
-  make
-}
-
-package() {
-  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
-}
--- a/src/libretro-snes9x2010-git/PKGBUILD
+++ b/src/libretro-snes9x2010-git/PKGBUILD
@ -1,35 +0,0 @@
-# Maintainer : Johnathan Jenkins <twodopeshaggy@gmail.com>
-# Contributor:  prettyvanilla <prettyvanilla@posteo.at>
-# Contributor: almostalive   <almostalive2003 at gmail dot com>
-
-pkgname=libretro-snes9x2010-git
-pkgver=882.cdc2a1f
-pkgrel=1
-pkgdesc="libretro implementation of Snes9x Next. (Super Nintendo Entertainment System)"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/libretro/snes9x2010"
-license=('custom')
-makedepends=('git')
-
-_libname=snes9x2010_libretro
-_gitname=snes9x2010
-source=("git+https://github.com/libretro/${_gitname}.git"
-        "https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
-md5sums=('SKIP'
-         'SKIP')
-
-pkgver() {
-  cd "${_gitname}"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-  cd "${_gitname}"
-  make -f Makefile.libretro
-}
-
-package() {
-  install -Dm644 "${_gitname}/docs/snes9x-license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
-  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
-}
--- a/src/libretro-stella-git/PKGBUILD
+++ b/src/libretro-stella-git/PKGBUILD
@ -1,33 +0,0 @@
-# Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
-
-pkgname=libretro-stella-git
-pkgver=193.dfe86f9
-pkgrel=1
-pkgdesc="libretro implementation of Stella. (Atari 2600)"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/libretro/stella-libretro"
-license=('GPL2')
-groups=('libretro')
-makedepends=('git')
-
-_libname=stella_libretro
-_gitname=stella-libretro
-source=("git+https://github.com/libretro/${_gitname}.git"
-	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
-sha256sums=('SKIP'
-	'SKIP')
-
-pkgver() {
-  cd "${_gitname}"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-  cd "${_gitname}"
-  make
-}
-
-package() {
-  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
-}
--- a/src/libretro-vba-next-git/PKGBUILD
+++ b/src/libretro-vba-next-git/PKGBUILD
@ -1,35 +0,0 @@
-# Maintainer : Johnathan Jenkins <twodopeshaggy@gmail.com>
-# Contributor:  prettyvanilla <prettyvanilla@posteo.at>
-# Contributor: almostalive   <almostalive2003 at gmail dot com>
-
-pkgname=libretro-vba-next-git
-pkgver=710.87989b4
-pkgrel=1
-pkgdesc="libretro implementation of VBA Next. (Game Boy Advance)"
-groups=('libretro')
-arch=('i686' 'x86_64' 'arm' 'armv6h')
-url="https://github.com/libretro/vba-next"
-license=('GPL')
-makedepends=('git')
-
-_libname=vba_next_libretro
-_gitname=vba-next
-source=("git+https://github.com/libretro/${_gitname}.git"
-        "https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
-md5sums=('SKIP'
-         'SKIP')
-
-pkgver() {
-  cd "${_gitname}"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-  cd "${_gitname}"
-  make -f Makefile.libretro
-}
-
-package() {
-  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
-}
--- a/src/libretro-virtualjaguar-git/PKGBUILD
+++ b/src/libretro-virtualjaguar-git/PKGBUILD
@ -1,33 +0,0 @@
-# Maintainer: Oliver Jaksch <arch-aur@com-in.de>
-
-pkgname=libretro-virtualjaguar-git
-pkgver=211.d5ddbe0
-pkgrel=1
-pkgdesc="libretro implementation of Virtual Jaguar. (Atari Jaguar)"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/libretro/virtualjaguar-libretro"
-license=('GPL3')
-groups=('libretro')
-makedepends=('git')
-
-_libname=virtualjaguar_libretro
-_gitname=virtualjaguar-libretro
-source=("git+https://github.com/libretro/${_gitname}.git"
-	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
-sha256sums=('SKIP'
-	'SKIP')
-
-pkgver() {
-  cd "${_gitname}"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-  cd "${_gitname}"
-  make
-}
-
-package() {
-  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
-}
--- a/src/lostfiles/PKGBUILD
+++ b/src/lostfiles/PKGBUILD
@ -1,16 +1,21 @@
-# Contributor: graysky <graysky AT archlinux dot us>
+# Maintainer: graysky <graysky AT archlinux dot us>

 pkgname=lostfiles
-pkgver=3.26
+pkgver=4.02
 pkgrel=1
 pkgdesc='Find orphaned files not owned by any Arch packages'
 arch=('any')
 license=('GPL2')
 url="https://github.com/graysky2/lostfiles"
-source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('42c5408b1bbc32eafebf16b0f843c775b39356b6edecdff5437d3e58c1c614ed')
+source=("$pkgname-$pkgver.tar.xz::https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('f83670cb680935050edcd72f42bf8bc4c9be607ff025ae8960fef997329cedfe')
+
+build() {
+  cd "$pkgname-$pkgver"
+  make 
+}

 package() {
-	cd "$pkgname-$pkgver"
-	install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname"
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
--- a/src/luaunbound/PKGBUILD
+++ b/src/luaunbound/PKGBUILD
@ -1,8 +1,8 @@
 # Maintainer: fordprefect <fordprefect@dukun.de>
 # Contributor: jhass <me@jhass.eu>
 pkgname=luaunbound
-pkgver=2017.03.24
-_version=6ba23bf18032
+pkgver=2017.11.15
+_version=5bd8a2f84124
 pkgrel=3
 pkgdesc="drop-in replacement for Prosodys internal DNS library with a binding to libunbound"
 url="https://www.zash.se/luaunbound.html"
--- a/src/memtest86-efi/PKGBUILD
+++ b/src/memtest86-efi/PKGBUILD
@ -2,44 +2,47 @@

 _pkgbasename=memtest86
 pkgname=$_pkgbasename-efi
-pkgver=7.4
-pkgrel=3
+pkgver=7.5.1001
+pkgrel=1
 pkgdesc="A free, thorough, stand alone memory test as an EFI application"
 arch=('i686' 'x86_64')
 url="http://www.memtest86.com"
 license=('GPL2' 'custom:PassMark')
-makedepends=('libarchive')
+makedepends=('p7zip')
 optdepends=('efibootmgr: to add a new EFI boot entry'
 	'grub: to add MemTest86 entry in GRUB2 menu')
 backup=(etc/$pkgname/$pkgname.conf)
 install=$pkgname.install
-source=("$_pkgbasename-$pkgver.iso.tar.gz::http://www.memtest86.com/downloads/$_pkgbasename-iso.tar.gz"
+source=("https://www.passmark.com/ftp/$_pkgbasename-usb-$pkgver.tar.gz"
 	"memtest86-efi"
 	"memtest86-efi.conf"
 	"grub.conf"
 	"systemd-boot.conf"
 	"memtest86-efi-update.hook"
 	"memtest86-efi-remove.hook")
-md5sums=('1719171a1d84d6b183112568cbdf8d61'
-         '9d970ce33ec9633fc823916faf614b61'
-         '6c096df3f55baf3e27c3bd605a418aa2'
-         '8b4aa0e2f5d769d902459c8f8d514336'
-         '496120c33c2af986933bf33456fa6cf3'
-         'f73ea56bd54ad1b51337046d4ef61a94'
-         '6027c3cc551663a604520a82cdc78b08')
+sha512sums=('10232a1c3a589407e06257f7fff14a28b524d3998bc712317d25081e3e67f87549bf36cb9e79f50ee9676e32b050d38bbfa74d2f536899d358bcd05edea3b97a'
+            '001151346736fc901dac0f5f2b07557b049f2e2cf2a7de0aae7019e7fde126e4e6cf291328dea920d5af45b21b08366b6465b8a8aa453f7af0fd760ced3952aa'
+            '947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8'
+            'df883042a5bad262e74b69e2ca0cd8c9c21a4e4eb5132aed0041a07050b5ab7f280e94681ffe106e6de547d00b621fd2a019cf5b669e00876a32e637687395f8'
+            '1ece1ca18d53a19eff8341cce0c6099ac6b8d27ebad176c9a85714a7cac24cef7dfa2b462d8a0160dc8eb71f21aca1ee2469ebdf095083dcd77fa0b0f90f1812'
+            '6952376b601b84da5fba14a7a5316d37b6083bae20f68f5b90b22d2728a19bf6d1fb367cf1adecfb82bf03e339b7dbf91f6d23f0d59731f89cf45240f16d5614'
+            '1fe55a642e36005f5b7b58e5fb245e8029bb1a19b5f30d8ddba6bbf5a4b96c1bba35be0dfacee478034b8367fdde62d34a934dcd787f4c6702889615bac9f78a')

 prepare() {
 	msg2 "Extract ISO..."
-	bsdtar -xf "Memtest86-$pkgver.iso"
+	7z x -y "$srcdir/memtest86-usb.img" > /dev/null
+	7z x -y "$srcdir/EFI System Partition.img" -oc:"$srcdir/$pkgname-$pkgver" > /dev/null 
 }

 package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
 	msg2 "Move MemTest86 stuff in share directory..."
-	[[ "$CARCH" == "i686" ]]   && install -Dvm755  "$srcdir/EFI/BOOT/BOOTIA32.EFI" "$pkgdir/usr/share/$pkgname/bootia32.efi"
-	[[ "$CARCH" == "x86_64" ]] && install -Dvm755  "$srcdir/EFI/BOOT/BOOTX64.EFI"  "$pkgdir/usr/share/$pkgname/bootx64.efi"
-	install -Dvm644 "$srcdir/EFI/BOOT/MT86.PNG"    "$pkgdir/usr/share/$pkgname/mt86.png"
-	install -Dvm644 "$srcdir/EFI/BOOT/UNIFONT.BIN" "$pkgdir/usr/share/$pkgname/unifont.bin"
-	install -Dvm644 "$srcdir/LICENSE.RTF"          "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rtf"
+	[[ "$CARCH" == "i686" ]]   && install -Dvm755  "EFI/BOOT/BOOTIA32.efi" "$pkgdir/usr/share/$pkgname/bootia32.efi"
+	[[ "$CARCH" == "x86_64" ]] && install -Dvm755  "EFI/BOOT/BOOTX64.efi"  "$pkgdir/usr/share/$pkgname/bootx64.efi"
+	install -Dvm644 "EFI/BOOT/mt86.png"    "$pkgdir/usr/share/$pkgname/mt86.png"
+	install -Dvm644 "EFI/BOOT/unifont.bin" "$pkgdir/usr/share/$pkgname/unifont.bin"
+	install -Dvm644 "license.rtf"          "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rtf"

 	msg2 "Install AUR provided script..."
 	install -Dvm755 "$srcdir/memtest86-efi"        "$pkgdir/usr/bin/memtest86-efi"
--- a/src/mingw-w64-binutils/0200-remove-provide-qualifiers.patch
+++ b/src/mingw-w64-binutils/0200-remove-provide-qualifiers.patch
@ -0,0 +1,146 @@
+From a985e9b9deabd81e16754584f4397a638e9d3f36 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Mon, 5 Feb 2018 09:12:42 +0000
+Subject: [PATCH] Import patch from mainline to remove PROVODE qualifiers
+ around definitions of __CTOR_LIST__ and __DTOR_LIST__ in PE linker scripts.
+
+	PR 22762
+	* scripttempl/pe.sc: Remove PROVIDE()s from __CTOR_LIST__ and
+	__DTOR_LIST__ symbols.  Add a comment explaining why this is
+	necessary.
+	* scripttemp/pep.sc: Likewise.
+	* ld.texinfo (PROVIDE): Add a note about the effect of common
+	symbols.
+---
+ ld/ChangeLog          | 14 ++++++++++++++
+ ld/ld.texinfo         |  6 ++++++
+ ld/scripttempl/pe.sc  | 24 ++++++++++++++++++++----
+ ld/scripttempl/pep.sc | 24 ++++++++++++++++++++----
+ 4 files changed, 60 insertions(+), 8 deletions(-)
+
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 0f00265..bf129a1 100644
+--- a/ld/ChangeLog
+++ b/ld/ChangeLog
+@@ -1,3 +1,17 @@
+2018-02-05  Nick Clifton  <nickc@redhat.com>
+
+	Import from mainline:
+
+	2018-02-03  Nick Clifton  <nickc@redhat.com>
+
+	PR 22762
+	* scripttempl/pe.sc: Remove PROVIDE()s from __CTOR_LIST__ and
+	__DTOR_LIST__ symbols.  Add a comment explaining why this is
+	necessary.
+	* scripttemp/pep.sc: Likewise.
+	* ld.texinfo (PROVIDE): Add a note about the effect of common
+	symbols.
+
+ 2018-01-27  Nick Clifton  <nickc@redhat.com>
+ 
+ 	Back to development.
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c89915f..764c401 100644
+--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
+@@ -4001,6 +4001,12 @@ underscore), the linker will silently use the definition in the program.
+ If the program references @samp{etext} but does not define it, the
+ linker will use the definition in the linker script.
+ 
+Note - the @code{PROVIDE} directive considers a common symbol to be
+defined, even though such a symbol could be combined with the symbol
+that the @code{PROVIDE} would create.  This is particularly important
+when considering constructor and destructor list symbols such as
+@samp{__CTOR_LIST__} as these are often defined as common symbols.
+
+ @node PROVIDE_HIDDEN
+ @subsection PROVIDE_HIDDEN
+ @cindex PROVIDE_HIDDEN
+diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc
+index c8a45ca..f56d783 100644
+--- a/ld/scripttempl/pe.sc
+++ b/ld/scripttempl/pe.sc
+@@ -98,8 +98,22 @@ SECTIONS
+     ${RELOCATING+*(.glue_7t)}
+     ${RELOCATING+*(.glue_7)}
+     ${CONSTRUCTING+
+-       PROVIDE(___CTOR_LIST__ = .);
+-       PROVIDE(__CTOR_LIST__ = .);
+       /* Note: we always define __CTOR_LIST__ and ___CTOR_LIST__ here,
+          we do not PROVIDE them.  This is because the ctors.o startup
+	  code in libgcc defines them as common symbols, with the 
+          expectation that they will be overridden by the definitions
+	  here.  If we PROVIDE the symbols then they will not be
+	  overridden and global constructors will not be run.
+	  
+	  This does mean that it is not possible for a user to define
+	  their own __CTOR_LIST__ and __DTOR_LIST__ symbols.  If that
+	  ability is needed a custom linker script will have to be
+	  used.  (The custom script can just be a copy of this script
+	  with the PROVIDE() qualifiers added).
+
+	  See PR 22762 for more details.  */
+       ___CTOR_LIST__ = .;
+       __CTOR_LIST__ = .;
+        LONG (-1);
+        KEEP(*(.ctors));
+        KEEP(*(.ctor));
+@@ -107,8 +121,10 @@ SECTIONS
+        LONG (0);
+      }
+     ${CONSTRUCTING+
+-       PROVIDE(___DTOR_LIST__ = .);
+-       PROVIDE(__DTOR_LIST__ = .);
+       /* See comment about __CTOR_LIST__ above.  The same reasoning
+          applies here too.  */
+       ___DTOR_LIST__ = .;
+       __DTOR_LIST__ = .;
+        LONG (-1);
+        KEEP(*(.dtors));
+        KEEP(*(.dtor));
+diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc
+index 8daacb2..3c6c84d 100644
+--- a/ld/scripttempl/pep.sc
+++ b/ld/scripttempl/pep.sc
+@@ -99,8 +99,22 @@ SECTIONS
+     ${RELOCATING+*(.glue_7)}
+     ${CONSTRUCTING+. = ALIGN(8);}
+     ${CONSTRUCTING+
+-       PROVIDE(___CTOR_LIST__ = .);
+-       PROVIDE(__CTOR_LIST__ = .);
+       /* Note: we always define __CTOR_LIST__ and ___CTOR_LIST__ here,
+          we do not PROVIDE them.  This is because the ctors.o startup
+	  code in libgcc defines them as common symbols, with the 
+          expectation that they will be overridden by the definitions
+	  here.  If we PROVIDE the symbols then they will not be
+	  overridden and global constructors will not be run.
+	  
+	  This does mean that it is not possible for a user to define
+	  their own __CTOR_LIST__ and __DTOR_LIST__ symbols.  If that
+	  ability is needed a custom linker script will have to be
+	  used.  (The custom script can just be a copy of this script
+	  with the PROVIDE() qualifiers added).
+
+	  See PR 22762 for more details.  */
+       ___CTOR_LIST__ = .;
+       __CTOR_LIST__ = .;
+        LONG (-1); LONG (-1);
+        KEEP (*(.ctors));
+        KEEP (*(.ctor));
+@@ -108,8 +122,10 @@ SECTIONS
+        LONG (0); LONG (0);
+      }
+     ${CONSTRUCTING+
+-       PROVIDE(___DTOR_LIST__ = .);
+-       PROVIDE(__DTOR_LIST__ = .);
+       /* See comment about __CTOR_LIST__ above.  The same reasoning
+    	  applies here too.  */
+       ___DTOR_LIST__ = .;
+       __DTOR_LIST__ = .;
+        LONG (-1); LONG (-1);
+        KEEP (*(.dtors));
+        KEEP (*(.dtor));
+-- 
+2.9.3
+
--- a/src/mingw-w64-binutils/PKGBUILD
+++ b/src/mingw-w64-binutils/PKGBUILD
@ -1,11 +1,10 @@
-# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com

 _targets="i686-w64-mingw32 x86_64-w64-mingw32"

 pkgname=mingw-w64-binutils
-pkgver=2.29
+pkgver=2.30
 pkgrel=1
 pkgdesc="Cross binutils for the MinGW-w64 cross-compiler"
 arch=('x86_64')
@ -14,10 +13,11 @@ license=('GPL')
 groups=('mingw-w64-toolchain' 'mingw-w64')
 depends=('zlib')
 options=('!libtool' '!emptydirs')
-validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93')
-source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"{,.sig})
-sha256sums=('172e8c89472cf52712fd23a9f14e9bca6182727fb45b0f8f482652a83d5a11b4'
-            'SKIP')
+validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F')  # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>
+source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"{,.sig} 0200-remove-provide-qualifiers.patch)
+sha256sums=('8c3850195d1c093d290a716e20ebcaa72eda32abf5e3d8611154b39cff79e9ea'
+            'SKIP'
+            '40f124febb3ee60239988127cf16d6a4d1bd41b156db8ec843a6871492fcca28')

 prepare() {
  cd "$srcdir"/binutils-${pkgver}
@ -25,6 +25,9 @@ prepare() {
  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+
+  # https://sourceware.org/bugzilla/show_bug.cgi?id=22762
+  patch -p1 -i "${srcdir}"/0200-remove-provide-qualifiers.patch
 }

 build() {
@ -35,6 +38,7 @@ build() {
        --target=${_target} \
        --infodir=/usr/share/info/${_target} \
        --enable-lto --enable-plugins \
+        --enable-deterministic-archives \
        --disable-multilib --disable-nls \
        --disable-werror
     make
--- a/src/mingw-w64-gcc/PKGBUILD
+++ b/src/mingw-w64-gcc/PKGBUILD
@ -1,11 +1,10 @@
-# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com

 _targets="i686-w64-mingw32 x86_64-w64-mingw32"

 pkgname=mingw-w64-gcc
-pkgver=7.3.0
+pkgver=8.1.0
 _islver=0.18
 pkgrel=1
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
@ -25,18 +24,24 @@ backup=()
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
 #source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
 source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
-	"http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2")
+       "http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2"
+        bz85638.patch)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
-              13975A70E63C361C73AE69EF6EEB81F8981C74C7) # richard.guenther@gmail.com
-sha256sums=('832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c'
+              13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
+              33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
+sha256sums=('1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153'
            'SKIP'
-            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b')
+            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
+            'd2a13f550ca7f9131ef14239e8f994b37c81fc8c59f73aff5edab170f5ed6124')

 prepare() {
-  ln -s gcc-${pkgver/+/-} gcc
+  ln -sf gcc-${pkgver/+/-} gcc
  cd "$srcdir"/gcc
  # link isl for in-tree builds
  ln -sf ../isl-${_islver} isl
+
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85638
+  patch -p0 -i "$srcdir"/bz85638.patch
 }

 build() {
--- a/src/mingw-w64-gcc/bz85638.patch
+++ b/src/mingw-w64-gcc/bz85638.patch
@ -0,0 +1,180 @@
+--- gcc/bb-reorder.c	(revision 259642)
+++ gcc/bb-reorder.c	(working copy)
+@@ -117,6 +117,7 @@ 
+ #include "fibonacci_heap.h"
+ #include "stringpool.h"
+ #include "attribs.h"
+#include "common/common-target.h"
+ 
+ /* The number of rounds.  In most cases there will only be 4 rounds, but
+    when partitioning hot and cold basic blocks into separate sections of
+@@ -1408,17 +1409,95 @@ get_uncond_jump_length (void)
+   return length;
+ }
+ 
+/* Create a forwarder block to OLD_BB starting with NEW_LABEL and in the
+   other partition wrt OLD_BB.  */
+
+static basic_block
+create_forwarder_block (rtx_code_label *new_label, basic_block old_bb)
+{
+  /* Put the new label and a jump in the new basic block.  */
+  rtx_insn *label = emit_label (new_label);
+  rtx_code_label *old_label = block_label (old_bb);
+  rtx_insn *jump = emit_jump_insn (targetm.gen_jump (old_label));
+  JUMP_LABEL (jump) = old_label;
+
+  /* Create the new basic block and put it in last position.  */
+  basic_block last_bb = EXIT_BLOCK_PTR_FOR_FN (cfun)->prev_bb;
+  basic_block new_bb = create_basic_block (label, jump, last_bb);
+  new_bb->aux = last_bb->aux;
+  new_bb->count = old_bb->count;
+  last_bb->aux = new_bb;
+
+  emit_barrier_after_bb (new_bb);
+
+  make_single_succ_edge (new_bb, old_bb, 0);
+
+  /* Make sure the new basic block is in the other partition.  */
+  unsigned new_partition = BB_PARTITION (old_bb);
+  new_partition ^= BB_HOT_PARTITION | BB_COLD_PARTITION;
+  BB_SET_PARTITION (new_bb, new_partition);
+
+  return new_bb;
+}
+
+/* The common landing pad in block OLD_BB has edges from both partitions.
+   Add a new landing pad that will just jump to the old one and split the
+   edges so that no EH edge crosses partitions.  */
+
+static void
+sjlj_fix_up_crossing_landing_pad (basic_block old_bb)
+{
+  const unsigned lp_len = cfun->eh->lp_array->length ();
+  edge_iterator ei;
+  edge e;
+
+  /* Generate the new common landing-pad label.  */
+  rtx_code_label *new_label = gen_label_rtx ();
+  LABEL_PRESERVE_P (new_label) = 1;
+
+  /* Create the forwarder block.  */
+  basic_block new_bb = create_forwarder_block (new_label, old_bb);
+
+  /* Create the map from old to new lp index and initialize it.  */
+  unsigned *index_map = (unsigned *) alloca (lp_len * sizeof (unsigned));
+  memset (index_map, 0, lp_len * sizeof (unsigned));
+
+  /* Fix up the edges.  */
+  for (ei = ei_start (old_bb->preds); (e = ei_safe_edge (ei)) != NULL; )
+    if (e->src != new_bb && BB_PARTITION (e->src) == BB_PARTITION (new_bb))
+      {
+	rtx_insn *insn = BB_END (e->src);
+	rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
+
+	gcc_assert (note != NULL);
+	const unsigned old_index = INTVAL (XEXP (note, 0));
+
+	/* Generate the new landing-pad structure.  */
+	if (index_map[old_index] == 0)
+	  {
+	    eh_landing_pad old_lp = (*cfun->eh->lp_array)[old_index];
+	    eh_landing_pad new_lp = gen_eh_landing_pad (old_lp->region);
+	    new_lp->post_landing_pad = old_lp->post_landing_pad;
+	    new_lp->landing_pad = new_label;
+	    index_map[old_index] = new_lp->index;
+	  }
+	XEXP (note, 0) = GEN_INT (index_map[old_index]);
+
+	/* Adjust the edge to the new destination.  */
+	redirect_edge_succ (e, new_bb);
+      }
+    else
+      ei_next (&ei);
+}
+
+ /* The landing pad OLD_LP, in block OLD_BB, has edges from both partitions.
+    Add a new landing pad that will just jump to the old one and split the
+    edges so that no EH edge crosses partitions.  */
+ 
+ static void
+-fix_up_crossing_landing_pad (eh_landing_pad old_lp, basic_block old_bb)
+dw2_fix_up_crossing_landing_pad (eh_landing_pad old_lp, basic_block old_bb)
+ {
+   eh_landing_pad new_lp;
+-  basic_block new_bb, last_bb;
+-  rtx_insn *jump;
+-  unsigned new_partition;
+   edge_iterator ei;
+   edge e;
+ 
+@@ -1428,32 +1507,12 @@ fix_up_crossing_landing_pad (eh_landing_
+   new_lp->landing_pad = gen_label_rtx ();
+   LABEL_PRESERVE_P (new_lp->landing_pad) = 1;
+ 
+-  /* Put appropriate instructions in new bb.  */
+-  rtx_code_label *new_label = emit_label (new_lp->landing_pad);
+-
+-  rtx_code_label *old_label = block_label (old_bb);
+-  jump = emit_jump_insn (targetm.gen_jump (old_label));
+-  JUMP_LABEL (jump) = old_label;
+-
+-  /* Create new basic block to be dest for lp.  */
+-  last_bb = EXIT_BLOCK_PTR_FOR_FN (cfun)->prev_bb;
+-  new_bb = create_basic_block (new_label, jump, last_bb);
+-  new_bb->aux = last_bb->aux;
+-  new_bb->count = old_bb->count;
+-  last_bb->aux = new_bb;
+-
+-  emit_barrier_after_bb (new_bb);
+-
+-  make_single_succ_edge (new_bb, old_bb, 0);
+-
+-  /* Make sure new bb is in the other partition.  */
+-  new_partition = BB_PARTITION (old_bb);
+-  new_partition ^= BB_HOT_PARTITION | BB_COLD_PARTITION;
+-  BB_SET_PARTITION (new_bb, new_partition);
+  /* Create the forwarder block.  */
+  basic_block new_bb = create_forwarder_block (new_lp->landing_pad, old_bb);
+ 
+   /* Fix up the edges.  */
+   for (ei = ei_start (old_bb->preds); (e = ei_safe_edge (ei)) != NULL; )
+-    if (e->src != new_bb && BB_PARTITION (e->src) == new_partition)
+    if (e->src != new_bb && BB_PARTITION (e->src) == BB_PARTITION (new_bb))
+       {
+ 	rtx_insn *insn = BB_END (e->src);
+ 	rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
+@@ -1651,9 +1710,11 @@ find_rarely_executed_basic_blocks_and_cr
+ 
+   /* The format of .gcc_except_table does not allow landing pads to
+      be in a different partition as the throw.  Fix this by either
+-     moving or duplicating the landing pads.  */
+     moving the landing pads or inserting forwarder landing pads.  */
+   if (cfun->eh->lp_array)
+     {
+      const bool sjlj
+	= (targetm_common.except_unwind_info (&global_options) == UI_SJLJ);
+       unsigned i;
+       eh_landing_pad lp;
+ 
+@@ -1685,13 +1746,18 @@ find_rarely_executed_basic_blocks_and_cr
+ 	      which ^= BB_HOT_PARTITION | BB_COLD_PARTITION;
+ 	      BB_SET_PARTITION (bb, which);
+ 	    }
+	  else if (sjlj)
+	    sjlj_fix_up_crossing_landing_pad (bb);
+ 	  else
+-	    fix_up_crossing_landing_pad (lp, bb);
+	    dw2_fix_up_crossing_landing_pad (lp, bb);
+
+	  /* There is a single, common landing pad in SJLJ mode.  */
+	  if (sjlj)
+	    break;
+ 	}
+     }
+ 
+   /* Mark every edge that crosses between sections.  */
+-
+   FOR_EACH_BB_FN (bb, cfun)
+     FOR_EACH_EDGE (e, ei, bb->succs)
+       {
--- a/src/mingw-w64-headers-bootstrap/PKGBUILD
+++ b/src/mingw-w64-headers-bootstrap/PKGBUILD
@ -1,6 +1,5 @@
-# $Id: PKGBUILD 266004 2017-11-09 13:17:42Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com

 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 _dummystring="/* Dummy header, which gets overriden, if winpthread library gets installed.  */"
@ -14,7 +13,7 @@ url="http://mingw-w64.sourceforge.net"
 license=('custom')
 groups=('mingw-w64-bootstrap')
 makedepends=('mingw-w64-headers')
-conflicts=('mingw-w64-winpthreads', 'mingw-w64-winpthreads-svn')
+conflicts=('mingw-w64-winpthreads')
 options=('!strip' '!libtool' '!emptydirs')
 source=()
 sha256sums=()
--- a/src/mingw-w64-headers/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch
+++ b/src/mingw-w64-headers/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch
@ -0,0 +1,36 @@
+From 5aa15ee4a5f04cdc797deb685d23dc67275af357 Mon Sep 17 00:00:00 2001
+From: Mateusz <mateuszb@poczta.onet.pl>
+Date: Mon, 22 Jan 2018 20:58:48 +0100
+Subject: [PATCH] intrin-impl.h: do not define _xgetbv for GCC 8
+
+GCC 8 from r248028 has defined function _xgetbv and we should
+avoid double definition of this function.
+
+Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
+---
+ mingw-w64-headers/include/psdk_inc/intrin-impl.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mingw-w64-headers/include/psdk_inc/intrin-impl.h b/mingw-w64-headers/include/psdk_inc/intrin-impl.h
+index ff9e6aff..88af804c 100644
+--- a/mingw-w64-headers/include/psdk_inc/intrin-impl.h
+++ b/mingw-w64-headers/include/psdk_inc/intrin-impl.h
+@@ -1775,6 +1775,7 @@ __buildmov(__movsd, unsigned __LONG32, "d")
+ #define __INTRINSIC_DEFINED___movsd
+ #endif /* __INTRINSIC_PROLOG */
+ 
+#if !defined(__GNUC__) || __GNUC__ < 8 /* GCC 8 has already defined _xgetbv */
+ /* NOTE: This should be in immintrin.h */
+ #if __INTRINSIC_PROLOG(_xgetbv)
+ unsigned __int64 _xgetbv(unsigned int);
+@@ -1798,6 +1799,7 @@ unsigned __int64 _xgetbv(unsigned int index)
+ #endif
+ #define __INTRINSIC_DEFINED__xgetbv
+ #endif /* __INTRINSIC_PROLOG */
+#endif /* __GNUC__ < 8 */
+ 
+ #endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */
+ 
+-- 
+2.14.1
+
--- a/src/mingw-w64-headers/PKGBUILD
+++ b/src/mingw-w64-headers/PKGBUILD
@ -1,13 +1,12 @@
-# $Id: PKGBUILD 266002 2017-11-09 13:16:03Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com

 _targets="i686-w64-mingw32 x86_64-w64-mingw32"

 pkgname='mingw-w64-headers'
 pkgver=5.0.3
 _pkgver=${pkgver/rc/-rc}
-pkgrel=1
+pkgrel=2
 pkgdesc="MinGW-w64 headers for Windows"
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
@ -15,9 +14,18 @@ license=('custom')
 groups=('mingw-w64-toolchain' 'mingw-w64')
 options=('!strip' '!libtool' '!emptydirs')
 validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740')
-source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig})
+source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig}
+        0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch)
 sha256sums=('2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4'
-            'SKIP')
+            'SKIP'
+            'be8aabf9c98026db998c97e7e14293d4a9db9a73587ab860e72d7a798b6ad16e')
+
+prepare() {
+  cd "$srcdir"/mingw-w64-v${_pkgver}
+
+  # https://sourceforge.net/p/mingw-w64/mailman/message/36200602/
+  patch -p1 -i "$srcdir"/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch
+}

 build() {
  for _target in ${_targets}; do
--- a/src/movim-git/PKGBUILD
+++ b/src/movim-git/PKGBUILD
@ -3,7 +3,7 @@

 _pkgbase='movim'
 pkgname=movim-git
-pkgver=r6116.6937c0c9
+pkgver=r6336.5fd158bd
 pkgrel=1
 pkgdesc="Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol."
 arch=('any')
@ -56,7 +56,7 @@ package() {
  cp -r app lib locales src themes vendor "$pkgdir/usr/share/webapps/$_pkgbase"
  install -Dm644 VERSION CHANGELOG.md INSTALL.md README.md index.php \
    linker.php manifest.webapp "$pkgdir/usr/share/webapps/$_pkgbase"
-  install -Dm755 daemon.php mud.php "$pkgdir/usr/share/webapps/$_pkgbase"
+  install -Dm755 daemon.php "$pkgdir/usr/share/webapps/$_pkgbase"

  # Configuration file
  install -m750 -d "$pkgdir/etc/webapps/$_pkgbase"
@ -74,8 +74,4 @@ package() {
  install -m755 -d "$pkgdir/etc/default"
  install -g http -Dm640 "$srcdir/movim.env" "$pkgdir/etc/default/$_pkgbase"
  install -Dm644 "$srcdir/movim.service" "$pkgdir/usr/lib/systemd/system/movim.service"
-
-  # Easy access to mud.php
-  install -d "$pkgdir/usr/bin"
-  ln -s "/usr/share/webapps/$_pkgbase/mud.php" "$pkgdir/usr/bin/mud"
 }
--- a/src/mprime/PKGBUILD
+++ b/src/mprime/PKGBUILD
@ -4,7 +4,7 @@

 pkgname=mprime
 pkgver=294b7
-pkgrel=1
+pkgrel=4
 pkgdesc="A GIMPS, distributed computing project client, dedicated to finding Mersenne primes."
 arch=('x86_64')
 url="http://www.mersenne.org"
--- a/src/ncurses5-compat-libs/.gitignore
+++ b/src/ncurses5-compat-libs/.gitignore
@ -0,0 +1,5 @@
+*.asc
+*.tgz
+logs/
+*.pkg.tar.xz
+*.sig
--- a/src/ncurses5-compat-libs/PKGBUILD
+++ b/src/ncurses5-compat-libs/PKGBUILD
@ -0,0 +1,42 @@
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=ncurses5-compat-libs
+_pkgname=ncurses
+pkgver=6.1
+pkgrel=1
+pkgdesc='System V Release 4.0 curses emulation library, ABI 5'
+arch=(i686 x86_64)
+url='http://invisible-island.net/ncurses/ncurses.html'
+license=(MIT)
+depends=(glibc gcc-libs sh)
+provides=(libtinfo5)
+conflicts=(libtinfo5)
+source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$pkgver.tar.gz{,.sig})
+md5sums=('98c889aaf8d23910d2b92d65be2e737a'
+         'SKIP')
+validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB')  # Thomas Dickey
+
+build() {
+  cd ${_pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+    --with-shared --with-normal --without-debug --without-ada --enable-widec \
+    --disable-pc-files --with-cxx-binding --with-cxx-shared --with-abi-version=5
+  make
+}
+
+package() {
+  cd ${_pkgname}-${pkgver}
+  make DESTDIR="$pkgdir" install.libs
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -rf "$pkgdir/usr/include/" "$pkgdir/usr/lib/pkgconfig" \
+    "$pkgdir"/usr/lib/*.so
+
+  for lib in ncurses ncurses++ form panel menu; do
+    ln -s /usr/lib/lib${lib}w.so.5 "$pkgdir/usr/lib/lib${lib}.so.5"
+  done
+  ln -s /usr/lib/libncurses.so.5 "$pkgdir/usr/lib/libtinfo.so.5"
+  ln -s /usr/lib/libncurses.so.5 "$pkgdir/usr/lib/libtic.so.5"
+}
--- a/src/ocserv/PKGBUILD
+++ b/src/ocserv/PKGBUILD
@ -1,6 +1,6 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 pkgname=ocserv
-pkgver=0.11.9
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="OpenConnect VPN Server"
 arch=('i686' 'x86_64')
@ -10,7 +10,7 @@ depends=('autogen' 'libpcl' 'http-parser' 'libnl' 'libsystemd' 'protobuf-c' 'tal
 makedepends=('freeradius' 'gperf' 'tcp-wrappers')
 backup=('etc/ocserv.config' 'etc/ocserv-passwd')
 source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=ocserv_${pkgver//./_}")
-sha256sums=('4f44d5351a8b329386693ba68527331d2f944f67c218dfce591e1eb2d1c2be7e')
+sha256sums=('4dba49ba482db06edcf317d64ba4a959ffd0dc62920975868e9a30c84dac00b6')

 prepare() {
  cd ${pkgname}-${pkgname}_*
--- a/src/openconnect-git/PKGBUILD
+++ b/src/openconnect-git/PKGBUILD
@ -2,13 +2,14 @@

 pkgname=openconnect-git
 _pkgname=openconnect
-pkgver=7.08.r46.g91c8188
-pkgrel=1
+pkgver=7.06.r93.g11ad105
+pkgrel=2
 pkgdesc="Open client for Cisco AnyConnect VPN"
 arch=('i686' 'x86_64')
-license=('LGPL2.1')
+license=('GPL')
 url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'gnutls' 'libproxy' 'vpnc' 'krb5' 'lz4' 'pcsclite')
+depends=('libxml2' 'gnutls' 'libproxy' 'vpnc' 'krb5' 'lz4' 'pcsclite' 'trousers' 'stoken'
+		'oath-toolkit')
 makedepends=('intltool' 'python2' 'git')
 options=('!emptydirs')
 provides=($_pkgname)
@ -27,7 +28,7 @@ build() {
  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
      --sbindir=/usr/bin \
      --disable-static
-  make
+  make V=0
 }

 package() {
--- a/src/pacaur/PKGBUILD
+++ b/src/pacaur/PKGBUILD
@ -1,5 +1,5 @@
 pkgname=pacaur
-pkgver=4.7.10
+pkgver=4.7.90
 pkgrel=1
 pkgdesc="An AUR helper that minimizes user interaction"
 arch=('any')
@ -8,35 +8,16 @@ license=('ISC')
 depends=('cower' 'expac' 'sudo' 'git')
 makedepends=('perl')
 backup=('etc/xdg/pacaur/config')
-source=("https://github.com/rmarquis/$pkgname/archive/$pkgver.tar.gz")
-md5sums=('ddb8adbb50889d07de41ca97d34a09d2')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/rmarquis/$pkgname/archive/$pkgver.tar.gz")
+md5sums=('237a716ddfe3eab43a0f7958be646d09')

 build() {
    cd "$pkgname-$pkgver"
-    pod2man --utf8 --section=8 --center="Pacaur Manual" --name="PACAUR"\
-        --release="$pkgname $pkgver" ./README.pod > ./pacaur.8
+    make
 }

 package() {
    cd "$pkgname-$pkgver"
-
-    mkdir -p "$pkgdir/etc/xdg/pacaur"
-    install -D -m644 ./config "$pkgdir/etc/xdg/pacaur/config"
-    mkdir -p "$pkgdir/usr/bin"
-    install -D -m755 ./pacaur "$pkgdir/usr/bin/$pkgname"
-    mkdir -p "$pkgdir/usr/share/bash-completion/completions"
-    install -D -m644 ./bash.completion\
-        "$pkgdir/usr/share/bash-completion/completions/$pkgname"
-    mkdir -p "$pkgdir/usr/share/zsh/site-functions"
-    install -D -m644 ./zsh.completion\
-        "$pkgdir/usr/share/zsh/site-functions/_pacaur"
-    mkdir -p "$pkgdir/usr/share/man/man8"
-    install -D -m644 ./pacaur.8 "$pkgdir/usr/share/man/man8/pacaur.8"
-    mkdir -p "$pkgdir/usr/share/licenses/pacaur"
-    install -D -m644 ./LICENSE "$pkgdir/usr/share/licenses/pacaur/LICENSE"
-    for i in {ca,da,de,es,fi,fr,hu,it,ja,nb,nl,pl,pt,ru,sk,sl,sr,sr@latin,tr,zh_CN}; do
-        mkdir -p "$pkgdir/usr/share/locale/$i/LC_MESSAGES/"
-        msgfmt ./po/$i.po -o "$pkgdir/usr/share/locale/$i/LC_MESSAGES/pacaur.mo"
-    done
+    make install DESTDIR=$pkgdir PREFIX=/usr
 }

--- a/src/prosody-hg-stable/PKGBUILD
+++ b/src/prosody-hg-stable/PKGBUILD
@ -8,7 +8,7 @@

 pkgname=prosody-hg-stable
 pkgrel=1
-pkgver=0.10.r7496+.7ea3311ca632+
+pkgver=0.10.r7499+.3d21c63ec03f+
 pkgver() {
  cd "$srcdir/prosody-hg"
  printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
--- a/src/python-postfix-policyd-spf/PKGBUILD
+++ b/src/python-postfix-policyd-spf/PKGBUILD
@ -3,7 +3,7 @@
 # Contributor: Samed Beyribey <ras0ir@eventualis.org>
 pkgname=python-postfix-policyd-spf
 _pkgname=pypolicyd-spf
-pkgver=2.0.1
+pkgver=2.0.2
 _pkgver=2.0
 pkgrel=1
 pkgdesc="Python Postfix Sender Policy Framework (SPF) filter"
@ -16,7 +16,7 @@ conflicts=('python2-postfix-policyd-spf')
 options=(!emptydirs)
 backup=(etc/python-policyd-spf/policyd-spf.conf)
 source=(https://launchpad.net/$_pkgname/$_pkgver/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
-md5sums=('d93d14bb41bccd076ee05535822cbb80')
+md5sums=('cc50281cc13a8984de058ddc5ae8dcaf')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
--- a/src/python-sleekxmpp/PKGBUILD
+++ b/src/python-sleekxmpp/PKGBUILD
@ -3,14 +3,14 @@
 pkgname=('python-sleekxmpp' 'python2-sleekxmpp')
 pkgbase='python-sleekxmpp'
 _realname='sleekxmpp'
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="A XMPP library written for Python 3.x"
 arch=("any")
 url="http://github.com/fritzy/SleekXMPP"
 license=('MIT')
 source=("https://github.com/fritzy/SleekXMPP/archive/sleek-${pkgver}.tar.gz")
-md5sums=('2f92d5d140de7de098af7e4aefa7ab5d')
+md5sums=('8707ba293cce2b003d1b93b9d1b0565f')
 makedepends=("python2" "python")

 package_python-sleekxmpp() {
--- a/Show More
+++ b/Show More