[arch-commits] CVS update of extra/daemons/dhcdbd (3 files)

[Jan de Groot]

    Date: Wednesday, April 25, 2007 @ 18:31:40
  Author: jgc
    Path: /home/cvs-extra/extra/daemons/dhcdbd

Modified: PKGBUILD (1.5 -> 1.6)
 Removed: dhcdbd-1.14-dbus_close.patch (1.1) dhcdbd.conf (1.1)

upgpkg: dhcdbd 2.7-1
Use default config, works fine as shipped by default, update to newer version, update website and source URL to point to the correct URL


------------------------------+
 PKGBUILD                     |   23 +++++++++++------------
 dhcdbd-1.14-dbus_close.patch |   21 ---------------------
 dhcdbd.conf                  |   19 -------------------
 3 files changed, 11 insertions(+), 52 deletions(-)


Index: extra/daemons/dhcdbd/PKGBUILD
diff -u extra/daemons/dhcdbd/PKGBUILD:1.5 extra/daemons/dhcdbd/PKGBUILD:1.6
--- extra/daemons/dhcdbd/PKGBUILD:1.5	Sun Oct 29 12:06:10 2006
+++ extra/daemons/dhcdbd/PKGBUILD	Wed Apr 25 18:31:39 2007
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD,v 1.5 2006/10/29 17:06:10 andyrtr Exp $
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.6 2007/04/25 22:31:39 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tor Krill <tor at krill.nu>
 
 pkgname=dhcdbd
-pkgver=1.14
-pkgrel=4
+pkgver=2.7
+pkgrel=1
 pkgdesc="DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options"
 arch=(i686 x86_64)
-url="http://people.redhat.com/~jvdias/dhcdbd/"
-depends=('dbus>=0.93' 'dhclient')
-source=(http://people.redhat.com/~jvdias/dhcdbd/$pkgname-$pkgver.tar.gz dhcdbd.script \
-	dhcdbd-1.14-dbus_close.patch)
-md5sums=('1180dee7a51a4384d55768650634cf93' 'db539f81ca440d7bc5ea69c83da91c8e'\
-         'a6e1ee2c1f72ae08936bfd3a1c3df70e')
+license=('GPL')
+url="http://people.redhat.com/dcantrel/dhcdbd/"
+depends=('dbus>=1.0.2-3' 'dhclient')
+source=(http://people.redhat.com/dcantrel/dhcdbd/${pkgname}-${pkgver}.tar.bz2
+        dhcdbd.script)
+md5sums=('9edf3eabe05487e7ee5f0b685683d7fb' 'db539f81ca440d7bc5ea69c83da91c8e')
+
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/dhcdbd-1.14-dbus_close.patch || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install
   mkdir -p ${startdir}/pkg/etc/rc.d/
   install -m755 ${startdir}/src/dhcdbd.script ${startdir}/pkg/etc/rc.d/dhcdbd
-  install -m644 ${startdir}/dhcdbd.conf ${startdir}/pkg/etc/dbus-1/system.d/dhcdbd.conf
 }
Index: extra/daemons/dhcdbd/dhcdbd-1.14-dbus_close.patch
diff -u extra/daemons/dhcdbd/dhcdbd-1.14-dbus_close.patch:1.1 extra/daemons/dhcdbd/dhcdbd-1.14-dbus_close.patch:removed
--- extra/daemons/dhcdbd/dhcdbd-1.14-dbus_close.patch:1.1	Sat Sep 30 08:14:43 2006
+++ extra/daemons/dhcdbd/dhcdbd-1.14-dbus_close.patch	Wed Apr 25 18:31:40 2007
@@ -1,21 +0,0 @@
-diff -ruN dhcdbd-1.14.orig/dbus_service.c dhcdbd-1.14/dbus_service.c
---- dhcdbd-1.14.orig/dbus_service.c	2006-07-28 16:38:43.000000000 -0500
-+++ dhcdbd-1.14/dbus_service.c	2006-07-28 16:39:41.000000000 -0500
-@@ -1412,7 +1412,7 @@
-     return ( cs );
- 
-  give_up:
--    dbus_connection_disconnect( connection );
-+    dbus_connection_close( connection );
-     dbus_shutdown();
-     return ( 0L );
- }
-@@ -1456,7 +1456,7 @@
-     cs->roots=0L;
- 
- 
--    dbus_connection_disconnect( cs->connection );
-+    dbus_connection_close( cs->connection );
-     dbus_shutdown();
-     free( cs );
- }
Index: extra/daemons/dhcdbd/dhcdbd.conf
diff -u extra/daemons/dhcdbd/dhcdbd.conf:1.1 extra/daemons/dhcdbd/dhcdbd.conf:removed
--- extra/daemons/dhcdbd/dhcdbd.conf:1.1	Sat Sep 30 08:14:43 2006
+++ extra/daemons/dhcdbd/dhcdbd.conf	Wed Apr 25 18:31:40 2007
@@ -1,19 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-    <servicedir>/usr/share/dbus-1/services</servicedir>
-    <policy user="root">
-	    <allow own="com.redhat.dhcp"/>
-	    <allow send_interface="com.redhat.dhcp"/>
-	    <allow send_destination="com.redhat.dhcp"/>
-    </policy>
-    <policy group="users">
-            <allow send_interface="com.redhat.dhcp"/>
-            <allow send_destination="com.redhat.dhcp"/>
-    </policy>
-    <policy context="default">
-            <deny own="com.redhat.dhcp"/>
-            <deny send_destination="com.redhat.dhcp"/>
-            <deny send_interface="com.redhat.dhcp"/>
-    </policy>    
-</busconfig>