Version bump

2 files changed, 25 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 331480827ea6..1ce3a3e8e53a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,25 @@
 pkgbase = hash-slinger
 	pkgdesc = Tools to generate special DNS records (SSHFP, TLSA)
-	pkgver = 2.5
+	pkgver = 2.6
 	pkgrel = 1
 	url = http://people.redhat.com/pwouters/hash-slinger/
 	arch = any
 	license = GPL2
 	makedepends = xmlto
-	depends = openssh
 	depends = python2-dnspython
 	depends = python2-ipaddr
 	depends = python2-m2crypto
 	depends = python2-unbound
-	source = http://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.5.tar.gz
-	source = http://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.5.tar.gz.asc
-	md5sums = 1054dced1533f9e5d8503f7b64407c2f
+	optdepends = openssh: for sshfp
+	optdepends = python2-gnupg: for openpgpkey
+	optdepends = libreswan: for ipseckey (if not using openswan or strongswan)
+	optdepends = openswan: for ipseckey (if not using libreswan or strongswan)
+	optdepends = strongswan: for ipseckey (if not using libreswan or openswan)
+	source = http://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.6.tar.gz
+	source = http://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.6.tar.gz.asc
+	md5sums = 9ddea4e6b3df7412213a3a8d33673fab
 	md5sums = SKIP
-	sha256sums = 18bf3e97e5e7469328533a5e8cd0b8bdedcaa1e7a5a754b92d405578ebbd02a4
+	sha256sums = 121143efea136958ad6a42cb0a8fa80d95b1e4fc45632019d8f07a534d6efab2
 	sha256sums = SKIP
 
 pkgname = hash-slinger
diff --git a/PKGBUILD b/PKGBUILD
index 338326b3e75b..70688a1517dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,33 @@
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 pkgname=hash-slinger
-pkgver=2.5
+pkgver=2.6
 pkgrel=1
 pkgdesc="Tools to generate special DNS records (SSHFP, TLSA)"
 arch=(any)
 url="http://people.redhat.com/pwouters/hash-slinger/"
 license=('GPL2')
-depends=('openssh' 'python2-dnspython' 'python2-ipaddr' 'python2-m2crypto' 'python2-unbound')
+depends=('python2-dnspython' 'python2-ipaddr' 'python2-m2crypto' 'python2-unbound')
 makedepends=('xmlto')
-source=(http://people.redhat.com/pwouters/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        http://people.redhat.com/pwouters/${pkgname}/${pkgname}-${pkgver}.tar.gz.asc)
-md5sums=('1054dced1533f9e5d8503f7b64407c2f'
+optdepends=('openssh: for sshfp'
+            'python2-gnupg: for openpgpkey'
+            'libreswan: for ipseckey (if not using openswan or strongswan)'
+            'openswan: for ipseckey (if not using libreswan or strongswan)'
+            'strongswan: for ipseckey (if not using libreswan or openswan)')
+source=(http://people.redhat.com/pwouters/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+md5sums=('9ddea4e6b3df7412213a3a8d33673fab'
          'SKIP')
-sha256sums=('18bf3e97e5e7469328533a5e8cd0b8bdedcaa1e7a5a754b92d405578ebbd02a4'
+sha256sums=('121143efea136958ad6a42cb0a8fa80d95b1e4fc45632019d8f07a534d6efab2'
             'SKIP')
-
+validpgpkeys=('F384E78A1D3352D3EB928AB862D3582FE0FD94D2')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-  for f in openpgpkey sshfp tlsa; do
+  for f in ipseckey openpgpkey sshfp tlsa; do
     sed -i 's@#!/usr/bin/python$@#!/usr/bin/env python2@' $f
   done
+
+  # Indentation issue :)
+  sed -i 's/        /\t/g' ipseckey
 }
 
 build() {