[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)
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
===
--- PKGBUILD2017-11-16 09:18:02 UTC (rev 310045)
+++ PKGBUILD2017-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)
-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
[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)
Date: Monday, July 13, 2015 @ 23:15:26
Author: daniel
Revision: 242178
upgpkg: dhcp 4.3.2-2
Fixed FS#23933 and FS#43405
Modified:
dhcp/trunk/PKGBUILD
dhcp/trunk/dhcpd4.service
dhcp/trunk/dhcpd6.service
+
PKGBUILD | 13 ++---
dhcpd4.service |2 +-
dhcpd6.service |2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-13 20:24:23 UTC (rev 242177)
+++ PKGBUILD2015-07-13 21:15:26 UTC (rev 242178)
@@ -7,12 +7,12 @@
# separate patch levels with a period to maintain proper versioning.
pkgver=4.3.2
_pkgver=4.3.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url=https://www.isc.org/software/dhcp;
makedepends=('bash' 'iproute2')
-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
dhcpd4.service
dhcpd6.service
dhcp-4.3.1-client_script-1.patch
@@ -19,13 +19,11 @@
dhcp-4.3.1-missing_ipv6-1.patch
arch_patch_over_lfs.patch)
md5sums=('5a284875dd2c12ddd388416d69156a67'
- 'SKIP'
- '22579cc6ce2b71383f817b0564c44c4d'
- 'a03765a91fda3f139229dd82ea372f8f'
+ '33cceed7056fdceda845eef26934f30f'
+ '4db26ed8335b908ef8cdee55172a84ed'
'c02bddb6c6c33c5885e3dd072ee2ee40'
'da655f02f1cf4d95b4708e84e69edbc8'
'ea45057374098b8ff7e140ecedf7696a')
-validpgpkeys=('ADBE9446286C794905F1E0756FA6EBC9911A4C02')
prepare() {
cd ${srcdir}/${pkgbase}-${_pkgver}
@@ -57,7 +55,7 @@
package_dhcp(){
pkgdesc=A DHCP server, client, and relay agent
depends=('glibc')
- backup=('etc/dhcpd.conf')
+ backup=('etc/dhcpd.conf' 'etc/dhcpd6.conf')
install=dhcp.install
cd ${srcdir}/${pkgbase}-${_pkgver}
@@ -70,6 +68,7 @@
# move back to config. This file is in backup array, so pacman will not
overwrite a changed config.
mv ${pkgdir}/etc/dhcpd.conf.example ${pkgdir}/etc/dhcpd.conf
+ cp ${pkgdir}/etc/dhcpd.conf ${pkgdir}/etc/dhcpd6.conf
# Remove dhclient
make -C client DESTDIR=${pkgdir} uninstall
Modified: dhcpd4.service
===
--- dhcpd4.service 2015-07-13 20:24:23 UTC (rev 242177)
+++ dhcpd4.service 2015-07-13 21:15:26 UTC (rev 242178)
@@ -5,7 +5,7 @@
[Service]
Type=forking
PIDFile=/run/dhcpd4.pid
-ExecStart=/usr/bin/dhcpd -4 -q -pf /run/dhcpd4.pid
+ExecStart=/usr/bin/dhcpd -4 -q -cf /etc/dhcpd.conf -pf /run/dhcpd4.pid
KillSignal=SIGINT
[Install]
Modified: dhcpd6.service
===
--- dhcpd6.service 2015-07-13 20:24:23 UTC (rev 242177)
+++ dhcpd6.service 2015-07-13 21:15:26 UTC (rev 242178)
@@ -5,7 +5,7 @@
[Service]
Type=forking
PIDFile=/run/dhcpd6.pid
-ExecStart=/usr/bin/dhcpd -6 -q -pf /run/dhcpd6.pid
+ExecStart=/usr/bin/dhcpd -6 -q -cf /etc/dhcpd6.conf -pf /run/dhcpd6.pid
KillSignal=SIGINT
[Install]
[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)
Date: Tuesday, March 4, 2014 @ 22:05:32
Author: anatolik
Revision: 206682
Use /usr/bin path instead of /usr/sbin/
Modified:
dhcp/trunk/PKGBUILD
dhcp/trunk/dhcpd4.service
dhcp/trunk/dhcpd6.service
+
PKGBUILD |4 ++--
dhcpd4.service |2 +-
dhcpd6.service |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-04 20:54:54 UTC (rev 206681)
+++ PKGBUILD2014-03-04 21:05:32 UTC (rev 206682)
@@ -20,8 +20,8 @@
dhcp-4.2.5-missing_ipv6-1.patch)
md5sums=('1020d77e1a4c1f01b76279caff9beb80'
'SKIP'
- '439ee2f145a1e86dd644cb94a854f8e7'
- '588aa85b6fe228c45623185a58d11992'
+ '22579cc6ce2b71383f817b0564c44c4d'
+ 'a03765a91fda3f139229dd82ea372f8f'
'9e4dcf90beec15bfcb6631809cdcc780'
'da655f02f1cf4d95b4708e84e69edbc8')
Modified: dhcpd4.service
===
--- dhcpd4.service 2014-03-04 20:54:54 UTC (rev 206681)
+++ dhcpd4.service 2014-03-04 21:05:32 UTC (rev 206682)
@@ -5,7 +5,7 @@
[Service]
Type=forking
PIDFile=/run/dhcpd4.pid
-ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid
+ExecStart=/usr/bin/dhcpd -4 -q -pf /run/dhcpd4.pid
KillSignal=SIGINT
[Install]
Modified: dhcpd6.service
===
--- dhcpd6.service 2014-03-04 20:54:54 UTC (rev 206681)
+++ dhcpd6.service 2014-03-04 21:05:32 UTC (rev 206682)
@@ -5,7 +5,7 @@
[Service]
Type=forking
PIDFile=/run/dhcpd6.pid
-ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid
+ExecStart=/usr/bin/dhcpd -6 -q -pf /run/dhcpd6.pid
KillSignal=SIGINT
[Install]
[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)
Date: Saturday, October 13, 2012 @ 13:03:14
Author: thomas
Revision: 168634
upgpkg: dhcp 4.2.4.1-3: Remove broken ExecReload= from units
Modified:
dhcp/trunk/PKGBUILD
dhcp/trunk/dhcpd4.service
dhcp/trunk/dhcpd6.service
+
PKGBUILD |6 +++---
dhcpd4.service |1 -
dhcpd6.service |1 -
3 files changed, 3 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-13 16:48:28 UTC (rev 168633)
+++ PKGBUILD2012-10-13 17:03:14 UTC (rev 168634)
@@ -8,7 +8,7 @@
pkgver=4.2.4.1
_pkgver=4.2.4-P1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url=https://www.isc.org/software/dhcp;
@@ -22,8 +22,8 @@
'c49b1497837ba56c54e401a66e1bab9b'
'12c2f3ae47ed23eb698eb7f1bfd80f20'
'8f357e46e1efcbb746f38737a3f977a2'
- '1076444f22e13eb5f6bff7821fd0f446'
- '9310f2d8b1d7e97ace06d68cb41d9998'
+ '439ee2f145a1e86dd644cb94a854f8e7'
+ '588aa85b6fe228c45623185a58d11992'
'fd64aeb4f399dcc41ea43089a3811094'
'541b415a25a169eaf64b681405f79a80')
Modified: dhcpd4.service
===
--- dhcpd4.service 2012-10-13 16:48:28 UTC (rev 168633)
+++ dhcpd4.service 2012-10-13 17:03:14 UTC (rev 168634)
@@ -6,7 +6,6 @@
Type=forking
PIDFile=/run/dhcpd4.pid
ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid
-ExecReload=/bin/kill -TERM $MAINPID
KillSignal=SIGINT
[Install]
Modified: dhcpd6.service
===
--- dhcpd6.service 2012-10-13 16:48:28 UTC (rev 168633)
+++ dhcpd6.service 2012-10-13 17:03:14 UTC (rev 168634)
@@ -6,7 +6,6 @@
Type=forking
PIDFile=/run/dhcpd6.pid
ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid
-ExecReload=/bin/kill -TERM $MAINPID
KillSignal=SIGINT
[Install]
[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)
Date: Friday, August 17, 2012 @ 18:53:26
Author: heftig
Revision: 165389
Add systemd services
Added:
dhcp/trunk/dhcpd4.service
dhcp/trunk/dhcpd6.service
Modified:
dhcp/trunk/PKGBUILD
+
PKGBUILD | 11 +--
dhcpd4.service | 13 +
dhcpd6.service | 13 +
3 files changed, 35 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-08-17 22:41:23 UTC (rev 165388)
+++ PKGBUILD2012-08-17 22:53:26 UTC (rev 165389)
@@ -8,13 +8,13 @@
pkgver=4.2.4.1
_pkgver=4.2.4-P1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url=https://www.isc.org/software/dhcp;
makedepends=('bash' 'iproute2' 'net-tools')
source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
-dhcp4 dhcp6 dhcp
+dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
dhcp-4.1.1-missing-ipv6-not-fatal.patch
dhclient-script-pathFixes.patch)
md5sums=('0ca7181024651f6323951d5498c8020b'
@@ -22,6 +22,8 @@
'c49b1497837ba56c54e401a66e1bab9b'
'12c2f3ae47ed23eb698eb7f1bfd80f20'
'8f357e46e1efcbb746f38737a3f977a2'
+ '1076444f22e13eb5f6bff7821fd0f446'
+ '9310f2d8b1d7e97ace06d68cb41d9998'
'fd64aeb4f399dcc41ea43089a3811094'
'541b415a25a169eaf64b681405f79a80')
@@ -59,6 +61,11 @@
install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase}
install -d ${pkgdir}/var/state/dhcp
+ install -D -m644 ${srcdir}/dhcpd4.service
${pkgdir}/usr/lib/systemd/system/dhcpd4.service
+ install -D -m644 ${srcdir}/dhcpd6.service
${pkgdir}/usr/lib/systemd/system/dhcpd6.service
+ ln -s dhcpd4.service ${pkgdir}/usr/lib/systemd/system/dhcp4.service
+ ln -s dhcpd6.service ${pkgdir}/usr/lib/systemd/system/dhcp6.service
+
# Remove dhclient
make -C client DESTDIR=${pkgdir} uninstall
Added: dhcpd4.service
===
--- dhcpd4.service (rev 0)
+++ dhcpd4.service 2012-08-17 22:53:26 UTC (rev 165389)
@@ -0,0 +1,13 @@
+[Unit]
+Description=IPv4 DHCP server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpd4.pid
+ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid
+ExecReload=/bin/kill -TERM $MAINPID
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target
Added: dhcpd6.service
===
--- dhcpd6.service (rev 0)
+++ dhcpd6.service 2012-08-17 22:53:26 UTC (rev 165389)
@@ -0,0 +1,13 @@
+[Unit]
+Description=IPv6 DHCP server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpd6.pid
+ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid
+ExecReload=/bin/kill -TERM $MAINPID
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target
