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

9 files changed, 175 insertions, 42 deletions

diff --git a/pcr/gnupg1/PKGBUILD b/pcr/gnupg1/PKGBUILD
new file mode 100644
index 000000000..fb426a1a9
--- /dev/null
+++ b/pcr/gnupg1/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 148992 2012-02-05 12:21:23Z andyrtr $
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Committer: Judd Vinet <jvinet@zeroflux.org>
+pkgname=gnupg1
+pkgname_=gnupg
+pkgver=1.4.18
+pkgrel=4
+pkgdesc="GNU Privacy Guard - a PGP replacement tool"
+arch=('i686' 'x86_64' 'armv6h')
+license=('GPL3')
+depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readline>=6.0.00')
+source=("ftp://ftp.gnupg.org/gcrypt/gnupg/$pkgname_-$pkgver.tar.bz2"{,.sig})
+install=gnupg.install
+url="http://www.gnupg.org/"
+sha1sums=('41462d1a97f91abc16a0031b5deadc3095ce88ae'
+          'SKIP')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+              '46CC730865BB5C78EBABADCF04376F3EE0856959'
+              '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+              'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+
+build() {
+  cd "${srcdir}/${pkgname_}-${pkgver}"
+  ./configure --prefix=/usr \
+	--libexecdir=/usr/lib \
+	--enable-noexecstack
+  make
+  #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now
+}
+
+check() {
+  cd "$srcdir/$pkgname_-$pkgver"
+  make -k check #All 27 tests passed
+}
+
+package () {
+  cd "${srcdir}/${pkgname_}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  # Fix file conflicts with gnupg2 pkg. Cd into directories to prevent
+  # unintentional transformation of the full path.
+  cd "$pkgdir/usr/share/man/man1"
+  rename gpg gpg1 gpg*
+
+  cd "$pkgdir/usr/bin"
+  rename gpg gpg1 gpg*
+
+  cd "$pkgdir/usr/share/man/man7"
+  rename gnupg gnupg1 gnupg*
+
+  # Correct multiple renames if makepkg is rerun.
+  find "$pkgdir" -name '*pg11*' -exec rename pg11 pg1 '{}' \+
+}
diff --git a/pcr/gnupg1/gnupg.install b/pcr/gnupg1/gnupg.install
new file mode 100644
index 000000000..5a6704716
--- /dev/null
+++ b/pcr/gnupg1/gnupg.install
@@ -0,0 +1,21 @@
+info_dir=/usr/share/info
+info_files=(gnupg1.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/knot/PKGBUILD b/pcr/knot/PKGBUILD
index c297aa299..f16d9a5c9 100644
--- a/pcr/knot/PKGBUILD
+++ b/pcr/knot/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Otto Sabart <seberm[at]gmail[dot]com>
 
 pkgname=knot
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc='high-performance authoritative-only DNS server'
 url='https://www.knot-dns.cz/'
@@ -13,8 +13,12 @@ license=('GPL3')
 install=install
 depends=('liburcu' 'openssl>=1.0.0' 'zlib')
 makedepends=('autoconf>=2.65' 'libtool' 'flex>=2.5.3' 'bison>=2.3')
-source=("https://secure.nic.cz/files/knot-dns/${pkgname}-${pkgver}.tar.xz"
+source=("https://secure.nic.cz/files/knot-dns/${pkgname}-${pkgver}.tar.xz"{,.asc}
         'knot.service')
+md5sums=('a1859b9e89c1719a764d95bcb8232197'
+         'SKIP'
+         '4f775e901f66bf4c9d231493eeb8d72a')
+validpgpkeys=('DEF35D16E5AE59D820BDF780ACE24DA9EE37A832')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -48,5 +52,3 @@ check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make check
 }
-md5sums=('c726ebf12fd2f325da8407538a2124f2'
-         '4f775e901f66bf4c9d231493eeb8d72a')
diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD
index 48f55dbfd..67a6e5a09 100644
--- a/pcr/monkeysphere/PKGBUILD
+++ b/pcr/monkeysphere/PKGBUILD
@@ -1,44 +1,50 @@
+# Maintainer: svalo <valo@eigenlab.org>
+# Contributor: David Costa <david@zarel.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Based on monkeysphere-git from
 # Contributor: Olivier Mehani <shtrom-arch@ssji.net>
-# $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
 pkgname=monkeysphere
 pkgver=0.37
-pkgrel=1
+pkgrel=2
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
 license=('GPL3')
-depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-checkdepends=('socat' 'openssh' 'cpio')
+depends=('gnupg1' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
+checkdepends=('socat' 'openssh' 'cpio' 'gnupg')
 source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
-        binmerge.patch)
+        binmerge.patch
+	ms.patch
+	mshost.patch
+	msauth.patch)
+
+sha256sums=('b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59'
+            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7'
+            'ce490eebfbf92b9a9abaf77d43489b0cdd7ebab427262e9eb7fbefdb67cdf289'
+            '4ddad85f6a9998f8f8869cef4f2f6d7bf9f04171fb3b5ae6c6621bfc8dc2bcbe'
+            'bcad168603c2afd4db6b54edd61c8c9cdd1e08bcea7de3b936a3269f271e3de6')
+
 install=monkeysphere.install
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Ni "${srcdir}/binmerge.patch"
+  patch -p1 -Ni "${srcdir}/ms.patch"
+  patch -p1 -Ni "${srcdir}/msauth.patch"
+  patch -p1 -Ni "${srcdir}/mshost.patch"
 }
 
-# Checks fail
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make test || true
-}
+# Checks fail 
+#check() {
+#  cd "$srcdir/$pkgname-$pkgver"
+#
+#  make test
+#}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
-  mkdir -p $pkgdir/var/lib/monkeysphere
+  mkdir -p "$pkgdir/var/lib/monkeysphere"
 }
-sha1sums=('c4f950346040f7703cb4c6e8b32022f4361d0c9d'
-          '780c2e203980558316b0714c4b2a3ad49be3ea27')
-sha256sums=('6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7'
-            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7')
-sha1sums=('1fab51ae4c1a19d8bbc358db8e2ce7df337cc93e'
-          '780c2e203980558316b0714c4b2a3ad49be3ea27')
-sha256sums=('b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59'
-            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7')
diff --git a/pcr/monkeysphere/ms.patch b/pcr/monkeysphere/ms.patch
new file mode 100644
index 000000000..99af937cc
--- /dev/null
+++ b/pcr/monkeysphere/ms.patch
@@ -0,0 +1,11 @@
+--- a/src/monkeysphere	2014-08-06 19:27:38.000000000 +0200
++++ b/src/monkeysphere	2014-12-07 23:22:52.903467885 +0100
+@@ -62,7 +62,7 @@
+ 
+ # user gpg command to define common options
+ gpg_user() {
+-    LC_ALL=C gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
++    LC_ALL=C gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@"
+ }
+ 
+ # output the ssh fingerprint of a gpg key
diff --git a/pcr/monkeysphere/msauth.patch b/pcr/monkeysphere/msauth.patch
new file mode 100644
index 000000000..b426101b9
--- /dev/null
+++ b/pcr/monkeysphere/msauth.patch
@@ -0,0 +1,20 @@
+--- a/src/monkeysphere-authentication	2014-08-06 19:27:38.000000000 +0200
++++ b/src/monkeysphere-authentication	2014-12-07 23:23:37.770134940 +0100
+@@ -73,7 +73,7 @@
+     GNUPGHOME="$GNUPGHOME_CORE"
+     export GNUPGHOME
+ 
+-    gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
++    gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@"
+ }
+ 
+ # function to interact with the gpg sphere keyring
+@@ -81,7 +81,7 @@
+     GNUPGHOME="$GNUPGHOME_SPHERE"
+     export GNUPGHOME
+  
+-    su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
++    su_monkeysphere_user gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@"
+ }
+ 
+ check_openpgp2ssh_sanity() {
diff --git a/pcr/monkeysphere/mshost.patch b/pcr/monkeysphere/mshost.patch
new file mode 100644
index 000000000..c8c6e2859
--- /dev/null
+++ b/pcr/monkeysphere/mshost.patch
@@ -0,0 +1,11 @@
+--- a/src/monkeysphere-host	2014-08-06 19:27:38.000000000 +0200
++++ b/src/monkeysphere-host.new	2014-12-07 23:23:07.306801343 +0100
+@@ -71,7 +71,7 @@
+ 
+ # function to interact with the gpg keyring
+ gpg_host() {
+-    GNUPGHOME="$GNUPGHOME_HOST" LC_ALL=C gpg --no-auto-check-trustdb --trust-model=always --no-greeting --quiet --no-tty --fixed-list-mode "$@"
++    GNUPGHOME="$GNUPGHOME_HOST" LC_ALL=C gpg1 --no-auto-check-trustdb --trust-model=always --no-greeting --quiet --no-tty --fixed-list-mode "$@"
+ }
+ 
+ # list the info about the a key, in colon format, to stdout
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index f1dad3f5a..4cfbbb1fa 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase=renpy
 pkgname=($pkgbase python2-$pkgbase)
-pkgver=6.17.7
+pkgver=6.18.3
 pkgrel=1
 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ conflicts=("${pkgbase}64" "$pkgbase-bin")
 replaces=("${pkgbase}64")
 source=("http://www.$pkgbase.org/dl/$pkgver/$pkgbase-$pkgver-source.tar.bz2"
         "$pkgbase.desktop" "$pkgbase."{sh,csh} "$pkgbase-launcher.sh")
-sha512sums=('22b0e08b18ee35317b11451205233cbd8a29617d9c3d298bbdcfc5757f67c2f0e4c8a748aa83d5c8b43786c062ffca109d07e981efa750fcee26f45f08a33ea2'
+sha512sums=('7ea99adaf1fbea7a499790fb5b37349fc797f383fb633956a43955c80885b259e26570469c430f4c4c103e62444f60082690489ee6400809f5e9024693261e55'
             '1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5'
             '2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df'
             'bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09'
diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD
index 9d9942fa1..ce2d93518 100644
--- a/pcr/strongswan/PKGBUILD
+++ b/pcr/strongswan/PKGBUILD
@@ -1,35 +1,46 @@
-# Contributor (Arch): nikicat <develniks at gmail dot com>
-# Contributor (Arch): danilo <gezuru at gmail dot com>
-# Contributor (Arch): Jason Begley <jayray at digitalgoat dot com>
-# Contributor (Arch): Ray Kohler <ataraxia937 at gmail dot com>
-# Contributor (Arch): Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com>
-# Contributor (Arch): 458italia <svenskaparadox [at] gmail dot com>
-# Maintainer (Arch): dkorzhevin <dkorzhevin at gmail dot com>
+# Contributor: nikicat <develniks at gmail dot com>
+# Contributor: danilo <gezuru at gmail dot com>
+# Contributor: Jason Begley <jayray at digitalgoat dot com>
+# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
+# Contributor: Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com>
+# Contributor: 458italia <svenskaparadox [at] gmail dot com>
+# Contributor: Thermi <noel [at] familie-kuntze dot com>
+# Maintainer: dkorzhevin <dkorzhevin at gmail dot com>
 
 pkgname=strongswan
-pkgver=5.1.0
-pkgrel=2
-pkgdesc="open source IPsec implementation"
+pkgver=5.2.2
+pkgrel=1
+pkgdesc="IPsec-based VPN Solution"
 url='http://www.strongswan.org'
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite')
+makedepends=('ldns' 'unbound' 'networkmanager' 'libnm-glib')
+optdepends=('unbound: dns resolver plugin'
+            'networkmanager: nm backend')
 conflicts=('openswan')
 options=(!libtool)
 backup=(etc/ipsec.conf etc/strongswan.conf)
-source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc)
+source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('7ee1a33060b2bde35be0f6d78a1d26d0'
+         'SKIP')
+validpgpkeys=('948F158A4E76A27BF3D07532DF42C170B34DBA77')
 changelog='CHANGELOG'
-md5sums=('c1cd0a3ba9960f590cae28c8470800e8'
-         'cf815adef48a1ffee34517380c731277')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+   export systemd_daemon_CFLAGS="-I/usr/include" \
+          systemd_daemon_LIBS="-L/usr/lib -lsystemd"
+   export systemd_journal_CFLAGS="-I/usr/include" \
+          systemd_journal_LIBS="-L/usr/lib -lsystemd"
 
   ./configure --prefix=/usr \
         --sbindir=/usr/bin \
         --sysconfdir=/etc \
         --libexecdir=/usr/lib \
+        --disable-static \
         --with-ipsecdir=/usr/lib/strongswan \
+        --with-systemdsystemunitdir=/usr/lib/systemd/system \
         --enable-sqlite \
         --enable-openssl --enable-curl \
         --enable-sql --enable-attr-sql \
@@ -38,9 +49,7 @@ build() {
         --enable-eap-simaka-reauth --enable-eap-identity --enable-eap-md5 \
         --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
         --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \
-        --enable-ha \
-        --disable-mysql --disable-ldap \
-        --enable-cmd
+        --enable-ha --enable-systemd --enable-nm
 
   make
 }