8 files changed, 172 insertions, 71 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index faea533e0..e939c59a5 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'armv7h')
 url="https://www.github.com/systemd/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
-             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-libre-api-headers'
+             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'git')
 makedepends_i686=('gnu-efi-libs')
 makedepends_x86_64=('gnu-efi-libs')
@@ -73,45 +73,57 @@ _backports=(
   '3d4cf7de48a74726694abbaa09f9804b845ff3ba'  # build-sys: check for lz4 in the old and new numbering scheme (#4717)
 )
 
-#_validate_tag() {
-#  local success fingerprint trusted status tag=v$pkgver
-#
-#  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
-#
-#  if (( ! success )); then
-#    error 'failed to validate tag %s\n' "$tag"
-#    return 1
-#  fi
-#
-#  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
-#    error 'unknown or untrusted public key: %s\n' "$fingerprint"
-#    return 1
-#  fi
-#
-#  case $status in
-#    'expired')
-#      warning 'the signature has expired'
-#      ;;
-#    'expiredkey')
-#      warning 'the key has expired'
-#      ;;
-#  esac
-#
-#  return 0
-#}
+_validate_tag() {
+  local success fingerprint trusted status tag=v$pkgver
+
+  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
+
+  if (( ! success )); then
+    error 'failed to validate tag %s\n' "$tag"
+    return 1
+  fi
+
+  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
+    error 'unknown or untrusted public key: %s\n' "$fingerprint"
+    return 1
+  fi
+
+  case $status in
+    'expired')
+      warning 'the signature has expired'
+      ;;
+    'expiredkey')
+      warning 'the key has expired'
+      ;;
+  esac
+
+  return 0
+}
 
 prepare() {
   cd "$pkgbase"
 
-#  _validate_tag || return
+  _validate_tag || return
 
   if (( ${#_backports[*]} > 0 )); then
     git cherry-pick -n "${_backports[@]}"
   fi
 
-  # apply FSDG and another patches
+  # https://github.com/systemd/systemd/issues/4789
+  patch -Np1 <../0001-nspawn-don-t-hide-bind-tmp-mounts.patch
+
+  # these patches aren't upstream, but they make v232 more useable.
+
+  # https://github.com/systemd/systemd/issues/4575
+  patch -Np1 <../0001-disable-RestrictAddressFamilies-on-i686.patch
+
+  # https://github.com/systemd/systemd/issues/4595
+  # https://github.com/systemd/systemd/issues/3826
+  patch -Np1 <../0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch
+
+  # apply FSDG patches
   local patchfile
-  for patchfile in "$srcdir"/*.patch; do
+  for patchfile in "$srcdir"/????-FSDG-*.patch; do
     patch -Np1 -i "$patchfile"
   done
 
@@ -132,18 +144,12 @@ build() {
     CXXFLAGS+=" -fno-lto"
   fi
 
-  local enable_gnuefi=''
-  if [ "$CARCH" != "armv7h" ]; then
-    enable_gnuefi='--enable-gnuefi'
-  fi
-
   local configure_options=(
     --libexecdir=/usr/lib
     --localstatedir=/var
     --sysconfdir=/etc
 
     --enable-lz4
-    $enable_gnuefi
     --disable-audit
     --disable-ima
 
@@ -154,6 +160,9 @@ build() {
     --with-dbuspolicydir=/usr/share/dbus-1/system.d
     --without-kill-user-processes
   )
+  if [ "$CARCH" != "armv7h" ]; then
+    configure_options+=(--enable-gnuefi)
+  fi
 
   ./configure "${configure_options[@]}"
 
diff --git a/pcr/pristine-etc-keeper-git/PKGBUILD b/pcr/pristine-etc-keeper-git/PKGBUILD
index cd26eec8e..f40e3cfff 100644
--- a/pcr/pristine-etc-keeper-git/PKGBUILD
+++ b/pcr/pristine-etc-keeper-git/PKGBUILD
@@ -2,21 +2,27 @@
 
 _pkgname=pristine-etc-keeper
 pkgname=$_pkgname-git
-pkgver=20161230
-_gitver=c05d5042ce2fcb5174e808e6439b624edcc28fb4
+pkgver=20170128
+_gitver='commit=78705062cfd1a17db1ef994ee6c48925060c6f29'
 url=https://git.parabola.nu/~lukeshu/$_pkgname.git
 license=('WTFPL')
 
+provides=($_pkgname)
+conflicts=($_pkgname)
+
 pkgrel=1
 arch=(any)
 depends=(etckeeper)
-provides=($_pkgname)
-conflicts=($_pkgname)
+optdepends=('holo-files: For holo-files integration')
+backup=(
+	'etc/etckeeper/pristine/fill'
+	'etc/etckeeper/pristine/drain'
+)
 source=(https://repo.parabola.nu/other/~lukeshu/$_pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('5d02bd1ef7eb5b4990fdb8871af231cc')
+md5sums=('a4957597192a5f4ba5adc87165395d67')
 
 # git:// is broken for user repos on git.parabola.nu right now
-mksource=("$pkgname-$pkgver::git+https://git.parabola.nu/~lukeshu/pristine-etc-keeper.git#commit=$_gitver")
+mksource=("$pkgname-$pkgver::git+https://git.parabola.nu/~lukeshu/pristine-etc-keeper.git#$_gitver")
 mkmd5sums=('SKIP')
 
 package() {
diff --git a/~lukeshu/.gitignore b/~lukeshu/.gitignore
deleted file mode 100644
index db32297d9..000000000
--- a/~lukeshu/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# probably source downloads
-*.tar.gz
-*.tar.xz
-*.tar.bz2
-*.tgz
-*.zip
diff --git a/~lukeshu/emacsutils-git/PKGBUILD b/~lukeshu/emacsutils-git/PKGBUILD
index 5601d8dba..3ade5d27f 100644
--- a/~lukeshu/emacsutils-git/PKGBUILD
+++ b/~lukeshu/emacsutils-git/PKGBUILD
@@ -3,32 +3,39 @@
 _pkgname=emacsutils
 pkgname=$_pkgname-git
 
-pkgver=20141202
-_gitver=d4ff19f0033e96f9a61fc9b094b038426735c834
+_pkgver=0.9
+pkgver=20170128
+_gitver='commit=3f075458f0f80d53569302795887c41122478c26'
 pkgdesc="Utilities for interacting with GNU Emacs from a *NIX environment"
 url="https://lukeshu.com/git/$_pkgname.git"
 license=('GPL3')
 
-provides=($_pkgname)
-conflicts=($_pkgname)
+provides=("$_pkgname=$_pkgver")
+conflicts=("$_pkgname")
 
 pkgrel=1
 arch=('any')
 
 depends=('emacs')
 source=("https://repo.parabola.nu/other/~lukeshu/$_pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('bcd8cbe2a9ed8ef32aef7ee35bdfd1c5')
+md5sums=('94f694263ce6e4081c6f1a44e4aeb4e0')
 
 mkdepends=('git')
-mksource=("$pkgname-$pkgver::git://lukeshu.com/$_pkgname.git#commit=$_gitver")
+mksource=(".$pkgname-$pkgver::git://git.lukeshu.com/$_pkgname.git#$_gitver")
 mkmd5sums=('SKIP')
 
+mksource() {
+        cd "$srcdir/.$pkgname-$pkgver"
+        make dist
+        mv "$_pkgname"-*/ ../"$pkgname-$pkgver"
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr
+  make VERSION=${_pkgver}.${pkgver} prefix=/usr
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make install prefix=/usr DESTDIR="$pkgdir"
+  make install VERSION=${_pkgver}.${pkgver} prefix=/usr DESTDIR="$pkgdir"
 }
diff --git a/~lukeshu/holo-lukeshu/PKGBUILD b/~lukeshu/holo-lukeshu/PKGBUILD
new file mode 100644
index 000000000..a291e0e3a
--- /dev/null
+++ b/~lukeshu/holo-lukeshu/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+
+# Upstream info
+_pkgname='holo'
+_pkgver=1.2.1
+_pkgdesc='Minimalistic configuration management'
+url='http://holocm.org'
+license=('GPL3')
+
+# patch info
+pkgname=$_pkgname-lukeshu
+pkgver=$_pkgver.lukeshu1
+pkgdesc="$_pkgdesc (with patches from lukeshu)"
+_gitver='commit=6e22b1f69650910f71f9f93d705e973384f3fab8'
+mksource=("$_pkgname-$pkgver::git+https://github.com/lukeshu/holo#$_gitver")
+mkmd5sums=('SKIP')
+provides=("$_pkgname=$pkgver")
+
+# package info
+pkgrel=1
+arch=('i686' 'x86_64' 'armv7h')
+depends=('git')
+makedepends=('go' 'perl')
+provides+=(
+  "holo-files=$pkgver"
+  'HOLO_API_VERSION=3'
+)
+backup=(
+  'etc/holorc'
+  'etc/holorc.d/10-files'
+)
+source=("https://repo.parabola.nu/other/~lukeshu/holo/$_pkgname-$pkgver.tar.gz")
+sha256sums=('0572fcff14fd2a740fce50070475f8d79c96464040f54d12cc7b212f1a5e64fb')
+
+options=('!strip') # binaries are already stripped inside the Makefile
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make
+}
+
+check() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make install DESTDIR="${pkgdir}"
+}
diff --git a/~lukeshu/httpconnectd-git/PKGBUILD b/~lukeshu/httpconnectd-git/PKGBUILD
new file mode 100644
index 000000000..fe95afb1f
--- /dev/null
+++ b/~lukeshu/httpconnectd-git/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=httpconnectd
+pkgname=$_pkgname-git
+
+pkgver=20161004
+_gitver='commit=0a9c98e499211e6c291c4188720852bd3823584c'
+pkgdesc="An HTTP server that only implements the CONNECT method"
+url="https://lukeshu.com/git/httpconnectd/"
+license=('WTFPL2')
+backup=('etc/httpconnectd/https.conf')
+
+provides=($_pkgname)
+conflicts=($_pkgname)
+
+pkgrel=1
+arch=('any')
+
+depends=('socat')
+
+source=("https://repo.parabola.nu/other/~lukeshu/$_pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('19f0136e2c05e043b5b0b35c15aaf7d9')
+
+mkdepends=('git')
+mksource=("$pkgname-$pkgver::git://lukeshu.com/$_pkgname.git#$_gitver")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make sysconfdir=/etc prefix=/usr
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make install sysconfdir=/etc prefix=/usr DESTDIR="$pkgdir"
+}
diff --git a/~lukeshu/netctl-network-online-git/PKGBUILD b/~lukeshu/netctl-network-online-git/PKGBUILD
index d8c22be47..99447901c 100644
--- a/~lukeshu/netctl-network-online-git/PKGBUILD
+++ b/~lukeshu/netctl-network-online-git/PKGBUILD
@@ -3,11 +3,12 @@
 _pkgname=netctl-network-online
 pkgname=$_pkgname-git
 
-pkgver=20160531
-_gitver=7e05800cefd742ff5991931d69cc28791a06a476
+pkgver=20170128
+_gitver='commit=13f2ec3409d686cc81665e620c1559d3926a2e94'
+_tarver=20160101-at3
 pkgdesc="network-online.target integration for netctl"
 url="https://lukeshu.com/git/$_pkgname.git"
-license=('WTFPL')
+license=('WTFPL2')
 
 provides=($_pkgname)
 conflicts=($_pkgname)
@@ -17,20 +18,19 @@ arch=('any')
 
 depends=('netctl')
 
-source=("https://repo.parabola.nu/other/~lukeshu/$_pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('1d062bd19ee6ece6c8006a8b8e68c683')
+source=("https://repo.parabola.nu/other/~lukeshu/$_pkgname/$pkgname-$_tarver.tar.gz")
+md5sums=('32a20efd8fd1c31af18240466e20bb4a')
 
 mkdepends=('git')
-mksource=("$pkgname-$pkgver::git://lukeshu.com/$_pkgname.git#commit=$_gitver")
+mksource=("$pkgname-$_tarver::git://git.lukeshu.com/$_pkgname.git#$_gitver")
 mkmd5sums=('SKIP')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$_tarver"
   make sysconfdir=/etc prefix=/usr
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$_tarver"
   make install sysconfdir=/etc prefix=/usr DESTDIR="$pkgdir"
-  install -Dm644  COPYING -t "$pkgdir"/usr/share/licenses/$pkgname
 }
diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD
index 1abd3f59d..37a054ce9 100644
--- a/~lukeshu/thingutils-git/PKGBUILD
+++ b/~lukeshu/thingutils-git/PKGBUILD
@@ -3,8 +3,8 @@
 _pkgname=thingutils
 pkgname=$_pkgname-git
 
-pkgver=20150504
-_gitver=fbc8a95ef9827ca785d43f50b0f8c0a5e390c1dc
+pkgver=20170126
+_gitver='commit=4c04b4de8266caf326d8915f129d42e3e83e0575'
 pkgdesc="Miscellaneous utilities by Luke Shumaker"
 url="https://lukeshu.com/git/thingutils.git"
 license=('MIT')
@@ -14,19 +14,17 @@ conflicts=($_pkgname)
 
 pkgrel=1
 arch=('i686' 'x86_64')
-
 optdepends=(
-    'offlineimap: for offlineimap-runner'
     'wdiff: for chardiff'
     'acpi: for batterymon or tempmon'
 )
 makedepends=('go')
 
 source=("https://repo.parabola.nu/other/~lukeshu/$_pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('3e9cae80a2c1b040f94339c8715f0b8d')
+md5sums=('ee01884f973df6bb965f61053ff729c1')
 
 mkdepends=('git')
-mksource=("$pkgname-$pkgver::git://lukeshu.com/$_pkgname.git#commit=$_gitver")
+mksource=("$pkgname-$pkgver::git://lukeshu.com/$_pkgname.git#$_gitver")
 mkmd5sums=('SKIP')
 
 build() {