[Pkg-utopia-commits] r1041 - in packages/unstable/dhcdbd/debian: .
patches
Michael Biebl
mbiebl-guest at costa.debian.org
Thu Sep 28 19:00:07 UTC 2006
Author: mbiebl-guest
Date: 2006-09-28 19:00:07 +0000 (Thu, 28 Sep 2006)
New Revision: 1041
Removed:
packages/unstable/dhcdbd/debian/patches/04-dhcdbd_conf_netdev_group.patch
packages/unstable/dhcdbd/debian/patches/40_dbus0.9.patch
Modified:
packages/unstable/dhcdbd/debian/changelog
packages/unstable/dhcdbd/debian/control
packages/unstable/dhcdbd/debian/dhcdbd.1
packages/unstable/dhcdbd/debian/dhcdbd.dbus-event
packages/unstable/dhcdbd/debian/patches/01-debian_specific_paths.patch
packages/unstable/dhcdbd/debian/patches/02-dhcdbd_location.patch
packages/unstable/dhcdbd/debian/patches/03-remove_extended_options_from_dhcdbd.patch
packages/unstable/dhcdbd/debian/rules
packages/unstable/dhcdbd/debian/watch
Log:
* New upstream release 2.0.
* Updated watch file.
* Improved init script, add dependency on lsb-base (>= 3.0-6) as we use lsb-style logging functions.
* Removed debian/patches/40_dbus0.9.patch, fixed upstream.
* Removed debian/patches/04-dhcdbd_conf_netdev_group.patch, not really needed as only root has to access the dhcdbd service.
* Use the term D-Bus consistently everywhere.
* debian/control:
Set DEB_MAKE_INVOKE = $(MAKE), otherwise the build fails, because the CFLAGS are overwritten. Probably an upstream bug.
Modified: packages/unstable/dhcdbd/debian/changelog
===================================================================
--- packages/unstable/dhcdbd/debian/changelog 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/changelog 2006-09-28 19:00:07 UTC (rev 1041)
@@ -1,7 +1,20 @@
+dhcdbd (2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/40_dbus0.9.patch
+ - Removed, fixed upstream.
+ * debian/patches/04-dhcdbd_conf_netdev_group.patch
+ - Removed, not actually needed.
+ * Improved the init script, added a dependency on lsb-base (>= 3.0-6).
+ * Use the term D-Bus consistently in the man page and package description.
+ * Updated the watch file.
+
+ -- Michael Biebl <biebl at teco.edu> Thu, 28 Sep 2006 19:20:10 +0200
+
dhcdbd (1.14-3) unstable; urgency=low
* Changed a deprecated dbus function (closes: #385383)
- - added 40_dbus0.9.patch
+ - added 40_dbus0.9.patch
-- Riccardo Setti <giskard at debian.org> Tue, 5 Sep 2006 19:42:19 +0200
Modified: packages/unstable/dhcdbd/debian/control
===================================================================
--- packages/unstable/dhcdbd/debian/control 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/control 2006-09-28 19:00:07 UTC (rev 1041)
@@ -8,8 +8,8 @@
Package: dhcdbd
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, dhcp3-client, dbus (>= 0.60), adduser
-Description: dbus interface to the ISC DHCP client
- dhcdbd provides a dbus interface to dhclient, the DHCP client from ISC,
+Depends: ${misc:Depends}, ${shlibs:Depends}, dhcp3-client, dbus (>= 0.60), adduser, lsb-base (>= 3.0-6)
+Description: D-Bus interface to the ISC DHCP client
+ dhcdbd provides a D-Bus interface to dhclient, the DHCP client from ISC,
so applications such as NetworkManager can query and control dhclient.
This allows an application neutral interface for such operations
Modified: packages/unstable/dhcdbd/debian/dhcdbd.1
===================================================================
--- packages/unstable/dhcdbd/debian/dhcdbd.1 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/dhcdbd.1 2006-09-28 19:00:07 UTC (rev 1041)
@@ -34,7 +34,7 @@
.SH "DESCRIPTION"
.PP
-\fBdhcdbd\fR is designed to be started as a D\-BUS service from a service description file, by default /usr/share/dbus\-1/services/dhcdbd\&.service;
+\fBdhcdbd\fR is designed to be started as a D\-Bus service from a service description file, by default /usr/share/dbus\-1/services/dhcdbd\&.service;
.PP
hence the default bus it will connect to is the "STARTER" bus, and it must be installed setuid to root\&.
Modified: packages/unstable/dhcdbd/debian/dhcdbd.dbus-event
===================================================================
--- packages/unstable/dhcdbd/debian/dhcdbd.dbus-event 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/dhcdbd.dbus-event 2006-09-28 19:00:07 UTC (rev 1041)
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# DBUS aware dhcpd client
+# DHCP D-Bus daemon
#
# Author: Michael Biebl <biebl at teco.edu>
#
@@ -8,7 +8,7 @@
set -e
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="DBUS aware dhcp client"
+DESC="DHCP D-Bus daemon"
NAME="dhcdbd"
DAEMON=/usr/sbin/$NAME
DAEMON_OPTS=--system
@@ -24,41 +24,38 @@
# Function that starts the daemon/service.
#
d_start() {
- log_begin_msg "Starting $DESC: $NAME"
-
start-stop-daemon --start --quiet --pidfile $PIDFILE \
--exec $DAEMON -- $DAEMON_OPTS
-
- log_end_msg $?
}
#
# Function that stops the daemon/service.
#
d_stop() {
- log_begin_msg "Stopping $DESC: $NAME"
-
start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON
-
- log_end_msg $?
+ --oknodo --retry 60 --exec $DAEMON
}
case "$1" in
start)
+ log_daemon_msg "Starting $DESC" "$NAME"
d_start
+ log_end_msg $?
;;
stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
d_stop
+ log_end_msg $?
;;
restart|force-reload)
+ log_daemon_msg "Restarting $DESC" "$NAME"
d_stop
- sleep 1
d_start
+ log_end_msg $?
;;
*)
- log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
Modified: packages/unstable/dhcdbd/debian/patches/01-debian_specific_paths.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/01-debian_specific_paths.patch 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/patches/01-debian_specific_paths.patch 2006-09-28 19:00:07 UTC (rev 1041)
@@ -1,24 +1,25 @@
---- dhcdbd.new 2006-01-11 21:44:38.000000000 +0100
-+++ dhcdbd.h 2005-11-17 03:36:00.000000000 +0100
-@@ -31,10 +31,10 @@
- #define DHCDBD_DHCLIENT_BIN "/sbin/dhclient"
+--- include/dhcdbd.h.orig 2006-08-24 18:34:47.000000000 +0200
++++ include/dhcdbd.h 2006-09-28 19:48:59.000000000 +0200
+@@ -40,11 +40,11 @@
#endif
+
#ifndef DHCDBD_DHCLIENT_LEASE_DIR
+-#define DHCDBD_DHCLIENT_LEASE_DIR "/var/lib/dhclient/"
+#define DHCDBD_DHCLIENT_LEASE_DIR "/var/lib/dhcp3/"
--#define DHCDBD_DHCLIENT_LEASE_DIR "/var/lib/dhclient/"
#endif
+
#ifndef DHCDBD_DHCLIENT_LEASE_PFX
+-#define DHCDBD_DHCLIENT_LEASE_PFX "dhclient-"
+#define DHCDBD_DHCLIENT_LEASE_PFX "dhclient."
--#define DHCDBD_DHCLIENT_LEASE_PFX "dhclient-"
#endif
+
#ifndef DHCDBD_DHCLIENT_LEASE_SFX
- #define DHCDBD_DHCLIENT_LEASE_SFX ".leases"
-@@ -43,7 +43,7 @@
- #define DHCDBD_PID_FILE "/var/run/dhcdbd.pid"
+@@ -56,7 +56,7 @@
#endif
+
#ifndef DHCDBD_DHCLIENT_PID_PFX
-+#define DHCDBD_DHCLIENT_PID_PFX "/var/run/dhclient."
--#define DHCDBD_DHCLIENT_PID_PFX "/var/run/dhclient-"
+-#define DHCDBD_DHCLIENT_PID_PFX "/var/run/dhclient-"
++#define DHCDBD_DHCLIENT_PID_PFX "/var/run/dhclient."
#endif
+
#ifndef DHCDBD_DHCLIENT_PID_SFX
- #define DHCDBD_DHCLIENT_PID_SFX ".pid"
Modified: packages/unstable/dhcdbd/debian/patches/02-dhcdbd_location.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/02-dhcdbd_location.patch 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/patches/02-dhcdbd_location.patch 2006-09-28 19:00:07 UTC (rev 1041)
@@ -1,27 +1,22 @@
---- Makefile 2005-11-17 03:36:00.000000000 +0100
-+++ Makefile.new 2006-01-23 17:44:48.000000000 +0100
-@@ -42,13 +42,13 @@
- if [ -d RedHat ]; then cd RedHat; make clean; fi;
-
- install:
-- mkdir -p $(DESTDIR)/sbin
-+ mkdir -p $(DESTDIR)/usr/sbin
- mkdir -p $(DESTDIR)/usr/share/dbus-1/services
- mkdir -p $(DESTDIR)/etc/dbus-1/system.d
-- cp -fp dhcdbd $(DESTDIR)/sbin
-+ cp -fp dhcdbd $(DESTDIR)/usr/sbin
- if [ `whoami` = 'root' ]; then \
-- chown root:root $(DESTDIR)/sbin/dhcdbd; \
-- chmod 6755 $(DESTDIR)/sbin/dhcdbd; \
-+ chown root:root $(DESTDIR)/usr/sbin/dhcdbd; \
-+ chmod 6755 $(DESTDIR)/usr/sbin/dhcdbd; \
- fi;
- cp -fp system.d/dhcdbd.conf $(DESTDIR)/etc/dbus-1/system.d
- cp -fp service/dhcdbd.service $(DESTDIR)/usr/share/dbus-1/services
---- service/dhcdbd.service 2005-11-17 03:36:00.000000000 +0100
-+++ service/dhcdbd.service.new 2006-01-23 17:43:27.000000000 +0100
+--- dhcdbd.service.orig 2005-11-17 03:36:00.000000000 +0100
++++ dhcdbd.service 2006-01-23 17:43:27.000000000 +0100
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=com.redhat.dhcp
-Exec=/sbin/dhcdbd
+Exec=/usr/sbin/dhcdbd
+--- Makefile.orig 2006-09-28 19:49:47.000000000 +0200
++++ Makefile 2006-09-28 19:53:15.000000000 +0200
+@@ -22,10 +22,10 @@
+ -rm -f *.tar.bz2
+
+ install: dhcdbd
+- mkdir -p $(DESTDIR)/sbin
++ mkdir -p $(DESTDIR)/usr/sbin
+ mkdir -p $(DESTDIR)/usr/share/dbus-1/services
+ mkdir -p $(DESTDIR)/etc/dbus-1/system.d
+- install -m 0755 src/dhcdbd $(DESTDIR)/sbin/dhcdbd
++ install -m 0755 src/dhcdbd $(DESTDIR)/usr/sbin/dhcdbd
+ install -m 0644 dhcdbd.conf $(DESTDIR)/etc/dbus-1/system.d/dhcdbd.conf
+ install -m 0644 dhcdbd.service $(DESTDIR)/usr/share/dbus-1/services/dhcdbd.service
+
Modified: packages/unstable/dhcdbd/debian/patches/03-remove_extended_options_from_dhcdbd.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/03-remove_extended_options_from_dhcdbd.patch 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/patches/03-remove_extended_options_from_dhcdbd.patch 2006-09-28 19:00:07 UTC (rev 1041)
@@ -1,5 +1,5 @@
---- dhcdbd.h 2006-01-13 21:25:33.000000000 +0100
-+++ dhcdbd.h.new 2006-01-13 21:25:16.000000000 +0100
+--- include/dhcdbd.h 2006-01-13 21:25:33.000000000 +0100
++++ include/dhcdbd.h.new 2006-01-13 21:25:16.000000000 +0100
@@ -58,7 +58,7 @@
#define DHCDBD_DHCLIENT_CONF_SFX ".conf"
#endif
Deleted: packages/unstable/dhcdbd/debian/patches/04-dhcdbd_conf_netdev_group.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/04-dhcdbd_conf_netdev_group.patch 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/patches/04-dhcdbd_conf_netdev_group.patch 2006-09-28 19:00:07 UTC (rev 1041)
@@ -1,11 +0,0 @@
---- system.d/dhcdbd.conf 2005-11-17 03:36:00.000000000 +0100
-+++ system.d/dhcdbd.conf.new 2006-02-09 20:29:22.000000000 +0100
-@@ -7,7 +7,7 @@
- <allow send_interface="com.redhat.dhcp"/>
- <allow send_destination="com.redhat.dhcp"/>
- </policy>
-- <policy user="named">
-+ <policy group="netdev">
- <allow send_interface="com.redhat.dhcp"/>
- <allow send_destination="com.redhat.dhcp"/>
- </policy>
Deleted: packages/unstable/dhcdbd/debian/patches/40_dbus0.9.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/40_dbus0.9.patch 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/patches/40_dbus0.9.patch 2006-09-28 19:00:07 UTC (rev 1041)
@@ -1,20 +0,0 @@
---- dbus_service.c.old 2006-08-24 17:37:47.801746000 +0200
-+++ dbus_service.c 2006-08-24 17:38:01.062574750 +0200
-@@ -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 );
- }
Modified: packages/unstable/dhcdbd/debian/rules
===================================================================
--- packages/unstable/dhcdbd/debian/rules 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/rules 2006-09-28 19:00:07 UTC (rev 1041)
@@ -5,7 +5,8 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_MAKE_INSTALL_TARGET=install DESTDIR=$(CURDIR)/debian/dhcdbd/
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/dhcdbd/
+DEB_MAKE_INVOKE = $(MAKE)
binary-install/dhcdbd::
@@ -15,6 +16,3 @@
install -D -m 755 $(CURDIR)/debian/dhcdbd.dbus-event \
$(CURDIR)/debian/dhcdbd/etc/dbus-1/event.d/24dhcdbd
-binary-fixup/dhcdbd::
- chmod -x $(DEB_DESTDIR)etc/dbus-1/system.d/dhcdbd.conf
- chmod -x $(DEB_DESTDIR)usr/share/dbus-1/services/dhcdbd.service
Modified: packages/unstable/dhcdbd/debian/watch
===================================================================
--- packages/unstable/dhcdbd/debian/watch 2006-09-27 21:12:19 UTC (rev 1040)
+++ packages/unstable/dhcdbd/debian/watch 2006-09-28 19:00:07 UTC (rev 1041)
@@ -1,2 +1,2 @@
version=3
-http://people.redhat.com/jvdias/dhcdbd/dhcdbd-([\d\.]*).tar.gz
+http://people.redhat.com/dcantrel/dhcdbd/dhcdbd-([\d\.]*).tar.bz2
More information about the Pkg-utopia-commits
mailing list