Merge branch 'master' of git://git.parabola.nu/abslibre/abslibre

author: fauno <fauno@endefensadelsl.org> 2018-01-06 19:31:57 -0300
committer: fauno <fauno@endefensadelsl.org> 2018-01-06 19:31:57 -0300
commit: 685d3ca91babdbb7e4efed88a75fe776a593b725 (patch)
tree: 0f1add3030cce7d571023522cbf9b78a11c3fc74 /pcr
parent: b3fae2f65c48f17b2c5b534b768ca0607b9e800d (diff)
parent: 8161eec2a2b550802274afaf9b162195053814f2 (diff)
download: abslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.tar.gz
abslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.tar.bz2
abslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.zip
88 files changed, 1071 insertions, 2669 deletions
diff --git a/pcr/apertium-tolk-svn/PKGBUILD b/pcr/apertium-tolk-svn/PKGBUILD
index f09506184..0df36f89a 100644
--- a/pcr/apertium-tolk-svn/PKGBUILD
+++ b/pcr/apertium-tolk-svn/PKGBUILD
@@ -31,6 +31,11 @@ build() {
   
   sh autogen.sh
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$_svnmod"
+
   make DESTDIR="$pkgdir/" install || return 1
-}
-\ No newline at end of file
+}
diff --git a/pcr/armory/PKGBUILD b/pcr/armory/PKGBUILD
index 0b0482797..631c3d03a 100644
--- a/pcr/armory/PKGBUILD
+++ b/pcr/armory/PKGBUILD
@@ -1,45 +1,77 @@
-# Maintainer  : Aurélien Desbrières <aurelien@hackers.camp>
-# Contributor : 2bluesc <2bluesc at gmail.com>
-# Contributor : mazzolino <maze+aur at strahlungsfrei.de>
-# Contributor : Pieter Kokx <pieter@kokx.nl>
+# Maintainer: Aurélien Desbrières <aurelien@hackers.camp>
+# Maintainer (Arch): Jonathan la Cour <jon@lacour.me>
+# Contributor (Arch): Patrick Glandien <patrick@synix.io>
+# Contributor (Arch): William Grieshaber <me@zee.li>
+# Contributor (Arch): portals <portals at riseup.net> Base on work of: 2bluesc <2bluesc at gmail.com> and mazzolino <maze+aur at strahlungsfrei.de>
+# Contributor (Arch): Pieter Kokx <pieter@kokx.nl>
 
 pkgname=armory
-_pkgname=BitcoinArmory
-pkgver=0.92.3
-_pkgver=0.92.3
-pkgrel=2
-pkgdesc="Python-Based Bitcoin Software"
-arch=('i686' 'x86_64')
-url="https://github.com/etotheipi/BitcoinArmory"
-license=('AGPL3')
-groups=()
-depends=('crypto++' 'swig' 'python2' 'twisted' 'qt4' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
-makedepends=('git' 'gcc' 'make')
-provides=('armory')
-conflicts=('armory')
-replaces=()
-backup=()
-options=()
-install=
-source=("run-armory.sh" "build_detect_platform-01.patch" "http://github.com/etotheipi/BitcoinArmory/archive/v$_pkgver.tar.gz")
-noextract=()
+pkgver=0.96.3.99
+pkgrel=1
+pkgdesc="Full-featured Bitcoin wallet management application"
+arch=(i686 x86_64)
+url="https://github.com/goatpig/BitcoinArmory"
+license=(AGPL3 MIT)
+depends=(crypto++ swig qt4 qt5-tools python2 python2-twisted python2-pyqt4 python2-bsddb python2-psutil)
+optdepends=('bitcoin-daemon: Communicate with the Bitcoin network')
+provides=(armory)
+conflicts=(armory armory-git armory-bin armory-goatpig-git)
+install="${pkgname}.install"
+
+# Signed hashes available at
+# https://github.com/goatpig/BitcoinArmory/releases with GPG ID 8C5211764922589A
+source=("https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/armory_${pkgver}_src.tar.gz"
+        'run-armory.sh')
+sha512sums=('afe73e2f52834dead3f085eca3daf27406f64c30678d1b68ee3de47acb7d38a2c5ae2d326e686cce0a91f1cf97ea69e8f81d208da4d0e57a0b6c152482ef7059'
+            'af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715')
+
+prepare() {
+  msg 'Validating Checksums GPG signature...'
+  curl -sL https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/sha256sum.txt.asc -o sha256sum.txt.asc
+  gpg --recv-key 8C5211764922589A
+  gpg --verify sha256sum.txt.asc
+  msg2 'Checksums GPG signature OK.'
+
+  msg 'Validating Checksums...'
+  grep "${pkgver}_src.tar.gz" 'sha256sum.txt.asc' | tr -d '\r' | sha256sum -c -
+  msg2 'Checksums OK.'
+
+  cd "$srcdir/${pkgname}_${pkgver}-src"
+
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./autogen.sh
+}
 
 build() {
-    cd $srcdir/BitcoinArmory-$_pkgver/
+  cd "$srcdir/${pkgname}_${pkgver}-src"
 
-    patch -p0 -i $srcdir//build_detect_platform-01.patch
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./configure
 
-    make PYVER=python2.7
+  ## Build using current python2 version
+  PYTHON_VERSION=${_py2ver} make
 }
 
 package() {
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armoryoffline.desktop" "$pkgdir/usr/share/applications/armoryoffline.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armorytestnet.desktop" "$pkgdir/usr/share/applications/armorytestnet.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/img/armory_icon_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_64x64.png"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/img/armory_icon_green_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_green_64x64.png"
+
   install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
 
   mkdir -p "$pkgdir/opt"
-  cp -R "$srcdir/$_pkgname-$_pkgver/" "$pkgdir/opt/"
-  mv "$pkgdir/opt/$_pkgname-$_pkgver" "$pkgdir/opt/$_pkgname"
+  cp -R "$srcdir/${pkgname}_${pkgver}-src/." "$pkgdir/opt/$pkgname/"
+
+  mkdir -p "$pkgdir/usr/local/bin"
+  ln -s "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/local/bin/$pkgname"
 
-  rm -rf "$pkgdir/opt/$_pkgname/cppForSwig/"
-  rm -rf "$pkgdir/opt/$_pkgname/.git/"
-  rm -rf "$pkgdir/opt/$_pkgname/.gitignore"
+  rm -rf "$pkgdir/opt/$pkgname/cppForSwig/"
+  rm -rf "$pkgdir/opt/$pkgname/.git/"
+  rm -rf "$pkgdir/opt/$pkgname/.gitignore"
 }
diff --git a/pcr/armory/PKGBUILD.old b/pcr/armory/PKGBUILD.old
new file mode 100644
index 000000000..0b0482797
--- /dev/null
+++ b/pcr/armory/PKGBUILD.old
@@ -0,0 +1,45 @@
+# Maintainer  : Aurélien Desbrières <aurelien@hackers.camp>
+# Contributor : 2bluesc <2bluesc at gmail.com>
+# Contributor : mazzolino <maze+aur at strahlungsfrei.de>
+# Contributor : Pieter Kokx <pieter@kokx.nl>
+
+pkgname=armory
+_pkgname=BitcoinArmory
+pkgver=0.92.3
+_pkgver=0.92.3
+pkgrel=2
+pkgdesc="Python-Based Bitcoin Software"
+arch=('i686' 'x86_64')
+url="https://github.com/etotheipi/BitcoinArmory"
+license=('AGPL3')
+groups=()
+depends=('crypto++' 'swig' 'python2' 'twisted' 'qt4' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
+makedepends=('git' 'gcc' 'make')
+provides=('armory')
+conflicts=('armory')
+replaces=()
+backup=()
+options=()
+install=
+source=("run-armory.sh" "build_detect_platform-01.patch" "http://github.com/etotheipi/BitcoinArmory/archive/v$_pkgver.tar.gz")
+noextract=()
+
+build() {
+    cd $srcdir/BitcoinArmory-$_pkgver/
+
+    patch -p0 -i $srcdir//build_detect_platform-01.patch
+
+    make PYVER=python2.7
+}
+
+package() {
+  install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
+
+  mkdir -p "$pkgdir/opt"
+  cp -R "$srcdir/$_pkgname-$_pkgver/" "$pkgdir/opt/"
+  mv "$pkgdir/opt/$_pkgname-$_pkgver" "$pkgdir/opt/$_pkgname"
+
+  rm -rf "$pkgdir/opt/$_pkgname/cppForSwig/"
+  rm -rf "$pkgdir/opt/$_pkgname/.git/"
+  rm -rf "$pkgdir/opt/$_pkgname/.gitignore"
+}
diff --git a/pcr/armory/armory.install b/pcr/armory/armory.install
new file mode 100644
index 000000000..7bbaf885f
--- /dev/null
+++ b/pcr/armory/armory.install
@@ -0,0 +1,13 @@
+ARMORY_IMG_DIR="/usr/share/armory/img"
+
+post_install() {
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_64x64.png" armoryicon
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_64x64.png" armoryofflineicon
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_green_64x64.png" armorytestneticon
+}
+
+pre_remove() {
+  xdg-icon-resource uninstall --size 64 armoryicon
+  xdg-icon-resource uninstall --size 64 armorytestneticon
+  xdg-icon-resource uninstall --size 64 armoryofflineicon
+}
diff --git a/pcr/armory/build_detect_platform-01.patch b/pcr/armory/build_detect_platform-01.patch
deleted file mode 100644
index ca3a5cc8d..000000000
--- a/pcr/armory/build_detect_platform-01.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cppForSwig/leveldb/build_detect_platform	2014-04-21 15:57:03.485118965 +0200
-+++ cppForSwig/leveldb/build_detect_platform_fix	2014-04-21 15:59:19.714407671 +0200
-@@ -185,9 +185,7 @@
- 
-     # Test whether Snappy library is installed
-     # http://code.google.com/p/snappy/
--    $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null  <<EOF
--      #include <snappy.h>
--      int main() {}
-+
- EOF
-     if [ "$?" = 0 ]; then
-         COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
diff --git a/pcr/armory/run-armory.sh b/pcr/armory/run-armory.sh
index fe3368474..aa1b3c315 100644
--- a/pcr/armory/run-armory.sh
+++ b/pcr/armory/run-armory.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-python2 /opt/BitcoinArmory/ArmoryQt.py $@
+python2 /opt/armory/ArmoryQt.py $@
diff --git a/pcr/arora/PKGBUILD b/pcr/arora/PKGBUILD
index 9c5d89b1a..c3e39fcc8 100644
--- a/pcr/arora/PKGBUILD
+++ b/pcr/arora/PKGBUILD
@@ -29,7 +29,7 @@ sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31'
           '3eea200350f7436bb2d744f8b6af1b5bbb758e51'
           '2d515947a8cbeea831490727e88c89ebee17c313')
 
-install=install
+#install=install
 
 prepare() {
         cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/pcr/base-meta/PKGBUILD b/pcr/base-meta/PKGBUILD
index 6124894e1..22564c020 100644
--- a/pcr/base-meta/PKGBUILD
+++ b/pcr/base-meta/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: David P. <megver83@parabola.nu>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=base-meta
-pkgver=20170324
+pkgver=20180106
 pkgrel=1
 pkgdesc="Base packages metapackage."
 arch=('any')
 url="https://git.parabola.nu/abslibre.git/"
 license=('GPL')
 groups=('base-openrc')
-depends=('bash' 'bzip2' 'coreutils' 'diffutils' 'e2fsprogs' 'file' 'findutils' 'gawk' 'gcc-libs'
-         'gettext' 'glibc' 'grep' 'gzip' 'iproute2' 'iputils' 'jfsutils' 'less' 'logrotate'
-         'man-db' 'man-pages' 'nano' 'pciutils' 'pcmciautils' 'perl' 'procps-ng' 'psmisc'
-         'reiserfsprogs' 's-nail' 'sed' 'shadow' 'sysfsutils' 'tar' 'texinfo' 'usbutils'
-         'util-linux' 'vi' 'which' 'xfsprogs')
+depends=('bash' 'bzip2' 'coreutils' 'diffutils' 'e2fsprogs' 'file' 'filesystem-nosystemd'
+         'findutils' 'gawk' 'gcc-libs' 'gettext' 'glibc' 'grep' 'gzip' 'iproute2' 'iputils'
+         'jfsutils' 'less' 'logrotate' 'man-db' 'man-pages' 'nano' 'pciutils' 'pcmciautils'
+         'perl' 'procps-ng' 'psmisc' 'reiserfsprogs' 's-nail' 'sed' 'shadow' 'sysfsutils'
+         'tar' 'texinfo' 'usbutils' 'util-linux-nosystemd' 'vi' 'which' 'xfsprogs')
 optdepends=('your-privacy: To remove support for protocols and services known to endanger privacy.')
diff --git a/pcr/cadabra/PKGBUILD b/pcr/cadabra/PKGBUILD
index c435d111e..c39878e75 100644
--- a/pcr/cadabra/PKGBUILD
+++ b/pcr/cadabra/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="${pkgbase^} is a computer algebra system (CAS)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://$pkgbase.phi-sci.com/"
 license=('GPL')
-groups=$pkgbase
+groups=($pkgbase)
 makedepends=('lie' 'modglue' 'gmp' 'pcre' 'gtkmm' 'texlive-core')
 install=$pkgbase.install
 source=(http://$pkgbase.phi-sci.com/$pkgbase-$pkgver.tar.gz)
diff --git a/pcr/filesystem-nosystemd/PKGBUILD b/pcr/filesystem-nosystemd/PKGBUILD
new file mode 100644
index 000000000..4b288ccd5
--- /dev/null
+++ b/pcr/filesystem-nosystemd/PKGBUILD
@@ -0,0 +1,167 @@
+# $Id$
+# Maintainer (Arch): Sébastien Luttringer
+# Contributor (Arch): Tom Gundersen <teg@jklm.no>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+
+pkgname=filesystem-nosystemd
+pkgver=2017.10
+pkgrel=2.parabola3
+pkgdesc='Base Parabola GNU/Linux-libre files'
+arch=('i686' 'x86_64' 'armv7h')
+license=('GPL')
+url='https://www.parabola.nu'
+groups=('base-openrc')
+install='filesystem.install'
+makedepends=('asciidoc')
+depends=('iana-etc')
+provides=("filesystem=$pkgver")
+replaces=(filesystem-parabola)
+conflicts=(filesystem-parabola filesystem)
+backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
+        'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
+        'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
+source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
+        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
+        'shells' 'gshadow' 'profile' 'parabola.7.txt' 'locale.sh')
+sha256sums=('faed5839ed5e6797d7fc67f7fc0b003554d32250f3ae2d3241603c70cdc646b0'
+            '3ad448c78cab733759ae3365620504b1444e854effd066f1c7174652f046ebe1'
+            'e9fd66742e96d16f4a244a3037522467c12e301f8e1337cda61eb67b78198534'
+            'f7b38167196943d8fb9d2e75358c7262d5fe1082b257c4c8caffe3b6de429cb5'
+            'f21f35e7d3083aeee19beb48478130d119b2572922a4889df98326d551540eda'
+            '00d5d103837480d26cd350753382c3211df6bc304ee59ffaab130fad108f6a86'
+            'a55259d43b287c35ee94c736f79eea68c72318e67e5f7b8c0a6dfbcf0d4fee13'
+            '34b820ca01b9ad7e4792e92122b39e891e647c016b7ecccb220d6f4e72eee5c7'
+            '86dff00854a7f2280bb799484ccc39ad449a171448926880742ae64f41666a43'
+            '05c90d4208ae9a59156fa6449b00d92cd3dc1aba8ae746bd78e813a74e309ede'
+            '13d1f59c1d0860bf43da996e2b9a6ab2744791614241ed9a1376b7e7e30de3a8'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+            'b4b5823ea612d18b8aaa59e3c662fb756001f1ce2fcc936a4d741b11002ed19d'
+            '74d2be3dd69600bcf0da751a1804a386bf4ad143b76d79c336acaa5c600e7991'
+            '6cff886fe9e23096d5f67b7857a747ebaf10431be5a2afc40236de5ad13a654f'
+            '33d4bec57c59f378e79ed8f3e4387e65fdd5cfd3d551d7cb015f7cf5cfad72f5'
+            '93d7d21f7e5a644ba533847beff35167efc4624571c9b68bea6cf2b6a13ab5ff'
+            '887e2fe6128172ab737d45b6703728ceef80d066ef64ee16eb9db22bef676734'
+            '331805ff85b80ae2444be58740f1cf41be56fb6e254e930677f1e36e8f95bee1')
+
+
+lint() {
+	# ensure that passwd is sync'd to shadow and group is sync'd to gshadow.
+	local r=0
+
+	local passwd shadow group gshadow
+
+	for f in passwd shadow group gshadow; do
+		mapfile -t "$f" < <(cut -d: -f1 "$f" | sort)
+	done
+
+	# we can cheat and do simple string comparison only because we can make some
+	# assumptions about the data in these files
+	if [[ ${passwd[*]} != "${shadow[*]}" ]]; then
+		error 'passwd is not in sync with shadow!'
+		r=1
+	fi
+
+	if [[ ${group[*]} != "${gshadow[*]}" ]]; then
+		error 'group is not in sync with gshadow!'
+		r=1
+	fi
+
+	return $r
+}
+
+build() {
+	cd "$srcdir"
+
+	lint
+
+	a2x -d manpage -f manpage parabola.7.txt
+}
+
+package() {
+	cd "$pkgdir"
+
+	#
+	# setup root filesystem
+	#
+	for d in boot dev etc home mnt usr var opt srv/http run; do
+		install -d -m755 $d
+	done
+	install -d -m555 proc
+	install -d -m555 sys
+	install -d -m0750 root
+	install -d -m1777 tmp
+	# vsftpd won't run with write perms on /srv/ftp
+	install -d -m555 -g ftp srv/ftp
+
+	# setup /etc and /usr/share/factory/etc
+	install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
+	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
+		install -m644 "$srcdir"/$f etc/
+		install -m644 "$srcdir"/$f usr/share/factory/etc/
+	done
+	ln -s ../proc/self/mounts etc/mtab
+	for f in gshadow shadow crypttab; do
+		install -m600 "$srcdir"/$f etc/
+		install -m600 "$srcdir"/$f usr/share/factory/etc/
+	done
+	touch etc/parabola-release
+	ln -sv parabola-release etc/arch-release
+	install -m755 "$srcdir"/locale.sh etc/profile.d/locale.sh
+	install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release
+	#ln -s ../usr/lib/os-release etc/os-release
+
+	# setup /var
+	for d in cache local opt log/old lib/misc empty; do
+		install -d -m755 var/$d
+	done
+	install -d -m1777 var/{tmp,spool/mail}
+
+	# allow setgid games to write scores
+	install -d -m775 -g games var/games
+	ln -s spool/mail var/mail
+	ln -s ../run var/run
+	ln -s ../run/lock var/lock
+
+	#
+	# setup /usr hierarchy
+	#
+	for d in bin include lib share/misc src; do
+		install -d -m755 usr/$d
+	done
+	for d in $(seq 8); do
+		install -d -m755 usr/share/man/man$d
+	done
+
+	#
+	# add lib symlinks
+	#
+	ln -s usr/lib "$pkgdir"/lib
+	[[ $CARCH = 'x86_64' ]] && (
+		ln -s usr/lib "$pkgdir"/lib64
+		ln -s lib "$pkgdir"/usr/lib64
+	)
+
+	#
+	# add bin symlinks
+	#
+	ln -s usr/bin "$pkgdir"/bin
+	ln -s usr/bin "$pkgdir"/sbin
+	ln -s bin "$pkgdir"/usr/sbin
+
+	#
+	# install parabola(7) manpage
+	#
+	install -D -m644 "$srcdir"/parabola.7 usr/share/man/man7/parabola.7
+
+	#
+	# setup /usr/local hierarchy
+	#
+	for d in bin etc games include lib man sbin share src; do
+		install -d -m755 usr/local/$d
+	done
+	ln -s ../man usr/local/share/man
+
+	# remove conflict with systemd
+	rm usr/share/factory/etc/nsswitch.conf
+}
diff --git a/pcr/filesystem-nosystemd/crypttab b/pcr/filesystem-nosystemd/crypttab
new file mode 100644
index 000000000..96065a060
--- /dev/null
+++ b/pcr/filesystem-nosystemd/crypttab
@@ -0,0 +1,17 @@
+# crypttab: mappings for encrypted partitions
+#
+# Each mapped device will be created in /dev/mapper, so your /etc/fstab
+# should use the /dev/mapper/<name> paths for encrypted devices.
+#
+# The Arch/Parabola specific syntax has been deprecated, see crypttab(5) for the
+# new supported syntax.
+#
+# NOTE: Do not list your root (/) partition here, it must be set up
+#       beforehand by the initramfs (/etc/mkinitcpio.conf).
+
+# <name>       <device>                                     <password>              <options>
+# home         UUID=b8ad5c18-f445-495d-9095-c9ec4f9d2f37    /etc/mypassword1
+# data1        /dev/sda3                                    /etc/mypassword2
+# data2        /dev/sda5                                    /etc/cryptfs.key
+# swap         /dev/sdx4                                    /dev/urandom            swap,cipher=aes-cbc-essiv:sha256,size=256
+# vol          /dev/sdb7                                    none
diff --git a/pcr/filesystem-nosystemd/filesystem.install b/pcr/filesystem-nosystemd/filesystem.install
new file mode 100644
index 000000000..6e78d4583
--- /dev/null
+++ b/pcr/filesystem-nosystemd/filesystem.install
@@ -0,0 +1,54 @@
+# args: <group> [options]
+_addgroup() {
+	if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then
+		need_group_update=1
+	fi
+}
+
+# args: <group> [options]
+_adduser() {
+	if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then
+		need_passwd_update=1
+	fi
+}
+
+post_upgrade() {
+	_addgroup optical -g 93
+	_addgroup audio   -g 92
+	_addgroup video   -g 91
+	_addgroup floppy  -g 94
+	_addgroup storage -g 95
+	_addgroup log     -g 19
+	_addgroup utmp    -g 20
+	_addgroup power   -g 98
+	_addgroup network -g 90
+	_addgroup games   -g 50
+	_addgroup uucp    -g 14
+	_addgroup proc    -g 26
+	_addgroup http    -g 33
+	_adduser  http    -u 33 -d /srv/http -g http -s /usr/bin/nologin
+	_addgroup scanner -g 96
+	_addgroup rfkill  -g 24
+	_addgroup lock    -g 54
+	_addgroup input   -g 97
+
+	# update shadow files if needed
+	if (( need_group_update )); then
+		grpconv >/dev/null
+	fi
+
+	if (( need_passwd_update )); then
+		pwconv >/dev/null
+	fi
+
+	if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
+		echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
+	fi
+
+	# set "Last password change" > 0; otherwise su $user wont work
+	for user in bin daemon mail ftp http nobody; do
+		if LANG=C chage -l ${user} | grep -q 'password must be changed'; then
+			chage -d 14871 ${user}
+		fi
+	done
+}
diff --git a/pcr/filesystem-nosystemd/fstab b/pcr/filesystem-nosystemd/fstab
new file mode 100644
index 000000000..b6716c14a
--- /dev/null
+++ b/pcr/filesystem-nosystemd/fstab
@@ -0,0 +1,4 @@
+# 
+# /etc/fstab: static file system information
+#
+# <file system>	<dir>	<type>	<options>	<dump>	<pass>
diff --git a/pcr/filesystem-nosystemd/group b/pcr/filesystem-nosystemd/group
new file mode 100644
index 000000000..002b8e075
--- /dev/null
+++ b/pcr/filesystem-nosystemd/group
@@ -0,0 +1,34 @@
+root:x:0:root
+bin:x:1:root,bin,daemon
+daemon:x:2:root,bin,daemon
+sys:x:3:root,bin
+adm:x:4:root,daemon
+tty:x:5:
+disk:x:6:root
+lp:x:7:daemon
+mem:x:8:
+kmem:x:9:
+wheel:x:10:root
+ftp:x:11:
+mail:x:12:
+uucp:x:14:
+log:x:19:root
+utmp:x:20:
+locate:x:21:
+rfkill:x:24:
+smmsp:x:25:
+proc:x:26:
+http:x:33:
+games:x:50:
+lock:x:54:
+network:x:90:
+video:x:91:
+audio:x:92:
+optical:x:93:
+floppy:x:94:
+storage:x:95:
+scanner:x:96:
+input:x:97:
+power:x:98:
+nobody:x:99:
+users:x:100:
diff --git a/pcr/filesystem-nosystemd/gshadow b/pcr/filesystem-nosystemd/gshadow
new file mode 100644
index 000000000..8d8a4e899
--- /dev/null
+++ b/pcr/filesystem-nosystemd/gshadow
@@ -0,0 +1,34 @@
+root:::root
+bin:::root,bin,daemon
+daemon:::root,bin,daemon
+sys:::root,bin
+adm:::root,daemon
+tty:::
+disk:::root
+lp:::daemon
+mem:::
+kmem:::
+wheel:::root
+ftp:::
+mail:::
+uucp:::
+log:::root
+utmp:x::
+locate:::
+rfkill:x::
+smmsp:::
+proc:::
+http:::
+games:::
+lock:::
+network:x::
+video:x::
+audio:::
+optical:::
+floppy:x::
+storage:x::
+scanner:x::
+input:x::
+power:x::
+nobody:::
+users:::
diff --git a/pcr/filesystem-nosystemd/host.conf b/pcr/filesystem-nosystemd/host.conf
new file mode 100644
index 000000000..cf52fe561
--- /dev/null
+++ b/pcr/filesystem-nosystemd/host.conf
@@ -0,0 +1,8 @@
+#
+# /etc/host.conf
+#
+
+order hosts,bind
+multi on
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/hosts b/pcr/filesystem-nosystemd/hosts
new file mode 100644
index 000000000..1747f9196
--- /dev/null
+++ b/pcr/filesystem-nosystemd/hosts
@@ -0,0 +1,9 @@
+#
+# /etc/hosts: static lookup table for host names
+#
+
+#<ip-address>	<hostname.domain.org>	<hostname>
+127.0.0.1	localhost.localdomain	localhost
+::1		localhost.localdomain	localhost
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/issue b/pcr/filesystem-nosystemd/issue
new file mode 100644
index 000000000..b001c55dd
--- /dev/null
+++ b/pcr/filesystem-nosystemd/issue
@@ -0,0 +1,2 @@
+Parabola GNU/Linux-libre \r  (\n) (\l)
+
diff --git a/pcr/filesystem-nosystemd/ld.so.conf b/pcr/filesystem-nosystemd/ld.so.conf
new file mode 100644
index 000000000..dfac45683
--- /dev/null
+++ b/pcr/filesystem-nosystemd/ld.so.conf
@@ -0,0 +1,7 @@
+#
+# /etc/ld.so.conf
+#
+
+include /etc/ld.so.conf.d/*.conf
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/locale.sh b/pcr/filesystem-nosystemd/locale.sh
new file mode 100644
index 000000000..11b7dc9ec
--- /dev/null
+++ b/pcr/filesystem-nosystemd/locale.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if [ -z "$LANG" ]; then
+  if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+    . "$XDG_CONFIG_HOME/locale.conf"
+  elif [ -n "$HOME" ] && [ -r "$HOME/.config/locale.conf" ]; then
+    . "$HOME/.config/locale.conf"
+  elif [ -r /etc/locale.conf ]; then
+    . /etc/locale.conf
+  fi
+fi
+
+LANG=${LANG:-C}
+export LANG
+[ -n "$LC_CTYPE" ]          && export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
+[ -n "$LC_TIME" ]           && export LC_TIME
+[ -n "$LC_COLLATE" ]        && export LC_COLLATE
+[ -n "$LC_MONETARY" ]       && export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
+[ -n "$LC_PAPER" ]          && export LC_PAPER
+[ -n "$LC_NAME" ]           && export LC_NAME
+[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION
diff --git a/pcr/filesystem-nosystemd/motd b/pcr/filesystem-nosystemd/motd
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pcr/filesystem-nosystemd/motd
diff --git a/pcr/filesystem-nosystemd/nsswitch.conf b/pcr/filesystem-nosystemd/nsswitch.conf
new file mode 100644
index 000000000..25125e13e
--- /dev/null
+++ b/pcr/filesystem-nosystemd/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: compat mymachines
+group: compat mymachines
+shadow: compat
+
+publickey: files
+
+hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf
diff --git a/pcr/filesystem-nosystemd/os-release b/pcr/filesystem-nosystemd/os-release
new file mode 100644
index 000000000..768bfbc92
--- /dev/null
+++ b/pcr/filesystem-nosystemd/os-release
@@ -0,0 +1,9 @@
+NAME="Parabola"
+PRETTY_NAME="Parabola GNU/Linux-libre"
+ID=parabola
+ID_LIKE="arch archlinux"
+ANSI_COLOR="1;35"
+HOME_URL="https://www.parabola.nu/"
+SUPPORT_URL="irc://chat.freenode.net#parabola"
+BUG_REPORT_URL="https://labs.parabola.nu/"
+
diff --git a/pcr/filesystem-nosystemd/parabola.7.txt b/pcr/filesystem-nosystemd/parabola.7.txt
new file mode 100644
index 000000000..48b5d7f02
--- /dev/null
+++ b/pcr/filesystem-nosystemd/parabola.7.txt
@@ -0,0 +1,89 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+
+parabola(7)
+============
+
+NAME
+----
+parabola - basic configuration
+
+SYNOPSIS
+--------
+Overview of the basic configuration of Parabola GNU/Linux-libre.
+
+DESCRIPTION
+-----------
+Parabola exposes the user to the system without hiding any details.
+This man page gives a brief overview of the configuration files that should be set up on a fresh install.
+
+SYSTEM SERVICES[[S]]
+--------------------
+System services to be started at boot can be enabled using 'rc-update add <name> <runlevel>'.
+To view available services, use 'rc-status --all'.
+
+HOSTNAME[[H]]
+-------------
+The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'.
+It will then be written to /etc/hostname.
+
+LOCALIZATION[[L]]
+-----------------
+Various locales may be enabled in /etc/locale.gen and are generated by 'locale-gen'.
+The system-wide locale to be used can be configured in /etc/locale.conf.
+These settings can be overridden on a per-user basis by keeping a user-specific locale.conf in $HOME/.config/locale.conf.
+The user-specific file will take precedence if it exists.
+
+VIRTUAL CONSOLE[[V]]
+--------------------
+The virtual console is configured in /etc/conf.d/keymaps.
+It allows you to set a font and a keyboard layout, among other things.
+Note that these settings only apply to the console and do not apply if you use X.
+
+TIME[[T]]
+---------
+A relative *symlink* needs to be created from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/.
+
+   'ln -s /etc/localtime /usr/share/zoneinfo/Europe/Paris'
+
+The real-time clock, which keeps track of time when the computer is off, can be configured to either
+be in UTC or in local time in /etc/conf.d/hwclock.
+The default is UTC.
+
+FILE SYSTEMS[[F]]
+-----------------
+File systems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
+
+INITRAMFS[[R]]
+--------------
+The initramfs is generated by 'mkinitcpio -p <preset>'.
+The default preset is "linux-libre".
+The initramfs can be configured in /etc/mkinitcpio.conf and must be regenerated after making configuration changes.
+
+PACKAGE MANAGER[[P]]
+--------------------
+The package manager, pacman, is configured in /etc/pacman.conf.
+
+BOOT LOADER[[B]]
+----------------
+GRUB's configuration is generated from /etc/default/grub by 'grub-mkconfig -o /boot/grub/grub.cfg'.
+Syslinux is configured in /boot/syslinux/syslinux.cfg.
+
+MODULES[[M]]
+------------
+Most modules should be loaded on-demand.
+Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
+and modules to be blacklisted from automatically loading can be configured in /etc/modprobe.d/.
+
+SEE ALSO
+--------
+
+*hostname*(5), *locale.conf*(5), *timezone*(3), *hwclock*(8),
+*fstab*(5), *crypttab*(5), *mkinitcpio*(8), *pacman*(8), *pacman.conf*(5),
+*grub-mkconfig*(8), *syslinux*(1), *modules-load.d*(5), *modprobe.d*(5)
+
+AUTHORS
+-------
+Written by Tom Gundersen.
+Rebranded for Parabola by Nicolás Reynolds and André Silva.
diff --git a/pcr/filesystem-nosystemd/passwd b/pcr/filesystem-nosystemd/passwd
new file mode 100644
index 000000000..59704dbef
--- /dev/null
+++ b/pcr/filesystem-nosystemd/passwd
@@ -0,0 +1,7 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/usr/bin/nologin
+daemon:x:2:2:daemon:/:/usr/bin/nologin
+mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin
+ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin
+http:x:33:33:http:/srv/http:/usr/bin/nologin
+nobody:x:99:99:nobody:/:/usr/bin/nologin
diff --git a/pcr/filesystem-nosystemd/profile b/pcr/filesystem-nosystemd/profile
new file mode 100644
index 000000000..60c1821dd
--- /dev/null
+++ b/pcr/filesystem-nosystemd/profile
@@ -0,0 +1,27 @@
+# /etc/profile
+
+#Set our umask
+umask 022
+
+# Set our default path
+PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
+export PATH
+
+# Load profiles from /etc/profile.d
+if test -d /etc/profile.d/; then
+	for profile in /etc/profile.d/*.sh; do
+		test -r "$profile" && . "$profile"
+	done
+	unset profile
+fi
+
+# Source global bash config
+if test "$PS1" && test "$BASH" && test -z ${POSIXLY_CORRECT+x} && test -r /etc/bash.bashrc; then
+	. /etc/bash.bashrc
+fi
+
+# Termcap is outdated, old, and crusty, kill it.
+unset TERMCAP
+
+# Man is much better than us at figuring this out
+unset MANPATH
diff --git a/pcr/filesystem-nosystemd/resolv.conf b/pcr/filesystem-nosystemd/resolv.conf
new file mode 100644
index 000000000..cecafba03
--- /dev/null
+++ b/pcr/filesystem-nosystemd/resolv.conf
@@ -0,0 +1,8 @@
+#
+# /etc/resolv.conf
+#
+
+#search <yourdomain.tld>
+#nameserver <ip>
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/securetty b/pcr/filesystem-nosystemd/securetty
new file mode 100644
index 000000000..5a2235ce7
--- /dev/null
+++ b/pcr/filesystem-nosystemd/securetty
@@ -0,0 +1,15 @@
+#
+# /etc/securetty
+#
+
+console
+tty1
+tty2
+tty3
+tty4
+tty5
+tty6
+ttyS0
+hvc0
+
+# End of file
diff --git a/pcr/filesystem-nosystemd/shadow b/pcr/filesystem-nosystemd/shadow
new file mode 100644
index 000000000..ccab68d33
--- /dev/null
+++ b/pcr/filesystem-nosystemd/shadow
@@ -0,0 +1,7 @@
+root::14871::::::
+bin:x:14871::::::
+daemon:x:14871::::::
+mail:x:14871::::::
+ftp:x:14871::::::
+http:x:14871::::::
+nobody:x:14871::::::
diff --git a/pcr/filesystem-nosystemd/shells b/pcr/filesystem-nosystemd/shells
new file mode 100644
index 000000000..18c1aeffa
--- /dev/null
+++ b/pcr/filesystem-nosystemd/shells
@@ -0,0 +1,8 @@
+#
+# /etc/shells
+#
+
+/bin/sh
+/bin/bash
+
+# End of file
diff --git a/pcr/gforth/PKGBUILD b/pcr/gforth/PKGBUILD
index c7e1e0512..489d88f15 100644
--- a/pcr/gforth/PKGBUILD
+++ b/pcr/gforth/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="Fast and portable implementation of the ANS Forth language"
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL3')
 depends=('libtool')
-source=("https://ftp.gnu.org/gnu/gforth/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 options=('libtool')
 install=$pkgname.install
 sha512sums=('f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4'
diff --git a/pcr/gimpfx-foundry/PKGBUILD b/pcr/gimpfx-foundry/PKGBUILD
index c49167eab..8351549eb 100644
--- a/pcr/gimpfx-foundry/PKGBUILD
+++ b/pcr/gimpfx-foundry/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.6_1
 pkgrel=2.1
 pkgdesc="Collection of Gimp scripts"
 url="http://gimpfx-foundry.sourceforge.net/"
-license="GPL"
+license=("GPL")
 arch=('any')
 depends=('gimp')
 source=(http://downloads.sourceforge.net/sourceforge/gimpfx-foundry/${pkgname}-${pkgver/_/-}.tar.gz)
diff --git a/pcr/gna-unrar/PKGBUILD b/pcr/gna-unrar/PKGBUILD
index c29b72408..0da97c7f2 100644
--- a/pcr/gna-unrar/PKGBUILD
+++ b/pcr/gna-unrar/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=unrar
 pkgname=gna-unrar
 pkgver=0.0.1
-url=(http://home.gna.org/unrar/)
+url=http://home.gna.org/unrar/
 license=(GPL)
 source=(http://download.gna.org/$_pkgname/$_pkgname-$pkgver.tar.gz)
 md5sums=('ac284a6739e3b8c794e7f9e8c20ed8f8')
diff --git a/pcr/gnash-git/PKGBUILD b/pcr/gnash-git/PKGBUILD
index 67f9d1eb2..c419d3b78 100644
--- a/pcr/gnash-git/PKGBUILD
+++ b/pcr/gnash-git/PKGBUILD
@@ -9,13 +9,13 @@
 pkgname=gnash-git
 _gitname=gnash
 pkgver=0.8.11.r22395.g8a11e6058
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU SWF Player based on GameSWF - git development version"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gnash/"
 license=('GPL3')
 depends=('curl' 'giflib' 'sdl' 'libjpeg' 'libpng' 'libgl' 
-  'glu' 'fontconfig' 'cairo' 'ffmpeg' 'jemalloc' 'boost-libs' 
+  'glu' 'fontconfig' 'cairo' 'ffmpeg' 'jemalloc' 'boost-libs<1.66'
   'gtk2' 'libldap' 'hicolor-icon-theme' 'desktop-file-utils' 'gconf' 
   'gtkglext' 'agg' 'gdk-pixbuf2')
 makedepends=('mesa' 'xulrunner' 'pkgconfig' 'boost' 'git')
diff --git a/pcr/imagemagick-nox/PKGBUILD b/pcr/imagemagick-nox/PKGBUILD
index ef0bdf4b9..744c2dc01 100644
--- a/pcr/imagemagick-nox/PKGBUILD
+++ b/pcr/imagemagick-nox/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgbase=imagemagick
 pkgname=imagemagick-nox
 
-pkgver=6.9.9.23
+pkgver=7.0.7.19
 pkgrel=1
 arch=(i686 x86_64 armv7h)
 
@@ -14,97 +14,106 @@ pkgdesc="An image viewing/manipulation program (without X11 support)"
 url="http://www.imagemagick.org/"
 license=(custom)
 
-# Remove libxt, libxext, opencl-headers, opencl-id-loader, libcl, glu
-makedepends=(libltdl lcms2 fontconfig ghostscript
-             openexr libwmf librsvg libxml2 liblqr openjpeg2 libraw libraqm
-             libwebp subversion)
 # Remove libxt, libxext, libcl, opencl-icd-loader
-depends=(libltdl lcms2 fontconfig liblqr libraqm)
-optdepends=('imagemagick-doc: for additional information'
-            'ghostscript: for Ghostscript support'
-            'openexr: for OpenEXR support'
-            'openjpeg2: for JP2 support'
-            'libwmf: for WMF support'
-            'librsvg: for SVG support'
-            'libxml2: for XML support'
-            'libpng: for PNG support'
-            'libwebp: for WEBP support'
-            'libraw: for DNG support')
-backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
-        "etc/ImageMagick-${pkgver%%.*}/colors.xml"
-        "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
-        "etc/ImageMagick-${pkgver%%.*}/log.xml"
-        "etc/ImageMagick-${pkgver%%.*}/magic.xml"
-        "etc/ImageMagick-${pkgver%%.*}/mime.xml"
-        "etc/ImageMagick-${pkgver%%.*}/policy.xml"
-        "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
-        "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
-options=('!docs' 'libtool' '!emptydirs')
+depends=(libltdl lcms2 fontconfig liblqr libraqm libpng)
+# Remove libxt, libxext, opencl-headers, opencl-id-loader, libcl, glu
+makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw libwebp
+             chrpath ocl-icd subversion)
+checkdepends=(gsfonts ttf-dejavu)
+_relname=ImageMagick-${pkgver%%.*}
+_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
 provides=("$_pkgbase=$pkgver")
 conflicts=("$_pkgbase")
 replaces=("imagemagick-srv")
 
-source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-        perlmagick.rpath.patch)
-sha256sums=('88a422ecc2888745373586b04f1ebd8e91ca090bbf133c2270f66fc716fba631'
+source=(https://www.imagemagick.org/download/$_tarname.tar.xz{,.asc}
+        parabola-fonts.diff)
+sha256sums=('5f1156824c37e5dde6ec37c5b1c51d9806f6d0e97aeaeb1e6907d7aba15951d9'
             'SKIP'
-            '17218bbecc17f3c7a86935a09d5a47e46113a1fc28f7d91c2fe495019cc36088')
-validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
+            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
+shopt -s extglob
 
 prepare() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  mkdir -p binpkg/usr/lib/pkgconfig binpkg/usr/share
+
+  cd $_tarname
+
+  # Fix up typemaps to match our packages, where possible
+  patch -Np1 -i $srcdir/parabola-fonts.diff
 
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  patch -p0 -i "$srcdir/perlmagick.rpath.patch"
-  autoreconf --force --install
+  # Don't run auto(re)conf; assumes use of git
 }
 
 build() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
-  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
-  [[ $CARCH = "armv7h" ]] && EXTRAOPTS="--with-gcc-arch=armv7h"
+  cd $_tarname
 
   no_x=yes with_x=no \
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
-    --enable-hdri --with-wmf --with-openexr --with-xml \
-    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
-    --disable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-dejavu-font-dir=/usr/share/fonts/TTF \
+    --with-gs-font-dir=/usr/share/fonts/gsfonts \
+    PSDelegate=/usr/bin/gs \
+    XPSDelegate=/usr/bin/gxps \
+    PCLDelegate=/usr/bin/gpcl6 \
+    --enable-hdri \
+    --disable-opencl \
+    --with-gslib \
+    --with-lqr \
+    --with-modules \
+    --with-openexr \
+    --with-openjp2 \
+    --with-perl \
+    --with-perl-options="INSTALLDIRS=vendor" \
+    --with-rsvg \
+    --with-webp \
+    --with-wmf \
+    --with-xml \
+    --without-autotrace \
+    --without-djvu \
+    --without-dps \
+    --without-fftw \
+    --without-fpx \
+    --without-gcc-arch \
+    --without-gvc \
+    --without-jbig
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  # make check
+  cd $_tarname
+  ulimit -n 4096
+  make check
 }
 
-package() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+package_imagemagick-nox() {
+  depends=("libmagick=$pkgver-$pkgrel")
+  optdepends=('imagemagick-doc: manual and API docs')
+  options=('!emptydirs')
 
-  make -j1 DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+  cd $_tarname
+  make DESTDIR="$srcdir/binpkg" install
 
-  # Cleaning
-  rm -f "$pkgdir"/usr/lib/*.la
+  mkdir -p "$pkgdir/usr/"{lib,share}
+  mv "$srcdir/binpkg/usr/bin" "$pkgdir/usr/"
+  mv "$srcdir/binpkg/usr/lib/perl5" "$pkgdir/usr/lib"
+  mv "$srcdir/binpkg/usr/share/man" "$pkgdir/usr/share"
 
   # remove useless display
   rm -vf "$pkgdir/usr/bin/display"
 
-  # template start; name=perl-binary-module-dependency; version=1;
-  if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
-    _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
-    _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
-    depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
-  fi
-  # template end;
+  find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
+
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+        _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+        _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+        depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE
 }
diff --git a/pcr/imagemagick-nox/parabola-fonts.diff b/pcr/imagemagick-nox/parabola-fonts.diff
new file mode 100644
index 000000000..63a547c4d
--- /dev/null
+++ b/pcr/imagemagick-nox/parabola-fonts.diff
@@ -0,0 +1,107 @@
+diff -u -r ImageMagick-6.9.9-25/config/type-dejavu.xml.in ImageMagick-6.9.9-25-archfonts/config/type-dejavu.xml.in
+--- ImageMagick-6.9.9-25/config/type-dejavu.xml.in	2017-11-30 19:24:05.000000000 +0100
++++ ImageMagick-6.9.9-25-archfonts/config/type-dejavu.xml.in	2017-12-02 18:44:53.410304554 +0100
+@@ -13,27 +13,6 @@
+   ImageMagick DejaVU font configuration.
+ -->
+ <typemap>
+-  <type name="DejaVu-LGC-Sans-Bold" fullname="DejaVu LGC Sans Bold" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSans-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Bold-Oblique" fullname="DejaVu LGC Sans Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSans-BoldOblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Book" fullname="DejaVu LGC Sans Book" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSans.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Condensed" fullname="DejaVu LGC Sans Condensed" family="DejaVuGC Sans" style="Normal" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Condensed-Bold" fullname="DejaVu LGC Sans Condensed Bold" family="DejaVuGC Sans" style="Normal" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Condensed-Bold-Oblique" fullname="DejaVu LGC Sans Condensed Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-BoldOblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Condensed-Oblique" fullname="DejaVu LGC Sans Condensed Oblique" family="DejaVuGC Sans" style="Oblique" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-Oblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-ExtraLight" fullname="DejaVu LGC Sans ExtraLight" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="200" glyphs="@dejavu_font_dir@DejaVuLGCSans-ExtraLight.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Mono-Bold" fullname="DejaVu LGC Sans Mono Bold" family="DejaVuGC Sans Mono" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Mono-Bold-Oblique" fullname="DejaVu LGC Sans Mono Bold Oblique" family="DejaVuGC Sans Mono" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-BoldOblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Mono-Book" fullname="DejaVu LGC Sans Mono Book" family="DejaVuGC Sans Mono" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansMono.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Mono-Oblique" fullname="DejaVu LGC Sans Mono Oblique" family="DejaVuGC Sans Mono" style="Oblique" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-Oblique.ttf"/>
+-  <type name="DejaVu-LGC-Sans-Oblique" fullname="DejaVu LGC Sans Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSans-Oblique.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Bold" fullname="DejaVu LGC Serif Bold" family="DejaVuGC Serif" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerif-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Bold-Italic" fullname="DejaVu LGC Serif Bold Italic" family="DejaVuGC Serif" style="Italic" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerif-BoldItalic.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Book" fullname="DejaVu LGC Serif Book" family="DejaVuGC Serif" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerif.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Condensed" fullname="DejaVu LGC Serif Condensed" family="DejaVuGC Serif" style="Normal" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Condensed-Bold" fullname="DejaVu LGC Serif Condensed Bold" family="DejaVuGC Serif" style="Normal" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-Bold.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Condensed-Bold-Italic" fullname="DejaVu LGC Serif Condensed Bold Italic" family="DejaVuGC Serif" style="Italic" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-BoldItalic.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Condensed-Italic" fullname="DejaVu LGC Serif -Condensed Italic" family="DejaVuGC Serif" style="Italic" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-Italic.ttf"/>
+-  <type name="DejaVu-LGC-Serif-Italic" fullname="DejaVu LGC Serif Italic" family="DejaVuGC Serif" style="Italic" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerif-Italic.ttf"/>
+   <type name="DejaVu-Sans-Bold" fullname="DejaVu Sans Bold" family="DejaVu Sans" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuSans-Bold.ttf"/>
+   <type name="DejaVu-Sans-Bold-Oblique" fullname="DejaVu Sans Bold Oblique" family="DejaVu Sans" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuSans-BoldOblique.ttf"/>
+   <type name="DejaVu-Sans-Book" fullname="DejaVu Sans Book" family="DejaVu Sans" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuSans.ttf"/>
+diff -u -r ImageMagick-6.9.9-25/config/type-ghostscript.xml.in ImageMagick-6.9.9-25-archfonts/config/type-ghostscript.xml.in
+--- ImageMagick-6.9.9-25/config/type-ghostscript.xml.in	2017-11-30 19:24:05.000000000 +0100
++++ ImageMagick-6.9.9-25-archfonts/config/type-ghostscript.xml.in	2017-12-02 19:08:05.669243822 +0100
+@@ -13,38 +13,38 @@
+   ImageMagick Ghostscript font configuration.
+ -->
+ <typemap>
+-  <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010013l.afm" glyphs="@ghostscript_font_dir@a010013l.pfb"/>
+-  <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010033l.afm" glyphs="@ghostscript_font_dir@a010033l.pfb"/>
+-  <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010015l.afm" glyphs="@ghostscript_font_dir@a010015l.pfb"/>
+-  <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010035l.afm" glyphs="@ghostscript_font_dir@a010035l.pfb"/>
+-  <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018015l.afm" glyphs="@ghostscript_font_dir@b018015l.pfb"/>
+-  <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018035l.afm" glyphs="@ghostscript_font_dir@b018035l.pfb"/>
+-  <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018012l.afm" glyphs="@ghostscript_font_dir@b018012l.pfb"/>
+-  <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018032l.afm" glyphs="@ghostscript_font_dir@b018032l.pfb"/>
+-  <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022003l.afm" glyphs="@ghostscript_font_dir@n022003l.pfb"/>
+-  <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022004l.afm" glyphs="@ghostscript_font_dir@n022004l.pfb"/>
+-  <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022023l.afm" glyphs="@ghostscript_font_dir@n022023l.pfb"/>
+-  <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022024l.afm" glyphs="@ghostscript_font_dir@n022024l.pfb"/>
+-  <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019003l.afm" glyphs="@ghostscript_font_dir@n019003l.pfb"/>
+-  <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019003l.afm" glyphs="@ghostscript_font_dir@n019003l.pfb"/>
+-  <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019004l.afm" glyphs="@ghostscript_font_dir@n019004l.pfb"/>
+-  <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019023l.afm" glyphs="@ghostscript_font_dir@n019023l.pfb"/>
+-  <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019024l.afm" glyphs="@ghostscript_font_dir@n019024l.pfb"/>
+-  <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019043l.afm" glyphs="@ghostscript_font_dir@n019043l.pfb"/>
+-  <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019063l.afm" glyphs="@ghostscript_font_dir@n019063l.pfb"/>
+-  <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019044l.afm" glyphs="@ghostscript_font_dir@n019044l.pfb"/>
+-  <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019064l.afm" glyphs="@ghostscript_font_dir@n019064l.pfb"/>
+-  <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059013l.afm" glyphs="@ghostscript_font_dir@c059013l.pfb"/>
+-  <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059033l.afm" glyphs="@ghostscript_font_dir@c059033l.pfb"/>
+-  <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059016l.afm" glyphs="@ghostscript_font_dir@c059016l.pfb"/>
+-  <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059036l.afm" glyphs="@ghostscript_font_dir@c059036l.pfb"/>
+-  <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052003l.afm" glyphs="@ghostscript_font_dir@p052003l.pfb"/>
+-  <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052023l.afm" glyphs="@ghostscript_font_dir@p052023l.pfb"/>
+-  <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052004l.afm" glyphs="@ghostscript_font_dir@p052004l.pfb"/>
+-  <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052024l.afm" glyphs="@ghostscript_font_dir@p052024l.pfb"/>
+-  <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021003l.afm" glyphs="@ghostscript_font_dir@n021003l.pfb"/>
+-  <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021004l.afm" glyphs="@ghostscript_font_dir@n021004l.pfb"/>
+-  <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021023l.afm" glyphs="@ghostscript_font_dir@n021023l.pfb"/>
+-  <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021024l.afm" glyphs="@ghostscript_font_dir@n021024l.pfb"/>
+-  <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@s050000l.afm" glyphs="@ghostscript_font_dir@s050000l.pfb" version="0.1" encoding="AdobeCustom"/>
++  <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-Book.otf"/>
++  <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-BookOblique.otf"/>
++  <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-Demi.otf"/>
++  <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-DemiOblique.otf"/>
++  <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-Demi.otf"/>
++  <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-DemiItalic.otf"/>
++  <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-Light.otf"/>
++  <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-LightItalic.otf"/>
++  <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Regular.otf"/>
++  <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Bold.otf"/>
++  <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Italic.otf"/>
++  <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-BoldItalic.otf"/>
++  <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Regular.otf"/>
++  <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Regular.otf"/>
++  <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Bold.otf"/>
++  <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Italic.otf"/>
++  <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-BoldItalic.otf"/>
++  <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Regular.otf"/>
++  <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Oblique.otf"/>
++  <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Bold.otf"/>
++  <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-BdOblique.otf"/>
++  <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Roman.otf"/>
++  <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Italic.otf"/>
++  <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Bold.otf"/>
++  <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-BdIta.otf"/>
++  <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Roman.otf"/>
++  <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Italic.otf"/>
++  <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Bold.otf"/>
++  <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-BoldItalic.otf"/>
++  <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Regular.otf"/>
++  <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Bold.otf"/>
++  <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Italic.otf"/>
++  <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-BoldItalic.otf"/>
++  <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@StandardSymbolsPS.otf" version="2.0" encoding="AdobeCustom"/>
+ </typemap>
diff --git a/pcr/imagemagick-nox/perlmagick.rpath.patch b/pcr/imagemagick-nox/perlmagick.rpath.patch
deleted file mode 100644
index a5b1a82e2..000000000
--- a/pcr/imagemagick-nox/perlmagick.rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
-+++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
-@@ -10469,6 +10469,8 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/pcr/inkscape-gtk3/PKGBUILD b/pcr/inkscape-gtk3/PKGBUILD
index ec07194ec..1953fca7b 100644
--- a/pcr/inkscape-gtk3/PKGBUILD
+++ b/pcr/inkscape-gtk3/PKGBUILD
@@ -13,7 +13,7 @@ pkgrel=19
 pkgdesc='Professional vector graphics editor with GTK3 and Python3'
 url='https://inkscape.org/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64' 'armv7h')
+arch=('i686' 'x86_64')
 makedepends=('boost' 'intltool')
 depends=('gdl' 'gnome-vfs' 'gsl' 'gtkmm3' 'gtkspell3' 'imagemagick' 'libcdr' 'libexif'
          'libvisio' 'libxslt' 'poppler-glib' 'popt' 'python' 'ttf-dejavu')
diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
index ad700ca6f..91e7a4b98 100644
--- a/pcr/lcmc/PKGBUILD
+++ b/pcr/lcmc/PKGBUILD
@@ -4,9 +4,9 @@ pkgname=lcmc
 pkgver=1.5.1
 pkgrel=1
 pkgdesc='Linux Cluster Management Console'
-arch=any
+arch=(any)
 url=http://$pkgname.sourceforge.net/
-license=GPL
+license=(GPL)
 depends=(
   java-runtime
   libxtst
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 8825deea0..e47910cea 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -10,7 +10,7 @@ arch=(
   i686
 )
 url=http://$pkgname.org/
-license=GPL3
+license=(GPL3)
 depends=(
   alsa-lib
   bzip2
@@ -38,8 +38,8 @@ makedepends=(
   yasm
   libvdpau
 )
-source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz
-sha512sums=88bbe82fc3edfde17339cbd5fbae5ab074e750ad750fafcabc2c1fa408f352e38f32d8c0df0ff6c926d449bff29c725fc2c219d8b6e0398e3b93d43f086c9f10
+source=(http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz)
+sha512sums=(88bbe82fc3edfde17339cbd5fbae5ab074e750ad750fafcabc2c1fa408f352e38f32d8c0df0ff6c926d449bff29c725fc2c219d8b6e0398e3b93d43f086c9f10)
 
 build() {
   cd $pkgname-$pkgver
diff --git a/pcr/libfilteraudio-git/PKGBUILD b/pcr/libfilteraudio-git/PKGBUILD
index 5a4af5445..9204788fa 100644
--- a/pcr/libfilteraudio-git/PKGBUILD
+++ b/pcr/libfilteraudio-git/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=libfilteraudio
 pkgname=libfilteraudio-git
-pkgver=r92.612c5a1
-pkgrel=1.1
+pkgver=r95.ada2f4f
+pkgrel=1
 pkgdesc="An easy to use audio filtering library made from webrtc code"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/irungentoo/filter_audio"
diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
index 4fd891ca4..56c0a8256 100644
--- a/pcr/libqb/PKGBUILD
+++ b/pcr/libqb/PKGBUILD
@@ -1,4 +1,4 @@
-# Mainteinar: fauno <fauno@parabola.nu>
+# Maintainer: fauno <fauno@parabola.nu>
 # Maintainer (arch):  Marcin Wieczorek <marcin@marcin.co>
 # Contributor: ovi chis <ovi@ovios.org>
 
diff --git a/pcr/librevpn-git/PKGBUILD b/pcr/librevpn-git/PKGBUILD
index d1feb074b..b05802097 100644
--- a/pcr/librevpn-git/PKGBUILD
+++ b/pcr/librevpn-git/PKGBUILD
@@ -38,8 +38,8 @@ optdepends=(
 )
 provides=($_pkgname)
 conflicts=($_pkgname)
-source=$_srcname-$_commit.tar.xz::http://repo.hackcoop.com.ar/$_pkgname.git/snapshot/$_commit.tar.xz
-sha512sums=$_sha512sums
+source=($_srcname-$_commit.tar.xz::http://repo.hackcoop.com.ar/$_pkgname.git/snapshot/$_commit.tar.xz)
+sha512sums=($_sha512sums)
 
 build() {
   cd $srcdir/$_commit
diff --git a/pcr/librevpn/PKGBUILD b/pcr/librevpn/PKGBUILD
index a8036f48f..2397f19f2 100644
--- a/pcr/librevpn/PKGBUILD
+++ b/pcr/librevpn/PKGBUILD
@@ -19,8 +19,8 @@ optdepends=(
   'ruby: for graph'
   sudo
 )
-source=http://repo.hackcoop.com.ar/$pkgname.git/snapshot/$pkgname-$pkgver.tar.xz
-sha512sums=96a0de4e35d1fd45652c4b7ee25d7335d9b3816065b48e978274845c328b68a03623abf812119af34f1856bd05170cac8ad59f233fc3dcd63ea6c84c89a80968
+source=(http://repo.hackcoop.com.ar/$pkgname.git/snapshot/$pkgname-$pkgver.tar.xz)
+sha512sums=(96a0de4e35d1fd45652c4b7ee25d7335d9b3816065b48e978274845c328b68a03623abf812119af34f1856bd05170cac8ad59f233fc3dcd63ea6c84c89a80968)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/pcr/lightspark-git/PKGBUILD b/pcr/lightspark-git/PKGBUILD
index aeaf2fd26..c351a9834 100644
--- a/pcr/lightspark-git/PKGBUILD
+++ b/pcr/lightspark-git/PKGBUILD
@@ -7,13 +7,13 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 _pkgname=lightspark
 pkgname=$_pkgname-git
-pkgver=0.8.0.r45.g06d58822
+pkgver=0.8.0.r123.gda0e6514
 pkgrel=1
 pkgdesc="An open source flash player implementation"
 arch=('i686' 'x86_64')
 url="http://lightspark.sourceforge.net"
 license=('LGPL3')
-depends=('gtk2' 'boost-libs' 'glew' 'ffmpeg' 'curl' 'desktop-file-utils' 'rtmpdump' 'sdl2_mixer' 'glibmm')
+depends=('gtk2' 'boost-libs<1.66' 'glew' 'ffmpeg' 'curl' 'desktop-file-utils' 'rtmpdump' 'sdl2_mixer' 'glibmm')
 makedepends=('git' 'cmake' 'nasm' 'llvm' 'boost')
 optdepends=('gnash-gtk: Gnash fallback support')
 provides=("$_pkgname")
diff --git a/pcr/log4c/PKGBUILD b/pcr/log4c/PKGBUILD
index b351eb717..054bcc833 100644
--- a/pcr/log4c/PKGBUILD
+++ b/pcr/log4c/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Logging FrameWork for C, as Log4j or Log4Cpp"
 url="http://log4c.sourceforge.net/"
 arch=('i686' 'x86_64')
-license="LGPL"
+license=("LGPL")
 depends=('expat')
 source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 sha256sums=('5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea')
diff --git a/pcr/log4cxx/PKGBUILD b/pcr/log4cxx/PKGBUILD
index 6c060d3af..003022ab3 100644
--- a/pcr/log4cxx/PKGBUILD
+++ b/pcr/log4cxx/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.10.0
 pkgrel=3.1
 pkgdesc="A C++ port of Log4j"
 url="http://logging.apache.org/log4cxx"
-license="APACHE"
+license=("APACHE")
 depends=('apr-util' 'libxml2')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('autoconf' 'automake' 'libtool' 'patch' 'zip' 'gzip' 'sed')
diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD
index d55f2b29e..08111724b 100644
--- a/pcr/luabind/PKGBUILD
+++ b/pcr/luabind/PKGBUILD
@@ -14,7 +14,7 @@ arch=(
   mips64el
 )
 url="http://www.rasterbar.com/products/$pkgname.html"
-license=MIT
+license=(MIT)
 makedepends=(
   boost
   boost-build
diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD
index 8889aa921..6f50cdea5 100644
--- a/pcr/mednafen-server/PKGBUILD
+++ b/pcr/mednafen-server/PKGBUILD
@@ -6,9 +6,9 @@ pkgver=0.5.2
 pkgrel=1
 pkgdesc='A server multi-system gaming emulator'
 url=http://$_pkgname.sourceforge.net/
-license=GPL
+license=(GPL)
 arch=('i686' 'x86_64' 'mips64el')
-backup=etc/$pkgname/standard.conf
+backup=(etc/$pkgname/standard.conf)
 source=(http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz
         $pkgname.service)
 sha512sums=('7ca094c7123e147bfaaedc254958fa664b7d71b141f8409b251bb646e04a7a6a5bc7f01ecac049b3895334a09a02e7449ac90e6db1d469322dba44f7281edf15'
diff --git a/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch b/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch
deleted file mode 100644
index 7f8f7164c..000000000
--- a/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 12 Oct 2016 13:41:33 -0400
-Subject: [PATCH] Fix linkage against shared glapi
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/gallium/targets/osmesa/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
-index 5d39486..04add87 100644
---- a/src/gallium/targets/osmesa/Makefile.am
-+++ b/src/gallium/targets/osmesa/Makefile.am
-@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
- 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
- 	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
- 	$(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
--	$(top_builddir)/src/mapi/glapi/libglapi.la \
-+	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
- 	$(SHARED_GLAPI_LIB) \
- 	$(OSMESA_LIB_DEPS) \
- 	$(CLOCK_LIB)
--- 
-2.9.3
-
diff --git a/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch b/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch
deleted file mode 100644
index 376828e67..000000000
--- a/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 16875ea5b9170f2213fd486d763f27a9d6dfc1b5 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Tue, 25 Oct 2016 09:35:13 +0200
-Subject: [PATCH 1/3] glapi: Link with glapi when built shared
-
-This patch explicitly links to libglapi when built shared.
-This was specially needed to avoid undefined non-weak-symbol as shown
-with:
-
-ldd  -r /usr/lib64/dri/i915_dri.so
-	linux-vdso.so.1 (0x00007fff821f4000)
-	libdrm_intel.so.1 => /lib64/libdrm_intel.so.1 (0x00007f6adf2c7000)
-	libdrm_nouveau.so.2 => /lib64/libdrm_nouveau.so.2 (0x00007f6adf0be000)
-	libdrm_radeon.so.1 => /lib64/libdrm_radeon.so.1 (0x00007f6adeeb2000)
-	libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f6adec8b000)
-	libdrm.so.2 => /lib64/libdrm.so.2 (0x00007f6adea7c000)
-	libexpat.so.1 => /lib64/libexpat.so.1 (0x00007f6ade84f000)
-	libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f6ade633000)
-	libdl.so.2 => /lib64/libdl.so.2 (0x00007f6ade42f000)
-	libm.so.6 => /lib64/libm.so.6 (0x00007f6ade125000)
-	libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f6addf0e000)
-	libc.so.6 => /lib64/libc.so.6 (0x00007f6addb4c000)
-	/lib64/ld-linux-x86-64.so.2 (0x000056274e913000)
-	libpciaccess.so.0 => /lib64/libpciaccess.so.0 (0x00007f6add941000)
-	libpcre.so.1 => /lib64/libpcre.so.1 (0x00007f6add6ce000)
-undefined symbol: _glapi_get_dispatch_table_size	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_get_context	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_add_dispatch	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_check_multithread	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_tls_Context	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_set_context	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_set_dispatch	(/usr/lib64/dri/i915_dri.so)
-undefined symbol: _glapi_tls_Dispatch	(/usr/lib64/dri/i915_dri.so)
-
-v3: Add gallium counterpart for radeon cases
-Reported-by: Jonathan Dieter <jdieter@lesbg.com>
-
-v2: Add Bugzilla and Signed-off
-
-Fixes: 0cbc90c57c ("mesa: dri: Add shared glapi to LIBADD on Android")
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98428
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
----
- src/gallium/targets/dri/Makefile.am | 2 --
- src/mesa/drivers/dri/Makefile.am    | 3 ---
- 2 files changed, 5 deletions(-)
-
-diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
-index bca747f..05f6c8c 100644
---- a/src/gallium/targets/dri/Makefile.am
-+++ b/src/gallium/targets/dri/Makefile.am
-@@ -1,10 +1,8 @@
- include $(top_srcdir)/src/gallium/Automake.inc
- 
--if HAVE_ANDROID
- if HAVE_SHARED_GLAPI
- SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
- endif
--endif
- 
- AM_CFLAGS = \
- 	-I$(top_srcdir)/src/mapi \
-diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
-index 1c6dd08..8e68fc0 100644
---- a/src/mesa/drivers/dri/Makefile.am
-+++ b/src/mesa/drivers/dri/Makefile.am
-@@ -6,12 +6,9 @@ MEGADRIVERS_DEPS =
- 
- SUBDIRS+=common
- 
--# On Android, we need to explicitly link to libglapi.so.
--if HAVE_ANDROID
- if HAVE_SHARED_GLAPI
- SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
- endif
--endif
- 
- if HAVE_I915_DRI
- SUBDIRS += i915
--- 
-2.7.4
-
diff --git a/pcr/mesa-vanilla/LICENSE b/pcr/mesa-vanilla/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/pcr/mesa-vanilla/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/pcr/mesa-vanilla/PKGBUILD b/pcr/mesa-vanilla/PKGBUILD
deleted file mode 100644
index 2460800ef..000000000
--- a/pcr/mesa-vanilla/PKGBUILD
+++ /dev/null
@@ -1,262 +0,0 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-
-# Based on mesa package from Arch and Arch ARM
-
-pkgbase=mesa-vanilla
-pkgname=('opencl-mesa-vanilla' 'libva-mesa-driver-vanilla' 'mesa-vdpau-vanilla' 'mesa-vanilla'
-         'mesa-libgl-vanilla' 'vulkan-radeon-vanilla')
-[[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel-vanilla')
-pkgver=17.0.3
-pkgrel=1
-arch=('i686' 'x86_64' 'armv7h')
-makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
-             'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
-             'libomxil-bellagio' 'libclc' 'clang' 'lm_sensors') # Implement 'lm_sensors' extra functionality, for i2c on video drivers
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-        LICENSE
-        remove-libpthread-stubs.patch
-        0001-Fix-linkage-against-shared-glapi.patch
-        0001-glapi-Link-with-glapi-when-built-shared.patch
-        drirc)
-sha256sums=('ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed'
-            'SKIP'
-            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
-            '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f'
-            'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7'
-            '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b'
-            '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
-validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') #  "Andres Gomez <tanty@igalia.com>"
-
-prepare() {
-  cd ${srcdir}/mesa-${pkgver}
-
-  # Now mesa checks for libpthread-stubs - so remove the check
-  patch -Np1 -i ../remove-libpthread-stubs.patch
-
-  # non-upstreamed ones
-  patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch
-  patch -Np1 -i ../0001-glapi-Link-with-glapi-when-built-shared.patch
-
-  autoreconf -fiv
-}
-
-build() {
-  # copy source to build mesa-libcl-icd package
-  cp -a ${srcdir}/{mesa,opencl}-${pkgver}
-
-  cd ${srcdir}/mesa-${pkgver}
-
-  # softpipe,llvmpipe
-  if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then
-    DRI=i915,i965,r200,radeon,nouveau,swrast
-    # Implement 'swr' (OpenSWR) software driver (only support x86 hardware with AVX extension, see: http://openswr.org/)
-    GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr
-    VULKAN=intel,radeon
-  elif [[ "${CARCH}" = 'armv7h' ]]; then
-    DRI=r200,radeon,nouveau,swrast
-    # Implement PCI and PCI-e drivers, due some ARM hardware does suport PCI and PCIe drivers, see:
-    #  https://lwn.net/Articles/586802/
-    #  https://www.linaro.org/blog/core-dump/kvm-pciemsi-passthrough-armarm64/
-    # nVidia, are avaliable on Tegra hardware and AMD will support K12 hardware, see:
-    #  https://en.wikipedia.org/wiki/Tegra
-    #  https://en.wikipedia.org/wiki/AMD_K12
-    GALLIUM=freedreno,etnaviv,vc4,imx,r300,r600,radeonsi,nouveau,svga,swrast,virgl
-    VULKAN=radeon
-  fi
-
-  # Implement 'gallium-extra-hud' extra functionality
-  # Implement opencl/vaapi/vdpau/xa on ARM archictecture, does support it and easy to maintain the PKGBUILD
-  #  ARM archictecture support PCI and PCIe drivers, see:
-  #    https://lwn.net/Articles/586802/
-  #    https://www.linaro.org/blog/core-dump/kvm-pciemsi-passthrough-armarm64/
-  #  Some ARM video drivers like freedreno/nouveau does support OpenCL, see:
-  #    Mali (Lima)                                  : https://en.wikipedia.org/wiki/Mali_(GPU)#Variants
-  #    Adreno (Freedreno, is not avaliable on mesa) : https://en.wikipedia.org/wiki/Adreno#Variants
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=${GALLIUM} \
-    --with-dri-drivers=${DRI} \
-    --with-egl-platforms=x11,drm,wayland \
-    --with-vulkan-drivers=${VULKAN} \
-    --disable-xvmc \
-    --enable-gallium-llvm \
-    --enable-llvm-shared-libs \
-    --enable-shared-glapi \
-    --disable-libglvnd \
-    --enable-egl \
-    --enable-glx \
-    --enable-glx-tls \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-gbm \
-    --enable-dri \
-    --enable-gallium-osmesa \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-vdpau \
-    --enable-omx \
-    --enable-nine \
-    --enable-opencl \
-    --enable-opencl-icd \
-    --enable-gallium-extra-hud \
-    --enable-lmsensors \
-    --with-clang-libdir=/usr/lib
-
-  make
-
-  # fake installation
-  mkdir $srcdir/fakeinstall
-  make DESTDIR=${srcdir}/fakeinstall install
-}
-
-package_opencl-mesa-vanilla() {
-  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('mesa-vanilla' 'opencl-icd-loader' 'expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors')
-  optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-driver')
-  conflicts=('opencl-mesa' 'opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst')
-  replaces=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst')
-
-  install -m755 -d ${pkgdir}/etc
-  cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
-
-  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libMesaOpenCL* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
-}
-
-package_vulkan-intel-vanilla() {
-  pkgdesc="Intel's Vulkan mesa driver"
-  depends=('mesa-vanilla' 'wayland' 'libx11' 'libxshmfence')
-  provides=('vulkan-driver')
-  conflicts=('vulkan-intel')
-
-  install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
-  cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
-
-  install -m755 -d ${pkgdir}/usr/{include/vulkan,lib}
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/"
-}
-
-package_vulkan-radeon-vanilla() {
-  pkgdesc="Radeon's Vulkan mesa driver"
-  depends=('mesa-vanilla' 'wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
-  provides=('vulkan-driver')
-  conflicts=('vulkan-radeon')
- 
-  install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
-  cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
-
-  install -m755 -d ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-radeon"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-radeon/"
-}
-
-package_libva-mesa-driver-vanilla() {
-  pkgdesc="VA-API implementation for gallium"
-  depends=('mesa-vanilla' 'libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors')
-  conflicts=('libva-mesa-driver')
-
-  install -m755 -d ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/"
-}
-
-package_mesa-vdpau-vanilla() {
-  pkgdesc="Mesa VDPAU drivers"
-  depends=('mesa-vanilla' 'libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors')
-  conflicts=('mesa-vdpau')
-
-  install -m755 -d ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
-}
-
-package_mesa-vanilla() {
-  pkgdesc="A free implementation of the OpenGL specification"
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' 
-           'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'mesa-libgl-vanilla' 'lm_sensors')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages'
-              'mesa-vdpau: for accelerated video playback'
-              'libva-mesa-driver: for accelerated video playback')
-  provides_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                   'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver' 'mesa')
-  conflicts_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                    'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'mesa'
-                    'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
-  replaces_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                   'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri'
-                   'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
-  provides_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver' 'mesa')
-  conflicts_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                  'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'mesa'
-                  'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
-  replaces_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
-                 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri'
-                 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
-  provides_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
-                   'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'opengl-driver' 'mesa')
-  conflicts_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
-                    'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'mesa'
-                    'nvidia-utils' 'catalyst-utils')
-  replaces_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
-                   'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri'
-                   'nvidia-utils' 'catalyst-utils')
-
-  install -m755 -d ${pkgdir}/etc
-  cp -v ${srcdir}/drirc ${pkgdir}/etc
-
-  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
-  # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
-  cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri
-
-  cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/d3d  ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libwayland*.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/
-
-  cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
-  cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
-
-  # remove vulkan headers
-  rm -rf ${pkgdir}/usr/include/vulkan
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_mesa-libgl-vanilla() {
-  pkgdesc="Mesa 3-D graphics library"
-  depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland')
-  provides=('libgl' 'libegl' 'libgles' 'mesa-libgl' 'libglvnd')
-  conflicts=('mesa-libgl' 'libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl')
-  replaces=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl')
-
-  install -m755 -d "${pkgdir}/usr/lib/"
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so*        ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so*       ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so*     ${pkgdir}/usr/lib/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
-}
diff --git a/pcr/mesa-vanilla/drirc b/pcr/mesa-vanilla/drirc
deleted file mode 100644
index 946cbc803..000000000
--- a/pcr/mesa-vanilla/drirc
+++ /dev/null
@@ -1,18 +0,0 @@
-<driconf>
-    <!-- Please always enable app-specific workarounds for all drivers and
-         screens. -->
-    <device>
-        <application name="Warsow (32-bit)" executable="warsow.i386">
-            <option name="allow_glsl_extension_directive_midshader" value="true" />
-        </application>
-
-        <application name="Warsow (64-bit)" executable="warsow.x86_64">
-            <option name="allow_glsl_extension_directive_midshader" value="true" />
-        </application>
-
-        <application name="Rust" executable="rust">
-            <option name="glsl_zero_init" value="true"/>
-        </application>
-        </application>
-    </device>
-</driconf>
diff --git a/pcr/mesa-vanilla/remove-libpthread-stubs.patch b/pcr/mesa-vanilla/remove-libpthread-stubs.patch
deleted file mode 100644
index efe8aaddd..000000000
--- a/pcr/mesa-vanilla/remove-libpthread-stubs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 54416b4..8a708d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -824,7 +824,7 @@ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
- 
- dnl pthread-stubs is mandatory on targets where it exists
- case "$host_os" in
--cygwin* )
-+cygwin* | linux* )
-     pthread_stubs_possible="no"
-     ;;
- * )
diff --git a/pcr/mplayer-vaapi/PKGBUILD b/pcr/mplayer-vaapi/PKGBUILD
deleted file mode 100644
index 1aa250c90..000000000
--- a/pcr/mplayer-vaapi/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# $Id: PKGBUILD 128869 2015-03-07 20:24:16Z foutrelis $
-# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
-# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-
-pkgname=mplayer-vaapi
-pkgver=36265
-pkgrel=14.parabola2
-pkgdesc="A movie player, compiled with VA API, without nonfree faac support and using of UnRAR executable disabled"
-arch=('i686' 'x86_64')
-url="http://gitorious.org/vaapi/mplayer"
-license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
-         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
-         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'libx264' 'speex' 'faad2'
-         'lirc' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
-         'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'opus'
-         'libbluray' 'libva' 'libass' 'rtmpdump' 'gsm' 'desktop-file-utils')
-depends+=('libx264.so')
-makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa' 'x264')
-provides=("mplayer=$pkgver")
-conflicts=('mplayer' 'mplayer-vaapi-libre' 'mplayer-libre-vaapi' 'mplayer-vaapi-parabola')
-replaces=('mplayer-vaapi-libre' 'mplayer-libre-vaapi' 'mplayer-vaapi-parabola')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/sources/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-        cdio-includes.patch
-        tweak-desktop-file.patch
-        subreader-fix-srt-parsing.patch
-        include-samba-4.0.patch)
-options=('!buildflags' '!emptydirs')
-install=mplayer-vaapi.install
-sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
-            'SKIP'
-            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
-            '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
-            '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3'
-            '169eb47b3b838ea95e50c871bdbbfb6fe0b9349b054da830f55f3b4d5055e4f3')
-validpgpkeys=('86CFFCA918CF3AF47147588051E8B148A9999C34')
-
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/cdio-includes.patch"
-  patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
-
-  # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
-  patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch"
-
-  # https://bugs.archlinux.org/task/41588
-  patch -Np1 -i "$srcdir/include-samba-4.0.patch"
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-runtime-cpudetection \
-    --disable-gui \
-    --disable-arts \
-    --disable-gif \
-    --disable-liblzo \
-    --enable-speex \
-    --disable-cdparanoia \
-    --disable-openal \
-    --disable-libdv \
-    --disable-musepack \
-    --disable-esd \
-    --disable-mga \
-    --disable-ass-internal \
-    --disable-faac \
-    --disable-unrarexec \
-    --enable-xvmc \
-    --enable-radio \
-    --enable-radio-capture \
-    --enable-smb \
-    --disable-vdpau \
-    --enable-vaapi \
-    --language=all \
-    --confdir=/etc/mplayer
-
-  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
-  install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
-  install -d "$pkgdir/usr/share/mplayer/"
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-  rm -rf "$pkgdir/usr/share/mplayer/font"
-  install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mplayer-vaapi/cdio-includes.patch b/pcr/mplayer-vaapi/cdio-includes.patch
deleted file mode 100644
index 894650717..000000000
--- a/pcr/mplayer-vaapi/cdio-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
-
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/pcr/mplayer-vaapi/include-samba-4.0.patch b/pcr/mplayer-vaapi/include-samba-4.0.patch
deleted file mode 100644
index 2ed272b6a..000000000
--- a/pcr/mplayer-vaapi/include-samba-4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
---- a/stream/stream_smb.c	2013-03-16 13:38:34.000000000 +0000
-+++ b/stream/stream_smb.c	2013-10-31 20:05:32.473947926 +0000
-@@ -18,7 +18,7 @@
- 
- #include "config.h"
- 
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
- #include <unistd.h>
- 
- #include "mp_msg.h"
diff --git a/pcr/mplayer-vaapi/mplayer-vaapi.install b/pcr/mplayer-vaapi/mplayer-vaapi.install
deleted file mode 100644
index a44f19aef..000000000
--- a/pcr/mplayer-vaapi/mplayer-vaapi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install
-}
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mplayer-vaapi/subreader-fix-srt-parsing.patch b/pcr/mplayer-vaapi/subreader-fix-srt-parsing.patch
deleted file mode 100644
index f1c087377..000000000
--- a/pcr/mplayer-vaapi/subreader-fix-srt-parsing.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sub/subreader.c
-===================================================================
---- sub/subreader.c	(revision 36284)
-+++ sub/subreader.c	(revision 36285)
-@@ -378,14 +378,14 @@
-     int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
- 
-     while (!current->text[0]) {
--        char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
-+        char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
-         int i;
- 
-         /* Parse SubRip header */
-         if (!stream_read_line(st, line, LINE_LEN, utf16))
-             return NULL;
--        if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
--                     &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
-+        if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",
-+                     &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
-             continue;
- 
-         current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10;
-@@ -442,7 +442,7 @@
- #endif
-     while (!current->text[0]) {
- 	if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
--	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
-+	if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
- 	    continue;
- 	current->start = a1*360000+a2*6000+a3*100+a4/10;
- 	current->end   = b1*360000+b2*6000+b3*100+b4/10;
-@@ -1123,7 +1123,7 @@
- 		{*uses_time=1;return SUB_MPL2;}
- 	if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",     &i, &i, &i, &i, &i, &i, &i, &i)==8)
- 		{*uses_time=1;return SUB_SUBRIP;}
--	if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10)
-+	if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8)
- 		{*uses_time=1;return SUB_SUBVIEWER;}
- 	if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4)
- 		{*uses_time=1;return SUB_SUBVIEWER2;}
diff --git a/pcr/mplayer-vaapi/tweak-desktop-file.patch b/pcr/mplayer-vaapi/tweak-desktop-file.patch
deleted file mode 100644
index 606e356b0..000000000
--- a/pcr/mplayer-vaapi/tweak-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mplayer.desktop.orig	2012-07-08 22:18:27.000000000 +0300
-+++ mplayer.desktop	2012-07-08 22:19:08.000000000 +0300
-@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
- Comment[it]=Riproduce filmati e musica
- Comment[ja]=動画や音声のファイルを再生します
- Icon=mplayer
--TryExec=gmplayer
--Exec=gmplayer %F
-+TryExec=mplayer
-+Exec=mplayer -really-quiet %F
- Terminal=false
-+NoDisplay=true
- Categories=GTK;AudioVideo;Audio;Video;Player;TV;
- MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;
diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD
index b475d8745..faa6ad78b 100644
--- a/pcr/netatalk/PKGBUILD
+++ b/pcr/netatalk/PKGBUILD
@@ -6,19 +6,21 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=netatalk
-pkgver=3.1.8
+pkgver=3.1.11
 pkgrel=1
 pkgdesc='Open-source implementation of the Apple Filing Protocol'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url='http://netatalk.sourceforge.net'
 license=('GPL')
-depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python2' 'dbus-glib' 'python2-dbus')
+depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python2' 'dbus-glib' 'python2-dbus' 'pam')
 replaces=('netatalk-git' 'netatalk2')
 backup=('etc/afp.conf'
 	'etc/extmap.conf')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
 	python2.patch)
+sha256sums=('3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6'
+	'582337cd434f5f3c89a00d99162747bd5f9ada57eef234ef8b49c16be7c19346')
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -39,5 +41,3 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums=('734745743b2d5fe39f3d6716f377e6255d6a061e3c615a4fe30db388ec6d848f6db063d733dfa24ccf967f1e9042841bce4824f4bed391952c4304ee11e11b0d'
-            '1c53f057ce19afcec15e3efa76aad310dc89bf14be7779c59066fd7389744198ae0008ea17c9ca23c1d5be93a8f5bbe1772c7da56fbce99a276260d59bb9f42a')
diff --git a/pcr/netatalk/avahi-client.patch b/pcr/netatalk/avahi-client.patch
deleted file mode 100644
index a1eef2b33..000000000
--- a/pcr/netatalk/avahi-client.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- macros/zeroconf.m4.orig	2014-06-08 21:23:46.000000000 +0400
-+++ macros/zeroconf.m4	2014-06-08 21:36:25.000000000 +0400
-@@ -25,23 +25,7 @@
- 			zeroconf_dir="$zeroconf"
- 		fi
- 
--        # mDNS support using mDNSResponder
--        AC_CHECK_HEADER(
--            dns_sd.h,
--            AC_CHECK_LIB(
--                dns_sd,
--                DNSServiceRegister,
--                AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
--        )
--
--        if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
--            ZEROCONF_LIBS="-ldns_sd"
--            AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
--            found_zeroconf=yes
--        fi
--
-         # mDNS support using Avahi
--        if test x"$found_zeroconf" != x"yes" ; then
-             AC_CHECK_HEADER(
-                 avahi-client/client.h,
-                 AC_CHECK_LIB(
-@@ -62,10 +46,26 @@
-                 found_zeroconf=yes
-                 ;;
-             esac
-+
-+        # mDNS support using mDNSResponder
-+        if test x"$found_zeroconf" != x"yes" ; then
-+            AC_CHECK_HEADER(
-+                dns_sd.h,
-+                AC_CHECK_LIB(
-+                    dns_sd,
-+                    DNSServiceRegister,
-+                    AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
-+            )
-+
-+            if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
-+                ZEROCONF_LIBS="-ldns_sd"
-+                AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
-+                found_zeroconf=yes
-+            fi
-+        fi
- 	    	CPPFLAGS="$savedcppflags"
- 		    LDFLAGS="$savedldflags"
-     	fi
--	fi
- 
- 	netatalk_cv_zeroconf=no
- 	AC_MSG_CHECKING([whether to enable Zerconf support])
diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog
deleted file mode 100644
index 8e1937a6c..000000000
--- a/pcr/netatalk/netatalk.changelog
+++ /dev/null
@@ -1,138 +0,0 @@
-2013-06-03 SJ_UnderWater
-
-	* 3.0.4-2:
-	move sbindir
-
-2013-05-26 SJ_UnderWater
-
-	* 3.0.4-1:
-	package update
-	minor fixes
-	dbus-glib dependency
-
-2013-03-27 SJ_UnderWater
-
-	* 3.0.3-1:
-	package update
-	minor fixes
-	python dependency
-
-2013-01-27 SJ_UnderWater
-
-	* 3.0.2-1:
-	package update
-	libevent fix
-	copy newer ./missing
-
-2013-01-05 SJ_UnderWater
-
-	* 3.0.1-5:
-	fixed AM deprecations
-	minor install fix
-
-2012-11-28 SJ_UnderWater
-
-	* 3.0.1-4 :
-	fixed mimic model
-
-2012-10-08 SJ_UnderWater
-
-	* 3.0.1-3 :
-	moved systemd from /etc
-	better rc.d install test
-
-2012-10-05 SJ_UnderWater
-
-	* 3.0.1-2 :
-	removed rc.d references
-
-2012-10-04 SJ_UnderWater
-
-	* 3.0.1-1 :
-	new version
-	moved to systemd
-	moved state to /var/db
-
-2012-07-14 SJ_UnderWater
-
-	* 3.0-3 :
-	moved localstate dir
-	to /etc for historical
-	reasons
-
-2012-07-12 SJ_UnderWater
-
-	* 3.0-2 :
-	disable bundled libevent
-
-2012-07-11 SJ_UnderWater
-
-	* 3.0-1 :
-	updated to new release
-	DDP moved to new pkg
-
-2012-06-12 SJ_UnderWater
-
-	* 2.2.3-4 :
-	added kill timing
-
-2012-06-04 SJ_UnderWater
-
-	* 2.2.3-3 :
-	removed conflicting files
-
-2012-06-02 SJ_UnderWater
-
-	* 2.2.3-2 :
-	Missing UAM links
-
-2012-05-29 SJ_UnderWater
-
-	* 2.2.3-1 :
-	updated package version
-	allowing headers and m4
-
-2012-05-01 SJ_UnderWater
-
-	* 2.2.2-6 :
-	moved to .rc files
-	refactored PKGBUILD
-	install rc.d files
-
-2012-04-25 SJ_UnderWater
-
-	* 2.2.2-5 :
-	init rebuild
-	fix dep check
-	fix get_pid
-	function relocation
-
-2012-04-21 SJ_UnderWater
-
-	* 2.2.2-4 :
-	moved to package()
-	added backup
-	split backup
-	moved depends
-
-2012-04-08 SJ_UnderWater
-
-	* 2.2.2-3 :
-	fixed extra dependencies
-	FHS compliance
-	NAMCAP checking
-	moved cups to optdepends
-
-2012-04-07 SJ_UnderWater
-
-	* 2.2.2-2 :
-	added Install
-	changed "conflicts" with "replace"
-	cleaned up PKGBUILD
-
-	* 2.2.2-1 :
-	added ChangeLog.
-	moved to split package format
-	bidirectional dependency-checking
-	moved to release package format
-	PKGBUILD compliance
diff --git a/pcr/olsrd/PKGBUILD b/pcr/olsrd/PKGBUILD
index 3f45ce5e9..7bcd86680 100644
--- a/pcr/olsrd/PKGBUILD
+++ b/pcr/olsrd/PKGBUILD
@@ -9,7 +9,7 @@ url="http://www.olsr.org"
 license=('BSD')
 depends=('glibc')
 makedepends=('bison')
-backup=etc/olsrd.conf
+backup=(etc/olsrd.conf)
 install=olsrd.install
 source=(http://www.olsr.org/releases/0.6/${pkgname}-${pkgver}.tar.bz2 rc.d.olsrd)
 md5sums=('a75fc9b6252df5b5f49f13418fafeff1' 'bc3e393e0179ffff0a6d6c9d6a5c4b60')
diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD
index e33a1cbba..1d103837c 100644
--- a/pcr/openrc/PKGBUILD
+++ b/pcr/openrc/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=openrc
 pkgname=('openrc' 'openrc-init')
-pkgver=0.34.8
-pkgrel=1.parabola3
+pkgver=0.34.11
+pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.gentoo.org/wiki/Project:OpenRC"
 license=('BSD2')
@@ -14,7 +14,7 @@ source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/OpenRC/openrc/archive/$
         "${pkgbase}.logrotate"
         'openrc-install.hook'
         'openrc-remove.hook')
-sha512sums=('2309e0d330c35467dd6008f1458ac9680207a4c783d4f4e6008a84a313088cfe796dd134dfec79699b8f9c90002b0ae621bb78a9925b987ae98fbd8ad75b947a'
+sha512sums=('76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be'
             '690612fddfb2c4cf8f6b5ba7239b9faf29eb3d9b152ab4dcf62694aa2852780440d08cee56d98a9597607f446b3697c911269562821a8402bb5747cbbae34bd9'
             'c31c94574f1c604930b572ed74eabdfcbedb344c54668ddeb3214d71de660e9fa8ff445b04ff817f16e62bce43376680d0a1b6c65baa8f6dba30e4ffa230c04a'
             '96bd71dd4fbe1417a640ac7526e83e1b2290732d5e558d7942c87db0dc1ccb7614763d7748b219ac5982b0db66cba9c124506ec939a661d73db4d0b2642f431e')
diff --git a/pcr/opensysusers/PKGBUILD b/pcr/opensysusers/PKGBUILD
index 93d33bc0e..e49c7162e 100644
--- a/pcr/opensysusers/PKGBUILD
+++ b/pcr/opensysusers/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: David P. <megver83@parabola.nu>
-# Maintainer (Artix): Chris Cromer <chris@cromer.cl>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer (Artix): Chris Cromer <chris@artixlinux.org>
 
 _url="https://github.com/artix-linux/opensysusers/archive"
 
 pkgname=opensysusers
-pkgver=0.3.1
+pkgver=0.3.2
 pkgrel=1.parabola1
 pkgdesc="A standalone utility for handling systemd-style sysusers.d users and groups"
 arch=('any')
@@ -15,7 +16,7 @@ depends=('shadow')
 optdepends=('openrc: update automatically on boot')
 source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz"
         'opensysusers.hook')
-sha512sums=('f2c6969f8b6730ae7e64501bc277e8647da052e477850b3f6c02249106245b791fa9192ca8b711bf50dd35b164ac0d29ea4095c1b68b4ebc2a06c741a3ca03ea'
+sha512sums=('713bce28364e4cb19271ad8f3f5fe4e45b688d1c3724c6cdfc6e014fe5ebdd107c1a0f46897e3cb1b885fca3385e46e6cb3cba119558b52580381260a21a23a0'
             '1f5d110e0575ac41b66b3710e26a85cb9806589fb543c2ffaed81643225de0e23d473342931c12dd725e3b4744a5fb71b7bb9c5731dc0a7dfb02add019acebc9')
 
 package() {
diff --git a/pcr/pencil2d/PKGBUILD b/pcr/pencil2d/PKGBUILD
index 5d385eeaa..1ffcba796 100644
--- a/pcr/pencil2d/PKGBUILD
+++ b/pcr/pencil2d/PKGBUILD
@@ -10,7 +10,7 @@ arch=(
   i686
 )
 url=http://http://www.pencil2d.org/
-license=GPL2
+license=(GPL2)
 depends=(
   desktop-file-utils
   ming
diff --git a/pcr/perl-linux-desktopfiles/PKGBUILD b/pcr/perl-linux-desktopfiles/PKGBUILD
index cd4fb923b..70a5c91e9 100644
--- a/pcr/perl-linux-desktopfiles/PKGBUILD
+++ b/pcr/perl-linux-desktopfiles/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="Perl module to get and parse the Linux .desktop files"
 arch=('any')
 url="https://metacpan.org/module/Linux::DesktopFiles"
 
-source="http://cpan.metacpan.org/authors/id/T/TR/TRIZEN/${_pkgname}-${pkgver}.tar.gz"
+source=("http://cpan.metacpan.org/authors/id/T/TR/TRIZEN/${_pkgname}-${pkgver}.tar.gz")
 sha256sums=('45afb52301ed1553fa741c40e62dc91280bb0e6e58dad83e6a49415a02f0973b')
 
 license=('GPLv3')
diff --git a/pcr/qtile/PKGBUILD b/pcr/qtile/PKGBUILD
index 46a66aab6..c30883294 100644
--- a/pcr/qtile/PKGBUILD
+++ b/pcr/qtile/PKGBUILD
@@ -2,19 +2,19 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=qtile
-pkgver=0.10.6
+pkgver=0.10.7
 pkgrel=1
 pkgdesc="A full-featured, pure-Python tiling window manager."
 arch=('any')
 url="http://www.qtile.org"
 license=('MIT')
-depends=('python' 'pango' 'python-xcffib>=0.4.1' 'python-cairocffi>=0.7.2')
+depends=('python' 'pango' 'python-xcffib>=0.5.1' 'python-cairocffi>=0.8.0')
 makedepends=('python-distribute')
 optdepends=('python-setproctitle: change the process name to qtile')
 conflicts=('qtile-git')
 install=${pkgname}.install
 source=("https://github.com/qtile/qtile/archive/v${pkgver}.tar.gz")
-md5sums=('c0c42fb746f21f6f9d6b549595f6e16e')
+sha256sums=('cbde17f5afdf2af7c80dd47c0f0ed5f8d716e3c87082c091b38e0d241ba39753')
 
 package() {
   cd "$srcdir/$pkgname-$pkgver/"
diff --git a/pcr/sobby/PKGBUILD b/pcr/sobby/PKGBUILD
index 646386ba9..2a3070791 100644
--- a/pcr/sobby/PKGBUILD
+++ b/pcr/sobby/PKGBUILD
@@ -4,7 +4,7 @@ pkgver=0.4.8
 pkgrel=2
 pkgdesc="Standalone obby server"
 url="http://gobby.0x539.de/trac/"
-license="GPL"
+license=("GPL")
 depends=('obby=0.4.8' 'libxml++')
 makedepends=('pkgconfig' 'net6>=1.3.12')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/pcr/toilet/PKGBUILD b/pcr/toilet/PKGBUILD
deleted file mode 100644
index 48deb1b9b..000000000
--- a/pcr/toilet/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer (Arch): Christian Neukirchen <chneukirchen@gmail.com>
-# Contributor (Arch): bl4ckb1t <bl4ckb1t@gmail.com>
-pkgname=toilet
-pkgver=0.3
-pkgrel=1
-pkgdesc="free replacement for the FIGlet utility."
-arch=('i686' 'x86_64')
-url="http://libcaca.zoy.org/wiki/toilet"
-license=('custom:WTFPL')
-depends=('libcaca')
-replaces=('figlet')
-conflicts=('figlet')
-provides=('figlet')
-source=(http://libcaca.zoy.org/files/toilet/$pkgname-$pkgver.tar.gz)
-md5sums=('9b72591cb22a30c42a3184b17cabca6f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/pcr/ttf-montserrat/PKGBUILD b/pcr/ttf-montserrat/PKGBUILD
index 1069ddb19..f38fc6a0d 100644
--- a/pcr/ttf-montserrat/PKGBUILD
+++ b/pcr/ttf-montserrat/PKGBUILD
@@ -3,16 +3,14 @@
 # Contributor (Arch): scolobb <scolobb at colimite fr> #THX for the mirror
 
 pkgname=ttf-montserrat
-provides="ttf-montserrat"
+provides=("ttf-montserrat")
 pkgdesc="Gorgeous geometric font with extended latin support (Regular, Alternates, Subrayada)"
 url="http://montserrat.zkysky.com.ar/en"
 pkgver=1.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('SIL Open Font')
-depends=
 install=ttf.install
-makedepends=
 #source=('http://colimite.fr/aur-mirrors/Montserrat.tar.gz') #BACKUP
 source=('http://marvid.fr/~eeva/mirror/Montserrat.tar.gz')
 sha512sums=('1d36ad8eb439ee2a2eee405bab2535cdf1e798e10d2e1ad93e86abb93656033d9136bda0482fd0d0f1a41473aca2078f5969a1385cdafa4ac7f667ef54f1e30e')
@@ -32,4 +30,4 @@ package() {
   install -m644 MontserratAlternates-Regular.ttf "${pkgdir}/usr/share/fonts/TTF/MontserratAlternates-Regular.ttf"
   install -m644 MontserratSubrayada-Bold.ttf     "${pkgdir}/usr/share/fonts/TTF/MontserratSubrayada-Bold.ttf"
   install -m644 MontserratSubrayada-Regular.ttf  "${pkgdir}/usr/share/fonts/TTF/MontserratSubrayada-Regular.ttf"
-}
-\ No newline at end of file
+}
diff --git a/pcr/uboot-tools/PKGBUILD b/pcr/uboot-tools/PKGBUILD
new file mode 100644
index 000000000..65fa2cfc8
--- /dev/null
+++ b/pcr/uboot-tools/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer (Arch): Anatol Pomozov
+# Contributor (Arch): Michael Lass <bevan@bi-co.net>
+# Contributor (Arch): Philipp Schrader <philipp.schrader+arch@gmail.com>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+pkgname=uboot-tools
+pkgver=2017.07
+pkgrel=1
+pkgdesc='U-Boot bootloader utility tools'
+arch=(armv7h)
+url='http://www.denx.de/wiki/U-Boot/WebHome'
+license=(GPL)
+depends=(openssl)
+source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2{,.sig})
+validpgpkeys=('E872DB409C1A687EFBE8633687F9F635D31D7652')
+sha256sums=('5374bfdc8acb9a38c025371b1ff20f45e7533668e84e685d0df5d9e7c0e4feff'
+            'SKIP')
+
+build() {
+  cd u-boot-$pkgver
+  make defconfig
+  make tools-all
+}
+
+package() {
+  install -m 755 -d "$pkgdir"/usr/bin
+  install -m 755 -t "$pkgdir"/usr/bin/ u-boot-$pkgver/tools/{mk{,env}image,env/fw_printenv,img2srec,dumpimage,netconsole,jtagconsole,ncb}
+  ln -s fw_printenv "$pkgdir"/usr/bin/fw_setenv
+  install -m 644 -D u-boot-$pkgver/doc/mkimage.1 "$pkgdir"/usr/share/man/man1/mkimage.1
+}
diff --git a/pcr/unrar-emulator/PKGBUILD b/pcr/unrar-emulator/PKGBUILD
index 38e026356..49b151d8a 100644
--- a/pcr/unrar-emulator/PKGBUILD
+++ b/pcr/unrar-emulator/PKGBUILD
@@ -8,7 +8,7 @@ arch=('any')
 license=('AGPL3')
 desc="Script to emulate nonfree unrar"
 depends=('bash' 'libarchive' 'unar')
-url=('https://projects.parabola.nu/software-emulators.git')
+url='https://projects.parabola.nu/software-emulators.git'
 source=($url/plain/unrar-emulator/unrar.sh)
 sha512sums=('c3f015dc8a7a1ddb2a4e94c80ff6ec59f3da368b8d616c43765e60e6b01ecd168e8babe051a945901935a6ac7d4f1368d5240257bdfad024a5b3fa21109f6ef6')
 
diff --git a/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD
index 5df38533f..401d04727 100644
--- a/pcr/xcftools/PKGBUILD
+++ b/pcr/xcftools/PKGBUILD
@@ -18,8 +18,8 @@ depends=(
   libpng
   perl
 )
-optdepends=gimp
-makedepends=libpng
+optdepends=(gimp)
+makedepends=(libpng)
 source=(
   http://henning.makholm.net/$pkgname/$pkgname-$pkgver.tar.gz
   $pkgname.patch
diff --git a/pcr/xdesktopwaves/PKGBUILD b/pcr/xdesktopwaves/PKGBUILD
index 3d24450d3..a51d00b1c 100644
--- a/pcr/xdesktopwaves/PKGBUILD
+++ b/pcr/xdesktopwaves/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=1.3
 pkgrel=1
 pkgdesc="xdesktopwaves is a cellular automata setting the background of your X Windows desktop under water. Windows and mouse are like ships on the sea."
 arch=('i686' 'x86_64')
-url=("http://xdesktopwaves.sourceforge.net/")
+url="http://xdesktopwaves.sourceforge.net/"
 license=('GPL2')
 depends=('xorg-server')
 makedepends=('make' 'gcc')
diff --git a/pcr/xen/21_linux_xen_multiboot_arch b/pcr/xen/21_linux_xen_multiboot_arch
index ef3a39b54..877bf2233 100755
--- a/pcr/xen/21_linux_xen_multiboot_arch
+++ b/pcr/xen/21_linux_xen_multiboot_arch
@@ -85,18 +85,14 @@ linux_entry ()
   type="$4"
   args="$5"
   xen_args="$6"
-  ver=""
-  if $($grub_file --is-x86-multiboot2 ${xen_dirname}/${xen_basename}); then
-     ver="2"
-  fi
   if [ -z "$boot_device_id" ]; then
       boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
   fi
   if [ x$type != xsimple ] ; then
       if [ x$type = xrecovery ] ; then
-	  title="$(gettext_printf "%s, with Xen %s and Linux-%s (recovery mode)" "${os}" "${xen_version}" "${version}")"
+	  title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")"
       else
-	  title="$(gettext_printf "%s, with Xen %s and Linux-%s" "${os}" "${xen_version}" "${version}")"
+	  title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")"
       fi
       replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
       if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
@@ -126,16 +122,16 @@ linux_entry ()
         else
             xen_rm_opts="no-real-mode edd=off"
         fi
-	multiboot${ver}	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
+	${xen_loader}	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
 	echo	'$(echo "$lmessage" | grub_quote)'
-	module${ver}	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
+	${module_loader}	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then
     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
     message="$(gettext_printf "Loading initial ramdisk ...")"
     sed "s/^/$submenu_indentation/" << EOF
 	echo	'$(echo "$message" | grub_quote)'
-	module${ver}	--nounzip   ${rel_dirname}/${initrd}
+	${module_loader}	--nounzip   ${rel_dirname}/${initrd}
 EOF
   fi
   sed "s/^/$submenu_indentation/" << EOF
@@ -224,20 +220,30 @@ while [ "x${xen_list}" != "x" ] ; do
     if [ "x$is_top_level" != xtrue ]; then
 	echo "	submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
     fi
+    if ($grub_file --is-arm64-efi $current_xen); then
+	xen_loader="xen_hypervisor"
+	module_loader="xen_module"
+    else
+	if ($grub_file --is-x86-multiboot2 $current_xen); then
+	    xen_loader="multiboot2"
+	    module_loader="module2"
+	else
+	    xen_loader="multiboot"
+	    module_loader="module"
+        fi
+    fi
     while [ "x$list" != "x" ] ; do
 	linux=`version_find_latest $list`
 	gettext_printf "Found linux-libre image: %s\n" "$linux" >&2
 	basename=`basename $linux`
 	dirname=`dirname $linux`
 	rel_dirname=`make_system_path_relative_to_its_root $dirname`
-	version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+	version=`echo $basename | sed -e "s,vmlinuz-,,g"`
 	alt_version=`echo $version | sed -e "s,\.old$,,g"`
 	linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
 
 	initrd=
-	for i in "initramfs-linux-${version}.img" \
-	   "initrd.img-${version}" "initrd-${version}.img" \
-	   "initrd-${version}.gz" \
+	for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
 	   "initrd-${version}" "initramfs-${version}.img" \
 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
diff --git a/pcr/xen/ChangeLog b/pcr/xen/ChangeLog
index b23e810df..ced200187 100644
--- a/pcr/xen/ChangeLog
+++ b/pcr/xen/ChangeLog
@@ -1,169 +1,40 @@
-2015-06-24 John Thomson
-	* 4.7.0-1
-	Xen 4.7.0
-
-2015-06-11 John Thomson
-	* 4.6.1-7
-	Apply XSA patch: 175, 178, 181
-
-2015-05-23 John Thomson
-	* 4.6.1-6
-	Apply XSA patch: 180
-
-2015-05-19 John Thomson
-	* 4.6.1-5
-	Apply XSA patch: 176
-
-2016-05-12 John Thomson
-	* 4.6.1-4
-	Apply XSA patch: 179
-	Patches for GCC6
-
-2016-04-19 John Thomson
-	* 4.6.1-3
-	Apply XSA patch: 173
-
-2016-03-31 John Thomson
-	* 4.6.1-2
-	Apply XSA patch: 172
-
-2016-02-19 John Thomson
-	* 4.6.1-1
-	Xen source package updated to 4.6.1
-	Apply XSA patch: 170
-
-2016-02-19 John Thomson
-	* 4.5.2-1
-	Xen source package updated to 4.5.2
-	Build xen.efi with mingw-w64-binutils
-	Build ovmf
-	Apply XSA patches: 154, 156, 158 to 160, 162 to 168, and 170
-
-2015-07-04 David Sutton <kantras - gmail.com>
-	* 4.5.1-1
-	New major release from upstream
-	Added -fno-caller-saves CFLAG to PKGBUILD to work around GCC5 issues
-	Added in some compile fixes for GCC 5
-	Disabled OVMF for now until patched for GCC 5
-
-2015-05-13 David Sutton <kantras - gmail.com>
-	* 4.5.0-3
-	Added Security patches
-
-2015-04-08 David Sutton <kantras - gmail.com>
-	* 4.5.0-2
-	Updated PKGBUILD to use absolute instead of relative paths for install
-	Updated efi-xen.cfg with syntax fix
-	Added gnuttls-3.4.0 patch 
-	Added security patches
-
-2015-03-01 David Sutton <kantras - gmail.com>
-	* 4.5.0-1 
-	New major release from upstream
-	Cleaned up old XSA patches
-	Removed old systemd support patches and realigned with the new upstream methods
-
-2014-10-26 David Sutton <kantras - gmail.com>
-	* 4.4.1-3
-	Enabled OVMF support and added patches to fix compile
-	Enabled spice support and added patch to enable qemu support in qemu-xen
-	Added figlet as an make dependancy for the ascii art version number
-	Including an example xen.cfg package for people who will be using EFI
-	Additional cleanup (explictly disabling some unnecessary libraries)
-
-2014-10-12 David Sutton <kantras - gmail.com>
-	* 4.4.1-2:
-	Added XSA 104, 105, 106, 107 and 108 security patches
-	Added .config to resolve compile issues where /etc/sysconfig exists
-
-2014-09-04 David Sutton <kantras - gmail.com>
-	* 4.4.1-1:
-	New Upstream release
-	Cleared out unnecessary patches (security, gcc compile and pit)
-
-2014-06-22 David Sutton <kantras - gmail.com>
-	* 4.4.0-6:
-	Added additional patch to support XSA 100 on AMD platform
-
-2014-06-17 David Sutton <kantras - gmail.com>
-	* 4.4.0-5:
-	Added XSA 96 and 100 security patches
-	Added patch to explictly disable searching for bluez libs
-	Cleaned up PKGBUILD
-
-2014-05-17 David Sutton <kantras - gmail.com>
-	* 4.4.0-4:
-	Added patch to fix shutdown issues with pvh domains
-
-2014-05-01 David Sutton <kantras - gmail.com>
-	* 4.4.0-3:
-        Added XSA 92 Security patch
-        Added fix for compiling under GCC 4.9.0 (From Fedora Rawhide SRPM)
-        Added updates to 09_xen to closer match system 10_linux
-
-2014-03-11 David Sutton <kantras - gmail.com>
-	* 4.4.0-2:
-	Moved xen-syms file so 09_xen won't pick it up as a potential kernel.
-	Added XSA 89 Security patch
-	Minor PKGBUILD cleanup/changes
-
-2014-03-10 David Sutton <kantras - gmail.com>
-	* 4.4.0-1:
-	New upstream release
-	Cleaned up old unnecessary patches
-
-2014-02-19 David Sutton <kantras - gmail.com>
-	* 4.3.2-1:
-	New upstream release
-	Removed unnecessary security patches (since now integrated into source)
-	Attempts to pull down additional required source file to ensure not corrupted
-	Added missing dependancy libseccomp
-
-2013-11-25 David Sutton <kantras - gmail.com>
-	* 4.3.1-2:
-	Changed bluez dependancy from bluez4 to bluez
-	Added recent security patches
-
-2013-10-31 David Sutton <kantras - gmail.com>
-	* 4.3.1-1:
-	New upstream release
-	Removed unnecessary security patches (already merged)
-	Fixed BIOS Workaround patch to apply to the new source files
-	Fixed ATI Passthrough patch to apply to the new source files
-	Updated paths in all patches
-
-2013-09-29 David Sutton <kantras - gmail.com>
-	* 4.3.0-7:
-	Fixed optdepends in PKGBUILD
-	Added in a pre_remove function in xen.install to disable services
-	Minor text formating changes in xen.install
-	Added XSA 62,63,64 and 66 patches (Xen Security Advisories)
-
-2013-09-29 David Sutton <kantras - gmail.com>
-	* 4.3.0-6:
-	Fixed 09_xen so it can detect lts kernels
-
-2013-09-28 David Sutton <kantras - gmail.com>
-	* 4.3.0-5:
-	Fixed mount option in 09_xen from ro to rw
-	Added in dummy /etc/xen/grub.conf to control settings in 09_xen
-	Fix library sanitize so that it returns to the base directory
-	Move the syms file to /usr/share/xen so that it is out of the way of boot but still accessible
-	Added optional dependancy for openvswitch
-
-2013-08-13 David Sutton <kantras - gmail.com>
-	* 4.3.0-4 :
-	Added patch for qemu-xen to add a TOM register for PCI Hole mapping
-	Protected /etc/conf.d/xendomains from being overwritten
-	Included ATI Passthrough patch (not enabled by default, compile tested only)
-
-2013-07-23 David Sutton <kantras - gmail.com>
-
-        * 4.3.0-3 :
-        added ChangeLog.
-        Cleaned up PKGBUILD to match Arch Package Standards
-        Fixed some path references - /var/run to /run
-        Removed some unnecessary empty directories
-        Updated xenconsoled and xenstored so they use /run for pid file
-        Updated auto-created /run directories to include xenstored
-
+2018-01-04 John Thomson
+    * 4.10.0-2
+    XSA-253 x86: memory leak with MSR emulation
+
+2017-12-13 John Thomson
+    * 4.10.0-1
+    Xen 4.10 release
+
+2017-12-04 John Thomson
+    * 4.10.0rc8
+    Xen 4.10 release candidate 8
+
+2017-12-01 John Thomson
+    * 4.10.0rc7
+    Xen 4.10 release candidate 7
+
+2017-11-23 John Thomson
+    * 4.10.0rc6
+    Xen 4.10 release candidate 6
+
+2017-11-18 John Thomson
+    * 4.10.0rc5
+    Xen 4.10 release candidate 5
+    grub multiboot2 config generator updated
+
+2017-11-13 John Thomson
+    * 4.10.0rc4
+    Xen 4.10 release candidate 4
+
+2017-11-02 John Thomson
+    * 4.10.0rc3
+    Xen 4.10 release candidate 3
+
+2017-10-23 John Thomson
+    * 4.10.0rc2
+    Xen 4.10 release candidate 2
+
+2017-10-18 John Thomson
+    * 4.10.0rc1
+    Xen 4.10 release candidate 1
diff --git a/pcr/xen/PKGBUILD b/pcr/xen/PKGBUILD
index a55df5075..2e0dd94d8 100644
--- a/pcr/xen/PKGBUILD
+++ b/pcr/xen/PKGBUILD
@@ -1,4 +1,4 @@
-# current version adapted from https://gitlab.com/johnth/aur-xen/blob/ea6a7a5938eb8bb4fbcd5de11220b2a7bbe12121/PKGBUILD
+# current version adapted from https://gitlab.com/archlinux-packages-johnth/xen/tree/xen-4.10
 
 # Maintainer (AUR): John Thomson <aur.xen at j0aur.mm.st>
 # Contributor (Arch): David Sutton <kantras - gmail.com>
@@ -34,10 +34,10 @@ _build_livepatch="${build_livepatch:-false}"
 pkgbase=xen
 pkgname=(xen{,-docs,-syms})
 _pkgname=xen
-pkgver=4.9.0
+pkgver=4.10.0
 _pkgver=${pkgver/rc/-rc}
-pkgrel=1.parabola2
-pkgdesc="Virtual Machine Hypervisor & Tools (Parabola rebranded)"
+pkgrel=1
+pkgdesc='Virtual Machine Hypervisor & Tools (Parabola rebranded)'
 arch=(x86_64 armv7h)
 depends=(
     bridge-utils
@@ -45,6 +45,7 @@ depends=(
     gnutls
     iproute2
     libaio
+    libcacard
     libcap-ng
     libiscsi
     libnl
@@ -86,6 +87,11 @@ makedepends=(
     gcc-multilib
     iasl
 )
+[[ "$CARCH" == 'i686' ]] && makedepends+=(
+    bin86
+    dev86
+    iasl
+)
 
 ## For building Xen EFI boot file.
 ## mingw-w64-binutils only needed if 
@@ -93,15 +99,19 @@ makedepends=(
 _binutils_efi=false
 
 if [[ "$CARCH" == 'x86_64' ]]; then
-    _binutils_emulations="$(ld -V)"
-    if [[ "$_binutils_emulations" == *'i386pep'* ]]; then
-        _binutils_efi=true
-        echo '#ld has efi support'
+    if which ld 2>&1 > /dev/null; then
+        _binutils_emulations="$(ld -V)"
+        if [[ "$_binutils_emulations" == *'i386pep'* ]]; then
+            _binutils_efi=true
+            msg '#ld has efi support'
+        else
+            makedepends+=(
+                mingw-w64-binutils
+            )
+            msg '#ld does not have efi support, using mingw'
+        fi
     else
-        makedepends+=(
-            mingw-w64-binutils
-        )
-        echo '#ld does not have efi support, using mingw'
+        true
     fi
 fi
 
@@ -111,9 +121,9 @@ changelog=ChangeLog
 
 ##SeaBIOS & OVMF tags are in src/xen-*/tools/Config.mk
 ##grep -rE '_(REVISION|VERSION|TAG)( \?| :){0,1}=' src/xen**/{Config.mk,stubdom/configure,tools/firmware/etherboot/Makefile}
-_git_tag_seabios='#tag=rel-1.10.0'
-_git_tag_ovmf='#tag=5920a9d16b1ab887c2858224316a98e961d71b05'
-_git_tag_ipxe='827dd1bfee67daa683935ce65316f7e0f057fe1c'
+_git_tag_seabios='#tag=rel-1.10.2'
+_git_tag_ovmf='#tag=947f3737abf65fda63f3ffd97fddfa6986986868'
+_git_tag_ipxe='356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d'
 
 if [[ "$_build_stubdom" == true ]]; then
     if [[ "$CARCH" == *'arm'* ]]; then
@@ -135,18 +145,6 @@ source=(
     ## Compile patches
     ati-passthrough.patch
     patch-ovmf-use-python2.patch
-    patch-ovmf-apply-inbuild-patches.patch
-    patch-ovmf-patches-series.patch
-    #patch-build-efi-with-mingw.patch::https://github.com/jakogut/xen-igvtg-aur/raw/28c81072e419d72a100ada9c393e37fae35ad263/xen_efi_build.patch
-    patch-inbuild-ovmf-5-hiilib.c-pointer-zero.patch::'https://github.com/tianocore/edk2/commit/fe4a28ccbfd33cae9e1f56b174d46b4eb2329efd.patch'
-    patch-inbuild-ipxe-gcc7-implicit-fallthrough.patch::'https://github.com/ipxe/ipxe/commit/5f85cbb9ee1c00cec81a848a9e871ad5d1e7f53f.patch'
-    patch-inbuild-ipxe-gcc7-implicit-fallthrough-ath5k.patch::'https://github.com/ipxe/ipxe/commit/45f2265bfcbbf2afd7fac24372ae26e453f2b52d.patch'
-    patch-inbuild-ipxe-gcc7-implicit-fallthrough-curses.patch::'https://github.com/ipxe/ipxe/commit/28e26dd2503e6006fabb26f8c33050ba93a99623.patch'
-    patch-ipxe-patches-series.patch
-    patch-gcc7-vtpm-implicit-fallthrough.patch
-    patch-gcc7-vtpmmgr-make-inline-static.patch
-    patch-gcc7-minios-udivmod.patch
-    patch-gcc7-rombios.patch::'https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff_plain;h=672949d6c61d9cba01c5b414eed9d522082f04d3'
 
     ## Files
     xen.install
@@ -155,10 +153,11 @@ source=(
     "tmpfiles.d-$_pkgname.conf"
 
     ## XSA patches
+    https://xenbits.xen.org/xsa/xsa253.patch
 )
 
 if [[ "$_build_stubdom" == true ]]; then
-    echo '#building with stubdom'
+    msg '#building with stubdom'
     source+=(
         http://xenbits.xen.org/xen-extfiles/lwip-1.3.0.tar.gz
         http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz
@@ -193,37 +192,18 @@ fi
 
 validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9')
 #gpg --keyserver pgp.mit.edu --recv-key 23E3222C145F4475FA8060A783FE14C957E82BD9
-sha256sums=(
-    'cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b'
-    'SKIP'
-    '36deacb946c59ad1d6600f6e5b89d6a7a8961e65eb000900e184075920120f49'
-
-    'SKIP'
-    'SKIP'
-
-    'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3'
-    '5fb65130f96d1728368a09042e55f622c14117572030ce2141bff4ae150e4a01'
-    'a853a38b8fd661d6b99979831cdae014cd23d831b57a90a467400660343f23f6'
-    '81b93e8c9e0ecb0d8c0555892b27b7e6c39d961af33cdea53ac72070e3e741b2'
-    #'a8ce42777e22af49080131e174b6b89c6e7597539838fb8b17a12280fd10b10b'
-    '79d8ce76bdeb72a1583254f1fb80309e56428d7406a6605a5ec860dc5a1beb3d'
-    'e042b0161d76ee9af7b113c46703dde2663f762d696f4290585be36d907e97a5'
-    '2be4efb8be044c9b2459d09f5a6390fecb218ed4cb38964bce0674882817b91a'
-    'db21442e38be53d342c7574c7c17fb8ce45e57c11dd1ad99e60641ea4061653b'
-    '9135c1ca7aed28a86afc7a0feb2930bd95b4fabf865dd368e8912cc77d38fb33'
-    '0ce9de822712e2b538dc144ba23b584970ac73b327277917b4afaa321c5b4b0c'
-    '5727d42575dfac1870d235fab23b8a230857cfdf44372bc1d98bb6384b752367'
-    'b6fa5bff89242719b20747d7eb197d0aeb59f8a89e841137f0b0cab17de20686'
-    '70b41197cde89d71e37d0c0d2af7087f4ec0a85db3f3e01f22cd2f91bf68b3c8'
-
-    #pkgbuild files
-    '330bcc5ab22e982d37495b57176d306353c220fec7c2b6c4a78a9133382a623e'
-    '9b2e6880d6345d1029317d7d65c85e07039b795c988b6852159d2ad673b13930'
-    '95f09bccc104d98c14559000823cb50f0d076f6a65b9f3b4e7725762b84ab5c7'
-    '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
-
-    ## XSA patches
-)
+sha256sums=('0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844'
+            'SKIP'
+            '251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4'
+            'SKIP'
+            'SKIP'
+            'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3'
+            '5fb65130f96d1728368a09042e55f622c14117572030ce2141bff4ae150e4a01'
+            '55145ff9c1570257478842e4001b0dafe007d90f5b06db17231bc5bf20f3b23d'
+            '8101316cfdf4b59e9c39b7372d4240a4552971c0fa53a4719bbb7a22f5622f4e'
+            'efb3c5713d556aa4890136ebf61502060cf90234fbd2e85701ad7a7ed2524fb1'
+            '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
+            'bba1abb5e4368421de29385e37f8477bf3534d3ba3ff7e2aae9c9d3da53f1393')
 
 
 if [[ "$_build_stubdom" == true ]]; then
@@ -270,8 +250,9 @@ prepare() {
     ### Patching
 
     # XSA Patches
-    echo 'XSA patches'
+    msg 'XSA patches'
     # Security Patches - Base
+    patch -Np1 -i "$srcdir/xsa253.patch"
 
     # Security Patches - qemu-xen-traditional
     cd 'tools/qemu-xen-traditional/'
@@ -283,13 +264,11 @@ prepare() {
 
 
     # Compile Patches
-    echo 'Compile patches'
-    patch -Np1 -i "$srcdir/patch-gcc7-rombios.patch"
+    msg 'Compile patches'
 
     # Build EFI binary with mingw
     if [[ "$_binutils_efi" != true ]]; then
         if $(stat /usr/x86_64-w64-mingw32/bin/ld >/dev/null 2>&1); then
-            #patch -Np1 -i "$srcdir/patch-build-efi-with-mingw.patch"
             sed -i.bak '/ EFI_LD/s/LD/LD_EFI/' xen/arch/x86/Makefile
             sed -i.bak 's/LD/LD_EFI/' xen/arch/x86/efi/Makefile
             sed -i.bak '/EFI_MOUNTPOINT .*/aLD_EFI ?= $(LD)' xen/Makefile
@@ -302,10 +281,8 @@ prepare() {
 
     # OVMF Compile support (Pulls from GIT repo, so patching to patch after pull request)
     patch -Np1 -i "$srcdir/patch-ovmf-use-python2.patch"
-    patch -Np1 -i "$srcdir/patch-ovmf-apply-inbuild-patches.patch"
-    mkdir -p tools/firmware/ovmf-patches
-    patch -Np1 -i "$srcdir/patch-ovmf-patches-series.patch"
-    cp "$srcdir"/patch-inbuild-ovmf*.patch tools/firmware/ovmf-patches/
+    #mkdir -p tools/firmware/ovmf-patches
+    #cp "$srcdir"/patch-inbuild-ovmf*.patch tools/firmware/ovmf-patches/
 
     # Uncomment line below if you want to enable ATI Passthrough support (some reported successes, untested with 4.4)
     #patch -Np1 -i "$srcdir/ati-passthrough.patch"
@@ -321,10 +298,20 @@ prepare() {
     sed -i 's:/var/run:/run:' ${_var_run_fixed_paths[@]}
 
     ## Fix python version in shebang
-    echo 'Fix python shebang to python2'
+    msg 'Fix python shebang to python2'
     _python_files=( $(grep -Rlse '^#!/usr/bin/.*python$' || : ) )
     sed -Ei 's|(^#!.*/usr/bin/(env ){0,1})python$|\1python2|' ${_python_files[@]}
 
+    ## Fix systemd-modules-load.d/xen.conf
+    ## remove nonexistent modules
+    find tools -iname 'configure*' -exec sed -i -E -e '
+        /^LINUX_BACKEND_MODULES="$/,/^"$/ {
+            #Address range where this variable is set
+            /"/b;               #Do noting if the line contains "
+            /^xen-/!d;          #Delete if does not start with xen
+            s/scsibk/scsiback/; #Change scsibk to scsiback
+        };' {} \;
+
     if [[ "$_build_stubdom" == true ]]; then
         # Copy supporting tarballs into place
         ln -s "$srcdir/lwip-1.3.0.tar.gz" stubdom/
@@ -339,18 +326,14 @@ prepare() {
 
         ## Stubdom patches
         cd 'extras/mini-os'
-        patch -Np1 -i "$srcdir/patch-gcc7-minios-udivmod.patch"
         cd '../../'
 
         #vtpm
-        patch -Np1 -i "$srcdir/patch-gcc7-vtpmmgr-make-inline-static.patch"
-        patch -Np1 -i "$srcdir/patch-gcc7-vtpm-implicit-fallthrough.patch"
     fi
 
     #etherboot
     ln -s "$srcdir/ipxe-git-$_git_tag_ipxe.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
-    patch -Np1 -i "$srcdir/patch-ipxe-patches-series.patch"
-    cp "$srcdir"/patch-inbuild-ipxe*.patch tools/firmware/etherboot/patches/
+    #cp "$srcdir"/patch-inbuild-ipxe*.patch tools/firmware/etherboot/patches/
 }
 
 build() {
@@ -412,9 +395,9 @@ package_xen() {
         'openvswitch: Optional advanced networking support'
         'urlgrabber: Required for xenpvnetboot'
     )
-    conflicts=(xen-{git,rc,igvtg,4.{5,6,7}} xenstore)
+    conflicts=(xen-{git,rc,igvtg,4.{8,9}} xenstore)
     provides=(xenstore)
-    replaces=(xen-{git,rc,4.{5,6,7}})
+    replaces=(xen-{git,rc,4.{8,9}})
     backup=(
         etc/conf.d/xen{domains,commons}
         "etc/$_pkgname/grub.conf"
diff --git a/pcr/xen/efi-xen.cfg b/pcr/xen/efi-xen.cfg
index 3c8e4d04c..d9f61958a 100644
--- a/pcr/xen/efi-xen.cfg
+++ b/pcr/xen/efi-xen.cfg
@@ -3,5 +3,5 @@ default=xen
 
 [xen]
 options=console=vga dom0_mem=1024M,max:1024M dom0_max_vcpus=4 loglvl=all noreboot
-kernel=vmlinuz-linux-libre root=<Root Device> rw
+kernel=vmlinuz-linux-libre root=<Root Device> rw 
 ramdisk=initramfs-linux-libre.img
diff --git a/pcr/xen/patch-gcc7-minios-udivmod.patch b/pcr/xen/patch-gcc7-minios-udivmod.patch
deleted file mode 100644
index 868e63c20..000000000
--- a/pcr/xen/patch-gcc7-minios-udivmod.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-gcc7 generates a call to __udivmoddi4 ...
-
-stubdom/mini-os-x86_32-grub/mini-os.o: In function `_strtoll_r':
-stubdom/newlib-x86_32/i686-xen-elf/newlib/libc/stdlib/../../../../../newlib-1.16.0/newlib/libc/stdlib/strtoll_r.c:110: undefined reference to `__udivmoddi4'
-make[2]: *** [Makefile:167: stubdom/mini-os-x86_32-grub/mini-os] Error 1
-
-... which the linker only finds if libgcc.a is provided on the commandline.
-
-Signed-off-by: Olaf Hering <olaf@aepfle.de>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ef8559b..b9c1336 100644
---- a/Makefile
-+++ b/Makefile
-@@ -162,7 +162,7 @@ $(OBJ_DIR)/arch/x86/minios-x86%.lds:  arch/x86/minios-x86.lds.S
- 	$(CPP) $(ASFLAGS) -P $< -o $@
- 
- $(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib $(OBJ_DIR)/$(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds
--	$(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o
-+	$(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) $$(gcc -print-libgcc-file-name $(CFLAGS)) -o $@.o
- 	$(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o
- 	$(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@
- 	gzip -f -9 -c $@ >$@.gz
-
-_______________________________________________
-Xen-devel mailing list
-Xen-devel@lists.xen.org
-https://lists.xen.org/xen-devel
diff --git a/pcr/xen/patch-gcc7-vtpm-implicit-fallthrough.patch b/pcr/xen/patch-gcc7-vtpm-implicit-fallthrough.patch
deleted file mode 100644
index 068752d2d..000000000
--- a/pcr/xen/patch-gcc7-vtpm-implicit-fallthrough.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-GCC-7 have -Wimplicit-fallthrough enabled with -Wextra. Add appropriate
-comment which both mute the warning and improve readibility.
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- stubdom/Makefile                        |  1 +
- stubdom/vtpm-implicit-fallthrough.patch | 10 ++++++++++
- 2 files changed, 11 insertions(+)
- create mode 100644 stubdom/vtpm-implicit-fallthrough.patch
-
-diff --git a/stubdom/Makefile b/stubdom/Makefile
-index db01827..5055e31 100644
---- a/stubdom/Makefile
-+++ b/stubdom/Makefile
-@@ -228,6 +228,7 @@ tpm_emulator-$(XEN_TARGET_ARCH): tpm_emulator-$(TPMEMU_VERSION).tar.gz
- 	patch -d $@ -p1 < vtpm-deepquote.patch
- 	patch -d $@ -p1 < vtpm-deepquote-anyloc.patch
- 	patch -d $@ -p1 < vtpm-cmake-Wextra.patch
-+	patch -d $@ -p1 < vtpm-implicit-fallthrough.patch
- 	mkdir $@/build
- 	cd $@/build; CC=${CC} $(CMAKE) .. -DCMAKE_C_FLAGS:STRING="-std=c99 -DTPM_NO_EXTERN $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-declaration-after-statement"
- 	touch $@
-diff --git a/stubdom/vtpm-implicit-fallthrough.patch b/stubdom/vtpm-implicit-fallthrough.patch
-new file mode 100644
-index 0000000..db97be5
---- /dev/null
-+++ b/stubdom/vtpm-implicit-fallthrough.patch
-@@ -0,0 +1,10 @@
-+--- tpm_emulator-x86_64/tpm/tpm_cmd_handler.c.orig	2017-04-27 13:37:14.408000000 +0200
-++++ tpm_emulator-x86_64/tpm/tpm_cmd_handler.c	2017-04-27 13:39:53.585000000 +0200
-+@@ -3397,6 +3397,7 @@
-+                   sizeof(rsp->auth2->nonceOdd.nonce));
-+       tpm_hmac_update(&hmac, (BYTE*)&rsp->auth2->continueAuthSession, 1);
-+       tpm_hmac_final(&hmac, rsp->auth2->auth);
-++      /* fall-thru */
-+     case TPM_TAG_RSP_AUTH1_COMMAND:
-+       tpm_hmac_init(&hmac, rsp->auth1->secret, sizeof(rsp->auth1->secret));
-+       tpm_hmac_update(&hmac, rsp->auth1->digest, sizeof(rsp->auth1->digest));
--- 
-2.7.4
-
-
-_______________________________________________
-Xen-devel mailing list
-Xen-devel@lists.xen.org
-https://lists.xen.org/xen-devel
diff --git a/pcr/xen/patch-gcc7-vtpmmgr-make-inline-static.patch b/pcr/xen/patch-gcc7-vtpmmgr-make-inline-static.patch
deleted file mode 100644
index a2c96691a..000000000
--- a/pcr/xen/patch-gcc7-vtpmmgr-make-inline-static.patch
+++ /dev/null
@@ -1,1161 +0,0 @@
-gcc7 is more strict with functions marked as inline. They are not
-automatically inlined. Instead a function call is generated, but the
-actual code is not visible by the linker.
-
-Do a mechanical change and mark every 'inline' as 'static inline'. For
-simpler review the static goes into an extra line.
-
-Signed-off-by: Olaf Hering <olaf@aepfle.de>
----
- stubdom/vtpmmgr/marshal.h      | 76 ++++++++++++++++++++++++++++++++++++++++++
- stubdom/vtpmmgr/tcg.h          | 14 ++++++++
- stubdom/vtpmmgr/tpm2_marshal.h | 58 ++++++++++++++++++++++++++++++++
- stubdom/vtpmmgr/tpmrsa.h       |  1 +
- 4 files changed, 149 insertions(+)
-
-diff --git a/stubdom/vtpmmgr/marshal.h b/stubdom/vtpmmgr/marshal.h
-index d826f19d89..dce19c6439 100644
---- a/stubdom/vtpmmgr/marshal.h
-+++ b/stubdom/vtpmmgr/marshal.h
-@@ -47,16 +47,19 @@ typedef enum UnpackPtr {
- 	UNPACK_ALLOC
- } UnpackPtr;
- 
-+static
- inline BYTE* pack_BYTE(BYTE* ptr, BYTE t) {
- 	ptr[0] = t;
- 	return ++ptr;
- }
- 
-+static
- inline BYTE* unpack_BYTE(BYTE* ptr, BYTE* t) {
- 	t[0] = ptr[0];
- 	return ++ptr;
- }
- 
-+static
- inline int unpack3_BYTE(BYTE* ptr, UINT32* pos, UINT32 max, BYTE *t)
- {
- 	if (*pos + 1 > max)
-@@ -72,18 +75,21 @@ inline int unpack3_BYTE(BYTE* ptr, UINT32* pos, UINT32 max, BYTE *t)
- #define unpack3_BOOL(p, x, m, t) unpack3_BYTE(p, x, m, t)
- #define sizeof_BOOL(t) 1
- 
-+static
- inline BYTE* pack_UINT16(void* ptr, UINT16 t) {
- 	UINT16* p = ptr;
- 	*p = cpu_to_be16(t);
- 	return ptr + sizeof(UINT16);
- }
- 
-+static
- inline BYTE* unpack_UINT16(void* ptr, UINT16* t) {
- 	UINT16* p = ptr;
- 	*t = be16_to_cpu(*p);
- 	return ptr + sizeof(UINT16);
- }
- 
-+static
- inline int unpack3_UINT16(BYTE* ptr, UINT32* pos, UINT32 max, UINT16 *t)
- {
- 	if (*pos + 2 > max)
-@@ -93,18 +99,21 @@ inline int unpack3_UINT16(BYTE* ptr, UINT32* pos, UINT32 max, UINT16 *t)
- 	return 0;
- }
- 
-+static
- inline BYTE* pack_UINT32(void* ptr, UINT32 t) {
- 	UINT32* p = ptr;
- 	*p = cpu_to_be32(t);
- 	return ptr + sizeof(UINT32);
- }
- 
-+static
- inline BYTE* unpack_UINT32(void* ptr, UINT32* t) {
- 	UINT32* p = ptr;
- 	*t = be32_to_cpu(*p);
- 	return ptr + sizeof(UINT32);
- }
- 
-+static
- inline int unpack3_UINT32(BYTE* ptr, UINT32* pos, UINT32 max, UINT32 *t)
- {
- 	if (*pos + 4 > max)
-@@ -236,16 +245,19 @@ inline int unpack3_UINT32(BYTE* ptr, UINT32* pos, UINT32 max, UINT32 *t)
- #define sizeof_TCS_KEY_HANDLE(t) sizeof_UINT32(t)
- 
- 
-+static
- inline BYTE* pack_BUFFER(BYTE* ptr, const BYTE* buf, UINT32 size) {
- 	memcpy(ptr, buf, size);
- 	return ptr + size;
- }
- 
-+static
- inline BYTE* unpack_BUFFER(BYTE* ptr, BYTE* buf, UINT32 size) {
- 	memcpy(buf, ptr, size);
- 	return ptr + size;
- }
- 
-+static
- inline int unpack3_BUFFER(BYTE* ptr, UINT32* pos, UINT32 max, BYTE* buf, UINT32 size) {
- 	if (*pos + size > max)
- 		return TPM_SIZE;
-@@ -256,11 +268,13 @@ inline int unpack3_BUFFER(BYTE* ptr, UINT32* pos, UINT32 max, BYTE* buf, UINT32
- 
- #define sizeof_BUFFER(b, s) s
- 
-+static
- inline BYTE* unpack_ALIAS(BYTE* ptr, BYTE** buf, UINT32 size) {
- 	*buf = ptr;
- 	return ptr + size;
- }
- 
-+static
- inline BYTE* unpack_ALLOC(BYTE* ptr, BYTE** buf, UINT32 size) {
- 	if(size) {
- 		*buf = malloc(size);
-@@ -271,6 +285,7 @@ inline BYTE* unpack_ALLOC(BYTE* ptr, BYTE** buf, UINT32 size) {
- 	return ptr + size;
- }
- 
-+static
- inline BYTE* unpack_PTR(BYTE* ptr, BYTE** buf, UINT32 size, UnpackPtr alloc) {
- 	if(alloc == UNPACK_ALLOC) {
- 		return unpack_ALLOC(ptr, buf, size);
-@@ -279,6 +294,7 @@ inline BYTE* unpack_PTR(BYTE* ptr, BYTE** buf, UINT32 size, UnpackPtr alloc) {
- 	}
- }
- 
-+static
- inline int unpack3_PTR(BYTE* ptr, UINT32* pos, UINT32 max, BYTE** buf, UINT32 size, UnpackPtr alloc) {
- 	if (size > max || *pos + size > max)
- 		return TPM_SIZE;
-@@ -292,14 +308,17 @@ inline int unpack3_PTR(BYTE* ptr, UINT32* pos, UINT32 max, BYTE** buf, UINT32 si
- }
- #define unpack3_VPTR(ptr, pos, max, buf, size, alloc) unpack3_PTR(ptr, pos, max, (void*)(buf), size, alloc)
- 
-+static
- inline BYTE* pack_TPM_AUTHDATA(BYTE* ptr, const TPM_AUTHDATA* d) {
- 	return pack_BUFFER(ptr, *d, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline BYTE* unpack_TPM_AUTHDATA(BYTE* ptr, TPM_AUTHDATA* d) {
- 	return unpack_BUFFER(ptr, *d, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline int unpack3_TPM_AUTHDATA(BYTE* ptr, UINT32* pos, UINT32 len, TPM_AUTHDATA* d) {
- 	return unpack3_BUFFER(ptr, pos, len, *d, TPM_DIGEST_SIZE);
- }
-@@ -325,6 +344,7 @@ inline int unpack3_TPM_AUTHDATA(BYTE* ptr, UINT32* pos, UINT32 len, TPM_AUTHDATA
- #define sizeof_TPM_TAG(t) sizeof_UINT16(t)
- #define sizeof_TPM_STRUCTURE_TAG(t) sizeof_UINT16(t)
- 
-+static
- inline BYTE* pack_TPM_VERSION(BYTE* ptr, const TPM_VERSION* t) {
- 	ptr[0] = t->major;
- 	ptr[1] = t->minor;
-@@ -333,6 +353,7 @@ inline BYTE* pack_TPM_VERSION(BYTE* ptr, const TPM_VERSION* t) {
- 	return ptr + 4;
- }
- 
-+static
- inline BYTE* unpack_TPM_VERSION(BYTE* ptr, TPM_VERSION* t) {
- 	t->major = ptr[0];
- 	t->minor = ptr[1];
-@@ -341,6 +362,7 @@ inline BYTE* unpack_TPM_VERSION(BYTE* ptr, TPM_VERSION* t) {
- 	return ptr + 4;
- }
- 
-+static
- inline int unpack3_TPM_VERSION(BYTE* ptr, UINT32 *pos, UINT32 max, TPM_VERSION* t) {
- 	if (*pos + 4 > max)
- 		return TPM_SIZE;
-@@ -355,6 +377,7 @@ inline int unpack3_TPM_VERSION(BYTE* ptr, UINT32 *pos, UINT32 max, TPM_VERSION*
- 
- #define sizeof_TPM_VERSION(x) 4
- 
-+static
- inline BYTE* pack_TPM_CAP_VERSION_INFO(BYTE* ptr, const TPM_CAP_VERSION_INFO* v) {
- 	ptr = pack_TPM_STRUCTURE_TAG(ptr, v->tag);
- 	ptr = pack_TPM_VERSION(ptr, &v->version);
-@@ -366,6 +389,7 @@ inline BYTE* pack_TPM_CAP_VERSION_INFO(BYTE* ptr, const TPM_CAP_VERSION_INFO* v)
- 	return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM_CAP_VERSION_INFO(BYTE* ptr, TPM_CAP_VERSION_INFO* v, UnpackPtr alloc) {
- 	ptr = unpack_TPM_STRUCTURE_TAG(ptr, &v->tag);
- 	ptr = unpack_TPM_VERSION(ptr, &v->version);
-@@ -377,14 +401,17 @@ inline BYTE* unpack_TPM_CAP_VERSION_INFO(BYTE* ptr, TPM_CAP_VERSION_INFO* v, Unp
- 	return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM_DIGEST(BYTE* ptr, const TPM_DIGEST* d) {
- 	return pack_BUFFER(ptr, d->digest, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline BYTE* unpack_TPM_DIGEST(BYTE* ptr, TPM_DIGEST* d) {
- 	return unpack_BUFFER(ptr, d->digest, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline int unpack3_TPM_DIGEST(BYTE* ptr, UINT32* pos, UINT32 max, TPM_DIGEST* d) {
- 	return unpack3_BUFFER(ptr, pos, max, d->digest, TPM_DIGEST_SIZE);
- }
-@@ -409,20 +436,24 @@ inline int unpack3_TPM_DIGEST(BYTE* ptr, UINT32* pos, UINT32 max, TPM_DIGEST* d)
- #define pack_TPM_CHOSENID_HASH(ptr, d) pack_TPM_DIGEST(ptr, d)
- #define unpack_TPM_CHOSENID_HASH(ptr, d) unpack_TPM_DIGEST(ptr, d)
- 
-+static
- inline BYTE* pack_TPM_NONCE(BYTE* ptr, const TPM_NONCE* n) {
- 	return pack_BUFFER(ptr, n->nonce, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline BYTE* unpack_TPM_NONCE(BYTE* ptr, TPM_NONCE* n) {
- 	return unpack_BUFFER(ptr, n->nonce, TPM_DIGEST_SIZE);
- }
- 
- #define sizeof_TPM_NONCE(x) TPM_DIGEST_SIZE
- 
-+static
- inline int unpack3_TPM_NONCE(BYTE* ptr, UINT32* pos, UINT32 max, TPM_NONCE* n) {
- 	return unpack3_BUFFER(ptr, pos, max, n->nonce, TPM_DIGEST_SIZE);
- }
- 
-+static
- inline BYTE* pack_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, const TPM_SYMMETRIC_KEY_PARMS* k) {
- 	ptr = pack_UINT32(ptr, k->keyLength);
- 	ptr = pack_UINT32(ptr, k->blockSize);
-@@ -430,6 +461,7 @@ inline BYTE* pack_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, const TPM_SYMMETRIC_KEY_PAR
- 	return pack_BUFFER(ptr, k->IV, k->ivSize);
- }
- 
-+static
- inline BYTE* pack_TPM_SYMMETRIC_KEY(BYTE* ptr, const TPM_SYMMETRIC_KEY* k) {
- 	ptr = pack_UINT32(ptr, k->algId);
- 	ptr = pack_UINT16(ptr, k->encScheme);
-@@ -437,6 +469,7 @@ inline BYTE* pack_TPM_SYMMETRIC_KEY(BYTE* ptr, const TPM_SYMMETRIC_KEY* k) {
- 	return pack_BUFFER(ptr, k->data, k->size);
- }
- 
-+static
- inline int unpack3_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 max, TPM_SYMMETRIC_KEY_PARMS* k, UnpackPtr alloc) {
- 	return unpack3_UINT32(ptr, pos, max, &k->keyLength) ||
- 		unpack3_UINT32(ptr, pos, max, &k->blockSize) ||
-@@ -444,10 +477,12 @@ inline int unpack3_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 max, T
- 		unpack3_PTR(ptr, pos, max, &k->IV, k->ivSize, alloc);
- }
- 
-+static
- inline int sizeof_TPM_SYMMETRIC_KEY_PARMS(const TPM_SYMMETRIC_KEY_PARMS* k) {
- 	return 12 + k->ivSize;
- }
- 
-+static
- inline int unpack3_TPM_SYMMETRIC_KEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_SYMMETRIC_KEY* k, UnpackPtr alloc) {
- 	return unpack3_UINT32(ptr, pos, max, &k->algId) ||
- 		unpack3_UINT16(ptr, pos, max, &k->encScheme) ||
-@@ -455,6 +490,7 @@ inline int unpack3_TPM_SYMMETRIC_KEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_SYM
- 		unpack3_PTR(ptr, pos, max, &k->data, k->size, alloc);
- }
- 
-+static
- inline BYTE* pack_TPM_RSA_KEY_PARMS(BYTE* ptr, const TPM_RSA_KEY_PARMS* k) {
- 	ptr = pack_UINT32(ptr, k->keyLength);
- 	ptr = pack_UINT32(ptr, k->numPrimes);
-@@ -462,6 +498,7 @@ inline BYTE* pack_TPM_RSA_KEY_PARMS(BYTE* ptr, const TPM_RSA_KEY_PARMS* k) {
- 	return pack_BUFFER(ptr, k->exponent, k->exponentSize);
- }
- 
-+static
- inline int unpack3_TPM_RSA_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 max, TPM_RSA_KEY_PARMS* k, UnpackPtr alloc) {
- 	return unpack3_UINT32(ptr, pos, max, &k->keyLength) ||
- 		unpack3_UINT32(ptr, pos, max, &k->numPrimes) ||
-@@ -469,11 +506,13 @@ inline int unpack3_TPM_RSA_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 max, TPM_RSA
- 		unpack3_PTR(ptr, pos, max, &k->exponent, k->exponentSize, alloc);
- }
- 
-+static
- inline int sizeof_TPM_RSA_KEY_PARMS(const TPM_RSA_KEY_PARMS* k) {
- 	return 12 + k->exponentSize;
- }
- 
- 
-+static
- inline BYTE* pack_TPM_KEY_PARMS(BYTE* ptr, const TPM_KEY_PARMS* k) {
- 	ptr = pack_TPM_ALGORITHM_ID(ptr, k->algorithmID);
- 	ptr = pack_TPM_ENC_SCHEME(ptr, k->encScheme);
-@@ -493,6 +532,7 @@ inline BYTE* pack_TPM_KEY_PARMS(BYTE* ptr, const TPM_KEY_PARMS* k) {
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 len, TPM_KEY_PARMS* k, UnpackPtr alloc) {
- 	int rc = unpack3_TPM_ALGORITHM_ID(ptr, pos, len, &k->algorithmID) ||
- 		unpack3_TPM_ENC_SCHEME(ptr, pos, len, &k->encScheme) ||
-@@ -511,6 +551,7 @@ inline int unpack3_TPM_KEY_PARMS(BYTE* ptr, UINT32* pos, UINT32 len, TPM_KEY_PAR
- 	return TPM_FAIL;
- }
- 
-+static
- inline int sizeof_TPM_KEY_PARMS(const TPM_KEY_PARMS* k) {
- 	int rc = 0;
- 	rc += sizeof_TPM_ALGORITHM_ID(&k->algorithmID);
-@@ -532,52 +573,62 @@ inline int sizeof_TPM_KEY_PARMS(const TPM_KEY_PARMS* k) {
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_STORE_PUBKEY(BYTE* ptr, const TPM_STORE_PUBKEY* k) {
- 	ptr = pack_UINT32(ptr, k->keyLength);
- 	ptr = pack_BUFFER(ptr, k->key, k->keyLength);
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_STORE_PUBKEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_STORE_PUBKEY* k, UnpackPtr alloc) {
- 	return unpack3_UINT32(ptr, pos, max, &k->keyLength) ||
- 		unpack3_PTR(ptr, pos, max, &k->key, k->keyLength, alloc);
- }
- 
-+static
- inline int sizeof_TPM_STORE_PUBKEY(const TPM_STORE_PUBKEY* k) {
- 	return 4 + k->keyLength;
- }
- 
-+static
- inline BYTE* pack_TPM_PUBKEY(BYTE* ptr, const TPM_PUBKEY* k) {
- 	ptr = pack_TPM_KEY_PARMS(ptr, &k->algorithmParms);
- 	return pack_TPM_STORE_PUBKEY(ptr, &k->pubKey);
- }
- 
-+static
- inline int unpack3_TPM_PUBKEY(BYTE* ptr, UINT32* pos, UINT32 len, TPM_PUBKEY* k, UnpackPtr alloc) {
- 	return unpack3_TPM_KEY_PARMS(ptr, pos, len, &k->algorithmParms, alloc) ||
- 		unpack3_TPM_STORE_PUBKEY(ptr, pos, len, &k->pubKey, alloc);
- }
- 
-+static
- inline BYTE* pack_TPM_PCR_SELECTION(BYTE* ptr, const TPM_PCR_SELECTION* p) {
- 	ptr = pack_UINT16(ptr, p->sizeOfSelect);
- 	ptr = pack_BUFFER(ptr, p->pcrSelect, p->sizeOfSelect);
- 	return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM_PCR_SELECTION(BYTE* ptr, TPM_PCR_SELECTION* p, UnpackPtr alloc) {
- 	ptr = unpack_UINT16(ptr, &p->sizeOfSelect);
- 	ptr = unpack_PTR(ptr, &p->pcrSelect, p->sizeOfSelect, alloc);
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_PCR_SELECTION(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR_SELECTION* p, UnpackPtr alloc) {
- 	return unpack3_UINT16(ptr, pos, max, &p->sizeOfSelect) ||
- 		unpack3_PTR(ptr, pos, max, &p->pcrSelect, p->sizeOfSelect, alloc);
- }
- 
-+static
- inline int sizeof_TPM_PCR_SELECTION(const TPM_PCR_SELECTION* p) {
- 	return 2 + p->sizeOfSelect;
- }
- 
-+static
- inline BYTE* pack_TPM_PCR_INFO(BYTE* ptr, const TPM_PCR_INFO* p) {
- 	ptr = pack_TPM_PCR_SELECTION(ptr, &p->pcrSelection);
- 	ptr = pack_TPM_COMPOSITE_HASH(ptr, &p->digestAtRelease);
-@@ -585,12 +636,14 @@ inline BYTE* pack_TPM_PCR_INFO(BYTE* ptr, const TPM_PCR_INFO* p) {
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_PCR_INFO(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR_INFO* p, UnpackPtr alloc) {
- 	return unpack3_TPM_PCR_SELECTION(ptr, pos, max, &p->pcrSelection, alloc) ||
- 		unpack3_TPM_COMPOSITE_HASH(ptr, pos, max, &p->digestAtRelease) ||
- 		unpack3_TPM_COMPOSITE_HASH(ptr, pos, max, &p->digestAtCreation);
- }
- 
-+static
- inline int sizeof_TPM_PCR_INFO(const TPM_PCR_INFO* p) {
- 	int rc = 0;
- 	rc += sizeof_TPM_PCR_SELECTION(&p->pcrSelection);
-@@ -599,6 +652,7 @@ inline int sizeof_TPM_PCR_INFO(const TPM_PCR_INFO* p) {
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_PCR_INFO_LONG(BYTE* ptr, const TPM_PCR_INFO_LONG* p) {
- 	ptr = pack_TPM_STRUCTURE_TAG(ptr, p->tag);
- 	ptr = pack_TPM_LOCALITY_SELECTION(ptr, p->localityAtCreation);
-@@ -610,6 +664,7 @@ inline BYTE* pack_TPM_PCR_INFO_LONG(BYTE* ptr, const TPM_PCR_INFO_LONG* p) {
- 	return ptr;
- }
- 
-+static
- inline int sizeof_TPM_PCR_INFO_LONG(const TPM_PCR_INFO_LONG* p) {
- 	int rc = 0;
- 	rc += sizeof_TPM_STRUCTURE_TAG(p->tag);
-@@ -622,6 +677,7 @@ inline int sizeof_TPM_PCR_INFO_LONG(const TPM_PCR_INFO_LONG* p) {
- 	return rc;
- }
- 
-+static
- inline int unpack3_TPM_PCR_INFO_LONG(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR_INFO_LONG* p, UnpackPtr alloc) {
- 	return unpack3_TPM_STRUCTURE_TAG(ptr, pos, max, &p->tag) ||
- 		unpack3_TPM_LOCALITY_SELECTION(ptr, pos, max,
-@@ -637,6 +693,7 @@ inline int unpack3_TPM_PCR_INFO_LONG(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR
- 		unpack3_TPM_COMPOSITE_HASH(ptr, pos, max, &p->digestAtRelease);
- }
- 
-+static
- inline BYTE* pack_TPM_PCR_COMPOSITE(BYTE* ptr, const TPM_PCR_COMPOSITE* p) {
- 	ptr = pack_TPM_PCR_SELECTION(ptr, &p->select);
- 	ptr = pack_UINT32(ptr, p->valueSize);
-@@ -644,12 +701,14 @@ inline BYTE* pack_TPM_PCR_COMPOSITE(BYTE* ptr, const TPM_PCR_COMPOSITE* p) {
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_PCR_COMPOSITE(BYTE* ptr, UINT32* pos, UINT32 max, TPM_PCR_COMPOSITE* p, UnpackPtr alloc) {
- 	return unpack3_TPM_PCR_SELECTION(ptr, pos, max, &p->select, alloc) ||
- 		unpack3_UINT32(ptr, pos, max, &p->valueSize) ||
- 		unpack3_PTR(ptr, pos, max, (BYTE**)&p->pcrValue, p->valueSize, alloc);
- }
- 
-+static
- inline BYTE* pack_TPM_KEY(BYTE* ptr, const TPM_KEY* k) {
- 	ptr = pack_TPM_VERSION(ptr, &k->ver);
- 	ptr = pack_TPM_KEY_USAGE(ptr, k->keyUsage);
-@@ -665,6 +724,7 @@ inline BYTE* pack_TPM_KEY(BYTE* ptr, const TPM_KEY* k) {
- 	return pack_BUFFER(ptr, k->encData, k->encDataSize);
- }
- 
-+static
- inline int unpack3_TPM_KEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_KEY* k, UnpackPtr alloc) {
- 	int rc = unpack3_TPM_VERSION(ptr, pos, max, &k->ver) ||
- 		unpack3_TPM_KEY_USAGE(ptr, pos, max, &k->keyUsage) ||
-@@ -682,6 +742,7 @@ inline int unpack3_TPM_KEY(BYTE* ptr, UINT32* pos, UINT32 max, TPM_KEY* k, Unpac
- 		unpack3_PTR(ptr, pos, max, &k->encData, k->encDataSize, alloc);
- }
- 
-+static
- inline int sizeof_TPM_KEY(const TPM_KEY* k) {
- 	int rc = 0;
- 	rc += sizeof_TPM_VERSION(&k->ver);
-@@ -699,18 +760,21 @@ inline int sizeof_TPM_KEY(const TPM_KEY* k) {
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_BOUND_DATA(BYTE* ptr, const TPM_BOUND_DATA* b, UINT32 payloadSize) {
- 	ptr = pack_TPM_VERSION(ptr, &b->ver);
- 	ptr = pack_TPM_PAYLOAD_TYPE(ptr, b->payload);
- 	return pack_BUFFER(ptr, b->payloadData, payloadSize);
- }
- 
-+static
- inline BYTE* unpack_TPM_BOUND_DATA(BYTE* ptr, TPM_BOUND_DATA* b, UINT32 payloadSize, UnpackPtr alloc) {
- 	ptr = unpack_TPM_VERSION(ptr, &b->ver);
- 	ptr = unpack_TPM_PAYLOAD_TYPE(ptr, &b->payload);
- 	return unpack_PTR(ptr, &b->payloadData, payloadSize, alloc);
- }
- 
-+static
- inline BYTE* pack_TPM_STORED_DATA(BYTE* ptr, const TPM_STORED_DATA* d) {
- 	ptr = pack_TPM_VERSION(ptr, &d->ver);
- 	ptr = pack_UINT32(ptr, d->sealInfoSize);
-@@ -722,6 +786,7 @@ inline BYTE* pack_TPM_STORED_DATA(BYTE* ptr, const TPM_STORED_DATA* d) {
- 	return ptr;
- }
- 
-+static
- inline int sizeof_TPM_STORED_DATA(const TPM_STORED_DATA* d) {
- 	int rv = sizeof_TPM_VERSION(&d->ver) + sizeof_UINT32(d->sealInfoSize);
- 	if (d->sealInfoSize) {
-@@ -732,6 +797,7 @@ inline int sizeof_TPM_STORED_DATA(const TPM_STORED_DATA* d) {
- 	return rv;
- }
- 
-+static
- inline int unpack3_TPM_STORED_DATA(BYTE* ptr, UINT32* pos, UINT32 len, TPM_STORED_DATA* d, UnpackPtr alloc) {
- 	int rc = unpack3_TPM_VERSION(ptr, pos, len, &d->ver) ||
- 		unpack3_UINT32(ptr, pos, len, &d->sealInfoSize);
-@@ -746,6 +812,7 @@ inline int unpack3_TPM_STORED_DATA(BYTE* ptr, UINT32* pos, UINT32 len, TPM_STORE
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_STORED_DATA12(BYTE* ptr, const TPM_STORED_DATA12* d) {
- 	ptr = pack_TPM_STRUCTURE_TAG(ptr, d->tag);
- 	ptr = pack_TPM_ENTITY_TYPE(ptr, d->et);
-@@ -758,6 +825,7 @@ inline BYTE* pack_TPM_STORED_DATA12(BYTE* ptr, const TPM_STORED_DATA12* d) {
- 	return ptr;
- }
- 
-+static
- inline int sizeof_TPM_STORED_DATA12(const TPM_STORED_DATA12* d) {
- 	int rv = sizeof_TPM_STRUCTURE_TAG(&d->ver) +
- 		 sizeof_TPM_ENTITY_TYPE(&d->et) +
-@@ -770,6 +838,7 @@ inline int sizeof_TPM_STORED_DATA12(const TPM_STORED_DATA12* d) {
- 	return rv;
- }
- 
-+static
- inline int unpack3_TPM_STORED_DATA12(BYTE* ptr, UINT32* pos, UINT32 len, TPM_STORED_DATA12* d, UnpackPtr alloc) {
- 	int rc = unpack3_TPM_STRUCTURE_TAG(ptr, pos, len, &d->tag) ||
- 		unpack3_TPM_ENTITY_TYPE(ptr, pos, len, &d->et) ||
-@@ -786,6 +855,7 @@ inline int unpack3_TPM_STORED_DATA12(BYTE* ptr, UINT32* pos, UINT32 len, TPM_STO
- 	return rc;
- }
- 
-+static
- inline BYTE* pack_TPM_AUTH_SESSION(BYTE* ptr, const TPM_AUTH_SESSION* auth) {
- 	ptr = pack_TPM_AUTH_HANDLE(ptr, auth->AuthHandle);
- 	ptr = pack_TPM_NONCE(ptr, &auth->NonceOdd);
-@@ -794,6 +864,7 @@ inline BYTE* pack_TPM_AUTH_SESSION(BYTE* ptr, const TPM_AUTH_SESSION* auth) {
- 	return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM_AUTH_SESSION(BYTE* ptr, TPM_AUTH_SESSION* auth) {
- 	ptr = unpack_TPM_NONCE(ptr, &auth->NonceEven);
- 	ptr = unpack_BOOL(ptr, &auth->fContinueAuthSession);
-@@ -801,6 +872,7 @@ inline BYTE* unpack_TPM_AUTH_SESSION(BYTE* ptr, TPM_AUTH_SESSION* auth) {
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_AUTH_SESSION(BYTE* ptr, UINT32* pos, UINT32 len, TPM_AUTH_SESSION* auth) {
- 	return unpack3_TPM_NONCE(ptr, pos, len, &auth->NonceEven) ||
- 		unpack3_BOOL(ptr, pos, len, &auth->fContinueAuthSession) ||
-@@ -808,6 +880,7 @@ inline int unpack3_TPM_AUTH_SESSION(BYTE* ptr, UINT32* pos, UINT32 len, TPM_AUTH
- }
- 
- 
-+static
- inline int sizeof_TPM_AUTH_SESSION(const TPM_AUTH_SESSION* auth) {
- 	int rv = 0;
- 	rv += sizeof_TPM_AUTH_HANDLE(auth->AuthHandle);
-@@ -817,6 +890,7 @@ inline int sizeof_TPM_AUTH_SESSION(const TPM_AUTH_SESSION* auth) {
- 	return rv;
- }
- 
-+static
- inline BYTE* pack_TPM_RQU_HEADER(BYTE* ptr,
- 		TPM_TAG tag,
- 		UINT32 size,
-@@ -826,6 +900,7 @@ inline BYTE* pack_TPM_RQU_HEADER(BYTE* ptr,
- 	return pack_UINT32(ptr, ord);
- }
- 
-+static
- inline BYTE* unpack_TPM_RQU_HEADER(BYTE* ptr,
- 		TPM_TAG* tag,
- 		UINT32* size,
-@@ -836,6 +911,7 @@ inline BYTE* unpack_TPM_RQU_HEADER(BYTE* ptr,
- 	return ptr;
- }
- 
-+static
- inline int unpack3_TPM_RQU_HEADER(BYTE* ptr, UINT32* pos, UINT32 max,
- 		TPM_TAG* tag, UINT32* size, TPM_COMMAND_CODE* ord) {
- 	return
-diff --git a/stubdom/vtpmmgr/tcg.h b/stubdom/vtpmmgr/tcg.h
-index 813ce57a2d..423131dc25 100644
---- a/stubdom/vtpmmgr/tcg.h
-+++ b/stubdom/vtpmmgr/tcg.h
-@@ -461,6 +461,7 @@ typedef struct TPM_CAP_VERSION_INFO {
-    BYTE* vendorSpecific;
- } TPM_CAP_VERSION_INFO;
- 
-+static
- inline void free_TPM_CAP_VERSION_INFO(TPM_CAP_VERSION_INFO* v) {
-    free(v->vendorSpecific);
-    v->vendorSpecific = NULL;
-@@ -494,6 +495,7 @@ typedef struct TPM_SYMMETRIC_KEY {
-    BYTE* data;
- } TPM_SYMMETRIC_KEY;
- 
-+static
- inline void free_TPM_SYMMETRIC_KEY_PARMS(TPM_SYMMETRIC_KEY_PARMS* p) {
-    free(p->IV);
-    p->IV = NULL;
-@@ -510,6 +512,7 @@ typedef struct TPM_RSA_KEY_PARMS {
- 
- #define TPM_RSA_KEY_PARMS_INIT { 0, 0, 0, NULL }
- 
-+static
- inline void free_TPM_RSA_KEY_PARMS(TPM_RSA_KEY_PARMS* p) {
-    free(p->exponent);
-    p->exponent = NULL;
-@@ -528,6 +531,7 @@ typedef struct TPM_KEY_PARMS {
- 
- #define TPM_KEY_PARMS_INIT { 0, 0, 0, 0 }
- 
-+static
- inline void free_TPM_KEY_PARMS(TPM_KEY_PARMS* p) {
-    if(p->parmSize) {
-       switch(p->algorithmID) {
-@@ -550,6 +554,7 @@ typedef struct TPM_STORE_PUBKEY {
- 
- #define TPM_STORE_PUBKEY_INIT { 0, NULL }
- 
-+static
- inline void free_TPM_STORE_PUBKEY(TPM_STORE_PUBKEY* p) {
-    free(p->key);
-    p->key = NULL;
-@@ -562,6 +567,7 @@ typedef struct TPM_PUBKEY {
- 
- #define TPM_PUBKEY_INIT { TPM_KEY_PARMS_INIT, TPM_STORE_PUBKEY_INIT }
- 
-+static
- inline void free_TPM_PUBKEY(TPM_PUBKEY* k) {
-    free_TPM_KEY_PARMS(&k->algorithmParms);
-    free_TPM_STORE_PUBKEY(&k->pubKey);
-@@ -574,6 +580,7 @@ typedef struct TPM_PCR_SELECTION {
- 
- #define TPM_PCR_SELECTION_INIT { 0, NULL }
- 
-+static
- inline void free_TPM_PCR_SELECTION(TPM_PCR_SELECTION* p) {
-    free(p->pcrSelect);
-    p->pcrSelect = NULL;
-@@ -594,6 +601,7 @@ typedef struct TPM_PCR_INFO_LONG {
- #define TPM_PCR_INFO_LONG_INIT { 0, 0, 0, TPM_PCR_SELECTION_INIT, \
-                                  TPM_PCR_SELECTION_INIT }
- 
-+static
- inline void free_TPM_PCR_INFO_LONG(TPM_PCR_INFO_LONG* p) {
-    free_TPM_PCR_SELECTION(&p->creationPCRSelection);
-    free_TPM_PCR_SELECTION(&p->releasePCRSelection);
-@@ -607,6 +615,7 @@ typedef struct TPM_PCR_INFO {
- 
- #define TPM_PCR_INFO_INIT { TPM_PCR_SELECTION_INIT }
- 
-+static
- inline void free_TPM_PCR_INFO(TPM_PCR_INFO* p) {
-    free_TPM_PCR_SELECTION(&p->pcrSelection);
- }
-@@ -619,6 +628,7 @@ typedef struct TPM_PCR_COMPOSITE {
- 
- #define TPM_PCR_COMPOSITE_INIT { TPM_PCR_SELECTION_INIT, 0, NULL }
- 
-+static
- inline void free_TPM_PCR_COMPOSITE(TPM_PCR_COMPOSITE* p) {
-    free_TPM_PCR_SELECTION(&p->select);
-    free(p->pcrValue);
-@@ -643,6 +653,7 @@ typedef struct TPM_KEY {
-    .pubKey = TPM_STORE_PUBKEY_INIT, \
-    .encDataSize = 0, .encData = NULL }
- 
-+static
- inline void free_TPM_KEY(TPM_KEY* k) {
-    if(k->PCRInfoSize) {
-       free_TPM_PCR_INFO(&k->PCRInfo);
-@@ -660,6 +671,7 @@ typedef struct TPM_BOUND_DATA {
- 
- #define TPM_BOUND_DATA_INIT { .payloadData = NULL }
- 
-+static
- inline void free_TPM_BOUND_DATA(TPM_BOUND_DATA* d) {
-    free(d->payloadData);
-    d->payloadData = NULL;
-@@ -676,6 +688,7 @@ typedef struct TPM_STORED_DATA {
- #define TPM_STORED_DATA_INIT { .sealInfoSize = 0, sealInfo = TPM_PCR_INFO_INIT,\
-    .encDataSize = 0, .encData = NULL }
- 
-+static
- inline void free_TPM_STORED_DATA(TPM_STORED_DATA* d) {
-    if(d->sealInfoSize) {
-       free_TPM_PCR_INFO(&d->sealInfo);
-@@ -696,6 +709,7 @@ typedef struct TPM_STORED_DATA12 {
- #define TPM_STORED_DATA12_INIT { .sealInfoLongSize = 0, \
-    sealInfoLong = TPM_PCR_INFO_INIT, .encDataSize = 0, .encData = NULL }
- 
-+static
- inline void free_TPM_STORED_DATA12(TPM_STORED_DATA12* d) {
-    if(d->sealInfoLongSize) {
-       free_TPM_PCR_INFO_LONG(&d->sealInfoLong);
-diff --git a/stubdom/vtpmmgr/tpm2_marshal.h b/stubdom/vtpmmgr/tpm2_marshal.h
-index aaa44645a2..ba070ad38e 100644
---- a/stubdom/vtpmmgr/tpm2_marshal.h
-+++ b/stubdom/vtpmmgr/tpm2_marshal.h
-@@ -52,6 +52,7 @@
- #define pack_TPM_BUFFER(ptr, buf, size) pack_BUFFER(ptr, buf, size)
- #define unpack_TPM_BUFFER(ptr, buf, size) unpack_BUFFER(ptr, buf, size)
- 
-+static
- inline BYTE* pack_BYTE_ARRAY(BYTE* ptr, const BYTE* array, UINT32 size)
- {
-     int i;
-@@ -60,21 +61,25 @@ inline BYTE* pack_BYTE_ARRAY(BYTE* ptr, const BYTE* array, UINT32 size)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMA_SESSION(BYTE* ptr, const TPMA_SESSION *attr)
- {
-     return pack_BYTE(ptr, (BYTE)(*attr));
- }
- 
-+static
- inline BYTE* unpack_TPMA_SESSION(BYTE* ptr, TPMA_SESSION *attr)
- {
-     return unpack_BYTE(ptr, (BYTE *)attr);
- }
- 
-+static
- inline BYTE* pack_TPMI_ALG_HASH(BYTE* ptr, const TPMI_ALG_HASH *hash)
- {
-     return pack_UINT16(ptr, *hash);
- }
- 
-+static
- inline BYTE* unpack_TPMI_ALG_HASH(BYTE *ptr, TPMI_ALG_HASH *hash)
- {
-     return unpack_UINT16(ptr, hash);
-@@ -125,6 +130,7 @@ inline BYTE* unpack_TPMI_ALG_HASH(BYTE *ptr, TPMI_ALG_HASH *hash)
- #define pack_TPMI_RH_LOCKOUT(ptr, l)            pack_TPM2_HANDLE(ptr, l)
- #define unpack_TPMI_RH_LOCKOUT(ptr, l)          unpack_TPM2_HANDLE(ptr, l)
- 
-+static
- inline BYTE* pack_TPM2B_DIGEST(BYTE* ptr, const TPM2B_DIGEST *digest)
- {
-     ptr = pack_UINT16(ptr, digest->size);
-@@ -132,6 +138,7 @@ inline BYTE* pack_TPM2B_DIGEST(BYTE* ptr, const TPM2B_DIGEST *digest)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_DIGEST(BYTE* ptr, TPM2B_DIGEST *digest)
- {
-     ptr = unpack_UINT16(ptr, &digest->size);
-@@ -139,6 +146,7 @@ inline BYTE* unpack_TPM2B_DIGEST(BYTE* ptr, TPM2B_DIGEST *digest)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMT_TK_CREATION(BYTE* ptr,const TPMT_TK_CREATION *ticket )
- {
-     ptr = pack_TPM_ST(ptr , &ticket->tag);
-@@ -147,6 +155,7 @@ inline BYTE* pack_TPMT_TK_CREATION(BYTE* ptr,const TPMT_TK_CREATION *ticket )
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMT_TK_CREATION(BYTE* ptr, TPMT_TK_CREATION *ticket )
- {
-     ptr = unpack_TPM_ST(ptr, &ticket->tag);
-@@ -155,6 +164,7 @@ inline BYTE* unpack_TPMT_TK_CREATION(BYTE* ptr, TPMT_TK_CREATION *ticket )
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_NAME(BYTE* ptr,const TPM2B_NAME *name )
- {
-     ptr = pack_UINT16(ptr, name->size);
-@@ -162,6 +172,7 @@ inline BYTE* pack_TPM2B_NAME(BYTE* ptr,const TPM2B_NAME *name )
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_NAME(BYTE* ptr, TPM2B_NAME *name)
- {
-     ptr = unpack_UINT16(ptr, &name->size);
-@@ -169,6 +180,7 @@ inline BYTE* unpack_TPM2B_NAME(BYTE* ptr, TPM2B_NAME *name)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_NONCE(BYTE* ptr, const TPM2B_NONCE *nonce)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)nonce);
-@@ -176,6 +188,7 @@ inline BYTE* pack_TPM2B_NONCE(BYTE* ptr, const TPM2B_NONCE *nonce)
- 
- #define unpack_TPM2B_NONCE(ptr, nonce)  unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)nonce)
- 
-+static
- inline BYTE* pack_TPM2B_AUTH(BYTE* ptr, const TPM2B_AUTH *auth)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)auth);
-@@ -183,6 +196,7 @@ inline BYTE* pack_TPM2B_AUTH(BYTE* ptr, const TPM2B_AUTH *auth)
- 
- #define unpack_TPM2B_AUTH(ptr, auth)    unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)auth)
- 
-+static
- inline BYTE* pack_TPM2B_DATA(BYTE* ptr, const TPM2B_DATA *data)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)data);
-@@ -190,6 +204,7 @@ inline BYTE* pack_TPM2B_DATA(BYTE* ptr, const TPM2B_DATA *data)
- 
- #define unpack_TPM2B_DATA(ptr, data)    unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)data)
- 
-+static
- inline BYTE* pack_TPM2B_SENSITIVE_DATA(BYTE* ptr, const TPM2B_SENSITIVE_DATA *data)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)data);
-@@ -197,6 +212,7 @@ inline BYTE* pack_TPM2B_SENSITIVE_DATA(BYTE* ptr, const TPM2B_SENSITIVE_DATA *da
- 
- #define unpack_TPM2B_SENSITIVE_DATA(ptr, data)  unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)data)
- 
-+static
- inline BYTE* pack_TPM2B_PUBLIC_KEY_RSA(BYTE* ptr, const TPM2B_PUBLIC_KEY_RSA *rsa)
- {
-     return pack_TPM2B_DIGEST(ptr, (const TPM2B_DIGEST*)rsa);
-@@ -204,6 +220,7 @@ inline BYTE* pack_TPM2B_PUBLIC_KEY_RSA(BYTE* ptr, const TPM2B_PUBLIC_KEY_RSA *rs
- 
- #define unpack_TPM2B_PUBLIC_KEY_RSA(ptr, rsa)   unpack_TPM2B_DIGEST(ptr, (TPM2B_DIGEST*)rsa)
- 
-+static
- inline BYTE* pack_TPM2B_PRIVATE(BYTE* ptr, const TPM2B_PRIVATE *Private)
- {
-     ptr = pack_UINT16(ptr, Private->size);
-@@ -211,6 +228,7 @@ inline BYTE* pack_TPM2B_PRIVATE(BYTE* ptr, const TPM2B_PRIVATE *Private)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_PRIVATE(BYTE* ptr, TPM2B_PRIVATE *Private)
- {
-     ptr = unpack_UINT16(ptr, &Private->size);
-@@ -218,6 +236,7 @@ inline BYTE* unpack_TPM2B_PRIVATE(BYTE* ptr, TPM2B_PRIVATE *Private)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_PCR_SELECTION_ARRAY(BYTE* ptr, const TPMS_PCR_SELECTION *sel, UINT32 count)
- {
-     int i;
-@@ -229,6 +248,7 @@ inline BYTE* pack_TPMS_PCR_SELECTION_ARRAY(BYTE* ptr, const TPMS_PCR_SELECTION *
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMS_PCR_SELECTION_ARRAY(BYTE* ptr, TPMS_PCR_SELECTION *sel, UINT32 count)
- {
-     int i;
-@@ -240,6 +260,7 @@ inline BYTE* unpack_TPMS_PCR_SELECTION_ARRAY(BYTE* ptr, TPMS_PCR_SELECTION *sel,
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPML_PCR_SELECTION(BYTE* ptr, const TPML_PCR_SELECTION *sel)
- {
-     ptr = pack_UINT32(ptr, sel->count);
-@@ -247,6 +268,7 @@ inline BYTE* pack_TPML_PCR_SELECTION(BYTE* ptr, const TPML_PCR_SELECTION *sel)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPML_PCR_SELECTION(BYTE* ptr, TPML_PCR_SELECTION *sel)
- {
-     ptr = unpack_UINT32(ptr, &sel->count);
-@@ -254,6 +276,7 @@ inline BYTE* unpack_TPML_PCR_SELECTION(BYTE* ptr, TPML_PCR_SELECTION *sel)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPML_DIGEST(BYTE* ptr,TPML_DIGEST *digest)
- {
-     int i;
-@@ -265,6 +288,7 @@ inline BYTE* unpack_TPML_DIGEST(BYTE* ptr,TPML_DIGEST *digest)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_CREATION_DATA(BYTE* ptr,const TPMS_CREATION_DATA *data)
- {
-     ptr = pack_TPML_PCR_SELECTION(ptr, &data->pcrSelect);
-@@ -276,6 +300,7 @@ inline BYTE* pack_TPMS_CREATION_DATA(BYTE* ptr,const TPMS_CREATION_DATA *data)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMS_CREATION_DATA(BYTE* ptr, TPMS_CREATION_DATA *data)
- {
-     ptr = unpack_TPML_PCR_SELECTION(ptr, &data->pcrSelect);
-@@ -288,6 +313,7 @@ inline BYTE* unpack_TPMS_CREATION_DATA(BYTE* ptr, TPMS_CREATION_DATA *data)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_CREATION_DATA(BYTE* ptr, const TPM2B_CREATION_DATA *data )
- {
-     ptr = pack_UINT16(ptr, data->size);
-@@ -295,6 +321,7 @@ inline BYTE* pack_TPM2B_CREATION_DATA(BYTE* ptr, const TPM2B_CREATION_DATA *data
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_CREATION_DATA(BYTE* ptr, TPM2B_CREATION_DATA * data)
- {
-     ptr = unpack_UINT16(ptr, &data->size);
-@@ -302,6 +329,7 @@ inline BYTE* unpack_TPM2B_CREATION_DATA(BYTE* ptr, TPM2B_CREATION_DATA * data)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_SENSITIVE_CREATE(BYTE* ptr, const TPMS_SENSITIVE_CREATE *create)
- {
-     ptr = pack_TPM2B_AUTH(ptr, &create->userAuth);
-@@ -309,6 +337,7 @@ inline BYTE* pack_TPMS_SENSITIVE_CREATE(BYTE* ptr, const TPMS_SENSITIVE_CREATE *
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_SENSITIVE_CREATE(BYTE* ptr, const TPM2B_SENSITIVE_CREATE *create)
- {
-     BYTE* sizePtr = ptr;
-@@ -318,6 +347,7 @@ inline BYTE* pack_TPM2B_SENSITIVE_CREATE(BYTE* ptr, const TPM2B_SENSITIVE_CREATE
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMU_SYM_MODE(BYTE* ptr, const TPMU_SYM_MODE *p,
-                                 const TPMI_ALG_SYM_OBJECT *sel)
- {
-@@ -336,6 +366,7 @@ inline BYTE* pack_TPMU_SYM_MODE(BYTE* ptr, const TPMU_SYM_MODE *p,
-     }
-     return ptr;
- }
-+static
- inline BYTE* unpack_TPMU_SYM_MODE(BYTE* ptr, TPMU_SYM_MODE *p,
-                                   const TPMI_ALG_SYM_OBJECT *sel)
- {
-@@ -355,6 +386,7 @@ inline BYTE* unpack_TPMU_SYM_MODE(BYTE* ptr, TPMU_SYM_MODE *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMU_SYM_KEY_BITS(BYTE* ptr, const TPMU_SYM_KEY_BITS *p,
-                                     const TPMI_ALG_SYM_OBJECT *sel)
- {
-@@ -376,6 +408,7 @@ inline BYTE* pack_TPMU_SYM_KEY_BITS(BYTE* ptr, const TPMU_SYM_KEY_BITS *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMU_SYM_KEY_BITS(BYTE* ptr, TPMU_SYM_KEY_BITS *p,
-                                       const TPMI_ALG_SYM_OBJECT *sel)
- {
-@@ -397,6 +430,7 @@ inline BYTE* unpack_TPMU_SYM_KEY_BITS(BYTE* ptr, TPMU_SYM_KEY_BITS *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMT_SYM_DEF_OBJECT(BYTE* ptr, const TPMT_SYM_DEF_OBJECT *p)
- {
-     ptr = pack_TPMI_ALG_SYM_OBJECT(ptr, &p->algorithm);
-@@ -405,6 +439,7 @@ inline BYTE* pack_TPMT_SYM_DEF_OBJECT(BYTE* ptr, const TPMT_SYM_DEF_OBJECT *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMT_SYM_DEF_OBJECT(BYTE *ptr, TPMT_SYM_DEF_OBJECT *p)
- {
-     ptr = unpack_TPMI_ALG_SYM_OBJECT(ptr, &p->algorithm);
-@@ -416,6 +451,7 @@ inline BYTE* unpack_TPMT_SYM_DEF_OBJECT(BYTE *ptr, TPMT_SYM_DEF_OBJECT *p)
- #define pack_TPMS_SCHEME_OAEP(p, t)     pack_TPMI_ALG_HASH(p, &((t)->hashAlg))
- #define unpack_TPMS_SCHEME_OAEP(p, t)   unpack_TPMI_ALG_HASH(p, &((t)->hashAlg))
- 
-+static
- inline BYTE* pack_TPMU_ASYM_SCHEME(BYTE *ptr, const TPMU_ASYM_SCHEME *p,
-                                    const TPMI_ALG_RSA_SCHEME *s)
- {
-@@ -438,6 +474,7 @@ inline BYTE* pack_TPMU_ASYM_SCHEME(BYTE *ptr, const TPMU_ASYM_SCHEME *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMU_ASYM_SCHEME(BYTE *ptr, TPMU_ASYM_SCHEME *p,
-                                      const TPMI_ALG_RSA_SCHEME *s)
- {
-@@ -462,6 +499,7 @@ inline BYTE* unpack_TPMU_ASYM_SCHEME(BYTE *ptr, TPMU_ASYM_SCHEME *p,
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMT_RSA_SCHEME(BYTE* ptr, const TPMT_RSA_SCHEME *p)
- {
-     ptr = pack_TPMI_ALG_RSA_SCHEME(ptr, &p->scheme);
-@@ -469,6 +507,7 @@ inline BYTE* pack_TPMT_RSA_SCHEME(BYTE* ptr, const TPMT_RSA_SCHEME *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMT_RSA_SCHEME(BYTE* ptr, TPMT_RSA_SCHEME *p)
- {
-     ptr = unpack_TPMI_ALG_RSA_SCHEME(ptr, &p->scheme);
-@@ -476,6 +515,7 @@ inline BYTE* unpack_TPMT_RSA_SCHEME(BYTE* ptr, TPMT_RSA_SCHEME *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMT_RSA_DECRYPT(BYTE* ptr, const TPMT_RSA_DECRYPT *p)
- {
-     ptr = pack_TPMI_ALG_RSA_SCHEME(ptr, &p->scheme);
-@@ -483,6 +523,7 @@ inline BYTE* pack_TPMT_RSA_DECRYPT(BYTE* ptr, const TPMT_RSA_DECRYPT *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_RSA_PARMS(BYTE* ptr, const TPMS_RSA_PARMS *p)
- {
-     ptr = pack_TPMT_SYM_DEF_OBJECT(ptr, &p->symmetric);
-@@ -492,6 +533,7 @@ inline BYTE* pack_TPMS_RSA_PARMS(BYTE* ptr, const TPMS_RSA_PARMS *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMS_RSA_PARMS(BYTE *ptr, TPMS_RSA_PARMS *p)
- {
-     ptr = unpack_TPMT_SYM_DEF_OBJECT(ptr, &p->symmetric);
-@@ -501,6 +543,7 @@ inline BYTE* unpack_TPMS_RSA_PARMS(BYTE *ptr, TPMS_RSA_PARMS *p)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMU_PUBLIC_PARMS(BYTE* ptr, const TPMU_PUBLIC_PARMS *param,
-                                     const TPMI_ALG_PUBLIC *selector)
- {
-@@ -518,6 +561,7 @@ inline BYTE* pack_TPMU_PUBLIC_PARMS(BYTE* ptr, const TPMU_PUBLIC_PARMS *param,
-     return NULL;
- }
- 
-+static
- inline BYTE* unpack_TPMU_PUBLIC_PARMS(BYTE* ptr, TPMU_PUBLIC_PARMS *param,
-                                       const TPMI_ALG_PUBLIC *selector)
- {
-@@ -535,18 +579,21 @@ inline BYTE* unpack_TPMU_PUBLIC_PARMS(BYTE* ptr, TPMU_PUBLIC_PARMS *param,
-     return NULL;
- }
- 
-+static
- inline BYTE* pack_TPMS_ECC_POINT(BYTE* ptr, const TPMS_ECC_POINT *point)
- {
-     assert(false);
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMS_ECC_POINT(BYTE* ptr, TPMS_ECC_POINT *point)
- {
-     assert(false);
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMU_PUBLIC_ID(BYTE* ptr, const TPMU_PUBLIC_ID *id,
-                                  const TPMI_ALG_PUBLIC *selector)
- {
-@@ -564,6 +611,7 @@ inline BYTE* pack_TPMU_PUBLIC_ID(BYTE* ptr, const TPMU_PUBLIC_ID *id,
-     return NULL;
- }
- 
-+static
- inline BYTE* unpack_TPMU_PUBLIC_ID(BYTE* ptr, TPMU_PUBLIC_ID *id, TPMI_ALG_PUBLIC *selector)
- {
-     switch (*selector) {
-@@ -580,6 +628,7 @@ inline BYTE* unpack_TPMU_PUBLIC_ID(BYTE* ptr, TPMU_PUBLIC_ID *id, TPMI_ALG_PUBLI
-     return NULL;
- }
- 
-+static
- inline BYTE* pack_TPMT_PUBLIC(BYTE* ptr, const TPMT_PUBLIC *public)
- {
-     ptr = pack_TPMI_ALG_PUBLIC(ptr, &public->type);
-@@ -591,6 +640,7 @@ inline BYTE* pack_TPMT_PUBLIC(BYTE* ptr, const TPMT_PUBLIC *public)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPMT_PUBLIC(BYTE* ptr, TPMT_PUBLIC *public)
- {
-     ptr = unpack_TPMI_ALG_PUBLIC(ptr, &public->type);
-@@ -602,6 +652,7 @@ inline BYTE* unpack_TPMT_PUBLIC(BYTE* ptr, TPMT_PUBLIC *public)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2B_PUBLIC(BYTE* ptr, const TPM2B_PUBLIC *public)
- {
-     BYTE *sizePtr = ptr;
-@@ -611,6 +662,7 @@ inline BYTE* pack_TPM2B_PUBLIC(BYTE* ptr, const TPM2B_PUBLIC *public)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2B_PUBLIC(BYTE* ptr, TPM2B_PUBLIC *public)
- {
-     ptr = unpack_UINT16(ptr, &public->size);
-@@ -618,6 +670,7 @@ inline BYTE* unpack_TPM2B_PUBLIC(BYTE* ptr, TPM2B_PUBLIC *public)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_PCR_SELECTION(BYTE* ptr, const TPMS_PCR_SELECTION *selection)
- {
-     ptr = pack_TPMI_ALG_HASH(ptr, &selection->hash);
-@@ -626,6 +679,7 @@ inline BYTE* pack_TPMS_PCR_SELECTION(BYTE* ptr, const TPMS_PCR_SELECTION *select
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPMS_PCR_SELECTION_Array(BYTE* ptr, const TPMS_PCR_SELECTION *selections,
-                                            const UINT32 cnt)
- {
-@@ -635,6 +689,7 @@ inline BYTE* pack_TPMS_PCR_SELECTION_Array(BYTE* ptr, const TPMS_PCR_SELECTION *
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM_AuthArea(BYTE* ptr, const TPM_AuthArea *auth)
- {
-     BYTE* sizePtr = ptr;
-@@ -647,6 +702,7 @@ inline BYTE* pack_TPM_AuthArea(BYTE* ptr, const TPM_AuthArea *auth)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM_AuthArea(BYTE* ptr, TPM_AuthArea *auth)
- {
-     ptr = unpack_UINT32(ptr, &auth->size);
-@@ -657,6 +713,7 @@ inline BYTE* unpack_TPM_AuthArea(BYTE* ptr, TPM_AuthArea *auth)
-     return ptr;
- }
- 
-+static
- inline BYTE* pack_TPM2_RSA_KEY(BYTE* ptr, const TPM2_RSA_KEY *key)
- {
-     ptr = pack_TPM2B_PRIVATE(ptr, &key->Private);
-@@ -664,6 +721,7 @@ inline BYTE* pack_TPM2_RSA_KEY(BYTE* ptr, const TPM2_RSA_KEY *key)
-     return ptr;
- }
- 
-+static
- inline BYTE* unpack_TPM2_RSA_KEY(BYTE* ptr, TPM2_RSA_KEY *key)
- {
-     ptr = unpack_TPM2B_PRIVATE(ptr, &key->Private);
-diff --git a/stubdom/vtpmmgr/tpmrsa.h b/stubdom/vtpmmgr/tpmrsa.h
-index 08213bbb7a..65fd32a45c 100644
---- a/stubdom/vtpmmgr/tpmrsa.h
-+++ b/stubdom/vtpmmgr/tpmrsa.h
-@@ -62,6 +62,7 @@ TPM_RESULT tpmrsa_pub_encrypt_oaep( tpmrsa_context *ctx,
-       unsigned char *output );
- 
- /* free tpmrsa key */
-+static
- inline void tpmrsa_free( tpmrsa_context *ctx ) {
-    mpi_free( &ctx->RN ); mpi_free( &ctx->E  ); mpi_free( &ctx->N  );
- }
-
-_______________________________________________
-Xen-devel mailing list
-Xen-devel@lists.xen.org
-https://lists.xen.org/xen-devel
diff --git a/pcr/xen/patch-ipxe-patches-series.patch b/pcr/xen/patch-ipxe-patches-series.patch
deleted file mode 100644
index 30e916417..000000000
--- a/pcr/xen/patch-ipxe-patches-series.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: [PATCH] Fix gcc7 warn
-
----
- tools/firmware/etherboot/patches/series | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/firmware/etherboot/patches/series b/tools/firmware/etherboot/patches/series
-index 86cb300..780c6c6 100644
---- a/tools/firmware/etherboot/patches/series
-+++ b/tools/firmware/etherboot/patches/series
-@@ -1 +1,4 @@
- boot_prompt_option.patch
-+patch-inbuild-ipxe-gcc7-implicit-fallthrough.patch
-+patch-inbuild-ipxe-gcc7-implicit-fallthrough-ath5k.patch
-+patch-inbuild-ipxe-gcc7-implicit-fallthrough-curses.patch
--- 
-2.13.0
-
diff --git a/pcr/xen/patch-ovmf-apply-inbuild-patches.patch b/pcr/xen/patch-ovmf-apply-inbuild-patches.patch
deleted file mode 100644
index 2c2f3ed75..000000000
--- a/pcr/xen/patch-ovmf-apply-inbuild-patches.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 088d0d605131eeb43dc1c4ab21631ea7e51f8501 Mon Sep 17 00:00:00 2001
-From: John Thomson <git@johnthomson.fastmail.com.au>
-Date: Sat, 24 Jun 2017 09:38:13 +1000
-Subject: [PATCH] Fix OVMF apply patches series
-
----
- tools/firmware/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
-index a5a6802..875e7e5 100644
---- a/tools/firmware/Makefile
-+++ b/tools/firmware/Makefile
-@@ -20,6 +20,9 @@ ovmf-dir:
- 	sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/BinWrappers/PosixLike"/* || true
- 	sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/Tests/GNUmakefile"
- 	cp ovmf-makefile ovmf-dir/Makefile;
-+	for i in $$(cat ovmf-patches/series); do \
-+		patch -d ovmf-dir -Np1 < ovmf-patches/$$i || exit 1; \
-+	done
- 
- seabios-dir:
- 	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir
--- 
-2.13.1
-
diff --git a/pcr/xen/patch-ovmf-patches-series.patch b/pcr/xen/patch-ovmf-patches-series.patch
deleted file mode 100644
index 0f230e504..000000000
--- a/pcr/xen/patch-ovmf-patches-series.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 30f9f61c42b9530332a856a5bc09db52c446289d Mon Sep 17 00:00:00 2001
-From: John Thomson <git@johnthomson.fastmail.com.au>
-Date: Sat, 24 Jun 2017 09:48:02 +1000
-Subject: [PATCH] Add ovmf patches series file
-
----
- tools/firmware/ovmf-patches/series | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 tools/firmware/ovmf-patches/series
-
-diff --git a/tools/firmware/ovmf-patches/series b/tools/firmware/ovmf-patches/series
-new file mode 100644
-index 0000000..ac6bda5
---- /dev/null
-+++ b/tools/firmware/ovmf-patches/series
-@@ -0,0 +1 @@
-+patch-inbuild-ovmf-5-hiilib.c-pointer-zero.patch
--- 
-2.13.1
-
diff --git a/pcr/xen/xen.install b/pcr/xen/xen.install
index f629e6643..2c03573e7 100644
--- a/pcr/xen/xen.install
+++ b/pcr/xen/xen.install
@@ -34,7 +34,6 @@ GRUB_DEFAULT="xen-gnulinux-simple-a-unique-id-from-your-grub-goes-here"
 run grub-mkconfig
 
 ##########
-
 Direct EFI boot preperation:
 Create a xen.cfg file in the same directory as xen.efi.
 These need to be in ESP, or in a directory accessible from you EFI bootloader.
@@ -54,6 +53,7 @@ install_msg() {
 
 In order to complete the installation, and enable Xen,
 at the very least you must:
+
 1. Configure your bootloader to boot Xen:
 __EOF__
     xen_boot
author	fauno <fauno@endefensadelsl.org>	2018-01-06 19:31:57 -0300
committer	fauno <fauno@endefensadelsl.org>	2018-01-06 19:31:57 -0300
commit	685d3ca91babdbb7e4efed88a75fe776a593b725 (patch)
tree	0f1add3030cce7d571023522cbf9b78a11c3fc74 /pcr
parent	b3fae2f65c48f17b2c5b534b768ca0607b9e800d (diff)
parent	8161eec2a2b550802274afaf9b162195053814f2 (diff)
download	abslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.tar.gz abslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.tar.bz2 abslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.zip