[arch-commits] Commit in stubby/repos/community-x86_64 (7 files)
Bruno Pagani
archange at archlinux.org
Sun Nov 12 10:35:26 UTC 2017
Date: Sunday, November 12, 2017 @ 10:35:24
Author: archange
Revision: 266290
archrelease: copy trunk to community-x86_64
Added:
stubby/repos/community-x86_64/PKGBUILD
(from rev 266289, stubby/trunk/PKGBUILD)
stubby/repos/community-x86_64/fix-makefile.patch
(from rev 266289, stubby/trunk/fix-makefile.patch)
stubby/repos/community-x86_64/ignore-sigpipe.patch
(from rev 266289, stubby/trunk/ignore-sigpipe.patch)
stubby/repos/community-x86_64/stubby.sysusers
(from rev 266289, stubby/trunk/stubby.sysusers)
Deleted:
stubby/repos/community-x86_64/PKGBUILD
stubby/repos/community-x86_64/fix-makefile.patch
stubby/repos/community-x86_64/stubby.sysusers
----------------------+
PKGBUILD | 91 +++++++++++++++++++++++++------------------------
fix-makefile.patch | 43 +++++++++++------------
ignore-sigpipe.patch | 35 ++++++++++++++++++
stubby.sysusers | 2 -
4 files changed, 105 insertions(+), 66 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-12 10:34:58 UTC (rev 266289)
+++ PKGBUILD 2017-11-12 10:35:24 UTC (rev 266290)
@@ -1,43 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=stubby
-pkgver=0.1.4
-pkgrel=1
-pkgdesc="DNS Privacy stub resolver"
-arch=('x86_64' 'i686')
-url="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
-license=('BSD')
-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')
-sha256sums=('cc10f253b6f0334cb5865982e8dbb25e012df4fff1ee01ea1860a10d41abf4b1'
- '2acedcf2b65d6e802a70deb55a5befbb71ff83be68a0ba5231a09c126910142b'
- 'b9ea6a864f33dfeac7ad6cc20b35956bba3d61c8362512529f212604bc124939')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i ../fix-makefile.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- autoreconf -vfi
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
-
- install -Dm644 systemd/${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
- install -Dm644 systemd/${pkgname}.conf -t "${pkgdir}"/usr/lib/tmpfiles.d/
- install -Dm644 ../${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
-}
Copied: stubby/repos/community-x86_64/PKGBUILD (from rev 266289, stubby/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-11-12 10:35:24 UTC (rev 266290)
@@ -0,0 +1,48 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=stubby
+pkgver=0.1.5
+pkgrel=1
+pkgdesc="DNS Privacy stub resolver"
+arch=('x86_64')
+url="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
+license=('BSD')
+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')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ../fix-makefile.patch
+ patch -p1 -i ../ignore-sigpipe.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ autoreconf -vfi
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
+ rmdir "${pkgdir}"/var{/run,}
+
+ install -Dm644 systemd/${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
+ install -Dm644 systemd/${pkgname}.conf -t "${pkgdir}"/usr/lib/tmpfiles.d/
+ install -Dm644 ../${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
+}
Deleted: fix-makefile.patch
===================================================================
--- fix-makefile.patch 2017-11-12 10:34:58 UTC (rev 266289)
+++ fix-makefile.patch 2017-11-12 10:35:24 UTC (rev 266290)
@@ -1,22 +0,0 @@
-From 0ada751ca26dfcdd3b4cd9a1a95acdb6e6301881 Mon Sep 17 00:00:00 2001
-From: Sara Dickinson <sara at sinodun.com>
-Date: Wed, 1 Nov 2017 10:24:24 +0000
-Subject: [PATCH] Use DESTDIR when installing stubby.yml file
-
----
- Makefile.am | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index aab3b3b..1f86472 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -14,5 +14,6 @@ stubby.yml.windows: ${srcdir}/stubby.yml.example
- awk "{sub(/$$/,\"\r\")}1" $< > $@
-
- install-data-hook: $(CONFIG_FILE)
-- test -f ${stubbyconfdir}/stubby.yml || \
-- ${INSTALL_DATA} $(CONFIG_FILE) ${stubbyconfdir}/stubby.yml
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(stubbyconfdir)
-+ test -f $(DESTDIR)${stubbyconfdir}/stubby.yml || \
-+ ${INSTALL_DATA} $(CONFIG_FILE) $(DESTDIR)${stubbyconfdir}/stubby.yml
Copied: stubby/repos/community-x86_64/fix-makefile.patch (from rev 266289, stubby/trunk/fix-makefile.patch)
===================================================================
--- fix-makefile.patch (rev 0)
+++ fix-makefile.patch 2017-11-12 10:35:24 UTC (rev 266290)
@@ -0,0 +1,21 @@
+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
Copied: stubby/repos/community-x86_64/ignore-sigpipe.patch (from rev 266289, stubby/trunk/ignore-sigpipe.patch)
===================================================================
--- ignore-sigpipe.patch (rev 0)
+++ ignore-sigpipe.patch 2017-11-12 10:35:24 UTC (rev 266290)
@@ -0,0 +1,35 @@
+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);
+ }
+
Deleted: stubby.sysusers
===================================================================
--- stubby.sysusers 2017-11-12 10:34:58 UTC (rev 266289)
+++ stubby.sysusers 2017-11-12 10:35:24 UTC (rev 266290)
@@ -1 +0,0 @@
-u stubby - "DNS Privacy Daemon" -
Copied: stubby/repos/community-x86_64/stubby.sysusers (from rev 266289, stubby/trunk/stubby.sysusers)
===================================================================
--- stubby.sysusers (rev 0)
+++ stubby.sysusers 2017-11-12 10:35:24 UTC (rev 266290)
@@ -0,0 +1 @@
+u stubby - "DNS Privacy Daemon" -
More information about the arch-commits
mailing list