FreeBSD backend fixes. malloc.h -> stdlib.h

(Portage version: 2.1.2.3)

5 files changed, 100 insertions, 11 deletions

diff --git a/sys-apps/hal/files/0.5.9/04_cache_regen_return_fix.patch b/sys-apps/hal/files/0.5.9/04_cache_regen_return_fix.patch
index a31f84e80199..be16eb212118 100644
--- a/sys-apps/hal/files/0.5.9/04_cache_regen_return_fix.patch
+++ b/sys-apps/hal/files/0.5.9/04_cache_regen_return_fix.patch
@@ -1,13 +1,18 @@
 Index: b/hald/mmap_cache.c
 ===================================================================
 --- a/hald/mmap_cache.c	2007-03-07 16:55:02.000000000 -0500
-+++ b/hald/mmap_cache.c	2007-04-10 10:56:10.000000000 -0400
-@@ -137,7 +137,7 @@
++++ b/hald/mmap_cache.c	2007-04-11 12:16:44.000000000 -0400
+@@ -137,10 +137,10 @@
  	HAL_INFO (("In regen_cache_cb exit_type=%d, return_code=%d", exit_type, return_code));
  
  	/* see create_cache.c - rc==0 means success - rc==2 means "success, but some fdi files skipped" */
 -	if (exit_type != HALD_RUN_SUCCESS || return_code != 0 || return_code != 2) {
-+	if (exit_type != HALD_RUN_SUCCESS || ( return_code != 0 && return_code != 2)) {
- 		regen_cache_success = FALSE;
- 	} else {
+-		regen_cache_success = FALSE;
+-	} else {
++	if (exit_type == HALD_RUN_SUCCESS && ( return_code == 0 || return_code == 2)) {
  		regen_cache_success = TRUE;
++	} else {
++		regen_cache_success = FALSE;
+ 	}
+ 
+ 	regen_cache_done = TRUE;
diff --git a/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch b/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch
index 6e09b69e5ccb..c11d24de47db 100644
--- a/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch
+++ b/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch
@@ -1,20 +1,23 @@
 Index: b/partutil/Makefile.am
 ===================================================================
---- a/partutil/Makefile.am	2007-03-07 16:52:19.000000000 -0500
-+++ b/partutil/Makefile.am	2007-04-11 12:03:45.000000000 -0400
-@@ -1,8 +1,6 @@
+--- a/partutil/Makefile.am	2007-04-11 12:15:39.000000000 -0400
++++ b/partutil/Makefile.am	2007-04-11 12:23:05.000000000 -0400
+@@ -1,12 +1,8 @@
 -if HALD_COMPILE_SOLARIS 
 -# do nothing
 -else if HALD_COMPILE_FREEBSD
 -# do nothing
 -else 
+-
+ INCLUDES = @GLIB_CFLAGS@
+ 
 +if HALD_COMPILE_LINUX
-+noinst_LTLIBRARIES = libpartutil.la
+ noinst_LTLIBRARIES = libpartutil.la
 +endif
  
- INCLUDES = @GLIB_CFLAGS@
+ libpartutil_la_SOURCES = partutil.h partutil.c ../hald/logger.c
  
-@@ -14,4 +12,3 @@
+@@ -14,4 +10,3 @@
  
  clean-local :
  	rm -f *~
diff --git a/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch b/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch
new file mode 100644
index 000000000000..4539092e1a94
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch
@@ -0,0 +1,53 @@
+Index: b/hald/freebsd/hf-usb.c
+===================================================================
+--- a/hald/freebsd/hf-usb.c	2007-03-24 18:32:57.000000000 -0400
++++ b/hald/freebsd/hf-usb.c	2007-04-11 12:56:02.000000000 -0400
+@@ -372,11 +372,11 @@
+       can_wake_up = (config_desc.bmAttributes & UC_REMOTE_WAKEUP) != 0;
+       num_interfaces = config_desc.bNumInterface;
+ 
+-      if (config_desc->iConfiguration != 0)
++      if (config_desc.iConfiguration != 0)
+ 	{
+ 	  char *configuration;
+ 
+-	  configuration = hf_usb_get_string_descriptor(controller->fd, di->udi_addr, config_desc->iConfiguration, NULL);
++	  configuration = hf_usb_get_string_descriptor(controller->fd, di->udi_addr, config_desc.iConfiguration, NULL);
+ 	  if (configuration)
+ 	    {
+ 	      hal_device_property_set_string(device, "usb_device.configuration", configuration);
+@@ -424,6 +424,8 @@
+ 
+ static HalDevice *
+ hf_usb_interface_device_new (HalDevice *parent,
++			     Controller *controller,
++			     const struct usb_device_info *di,
+ 			     const usb_interface_descriptor_t *desc)
+ {
+   HalDevice *device;
+@@ -447,6 +449,7 @@
+   hal_device_property_set_int(device, "usb.interface.protocol", desc->bInterfaceProtocol);
+   hal_device_property_set_int(device, "usb.interface.number", desc->bInterfaceNumber);
+ 
++  /** FIX ME.. controller and di are not variables in this scope..
+   if (desc->iInterface != 0)
+     {
+       char *interface;
+@@ -458,7 +461,7 @@
+ 	  g_free(interface);
+ 	}
+     }
+-
++*/
+ 
+   hf_usb_device_compute_udi(device);
+ 
+@@ -576,7 +579,7 @@
+ 	      break;
+ 	    }
+ 
+-	  if_device = hf_usb_interface_device_new(device, if_desc);
++	  if_device = hf_usb_interface_device_new(device, controller, device_info, if_desc);
+ 	  hf_device_preprobe_and_add(if_device);
+ 
+ 	  p += USB_INTERFACE_DESCRIPTOR_SIZE + if_desc->bNumEndpoints * USB_ENDPOINT_DESCRIPTOR_SIZE;
diff --git a/sys-apps/hal/files/0.5.9/07_malloc_h_for_stdlib_h.patch b/sys-apps/hal/files/0.5.9/07_malloc_h_for_stdlib_h.patch
new file mode 100644
index 000000000000..2e3f4efeb988
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/07_malloc_h_for_stdlib_h.patch
@@ -0,0 +1,26 @@
+Index: b/hald/create_cache.c
+===================================================================
+--- a/hald/create_cache.c	2007-03-07 16:55:02.000000000 -0500
++++ b/hald/create_cache.c	2007-04-11 12:58:44.000000000 -0400
+@@ -34,8 +34,8 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <dirent.h>
+-#include <malloc.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <getopt.h>
+Index: b/hald/hald.c
+===================================================================
+--- a/hald/hald.c	2007-04-06 19:25:20.000000000 -0400
++++ b/hald/hald.c	2007-04-11 12:59:03.000000000 -0400
+@@ -43,7 +43,6 @@
+ #include <syslog.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-#include <malloc.h>
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index 687e2ad2d261..7713b7cc8133 100644
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -3,5 +3,7 @@
 03_crasher_fix_fail_to_return_value.patch
 04_cache_regen_return_fix.patch
 05_freebsd_partutil_make_fix.patch
+06_freebsd_backend_fix.patch
+07_malloc_h_for_stdlib_h.patch
 95_gentoo_man_page.patch
 96_plugdev_allow_send.patch