update to new upstream release

Thanks to @opippi for the libexec_dir patch!

6 files changed, 45 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d644ff515aa..80a5b9943ac7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dnssec-trigger
 	pkgdesc = Reconfigures the local unbound DNS server to use DNSSEC enabled forwarders
-	pkgver = 0.15
+	pkgver = 0.16
 	pkgrel = 1
 	url = http://www.nlnetlabs.nl/projects/dnssec-trigger/
 	arch = i686
@@ -9,15 +9,18 @@ pkgbase = dnssec-trigger
 	depends = gtk2
 	depends = ldns
 	depends = unbound
+	depends = openssl
 	backup = etc/dnssec.conf
 	backup = etc/dnssec-trigger/dnssec-trigger.conf
-	source = http://www.nlnetlabs.nl/downloads/dnssec-trigger/dnssec-trigger-0.15.tar.gz
+	source = http://www.nlnetlabs.nl/downloads/dnssec-trigger/dnssec-trigger-0.16.tar.gz
 	source = dnssec-triggerd.service
 	source = dnssec-triggerd-keygen.service
-	source = gtk-update-icon-cache-invocation.patch
-	sha256sums = 32d88f44791c540079e5fbfbe96e686e82563d0fd34d9cbc0756773658554e47
+	source = 0001-libexec-dir.patch
+	source = 0002-gtk-update-icon-cache-invocation.patch
+	sha256sums = e80aab8fd52074638f782a608bf433cbaa507cad087bcc5fb433353db9d057cb
 	sha256sums = c8ed3ef4ec9cba0bd00f47bfbf0e59c318130615aca4370bc597d98365445be9
 	sha256sums = 831f2cf40687325d50fcc11a74050198d9a24f230749e3570cf9153abf3db12e
+	sha256sums = 756e3dc4f0243f90a119064a9bfcbc032c07940bae7821f71f63c025a21bc9b7
 	sha256sums = 5710dd86e0b8534096274ace3fe6cd224c440a6e86f4ed6bbdb0753146717121
 
 pkgname = dnssec-trigger
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..0cfb3f9c6c15
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+src/
+pkg/
+
+dnssec-trigger-*.tar.gz
+dnssec-trigger-*.pkg*
diff --git a/0001-libexec-dir.patch b/0001-libexec-dir.patch
new file mode 100644
index 000000000000..967a2f797d41
--- /dev/null
+++ b/0001-libexec-dir.patch
@@ -0,0 +1,21 @@
+diff -aur dnssec-trigger-0.16.orig/riggerd/reshook.c dnssec-trigger-0.16.new/riggerd/reshook.c
+--- dnssec-trigger-0.16.orig/riggerd/reshook.c	2017-06-08 17:06:17.000000000 +0200
++++ dnssec-trigger-0.16.new/riggerd/reshook.c	2018-08-25 09:26:23.159139318 +0200
+@@ -256,7 +256,7 @@
+ 	win_set_resolv("127.0.0.1");
+ #else /* not on windows */
+ #  ifndef HOOKS_OSX /* on Linux/BSD */
+-	if (system("/usr/libexec/dnssec-trigger-script --setup") == 0)
++	if (system(LIBEXEC_DIR "/dnssec-trigger-script --setup") == 0)
+ 		return;
+ 
+ 	if(really_set_to_localhost(cfg)) {
+@@ -285,7 +285,7 @@
+ 	char iplist[10240];
+ 	iplist[0] = 0;
+ #else
+-	if (system("/usr/libexec/dnssec-trigger-script --restore") == 0)
++	if (system(LIBEXEC_DIR "/dnssec-trigger-script --restore") == 0)
+ 		return;
+ #endif
+ 	set_to_localhost = 0;
diff --git a/gtk-update-icon-cache-invocation.patch b/0002-gtk-update-icon-cache-invocation.patch
index 512bf43f36f0..512bf43f36f0 100644
--- a/gtk-update-icon-cache-invocation.patch
+++ b/0002-gtk-update-icon-cache-invocation.patch
diff --git a/PKGBUILD b/PKGBUILD
index 44c788b3d033..855503228719 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,34 @@
 # Maintainer: Felix Morgner <felix.morgner@gmail.com>
 
 pkgname=dnssec-trigger
-pkgver=0.15
+pkgver=0.16
 pkgrel=1
 pkgdesc="Reconfigures the local unbound DNS server to use DNSSEC enabled forwarders"
 arch=('i686' 'x86_64')
 url="http://www.nlnetlabs.nl/projects/dnssec-trigger/"
 license=('BSD')
-depends=('gtk2' 'ldns' 'unbound')
+depends=('gtk2'
+         'ldns'
+         'unbound'
+         'openssl')
 backup=('etc/dnssec.conf'
         'etc/dnssec-trigger/dnssec-trigger.conf')
 source=(http://www.nlnetlabs.nl/downloads/dnssec-trigger/$pkgname-$pkgver.tar.gz
         dnssec-triggerd.service
         dnssec-triggerd-keygen.service
-        gtk-update-icon-cache-invocation.patch)
-sha256sums=('32d88f44791c540079e5fbfbe96e686e82563d0fd34d9cbc0756773658554e47'
+        0001-libexec-dir.patch
+        0002-gtk-update-icon-cache-invocation.patch)
+sha256sums=('e80aab8fd52074638f782a608bf433cbaa507cad087bcc5fb433353db9d057cb'
             'c8ed3ef4ec9cba0bd00f47bfbf0e59c318130615aca4370bc597d98365445be9'
             '831f2cf40687325d50fcc11a74050198d9a24f230749e3570cf9153abf3db12e'
+            '756e3dc4f0243f90a119064a9bfcbc032c07940bae7821f71f63c025a21bc9b7'
             '5710dd86e0b8534096274ace3fe6cd224c440a6e86f4ed6bbdb0753146717121')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/gtk-update-icon-cache-invocation.patch"
-  sed -i "s!/usr/libexec/!/usr/lib/$pkgname/!g" 01-dnssec-trigger.in
+
+  patch -p1 -i "$srcdir/0001-libexec-dir.patch"
+  patch -p1 -i "$srcdir/0002-gtk-update-icon-cache-invocation.patch"
 }
 
 build() {
diff --git a/openssl-1.1.patch b/openssl-1.1.patch
deleted file mode 100644
index ea6435cde00f..000000000000
--- a/openssl-1.1.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aur dnssec-trigger-0.14/riggerd/cfg.c dnssec-trigger-0.14-patched/riggerd/cfg.c
---- dnssec-trigger-0.14/riggerd/cfg.c	2017-06-08 17:06:17.000000000 +0200
-+++ dnssec-trigger-0.14-patched/riggerd/cfg.c	2017-11-18 11:21:50.477359449 +0100
-@@ -540,9 +540,11 @@
- 	if(!ctx)
- 		return ctx_err_ret(ctx, err, errlen,
- 			"could not allocate SSL_CTX pointer");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- 	if(!(SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2))
- 		return ctx_err_ret(ctx, err, errlen, 
- 			"could not set SSL_OP_NO_SSLv2");
-+#endif
- 	if(!SSL_CTX_use_certificate_file(ctx,c_cert,SSL_FILETYPE_PEM) ||
- 		!SSL_CTX_use_PrivateKey_file(ctx,c_key,SSL_FILETYPE_PEM)
- 		|| !SSL_CTX_check_private_key(ctx))
-diff -aur dnssec-trigger-0.14/riggerd/net_help.c dnssec-trigger-0.14-patched/riggerd/net_help.c
---- dnssec-trigger-0.14/riggerd/net_help.c	2017-06-08 17:06:17.000000000 +0200
-+++ dnssec-trigger-0.14-patched/riggerd/net_help.c	2017-11-18 11:22:40.546960367 +0100
-@@ -447,11 +447,13 @@
- 		return NULL;
- 	}
- 	/* no SSLv2 because has defects */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- 	if(!(SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2)){
- 		log_crypto_err("could not set SSL_OP_NO_SSLv2");
- 		SSL_CTX_free(ctx);
- 		return NULL;
- 	}
-+#endif
- 	if(!SSL_CTX_use_certificate_file(ctx, pem, SSL_FILETYPE_PEM)) {
- 		log_err("error for cert file: %s", pem);
- 		log_crypto_err("error in SSL_CTX use_certificate_file");
-diff -aur dnssec-trigger-0.14/riggerd/reshook.c dnssec-trigger-0.14-patched/riggerd/reshook.c
---- dnssec-trigger-0.14/riggerd/reshook.c	2017-06-08 17:06:17.000000000 +0200
-+++ dnssec-trigger-0.14-patched/riggerd/reshook.c	2017-11-18 11:23:54.853034153 +0100
-@@ -256,7 +256,7 @@
- 	win_set_resolv("127.0.0.1");
- #else /* not on windows */
- #  ifndef HOOKS_OSX /* on Linux/BSD */
--	if (system("/usr/libexec/dnssec-trigger-script --setup") == 0)
-+	if (system(LIBEXEC_DIR "/dnssec-trigger-script --setup") == 0)
- 		return;
- 
- 	if(really_set_to_localhost(cfg)) {
-diff -aur dnssec-trigger-0.14/riggerd/svr.c dnssec-trigger-0.14-patched/riggerd/svr.c
---- dnssec-trigger-0.14/riggerd/svr.c	2017-06-08 17:06:17.000000000 +0200
-+++ dnssec-trigger-0.14-patched/riggerd/svr.c	2017-11-18 11:23:10.156724197 +0100
-@@ -162,10 +162,12 @@
- 		return 0;
- 	}
- 	/* no SSLv2 because has defects */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- 	if(!(SSL_CTX_set_options(s->ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2)){
- 		log_crypto_err("could not set SSL_OP_NO_SSLv2");
- 		return 0;
- 	}
-+#endif
- 	s_cert = s->cfg->server_cert_file;
- 	s_key = s->cfg->server_key_file;
- 	verbose(VERB_ALGO, "setup SSL certificates");