[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcp.install)

[Jan Steffens]

    Date: Saturday, November 3, 2012 @ 13:32:17
  Author: heftig
Revision: 170144

4.2.4.2, with /var/lib instead of /var/state

Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhcp.install

--------------+
 PKGBUILD     |   24 +++++++++++-------------
 dhcp.install |   22 +++++++++-------------
 2 files changed, 20 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-03 17:26:58 UTC (rev 170143)
+++ PKGBUILD	2012-11-03 17:32:17 UTC (rev 170144)
@@ -5,10 +5,10 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.1
-_pkgver=4.2.4-P1
+pkgver=4.2.4.2
+_pkgver=4.2.4-P2
 
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
@@ -17,8 +17,8 @@
         dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
         dhcp-4.1.1-missing-ipv6-not-fatal.patch
         dhclient-script-pathFixes.patch)
-md5sums=('0ca7181024651f6323951d5498c8020b'
-         '0dfe000dd88555ea06b282ae5e574d5f'
+md5sums=('fe36056f2d274fa4b82a5422f192e65f'
+         '1f20126efd33c34d52a4148db780921f'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
@@ -37,10 +37,10 @@
   patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-      --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
-      --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
-      --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
+      --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+      --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+      --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
+      --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
 
   make
 
@@ -59,12 +59,10 @@
   install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
   install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
   install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
-  install -d "${pkgdir}/var/state/dhcp"
+  install -d "${pkgdir}/var/lib/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
@@ -83,7 +81,7 @@
   # move dhclient.conf to dhclient.conf.example
   mv "${pkgdir}"/etc/dhclient.conf{,.example}
   
-  install -d "${pkgdir}/var/state/dhclient"
+  install -d "${pkgdir}/var/lib/dhclient"
 
   # install dhclient linux script
   install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"

Modified: dhcp.install
===================================================================
--- dhcp.install	2012-11-03 17:26:58 UTC (rev 170143)
+++ dhcp.install	2012-11-03 17:32:17 UTC (rev 170144)
@@ -1,18 +1,14 @@
-# arg 1:  the new package version
 post_install() {
-  [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
-  [ -f var/state/dhcp/dhcpd6.leases ] || : >var/state/dhcp/dhcpd6.leases
-  #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded."
-
-  echo
-  echo "==> The dhcp server has now two rc.d scripts."
-  echo "==> Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or"
-  echo "==> '/etc/rc.d/dhcp4' to use IPv4 dhcp server."
-  echo "==> Make sure that you change your DAEMONS array in '/etc/rc.conf'!"
+  [[ -f var/lib/dhcp/dhcpd.leases ]] || : >var/lib/dhcp/dhcpd.leases
+  [[ -f var/lib/dhcp/dhcpd6.leases ]] || : >var/lib/dhcp/dhcpd6.leases
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  if (( $(vercmp $2 4.2.4.2) < 0 )); then
+    echo ">>> Lease directory moved from /var/state/dhcp"
+    echo "    to /var/lib/dhcp. Move your old lease files"
+    echo "    if you want to keep using them."
+  fi
+
+  post_install
 }