Update packages

src/android-emulator/PKGBUILD

@@ -1,22 +1,19 @@
 # Maintainer: Zhang Hai <dreaming.in.code.zh@gmail.com>
 
 pkgname=android-emulator
-pkgver=27.2.9
+pkgver=28.0.23
 pkgrel=1
 pkgdesc='Google Android Emulator'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://developer.android.com/studio/releases/emulator.html'
 license=('custom')
-depends_i686=('gcc-libs' 'libpulse' 'libx11' 'libxcb' 'libxdamage'
+depends=('libpulse' 'libx11' 'libxcb' 'libxdamage' 'libxext'
-              'libxext' 'libxfixes' 'ncurses5-compat-libs' 'zlib')
+         'libxfixes' 'ncurses5-compat-libs' 'zlib')
-depends_x86_64=('lib32-gcc-libs' 'lib32-glibc' 'libpulse' 'libx11'
-                'libxcb' 'libxdamage' 'libxext' 'libxfixes'
-                'ncurses5-compat-libs' 'zlib')
 install="${pkgname}.install"
-source=('https://dl.google.com/android/repository/emulator-linux-4773671.zip'
+source=('https://dl.google.com/android/repository/emulator-linux-5264690.zip'
         "${pkgname}.sh"
         "${pkgname}.csh")
-sha1sums=('2a4d424c0c8a2ac94fea68732f90c7668e5682f6'
+sha1sums=('48c1cda2bdf3095d9d9d5c010fbfb3d6d673e3ea'
           '4537a7ce30bedf87cedafc2020822219ad58310d'
           '2fb371b5774b67143f0610dfbec4963a4e2f11cc')
 
@@ -25,12 +22,6 @@ package() {
   install -Dm755 "${pkgname}.sh" "${pkgdir}/etc/profile.d/${pkgname}.sh"
   install -Dm755 "${pkgname}.csh" "${pkgdir}/etc/profile.d/${pkgname}.csh"
 
-  rm -rf emulator/lib{,64}/libstdc++
-
-  if [[ "${CARCH}" = i686 ]]; then
-    rm -rf emulator/lib64/
-  fi
-
   install -d "${pkgdir}/opt/android-sdk/"
   cp -a emulator "${pkgdir}/opt/android-sdk/"
 

src/atheme/PKGBUILD

@@ -10,7 +10,8 @@ _cracklib=default
 _ldap=no
 
 pkgname=atheme
-pkgver=7.2.9
+pkgver=7.2.10_r2
+_pkgver="7.2.10-r2"
 pkgrel=1
 pkgdesc="IRC services"
 arch=("i686" "x86_64")
@@ -31,15 +32,18 @@ backup=(
     'etc/atheme/atheme.motd'
 )
 install=atheme.install
-source=("https://github.com/atheme/atheme/releases/download/v${pkgver}/atheme-${pkgver}.tar.bz2"
+source=("https://github.com/atheme/atheme/releases/download/v${_pkgver}/atheme-v${_pkgver}.tar.xz"
         "atheme.service"
 )
-sha256sums=('a87a046aa73fc4a97a11d41cc08c60b835135ba20bb173ca888b40e0d6b54b27'
+sha256sums=('cceceb285283509c9f6dcb20eeb9b816db373a81b55fe49bc11a774b501d687d'
             'ee9ad7658434451184872c21c7fd38196d22d1dfb6b1f37bcfaf8c363d50296f')
 
-build() {
+pkgver() {
-    cd "atheme-$pkgver"
+    echo "$_pkgver" >&2
+    echo "$_pkgver" | tr - _
+}
 
+build() {
     _configure="./configure --prefix=/usr --enable-fhs-paths"
     _configure+=" --sysconfdir=/etc/atheme --localstatedir=/var"
 
@@ -53,10 +57,6 @@ build() {
     [[ $_large_network = yes ]] && _configure+=" --enable-large-net"
     [[ $_contrib = yes ]]       && _configure+=" --enable-contrib"
 
-    [[ $_pcre = yes ]] && _configure+=" --with-pcre"
-    [[ $_pcre = no ]]  && _configure+=" --without-pcre"
-
-
     [[ $_pcre = yes ]] && _configure+=" --with-pcre"
     [[ $_pcre = no ]]  && _configure+=" --without-pcre"
 
@@ -65,7 +65,6 @@ build() {
 }
 
 package() {
-    cd "atheme-$pkgver"
     make DESTDIR="$pkgdir/" install
     install -Dm0644 "$srcdir/atheme.service" "$pkgdir/usr/lib/systemd/system/atheme.service"
 

src/aurutils/PKGBUILD

@@ -1,49 +1,29 @@
-# Maintainer: Alad Wenter <alad@mailbox.org>
+# Maintainer: Alad Wenter <alad@archlinux.org>
+# Co-Maintainer: Cedric Girard <cgirard.archlinux@valinor.fr>
 pkgname=aurutils
-pkgver=1.5.3
+pkgver=2.3.1
-pkgrel=10
+pkgrel=1
 pkgdesc='helper tools for the arch user repository'
-arch=('any')
 url='https://github.com/AladW/aurutils'
+arch=('any')
 license=('custom:ISC')
-depends=('pacman>=5' 'git' 'jq' 'pacutils>=0.4')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-makedepends=('git')
+        #"$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc")
-optdepends=('devtools: systemd-nspawn support'
+install=$pkgname.install
+depends=('git' 'jq' 'expac' 'diffstat' 'pacutils' 'parallel' 'wget')
+optdepends=('bash-completion: bash completion'
+            'devtools: aur-chroot'
             'vifm: build file interaction'
-            'aria2: threaded downloads'
+            'xdelta3: generate delta files')
-            'parallel: threaded downloads'
+sha256sums=('2e8c7656c620c1c8ded07e20cc9e9cb37d7a4bb234c9f5bd166a2e3887d3db65')
-            'expac: aursift script'
+validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A') # Alad Wenter <alad@archlinux.org>
-            'repose: repo-add alternative')
-_backports=('0001-aurbuild-backport-fix-for-236.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'
-            '8bf1fe675284a8e91aa37bdbf035c0158f910446fdd10d21a705e89ff711c883'
-            '75326f1f932b545754eb05ef62ad637874367d276ee584ff9544f0c0178e39b8'
-            'bb03ef84bd3e7b28af9d2a829a61869c4845bdce65c897d267e691091033fe8a'
-            '40efaedd46cb98e0af0faf8cd61dc36eaa2638cf429d280beaf5c37f09a4369b'
-            '2fc7599245c53cad4b3b404a9ecf0ef122cf6be66d18a156e83ebfd1923b5359'
-            '8f4c9ea372827db3a4d4aa8e67e4fd962384197fc1684ba50e4f739d2917402f'
-            '1cb14e6605e38a1bc127d7ea576a02dfbc2d3c0e009597980fe4040a65b347f2')
-# Alad Wenter <alad@mailbox.org>
-validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A')
 
-prepare() {
+build() {
     cd "$pkgname-$pkgver"
-    for p in "${_backports[@]}"; do
+    make
-        patch -p1 < "$srcdir/$p"
-    done
 }
 
 package() {
     cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" PREFIX="/usr" install
+    make DESTDIR="$pkgdir" install
 }

src/binfmt-support/PKGBUILD

@@ -1,26 +1,42 @@
+# Maintainer: Antoine Viallon <antoine.viallon@gmail.com>
 pkgname=binfmt-support
-pkgver=2.1.8
+pkgver=2.2.0
-pkgrel=1
+_pkgver=2.2.0                      # For use with RC releases, to replace the - with _
-pkgdesc="register interpreters for various binary formats"
+pkgrel=2
-arch=(i686 x86_64)
+pkgdesc="Arbitraty executable file format kernel extension"
-url="http://packages.debian.org/en/sid/binfmt-support"
+arch=('i686' 'x86_64')
+url="https://git.savannah.gnu.org/cgit/binfmt-support.git/"
 license=('GPL')
-depends=('libpipeline')
+depends=('autoconf' 'automake')
-makedepends=()
+makedepends=('make' 'gcc' 'git' 'libpipeline')
-source=(ftp://ftp.de.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_$pkgver.orig.tar.gz
+source=("https://git.savannah.gnu.org/cgit/binfmt-support.git/snapshot/$pkgname-$_pkgver.tar.gz")
-	binfmt-support.service)
+sha512sums=('b35238fa96f7e3201f7c9a70172ecd2c6b0be66e4735ff96c17ae2167f670a67c856d0fc1b0d50bf3c14f4a35c5e9927a848814791ea9be928dff82426cb0da4')
-sha256sums=('ebad04db8444d2275d042b5074fa3e160bcf3e2c23ee9b660e75f5acd73618a2'
+
-            'efba2300b9f0c8c5c14696d2b25836d91edaaad8d30c64ed7d3eab0163b2553e')
+prepare() {
+    echo -e '\033[0;31mWARNING : \033[1;33mThis package is deprecated, please use systemd-binfmt instead.\033[0m'
+    read -p "Do you really want to install it anyway ? " yn 
+    case $yn in
+	[Nn]* ) exit;;
+    esac
+    set -e
+    cd "${srcdir}/$pkgname-$_pkgver"
+    ./bootstrap
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+
-  ./configure --prefix=/usr --libexecdir=/usr/lib --sbindir=/usr/bin --localstatedir=/var
+  cd "${srcdir}/$pkgname-$_pkgver"
+  ./configure --prefix=/usr \
+	--libexecdir=/usr/lib \
+	--sbindir=/usr/bin \
+	--sysconfdir=/etc \
+	--disable-upstart
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
-  install -dm0755 $pkgdir/var/lib/binfmts
+  #install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # Couldn't find any License !
-  install -Dm755 $srcdir/binfmt-support.service $pkgdir/usr/lib/systemd/system/binfmt-support.service
 }
+      

src/bluez-utils-compat/PKGBUILD

@@ -7,7 +7,7 @@
 pkgname='bluez-utils-compat'
 _pkgbase='bluez'
 pkgver=5.50
-pkgrel=2
+pkgrel=3
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h' 'arm' 'aarch64')
 license=('GPL2')

src/ccextractor/PKGBUILD

@@ -7,7 +7,7 @@
 # https://github.com/cacack/pkgbuilds/tree/master/ccextractor
 
 pkgname=ccextractor
-pkgver=0.86
+pkgver=0.87
 pkgrel=1
 pkgdesc="A fast closed captions extractor for MPEG files."
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ depends=('gcc-libs' 'tesseract')
 source=(
    https://github.com/CCExtractor/ccextractor/archive/v$pkgver.tar.gz
 )
-sha512sums=('50a501650f1b60ab54aba690ae211610975bd1894ae103d0a1e10b6348f93436c9fa974a16bff5c7b8ba4e011be1730aa890e3c96217b2a4b05384e598d850d0')
+sha512sums=('adc421dadc844c5708bd8a15d07bca9cece8d381515a5a2f7ebaca1b95a128d083de6a6cfaa695a89dc3bcb81e0e457a959be072a9b1cd2c268a5138a93a0a11')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver/linux"

src/chocolate-doom/PKGBUILD

@@ -4,13 +4,13 @@ pkgname=(chocolate-{doom,heretic,hexen,strife,common})
 pkgbase=${pkgname[0]}
 pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports."
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.chocolate-doom.org/"
 license=('GPL2')
 depends=('libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net')
 makedepends=('python')
-source=(http://chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc}
+source=(https://www.chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc}
         0001_fix-bash-completion.patch)
 sha512sums=('41f235c0d84ef21070636ad0610e97898dfd366fae7f9244bd2aebf8974db98dcf55f70bcab2f93589b9bf31dd421db32e8af88e0f8e0a655d2b9f1d4ead2afd'
             'SKIP'

src/clean-chroot-manager/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: graysky <graysky AT archlinux DOT us>
 
 pkgname=clean-chroot-manager
-pkgver=2.90
+pkgver=2.93
 pkgrel=1
 pkgdesc='Wrapper scripts for managing clean chroots.'
 arch=('any')
@@ -11,7 +11,7 @@ depends=('devtools>=20180528-1' 'rsync')
 conflicts=('clean_chroot_manager')
 replaces=('clean_chroot_manager')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/graysky2/clean-chroot-manager/archive/v$pkgver.tar.gz")
-sha256sums=('bf1a8adffcfd435937bda8c0757348c40af4dfe99758ae22e0748829adaf4499')
+sha256sums=('e78cf1c1a411d10dc9aae117e2fbd12cfcc4437cd39427c4a5c887ce6fa3ad8c')
 install=ccm.install
 
 build() {

src/clean-chroot-manager/ccm.install

@@ -2,7 +2,7 @@
 ## arg 2:  the old package version
 
 post_upgrade() {
-	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
+	for test in 2.92-1 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'

src/cloog/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor: Allan McRae <allan@archlinux.org>
 
 pkgname=cloog
-pkgver=0.19.0
+pkgver=0.20.0
 pkgrel=1
 pkgdesc="Library that generates loops for scanning polyhedra"
 arch=('i686' 'x86_64' 'armv7h')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('osl' 'isl')
 makedepends=('texlive-core' 'texlive-bin')
 source=(https://github.com/periscop/cloog/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz)
-sha512sums=('a0646f31e7a2c1809c51b812f58dc3f733f3a7c4cdf84fa5fee4ed7a372b7bf649561c7eceb7bfc754f1aca519ec0fc3718e08775e7eb072a238ce341edda10a')
+sha512sums=('d00cbefd348b45d9d482320a088f7ae736440046b99469cbdfbb177a38dcef182c3305f0a567a1f5699c23b7108db6fd5ad6dfbc071d63ccca1d6bfc1b198565')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,6 +23,7 @@ check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # There are certain race conditions on running the tests, so we restrict
   # it to one job (one CPU core).
+
   make -j1 check
 }
 

src/coturn/PKGBUILD

@@ -4,7 +4,7 @@
 
 pkgname=coturn
 _portname=turnserver
-pkgver=4.5.0.7
+pkgver=4.5.0.8
 pkgrel=1
 pkgdesc="Free open source implementation of TURN and STUN Server"
 arch=('i686' 'x86_64' 'armv7h')
@@ -17,7 +17,7 @@ install="$_portname.install"
 backup=("etc/turnserver.conf")
 source=(http://$_portname.open-sys.org/downloads/v$pkgver/$_portname-$pkgver.tar.gz $_portname.service $_portname.tmpfiles.d)
 
-sha256sums=('86248c541a1184eb388c54d4178cffbf16ef53504fbb60106e575194f078b221'
+sha256sums=('94a9e67ac7d92c913b5bd8cb6b70ee6e9aa0e9e7cc3c984fc2d8cf381c6edf87'
             '319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc'
             'fe7ed64dc6844aabdfa00b76134b22d69d9097bd3f77120d704d0ee08c036c21')
 

src/coturn/turnserver.install

@@ -1,7 +1,7 @@
 post_install() {
 
   id turnserver &>/dev/null || \
-    useradd -r -g daemon -M -s /usr/bin/false turnserver
+    useradd -r -g daemon -d / -s /usr/bin/nologin turnserver
 
   install -dm 755 "/var/log/turnserver"
   chown -R turnserver:daemon /var/log/turnserver

src/crispy-doom/PKGBUILD

@@ -2,19 +2,19 @@
 
 pkgname=crispy-doom
 pkgdesc="Vanilla-compatible enhanced Doom engine"
-pkgver=5.4
+pkgver=5.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://fabiangreffrath.github.io/crispy-doom"
 license=('GPL2')
-depends=('libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net')
+depends=('hicolor-icon-theme' 'libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net')
 makedepends=('python')
 optdepends=('freedm: Free deathmatch game'
             'freedoom1: Free Ultimate Doom-compatible game'
             'freedoom2: Free Doom II/Final Doom-compatible game')
 install=crispy-doom.install
 source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz)
-sha512sums=('aa3dedfc5517e5347a9b0b25b2926f58a9bf470ec9879e61d67be3acbd3051cece4a3eb74d7fea2b5c373e808b50f86f82add3da25ec0f1111a52ed5662f1e5f')
+sha512sums=('723c7fb15a4a7586506658889a9c309ca3a43bc1c078ce3cd72b976eeffef5f3c138fb6c2a8e2b40151ce5564f1a75e9c28d87bf6ea2c6be034ee73b7d5d3b44')
 
 prepare() {
   # GitHub's generated archive prefix kind of sucks.

src/dino-git/PKGBUILD

@@ -2,13 +2,13 @@
 # Contributor: svalo <me@valo.space>
 
 pkgname=dino-git
-pkgver=r279.9e93a77
+pkgver=r370.38b5320
 pkgrel=1
 pkgdesc="Simple and modern Jabber/XMPP client written in vala"
 arch=('i686' 'x86_64' 'aarch64')
 url="https://github.com/dino/dino"
 license=('GPL3')
-depends=('glib2>=2.38' 'glib-networking' 'gtk3>=3.22' 'gpgme' 'libgee>=0.10' 'libgcrypt' 'libsoup' 'sqlite')
+depends=('glib2>=2.38' 'glib-networking' 'gtk3>=3.22' 'gpgme' 'libgee>=0.10' 'libgcrypt' 'libsoup' 'sqlite' 'qrencode')
 makedepends=('git' 'cmake' 'vala>=0.34' 'ninja')
 optdepends=('libcanberra: audio notification support')
 provides=("${pkgname%-git}")

src/displaylink/PKGBUILD

@@ -1,8 +1,9 @@
-# Maintainer: PlusMinus
+# Maintainer: rHermes <teodor_spaeren@riseup.net>
+# Contributor: PlusMinus
 # Contributor: rhabbachi
 
 pkgname=displaylink
-pkgver=4.2.29
+pkgver=4.4.24
 pkgrel=1
 pkgdesc="Linux driver for DL-6xxx, DL-5xxx, DL-41xx and DL-3x00"
 arch=('i686' 'x86_64')
@@ -12,18 +13,18 @@ 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=1123
+source=(displaylink-driver-$pkgver.zip::https://www.displaylink.com/downloads/file?id=1261
 	udev.sh
         99-displaylink.rules 
 	displaylink.service 
         displaylink-sleep.sh)
-md5sums=('ab920bea23a265516e3d0097992c62f3'
+md5sums=('f18b8e6fe8f2baf9c0288afddfd771a1'
          'd5de775e41af06edbd8073adc490139d'
          '20495d81c7d2540910ef86dc437b7fac'
          'c141a15e973481c7d961f8e135627ca4'
          '7cbd9ab2ac79ba66e8297689c6e5483e')
 
-DLAGENTS=('http::/usr/bin/wget -O %o --post-data=fileId=1123&accept_submit=Accept %u')
+DLAGENTS=('https::/usr/bin/wget -O %o --post-data=fileId=1261&accept_submit=Accept %u')
 
 # Update with > updpkgsums
 

src/emulationstation-autoscraper/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=emulationstation-autoscraper
-pkgver=1.4.5
+pkgver=1.4.6
 pkgrel=1
 pkgdesc="An auto-scraper for EmulationStation written in Go using hashes"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
@@ -9,24 +9,26 @@ url="https://github.com/sselph/scraper"
 license=('custom')
 makedepends=('git' 'go')
 
-source=("https://github.com/sselph/scraper/archive/v${pkgver}.tar.gz")
+source=($pkgname-$pkgver.tar.gz::https://github.com/sselph/scraper/archive/v${pkgver}.tar.gz)
-sha256sums=('5e7496b7634126f5be81fdd88a20fe108f40d4a8a0089b2d07ae82ea2cea812c')
+sha256sums=('898d13a94f630bcb2e78b144fb06c106a6f29a316ab1d63f9b702719cf98e0cd')
 
 scraperdir="scraper-${pkgver}"
 
 build() {
-  cd "${srcdir}/${scraperdir}"
+  # echo $arch # for later use on different arches
-  echo $arch
+  mkdir -p "github.com/sselph"
+  ln -s "${srcdir}/${scraperdir}" "${srcdir}/github.com/sselph/scraper"
+  GOPATH="$(pwd)" && export GOPATH=$(echo ${GOPATH%src})
   echo $(go build github.com/sselph/scraper)
 }
 
 package() {
-  cd "${srcdir}/${scraperdir}"
+  cd "${srcdir}"
   strip "scraper"
-  install -Dm755 "${srcdir}/${scraperdir}/scraper" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm755 "${srcdir}/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
+  for LIC in $(find "${srcdir}/${scraperdir}/vendor/github.com" -name LICENSE); do
     PKGNAME="$(echo ${LIC} | awk -F "/" '{print $(NF-1)}')"
-    install -Dm644 "${srcdir}/${scraperdir}/${LIC}" "${pkgdir}/usr/share/licenses/${pkgname}/license.${PKGNAME}"
+    install -Dm644 "${LIC}" "${pkgdir}/usr/share/licenses/${pkgname}/license.${PKGNAME}"
   done
 }

src/emulationstation-git/PKGBUILD

@@ -5,34 +5,31 @@
 pkgname=emulationstation-git
 _gitname=EmulationStation
 pkgrel=1
-pkgver=1314.dc541e5
+epoch=1
+pkgver=2.4.1.r392.gb7bec0eb
 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"
 license=('MIT')
-makedepends=('git' 'boost' 'freetype2' 'eigen' 'cmake' 'mesa' 'libsm')
+makedepends=('git' 'boost' 'freetype2' 'eigen' 'cmake' 'mesa' 'libsm' 'rapidjson')
-depends=('alsa-lib' 'sdl2' 'boost-libs' 'freeimage' 'ttf-dejavu' 'glu' 'vlc')
+depends=('alsa-lib' 'sdl2' 'boost-libs' 'freeimage' 'ttf-dejavu' 'glu' 'vlc' 'libcec')
 if [ "$CARCH" = "armv6h" ]; then
 depends+=('raspberrypi-firmware')
 else
 depends+=('libgl')
 fi
-source=('git://github.com/RetroPie/EmulationStation.git'
+source=('git://github.com/RetroPie/EmulationStation.git')
-        'git://github.com/zeux/pugixml.git')
+md5sums=('SKIP')
-md5sums=('SKIP'
-         'SKIP')
 provides=('emulationstation')
 
 pkgver() {
   cd $srcdir/$_gitname
-  printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"  
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
 	cd "$srcdir/$_gitname"
-	git submodule init
+	git submodule update --init
-	git config submodule.external/pugixml.url $srcdir/pugixml
-	git submodule update
 }
 
 build() {

src/evdi/PKGBUILD

@@ -1,7 +1,8 @@
-# Maintainer: PlusMinus
+# Maintainer: mwawrzyniak
+# Contributor: PlusMinus
 
 pkgname=evdi
-pkgver=1.5.0.2
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="A Linux® kernel module that enables management of multiple screens."
 arch=('i686' 'x86_64')
@@ -18,12 +19,25 @@ backup=()
 options=()
 install=$pkgname.install
 changelog=$pkgname.Changelog
-source=($pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/DisplayLink/evdi/archive/v$pkgver.tar.gz)
+source=($pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/DisplayLink/evdi/archive/v$pkgver.tar.gz
+        relro.patch)
 noextract=()
-md5sums=('19c7dc3829b2ff84826007e7b4a3c961')
+md5sums=('e59f2372e5aa5719da9995f09725c3c7'
+         '05e64dd295a66c030139d0c8f6f7013b')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    patch -Np1 < "../$src"
+  done
+}
 
 build() {
-# We only need to build the library in this step, dmks will build the module
+# We only need to build the library in this step, dkms will build the module
 cd "$pkgname-$pkgver/library"
 
 make

src/evdi/evdi.Changelog

@@ -1,3 +1,18 @@
+v1.6.0
+EVDI driver used in DisplayLink Ubuntu Software v5.1
+- shift towards 'atomic modesetting'
+- add support for 4.19 and 4.20 kernels
+- drop support for kernels older than 4.2
+
+v1.5.1-2
+- Removed FBINFO_CAN_FORCE_OUTPUT (breaks 4.20 / apparently never worked right)
+  (https://github.com/torvalds/linux/commit/04cfcc7ab358e331b32cabde1e853a125f3f8735#diff-43768cc89c01c730cb119634b42dfa81)
+- Also added dynamic patching ability (borrowed from "linux" PKGBUILD)
+- Fixed namcap relro warning
+
+v1.5.1
+EVDI driver used in DisplayLink Ubuntu Software v4.4
+
 v1.5.0.2
 Re-release v1.5.0-r2 as v1.5.0.2 for Chrome OS only.
 

src/factorio-demo/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor: Sebastien Duthil <duthils@free.fr>
 
 pkgname=factorio-demo
-pkgver=0.15.36
+pkgver=0.16.51
 pkgrel=1
 pkgdesc="A 2D game about building and maintaining factories."
 arch=('x86_64')
@@ -12,25 +12,26 @@ depends=('libxcursor' 'alsa-lib' 'libxrandr' 'libxinerama' 'mesa')
 conflicts=('factorio' 'factorio-headless' 'factorio-experimental')
 makedepends=('xz')
 source=(factorio.desktop
-        LICENSE)
+        LICENSE
-source_x86_64=(factorio_demo_x64_${pkgver}.tar.xz::http://www.factorio.com/get-download/${pkgver}/demo/linux64)
+        factorio_demo_x64_${pkgver}.tar.xz::http://www.factorio.com/get-download/${pkgver}/demo/linux64
+)
 sha256sums=('c3bbe51c3c35641d6064ff0f8470294f8a317f0413bb149f6bd47461b03804bf'
-            '67ec2f88afff5d7e0ca5fd3301b5d98655269c161a394368fa0ec49fbc0c0e21')
+            '67ec2f88afff5d7e0ca5fd3301b5d98655269c161a394368fa0ec49fbc0c0e21'
-sha256sums_x86_64=('fcff6735880094ef3690c5c6a70261ec93c44c508cad2050f487f2a3e7438a29')
+            'ca58a5cb40f7e8b3b741bc8f9ab9d587ca0cda930d6799fd45cd9f91d00fc67d')
 
 # no modifications needed, the executable looks for:
 # - data in /usr/share/factorio
 # - config in ~/.factorio
 
 package() {
-  cd "$srcdir/factorio"
+  cd "${srcdir}/factorio"
 
   install -d "${pkgdir}/usr/bin"
   install -d "${pkgdir}/usr/share/applications"
   install -d "${pkgdir}/usr/share/factorio"
   install -d "${pkgdir}/usr/share/licenses/factorio-demo"
 
-  install -m755 bin/*/factorio "${pkgdir}/usr/bin/factorio"
+  install -m755 "bin/x64/factorio" "${pkgdir}/usr/bin/factorio"
   cp -r data/* "${pkgdir}/usr/share/factorio"
   install -m644 "${srcdir}/factorio.desktop" "${pkgdir}/usr/share/applications/factorio.desktop"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/factorio-demo/LICENSE"

src/filebot/PKGBUILD

@@ -1,3 +1,4 @@
+# Maintainer: Roman Vasilev <2rvasilev@live.ru>
 # Maintainer: max.bra <max dot bra at alice dot it>
 # Contributor: nadolph
 # Contributor: dcelasun
@@ -6,78 +7,68 @@
 # Contributor: Nathan Owe <ndowens04 at gmail>
 
 pkgname=filebot
-pkgver=4.8.4
+pkgver=4.8.5
 pkgrel=1
-_jnaver=4.5.2
+pkgdesc="The ultimate TV and Movie Renamer"
-_fixedcommit=b9572f4501ba9d5af9d445a792fa902274f37679
-pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
 arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
-url="https://github.com/filebot/filebot"
+url="https://www.filebot.net/"
-license=('GPL')
+license=('Commercial')
 install=$pkgname.install
-depends=('java-runtime>=9' 'fontconfig' 'chromaprint')
+install=()
-makedepends=('unzip' 'apache-ivy' 'jdk>=9' 'git')
+depends=('java-openjfx' 'jre8-openjdk' 'fontconfig' 'chromaprint')
+makedepends=()
+provides=('filebot')
+conflicts=('filebot47' 'filebot-git')
 
 [[ $CARCH == "i686" ]]   && _intarch=i686
-[[ $CARCH == "x86_64" ]] && _intarch=x86_64
+[[ $CARCH == "x86_64" ]] && _intarch=amd64
 [[ $CARCH == "armv7l" ]] && _intarch=armv7l
 [[ $CARCH == "armv7h" ]] && _intarch=armv7l
+[[ $CARCH == "aarch64" ]] && _intarch=armv8
 
-source=("${pkgname}::git+https://github.com/filebot/filebot.git"
+source=(#"https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-portable.tar.xz"
-        #https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz
+        "https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur.tar.xz"
-        $pkgname-arch.sh $pkgname.svg $pkgname.desktop)
+        $pkgname-arch.sh
+        #$pkgname.svg
+        #$pkgname.desktop
+        )
 
-md5sums=('SKIP'
+md5sums=('91827d5a16358316c475e58ee86b552e'
-         'fa7b8d4b811f5d9e0d27cffbb20dc0ee'
+         '7c1128f94fcd9f4e29225a12eac83704')
-         '04f46be047049448dba3f0de29fe192d'
-         'f37edd0bba7570904d28ab1681c7a7f3')
 
-optdepends=('libzen: Support for additional subtitle search engines (Sublight)'
+optdepends=('libzen: Required by libmediainfo'
-	    'libmediainfo: Episode naming / Sublight usage'
+	    'libmediainfo: Read media info such as video codec, resolution or duration'
 	    'java-p7zip-binding: Extract archives'
-	    'gvfs: gvfs backends')
+	    'gvfs: Drag-n-Drop from GVFS remote filesystems')
-
-#noextract=($(for i in ${source[@]}; do basename $i; done))
 
 prepare() {
-  cd "$srcdir/$pkgname/"
+  cd "$srcdir"
-  git checkout $_fixedcommit
-  sed -i -E 's/release="([^"]*)"/target="\1" source="\1"/' build.xml
-  sed -i -E 's/-portable.tar.xz/-portable.tar.gz/' 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
-  sed -i -E 's/tar.compression: xz/tar.compression: gzip/' 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() {
-  export JAVA_HOME=/usr/lib/jvm/java-10-jdk
+  cd $srcdir
-  cd $pkgname
-  ant resolve
-  ant jar
-  ant tar
-  cd dist
-  mkdir portable
-  tar -xf FileBot_$pkgver-portable.tar.gz -C ./portable
 }
 
 package() {
-  install -Dm644 $pkgname/dist/portable/lib/Linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
+  mkdir -p $pkgdir/usr/share/java/$pkgname/
-  cp -dpr --no-preserve=ownership $pkgname/dist/portable/jar/* "$pkgdir/usr/share/java/$pkgname/"
   
   install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+
-  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  cd "$srcdir/usr/share"
+
+  install -Dm644 $pkgname/lib/$CARCH/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
+  cp -dpr --no-preserve=ownership $pkgname/jar/* "$pkgdir/usr/share/java/$pkgname/"
+
+  cp -dpr --no-preserve=ownership icons/* "$pkgdir/usr/share/icons/"
+
+  #install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+  #install -Dm644 icons/hicolor/scalable/apps/$pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+
+  #install -Dm644 applications/*.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  mkdir -p $pkgdir/usr/share/applications/
+  cp -dpr --no-preserve=ownership applications/* "$pkgdir/usr/share/applications/"
+
+  mkdir -p $pkgdir/usr/share/mime/packages/
+  cp -dpr --no-preserve=ownership mime/* "$pkgdir/usr/share/mime/"
+  
 }

src/filebot/filebot-arch.sh

@@ -5,7 +5,6 @@ export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 
 APP_ROOT=/usr/share/java/filebot
-cd $APP_ROOT
 
 # add APP_ROOT to LD_LIBRARY_PATH
 if [ ! -z "$LD_LIBRARY_PATH" ]; then
@@ -20,5 +19,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=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/filebot $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@"
+/usr/lib/jvm/java-8-openjdk/bin/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/filebot $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@"
 

src/filebot/filebot.install

@@ -1,6 +1,8 @@
 post_install() {
 echo -e "\e[1;33m==>\e[0m if you use OpenJDK as Java VM you \e[1;31mmust\e[0m also install OpenJFX"
 echo -e "\e[1;33m==>\e[0m \e[1;36mhttps://wiki.archlinux.org/index.php/Java#OpenJFX\e[0m"
+echo ""
+echo -e "\e[1;33m==>\e[0m \e[1;31mfilebot --license license.file\e[0m will activate your license.file
 }
 
 post_upgrade() {

src/gajim-plugin-omemo/PKGBUILD

@@ -2,17 +2,17 @@
 
 pkgname=gajim-plugin-omemo
 _pkgname=omemo
-pkgver=2.5.13
+pkgver=2.6.27
 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>=1.0.0" "python-qrcode" "python-setuptools" "python-cryptography" "python-axolotl")
+depends=("gajim>=1.0.99" "gajim<=1.1.90" "python-qrcode" "python-setuptools" "python-cryptography" "python-axolotl")
 provides=('gajim-plugin-omemo')
 conflicts=('gajim-plugin-omemo-git')
 source=("https://ftp.gajim.org/plugins_releases/${_pkgname}_${pkgver}.zip")
-sha512sums=('f5a22f2d7ee6c8b5c8e49df6bcbba05f8dfebff2c764470fa8c80c0ccf667f964fd33d5f4541cc1f6d5d4058c74ac9398b1e0c4ec10d37f3d40eb08d922180d9')
+sha512sums=('886319c373bb6435626bd36103221c375cd419d7a39970c36f4a5950aff565a17c4d050fa147e3f50d4987371885a559f0fbdecad4f85e1b87a3f049c49f9078')
 
 package() {
   cd ${srcdir}/${_pkgname}
@@ -21,8 +21,8 @@ package() {
   rm -r CHANGELOG COPYING
 
   # Install the plugin
-  install -d ${pkgdir}/usr/lib/python3.6/site-packages/gajim/data/plugins/${_pkgname}
+  install -d ${pkgdir}/usr/lib/python3.7/site-packages/gajim/data/plugins/${_pkgname}
-  cp -r * ${pkgdir}/usr/lib/python3.6/site-packages/gajim/data/plugins/${_pkgname}/
+  cp -r * ${pkgdir}/usr/lib/python3.7/site-packages/gajim/data/plugins/${_pkgname}/
 }
 
 # vim:set ts=2 sw=2 et:

src/hivex/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=hivex
 pkgver=1.3.15
-pkgrel=2
+pkgrel=3
 pkgdesc="System for extracting the contents of Windows Registry."
 arch=("i686" "x86_64")
 url="http://libguestfs.org"

src/intellij-idea-ultimate-edition/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgbase=intellij-idea-ultimate-edition
 pkgname=(intellij-idea-ultimate-edition intellij-idea-ultimate-edition-jre)
-pkgver=2018.3.4
+pkgver=2018.3.5
-_buildver=183.5429.30
+_buildver=183.5912.21
 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=('3866349090ea295c0ac4f1b77d20c74d8c9647e73e5ad541c61b3dfbfc4ab5f3'
+sha256sums=('b696da5c3521638f83891191f3bd9063d30d0b7ea81ad0bf9500f2b41840d078'
             '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:

src/isl/PKGBUILD

@@ -4,31 +4,28 @@
 
 pkgname=isl
 pkgver=0.20
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
 arch=('i686' 'x86_64')
 url="http://isl.gforge.inria.fr/"
-makedepends=('git')
 depends=('gmp')
 license=('MIT')
 conflicts=('isl-git' 'isl14' 'isl15' 'isl16' 'isl17')
-source=("isl::git+http://repo.or.cz/isl.git#tag=isl-${pkgver}")
+source=("http://isl.gforge.inria.fr/isl-${pkgver}.tar.gz")
-sha256sums=('SKIP')
+sha256sums=('cf4ec18538df940ad5d5760af1246825cc58dd295241ab41d3f3962b24f55199')
-
 build() {
-  cd ${srcdir}/${pkgname}
+  cd ${srcdir}/${pkgname}-${pkgver}
-  ./autogen.sh
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}
+  cd ${srcdir}/${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   make DESTDIR="$pkgdir" install
 

src/jdk-devel/LICENSE-Early-Adopter-Development-Agreement.txt

@@ -1,95 +0,0 @@
-Oracle Technology Network Early Adopter Development License Agreement
-
-EXPORT CONTROLS
-Export laws and regulations of the United States and any other relevant local export laws and regulations apply to the Oracle Technology.  You agree that such export control laws govern Your use of the Oracle Technology (including technical data) and any services deliverables provided under this agreement, and You agree to comply with all such export laws and regulations (including “deemed export” and  “deemed re-export” regulations).  You agree that no data, information, program and/or materials resulting from services (or direct product thereof) will be exported, directly or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology.
-
-Accordingly, You confirm:
-
--You will not download, provide, make available or otherwise export or re-export the Oracle Technology, directly or indirectly, to countries prohibited by applicable laws and regulations nor to citizens, nationals or residents of those countries.
-
--You are not listed on the United States Department of Treasury lists of Specially Designated Nationals and Blocked Persons, Specially Designated Terrorists, and Specially Designated Narcotic Traffickers, nor are You listed on the United States Department of Commerce Table of Denial Orders.
-
-- You will not download or otherwise export or re-export the Oracle Technology, directly or indirectly, to persons on the above mentioned lists.
-
-- You will not use the Oracle Technology for, and will not allow the Oracle Technology to be used for, any purposes prohibited by applicable law, including, without limitation, for the development, design, manufacture or production of nuclear, chemical or biological weapons of mass destruction.
-
-Oracle Employees: Under no circumstances are Oracle Employees authorized to download software for the purpose of distributing it to customers. Oracle products are available to employees for internal use or demonstration purposes only. In keeping with Oracle's trade compliance obligations under U.S. and applicable multilateral law, failure to comply with this policy could result in disciplinary action up to and including termination.
-
-Note: You are bound by the Oracle Technology Network ("OTN") Early Adopter Development License Agreement (“OTN License Agreement”) terms. The OTN License Agreement terms also apply to all updates You receive under Your Technology Track subscription.
-
-The OTN License Agreement terms below supercede any shrinkwrap license on the OTN Technology Track software CDs and previous OTN License terms (including the Oracle Program License as modified by the OTN Program Use Certificate).
-
-PLEASE READ THE FOLLOWING LICENSE AGREEMENT TERMS AND CONDITIONS CAREFULLY BEFORE ACCESSING, DOWNLOADING, INSTALLING OR USING THE ORACLE TECHNOLOGY. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU AND ORACLE.
-
-Oracle Technology Network Early Adopter Development License Agreement
-
-"Oracle,” We," "Us," and "Our" refers to Oracle America, Inc., for and on behalf of itself and its subsidiaries and affiliates under common control. "You" and "Your" refers to the individual or entity, for which You are an authorized representative with full authority to enter into this agreement on behalf of, that wishes to use the Programs. "Programs" refers to the pre-production version of the Oracle software product You wish to access and use or download and use, including program documentation, if any. “Supplemental Programs” refer to any supplemental Oracle production software as may be provided by Oracle for operation of the Programs. If included, Supplemental Programs are listed in Exhibit A to this Agreement. Programs and any Supplemental Programs are collectively “Oracle Technology”. "License" refers to Your right to use the Oracle Technology under the terms of this license agreement. “Oracle Confidential Information” includes the Software, any information related to the Software and Feedback. Oracle Confidential Information shall not include information which: (a) is or becomes a part of the public domain through no act or omission of the other party; or (b) was in the other party’s lawful possession prior to the disclosure and had not been obtained by the other party either directly or indirectly from the disclosing party; or (c) is lawfully disclosed to the other party by a third party without restriction on disclosure; or (d) except for Feedback, is independently developed by You. You agree, both during the term of this Agreement and for a period of three years after termination of this Agreement and of all licenses granted hereunder, to hold Oracle Confidential Information in confidence. You agree not to make Oracle’s Confidential Information available in any form to any unauthorized third parties. You agree to take all reasonable steps to ensure that Confidential Information is not disclosed or distributed by Your employees or agents in violation of the provisions of this Agreement.
-
-This agreement is governed by California law, except for that body of laws related to the conflict of laws. You agree to submit to the exclusive jurisdiction of, and venue in, the courts located in San Francisco or Santa Clara counties in California in any dispute arising out of or relating to this agreement or the Oracle Technology.
-
-In order to use the Oracle Technology, You must first agree to the license terms below by selecting the "Accept License Agreement" (or the equivalent) button below. If You do not or cannot agree to these license terms, You are not permitted to access, download or use the Oracle Technology.
-
-License Rights
-We grant You a revocable, nonexclusive, nontransferable, royalty-free and limited right to (a) use one (1) copy of the binary portions of the Programs and any Supplemental Programs for the sole purpose of internal non-production and non-commercial evaluation and testing of the Programs, including, developing no more than a single prototype of each of Your applications; and (b) if provided by Us at our sole discretion, view the source code portions of the Programs internally for the purposes of evaluation and testing only (collectively, “Authorized Use”).
-
-All rights not expressly granted above are hereby reserved. If You want to use the Oracle Technology for any purpose other than as permitted under this agreement, including but not limited to distribution of the Oracle Technology or the application You develop or any use of the Oracle Technology or the application You develop for Your internal business purposes (other than the Authorized Use), You must obtain a valid Oracle license permitting such use.
-
-You acknowledge that (1) the Programs are not generally available and may have defects, security vulnerabilities, or other deficiencies that may not and/or cannot be corrected by Us and are subject to change at Our sole discretion; and (2) We may not produce a production release version of the Programs and any development efforts undertaken by You are at Your own risk. We may audit Your use of the Oracle Technology.
-
-The Oracle Technology will either be hosted by Oracle or provided to You. In the event that the Oracle Technology are provided to You in a hosted environment, Oracle may provide certain passwords and/or other access information to enable You to access the Oracle Technology. These passwords and/or access information shall be and are Oracle Confidential Information under the terms of this agreement and shall be used solely for the purpose of accessing the Oracle Technology for the evaluation and testing purposes described above. Any hosted instance of the Oracle Technology is provided as is and without warranty. Oracle makes no assurances that any data loaded into the hosted instance will be secured or that such data will remain confidential. Further, Oracle, at its discretion, (a) may access, monitor, and/or review Your activity and data in the hosted instance, and (b) may delete Your files within the hosted instance. Accordingly, Oracle advises You not to place any personal information or other production data into the hosted instance. You agree to take all reasonable steps to prevent improper or unauthorized access to or use of the Oracle Technology.
-
-Collection of Information
-The Oracle Technology may collect certain technical information regarding Your use of the Oracle Technology for the purpose of improving the functionality of the Oracle Technology. Except as set forth above with respect to Oracle-hosted instances of the Oracle Technology, Oracle will comply with its Privacy Policy in effect as data collection services are performed, which is available at http://www.oracle.com/us/legal/privacy/index.html .
-
-Ownership and Restrictions
-We retain all ownership and intellectual property rights in the Oracle Technology. The Oracle Technology may be accessed from the hosted environment or if the Oracle Technology are provided to You, the Oracle Technology may be installed on one computer only, and used by Your employees or agents in the operating environment identified by Us. You may make one copy of the Oracle Technology for backup purposes.
-
-The license grant set forth above is subject to the following additional specific agreements and covenants:
-
-(i) You shall not use the Oracle Technology for training, commercial time-sharing or service bureau use;
-
-(ii) You agree that it will not make copies of the Oracle Technology except for backup purposes;
-
-(iii) You agree not to cause or permit the disassembly, reverse compilation, or reverse engineering of the Oracle Technology, except as otherwise specified by law; and
-
-(iv) You shall not remove any product identification, copyright notices, or other notices or proprietary restrictions from the Oracle Technology.
-
-Feedback 
-”Feedback” shall mean any input provided to Us, in any manner, regarding Oracle’s products, documentation and/or services, including changes or suggested changes to Oracle’s current or future products, documentation, and/or services, and benchmark test results. You grant to Oracle a worldwide, royalty-free, non-exclusive, perpetual, and irrevocable right to use Feedback for any purpose, including but not limited to, incorporation of such Feedback into the Software or other software products without compensation to You. Any Feedback shall be Oracle Confidential Information. You shall not be identified with Feedback if Oracle provides it to a third party.
-
-Export
-You agree to comply fully with export laws and regulations of the United States and any other applicable export laws ("Export Laws") to assure that neither the Software, Confidential Information nor any direct product thereof are:  (1) exported, directly or indirectly, in violation of this Agreement or Export Laws; or (2) used for any purposes prohibited by the Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology.  
-
-Disclaimer of Warranty and Exclusive Remedies
-THE ORACLE TECHNOLOGY IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, ACCURACY, TIMELINESS OR NONINFRINGEMENT.
-
-IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000).
-
-Additional Trial Programs
-We may include additional trial programs with the Programs licensed under this agreement which You download or access in the hosted environment. You will have 30 days from the delivery date or hosted environment access date to evaluate these additional trial programs. Any use of these trial programs after the 30 day trial period requires You to obtain the applicable license. Any additional trial programs are provided "as is" and We do not provide technical support or any warranties for these programs.
-
-No Technical Support
-Our technical support organization will not provide technical support, phone support, or updates to You for the Oracle Technology licensed under this agreement.
-
-End of Agreement
-This agreement, and Your right to use the Programs, will be terminated: (i) automatically upon the general commercial availability of the Programs, or six months from the date You download the Programs, whichever is first to occur, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control; (ii) by You, by ceasing to use and destroying all copies of the Oracle Technology in Your possession or control; or, (iii) by Us if You fail to comply with any of the terms of this agreement, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control.
-
-Relationship Between the Parties
-The relationship between You and Us is that of licensee/licensor. Neither party will represent that it has any authority to assume or create any obligation, express or implied, on behalf of the other party, nor to represent the other party as agent, employee, franchisee, or in any other capacity. Nothing in this agreement shall be construed to limit either party's right to independently develop or distribute software that is functionally similar to the other party's products, so long as proprietary information of the other party is not included in such software.
-
-Third-Party Technology 
-The Oracle Technology may be distributed to You with third party technology or derivatives of third party technology (“Third Party Technology”).  Oracle may provide certain notices to You in Oracle Technology documentation, readmes or otherwise in connection with such Third Party Technology. 
-
-Third Party Technology will be licensed to You either under the terms of this agreement, or, if specified in the Oracle Technology documentation, readme files or otherwise, under separate license terms (“Separate Terms”) and not under the terms of this agreement (“Separately Licensed Third Party Technology”).   Your rights to use such Separately Licensed Third Party Technology under the Separate Terms are not restricted or modified in any way by this agreement.
-
-Entire Agreement
-You agree that this agreement is the complete agreement for the Oracle Technology and licenses, and, except as may be expressly set forth in Exhibit A, this agreement supersedes all prior or contemporaneous agreements or representations, including any clickwrap, shrinkwrap or similar licenses. If any term of this agreement is found to be invalid or unenforceable, the remaining provisions will remain effective.
-
-Last updated: 24 February 2015
-
-Should You have any questions concerning this License Agreement, or if You desire to contact Oracle for any reason, please write: 
-Oracle America, Inc. 
-500 Oracle Parkway, 
-Redwood City, CA 94065
-
-Oracle may contact You to ask if You had a satisfactory experience installing and using this software download and/or accessing and using the hosted environment.

src/jdk-devel/LICENSE-Early-Adopter-Terms.txt

@@ -1,95 +0,0 @@
-Oracle Technology Network Early Adopter Development License Agreement
-
-EXPORT CONTROLS
-Export laws and regulations of the United States and any other relevant local export laws and regulations apply to the Oracle Technology.  You agree that such export control laws govern Your use of the Oracle Technology (including technical data) and any services deliverables provided under this agreement, and You agree to comply with all such export laws and regulations (including “deemed export” and  “deemed re-export” regulations).  You agree that no data, information, program and/or materials resulting from services (or direct product thereof) will be exported, directly or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology.
-
-Accordingly, You confirm:
-
--You will not download, provide, make available or otherwise export or re-export the Oracle Technology, directly or indirectly, to countries prohibited by applicable laws and regulations nor to citizens, nationals or residents of those countries.
-
--You are not listed on the United States Department of Treasury lists of Specially Designated Nationals and Blocked Persons, Specially Designated Terrorists, and Specially Designated Narcotic Traffickers, nor are You listed on the United States Department of Commerce Table of Denial Orders.
-
-- You will not download or otherwise export or re-export the Oracle Technology, directly or indirectly, to persons on the above mentioned lists.
-
-- You will not use the Oracle Technology for, and will not allow the Oracle Technology to be used for, any purposes prohibited by applicable law, including, without limitation, for the development, design, manufacture or production of nuclear, chemical or biological weapons of mass destruction.
-
-Oracle Employees: Under no circumstances are Oracle Employees authorized to download software for the purpose of distributing it to customers. Oracle products are available to employees for internal use or demonstration purposes only. In keeping with Oracle's trade compliance obligations under U.S. and applicable multilateral law, failure to comply with this policy could result in disciplinary action up to and including termination.
-
-Note: You are bound by the Oracle Technology Network ("OTN") Early Adopter Development License Agreement (“OTN License Agreement”) terms. The OTN License Agreement terms also apply to all updates You receive under Your Technology Track subscription.
-
-The OTN License Agreement terms below supercede any shrinkwrap license on the OTN Technology Track software CDs and previous OTN License terms (including the Oracle Program License as modified by the OTN Program Use Certificate).
-
-PLEASE READ THE FOLLOWING LICENSE AGREEMENT TERMS AND CONDITIONS CAREFULLY BEFORE ACCESSING, DOWNLOADING, INSTALLING OR USING THE ORACLE TECHNOLOGY. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU AND ORACLE.
-
-Oracle Technology Network Early Adopter Development License Agreement
-
-"Oracle,” We," "Us," and "Our" refers to Oracle America, Inc., for and on behalf of itself and its subsidiaries and affiliates under common control. "You" and "Your" refers to the individual or entity, for which You are an authorized representative with full authority to enter into this agreement on behalf of, that wishes to use the Programs. "Programs" refers to the pre-production version of the Oracle software product You wish to access and use or download and use, including program documentation, if any. “Supplemental Programs” refer to any supplemental Oracle production software as may be provided by Oracle for operation of the Programs. If included, Supplemental Programs are listed in Exhibit A to this Agreement. Programs and any Supplemental Programs are collectively “Oracle Technology”. "License" refers to Your right to use the Oracle Technology under the terms of this license agreement. “Oracle Confidential Information” includes the Software, any information related to the Software and Feedback. Oracle Confidential Information shall not include information which: (a) is or becomes a part of the public domain through no act or omission of the other party; or (b) was in the other party’s lawful possession prior to the disclosure and had not been obtained by the other party either directly or indirectly from the disclosing party; or (c) is lawfully disclosed to the other party by a third party without restriction on disclosure; or (d) except for Feedback, is independently developed by You. You agree, both during the term of this Agreement and for a period of three years after termination of this Agreement and of all licenses granted hereunder, to hold Oracle Confidential Information in confidence. You agree not to make Oracle’s Confidential Information available in any form to any unauthorized third parties. You agree to take all reasonable steps to ensure that Confidential Information is not disclosed or distributed by Your employees or agents in violation of the provisions of this Agreement.
-
-This agreement is governed by California law, except for that body of laws related to the conflict of laws. You agree to submit to the exclusive jurisdiction of, and venue in, the courts located in San Francisco or Santa Clara counties in California in any dispute arising out of or relating to this agreement or the Oracle Technology.
-
-In order to use the Oracle Technology, You must first agree to the license terms below by selecting the "Accept License Agreement" (or the equivalent) button below. If You do not or cannot agree to these license terms, You are not permitted to access, download or use the Oracle Technology.
-
-License Rights
-We grant You a revocable, nonexclusive, nontransferable, royalty-free and limited right to (a) use one (1) copy of the binary portions of the Programs and any Supplemental Programs for the sole purpose of internal non-production and non-commercial evaluation and testing of the Programs, including, developing no more than a single prototype of each of Your applications; and (b) if provided by Us at our sole discretion, view the source code portions of the Programs internally for the purposes of evaluation and testing only (collectively, “Authorized Use”).
-
-All rights not expressly granted above are hereby reserved. If You want to use the Oracle Technology for any purpose other than as permitted under this agreement, including but not limited to distribution of the Oracle Technology or the application You develop or any use of the Oracle Technology or the application You develop for Your internal business purposes (other than the Authorized Use), You must obtain a valid Oracle license permitting such use.
-
-You acknowledge that (1) the Programs are not generally available and may have defects, security vulnerabilities, or other deficiencies that may not and/or cannot be corrected by Us and are subject to change at Our sole discretion; and (2) We may not produce a production release version of the Programs and any development efforts undertaken by You are at Your own risk. We may audit Your use of the Oracle Technology.
-
-The Oracle Technology will either be hosted by Oracle or provided to You. In the event that the Oracle Technology are provided to You in a hosted environment, Oracle may provide certain passwords and/or other access information to enable You to access the Oracle Technology. These passwords and/or access information shall be and are Oracle Confidential Information under the terms of this agreement and shall be used solely for the purpose of accessing the Oracle Technology for the evaluation and testing purposes described above. Any hosted instance of the Oracle Technology is provided as is and without warranty. Oracle makes no assurances that any data loaded into the hosted instance will be secured or that such data will remain confidential. Further, Oracle, at its discretion, (a) may access, monitor, and/or review Your activity and data in the hosted instance, and (b) may delete Your files within the hosted instance. Accordingly, Oracle advises You not to place any personal information or other production data into the hosted instance. You agree to take all reasonable steps to prevent improper or unauthorized access to or use of the Oracle Technology.
-
-Collection of Information
-The Oracle Technology may collect certain technical information regarding Your use of the Oracle Technology for the purpose of improving the functionality of the Oracle Technology. Except as set forth above with respect to Oracle-hosted instances of the Oracle Technology, Oracle will comply with its Privacy Policy in effect as data collection services are performed, which is available at http://www.oracle.com/us/legal/privacy/index.html .
-
-Ownership and Restrictions
-We retain all ownership and intellectual property rights in the Oracle Technology. The Oracle Technology may be accessed from the hosted environment or if the Oracle Technology are provided to You, the Oracle Technology may be installed on one computer only, and used by Your employees or agents in the operating environment identified by Us. You may make one copy of the Oracle Technology for backup purposes.
-
-The license grant set forth above is subject to the following additional specific agreements and covenants:
-
-(i) You shall not use the Oracle Technology for training, commercial time-sharing or service bureau use;
-
-(ii) You agree that it will not make copies of the Oracle Technology except for backup purposes;
-
-(iii) You agree not to cause or permit the disassembly, reverse compilation, or reverse engineering of the Oracle Technology, except as otherwise specified by law; and
-
-(iv) You shall not remove any product identification, copyright notices, or other notices or proprietary restrictions from the Oracle Technology.
-
-Feedback 
-”Feedback” shall mean any input provided to Us, in any manner, regarding Oracle’s products, documentation and/or services, including changes or suggested changes to Oracle’s current or future products, documentation, and/or services, and benchmark test results. You grant to Oracle a worldwide, royalty-free, non-exclusive, perpetual, and irrevocable right to use Feedback for any purpose, including but not limited to, incorporation of such Feedback into the Software or other software products without compensation to You. Any Feedback shall be Oracle Confidential Information. You shall not be identified with Feedback if Oracle provides it to a third party.
-
-Export
-You agree to comply fully with export laws and regulations of the United States and any other applicable export laws ("Export Laws") to assure that neither the Software, Confidential Information nor any direct product thereof are:  (1) exported, directly or indirectly, in violation of this Agreement or Export Laws; or (2) used for any purposes prohibited by the Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology.  
-
-Disclaimer of Warranty and Exclusive Remedies
-THE ORACLE TECHNOLOGY IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, ACCURACY, TIMELINESS OR NONINFRINGEMENT.
-
-IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000).
-
-Additional Trial Programs
-We may include additional trial programs with the Programs licensed under this agreement which You download or access in the hosted environment. You will have 30 days from the delivery date or hosted environment access date to evaluate these additional trial programs. Any use of these trial programs after the 30 day trial period requires You to obtain the applicable license. Any additional trial programs are provided "as is" and We do not provide technical support or any warranties for these programs.
-
-No Technical Support
-Our technical support organization will not provide technical support, phone support, or updates to You for the Oracle Technology licensed under this agreement.
-
-End of Agreement
-This agreement, and Your right to use the Programs, will be terminated: (i) automatically upon the general commercial availability of the Programs, or six months from the date You download the Programs, whichever is first to occur, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control; (ii) by You, by ceasing to use and destroying all copies of the Oracle Technology in Your possession or control; or, (iii) by Us if You fail to comply with any of the terms of this agreement, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control.
-
-Relationship Between the Parties
-The relationship between You and Us is that of licensee/licensor. Neither party will represent that it has any authority to assume or create any obligation, express or implied, on behalf of the other party, nor to represent the other party as agent, employee, franchisee, or in any other capacity. Nothing in this agreement shall be construed to limit either party's right to independently develop or distribute software that is functionally similar to the other party's products, so long as proprietary information of the other party is not included in such software.
-
-Third-Party Technology 
-The Oracle Technology may be distributed to You with third party technology or derivatives of third party technology (“Third Party Technology”).  Oracle may provide certain notices to You in Oracle Technology documentation, readmes or otherwise in connection with such Third Party Technology. 
-
-Third Party Technology will be licensed to You either under the terms of this agreement, or, if specified in the Oracle Technology documentation, readme files or otherwise, under separate license terms (“Separate Terms”) and not under the terms of this agreement (“Separately Licensed Third Party Technology”).   Your rights to use such Separately Licensed Third Party Technology under the Separate Terms are not restricted or modified in any way by this agreement.
-
-Entire Agreement
-You agree that this agreement is the complete agreement for the Oracle Technology and licenses, and, except as may be expressly set forth in Exhibit A, this agreement supersedes all prior or contemporaneous agreements or representations, including any clickwrap, shrinkwrap or similar licenses. If any term of this agreement is found to be invalid or unenforceable, the remaining provisions will remain effective.
-
-Last updated: 24 February 2015
-
-Should You have any questions concerning this License Agreement, or if You desire to contact Oracle for any reason, please write: 
-Oracle America, Inc. 
-500 Oracle Parkway, 
-Redwood City, CA 94065
-
-Oracle may contact You to ask if You had a satisfactory experience installing and using this software download and/or accessing and using the hosted environment.

src/jdk-devel/PKGBUILD

@@ -1,109 +0,0 @@
-# Maintainer: Det <nimetonmaili g-mail>
-
-_pkgname=jdk
-pkgname=jdk-devel
-_major=11
-_build=28
-_jname=${_pkgname}${_major}
-pkgver=${_major}b${_build}
-pkgrel=1
-pkgdesc="Oracle Java $_major Development Kit Snapshot"
-arch=('x86_64')
-url="http://jdk.java.net/$_major/"
-license=('custom:Oracle')
-depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils')
-optdepends=('alsa-lib: for basic sound support'
-            'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
-            'gtk2: for Gtk+ look and feel (desktop)')
-provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
-          "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major"
-          "java-openjfx=$_major" "$_jname")
-conflicts=("$_jname")
-_jvmdir=/usr/lib/jvm/java-$_major-$_pkgname
-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/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}+${_build}_linux-x64_bin.tar.gz"
-        'java.desktop'
-        'jconsole.desktop'
-        'java_16.png'
-        'java_48.png'
-        'LICENSE-Early-Adopter-Development-Agreement.txt')
-sha256sums=('58e7d9d42e5251803773c7b28e67b1848d3fe152cc7f150078285e61856c741f'
-            'ed7392cbad258da943d39e9a5fab1ee6ab6a287ac0c20172805d5dbfc5accedb'
-            'e8544f5384d541c16973543ace0f812e2dea657eed551a70baebb1a0cd9f3771'
-            'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed'
-            '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176'
-            '36d48f14c16f0dcc98a8ce2301fd2a111701e6f59a7da08b0e51fdb3e2f9ca89')
-
-package() {
-  cd $_pkgname-$_major
-
-  msg2 "Creating directory structure..."
-  install -d "$pkgdir"/etc/.java/.systemPrefs
-  install -d "$pkgdir"/usr/lib/jvm/java-$_major-$_pkgname/bin
-  install -d "$pkgdir"/usr/lib/mozilla/plugins
-  install -d "$pkgdir"/usr/share/licenses/java$_major-$_pkgname
-
-  msg2 "Moving contents..."
-  mv * "$pkgdir"/$_jvmdir
-
-  # Cd to the new playground
-  cd "$pkgdir"/$_jvmdir
-
-  msg2 "Fixing directory structure..."
-  # Create a placeholder 'jre' link
-  ln -s . jre
-
-  # 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 + 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
-
-  # 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
-    new_etc_path="/etc/java-$_jname/${sub_path/conf\/}"
-
-    # Move & link
-    install -Dm644 "$sub_path" "$pkgdir/$new_etc_path"
-    ln -sf "$new_etc_path" "$sub_path"
-  done
-
-  # Link NPAPI plugin
-  ln -sf $_jvmdir/lib/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so
-
-  # Replace JKS keystore with 'ca-certificates-java'
-  ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
-
-  # Move & link licenses
-  mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
-  install -m644 "$srcdir"/LICENSE-Early-Adopter-Development-Agreement.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
-  ln -sf /usr/share/licenses/java$_major-$_pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
-
-  msg2 "Enabling copy+paste in unsigned applets..."
-  # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
-  # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
-  # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html
-  _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy)
-  sed "$_line a\\\\n \
-    // (AUR) Allow unsigned applets to read system clipboard, see:\n \
-    // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \
-    // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \
-    permission java.awt.AWTPermission \"accessClipboard\";" \
-    -i "$pkgdir"/etc/java-$_jname/security/java.policy
-}

src/jdk-devel/java.desktop

@@ -1,25 +0,0 @@
-#
-# 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;

src/jdk-devel/jconsole-jdk9.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jdk/bin/jconsole
-Icon=sun-java-jdk9
-Name=Java 9 Monitoring and Management Console
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;

src/jdk-devel/jconsole.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-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
-Categories=Development;Java;

src/jdk-devel/jdk-devel.install

@@ -1,74 +0,0 @@
-VERSION='11'
-THIS_JAVA='java-${VERSION}-jdk'
-NAME='JDK Devel'
-
-all_off="$(tput sgr0)"
-bold="${all_off}$(tput bold)"
-blue="${bold}$(tput setaf 4)"
-yellow="${bold}$(tput setaf 3)"
-
-note() {
-    printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n"
-}
-
-note2() {
-    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
-}
-
-post_install() {
-    default=$(archlinux-java get)
-    case ${default} in
-        "")
-            archlinux-java set ${THIS_JAVA}
-            note "${NAME} ('${THIS_JAVA}') set as default Java environment."
-            ;;
-        ${THIS_JAVA})
-            note "${NAME} ('${THIS_JAVA}') set as default Java environment."
-            ;;
-        *)
-            note "Default Java environment already set to '${default}'.
-                   To use ${NAME} ('${THIS_JAVA}'), run:
-                     # archlinux-java set ${THIS_JAVA}
-                   For status, use:
-                     $ archlinux-java status"
-            ;;
-    esac
-
-    if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then
-        update-ca-trust
-    fi
-    
-    note2 "Since Oracle Java 9, some Qt 5 applications (such as the reader apps Zeal and
-          GoldenDict) will crash due to the existance of the Java NPAPI plugin symlink
-          (/usr/lib/mozilla/plugins/libnpjp2-jdk${VERSION}.so).
-          
-          See: 
-          - https://github.com/zealdocs/zeal/issues/802
-          - https://bbs.archlinux.org/viewtopic.php?id=231222"
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    default=$(archlinux-java get)
-    if [[ ${default} = ${THIS_JAVA} ]]; then
-        archlinux-java unset
-    fi
-}
-
-post_remove() {
-    default=$(archlinux-java get) # reassign
-    if [[ ${default} ]]; then
-        note "Default Java environment is '${default}'."
-    else
-        archlinux-java fix
-        default=$(archlinux-java get) # re-reassign
-        if [[ ${default} ]]; then
-            note "Default Java environment left as '${default}'."
-        else
-            note "Java environment unset."
-        fi
-    fi
-}

src/jdk-devel/jmc-jdk9.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jdk/bin/jmc
-Icon=sun-java-jdk9
-Name=Java 9 Mission Control
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;

src/jdk-devel/jvisualvm-jdk9.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jdk/bin/jvisualvm
-GenericName=Java Monitoring and Performance Monitoring Tool
-Icon=sun-java-jdk9
-Name=Java 9 VisualVM
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;

src/jdk-devel/policytool-jdk9.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jdk/bin/policytool
-Icon=sun-java-jdk9
-Name=Java 9 Policy Settings
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;

src/jdk/PKGBUILD

@@ -1,124 +0,0 @@
-# Maintainer: Det <nimetonmaili g-mail>
-
-pkgname=jdk
-pkgver=10.0.2
-_major=${pkgver/.*}
-_build=13
-_hash=19aef61b38124481863b1413dce1855f
-_jname=${pkgname}${_major}
-pkgrel=1
-pkgdesc="Oracle Java Development Kit"
-arch=('x86_64')
-url="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
-license=('custom:Oracle')
-depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils')
-optdepends=('alsa-lib: for basic sound support'
-            'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
-            'gtk2: for Gtk+ look and feel (desktop)')
-provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
-          "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major"
-          "java-openjfx=$_major" "$_jname")
-conflicts=("$_jname")
-_jvmdir=/usr/lib/jvm/java-$_major-$pkgname
-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=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/${pkgname}-${pkgver}_linux-x64_bin.tar.gz"
-        "jconsole.desktop"
-        "jmc.desktop"
-        "policytool.desktop")
-sha256sums=('6633c20d53c50c20835364d0f3e172e0cbbce78fff81867488f22a6298fa372b'
-            '3ea717825268a66837380c9ca2b076f02a3298d2df48c3450152fdaf1d0dbc6e'
-            '365b33b197e6be65ad746e5ed864428e45ae1e24dba53aa7d9c71de0644cf4e2'
-            '5dfde6ee531056571d9601d47fbb4a3e56062e4d611667a56ba7931ec7948b36')
-            
-DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
-
-package() {
-  cd $pkgname-$pkgver
-
-  msg2 "Creating directory structure..."
-  install -d "$pkgdir"/etc/.java/.systemPrefs
-  install -d "$pkgdir"/usr/lib/jvm/java-$_major-$pkgname/bin
-  install -d "$pkgdir"/usr/lib/mozilla/plugins
-  install -d "$pkgdir"/usr/share/licenses/java$_major-$pkgname
-
-  msg2 "Removing redundancies..."
-  rm -r lib/desktop/icons/HighContrast
-  rm -r lib/desktop/icons/HighContrastInverse
-  rm -r lib/desktop/icons/LowContrast
-  rm  lib/fontconfig.*.bfc
-  rm  lib/fontconfig.*.properties.src
-
-  msg2 "Moving contents..."
-  mv * "$pkgdir"/$_jvmdir
-
-  # Cd to the new playground
-  cd "$pkgdir"/$_jvmdir
-
-  msg2 "Fixing directory structure..."
-  # Create a placeholder 'jre' link
-  ln -s . jre
-
-  # Fix bundled .desktops
-  sed -e "s|Exec=|Exec=$_jvmdir/bin/|" \
-      -e "s|.png|-$_jname.png|" \
-      -i lib/desktop/applications/*
-
-  # 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
-  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
-    new_etc_path="/etc/java-$_jname/${sub_path/conf\/}"
-
-    # Move & link
-    install -Dm644 "$sub_path" "$pkgdir/$new_etc_path"
-    ln -sf "$new_etc_path" "$sub_path"
-  done
-
-  # Link NPAPI plugin
-  ln -sf $_jvmdir/lib/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so
-
-  # Replace JKS keystore with 'ca-certificates-java'
-  ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
-
-  # Move & link licenses
-  mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
-  ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
-
-  msg2 "Enabling copy+paste in unsigned applets..."
-  # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
-  # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
-  # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html
-  _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy)
-  sed "$_line a\\\\n \
-    // (AUR) Allow unsigned applets to read system clipboard, see:\n \
-    // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \
-    // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \
-    permission java.awt.AWTPermission \"accessClipboard\";" \
-    -i "$pkgdir"/etc/java-$_jname/security/java.policy
-}

src/jdk/jconsole-jdk8.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jdk/bin/jconsole
-Icon=sun-java-jdk8
-Name=Java Monitoring and Management Console
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;

src/jdk/jconsole.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-<version>-jdk/bin/jconsole
-Icon=sun-java-jdk<version>
-Name=Java Monitoring and Management Console
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;

src/jdk/jdk.install

@@ -1,74 +0,0 @@
-VERSION='<version>'
-THIS_JAVA='java-${VERSION}-jdk'
-NAME='JDK'
-
-all_off="$(tput sgr0)"
-bold="${all_off}$(tput bold)"
-blue="${bold}$(tput setaf 4)"
-yellow="${bold}$(tput setaf 3)"
-
-note() {
-    printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n"
-}
-
-note2() {
-    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
-}
-
-post_install() {
-    default=$(archlinux-java get)
-    case ${default} in
-        "")
-            archlinux-java set ${THIS_JAVA}
-            note "${NAME} ('${THIS_JAVA}') set as default Java environment."
-            ;;
-        ${THIS_JAVA})
-            note "${NAME} ('${THIS_JAVA}') set as default Java environment."
-            ;;
-        *)
-            note "Default Java environment already set to '${default}'.
-                   To use ${NAME} ('${THIS_JAVA}'), run:
-                     # archlinux-java set ${THIS_JAVA}
-                   For status, use:
-                     $ archlinux-java status"
-            ;;
-    esac
-
-    if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then
-        update-ca-trust
-    fi
-
-    note2 "Since Oracle Java 9, some Qt 5 applications (such as the reader apps Zeal and
-          GoldenDict) will crash due to the existance of the Java NPAPI plugin symlink
-          (/usr/lib/mozilla/plugins/libnpjp2-jdk${VERSION}.so).
-          
-          See: 
-          - https://github.com/zealdocs/zeal/issues/802
-          - https://bbs.archlinux.org/viewtopic.php?id=231222"
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    default=$(archlinux-java get)
-    if [[ ${default} = ${THIS_JAVA} ]]; then
-        archlinux-java unset
-    fi
-}
-
-post_remove() {
-    default=$(archlinux-java get) # reassign
-    if [[ ${default} ]]; then
-        note "Default Java environment is '${default}'."
-    else
-        archlinux-java fix
-        default=$(archlinux-java get) # re-reassign
-        if [[ ${default} ]]; then
-            note "Default Java environment left as '${default}'."
-        else
-            note "Java environment unset."
-        fi
-    fi
-}

src/jdk/jmc-jdk8.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jdk/bin/jmc
-Icon=sun-java-jdk8
-Name=Java Mission Control
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;

src/jdk/jmc.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-<version>-jdk/bin/jmc
-Icon=sun-java-jdk<version>
-Name=Java Mission Control
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;

src/jdk/jvisualvm-jdk8.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jdk/bin/jvisualvm
-GenericName=Java Monitoring and Performance Monitoring Tool
-Icon=sun-java-jdk8
-Name=Java VisualVM
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;

src/jdk/policytool-jdk8.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jdk/jre/bin/policytool
-Icon=sun-java-jdk8
-Name=Java Policy Settings
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;

src/jdk/policytool.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-<version>-jdk/bin/policytool
-Icon=sun-java-jdk<version>
-Name=Java Policy Settings
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;

src/jdk6/PKGBUILD

@@ -8,7 +8,7 @@ _major=6
 _minor=45
 _build=b06
 pkgver=${_major}u${_minor}
-pkgrel=6
+pkgrel=7
 pkgdesc="Oracle Java $_major Development Kit (public release - end of support)"
 arch=('i686' 'x86_64')
 url=https://www.java.com/en/download/faq/java_6.xml
@@ -163,7 +163,7 @@ package() {
   ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
 
   # Java Cryptography Extension (JCE) Unlimited Strength files
-  rename -- ".jar" "-limited.jar" jre/lib/security/*
+  rename -- ".jar" "-limited.jar" jre/lib/security/*.jar
   install -Dm644 "$srcdir"/jce/* jre/lib/security/
 
   # Do the move

src/jdk8/PKGBUILD

@@ -1,157 +1,178 @@
-# Maintainer: Det <nimetonmaili g-mail>
+# Maintainer: Chris Severance aur.severach AatT spamgourmet.com
+# Contributor: Det <nimetonmaili g-mail>
 
-_pkgname=jdk
+set -u
-pkgname=jdk8
+_pkgname='jdk'
-_major=8
+_major='8'
-_minor=181
+pkgname="${_pkgname}${_major}"
-_build=b13
+_minor='202'; _build='b08'; _hash='1961070e4c9b4e26a04e7f5a083f551e'
-_hash=96a7b8442fe848ef90c96a2fad6ed6d1
+pkgver="${_major}u${_minor}"
-pkgver=${_major}u${_minor}
+pkgrel='1'
-pkgrel=1
+pkgdesc="Oracle Java ${_major} Development Kit"
-pkgdesc="Oracle Java $_major Development Kit"
 arch=('x86_64')
-url="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
+url='http://www.oracle.com/technetwork/java/javase/downloads/index.html'
 license=('custom:Oracle')
-depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils')
+depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-runtime-common' 'nss' 'xdg-utils')
+depends+=('java-environment-common')
 optdepends=('alsa-lib: for basic sound support'
             'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
             'gtk2: for Gtk+ look and feel (desktop)')
-provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
+provides=("java-runtime=${_major}" "java-runtime-headless=${_major}" "java-web-start=${_major}"
-          "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major"
+          "java-runtime-jre=${_major}" "java-runtime-headless-jre=${_major}" "java-web-start-jre=${_major}"
-          "java-openjfx=$_major")
+          "java-openjfx=${_major}")
+provides+=("java-environment-jdk=${_major}" "java-environment=${_major}")
 
 # Variables
-DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
+DLAGENTS=("${DLAGENTS[@]//curl -/curl -b 'oraclelicense=a' -}")
-_jname=${_pkgname}${_major}
+_jname="${_pkgname}${_major}"
-_jvmdir=/usr/lib/jvm/java-$_major-$_pkgname
+_jvmdir="/usr/lib/jvm/java-${_major}-${_pkgname}"
 
-backup=("etc/java-$_jname/amd64/jvm.cfg"
+backup=("etc/java-${_jname}/amd64/jvm.cfg"
-        "etc/java-$_jname/images/cursors/cursors.properties"
+        "etc/java-${_jname}/images/cursors/cursors.properties"
-        "etc/java-$_jname/management/jmxremote.access"
+        "etc/java-${_jname}/management/jmxremote.access"
-        "etc/java-$_jname/management/management.properties"
+        "etc/java-${_jname}/management/management.properties"
-        "etc/java-$_jname/security/java.policy"
+        "etc/java-${_jname}/security/java.policy"
-        "etc/java-$_jname/security/java.security"
+        "etc/java-${_jname}/security/java.security"
-        "etc/java-$_jname/security/javaws.policy"
+        "etc/java-${_jname}/security/javaws.policy"
-        "etc/java-$_jname/content-types.properties"
+        "etc/java-${_jname}/content-types.properties"
-        "etc/java-$_jname/flavormap.properties"
+        "etc/java-${_jname}/flavormap.properties"
-        "etc/java-$_jname/fontconfig.properties.src"
+        "etc/java-${_jname}/fontconfig.properties.src"
-        "etc/java-$_jname/logging.properties"
+        "etc/java-${_jname}/logging.properties"
-        "etc/java-$_jname/net.properties"
+        "etc/java-${_jname}/net.properties"
-        "etc/java-$_jname/psfont.properties.ja"
+        "etc/java-${_jname}/psfont.properties.ja"
-        "etc/java-$_jname/psfontj2d.properties"
+        "etc/java-${_jname}/psfontj2d.properties"
-        "etc/java-$_jname/sound.properties")
+        "etc/java-${_jname}/sound.properties")
 options=('!strip') # JDK debug-symbols
-install=$pkgname.install
+install="${pkgname}.install"
-source=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$_pkgname-$pkgver-linux-x64.tar.gz"
+source=(
-        "http://download.oracle.com/otn-pub/java/jce/$_major/jce_policy-$_major.zip"
+  "https://download.oracle.com/otn-pub/java/jce/${_major}/jce_policy-${_major}.zip"
-        "jconsole-$_jname.desktop"
+  "https://download.oracle.com/otn-pub/java/jdk/${pkgver}-${_build}/${_hash}/${_pkgname}-${pkgver}-linux-x64.tar.gz"
-        "jmc-$_jname.desktop"
+  "jconsole-${_jname}.desktop"
-        "jvisualvm-$_jname.desktop"
+  "jmc-${_jname}.desktop"
-        "policytool-$_jname.desktop")
+  "jvisualvm-${_jname}.desktop"
-md5sums=('ef599e322eee42f6769991dd3e3b1a31'
+  "policytool-${_jname}.desktop"
-         'b3c7031bc65c28c2340302065e7d00d3'
+)
+md5sums=('b3c7031bc65c28c2340302065e7d00d3'
+         '0029351f7a946f6c05b582100c7d45b7'
          '8a66f50efdc867ffd6a27168bc93b210'
          '1cbde70639abd98db4bace284dbf2bc4'
          'f0b39865361437f3778ecbe6ffbc0a06'
          '89704501aff8efe859c31968d8d168e6')
+sha256sums=('f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59'
+            '9a5c32411a6a06e22b69c495b7975034409fa1652d03aeb8eb5b6f59fd4594e0'
+            '65282603bd0804d162f3f7da47bc7f3c91373e87504297d6a6fd6f2f8a1ec4ee'
+            '8f865b52946a9ab98556c56306c7e70ae7aa432b4d005c70df0bba9d2c3111b1'
+            '144e6651fcea08d95f3148d3a8ad17deb93fec4dd9236d37d27d7c648230b870'
+            '635433e9c78ff58af65c316232ac9907d289a324428923788ea0f82ae7f8083b')
 ## Alternative mirror, if your local one is throttled:
-#source[0]=("http://ftp.wsisiz.edu.pl/pub/pc/pozyteczne%20oprogramowanie/java/$_pkgname-$pkgver-linux-x64.gz")
+#source[0]=("http://ftp.wsisiz.edu.pl/pub/pc/pozyteczne%20oprogramowanie/java/${_pkgname}-${pkgver}-linux-x64.gz")
 
 package() {
-    cd ${_pkgname}1.${_major}.0_${_minor}
+  set -u
+  cd "${_pkgname}1.${_major}.0_${_minor}"
 
-    msg2 "Creating directory structure..."
+  set +u; msg2 'Creating directory structure...'; set -u
-    install -d "$pkgdir"/etc/.java/.systemPrefs
+  install -d "${pkgdir}/etc/.java/.systemPrefs"
-    install -d "$pkgdir"/usr/lib/jvm/java-$_major-$_pkgname/bin
+  install -d "${pkgdir}/usr/lib/jvm/java-${_major}-${_pkgname}/bin"
-    install -d "$pkgdir"/usr/lib/mozilla/plugins
+  install -d "${pkgdir}/usr/lib/mozilla/plugins"
-    install -d "$pkgdir"/usr/share/licenses/java$_major-$_pkgname
+  install -d "${pkgdir}/usr/share/licenses/java${_major}-${_pkgname}"
 
-    msg2 "Removing redundancies..."
+  set +u; msg2 'Removing redundancies...'; set -u
-    rm -r jre/lib/desktop/icons/HighContrast/
+  pushd 'jre' > /dev/null
-    rm -r jre/lib/desktop/icons/HighContrastInverse/
+  rm -r 'lib/desktop/icons/HighContrast/'
-    rm -r jre/lib/desktop/icons/LowContrast/
+  rm -r 'lib/desktop/icons/HighContrastInverse/'
-    rm    jre/lib/fontconfig.*.bfc
+  rm -r 'lib/desktop/icons/LowContrast/'
-    rm    jre/lib/fontconfig.*.properties.src
+  rm    lib/fontconfig.*.bfc
-    rm -r jre/plugin/
+  rm    lib/fontconfig.*.properties.src
-    rm    jre/*.txt
+  rm    *.txt
-    rm    jre/COPYRIGHT
+  rm    'COPYRIGHT'
-    rm    jre/LICENSE
+  rm    'LICENSE'
-    rm    jre/README
+  rm    'README'
-    rm    man/ja
+  rm -r 'plugin/'
+  popd > /dev/null
+  rm    'man/ja'
 
-    msg2 "Moving contents..."
+  set +u; msg2 'Moving contents...'; set -u
-    mv * "$pkgdir"/$_jvmdir
+  mv * "${pkgdir}/${_jvmdir}"
 
   # Cd to the new playground
-    cd "$pkgdir"/$_jvmdir
+  cd "${pkgdir}/${_jvmdir}"
 
-    msg2 "Fixing directory structure..."
+  set +u; msg2 'Fixing directory structure...'; set -u
   # Replace duplicate binaries in bin/ with links to jre/bin/
-    for i in $(ls jre/bin/); do
+  local _i
-        ln -sf "$_jvmdir/jre/bin/$i" "bin/$i"
+  for _i in jre/bin/*; do
+    ln -sf "${_jvmdir}/jre/bin/${_i##*/}" "bin/${_i##*/}"
   done
 
-    # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png)
+  # Suffix .desktops + icons (sun-java.png -> sun-java-${_jname}.png)
-    for i in $(find jre/lib/desktop/ -type f); do
+  local _i
-        rename -- "." "-$_jname." $i
+  for _i in $(find 'jre/lib/desktop/' -type 'f'); do
+    rename -- '.' "-${_jname}." "${_i}"
   done
 
   # Fix .desktop paths
-    sed -e "s|Exec=|Exec=$_jvmdir/jre/bin/|" \
+  sed -e "s|Exec=|Exec=${_jvmdir}/jre/bin/|" \
-        -e "s|.png|-$_jname.png|" \
+      -e "s|.png|-${_jname}.png|" \
-    -i jre/lib/desktop/applications/*
+    -i 'jre/lib/desktop/applications'/*
 
   # Move .desktops + icons to /usr/share
-    mv jre/lib/desktop/* "$pkgdir"/usr/share/
+  mv 'jre/lib/desktop'/* "${pkgdir}/usr/share/"
-    install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
+  install -m644 "${srcdir}"/*.desktop "${pkgdir}/usr/share/applications/"
 
-    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/jre/lib -> /etc
+  # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-${_jname}/jre/lib -> /etc
-    for new_etc_path in ${backup[@]}; do
+  local _new_etc_path
+  for _new_etc_path in "${backup[@]}"; do
     # Old location
-        old_usr_path="jre/lib/${new_etc_path#*$_jname/}"
+    local _old_usr_path="jre/lib/${_new_etc_path#*${_jname}/}"
 
     # Move
-        install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
+    install -Dm644 "${_old_usr_path}" "${pkgdir}/${_new_etc_path}"
-        ln -sf "/$new_etc_path" "$old_usr_path"
+    ln -sf "/${_new_etc_path}" "${_old_usr_path}"
   done
 
   # Link NPAPI plugin
-    ln -sf $_jvmdir/jre/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so
+  ln -s "${_jvmdir}/jre/lib/amd64/libnpjp2.so" "${pkgdir}/usr/lib/mozilla/plugins/libnpjp2-${_jname}.so"
 
   # Replace JKS keystore with 'ca-certificates-java'
-    ln -sf /etc/ssl/certs/java/cacerts jre/lib/security/cacerts
+  ln -sf '/etc/ssl/certs/java/cacerts' 'jre/lib/security/cacerts'
 
   # Suffix man pages
-    for i in $(find man/ -type f); do
+  for _i in $(find 'man/' -type 'f'); do
-        mv "$i" "${i/.1}-$_jname.1"
+    rename -- '.1' "-${_jname}.1" "${_i}"
   done
 
   # Move man pages
-    mv man/ja_JP.UTF-8/ man/ja
+  mv 'man/ja_JP.UTF-8/' 'man/ja'
-    mv man/ "$pkgdir"/usr/share
+  mv 'man/' "${pkgdir}/usr/share"
 
   # Move/link licenses
-    mv COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
+  mv 'COPYRIGHT' 'LICENSE' *.txt "${pkgdir}/usr/share/licenses/java${_major}-${_pkgname}/"
-    ln -sf /usr/share/licenses/java$_major-$_pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
+  ln -s "/usr/share/licenses/java${_major}-${_pkgname}/" "${pkgdir}/usr/share/licenses/${pkgname}"
 
-    msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..."
+  set +u; msg2 'Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files...'; set -u
   # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
   # things like 256-bit AES. Enabled by default in OpenJDK:
   # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html
   # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html
-    install -m644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/*.jar jre/lib/security/
+  install -m644 "${srcdir}/UnlimitedJCEPolicyJDK${_major}"/*.jar 'jre/lib/security/'
-    install -Dm644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/README.txt \
+  install -Dm644 "${srcdir}/UnlimitedJCEPolicyJDK${_major}/README.txt" \
-                   "$pkgdir"/usr/share/doc/$_pkgname/README_-_Java_JCE_Unlimited_Strength.txt
+                 "${pkgdir}/usr/share/doc/${_pkgname}/README_-_Java_JCE_Unlimited_Strength.txt"
 
-    msg2 "Enabling copy+paste in unsigned applets..."
+  set +u; msg2 'Enabling copy+paste in unsigned applets...'; set -u
   # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
   # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
   # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html
-    _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy)
+  local _text='\
-    sed "$_line a\\\\n \
+         // (AUR) Allow unsigned applets to read system clipboard, see:
-        // (AUR) Allow unsigned applets to read system clipboard, see:\n \
+         // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
-        // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \
+         // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html
-        // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \
+         permission java.awt.AWTPermission "accessClipboard";'
-        permission java.awt.AWTPermission \"accessClipboard\";" \
+  local _lf=$'\n'
-    -i "$pkgdir"/etc/java-$_jname/security/java.policy
+  _text="${_text//${_lf}/\\n}"
+  local _line
+  _line="$(awk '/permission/{a=NR}; END{print a}' "${pkgdir}/etc/java-${_jname}/security/java.policy")"
+  sed -e "${_line} a ${_text}" -i "${pkgdir}/etc/java-${_jname}/security/java.policy"
+  set +u
 }
+set +u

src/kiwiirc/PKGBUILD

@@ -1,56 +1,36 @@
-# Maintainer: Jack Allnutt <jack@allnutt.eu>
+# Maintainer: Jingbei Li <i@jingbei.li>
+# Contributor: Jack Allnutt <jack@allnutt.eu>
 pkgname=kiwiirc
-pkgver=0.9.4
+pkgver=1.1.0.r2044.g4c979963
 pkgrel=1
 pkgdesc="A hand-crafted web-based IRC client that you can enjoy"
 arch=('any')
 url="https://kiwiirc.com/"
-license=('AGPL3')
+license=('APACHE')
-depends=('nodejs>=4.0.0', 'npm')
+makedepends=('git' 'yarn')
-makedepends=('git')
-options=('emptydirs' '!strip')
 install='kiwiirc.install'
-backup=('etc/kiwiirc/config.js')
+source=(git+https://github.com/kiwiirc/kiwiirc)
-source=(https://github.com/prawnsalad/KiwiIRC/archive/v$pkgver.tar.gz
+md5sums=('SKIP')
-    'kiwi.patch'
+
-    'kiwiirc.service'
+pkgver () {
-    'kiwiirc.conf.sysusers'
+    cd "${pkgname}"
-    'kiwiirc.conf.tmpfiles')
+    (
-md5sums=('1a06e33088ca6ed89f857f7687470761'
+        set -o pipefail
-         '14a75cab7c10f2dd17856ab5a99d3bfc'
+        git describe --long 2>/dev/null | sed -e 's/\([^-]*-g\)/r\1/;s/-/./g' -e 's/^v//'||
-         'bcb28ddb7f0bcc3be830b8045969eb2c'
+        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-         '593da856bcf9036bc51380b74d9df394'
+    )
-         '803080337de27be8921edd76f15c763c')
+}
 
 build() {
-    cp kiwiirc.service "$srcdir/KiwiIRC-$pkgver/"
+    cd "$srcdir/$pkgname"
-    cp kiwiirc.conf.sysusers "$srcdir/KiwiIRC-$pkgver/"
+    yarn install
-    cp kiwiirc.conf.tmpfiles "$srcdir/KiwiIRC-$pkgver/"
+    yarn run build
-    cd "$srcdir/KiwiIRC-$pkgver"
-    git apply --whitespace=fix ../kiwi.patch
-    npm -q install
-    npm -q dedupe
 }
 
 package() {
-    cd "$srcdir"
+    cd "$srcdir/$pkgname"
-    install -D -m644 KiwiIRC-$pkgver/config.example.js $pkgdir/etc/kiwiirc/config.js
-    install -D -m755 KiwiIRC-$pkgver/kiwi $pkgdir/usr/bin/kiwi
-    install -D -m644 KiwiIRC-$pkgver/kiwiirc.service $pkgdir/usr/lib/systemd/system/kiwiirc.service
-    install -D -m644 KiwiIRC-$pkgver/man/kiwiirc.1 $pkgdir/usr/share/man/man1/kiwi.1
-    install -D -m644 KiwiIRC-$pkgver/package.json $pkgdir/usr/share/kiwiirc/package.json
-    install -D -m644 KiwiIRC-$pkgver/README.md $pkgdir/usr/share/kiwiirc/README.md
-    install -D -m644 KiwiIRC-$pkgver/kiwiirc.conf.sysusers $pkgdir/usr/lib/sysusers.d/kiwiirc.conf
-    install -D -m644 KiwiIRC-$pkgver/kiwiirc.conf.tmpfiles $pkgdir/usr/lib/tmpfiles.d/kiwiirc.conf
 
-    install -d -m755 $pkgdir/usr/lib/kiwiirc/server_modules
+    mkdir -p $pkgdir/usr/share/webapps/
-    install -d -m755 $pkgdir/var/lib/kiwiirc
+    cp -r dist $pkgdir/usr/share/webapps/kiwiirc
-    install -d -m644 $pkgdir/var/log/kiwiirc
+    sed 's/welcome/personal/' -i $pkgdir/usr/share/webapps/kiwiirc/static/config.json
-    install -d -m755 $pkgdir/usr/share/kiwiirc/server
-    install -d -m755 $pkgdir/usr/share/kiwiirc/node_modules
-
-    cp -dr --preserve=mode KiwiIRC-$pkgver/client/* $pkgdir/var/lib/kiwiirc
-    cp -dr --preserve=mode KiwiIRC-$pkgver/node_modules $pkgdir/usr/share/kiwiirc/
-    cp -dr --preserve=mode KiwiIRC-$pkgver/server $pkgdir/usr/share/kiwiirc
-    cp -dr --preserve=mode KiwiIRC-$pkgver/server_modules $pkgdir/usr/lib/kiwiirc
 }

src/kiwiirc/kiwiirc.install

@@ -1,26 +1,7 @@
 post_install() {
-    systemd-sysusers
+    echo Please see https://wiki.archlinux.org/index.php/KiwiIRC and set up the web server to use KiwiIRC!
-    systemd-tmpfiles --create /usr/lib/tmpfiles.d/kiwiirc.conf
-
-    chown -R kiwiirc:kiwiirc /etc/kiwiirc
-    chown -R kiwiirc:kiwiirc /usr/lib/kiwiirc
-    chown -R kiwiirc:kiwiirc /usr/share/kiwiirc
-    chown -R kiwiirc:kiwiirc /var/lib/kiwiirc
-
-    setcap CAP_NET_BIND_SERVICE=+pe /usr/bin/node
-
-    sudo -u kiwiirc kiwi build
 }
 
 post_upgrade() {
     post_install
 }
-
-pre_remove() {
-    systemctl disable kiwiirc.service
-    systemd-tmpfiles --remove /usr/lib/tmpfiles.d/kiwiirc.conf
-}
-
-post_remove() {
-    rm -rf /var/lib/kiwiirc/
-}

src/lgogdownloader/PKGBUILD

@@ -2,11 +2,11 @@
 
 pkgname=lgogdownloader
 pkgver=3.4
-pkgrel=1
+pkgrel=3
 pkgdesc="An open source downloader for GOG.com games, uses the GOG.com API"
 url="https://sites.google.com/site/gogdownloader/"
 arch=('x86_64')
-license=(WTFPL)
+license=('WTFPL')
 depends=('boost' 'jsoncpp' 'liboauth' 'rhash' 'tinyxml2' 'htmlcxx' 'curl')
 makedepends=('help2man' 'cmake')
 source=("http://sites.google.com/site/gogdownloader/$pkgname-$pkgver.tar.gz")

src/libgcj17-bin/PKGBUILD

@@ -4,7 +4,8 @@
 # Contributor: Roberto Calabrese <robertocalabrese75 [at] gmail.com>
 
 pkgname=libgcj17-bin
-pkgver=6.4.0_13
+epoch=1
+pkgver=6.3.0_18+deb9u1
 pkgrel=1
 pkgdesc="Dynamically load and interpret java class files. Built from binary \
 executables available in Debian repositories."
@@ -16,8 +17,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=('949796af87b86f808b20818fde45b8a735fcad5a')
+sha1sums_i686=('59e179c197637aae5dcaa0f83de4094a7e1f5396')
-sha1sums_x86_64=('2841f49b2f785d38367973b71ccd1907e1dc6c88')
+sha1sums_x86_64=('57125c15fd5b1a42bfa2b5d2da8378d7e51c1ecc')
 
 prepare() {
   tar xf data.tar.*

src/libguestfs/PKGBUILD

@@ -5,7 +5,7 @@
 # Maintainer: Nikos Skalkotos <skalkoto (at) Gmail.com>
 
 pkgname=libguestfs
-pkgver=1.38.2
+pkgver=1.38.6
 pkgver_short=${pkgver%.*}
 pkgrel=1
 pkgdesc="Access and modify virtual machine disk image"
@@ -63,7 +63,7 @@ provides=("guestfish=${pkgver}")
 options=()
 source=("http://libguestfs.org/download/${pkgver_short}-stable/${pkgname}-${pkgver}.tar.gz"
         "update-libguestfs-appliance")
-sha512sums=('1e9ed5d07baa25cab4ccc0c12c9f4c90ef35ff760814d672975952d098cd84b3e81c70cfe65a9c6c34de84725f29861bfe08ed72c9f9eb03f19313bdaacf2d05'
+sha512sums=('20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1'
             '436f85c20e5c596738fcadd08089ddf5923e3b51ab05fe0a80d0fea7f0f5a7b797aece70f05e7d0f68387632a4b816d688890e0e06af4c834ae000f0d4ad5aff')
 
 check() {

src/libspotify/PKGBUILD

@@ -1,74 +0,0 @@
-# Maintainer: buckket <buckket@cock.li>
-# Contributor: FadeMind <fademind@gmail.com>
-# Contributor: Richard Weber <old-box at outlook dot com>
-# Contributor: Benjamin Hedrich <kiwisauce at pagenotfound dot de>
-# Contributor: Thomas Jost <schnouki at schnouki dot net>
-# Contributor: Tomas Strand <tomas at fik1 dot net>
-
-### NOTICE
-### libspotify is EOL, sources are taken from https://mopidy.github.io/libspotify-archive/
-### Checksums have not changed.
-### 
-### SPOTIFY DEVS STATEMENT
-###
-### Please note that we have removed the LibSpotify binaries from our website in an effort to phase out the usage of this deprecated library. 
-### LibSpotify has been considered deprecated since 2015 and will be shut down in 2017, so we want to ensure that all developers’ efforts and 
-### attention are focused on newer and better APIs that we actively support and maintain. These APIs include the Web API, iOS and Android SDKs, 
-### and upcoming embedded libraries for Windows, Mac OS X and Linux. More information regarding upcoming libraries will be provided in the coming months.
-###
-###
-### Source: https://is.gd/z6waBx
-###
-###
-
-pkgname=libspotify
-pkgver=12.1.51
-pkgrel=6
-pkgdesc="C API package allowing third-party developers to write applications that utilize the Spotify music streaming service"
-arch=("i686" "x86_64")
-url="https://developer.spotify.com/technologies/libspotify/"
-license=('custom')
-depends=('glibc')
-
-if [ "$CARCH" == "x86_64" ]; then
-    SPOTIFY_ARCH="x86_64"
-    source_x86_64=("https://mopidy.github.io/libspotify-archive/${pkgname}-${pkgver}-Linux-${SPOTIFY_ARCH}-release.tar.gz")
-    md5sums_x86_64=('83efddcc195d6ff12b24c97c767a5e45')
-    sha256sums_x86_64=('43a14e0732ba6ae30078fac105d0e2998d04d5f5c396a4968386bc4e22491058')
-fi
-
-if [ "$CARCH" == "i686" ]; then
-    SPOTIFY_ARCH="i686"
-    source_i686=("https://mopidy.github.io/libspotify-archive/${pkgname}-${pkgver}-Linux-${SPOTIFY_ARCH}-release.tar.gz")
-    md5sums_i686=('04735b890da0b1fc7f1f14e68a5293de')
-    sha256sums_i686=('941ab4ba10bcd6ec4e96127afd095a39e11bc955de0882734c97e4f588b155ae')
-fi
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}-Linux-${SPOTIFY_ARCH}-release"
-
-    # Don't do stupid things from a Makefile
-    msg2 "Patching Makefile..."
-    sed -i 's/ldconfig//' Makefile
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}-Linux-${SPOTIFY_ARCH}-release"
-
-    make prefix="$pkgdir/usr" install
-
-    # Install documentation
-    cp -R share "$pkgdir"/usr/share
-    mkdir -p "$pkgdir"/usr/share/man
-    mv "$pkgdir"/usr/share/man3 "$pkgdir"/usr/share/man/man3
-
-    # Correct pkgconfig file
-    sed -e s:PKG_PREFIX:/usr:g \
-          < lib/pkgconfig/libspotify.pc \
-          > "$pkgdir"/usr/lib/pkgconfig/libspotify.pc
-
-    # Custom license
-    install -Dm644 LICENSE licenses.xhtml "$pkgdir"/usr/share/doc/libspotify
-    mkdir -p "$pkgdir"/usr/share/licenses/libspotify
-    ln -s ../../doc/libspotify/LICENSE "$pkgdir"/usr/share/licenses/libspotify/LICENSE
-}

src/luaunbound/PKGBUILD

@@ -1,9 +1,10 @@
 # Maintainer: fordprefect <fordprefect@dukun.de>
 # Contributor: jhass <me@jhass.eu>
 pkgname=luaunbound
-pkgver=2017.11.15
+pkgver=0.2_1
-_version=5bd8a2f84124
+_pkgver=0.2-1
-pkgrel=3
+epoch=1
+pkgrel=1
 pkgdesc="drop-in replacement for Prosodys internal DNS library with a binding to libunbound"
 url="https://www.zash.se/luaunbound.html"
 arch=('i686' 'x86_64')
@@ -12,24 +13,22 @@ depends=("unbound")
 makedepends=("mercurial" "unbound" "lua" "libxslt" "ccache")
 optdepends=("luajit: jit for lua")
 install=luaunbound.install
-source=("${pkgname}::hg+https://code.zash.se/luaunbound" "use_cc.patch")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LuaDist2/luaunbound/archive/${_pkgver}.tar.gz" "use_cc.patch")
 sha512sums=('SKIP'
             '6b11dfe9f5de743f101463fb3fb2144fe3aff75e7e19036f67d0e0b8adc8c36db73cf73d0aba483d651f8f5b2773093adc27e788354b165314c777e8de45bf28')
 
 prepare() {
-    cd "$srcdir/$pkgname"
+    cd "$srcdir/$pkgname-$_pkgver"
-    # fixed commit
-    hg checkout $_version
     patch -p1 < "$srcdir/use_cc.patch"
 }
 
 build() {
-    cd "$srcdir/$pkgname"
+    cd "$srcdir/$pkgname-$_pkgver"
     make all
 }
  
 package() {
-    cd "$srcdir/$pkgname"
+    cd "$srcdir/$pkgname-$_pkgver"
     install -Dm644 use_unbound.lua "$pkgdir/etc/prosody/use_unbound.lua"
     install -Dm755 lunbound.so "$pkgdir/usr/lib/prosody/util/lunbound.so"
     install -Dm644 README.markdown "$pkgdir/usr/share/doc/luaunbound/README"

src/mellowplayer/PKGBUILD

@@ -2,38 +2,35 @@
 # Maintainer: ZeroDot1 <zerodot1@bk.ru>
 pkgname=mellowplayer
 _pkgname=MellowPlayer
-pkgver=3.4.0
+pkgver=3.5.2
-pkgrel=4
+pkgrel=2
 pkgdesc="Open source and cross-platform desktop application that runs web-based music streaming 
          services in its own window and provides integration with your desktop."
 url='https://github.com/ColinDuquesnoy/MellowPlayer'
 license=('GPL')
 arch=('x86_64')
 depends=('qt5-base' 'qt5-webengine' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-translations' 'qt5-graphicaleffects' 'xdg-utils' 'libnotify' 'libevent')
-makedepends=('qt5-tools' 'qbs' 'mesa')
+makedepends=('qt5-tools' 'cmake' 'mesa')
 optdepends=( 'qt5-webengine-widevine: DRM needed for Spotify' 'pepper-flash: needed for Tidal and Deezer')
-source=("https://github.com/ColinDuquesnoy/MellowPlayer/archive/${pkgver}.tar.gz" 
+source=("https://gitlab.com/ColinDuquesnoy/MellowPlayer/-/archive/${pkgver}/MellowPlayer-${pkgver}.tar.gz" 
         "widevine-path.patch")
-md5sums=('60aac9e1f5f32d699920e44e2f3af790'
+md5sums=('604a33c9f3608ee7403675969c1de902'
          '67f8c5c6af4b770a4017a5ca9f137b90')
 
 prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd $srcdir/MellowPlayer-${pkgver}
-    patch -Np1 -i "${srcdir}/widevine-path.patch" "${srcdir}/${_pkgname}-${pkgver}/src/main/share/applications/mellowplayer.desktop"
+    patch -Np1 -i "${srcdir}/widevine-path.patch" "$srcdir/MellowPlayer-${pkgver}/src/main/share/applications/mellowplayer.desktop"
-    
-    qbs-setup-toolchains --detect
-    qbs-setup-qt $(which qmake) qt5
-    qbs-config defaultProfile qt5
 }
 
 build() {
-      cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd $srcdir/MellowPlayer-${pkgver}
-  qbs build config:release
+  export MAKEFLAGS="-j$(nproc)"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
+  make 
 }
 
 package() {
-      cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd $srcdir/MellowPlayer-${pkgver}
-  qbs install --install-root "${pkgdir}/usr" config:release
+  make DESTDIR=${pkgdir} install
 }
 
-

src/memtest86-efi/PKGBUILD

@@ -2,10 +2,11 @@
 
 _pkgbasename=memtest86
 pkgname=$_pkgbasename-efi
-pkgver=7.5.1001
+pkgver=8.1
-pkgrel=1
+#_build=1000
+pkgrel=4
 pkgdesc="A free, thorough, stand alone memory test as an EFI application"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://www.memtest86.com"
 license=('GPL2' 'custom:PassMark')
 makedepends=('p7zip')
@@ -13,18 +14,15 @@ 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=("https://www.passmark.com/ftp/$_pkgbasename-usb-$pkgver.tar.gz"
+source=(#"https://www.passmark.com/ftp/$_pkgbasename-usb-$pkgver.$_build.zip"
+	"$pkgname-$pkgver.zip::https://www.memtest86.com/downloads/$_pkgbasename-usb.zip"
 	"memtest86-efi"
 	"memtest86-efi.conf"
-	"grub.conf"
-	"systemd-boot.conf"
 	"memtest86-efi-update.hook"
 	"memtest86-efi-remove.hook")
-sha512sums=('10232a1c3a589407e06257f7fff14a28b524d3998bc712317d25081e3e67f87549bf36cb9e79f50ee9676e32b050d38bbfa74d2f536899d358bcd05edea3b97a'
+sha512sums=('1b4dad3afe4bdf1e7d57ce52815ab8ab7646487272485723e99af1b9d6da79807d0aafea549f5906b320d346ab4f27d9c47734681ffad6fa1e6c50375ab94ff0'
-            '001151346736fc901dac0f5f2b07557b049f2e2cf2a7de0aae7019e7fde126e4e6cf291328dea920d5af45b21b08366b6465b8a8aa453f7af0fd760ced3952aa'
+            '9e4919d3a1d2435c3feed718b422be7206ec639268d79aee2ac419e9665d134829f507506da33903da547f73d22e0833335118cbe04cda0c5bbfc7e64aa3bd51'
             '947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8'
-            'df883042a5bad262e74b69e2ca0cd8c9c21a4e4eb5132aed0041a07050b5ab7f280e94681ffe106e6de547d00b621fd2a019cf5b669e00876a32e637687395f8'
-            '1ece1ca18d53a19eff8341cce0c6099ac6b8d27ebad176c9a85714a7cac24cef7dfa2b462d8a0160dc8eb71f21aca1ee2469ebdf095083dcd77fa0b0f90f1812'
             '6952376b601b84da5fba14a7a5316d37b6083bae20f68f5b90b22d2728a19bf6d1fb367cf1adecfb82bf03e339b7dbf91f6d23f0d59731f89cf45240f16d5614'
             '1fe55a642e36005f5b7b58e5fb245e8029bb1a19b5f30d8ddba6bbf5a4b96c1bba35be0dfacee478034b8367fdde62d34a934dcd787f4c6702889615bac9f78a')
 
@@ -38,8 +36,9 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 
 	msg2 "Move MemTest86 stuff in share directory..."
-	[[ "$CARCH" == "i686" ]]   && install -Dvm755  "EFI/BOOT/BOOTIA32.efi" "$pkgdir/usr/share/$pkgname/bootia32.efi"
+	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 -Dvm755 "EFI/BOOT/BOOTX64.efi"   "$pkgdir/usr/share/$pkgname/bootx64.efi"
+	install -Dvm644 "EFI/BOOT/blacklist.cfg" "$pkgdir/usr/share/$pkgname/blacklist.cfg"
 	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"
@@ -47,8 +46,6 @@ package() {
 	msg2 "Install AUR provided script..."
 	install -Dvm755 "$srcdir/memtest86-efi"        "$pkgdir/usr/bin/memtest86-efi"
 	install -Dvm644 "$srcdir/memtest86-efi.conf"   "$pkgdir/etc/memtest86-efi/memtest86-efi.conf"
-	install -Dvm644 "$srcdir/grub.conf"            "$pkgdir/etc/memtest86-efi/grub.conf"
-	install -Dvm644 "$srcdir/systemd-boot.conf"    "$pkgdir/etc/memtest86-efi/systemd-boot.conf"
 
 	msg2 "Install Pacman hooks..."
 	install -Dvm644 "$srcdir/memtest86-efi-update.hook" "$pkgdir/usr/share/libalpm/hooks/memtest86-efi-update.hook"

src/memtest86-efi/memtest86-efi

@@ -8,6 +8,7 @@ PRGNAME=$(basename $0)
 CONFDIR="/etc/memtest86-efi"
 CONFFILE="$CONFDIR/memtest86-efi.conf"
 source "$CONFFILE" || exit 127
+shopt -s extglob
 [[ "$(uname -m)" == "i686" ]]   && ARCH="ia32"
 [[ "$(uname -m)" == "x86_64" ]] && ARCH="x64"
 
@@ -30,13 +31,40 @@ checkcommand() {
 }
 
 _common_install() {
-	efidir="$esp/EFI/memtest86"
+	efidir="$1"
-	efifile="$efidir/memtest$ARCH.efi"
+	efifile="$2"
 
-	echo -e "MemTest86 will be installed in ${CB}$efidir/${CR}."
+	echo -e "MemTest86 is installed into ${CB}$efidir/${CR} directory."
 	mkdir -pv "$efidir"
-	cp -v "$MEMTEST86_PATH/"*     "$efidir/" # Move files in memtest ESP directory
+	cp -v "$MEMTEST86_PATH/"!(*.efi) "$efidir/" # Move files in memtest ESP directory
-	mv -v "$efidir/boot$ARCH.efi" "$efifile" # Rename .efi file
+	cp -v "$MEMTEST86_PATH/boot$ARCH.efi" "$efidir/$efifile" # Copy and rename .efi file
+}
+
+_write_grub_cfg() {
+	uuid="$1"
+
+	cat > "/etc/grub.d/86_memtest" <<FOE
+#!/bin/sh
+
+cat <<EOF
+if [ "\\\$grub_platform" = "efi" ]; then
+	menuentry "Memtest86" {
+		search --set=root --no-floppy --fs-uuid $uuid
+		chainloader /EFI/memtest86/memtest$ARCH.efi
+	}
+fi
+EOF
+FOE
+	chmod 755 "/etc/grub.d/86_memtest"
+}
+
+_write_systemd_boot_cfg() {
+	systemdbootdir="$1"
+
+	cat > "$systemdbootdir/memtest86-efi.conf" <<FOE
+title MemTest86
+efi   /EFI/memtest86/memtest$ARCH.efi
+FOE
 }
 
 install() {
@@ -86,16 +114,13 @@ install() {
 
 	case $choice in
 		1) # Install MemTest86 in $esp/
-			echo -e "MemTest86 will be installed in ${CB}$esp/${CR}."
-			efifile="$esp/shell$ARCH.efi"
 			[[ -f "$esp/shell$ARCH.efi" ]] && mv -v "$esp/shell$ARCH.efi" "$esp/shell$ARCH.efi.bak" # Backup if exist
-			cp -v "$MEMTEST86_PATH/"*               "$esp/" # Move files in ESP root
+			_common_install "$esp" "shell$ARCH.efi"
-			mv -v "$esp/boot$ARCH.efi"              "$efifile" # Rename .efi file
 		;;
 
 		2) # Install MemTest86 in $esp/EFI/memtest86/ & add an EFI boot entry
 			checkcommand efibootmgr
-			_common_install
+			_common_install "$esp/EFI/memtest86" "memtest$ARCH.efi"
 			echo -e "\nAdd a new EFI boot entry..."
 			efibootmgr -c -d ${device} -p ${partnumber} -w -L "MemTest86" -l "\EFI\memtest86\memtest$ARCH.efi" # Manage efi entry
 		;;
@@ -106,22 +131,21 @@ install() {
 				echo -e "${CE}GRUB2 seems not installed on your system. Aborted.${CR}" > /dev/stderr
 				exit 2
 			fi
-			_common_install
+			_common_install "$esp/EFI/memtest86" "memtest$ARCH.efi"
 			echo -e "\nAdd a new configuration file for GRUB..."
-			/bin/install -Dvm755 "$CONFDIR/grub.conf" "/etc/grub.d/86_memtest"
 			uuid=$(blkid $partition -s UUID -o value)
-			sed -i "s|@UUID@|$uuid|g"                 "/etc/grub.d/86_memtest"
+			_write_grub_cfg "$uuid"
-			sed -i "s|@ARCH@|$ARCH|g"                 "/etc/grub.d/86_memtest"
 			grub-mkconfig -o "/boot/grub/grub.cfg"
 		;;
 
 		4) # Install MemTest86 in $esp/EFI/memtest86/ & add a file for systemd-boot
-			_common_install
+			checkcommand bootctl
+			_common_install "$esp/EFI/memtest86" "memtest$ARCH.efi"
 			echo -e "\nAdd a new configuration file for systemd-boot..."
 			systemdbootdir="$esp/loader/entries"
 			mkdir -pv "$systemdbootdir"
-			/bin/install -Dvm644 "$CONFDIR/systemd-boot.conf" "$systemdbootdir/memtest86-efi.conf"
+			_write_systemd_boot_cfg "$systemdbootdir"
-			sed -i "s|@ARCH@|$ARCH|g"                         "$systemdbootdir/memtest86-efi.conf"
+			bootctl --path="$esp" update
 		;;
 
 		*) # Do nothing and quit
@@ -147,15 +171,11 @@ update() {
 
 	case $choice in
 		1) # Update files in $esp/
-			echo -e "MemTest86 will be updated in ${CB}$esp/${CR}."
+			_common_install "$esp" "shell$ARCH.efi"
-			cp -fv "$MEMTEST86_PATH/"*  "$esp/"
-			mv -fv "$esp/boot$ARCH.efi" "$esp/shell$ARCH.efi"
 		;;
 
 		2|3|4) # Update files in $esp/EFI/memtest86/
-			echo -e "MemTest86 will be updated in ${CB}$esp/EFI/memtest86/${CR}."
+			_common_install "$esp/EFI/memtest86" "memtest$ARCH.efi"
-			cp -fv "$MEMTEST86_PATH/"*                "$esp/EFI/memtest86/"
-			mv -fv "$esp/EFI/memtest86/boot$ARCH.efi" "$esp/EFI/memtest86/memtest$ARCH.efi"
 		;;
 	esac
 
@@ -171,7 +191,7 @@ remove() {
 	case $choice in
 		1) # Remove files in $esp/
 			echo -e "MemTest86 will be removed from ${CB}$esp/${CR}."
-			rm -v "$esp/mt86.png" "$esp/shell$ARCH.efi"
+			rm -v "$esp/shell$ARCH.efi" "$esp/blacklist.cfg" "$esp/mt86.png" "$esp/unifont.bin"
 			[[ -f "$esp/shell$ARCH.efi.bak" ]] && mv -v "$esp/shell$ARCH.efi.bak" "$esp/shell$ARCH.efi"
 		;;
 
@@ -248,6 +268,11 @@ about() {
 	echo -e "$PRGNAME is a script which helps you to easily use MemTest86 with your UEFI, as an EFI application."
 }
 
+if [[ -z $ARCH ]]; then
+	echo -e "${CE} Unsupported ARCH: $(uname -m). Aborted.${CR}" > /dev/stderr
+	exit -1
+fi
+
 case "$1" in
 	-i|--install) warn; checkuid; install; exit 0;;
 	-u|--update)  checkuid; update; exit 0;;

src/mingw-w64-binutils/PKGBUILD

@@ -4,7 +4,7 @@
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-binutils
-pkgver=2.31.1
+pkgver=2.32
 pkgrel=1
 pkgdesc="Cross binutils for the MinGW-w64 cross-compiler"
 arch=('x86_64')
@@ -15,7 +15,7 @@ depends=('zlib')
 options=('!libtool' '!emptydirs')
 validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F')  # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>
 source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"{,.sig})
-sha256sums=('e88f8d36bd0a75d3765a4ad088d819e35f8d7ac6288049780e2fefcad18dde88'
+sha256sums=('9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e'
             'SKIP')
 
 prepare() {

src/mingw-w64-crt/PKGBUILD

@@ -4,8 +4,7 @@
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-crt
-pkgver=5.0.4
+pkgver=6.0.0
-_pkgver=${pkgver/rc/-rc}
 pkgrel=1
 pkgdesc='MinGW-w64 CRT for Windows'
 arch=('any')
@@ -15,12 +14,12 @@ groups=('mingw-w64-toolchain' 'mingw-w64')
 makedepends=('mingw-w64-gcc-base' 'mingw-w64-binutils' 'mingw-w64-headers')
 options=('!strip' '!buildflags' 'staticlibs' '!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})
-sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803'
+sha256sums=('805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0'
             'SKIP')
 
 prepare() {
-  cd "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-crt
+  cd "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-crt
 }
 
 build() {
@@ -33,7 +32,7 @@ build() {
         _crt_configure_args="--disable-lib32 --enable-lib64"
     fi
     mkdir -p "$srcdir"/crt-${_target} && cd "$srcdir"/crt-${_target}
-    "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-crt/configure --prefix=/usr/${_target} \
+    "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-crt/configure --prefix=/usr/${_target} \
         --host=${_target} --enable-wildcard \
         ${_crt_configure_args}
     make

src/mingw-w64-gcc/PKGBUILD

@@ -4,9 +4,9 @@
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-gcc
-pkgver=8.2.0
+pkgver=8.3.0
-_islver=0.19
+_islver=0.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
 arch=('x86_64')
 url="http://gcc.gnu.org"
@@ -16,7 +16,6 @@ depends=('zlib' 'libmpc'
 	 'mingw-w64-crt' 'mingw-w64-binutils' 'mingw-w64-winpthreads'
 	 'mingw-w64-headers')
 makedepends=("gcc-ada")
-#checkdepends=('dejagnu') # Windows executables could run on Arch through bin_mft and Wine
 optdepends=()
 provides=('mingw-w64-gcc-base')
 replaces=()
@@ -24,19 +23,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" bz86593.patch)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
               33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
-sha256sums=('196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080'
+sha256sums=('64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c'
             'SKIP'
-            'd59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8')
+            'b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2' SKIP)
 
 prepare() {
   ln -sf gcc-${pkgver/+/-} gcc
-  cd "$srcdir"/gcc
+  cd gcc
+
   # link isl for in-tree builds
   ln -sf ../isl-${_islver} isl
+
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86593
+  rm -f gcc/testsuite/g++.dg/pr86593.C
+  patch -p1 -i "$srcdir/bz86593.patch"
 }
 
 build() {
@@ -51,7 +55,7 @@ build() {
         --with-system-zlib --enable-cloog-backend=isl \
         --enable-lto --disable-dw2-exceptions --enable-libgomp \
         --disable-multilib --enable-checking=release
-    make all
+    make
   done
 }
 
@@ -70,6 +74,5 @@ package() {
   strip "$pkgdir"/usr/bin/*
   # remove unnecessary files
   rm -r "$pkgdir"/usr/share
-  rm -f "$pkgdir"/usr/lib/libcc1.so*
+  rm "$pkgdir"/usr/lib/libcc1.*
-  rm -f "$pkgdir"/usr/lib/libcc1.a
 }

src/mingw-w64-headers/PKGBUILD

@@ -4,9 +4,8 @@
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname='mingw-w64-headers'
-pkgver=5.0.4
+pkgver=6.0.0
-_pkgver=${pkgver/rc/-rc}
+pkgrel=1
-pkgrel=2
 pkgdesc="MinGW-w64 headers for Windows"
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
@@ -14,19 +13,19 @@ 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})
-sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803'
+sha256sums=('805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0'
             'SKIP')
 
 prepare() {
-  cd "$srcdir"/mingw-w64-v${_pkgver}
+  cd "$srcdir"/mingw-w64-v${pkgver}
 }
 
 build() {
   for _target in ${_targets}; do
     msg "Configuring ${_target} headers"
     mkdir -p "$srcdir"/headers-${_target} && cd "$srcdir"/headers-${_target}
-    "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-headers/configure --prefix=/usr/${_target} --enable-sdk=all --enable-secure-api --host=${_target}
+    "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-headers/configure --prefix=/usr/${_target} --enable-sdk=all --enable-secure-api --host=${_target}
   done
 }
 
@@ -41,9 +40,9 @@ package() {
   done
 
   msg "Installing MinGW-w64 licenses"
-  install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/COPYING.MinGW-w64/COPYING.MinGW-w64.txt "$pkgdir"/usr/share/licenses/${pkgname}/COPYING.MinGW-w64.txt
+  install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/COPYING.MinGW-w64/COPYING.MinGW-w64.txt "$pkgdir"/usr/share/licenses/${pkgname}/COPYING.MinGW-w64.txt
-  install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt "$pkgdir"/usr/share/licenses/${pkgname}/COPYING.MinGW-w64-runtime.txt
+  install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt "$pkgdir"/usr/share/licenses/${pkgname}/COPYING.MinGW-w64-runtime.txt
-  install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-headers/ddk/readme.txt "$pkgdir"/usr/share/licenses/${pkgname}/ddk-readme.txt
+  install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-headers/ddk/readme.txt "$pkgdir"/usr/share/licenses/${pkgname}/ddk-readme.txt
-  install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-headers/direct-x/COPYING.LIB "$pkgdir"/usr/share/licenses/${pkgname}/direct-x-COPYING.LIB
+  install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-headers/direct-x/COPYING.LIB "$pkgdir"/usr/share/licenses/${pkgname}/direct-x-COPYING.LIB
-  install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-headers/direct-x/readme.txt "$pkgdir"/usr/share/licenses/${pkgname}/direct-x-readme.txt
+  install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-headers/direct-x/readme.txt "$pkgdir"/usr/share/licenses/${pkgname}/direct-x-readme.txt
 }

src/mingw-w64-winpthreads/PKGBUILD

@@ -4,8 +4,7 @@
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-winpthreads
-pkgver=5.0.4
+pkgver=6.0.0
-_pkgver=${pkgver/rc/-rc}
 pkgrel=1
 pkgdesc='MinGW-w64 winpthreads library'
 arch=('any')
@@ -18,15 +17,15 @@ conflicts=('mingw-w64-headers-bootstrap')
 replaces=('mingw-w64-headers-bootstrap')
 options=('!strip' '!buildflags' 'staticlibs' '!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})
-sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803'
+sha256sums=('805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0'
             'SKIP')
 
 build() {
   for _target in ${_targets}; do
     msg "Building ${_target} winpthreads..."
     mkdir -p "$srcdir"/winpthreads-build-${_target} && cd "$srcdir"/winpthreads-build-${_target}
-    "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-libraries/winpthreads/configure --prefix=/usr/${_target} \
+    "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-libraries/winpthreads/configure --prefix=/usr/${_target} \
         --host=${_target} --enable-static --enable-shared
     make
   done

src/movim-git/PKGBUILD

@@ -3,7 +3,7 @@
 
 _pkgbase='movim'
 pkgname=movim-git
-pkgver=r7026.f44bc2c9
+pkgver=r7308.8a32ba694
 pkgrel=1
 pkgdesc="Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol."
 arch=('any')
@@ -11,17 +11,21 @@ url='https://movim.eu'
 license=('AGPL3')
 provides=('movim')
 conflicts=('movim')
-depends=('php-gd' 'php-imagick' 'php-zmq')
+depends=('php-gd' 'php-imagick')
 optdepends=('postgresql: to use the postgresql database backend'
             'php-pgsql: php bindings for postgresql'
+            'php-sqlite: php bindings for sqlite'
             'mariadb: to use the mysql database backend'
+            'sqlite3: to use the sqlite database backend'
             'nginx: reverse proxy'
             'apache: reverse proxy'
             'php-fpm: PHP FactCGI process manager')
 makedepends=('git' 'composer')
 source=("$_pkgbase::git+https://github.com/movim/movim"
         movim.env
-        movim.service)
+        movim.service
+        sysuser.conf
+        tmpfiles.conf)
 install=movim.install
 backup=("etc/webapps/$_pkgbase/db.inc.php"
         "etc/default/movim")
@@ -40,17 +44,16 @@ build() {
 package() {
   cd "$srcdir/$_pkgbase"
 
+  # Systemd files
+  install -m755 -d "$pkgdir/etc/default"
+  install -Dm640 "$srcdir/movim.env" "$pkgdir/etc/default/$_pkgbase"
+  install -Dm644 "$srcdir/movim.service" "$pkgdir/usr/lib/systemd/system/movim.service"
+  install -Dm644 "$srcdir/sysuser.conf" "$pkgdir/usr/lib/sysusers.d/movim.conf"
+  install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/movim.conf"
+
   install -m755 -d "$pkgdir/usr/share/webapps/$_pkgbase"
 
-  # Cache
+  cp -r app database lib locales src theme vendor \
-  install -m750 -d "$pkgdir/var/cache/webapps/$_pkgbase/cache"\
-    "$pkgdir/var/cache/webapps/$_pkgbase/users"
-  chown -R root:http "$pkgdir/var/cache/webapps/$_pkgbase"
-  chmod -R u+rwX,g+rwX,o-rwx "$pkgdir/var/cache/webapps/$_pkgbase"
-  # XXX: Symlinks created post_upgrade. Waiting for upstream to fix
-  # https://github.com/movim/movim/issues/509.
-
-  cp -r app database lib locales src themes vendor \
     "$pkgdir/usr/share/webapps/$_pkgbase"
   install -Dm644 VERSION CHANGELOG.md INSTALL.md README.md index.php \
     linker.php phinx.php "$pkgdir/usr/share/webapps/$_pkgbase"
@@ -58,22 +61,11 @@ package() {
 
   # Configuration file
   install -m750 -d "$pkgdir/etc/webapps/$_pkgbase"
-  install -Dm750 config/db.example.inc.php "$pkgdir/etc/webapps/$_pkgbase/db.inc.php"
+  install -Dm640 config/db.example.inc.php "$pkgdir/etc/webapps/$_pkgbase/db.inc.php"
-  chown -R root:http "$pkgdir/etc/webapps/$_pkgbase"
-  chmod -R u+rwX,g+rwX,o-rwx "$pkgdir/etc/webapps/$_pkgbase"
-  ln -s "/etc/webapps/$_pkgbase" "$pkgdir/usr/share/webapps/$_pkgbase/config"
-
-  # Log files
-  install -m770 -d "$pkgdir/var/log/webapps/$_pkgbase"
-  chown -R root:http "$pkgdir/var/log/webapps/$_pkgbase"
-  ln -s "/var/log/webapps/$_pkgbase" "$pkgdir/usr/share/webapps/$_pkgbase/log"
-
-  # Systemd unit file
-  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"
 }
 
 sha256sums=('SKIP'
             '5dfff91dd4a54f3d3713530e204370a96d37898b670a61123d8cad42f92da306'
-            'b348b86ccfe56b104ada9134672bf77054b148b2a2eb9f704be429905fc3d834')
+            '813d580300ee5bb7f1f9603db2404f5af67fd02f49017708d4adb919d4422045'
+            'c8b569f1eafb97d8d03bbaabb9b4d6ed3415f922a05a52bd865942676368f4c5'
+            'e3cd2ceb71f4ef4689028313188def52aa19859e35aa8abcaa200495cd187935')

src/movim-git/movim.service

@@ -3,7 +3,7 @@ Description=Movim Daemon
 After=network.target
 
 [Service]
-Group=http
+User=movim
 WorkingDirectory=/usr/share/webapps/movim
 EnvironmentFile=/etc/default/movim
 ExecStartPre=/usr/bin/php vendor/bin/phinx migrate

src/nextcloud-app-keeweb/PKGBUILD

@@ -2,8 +2,8 @@
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=nextcloud-app-keeweb
-pkgver=0.4.0
+pkgver=0.5.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Open Keepass stores inside Nextcloud"
 arch=('any')
 url="https://github.com/jhass/nextcloud-keeweb"
@@ -12,12 +12,7 @@ depends=('nextcloud')
 makedepends=()
 options=('!strip')
 source=("https://github.com/jhass/nextcloud-keeweb/releases/download/v${pkgver}/keeweb-${pkgver}.tar.gz")
-sha512sums=("827e214622cf08b0af07a91a3764c47486333da2328883f3e4af6758316a8cb63341428ea8d2ff3f02bc86da3408ac5e21e653984d5b6455756963d9a26716bc")
+sha512sums=("a19ae97b26c01696e009236e98e757d85936eb1cd252175a796f04ddc90cbe7f90154f2bbdbb929ecddd9612a032630cef1046866d03380cfa2bd3e40fadfd94")
-
-prepare() {
-  cd "${srcdir}/keeweb"
-  sed -i 's/max-version="12"/max-version="13"/g' "appinfo/info.xml"
-}
 
 package() {
   install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"

src/nextcloud-app-passman/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=nextcloud-app-passman
-pkgver=2.1.4
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="Passman is a full featured password manager"
 arch=('any')
@@ -12,7 +12,7 @@ depends=('nextcloud')
 makedepends=()
 options=('!strip')
 source=("nextcloud-app-passman-${pkgver}.tar.gz::https://releases.passman.cc/passman_${pkgver}.tar.gz")
-sha512sums=("1c82dc87f357d6b22bc641558e934edb55c4766e779c05df77357c20e7916591ddbd654ab0779303433c20cb42339c2c56a6e47527f8aa2e9f15ee972d31c4ce")
+sha512sums=("75e61910bf11cbc632da04cf107230f6c94a15965663e3660717e8eb98c211c08cceaecea92d7a0bc3d3b2979216791188d56be334761dc696638cbcead0eb8e")
 
 package() {
   install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"

src/ocserv/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 pkgname=ocserv
-pkgver=0.12.0
+pkgver=0.12.2
 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=('4dba49ba482db06edcf317d64ba4a959ffd0dc62920975868e9a30c84dac00b6')
+sha256sums=('3ebcad5855691c302d46957c035f3c01d0c8e2d275cfca78abbb37fdaf91c204')
 
 prepare() {
   cd ${pkgname}-${pkgname}_*
@@ -30,3 +30,4 @@ package() {
   install -Dm0600 doc/sample.passwd "$pkgdir/etc/ocserv-passwd"
   install -Dm0644 doc/systemd/standalone/ocserv.service "$pkgdir/usr/lib/systemd/system/ocserv.service"
 }
+sha256sums=('da318005266de07d257daf407d087446d993c9035d4ca00156f65c3bae1ec851')

src/openconnect-git/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=openconnect-git
 _pkgname=openconnect
-pkgver=7.08.r127.g89778776
+pkgver=7.08.r127.g8977877
 pkgrel=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
 arch=('i686' 'x86_64')
@@ -14,7 +14,8 @@ makedepends=('intltool' 'python2' 'git')
 options=('!emptydirs')
 provides=($_pkgname)
 conflicts=($_pkgname)
-source=("$pkgname::git+https://gitlab.com/openconnect/$_pkgname.git/")
+source=("$pkgname::git+https://gitlab.com/ocserv/$_pkgname.git/")
+source=("$pkgname::git://git.infradead.org/users/dwmw2/$_pkgname.git")
 md5sums=('SKIP')
 
 pkgver() {
@@ -27,7 +28,8 @@ build() {
   ./autogen.sh
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
       --sbindir=/usr/bin \
-      --disable-static
+      --disable-static \
+      --without-gnutls
   make V=0
 }
 

src/pacaur/PKGBUILD

@@ -1,23 +1,21 @@
-pkgname=pacaur
+pkgname='pacaur'
-pkgver=4.7.90
+pkgver=4.8.4
 pkgrel=1
-pkgdesc="An AUR helper that minimizes user interaction"
+pkgdesc='An AUR helper that minimizes user interaction'
 arch=('any')
-url="https://github.com/rmarquis/pacaur"
+url="https://github.com/E5ten/${pkgname}"
 license=('ISC')
-depends=('cower' 'expac' 'sudo' 'git')
+depends=('auracle-git' 'expac' 'sudo' 'git' 'jq')
 makedepends=('perl')
-backup=('etc/xdg/pacaur/config')
+backup=("etc/xdg/${pkgname}/config")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/rmarquis/$pkgname/archive/$pkgver.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/E5ten/${pkgname}/archive/${pkgver}.tar.gz")
-md5sums=('237a716ddfe3eab43a0f7958be646d09')
+sha256sums=('0b5da346d54b893896a032b4b61475d1579c996978fe882e84432ebe6ceacfa2')
 
 build() {
-    cd "$pkgname-$pkgver"
+    make -C "${srcdir}/${pkgname}-${pkgver}" --no-print-directory
-    make
 }
 
 package() {
-    cd "$pkgname-$pkgver"
+    make -C "${srcdir}/${pkgname}-${pkgver}" --no-print-directory DESTDIR="${pkgdir}" PREFIX='/usr' install
-    make install DESTDIR=$pkgdir PREFIX=/usr
 }
 

src/panda3d/PKGBUILD

@@ -3,8 +3,8 @@
 # Contributor: Tucos <baspape@gmail.com>
 
 pkgname=panda3d
-pkgver=1.9.4
+pkgver=1.10.1
-pkgrel=2
+pkgrel=1
 pkgdesc="A 3D game engine with Python bindings. SDK package. Optional dependencies you want to support need to be installed before panda3d."
 url="http://www.panda3d.org"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('desktop-file-utils' 'shared-mime-info' 'xorg-server' 'libgl'
          'openssl' 'libjpeg' 'libpng' 'libtiff' 'freetype2' 'gtk2'
          'openal' 'libxrandr' 'libxcursor' 'libxxf86dga')
-makedepends=('python2' 'bison' 'cmake')
+makedepends=('python' 'bison' 'cmake' 'flex')
 
 # NOTICE: please read http://www.panda3d.org/manual/index.php/Dependencies for
 # more information. Optdepends you want your package to support, need to be
@@ -27,8 +27,7 @@ optdepends=(# Pretty much required
             'xorg-server: X11 support'
             'libgl: OpenGL support for X11'
             # Recommended
-            'python2: python2 bindings'
+            'python: Python 3 bindings'
-            'python: Experimental python 3 bindings'
             'openssl: Provides some networking and encryption support'
             'ffmpeg: Required to load and play video textures'
             'libjpeg: Required to read and write jpeg images'
@@ -41,18 +40,22 @@ optdepends=(# Pretty much required
             'openal: OpenAL audio'
             'zlib: Compression support'
             'libxxf86dga: Relative mouse mode'
+            'libvorbis: Used to load .ogg files encoded with Vorbis.'
+            'openexp: OpenEXR image format support'
             # Optional
+            'assimp: Open Asset Import'
+            'opus: Read .opus audio files'
             'bullet: Support for the physics engine'
             'eigen: Optimised linear algebra library'
             'fmodex: FMod audio'
             'libxcursor: Custom cursor icons'
             'libxrandr: Resolution switching'
-            'librocket: Librocket GUI support'
+            #'librocket: Librocket GUI support'
             'libsquish: DXT support (AUR)'
             'artoolkit: library for augmented reality (AUR)'
             'opencv: alternative to ffmpeg for video texture support'
             'fcollada: used for dae2egg and for loading dae files directly into Panda (unavailable)'
-            'vrpn: support for virtual reality trackers (unavailable)'
+            'vrpn-git: support for virtual reality trackers.'
             # ARM stuff, not really applicable, stated for completeness
             # NOTE: if you have libgles, you _must_ install libegl for this package to compile
             'libgles: OpenGL ES support'
@@ -60,16 +63,16 @@ optdepends=(# Pretty much required
             )
 
 install='panda3d.install'
-source=("$url/download/panda3d-$pkgver/panda3d-$pkgver.tar.gz"
+source=("https://github.com/panda3d/panda3d/archive/v$pkgver.tar.gz"
         'panda3d.install')
 
 JOBS=$(nproc)
 
 build() {
   cd "$srcdir/panda3d-$pkgver"
-  LD_LIBRARY_PATH=/usr/lib/openssl-1.0-compat/
+  #LD_LIBRARY_PATH=/usr/lib/openssl-1.0-compat/
   # disable broken extensions
-  python2 makepanda/makepanda.py --everything --no-opencv --no-opencv --no-maya2012 --no-fmodex --no-gles --no-gles2 --no-openssl ${PANDAFLAGS} --threads ${BUILD_THREADS:-$JOBS}
+  python makepanda/makepanda.py --everything --no-opencv --no-opencv --no-maya2012 --no-fmodex --no-gles --no-gles2 --no-openssl --no-egl ${PANDAFLAGS} --threads ${BUILD_THREADS:-$JOBS}
 }
 
 package() {
@@ -78,5 +81,5 @@ package() {
   install -D -m644 "$srcdir/panda3d-$pkgver/doc/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
 }
-md5sums=('7490512af90e003228fb8fb5e89a2371'
+md5sums=('a8e438d4a13ac8c81b80d288326617b3'
          '057269173f3c1987953302519bc744fa')

src/perl-file-libmagic/PKGBUILD

@@ -1,17 +1,17 @@
 # Maintainer: Ganymede < ganymede _AT_ analogon _DOT_ eu>
 
 pkgname=perl-file-libmagic
-pkgver=1.15
+pkgver=1.16
-pkgrel=5
+pkgrel=1
 pkgdesc="Determine MIME types of data or files using libmagic"
 arch=('any')
-url="http://search.cpan.org/~drolsky/File-LibMagic"
+url="https://metacpan.org/release/File-LibMagic"
 license=('GPL' 'PerlArtistic')
 depends=('perl' 'file')
 makedepends=('perl-test-fatal')
 options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/File-LibMagic-$pkgver.tar.gz)
+source=(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/File-LibMagic-$pkgver.tar.gz)
-sha256sums=('2c7fb54912caf2c22d06b02d6a88edad970e0f8b017634dc30eec46e53763e84')
+sha256sums=('c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60')
 
 build() {
   cd "$srcdir/File-LibMagic-$pkgver"

src/perl-sys-virt/PKGBUILD

@@ -6,7 +6,7 @@ _perlmod="sys-virt"
 _cpanname='Sys-Virt'
 pkgname=perl-${_perlmod}
 pkgver=3.0.0
-pkgrel=3
+pkgrel=5
 pkgdesc="Represent and manage a libvirt hypervisor connection"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/Sys-Virt/"

src/php-imagick/PKGBUILD

@@ -3,7 +3,7 @@
 pkgname=php-imagick
 _extname=imagick
 pkgver=3.4.3
-pkgrel=3
+pkgrel=5
 pkgdesc="PHP extension for IMagick"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://pecl.php.net/package/${_extname}"

src/pi-hole-ftl/PKGBUILD

@@ -1,53 +1,37 @@
 # Maintainer:  max.bra <max dot bra dot gtalk at gmail dot com>
+# Maintainer:  graysky <graysky AT archlinux DOT us>
 
 pkgname=pi-hole-ftl
 _pkgname=FTL
-pkgver=3.0
+_servicename=pihole-FTL
-pkgrel=2
+pkgver=4.2.3
+pkgrel=1
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc="The Pi-hole FTL engine"
 url="https://github.com/pi-hole/FTL"
 license=('EUPL-1.1')
-depends=()
+depends=('nettle' 'gmp')
 makedepends=('sqlite')
+conflicts=('dnsmasq')
+provides=('dnsmasq')
 install=$pkgname.install
-backup=('etc/pihole/pihole-FTL.conf')
+backup=('etc/pihole/pihole-FTL.conf' 'etc/pihole/pihole-FTL.db')
 source=("https://github.com/pi-hole/FTL/archive/v$pkgver.tar.gz"
+         "https://raw.githubusercontent.com/max72bra/pi-hole-ftl-archlinux-customization/master/arch-ftl-$pkgver.patch"
          "$pkgname.tmpfile"
          "$pkgname.service"
-	"$pkgname.conf"
+         "$pkgname.db"
-	"$pkgname.sysuser"
+         "$pkgname.conf")
-  )
+md5sums=('c77c455a423db6963ab0860cb3f256d6'
-md5sums=('45fd33e4498b2ab9403d96e1251abb8c'
+         'a1dffe02d7749ed94c0c2b088db36446'
-         'ca844c23699ba64777571253bc7ccb21'
+         '5faa64558cc0a5888923fcf77c299fa7'
-         '0f65203b2585fb83e02826091d220386'
+         'f3e42ec6f04180c6d6972998bf172a41'
-         '2d6ae93eea48a09ce5bc5bf62e081dd4'
+         '0495c002b7d5dce303d451e4cd2fede5'
-         '68e78907dc2a0c89421d02377e76d353')
+         '40b1c4174198eacd7d12eb9b356aced0')
 
 prepare() {
-  _ssc="/tmp/sedcontrol"
-
   cd "$srcdir"/"$_pkgname"-"$pkgver"
-
+  patch -Np1 -i ../arch-ftl-$pkgver.patch
-  # git descriptions setup
-  sed -i "s|^GIT_BRANCH := .*$|GIT_BRANCH := master|w $_ssc" "$srcdir"/$_pkgname-$pkgver/Makefile
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: git descriptions setup 1" && return 1 ; fi
-  sed -i "s|^GIT_VERSION := .*$|GIT_VERSION := v$pkgver|w $_ssc" "$srcdir"/$_pkgname-$pkgver/Makefile
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: git descriptions setup 2" && return 1 ; fi
-  sed -i "s|^GIT_DATE := .*$|GIT_DATE := $(date -I)|w $_ssc" "$srcdir"/$_pkgname-$pkgver/Makefile
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: git descriptions setup 3" && return 1 ; fi
-  sed -i "s|^GIT_TAG := .*$|GIT_TAG := v$pkgver|w $_ssc" "$srcdir"/$_pkgname-$pkgver/Makefile
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: git descriptions setup 4" && return 1 ; fi
-
-  # setting up logs paths
-  sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/memory.c
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up logs paths 1" && return 1 ; fi
-  sed -i "s|/var/run/pihole-FTL|/run/pihole-ftl/pihole-FTL|w $_ssc" "$srcdir"/$_pkgname-$pkgver/memory.c
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up logs paths 2" && return 1 ; fi
-  sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/memory.c
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up logs paths 3" && return 1 ; fi
-  sed -i "s|/var/run/pihole/|/run/pihole-ftl/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/memory.c
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up logs paths 4" && return 1 ; fi
 }
 
 build() {
@@ -60,12 +44,12 @@ package() {
   install -Dm755 "$_pkgname"-$pkgver/pihole-FTL "${pkgdir}"/usr/bin/pihole-FTL
   
   install -Dm644 "$pkgname.tmpfile" "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
-  install -Dm644 "$pkgname.sysuser" "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
 
   install -dm755 "$pkgdir"/etc/pihole
   install -Dm644 "$pkgname.conf" "$pkgdir"/etc/pihole/pihole-FTL.conf
+  install -Dm644 "$pkgname.db" "$pkgdir"/etc/pihole/pihole-FTL.db
 
-  install -Dm644 "$pkgname.service" "$pkgdir"/usr/lib/systemd/system/$pkgname.service
+  install -Dm644 "$pkgname.service" "$pkgdir"/usr/lib/systemd/system/$_servicename.service
   install -dm755 "$pkgdir/usr/lib/systemd/system/multi-user.target.wants"
-  ln -s ../$pkgname.service "$pkgdir/usr/lib/systemd/system/multi-user.target.wants/$pkgname.service"
+  ln -s ../$_servicename.service "$pkgdir/usr/lib/systemd/system/multi-user.target.wants/$_servicename.service"
 }

src/pi-hole-ftl/pi-hole-ftl.conf

@@ -1,9 +1,84 @@
-SOCKET_LISTENING=localonly
+### This file contains parameters for FTL behavior.
-TIMEFRAME=rolling24h
+### At install, all parameters are commented out. The user can select desired options.
-QUERY_DISPLAY=yes
+### Options shown are the default configuration. No modification is needed for most
-AAAA_QUERY_ANALYSIS=yes
+### installations.
-MAXDBDAYS=365
+### Visit https://docs.pi-hole.net/ftldns/configfile/ for more detailed parameter explanations
-RESOLVE_IPV6=yes
+
-RESOLVE_IPV4=yes
+## Socket Listening
-DBINTERVAL=1.0
+## Listen only for local socket connections or permit all connections
-DBFILE=/etc/pihole/pihole-FTL.db
+## Options: localonly, all
+#SOCKET_LISTENING=localonly
+
+## Query Display
+## Display all queries? Set to no to hide query display
+## Options: yes, no
+#QUERY_DISPLAY=yes
+
+## AAA Query Analysis
+## Allow FTL to analyze AAAA queries from pihole.log?
+## Options: yes, no
+#AAAA_QUERY_ANALYSIS=yes
+
+## Resolve IPv6
+## Should FTL try to resolve IPv6 addresses to host names?
+## Options: yes, no
+#RESOLVE_IPV6=yes
+
+## Resolve IPv4
+## Should FTL try to resolve IPv4 addresses to host names?
+## Options: yes, no
+#RESOLVE_IPV4=yes
+
+## Max Database Days
+## How long should queries be stored in the database -days-?
+## Setting this to 0 disables the database
+## See: https://docs.pi-hole.net/ftldns/database/
+## Options: number of days
+#MAXDBDAYS=365
+
+## Database Interval
+## How often do we store queries in FTL's database -minutes-?
+## See: https://docs.pi-hole.net/ftldns/database/
+## Options: number of minutes
+#DBINTERVAL=1.0
+
+## Database File
+## Specify path and filename of FTL's SQLite3 long-term database.
+## Setting this to DBFILE= disables the database altogether
+## See: https://docs.pi-hole.net/ftldns/database/
+## Option: path to db file
+#DBFILE=/etc/pihole/pihole-FTL.db
+
+## Max Log Age
+## Up to how many hours of queries should be imported from the database and logs -hours-?
+## Maximum is 744 -31 days-
+## Options: number of days
+#MAXLOGAGE=24.0
+
+## FTL Port
+## On which port should FTL be listening?
+## Options: tcp port
+#FTLPORT=4711
+
+## Privacy Level
+## Which privacy level is used?
+## See: https://docs.pi-hole.net/ftldns/privacylevels/
+## Options: 0, 1, 2, 3
+#PRIVACYLEVEL=0
+
+## Ignore Localhost
+## Should FTL ignore queries coming from the local machine?
+## Options: yes, no
+#IGNORE_LOCALHOST=no
+
+## Blocking Mode
+## How should FTL reply to blocked queries?
+## See: https://docs.pi-hole.net/ftldns/blockingmode/
+## Options: NULL, IP-NODATA-AAAA, IP, NXDOMAIN
+#BLOCKINGMODE=NULL
+
+## Regex Debug Mode
+## Controls if FTLDNS should print extended details about regex matching into pihole-FTL.log.
+## See: https://docs.pi-hole.net/ftldns/regex/overview/
+## Options: true, false
+#REGEX_DEBUGMODE=false

src/pi-hole-ftl/pi-hole-ftl.install

@@ -1,6 +1,9 @@
 post_install() {
+  # ftl DB permissions
+  [ -e /etc/pihole/pihole-FTL.db ] && chown nobody.nobody /etc/pihole /etc/pihole/pihole-FTL.db
+
   echo -e "\e[1;33m==>\e[0m Possible configurations in \e[1;31m/etc/pihole/pihole-FTL.conf\e[0m file"
-  echo -e "\e[1;33m==>\e[0m Please read the instructions on the project page: \e[1;36mhttps://github.com/pi-hole/FTL#ftls-config-file\e[0m"
+  echo -e "\e[1;33m==>\e[0m Please read the instructions on the project page: \e[1;36mhttps://docs.pi-hole.net/ftldns/configfile/\e[0m"
 }
 
 post_upgrade() {
@@ -8,5 +11,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  userdel -f pihole
+  id -u pihole > /dev/null 2>&1 && userdel -f pihole
 }

src/pi-hole-ftl/pi-hole-ftl.service

@@ -1,9 +1,7 @@
 [Unit]
-Description=Pi-hole FTL engine
+Description=Pi-hole FTLDNS engine
 
 [Service]
-User=pihole
-Group=pihole
 PIDFile=/run/pihole-ftl/pihole-FTL.pid
 ExecStart=/usr/bin/pihole-FTL no-daemon
 Restart=on-failure

src/pi-hole-ftl/pi-hole-ftl.tmpfile

@@ -1,5 +1,5 @@
-d /run/log/pihole-ftl 0755 pihole pihole - -
+d /run/log/pihole-ftl 0755 nobody nobody - -
-f /run/log/pihole-ftl/pihole-FTL.log 0644 pihole pihole - -
+f /run/log/pihole-ftl/pihole-FTL.log 0644 nobody nobody - -
-d /run/pihole-ftl 0755 pihole pihole - -
+d /run/pihole-ftl 0755 nobody nobody - -
-f /run/pihole-ftl/pihole-FTL.pid 0644 pihole pihole - -
+f /run/pihole-ftl/pihole-FTL.pid 0644 nobody nobody - -
-f /run/pihole-ftl/pihole-FTL.port 0644 pihole pihole - -
+f /run/pihole-ftl/pihole-FTL.port 0644 nobody nobody - -

src/pi-hole-server/PKGBUILD

@@ -3,15 +3,15 @@
 
 pkgname=pi-hole-server
 _pkgname=pi-hole
-pkgver=3.3.1
+pkgver=4.2.2
 pkgrel=1
 _wwwpkgname=AdminLTE
-_wwwpkgver=3.3
+_wwwpkgver=4.2
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.'
 arch=('any')
 license=('EUPL-1.1')
 url="https://github.com/pi-hole/pi-hole"
-depends=('dnsmasq' 'bc' 'perl' 'net-tools' 'iproute2' 'logrotate' 'pi-hole-ftl')
+depends=('pi-hole-ftl' 'bc' 'perl' 'net-tools' 'iproute2' 'logrotate' 'bind-tools')
 optdepends=(
 'lighttpd: a secure, fast, compliant and very flexible web-server'
 'php-cgi: CGI and FCGI SAPI for PHP needed only for lighttpd'
@@ -20,12 +20,13 @@ optdepends=(
 )
 conflicts=('pi-hole-standalone')
 install=$pkgname.install
-backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt'
+backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt' 'etc/pihole/regex.list'
-'etc/dnsmasq.d/01-pihole.conf')
+'etc/dnsmasq.d/01-pihole.conf' 'etc/pihole/adlists.list' 'etc/dnsmasq.conf')
 
 source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
 	    admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz
-	dnsmasq.main
+        "https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-$pkgver.patch"
+        "https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-$pkgver.patch"
 	    dnsmasq.include
 	    lighttpd.pi-hole.conf
 	    nginx.pi-hole.conf
@@ -37,224 +38,30 @@ source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$
 	    mimic_setupVars.conf.sh
 	    version.patch
 	    piholeDebug.sh
-  )
+)
 
-md5sums=('ea4f64bdf88620f59a1b01c19253e4e3'
+md5sums=('deebe32fd4867b289687689e0f377d72'
-         '23368537fa576480e45f625b5e1a7cd7'
+         '36f3125e753c0e6f37496b26309501da'
-         '3f1aeea43af0b192edb36b9e5484ff87'
+         'fc9f91dee70d0e73a14a63ecd3743ec1'
-         'ad008fac3c7351aa0d5205079b3dfb18'
+         'e93d67128df08b0ed66893f3fbf5ed68'
-         'a3518f54241ef2e67c17c7b144cb6a93'
+         '4d9038588164bb9130c8ca11653f83f3'
+         '971cc2859672341d77f8deba702fb7f7'
          'b63fcf29c29796023a2677bcf2b369a7'
-         '990b8abd0bfbba23a7ce82c59f2e3d64'
+         '9bc23c314397a0f59978cfe246140cda'
          '047f13d4ac97877f724f87b002aaee63'
          'd42a864f88299998f8233c0bc0dd093d'
          '20c5b0c6b4e23e55b25ab6c28dda709d'
          '291d3c95e445fe65caf40c3605efd186'
          'c227ffa88ddebc34cb715b73640cd845'
-         '93fe5e50cf3fcb08b24cf29b0cace85b'
+         '4e65ef5a25a9a7358cba24450dbed7cc'
          'd7b69ae51db0e8ac8e27f20a234eed85')
 
 prepare() {
-  _ssc="/tmp/sedcontrol"
-  
-  # the return of service management
-  sed -i "s|service dnsmasq \${svcOption}|systemctl \${svcOption} dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: the return of service management" && return 1 ; fi
-
-  # setting up and securing pihole wrapper script
-  #sed -n "/debugFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  #if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 1" && return 1 ; fi
-  #sed -i '/debugFunc() {/,+16d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/updatePiholeFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 2" && return 1 ; fi
-  sed -i '/updatePiholeFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/reconfigurePiholeFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 3" && return 1 ; fi
-  sed -i '/reconfigurePiholeFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/uninstallFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 4" && return 1 ; fi
-  sed -i '/uninstallFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/piholeCheckoutFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 5" && return 1 ; fi
-  sed -i '/piholeCheckoutFunc() {/,+20d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/tricorderFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 6" && return 1 ; fi
-  sed -i '/tricorderFunc() {/,+29d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/\"\-[r,up]/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 7" && return 1 ; fi
-  sed -i '/\"\-[r,up]/d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  #sed -n "/^  \-d/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  #if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 8" && return 1 ; fi
-  #sed -i '/^  \-d/,+2d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/^  \-up/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 9" && return 1 ; fi
-  sed -i '/^  \-up/d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/^  \-r/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 10" && return 1 ; fi
-  sed -i '/^  \-r/d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/uninstall/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 11" && return 1 ; fi
-  sed -i '/uninstall/d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -i "s|^  checkout.*$|\";|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 12" && return 1 ; fi
-
-  sed -n "/checkout/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 13" && return 1 ; fi
-  sed -i '/checkout/d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-  sed -n "/tricorder/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 14" && return 1 ; fi
-  sed -i '/tricorder/d' "$srcdir"/$_pkgname-$pkgver/pihole
-
-# -----------------
-
-  # setup gravity.sh
-  sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setup gravity.sh 1" && return 1 ; fi
-  sed -i "s|/etc/\.|/etc/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setup gravity.sh 2" && return 1 ; fi
-
-# -----------------
-
-  # setting up and securing webpage.sh script
-  sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/webpage.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing webpage.sh script 1" && return 1 ; fi
-
-# -----------------
-
-  # change log location to pihole script
-  sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log location to pihole script" && return 1 ; fi
-
-# -----------------
-
-  # change log location to piholeLogFlush.sh
-  sed -n "/\/var\/log\/pihole.log/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log location to piholeLogFlush.sh" && return 1 ; fi
-  sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|g" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh
-
-# -----------------
-
-  # change log and bin location to logrotate
-  sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/logrotate
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log and bin location to logrotate 1" && return 1 ; fi
-  sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/logrotate
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log and bin location to logrotate 2" && return 1 ; fi
-  sed -i "s|/usr/sbin|/usr/bin|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log and bin location to logrotate 3" && return 1 ; fi
-
-# -----------------
-
-  # change FTL port file location to chronometer.sh
-  sed -i "s|/var/run/pihole-FTL.port|/run/pihole-ftl/pihole-FTL.port|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change FTL port file location to chronometer.sh" && return 1 ; fi
-
-# -----------------
-
-  # no debug for us, right now
-  sed -n "/\-\- Generate debug log \-\-/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: no debug for us, right now 1" && return 1 ; fi
-  sed -i '/\-\- Generate debug log \-\-/,+5d' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php
-
-# -----------------
-
-  # change log location in admin php interface
-  sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/data.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log location in admin php interface 1" && return 1 ; fi
-
-  sed -i "s|/var/run/pihole-FTL.port|/run/pihole-ftl/pihole-FTL.port|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/FTL.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log location in admin php interface 2" && return 1 ; fi
-  sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/tailLog.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log location in admin php interface 3" && return 1 ; fi
-  sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/tailLog.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log location in admin php interface 4" && return 1 ; fi
-
-# -----------------
-
-  # since we don't directly install from git...
-#  sed -n "/\$core_branch =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-#  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 1" && return 1 ; fi
-#  sed -i 's/\$core_branch =.*$/\$core_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-#  sed -n "/\$web_branch =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-#  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 2" && return 1 ; fi
-#  sed -i 's/\$web_branch =.*$/\$web_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-
-  sed -n "/\$core_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 3" && return 1 ; fi
-  sed -i 's/\$core_current =.*$/\$core_current = "'"$pkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-  sed -n "/\$web_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 4" && return 1 ; fi
-  sed -i 's/\$web_current =.*$/\$web_current = "'"$_wwwpkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-  sed -n "/\$FTL_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 4" && return 1 ; fi
-  sed -i 's/\$FTL_current =.*$/\$FTL_current = exec("pihole-FTL version");/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-
-#  sed -n "/\$core_commit =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-#  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 5" && return 1 ; fi
-#  sed -i 's/\$core_commit =.*$/\$core_commit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-#  sed -n "/\$web_commit =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-#  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 6" && return 1 ; fi
-#  sed -i 's/\$web_commit =.*$/\$web_commit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
-
-  sed -i "s|/var/www/html/admin/|/srv/http/pihole/admin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 7" && return 1 ; fi
-
   cd "$srcdir"/"$_pkgname"-"$pkgver"
+  patch -Np1 -i "$srcdir"/arch-server-core-$pkgver.patch
   patch -p1 -i "$srcdir"/version.patch
-  cd "$srcdir"
+  cd "$srcdir"/"$_wwwpkgname"-"$_wwwpkgver"
-
+  patch -Np1 -i "$srcdir"/arch-server-admin-$pkgver.patch
-  sed -n "/{{corever}}/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 13" && return 1 ; fi
-  sed -i "s/{{corever}}/$pkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
-  sed -n "/{{webver}}/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 14" && return 1 ; fi
-  sed -i "s/{{webver}}/$_wwwpkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
-
-# -----------------
-
-  # web admin footer update setup
-  sed -i "s|https:\/\/github.com\/pi-hole\/pi-hole\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: web admin footer update setup 1" && return 1 ; fi
-  sed -i "s|https:\/\/github.com\/pi-hole\/AdminLTE\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: web admin footer update setup 2" && return 1 ; fi
-  sed -i "s|https:\/\/github.com\/pi-hole\/FTL\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: web admin footer update setup 3" && return 1 ; fi
-
-# -----------------
-
-  # sudo pihole full path (php-fpm compatibility)
-  sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/api.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudo pihole full path (php-fpm compatibility) 1" && return 1 ; fi
-  sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudo pihole full path (php-fpm compatibility) 2" && return 1 ; fi
-  sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/queryads.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudo pihole full path (php-fpm compatibility) 3" && return 1 ; fi
-  sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/savesettings.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudo pihole full path (php-fpm compatibility) 4" && return 1 ; fi
-  sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/sub.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudo pihole full path (php-fpm compatibility) 5" && return 1 ; fi
-  sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/add.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudo pihole full path (php-fpm compatibility) 6" && return 1 ; fi
-  sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/gravity.sh.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudo pihole full path (php-fpm compatibility) 7" && return 1 ; fi
-  sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/loginpage.php
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudo pihole full path (php-fpm compatibility) 8" && return 1 ; fi
-
-# -----------------
-
-  # pi-hole sudoers file is now populated by install script
-  echo "http ALL=NOPASSWD: /usr/bin/pihole" >> $_pkgname-$pkgver/advanced/pihole.sudo
 }
 
 package() {
@@ -269,12 +76,17 @@ package() {
   install -Dm755 $_pkgname-$pkgver/advanced/Scripts/list.sh "$pkgdir"/opt/pihole/list.sh
   install -Dm755 $_pkgname-$pkgver/advanced/Scripts/webpage.sh "$pkgdir"/opt/pihole/webpage.sh
   install -Dm755 $_pkgname-$pkgver/advanced/Scripts/COL_TABLE "$pkgdir"/opt/pihole/COL_TABLE
+  install -Dm755 $_pkgname-$pkgver/advanced/Scripts/wildcard_regex_converter.sh "$pkgdir"/opt/pihole/wildcard_regex_converter.sh
+  install -Dm755 $_pkgname-$pkgver/advanced/Scripts/query.sh "$pkgdir"/opt/pihole/query.sh
 
   install -Dm755 piholeDebug.sh "$pkgdir"/opt/pihole/piholeDebug.sh
   install -Dm755 mimic_setupVars.conf.sh "$pkgdir"/opt/pihole/mimic_setupVars.conf.sh
 
   install -dm750 "$pkgdir"/etc/sudoers.d
-  install -Dm440 $_pkgname-$pkgver/advanced/pihole.sudo "$pkgdir"/etc/sudoers.d/pihole
+  install -Dm440 $_pkgname-$pkgver/advanced/Templates/pihole.sudo "$pkgdir"/etc/sudoers.d/pihole
+  install -Dm644 $_pkgname-$pkgver/advanced/dnsmasq.conf.original "$pkgdir"/etc/dnsmasq.conf
+#  install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf
+  install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf
 
   install -Dm644 pi-hole.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/pi-hole.conf
 
@@ -288,13 +100,12 @@ package() {
 
   install -dm755 "$pkgdir"/etc/pihole
   install -dm755 "$pkgdir"/usr/share/pihole/configs
-  install -Dm644 $_pkgname-$pkgver/adlists.default "$pkgdir"/etc/pihole/adlists.default
+  install -Dm644 $_pkgname-$pkgver/adlists.list "$pkgdir"/etc/pihole/adlists.list
-  install -Dm644 $_pkgname-$pkgver/advanced/logrotate "$pkgdir"/etc/pihole/logrotate
+  install -Dm644 $_pkgname-$pkgver/advanced/Templates/logrotate "$pkgdir"/etc/pihole/logrotate
   install -Dm644 /dev/null "$pkgdir"/etc/pihole/whitelist.txt
   install -Dm644 /dev/null "$pkgdir"/etc/pihole/blacklist.txt
+  install -Dm644 /dev/null "$pkgdir"/etc/pihole/regex.list
 
-  install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf
-  install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf
   install -Dm644 lighttpd.pi-hole.conf "$pkgdir"/usr/share/pihole/configs/lighttpd.example.conf
   install -Dm644 nginx.pi-hole.conf "$pkgdir"/usr/share/pihole/configs/nginx.example.conf
 

src/pi-hole-server/dnsmasq.include

@@ -28,7 +28,11 @@ localise-queries
 bogus-priv
 no-resolv
 cache-size=10000
-log-queries=extra
+log-queries
 log-facility=/run/log/pihole/pihole.log
-local-ttl=300
+local-ttl=2
 log-async
+# If a DHCP client claims that its name is "wpad", ignore that.
+# This fixes a security hole. see CERT Vulnerability VU#598349
+dhcp-name-match=set:wpad-ignore,wpad
+dhcp-ignore-names=tag:wpad-ignore

src/pi-hole-server/lighttpd.pi-hole.conf

@@ -86,4 +86,4 @@ $HTTP["url"] =~ "^/admin/\.(.*)" {
 }
 
 # Add user chosen options held in external file
-include_shell "cat external.conf 2>/dev/null"
+#include_shell "cat external.conf 2>/dev/null"

src/pi-hole-server/pi-hole-server.install

@@ -5,8 +5,12 @@ warning() {
 post_install() {
   echo -e "\e[1;33m==>\e[0m Read setup instructions at \e[1;36mhttps://wiki.archlinux.org/index.php/Pi-hole\e[0m"
   echo -e "\e[1;33m==>\e[0m Generating initial block list, please wait...\e[0m"
+
+  # permissions
   chown -R http:http /srv/http/pihole
-  chown pihole:pihole /etc/pihole
+  chown nobody:nobody /etc/pihole
+  chown http:root /etc/pihole/regex.list
+
   /opt/pihole/mimic_setupVars.conf.sh
 
   # update lists on first run
@@ -22,8 +26,9 @@ post_upgrade() {
   [ -e /etc/pihole/hosts ] && rm /etc/pihole/hosts
   [ -e /etc/pihole/.useIPv6 ] && rm /etc/pihole/.useIPv6
 
-  # update owner of existing dir
+  # update owner of existing dir and file
-  chown pihole:pihole /etc/pihole
+  chown nobody:nobody /etc/pihole
+  chown http:root /etc/pihole/regex.list
 
   # warning
 

src/pi-hole-server/pi-hole.tmpfile

@@ -1,3 +1,3 @@
 d /run/pihole 0755 http root - -
-d /run/log/pihole 0755 dnsmasq root - -
+d /run/log/pihole 0755 nobody root - -
-f /run/log/pihole/pihole.log 0644 dnsmasq root - -
+f /run/log/pihole/pihole.log 0644 nobody root - -

src/pi-hole-server/version.patch

@@ -1,7 +1,6 @@
-diff -ur pi-hole-3.1/advanced/Scripts/version.sh pi-hole-3.1.a/advanced/Scripts/version.sh
+--- pi-hole-4.0.a/advanced/Scripts/version.sh	2018-08-05 19:40:22.000000000 +0200
---- pi-hole-3.1/advanced/Scripts/version.sh	2017-06-20 23:17:41.000000000 +0200
++++ pi-hole-4.0/advanced/Scripts/version.sh	2018-08-24 15:28:44.141363877 +0200
-+++ pi-hole-3.1.a/advanced/Scripts/version.sh	2017-06-22 13:52:36.293206505 +0200
+@@ -20,42 +20,16 @@
-@@ -20,63 +20,21 @@
          return 0
      fi
  
@@ -17,10 +16,10 @@ diff -ur pi-hole-3.1/advanced/Scripts/version.sh pi-hole-3.1.a/advanced/Scripts/
 -        echo "ERROR"
 -        return 1
 +    if [[ "$1" == "pi-hole" ]]; then
-+    echo "{{corever}}"
++        echo "4.2.1"
      else
 -        echo "Untagged"
-+    echo "{{webver}}"
++        echo "4.2.1"
      fi
      return 0
  }
@@ -48,25 +47,3 @@ diff -ur pi-hole-3.1/advanced/Scripts/version.sh pi-hole-3.1.a/advanced/Scripts/
      return 0
  }
  
- getRemoteHash(){
--  # Remote FTL hash is not applicable
--  if [[ "$1" == "FTL" ]]; then
--    echo "N/A"
--    return 0
--  fi
--
--  local daemon="${1}"
--  local branch="${2}"
--
--  hash=$(git ls-remote --heads "https://github.com/pi-hole/${daemon}" | \
--         awk -v bra="$branch" '$0~bra {print substr($0,0,8);exit}')
--  if [[ -n "$hash" ]]; then
--    echo "$hash"
--  else
--    echo "ERROR"
--    return 1
--  fi
-+  echo "N/A"
-   return 0
- }
- 

src/prosody-hg-stable/PKGBUILD

@@ -8,7 +8,7 @@
 
 pkgname=prosody-hg-stable
 pkgrel=1
-pkgver=0.10.r7587+.37b796cc366a+
+pkgver=0.10.r7564+.9e565d0b1771+
 pkgver() {
   cd "$srcdir/prosody-hg"
   printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"

src/python-configshell-fb/PKGBUILD

@@ -1,7 +1,7 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=('python-configshell-fb' 'python2-configshell-fb')
 _pkgname=configshell-fb
-pkgver=1.1.fb23
+pkgver=1.1.fb25
 pkgrel=1
 pkgdesc="python framework for building simple CLI applications (free branch)"
 arch=('any')
@@ -10,7 +10,7 @@ license=('Apache')
 options=()
 makedepends=('python-setuptools' 'python2-setuptools')
 source=(https://github.com/open-iscsi/configshell-fb/archive/v${pkgver}.tar.gz)
-sha512sums=('71e2a30f3a484fb416ca8bda22c49c27a3abb8c826dc5ab06d5fe73dc0e0ccb3960934176164a9e37770b2b9ec6906ac1c922f418ef452e9f025fbb906517df1')
+sha512sums=('7f0af5014600d148326b4692a84fcc388d3ea175a79566a5e3b1ede89d9dbc90be5f4b1481e69dd5654e88578b3732441a822e4d89cd0504d0ad3221d3a2f027')
 
 package_python-configshell-fb() {
   depends=('python-pyparsing' 'python-urwid')

src/python-pycares/PKGBUILD

@@ -1,13 +1,14 @@
 pkgname=python-pycares
 _pkgname=pycares
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A python interface for c-ares"
 arch=('i686' 'x86_64')
 url="https://github.com/saghul/pycares"
 license=('MIT')
 depends=('python')
 makedepends=('python-setuptools')
+
 source=("https://github.com/saghul/$_pkgname/archive/$_pkgname-${pkgver}.tar.gz")
 sha512sums=('d9a910b529d3b070b1685f6d89458404f22a5aa7002b01c1772f3eff548e9764826454c41bb69bf2f5b663df39cd1fb71b599b5f1ea88e197218e02942af67c7')
 

src/python-pydns/PKGBUILD

@@ -9,7 +9,6 @@ arch=('any')
 url="https://launchpad.net/py3dns"
 license=('Python')
 depends=('python')
-makedepends=('python-setuptools')
 source=("https://launchpad.net/${_realname}/trunk/${pkgver}/+download/${_realname}-${pkgver}.tar.gz")
 md5sums=('683ec2f5243b34f7127cfd0bfc9259c6')
 

src/python-rtslib-fb/PKGBUILD

@@ -1,7 +1,7 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=('python-rtslib-fb' 'python2-rtslib-fb')
 _pkgname=rtslib-fb
-pkgver=2.1.fb63
+pkgver=2.1.fb69
 pkgrel=1
 pkgdesc="free branch version of the LIO target API"
 arch=('any')
@@ -11,11 +11,10 @@ makedepends=('python-setuptools' 'python2-setuptools' 'python-pyudev' 'python2-p
 backup=()
 options=()
 install=
-source=(https://github.com/agrover/rtslib-fb/archive/v${pkgver}.tar.gz target.service)
+source=(https://github.com/open-iscsi/rtslib-fb/archive/v${pkgver}.tar.gz target.service)
-sha512sums=('faf5732299def9f5eb9147f930e8b48c9e9a26a918b41aa60f06a1f079e6e0453eb3c2d19136b244ef2349c23d31b7fa15cb4a0b6302ffbcd878033a45a11d1a'
+sha512sums=('552e660eb8aa26ac44f1ac089143a39e10106c1859db863c63ad5469e8ab0b0cdd0fba8f6fc30633cfd321ec0d72f6063ea0e8944aaa228de118400380b5418b'
             '3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5')
 
-
 prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
 }

src/python-slixmpp/PKGBUILD

@@ -2,25 +2,25 @@
 
 pkgname=python-slixmpp
 _pkgbase=slixmpp
-pkgver=1.4.0
+pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An XMPP library written for Python 3.4 (SleekXMPP asyncio fork)"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url="https://dev.louiz.org/projects/slixmpp"
 license=('MIT')
-depends=('python' 'python-aiodns' 'libidn' 'python-pyasn1' 'python-pyasn1-modules')
+depends=('python' 'python-aiodns' 'libidn' 'python-pyasn1' 'python-pyasn1-modules' 'python-aiohttp')
 makedepends=('git' 'cython')
 options=(!emptydirs)
 
-source=("https://dev.louiz.org/attachments/download/127/$_pkgbase-$pkgver.tar.gz")
+source=("https://lab.louiz.org/poezio/${_pkgbase}/-/archive/slix-${pkgver}/${_pkgbase}-slix-${pkgver}.tar.gz")
-sha512sums=('26d7459d2348c50db86bba4f3aae24d22003e0fe2b1e679c7725d480be9185b6f6d95dd94ed46d7b26b5a4b253fe6fc4d735dc56c02f9bc766cefa8f7ab8d198')
+sha512sums=('4220305e2f3d038071732da2e05641d54a0515b2f2ecdc2ed5aaf8c3ca287e9f521be369d9102c57c6891b605a16525d4805f5ab6699ff9f8b5844d4df457169')
 
 build() {
-    cd $_pkgbase-$pkgver
+    cd $_pkgbase-slix-$pkgver
     python setup.py build
 }
 
 package() {
-    cd $_pkgbase-$pkgver
+    cd $_pkgbase-slix-$pkgver
     python setup.py install --skip-build --root="$pkgdir/" --optimize=1
 }

src/python-spotify/PKGBUILD

@@ -1,42 +0,0 @@
-# Maintainer: buckket <buckket@cock.li>
-
-pkgname=("python-spotify" "python2-spotify")
-_pkgname=pyspotify
-pkgver=2.0.5
-pkgrel=4
-pkgdesc="A Python wrapper for libspotify."
-arch=("i686" "x86_64")
-license=("APACHE")
-url="http://pyspotify.mopidy.com/"
-makedepends=("python-setuptools" "python2-setuptools" "libspotify" "python-cffi")
-conflicts=("python2-pyspotify" "pyspotify")
-source=("https://pypi.python.org/packages/source/p/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-sha256sums=('fbd41c58d62232b0cabb7a9e38d45f36ac221699c006899bdb6be74c04602678')
-
-prepare() {
-  cp -r ${_pkgname}-${pkgver} "python-spotify-${pkgver}"
-  cp -r ${_pkgname}-${pkgver} "python2-spotify-${pkgver}"
-}
-
-build_python-spotify() {
-  cd ${pkgname}-${pkgver}
-  python setup.py build
-}
-
-build_python2-spotify() {
-  cd ${pkgname}-${pkgver}
-  python2 setup.py build
-}
-
-package_python-spotify() {
-  depends=("libspotify" "python-cffi")
-  cd ${pkgname}-${pkgver}
-  python setup.py install --root="${pkgdir}" --optimize=1
-}
-
-package_python2-spotify() {
-  depends=("libspotify" "python2-cffi")
-  cd ${pkgname}-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-}
-

src/python2-axolotl-curve25519-git/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname='python2-axolotl-curve25519-git'
 _pkgname='python-axolotl-curve25519'
-pkgver=0.4.1.2.r0.g293f9cd
+pkgver=r14.e4a9c4d
 pkgrel=1
 pkgdesc="Python wrapper for curve25519 library"
 url="https://github.com/tgalal/${_pkgname}"

src/python2-axolotl-git/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname='python2-axolotl-git'
 _pkgname='python-axolotl'
-pkgver=0.1.42.r0.g0c681af
+pkgver=0.1.39.r0.g37c5c55
 pkgrel=1
 pkgdesc="Python port of libaxolotl"
 url="https://github.com/tgalal/python-axolotl"

src/python2-dulwich/PKGBUILD

@@ -1,28 +1,21 @@
 # Maintainer: Timothée Ravier <tim@siosm.fr>
 
-pkgname=(python2-dulwich python-dulwich)
+pkgname=(python2-dulwich)
-pkgver=0.19.2
+pkgver=0.19.11
-pkgrel=2
+pkgrel=1
 pkgdesc='Pure-Python implementation of the Git file formats and protocols'
 arch=('any')
 url='https://www.dulwich.io/'
 license=('GPL2')
 depends=()
-makedepends=('python2' 'python')
+makedepends=('python2')
 options=(!emptydirs)
 source=("https://github.com/jelmer/dulwich/archive/dulwich-${pkgver}.tar.gz")
-md5sums=('279c9b467aeafdf397d3a51b1d2364c7')
+md5sums=('9d6b91f14e73f55d5fd69b0fe850bb2d')
 
 build() {
   cd "dulwich-dulwich-${pkgver}"
   python2 setup.py build
-  python setup.py build
-}
-
-package_python-dulwich() {
-  depends=('python')
-  cd "dulwich-dulwich-${pkgver}"
-  python setup.py install --root="$pkgdir/" --skip-build --optimize=1
 }
 
 package_python2-dulwich() {

src/python2-spotipy/PKGBUILD

@@ -1,20 +0,0 @@
-pkgname=python2-spotipy
-_pkgname=spotipy
-pkgver=2.4.4
-pkgrel=1
-pkgdesc='Simple client for the Spotify Web API'
-arch=('any')
-url="https://github.com/plamere/spotipy"
-license=('MIT')
-depends=('python2' 'python2-requests>=1.0')
-makedepends=('python2' 'python2-setuptools')
-source=("https://pypi.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-
-md5sums=('e9b895c8351d440af49470f9f3f9f4f4')
-
-package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    python2 setup.py install --root="${pkgdir}/" --optimize=1
-
-    install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}