[arch-commits] Commit in dhcpcd/trunk (PKGBUILD dhcpcd.service dhcpcd_.service)

[Ronald van Haren]

    Date: Saturday, November 17, 2012 @ 08:46:44
  Author: ronald
Revision: 171422

upgpkg: dhcpcd 5.6.3-1

update to 5.6.3; add dhcpcd.service FS#31543; change arguments in service file to the ones recommended by upstream in FS#31543

Added:
  dhcpcd/trunk/dhcpcd_.service
Modified:
  dhcpcd/trunk/PKGBUILD
  dhcpcd/trunk/dhcpcd.service

-----------------+
 PKGBUILD        |   14 ++++++++------
 dhcpcd.service  |   12 +++++-------
 dhcpcd_.service |   15 +++++++++++++++
 3 files changed, 28 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-17 13:36:53 UTC (rev 171421)
+++ PKGBUILD	2012-11-17 13:46:44 UTC (rev 171422)
@@ -4,8 +4,8 @@
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.6.2
-pkgrel=2
+pkgver=5.6.3
+pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
 arch=('i686' 'x86_64')
@@ -15,10 +15,11 @@
 backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd.conf.d' 'dhcpcd.service')
-sha1sums=('7127237b5594ba50642829e76033a04d1c6fd42e'
+        'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service')
+sha1sums=('d64b589d15821aa5851fda81078183cc61a3e45a'
           'b67b9ce6a2faaca75fea356966a16be2283b7db0'
-          'cf00c0046687a0c3274c2e7756334f86e3d2b485')
+          'a015a70ed6a035a194ef0ef37de32f1d893ff086'
+          'e49e01041f831281a1cd0c97ca21204e0aa07fda')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -51,5 +52,6 @@
   echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
 
   # install systemd files
-  install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd at .service
+  install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd at .service
+  install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
 }

Modified: dhcpcd.service
===================================================================
--- dhcpcd.service	2012-11-17 13:36:53 UTC (rev 171421)
+++ dhcpcd.service	2012-11-17 13:46:44 UTC (rev 171422)
@@ -1,15 +1,13 @@
 [Unit]
-Description=dhcpcd on %I
+Description=dhcpcd on all interfaces
 Wants=network.target
 Before=network.target
-BindsTo=sys-subsystem-net-devices-%i.device
-After=sys-subsystem-net-devices-%i.device
 
 [Service]
 Type=forking
-PIDFile=/run/dhcpcd-%I.pid
-ExecStart=/usr/sbin/dhcpcd -A -q -w %I
-ExecStop=/usr/sbin/dhcpcd -k %I
+PIDFile=/run/dhcpcd.pid
+ExecStart=/sbin/dhcpcd -q -b
+ExecStop=/sbin/dhcpcd -x
 
 [Install]
-Alias=multi-user.target.wants/dhcpcd at eth0.service
+WantedBy=multi-user.target

Added: dhcpcd_.service
===================================================================
--- dhcpcd_.service	                        (rev 0)
+++ dhcpcd_.service	2012-11-17 13:46:44 UTC (rev 171422)
@@ -0,0 +1,15 @@
+[Unit]
+Description=dhcpcd on %I
+Wants=network.target
+Before=network.target
+BindsTo=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd-%I.pid
+ExecStart=/usr/sbin/dhcpcd -q -b %I
+ExecStop=/usr/sbin/dhcpcd -x %I
+
+[Install]
+Alias=multi-user.target.wants/dhcpcd at eth0.service