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

[Daniel Isenmann]

    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
===================================================================
--- PKGBUILD	2015-07-13 20:24:23 UTC (rev 242177)
+++ PKGBUILD	2015-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]