[arch-commits] Commit in stubby/trunk (3 files)

[Bruno Pagani]

    Date: Monday, December 18, 2017 @ 22:54:25
  Author: archange
Revision: 274819

upgpkg: stubby 0.2.0-1

Carried changes have been released.

Modified:
  stubby/trunk/PKGBUILD
Deleted:
  stubby/trunk/fix-makefile.patch
  stubby/trunk/ignore-sigpipe.patch

----------------------+
 PKGBUILD             |   18 ++++--------------
 fix-makefile.patch   |   21 ---------------------
 ignore-sigpipe.patch |   35 -----------------------------------
 3 files changed, 4 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-18 22:47:20 UTC (rev 274818)
+++ PKGBUILD	2017-12-18 22:54:25 UTC (rev 274819)
@@ -1,7 +1,7 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org> 
 
 pkgname=stubby
-pkgver=0.1.5
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="DNS Privacy stub resolver"
 arch=('x86_64')
@@ -10,20 +10,10 @@
 backup=('etc/stubby/stubby.yml')
 depends=('getdns')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/getdnsapi/stubby/archive/v${pkgver}.tar.gz"
-        "${pkgname}.sysusers"
-        'fix-makefile.patch'
-        'ignore-sigpipe.patch')
-sha256sums=('f909cd56922e861c830ad6fe3c6f18e1100704345f17891368df9f9430aef80c'
-            '2acedcf2b65d6e802a70deb55a5befbb71ff83be68a0ba5231a09c126910142b'
-            '82d8e44bda864d634a5e917064af1ea7f172e662b4d6c5a0046570c581418d03'
-            'f5cca7d4cdc5cd879c3120996f4817fcd9b81d694528e8dd2680be7e42b9b838')
+        "${pkgname}.sysusers")
+sha256sums=('d827e6b83fbd27a64a08e94924c98ad032cd7217b1c27f85783c7f91dd7ce4d9'
+            '2acedcf2b65d6e802a70deb55a5befbb71ff83be68a0ba5231a09c126910142b')
 
-prepare() {
-    cd ${pkgname}-${pkgver}
-    patch -p1 -i ../fix-makefile.patch
-    patch -p1 -i ../ignore-sigpipe.patch
-}
-
 build() {
     cd ${pkgname}-${pkgver}
     autoreconf -vfi

Deleted: fix-makefile.patch
===================================================================
--- fix-makefile.patch	2017-12-18 22:47:20 UTC (rev 274818)
+++ fix-makefile.patch	2017-12-18 22:54:25 UTC (rev 274819)
@@ -1,21 +0,0 @@
-From 55f136eb5b160a5dcaf149988f28d2f02b707fa3 Mon Sep 17 00:00:00 2001
-From: Sara Dickinson <sara at sinodun.com>
-Date: Wed, 8 Nov 2017 11:44:41 +0000
-Subject: [PATCH] Add DESTDIR to runstatedir creation path
-
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1c8186f..94d05d0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,4 +16,4 @@ stubby.yml.windows: ${srcdir}/stubby.yml.example
- install-data-hook: $(CONFIG_FILE)
- 	test -f $(DESTDIR)${stubbyconfdir}/stubby.yml || \
- 		${INSTALL_DATA} $(CONFIG_FILE) $(DESTDIR)${stubbyconfdir}/stubby.yml
--	$(INSTALL) -m 755 -d $(runstatedir)
-\ No newline at end of file
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(runstatedir)
-\ No newline at end of file

Deleted: ignore-sigpipe.patch
===================================================================
--- ignore-sigpipe.patch	2017-12-18 22:47:20 UTC (rev 274818)
+++ ignore-sigpipe.patch	2017-12-18 22:54:25 UTC (rev 274819)
@@ -1,35 +0,0 @@
-From 9c3c83d1a0cacde5f43c28752e1767cf9af802b9 Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem at nlnetlabs.nl>
-Date: Fri, 10 Nov 2017 10:52:50 +0100
-Subject: [PATCH] Ignore SIGPIPE signal (for not suddenly stopping)
-
----
- src/stubby.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/stubby.c b/src/stubby.c
-index 53996ad..a2f987f 100644
---- a/src/stubby.c
-+++ b/src/stubby.c
-@@ -819,13 +819,20 @@ main(int argc, char **argv)
- 				        strerror(errno));
- 				exit(EXIT_FAILURE);
- 			}
--		} else
-+		} else {
-+#ifdef SIGPIPE
-+			(void)signal(SIGPIPE, SIG_IGN);
-+#endif
- 			getdns_context_run(context);
-+		}
- 	} else
- #endif
- 	{
- 		stubby_local_log(NULL,GETDNS_LOG_UPSTREAM_STATS, GETDNS_LOG_DEBUG,
- 			       "Starting DAEMON....\n");
-+#ifdef SIGPIPE
-+		(void)signal(SIGPIPE, SIG_IGN);
-+#endif
- 		getdns_context_run(context);
- 	}
-