[arch-commits] Commit in dnsmasq/repos (12 files)

Christian Hesse eworm at archlinux.org
Sun Aug 27 19:43:58 UTC 2017 

    Date: Sunday, August 27, 2017 @ 19:43:57
  Author: eworm
Revision: 304261

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  dnsmasq/repos/testing-i686/
  dnsmasq/repos/testing-i686/0001-do-not-include-stdio-h-before-dnsmasq-h.patch
    (from rev 304260, dnsmasq/trunk/0001-do-not-include-stdio-h-before-dnsmasq-h.patch)
  dnsmasq/repos/testing-i686/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch
    (from rev 304260, dnsmasq/trunk/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch)
  dnsmasq/repos/testing-i686/PKGBUILD
    (from rev 304260, dnsmasq/trunk/PKGBUILD)
  dnsmasq/repos/testing-i686/dnsmasq-sysusers.conf
    (from rev 304260, dnsmasq/trunk/dnsmasq-sysusers.conf)
  dnsmasq/repos/testing-i686/dnsmasq.service
    (from rev 304260, dnsmasq/trunk/dnsmasq.service)
  dnsmasq/repos/testing-x86_64/
  dnsmasq/repos/testing-x86_64/0001-do-not-include-stdio-h-before-dnsmasq-h.patch
    (from rev 304260, dnsmasq/trunk/0001-do-not-include-stdio-h-before-dnsmasq-h.patch)
  dnsmasq/repos/testing-x86_64/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch
    (from rev 304260, dnsmasq/trunk/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch)
  dnsmasq/repos/testing-x86_64/PKGBUILD
    (from rev 304260, dnsmasq/trunk/PKGBUILD)
  dnsmasq/repos/testing-x86_64/dnsmasq-sysusers.conf
    (from rev 304260, dnsmasq/trunk/dnsmasq-sysusers.conf)
  dnsmasq/repos/testing-x86_64/dnsmasq.service
    (from rev 304260, dnsmasq/trunk/dnsmasq.service)

------------------------------------------------------------------------+
 testing-i686/0001-do-not-include-stdio-h-before-dnsmasq-h.patch        |   24 +++
 testing-i686/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch   |   35 +++++
 testing-i686/PKGBUILD                                                  |   67 ++++++++++
 testing-i686/dnsmasq-sysusers.conf                                     |    1 
 testing-i686/dnsmasq.service                                           |   14 ++
 testing-x86_64/0001-do-not-include-stdio-h-before-dnsmasq-h.patch      |   24 +++
 testing-x86_64/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch |   35 +++++
 testing-x86_64/PKGBUILD                                                |   67 ++++++++++
 testing-x86_64/dnsmasq-sysusers.conf                                   |    1 
 testing-x86_64/dnsmasq.service                                         |   14 ++
 10 files changed, 282 insertions(+)

Copied: dnsmasq/repos/testing-i686/0001-do-not-include-stdio-h-before-dnsmasq-h.patch (from rev 304260, dnsmasq/trunk/0001-do-not-include-stdio-h-before-dnsmasq-h.patch)
===================================================================
--- testing-i686/0001-do-not-include-stdio-h-before-dnsmasq-h.patch	                        (rev 0)
+++ testing-i686/0001-do-not-include-stdio-h-before-dnsmasq-h.patch	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1,24 @@
+Subject: [PATCH 1/1] do not include stdio.h before dnsmasq.h
+Date: Tue, 22 Aug 2017 23:19:29 +0200
+From: Christian Hesse <mail at eworm.de>
+
+We define some constants in dnsmasq.h, which have an influence on
+stdio.h. So do not include stdio.h before dnsmasq.h.
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ src/helper.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/helper.c b/src/helper.c
+index 635677e..281cb4a 100644
+--- a/src/helper.c
++++ b/src/helper.c
+@@ -14,7 +14,6 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+-#include <stdio.h>
+ #include "dnsmasq.h"
+ 
+ #ifdef HAVE_SCRIPT

Copied: dnsmasq/repos/testing-i686/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch (from rev 304260, dnsmasq/trunk/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch)
===================================================================
--- testing-i686/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch	                        (rev 0)
+++ testing-i686/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1,35 @@
+From: Chris Novakovic <chris at chrisn.me.uk>
+Date: Tue, 6 Jun 2017 22:02:59 +0000 (+0100)
+Subject: Fix logic of appending ".<layer>" to PXE basename
+X-Git-Tag: v2.78test1~1
+X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=2446514e716075cfe2be35e2a9b9de4eacdbac99
+
+Fix logic of appending ".<layer>" to PXE basename
+
+Commit f77700aa, which fixes a compiler warning, also breaks the
+behaviour of prepending ".<layer>" to basenames in --pxe-service: in
+situations where the basename contains a ".", the ".<layer>" suffix is
+erroneously added, and in situations where the basename doesn't contain
+a ".", the ".<layer>" suffix is erroneously omitted.
+
+A patch against the git HEAD is attached that inverts this logic and
+restores the expected behaviour of --pxe-service.
+---
+
+diff --git a/src/rfc2131.c b/src/rfc2131.c
+index a679470..1c850e5 100644
+--- a/src/rfc2131.c
++++ b/src/rfc2131.c
+@@ -836,10 +836,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
+ 	  
+ 	  if (strchr(service->basename, '.'))
+ 	    snprintf((char *)mess->file, sizeof(mess->file),
+-		"%s.%d", service->basename, layer);
++		"%s", service->basename);
+ 	  else
+ 	    snprintf((char *)mess->file, sizeof(mess->file),
+-		"%s", service->basename);
++		"%s.%d", service->basename, layer);
+ 	  
+ 	  option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
+ 	  option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));

Copied: dnsmasq/repos/testing-i686/PKGBUILD (from rev 304260, dnsmasq/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=dnsmasq
+pkgver=2.77
+pkgrel=4
+pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
+url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('glibc' 'gmp' 'libidn' 'libdbus' 'libnetfilter_conntrack' 'nettle')
+backup=('etc/dnsmasq.conf')
+validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley <simon at thekelleys.org.uk>
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
+        '0001-do-not-include-stdio-h-before-dnsmasq-h.patch'
+        '0002-Fix-logic-of-appending-layer-to-PXE-basename.patch'
+        'dnsmasq-sysusers.conf'
+        'dnsmasq.service')
+sha256sums=('6eac3b1c50ae25170e3ff8c96ddb55236cf45007633fdb8a35b1f3e02f5f8b8a'
+            'SKIP'
+            'bd39af88222ec44d269734d0513656bed865fb0f0901b538fdbbe19768e91bcf'
+            '5c969e79037980f3d138434a40c4478f7383f9ee9a46689c96dcf93f74062e11'
+            '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
+            '983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')
+
+_build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_IDN -DHAVE_CONNTRACK"
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 < "${srcdir}"/0001-do-not-include-stdio-h-before-dnsmasq-h.patch
+  patch -Np1 < "${srcdir}"/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  make \
+    CFLAGS="$CPPFLAGS $CFLAGS" \
+    LDFLAGS="$LDFLAGS" \
+    COPTS="$_build_copts" \
+    all-i18n
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  # need to pass COPTS here to avoid rebuilding the binary.
+  make \
+    COPTS="$_build_copts" \
+    BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" \
+    install install-i18n
+
+  install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/usr/share/dbus-1/system.d/dnsmasq.conf
+  install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
+  install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service
+  install -Dm644 "$srcdir/dnsmasq-sysusers.conf" "$pkgdir"/usr/lib/sysusers.d/dnsmasq.conf
+
+  # DNSSEC setup
+  sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf
+  install -Dm644 "trust-anchors.conf" "$pkgdir"/usr/share/dnsmasq/trust-anchors.conf
+}
+
+# vim: ts=2 sw=2 et ft=sh

Copied: dnsmasq/repos/testing-i686/dnsmasq-sysusers.conf (from rev 304260, dnsmasq/trunk/dnsmasq-sysusers.conf)
===================================================================
--- testing-i686/dnsmasq-sysusers.conf	                        (rev 0)
+++ testing-i686/dnsmasq-sysusers.conf	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1 @@
+u dnsmasq - "dnsmasq daemon" /

Copied: dnsmasq/repos/testing-i686/dnsmasq.service (from rev 304260, dnsmasq/trunk/dnsmasq.service)
===================================================================
--- testing-i686/dnsmasq.service	                        (rev 0)
+++ testing-i686/dnsmasq.service	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A lightweight DHCP and caching DNS server
+After=network.target
+Documentation=man:dnsmasq(8)
+
+[Service]
+Type=dbus
+BusName=uk.org.thekelleys.dnsmasq
+ExecStartPre=/usr/bin/dnsmasq --test
+ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

Copied: dnsmasq/repos/testing-x86_64/0001-do-not-include-stdio-h-before-dnsmasq-h.patch (from rev 304260, dnsmasq/trunk/0001-do-not-include-stdio-h-before-dnsmasq-h.patch)
===================================================================
--- testing-x86_64/0001-do-not-include-stdio-h-before-dnsmasq-h.patch	                        (rev 0)
+++ testing-x86_64/0001-do-not-include-stdio-h-before-dnsmasq-h.patch	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1,24 @@
+Subject: [PATCH 1/1] do not include stdio.h before dnsmasq.h
+Date: Tue, 22 Aug 2017 23:19:29 +0200
+From: Christian Hesse <mail at eworm.de>
+
+We define some constants in dnsmasq.h, which have an influence on
+stdio.h. So do not include stdio.h before dnsmasq.h.
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ src/helper.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/helper.c b/src/helper.c
+index 635677e..281cb4a 100644
+--- a/src/helper.c
++++ b/src/helper.c
+@@ -14,7 +14,6 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+-#include <stdio.h>
+ #include "dnsmasq.h"
+ 
+ #ifdef HAVE_SCRIPT

Copied: dnsmasq/repos/testing-x86_64/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch (from rev 304260, dnsmasq/trunk/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch)
===================================================================
--- testing-x86_64/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch	                        (rev 0)
+++ testing-x86_64/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1,35 @@
+From: Chris Novakovic <chris at chrisn.me.uk>
+Date: Tue, 6 Jun 2017 22:02:59 +0000 (+0100)
+Subject: Fix logic of appending ".<layer>" to PXE basename
+X-Git-Tag: v2.78test1~1
+X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=2446514e716075cfe2be35e2a9b9de4eacdbac99
+
+Fix logic of appending ".<layer>" to PXE basename
+
+Commit f77700aa, which fixes a compiler warning, also breaks the
+behaviour of prepending ".<layer>" to basenames in --pxe-service: in
+situations where the basename contains a ".", the ".<layer>" suffix is
+erroneously added, and in situations where the basename doesn't contain
+a ".", the ".<layer>" suffix is erroneously omitted.
+
+A patch against the git HEAD is attached that inverts this logic and
+restores the expected behaviour of --pxe-service.
+---
+
+diff --git a/src/rfc2131.c b/src/rfc2131.c
+index a679470..1c850e5 100644
+--- a/src/rfc2131.c
++++ b/src/rfc2131.c
+@@ -836,10 +836,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
+ 	  
+ 	  if (strchr(service->basename, '.'))
+ 	    snprintf((char *)mess->file, sizeof(mess->file),
+-		"%s.%d", service->basename, layer);
++		"%s", service->basename);
+ 	  else
+ 	    snprintf((char *)mess->file, sizeof(mess->file),
+-		"%s", service->basename);
++		"%s.%d", service->basename, layer);
+ 	  
+ 	  option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
+ 	  option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));

Copied: dnsmasq/repos/testing-x86_64/PKGBUILD (from rev 304260, dnsmasq/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=dnsmasq
+pkgver=2.77
+pkgrel=4
+pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
+url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('glibc' 'gmp' 'libidn' 'libdbus' 'libnetfilter_conntrack' 'nettle')
+backup=('etc/dnsmasq.conf')
+validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley <simon at thekelleys.org.uk>
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
+        '0001-do-not-include-stdio-h-before-dnsmasq-h.patch'
+        '0002-Fix-logic-of-appending-layer-to-PXE-basename.patch'
+        'dnsmasq-sysusers.conf'
+        'dnsmasq.service')
+sha256sums=('6eac3b1c50ae25170e3ff8c96ddb55236cf45007633fdb8a35b1f3e02f5f8b8a'
+            'SKIP'
+            'bd39af88222ec44d269734d0513656bed865fb0f0901b538fdbbe19768e91bcf'
+            '5c969e79037980f3d138434a40c4478f7383f9ee9a46689c96dcf93f74062e11'
+            '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
+            '983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')
+
+_build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_IDN -DHAVE_CONNTRACK"
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 < "${srcdir}"/0001-do-not-include-stdio-h-before-dnsmasq-h.patch
+  patch -Np1 < "${srcdir}"/0002-Fix-logic-of-appending-layer-to-PXE-basename.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  make \
+    CFLAGS="$CPPFLAGS $CFLAGS" \
+    LDFLAGS="$LDFLAGS" \
+    COPTS="$_build_copts" \
+    all-i18n
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  # need to pass COPTS here to avoid rebuilding the binary.
+  make \
+    COPTS="$_build_copts" \
+    BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" \
+    install install-i18n
+
+  install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/usr/share/dbus-1/system.d/dnsmasq.conf
+  install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
+  install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service
+  install -Dm644 "$srcdir/dnsmasq-sysusers.conf" "$pkgdir"/usr/lib/sysusers.d/dnsmasq.conf
+
+  # DNSSEC setup
+  sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf
+  install -Dm644 "trust-anchors.conf" "$pkgdir"/usr/share/dnsmasq/trust-anchors.conf
+}
+
+# vim: ts=2 sw=2 et ft=sh

Copied: dnsmasq/repos/testing-x86_64/dnsmasq-sysusers.conf (from rev 304260, dnsmasq/trunk/dnsmasq-sysusers.conf)
===================================================================
--- testing-x86_64/dnsmasq-sysusers.conf	                        (rev 0)
+++ testing-x86_64/dnsmasq-sysusers.conf	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1 @@
+u dnsmasq - "dnsmasq daemon" /

Copied: dnsmasq/repos/testing-x86_64/dnsmasq.service (from rev 304260, dnsmasq/trunk/dnsmasq.service)
===================================================================
--- testing-x86_64/dnsmasq.service	                        (rev 0)
+++ testing-x86_64/dnsmasq.service	2017-08-27 19:43:57 UTC (rev 304261)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A lightweight DHCP and caching DNS server
+After=network.target
+Documentation=man:dnsmasq(8)
+
+[Service]
+Type=dbus
+BusName=uk.org.thekelleys.dnsmasq
+ExecStartPre=/usr/bin/dnsmasq --test
+ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

More information about the arch-commits mailing list