rpms/dhcdbd/devel dhcdbd-2.8-dbus-api.patch, NONE, 1.1 dhcdbd-2.8-open-mode.patch, NONE, 1.1 dhcdbd.spec, 1.48, 1.49

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcdbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5220

Modified Files:
	dhcdbd.spec 
Added Files:
	dhcdbd-2.8-dbus-api.patch dhcdbd-2.8-open-mode.patch 
Log Message:
* Wed Aug 08 2007 David Cantrell <dcantrell at redhat.com> - 2.8-3
- Update License tag to GPLv2
- Change dbus_watch_get_fd() calls to dbus_watch_get_unix_fd() calls
- Pass a mode to the open(2) call


dhcdbd-2.8-dbus-api.patch:

--- NEW FILE dhcdbd-2.8-dbus-api.patch ---
diff -up dhcdbd-2.8/src/dhcdbd.c.dbus dhcdbd-2.8/src/dhcdbd.c
diff -up dhcdbd-2.8/src/dbus_service.c.dbus dhcdbd-2.8/src/dbus_service.c
--- dhcdbd-2.8/src/dbus_service.c.dbus	2007-06-05 15:58:00.000000000 -0400
+++ dhcdbd-2.8/src/dbus_service.c	2007-08-08 18:46:03.000000000 -0400
@@ -1023,7 +1023,7 @@ static struct timeval *find_next_timeout
 
 static void set_watch_fds(DBusWatch * watch, DBusConnectionState * cs) {
     uint8_t flags = dbus_watch_get_flags(watch);
-    int fd = dbus_watch_get_fd(watch);
+    int fd = dbus_watch_get_unix_fd(watch);
 
     if (cs->n <= fd)
         cs->n = fd + 1;
@@ -1056,7 +1056,7 @@ static dbus_bool_t add_watch(DBusWatch *
     dbus_watch_set_data(watch, cs, no_free);
 
     if (cs->dh != 0L)
-        (*(cs->dh)) ("add_watch: %d", dbus_watch_get_fd (watch));
+        (*(cs->dh)) ("add_watch: %d", dbus_watch_get_unix_fd (watch));
 
     if (tsearch((const void *) watch, &(cs->watches), ptr_key_comparator) == 0L) {
         if (cs->eh != 0L)
@@ -1073,14 +1073,14 @@ static dbus_bool_t add_watch(DBusWatch *
 static void remove_watch(DBusWatch * watch, void *csp)
 {
     DBusConnectionState *cs = csp;
-    int fd = dbus_watch_get_fd(watch);
+    int fd = dbus_watch_get_unix_fd(watch);
 
     if (tdelete((const void *) watch, &(cs->watches), ptr_key_comparator) == 0L)
         if (cs->eh != 0L)
             (*(cs->eh)) ("remove_watch: can't happen?!?: watch not found");
 
     if (cs->dh != 0L)
-        (*(cs->dh)) ("remove_watch: %d", dbus_watch_get_fd(watch));
+        (*(cs->dh)) ("remove_watch: %d", dbus_watch_get_unix_fd(watch));
 
     FD_CLR(fd, &(cs->r_fds));
     FD_CLR(fd, &(cs->w_fds));
@@ -1091,7 +1091,7 @@ static void toggle_watch(DBusWatch * wat
     DBusConnectionState *cs = csp;
 
     if (cs->dh != 0L)
-        (*(cs->dh)) ("toggle_watch: %d", dbus_watch_get_fd(watch));
+        (*(cs->dh)) ("toggle_watch: %d", dbus_watch_get_unix_fd(watch));
 
     set_watch_fds(watch, cs);
 }
@@ -1113,11 +1113,11 @@ static void process_watch(const void *p,
         if (!dbus_watch_get_enabled(w))
             return;
 
-        fd = dbus_watch_get_fd(w);
+        fd = dbus_watch_get_unix_fd(w);
         flags = dbus_watch_get_flags(w);
 
         if (cs->dh != 0L)
-            (*(cs->dh)) ("handle_watch: %d", dbus_watch_get_fd(w));
+            (*(cs->dh)) ("handle_watch: %d", dbus_watch_get_unix_fd(w));
 
         if ((flags & DBUS_WATCH_READABLE) && (FD_ISSET(fd, &(cs->s_r_fds))))
             dbus_watch_handle(w, DBUS_WATCH_READABLE);

dhcdbd-2.8-open-mode.patch:

--- NEW FILE dhcdbd-2.8-open-mode.patch ---
diff -up dhcdbd-2.8/src/dhcdbd.c.mode dhcdbd-2.8/src/dhcdbd.c
--- dhcdbd-2.8/src/dhcdbd.c.mode	2006-08-25 15:45:05.000000000 -0400
+++ dhcdbd-2.8/src/dhcdbd.c	2007-08-08 18:51:12.000000000 -0400
@@ -2830,7 +2830,7 @@ dhcdbd_run (D_BUS_TYPE bus)
                 return (1);
         }
         unlink (DHCDBD_PID_FILE);
-        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT)) == -1)
+        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT), 0644) == -1)
                 exit (errno);
         l = sprintf (path, "%u", getpid ());
         l = write (fd, path, l);


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- dhcdbd.spec	8 Aug 2007 22:34:46 -0000	1.48
+++ dhcdbd.spec	8 Aug 2007 22:52:56 -0000	1.49
@@ -12,6 +12,9 @@
 
 Source:    http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
 
+Patch0:    %{name}-2.8-dbus-api.patch
+Patch1:    %{name}-2.8-open-mode.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: dbus-devel >= 0.90, pkgconfig
 
@@ -29,6 +32,8 @@
 
 %prep
 %setup -q
+%patch0 -p 1 -b .dbus
+%patch1 -p 1 -b .mode
 
 %build
 %{__make} %{?_smp_mflags}
@@ -68,6 +73,8 @@
 %changelog
 * Wed Aug 08 2007 David Cantrell <dcantrell at redhat.com> - 2.8-3
 - Update License tag to GPLv2
+- Change dbus_watch_get_fd() calls to dbus_watch_get_unix_fd() calls
+- Pass a mode to the open(2) call
 
 * Mon Jun 11 2007 David Cantrell <dcantrell at redhat.com> - 2.8-2
 - Merge review (#225690)