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

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 1c39b9ee226c29de2499f9113512844acd66ed9b..3a8def401bbd148c26b74a21632071eb7e30afef 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.157 2007/04/11 16:12:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.158 2007/04/11 18:17:23 cardoe Exp $
+
+  11 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  files/0.5.9/04_cache_regen_return_fix.patch,
+  files/0.5.9/05_freebsd_partutil_make_fix.patch,
+  +files/0.5.9/06_freebsd_backend_fix.patch,
+  +files/0.5.9/07_malloc_h_for_stdlib_h.patch, files/0.5.9/series:
+  FreeBSD backend fixes. malloc.h -> stdlib.h
 
   11 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
   +files/0.5.9/05_freebsd_partutil_make_fix.patch, files/0.5.9/series,

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 01043a0d05d34592491314a7ffab09160aa25035..0ae0448b7e155812edf22c9c275cad7372f3b77f 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -25,14 +25,22 @@ AUX 0.5.9/03_crasher_fix_fail_to_return_value.patch 759 RMD160 02095de1648ed5812
 MD5 801a95446b348b13ba7d34c96c0c4c74 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759
 RMD160 02095de1648ed581202f9d5e3f697b007ebb7154 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759
 SHA256 f6b8821c89bf2063a0cabc6d67a051e476960e17d510f9e688132b727a5e6e92 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759
-AUX 0.5.9/04_cache_regen_return_fix.patch 662 RMD160 be35a41d815e13416301a962886d609e8c11d977 SHA1 7a70940ca51ed1963a460957eef57cc93ccf9534 SHA256 0f1996db420adde84a67c07c5cc5b7076dda6d9ca005b524dd498856585b067d
-MD5 922d80e89f199a725c772297c7a3ffe3 files/0.5.9/04_cache_regen_return_fix.patch 662
-RMD160 be35a41d815e13416301a962886d609e8c11d977 files/0.5.9/04_cache_regen_return_fix.patch 662
-SHA256 0f1996db420adde84a67c07c5cc5b7076dda6d9ca005b524dd498856585b067d files/0.5.9/04_cache_regen_return_fix.patch 662
-AUX 0.5.9/05_freebsd_partutil_make_fix.patch 481 RMD160 17cf3895f93d043aeb18c8dd6a5e3ce45b19cbee SHA1 6e339648ce325050e66bd44377f96cd0ae4b0657 SHA256 ba170af841986d9d564db6e4965a1b97e0364bd181106cd7e15b4b26c9622e54
-MD5 1ed7c7595e9d0d7a8b0a6f3d9560312c files/0.5.9/05_freebsd_partutil_make_fix.patch 481
-RMD160 17cf3895f93d043aeb18c8dd6a5e3ce45b19cbee files/0.5.9/05_freebsd_partutil_make_fix.patch 481
-SHA256 ba170af841986d9d564db6e4965a1b97e0364bd181106cd7e15b4b26c9622e54 files/0.5.9/05_freebsd_partutil_make_fix.patch 481
+AUX 0.5.9/04_cache_regen_return_fix.patch 740 RMD160 119c4d4714765917b8d8bc622663ee19e7a3ffd2 SHA1 1e9d5a3db8ad7ca46b964f6ef5da3a6e35d9cf3e SHA256 7deab9fcc6e1063062460e88b7d931e641b8d878b644f9e4ed53d50cdfcdfbd7
+MD5 bbb1872eb4a7d94e028cb3ba9c440bfe files/0.5.9/04_cache_regen_return_fix.patch 740
+RMD160 119c4d4714765917b8d8bc622663ee19e7a3ffd2 files/0.5.9/04_cache_regen_return_fix.patch 740
+SHA256 7deab9fcc6e1063062460e88b7d931e641b8d878b644f9e4ed53d50cdfcdfbd7 files/0.5.9/04_cache_regen_return_fix.patch 740
+AUX 0.5.9/05_freebsd_partutil_make_fix.patch 551 RMD160 951f25aed54eb4efc5d4d7a24eda48d2377eeb04 SHA1 111a5432ade0ad024b81060f97661a57a0adc663 SHA256 63f571618b159876934596d9b67f37eb6602c219d98d3e419fd951b82abbcd1d
+MD5 8a7b4ca984c9d2656ffa01e83258f916 files/0.5.9/05_freebsd_partutil_make_fix.patch 551
+RMD160 951f25aed54eb4efc5d4d7a24eda48d2377eeb04 files/0.5.9/05_freebsd_partutil_make_fix.patch 551
+SHA256 63f571618b159876934596d9b67f37eb6602c219d98d3e419fd951b82abbcd1d files/0.5.9/05_freebsd_partutil_make_fix.patch 551
+AUX 0.5.9/06_freebsd_backend_fix.patch 1855 RMD160 b72d65291d04cc5ebadc24ef697f2e1ae2ab28a8 SHA1 db5ab4030732fa5641641c01fb80c3b46aaec99c SHA256 c8f5149e581cbcd328b70f04532b45f488940ce3b9d779a355600e96f885bed2
+MD5 65a0a52b23807f81ee2d61d2602256b2 files/0.5.9/06_freebsd_backend_fix.patch 1855
+RMD160 b72d65291d04cc5ebadc24ef697f2e1ae2ab28a8 files/0.5.9/06_freebsd_backend_fix.patch 1855
+SHA256 c8f5149e581cbcd328b70f04532b45f488940ce3b9d779a355600e96f885bed2 files/0.5.9/06_freebsd_backend_fix.patch 1855
+AUX 0.5.9/07_malloc_h_for_stdlib_h.patch 824 RMD160 029aff18287553c4fee38689cf007060e485fc2c SHA1 4e8b28eb363015e6ffd997daa338e3b853b59f52 SHA256 86e2db1894e9d3719b09f832f1766e4266870221d3558cd91a9ed59b5531d2d8
+MD5 219ba051522bf47a623427734daaa627 files/0.5.9/07_malloc_h_for_stdlib_h.patch 824
+RMD160 029aff18287553c4fee38689cf007060e485fc2c files/0.5.9/07_malloc_h_for_stdlib_h.patch 824
+SHA256 86e2db1894e9d3719b09f832f1766e4266870221d3558cd91a9ed59b5531d2d8 files/0.5.9/07_malloc_h_for_stdlib_h.patch 824
 AUX 0.5.9/95_gentoo_man_page.patch 18159 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 SHA1 f9de30d705eada8e2f631e51b715b9923f732fb4 SHA256 59d81dcb273f3cdc9c7fc9f195331529642fef2c2150b3eeb3fd98ea555b1893
 MD5 f6d115e0eb501aba476f4df965bfeb6c files/0.5.9/95_gentoo_man_page.patch 18159
 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 files/0.5.9/95_gentoo_man_page.patch 18159
@@ -41,10 +49,10 @@ AUX 0.5.9/96_plugdev_allow_send.patch 1781 RMD160 08f0cbb8960d4753d15d02c8694fae
 MD5 38976c1da85ba17ba6a46f56cd1de3bf files/0.5.9/96_plugdev_allow_send.patch 1781
 RMD160 08f0cbb8960d4753d15d02c8694fae09a6ef2a02 files/0.5.9/96_plugdev_allow_send.patch 1781
 SHA256 090d666c8df223fc0ea30f473fa3d52412ef22aff85c1eebf609a3f00dbd652a files/0.5.9/96_plugdev_allow_send.patch 1781
-AUX 0.5.9/series 225 RMD160 112cc6e91ba7db12aa0563e5829fda5f1ab304b9 SHA1 29ca54a2b8ca6a6cce66db31dbac0e5c6c8b76b8 SHA256 dc17fe0a3ab63c0cd2f40d999e51d639dcb2f72ca77117c57dfd10aeb47a1545
-MD5 5bbe731e6425e9cf0990467a1e319078 files/0.5.9/series 225
-RMD160 112cc6e91ba7db12aa0563e5829fda5f1ab304b9 files/0.5.9/series 225
-SHA256 dc17fe0a3ab63c0cd2f40d999e51d639dcb2f72ca77117c57dfd10aeb47a1545 files/0.5.9/series 225
+AUX 0.5.9/series 285 RMD160 d92863c4c3cf329a51899563f188e1b77569d75d SHA1 634770c21f28025a21bc8a3da8e8c61d5b023de5 SHA256 a1e80a782c05f61626ba22634b4d1aa37d04b3a8a13ce3fc15493b01ac14e90f
+MD5 c63db3a969b89354f997be4d8a68e4c5 files/0.5.9/series 285
+RMD160 d92863c4c3cf329a51899563f188e1b77569d75d files/0.5.9/series 285
+SHA256 a1e80a782c05f61626ba22634b4d1aa37d04b3a8a13ce3fc15493b01ac14e90f files/0.5.9/series 285
 AUX fix-scsi-fake-host-event.patch 3108 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea SHA1 af1d5c9a2cde091bd7abe04ed5e91a4bb815b675 SHA256 199749c188e5fb4858e4c1dac8800525377daf6a680dcd13e7096e71266ed05d
 MD5 3b6df9a24978d931781dc029c85288a9 files/fix-scsi-fake-host-event.patch 3108
 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea files/fix-scsi-fake-host-event.patch 3108
@@ -163,10 +171,10 @@ EBUILD hal-0.5.9.ebuild 6383 RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 SHA
 MD5 84c3c9a869e9c860b756e033458509da hal-0.5.9.ebuild 6383
 RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 hal-0.5.9.ebuild 6383
 SHA256 1734a1121bb33064e8bedadee3682947e654244b381d0032c3a28beed87c2a60 hal-0.5.9.ebuild 6383
-MISC ChangeLog 25047 RMD160 cf27f600f4ffac76961cd835a4a27efe0e2f10fa SHA1 57bce04157818d0bb2f975e32b880035680b4134 SHA256 4337975f192546d0eefbd3fc9a0559cd5fa7371ca7aba888b8923d05bcbe74c6
-MD5 da0d64f52b96db16b5ea9d3b059a7cc1 ChangeLog 25047
-RMD160 cf27f600f4ffac76961cd835a4a27efe0e2f10fa ChangeLog 25047
-SHA256 4337975f192546d0eefbd3fc9a0559cd5fa7371ca7aba888b8923d05bcbe74c6 ChangeLog 25047
+MISC ChangeLog 25353 RMD160 f5e6101b8b6d14fa981d0f9d202061e4fae2a100 SHA1 e2ed225dece0098d90a1064053923ca167d8ebc1 SHA256 be83735c28cb1bd1230fd2b67ed9d3d42170868502086a74080e5ed3a1234ed3
+MD5 7fd3a1a8e15cee7d2f64b940483e9f98 ChangeLog 25353
+RMD160 f5e6101b8b6d14fa981d0f9d202061e4fae2a100 ChangeLog 25353
+SHA256 be83735c28cb1bd1230fd2b67ed9d3d42170868502086a74080e5ed3a1234ed3 ChangeLog 25353
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -183,7 +191,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGHQjsoeSe8B0zEfwRAkZOAJ93oHs6/zwjaf8crz9YcTWWT77bpwCfTW5e
-38uAsycRYmWFRRex2L6yh8k=
-=wxHM
+iD8DBQFGHSYjoeSe8B0zEfwRAtdLAJ93UhLgLAxTmbJOBjwwSFMcfXRdqACfd98t
+NpMbgwTJfbFEdkJQubkLCsk=
+=6QDm
 -----END PGP SIGNATURE-----

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 a31f84e801999aeb24daba83c306493dc1294a40..be16eb2121182ef12fae5b29f246f518acf785cf 100644 (file)
--- 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 6e09b69e5ccb49d5f3611261827dbf6616e41220..c11d24de47dbc71c5eabfbf56f599a1ededa9495 100644 (file)
--- 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 (file)
index 0000000..4539092
--- /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 (file)
index 0000000..2e3f4ef
--- /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 687e2ad2d261f7ec950a4137e4151c7df3b50db9..7713b7cc8133d1dd44f076e8e42c50b42fc5c111 100644 (file)
--- 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