[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)

[Christian Hesse]

    Date: Thursday, November 16, 2017 @ 11:36:40
  Author: eworm
Revision: 310046

upgpkg: dhcp 4.3.6-3

try to work around racy issue with network setup

Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhcpd4.service
  dhcp/trunk/dhcpd6.service

----------------+
 PKGBUILD       |   17 ++++++++---------
 dhcpd4.service |    7 +++++++
 dhcpd6.service |    7 +++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-16 09:18:02 UTC (rev 310045)
+++ PKGBUILD	2017-11-16 11:36:40 UTC (rev 310046)
@@ -7,14 +7,13 @@
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.3.6
-_pkgver=4.3.6
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
 makedepends=('bash' 'iproute2')
 validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign at isc.org>
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc}
         dhcp-sysusers.conf
         dhcpd4.service
         dhcpd6.service
@@ -23,13 +22,13 @@
 sha256sums=('a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b'
             'SKIP'
             'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
-            '59164167861fe3eb5cef3582bc694e4b1e4d4ca96709103351b83e69ae05f8c8'
-            '7a67175680ae509e5bae406f80b692a02aec3c647386a5519b1de00e7eea1218'
+            '537b52307e2196775d79b7e7087fa7499189e26bc9a1737c9b75acd45a720920'
+            '9a2a9bdf25871dfe875ed39d92a4d97852f9ad6c38fa74bd16cbc18e85986d3f'
             '259d004987b4759e0c9e1a8807a5baa3df74f1e0c57b058a9e1bc92ea41fcb6a'
             '97088096c5d880ecd889f4875ba89cf8eaf564bec772038e8976c22bd4896b18')
 
 prepare() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Sourced from Fedora - required for NM
   # https://bugzilla.gnome.org/show_bug.cgi?id=748268
@@ -37,7 +36,7 @@
 }
 
 build() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   ./configure \
       --prefix=/usr \
       --sbindir=/usr/bin \
@@ -58,7 +57,7 @@
   backup=('etc/dhcpd.conf' 'etc/dhcpd6.conf')
   install=dhcp.install
 
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/var/lib/dhcp"
@@ -83,7 +82,7 @@
   depends=('glibc' 'bash' 'iproute2')
   provides=('dhcp-client')
 
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C client DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/dhclient"

Modified: dhcpd4.service
===================================================================
--- dhcpd4.service	2017-11-16 09:18:02 UTC (rev 310045)
+++ dhcpd4.service	2017-11-16 11:36:40 UTC (rev 310046)
@@ -10,6 +10,13 @@
 ProtectSystem=full
 ProtectHome=on
 KillSignal=SIGINT
+# We pull in network-online.target for a configured network connection.
+# However this is not guaranteed to be the network connection our
+# networks are configured for. So try to restart on failure with a delay
+# of two seconds. Rate limiting kicks in after 12 seconds.
+RestartSec=2s
+Restart=on-failure
+StartLimitInterval=12s
 
 [Install]
 WantedBy=multi-user.target

Modified: dhcpd6.service
===================================================================
--- dhcpd6.service	2017-11-16 09:18:02 UTC (rev 310045)
+++ dhcpd6.service	2017-11-16 11:36:40 UTC (rev 310046)
@@ -10,6 +10,13 @@
 ProtectSystem=full
 ProtectHome=on
 KillSignal=SIGINT
+# We pull in network-online.target for a configured network connection.
+# However this is not guaranteed to be the network connection our
+# networks are configured for. So try to restart on failure with a delay
+# of two seconds. Rate limiting kicks in after 12 seconds.
+RestartSec=2s
+Restart=on-failure
+StartLimitInterval=12s
 
 [Install]
 WantedBy=multi-user.target