diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2005-12-29 22:06:06 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2005-12-29 22:06:06 +0000 |
commit | 4c8c0ac48aa04a79af71c401ac5133154d0fc6c2 (patch) | |
tree | 13f672f0d6675f1ebdd2d99012799e1858785366 /sys-apps/hal | |
parent | Oops, missed gst dep bump (diff) | |
download | historical-4c8c0ac48aa04a79af71c401ac5133154d0fc6c2.tar.gz historical-4c8c0ac48aa04a79af71c401ac5133154d0fc6c2.tar.bz2 historical-4c8c0ac48aa04a79af71c401ac5133154d0fc6c2.zip |
Change initscript to handle possible permission problem. Make note about acpid in the ebuild.
Package-Manager: portage-2.1_pre2
Diffstat (limited to 'sys-apps/hal')
-rw-r--r-- | sys-apps/hal/ChangeLog | 11 | ||||
-rw-r--r-- | sys-apps/hal/Manifest | 20 | ||||
-rwxr-xr-x | sys-apps/hal/files/0.5-hald.rc | 12 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.5.5.1-r3 (renamed from sys-apps/hal/files/digest-hal-0.5.5.1-r2) | 0 | ||||
-rw-r--r-- | sys-apps/hal/files/hal-0.4.5-net_lockup.patch | 72 | ||||
-rw-r--r-- | sys-apps/hal/files/hal-0.4.5-vat_ntfs_labels.patch | 98 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.5.5.1-r3.ebuild (renamed from sys-apps/hal/hal-0.5.5.1-r2.ebuild) | 4 |
7 files changed, 34 insertions, 183 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 764eb8cc8825..850865d15cf0 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.61 2005/12/29 20:01:14 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.62 2005/12/29 22:06:06 cardoe Exp $ + +*hal-0.5.5.1-r3 (29 Dec 2005) + + 29 Dec 2005; Doug Goldstein <cardoe@gentoo.org> + -files/hal-0.4.5-vat_ntfs_labels.patch, files/0.5-hald.rc, + -files/hal-0.4.5-net_lockup.patch, -hal-0.5.5.1-r2.ebuild, + +hal-0.5.5.1-r3.ebuild: + Change initscript to handle possible permission problem. Make note about + acpid in the ebuild. 29 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org> hal-0.5.5.1-r2.ebuild: diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index ab48b6abd85f..3bcb22fe8b78 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -1,12 +1,13 @@ -MD5 9304137787081e85326f3005cbde2624 ChangeLog 8875 -MD5 169d86aeebcd34b958b6e37c9fc36ec6 files/0.5-hald.rc 529 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 a32e194e12ceb98d9c41cfbd1754032d ChangeLog 9201 +MD5 a9f5f0f695501bdda23e711cd18d39dc files/0.5-hald.rc 641 MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r2 62 MD5 2bbbb519c89110dfec96cf63cf541afc files/digest-hal-0.4.8 62 -MD5 cf6c7a60aee75f95022e5d25562468eb files/digest-hal-0.5.5.1-r2 64 +MD5 cf6c7a60aee75f95022e5d25562468eb files/digest-hal-0.5.5.1-r3 64 MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216 MD5 b0e12a62ce698e1eb2a32139498330cd files/hal-0.4.5-gentoo_gphoto2_usermap.patch 817 -MD5 f3ba6ada28cf947f8a7b7ec8fdd708ba files/hal-0.4.5-net_lockup.patch 2429 -MD5 442da36fd75002bb8300b0fcb65a1371 files/hal-0.4.5-vat_ntfs_labels.patch 2874 MD5 c1624c9456f164c1b611e3ab22fb105d files/hal-0.4.7-device_info_leak.patch 2203 MD5 64253ef1f2dcf68b2d82429026280085 files/hal-0.4.7-dont_add_device_twice-r1.patch 691 MD5 58ed07e2de5e898a1e4eeedf595ddb06 files/hal-0.4.7-sys_floppy_detection.patch 568 @@ -18,5 +19,12 @@ MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397 MD5 35750516d24e67c9f24f5f1e0da22ca0 files/hald 522 MD5 1a146b79d18a689bbc8a96b81f74c7f6 hal-0.4.7-r2.ebuild 3455 MD5 c6d1202b415d119777b338fd1787592e hal-0.4.8.ebuild 3420 -MD5 de95bb49ccf04a190c24a737bea75ce5 hal-0.5.5.1-r2.ebuild 3639 +MD5 5fe5ffac0018125c9a74e1d1fcffa576 hal-0.5.5.1-r3.ebuild 3701 MD5 a60767d83157413d549c69b98fac962c metadata.xml 303 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDtF3dBtvusYtCZMsRAgfvAJ96ZiadXQCN0Q+bpb7+vbL3KqH53ACgj1Pe +jvBLh6Lj9ZZ9/WcLzrrVLzA= +=2bBI +-----END PGP SIGNATURE----- diff --git a/sys-apps/hal/files/0.5-hald.rc b/sys-apps/hal/files/0.5-hald.rc index 38a182c6c236..d48a37807a88 100755 --- a/sys-apps/hal/files/0.5-hald.rc +++ b/sys-apps/hal/files/0.5-hald.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5-hald.rc,v 1.2 2005/12/21 09:41:20 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5-hald.rc,v 1.3 2005/12/29 22:06:06 cardoe Exp $ depend() { need dbus @@ -10,15 +10,17 @@ depend() { start() { ebegin "Starting Hardware Abstraction Layer daemon" - start-stop-daemon --start -q --exec /usr/sbin/hald - + if [ -f /proc/acpi/event ]; then + chgrp haldaemon /proc/acpi/event + chmod 440 /proc/acpi/event + fi + + start-stop-daemon --start -q --exec /usr/sbin/hald --use-syslog eend $? } stop() { ebegin "Stopping Hardware Abstraction Layer daemon" - start-stop-daemon --stop -q --pidfile /var/run/hald.pid - eend $? } diff --git a/sys-apps/hal/files/digest-hal-0.5.5.1-r2 b/sys-apps/hal/files/digest-hal-0.5.5.1-r3 index 9dfb57f4441c..9dfb57f4441c 100644 --- a/sys-apps/hal/files/digest-hal-0.5.5.1-r2 +++ b/sys-apps/hal/files/digest-hal-0.5.5.1-r3 diff --git a/sys-apps/hal/files/hal-0.4.5-net_lockup.patch b/sys-apps/hal/files/hal-0.4.5-net_lockup.patch deleted file mode 100644 index 3cca147332fe..000000000000 --- a/sys-apps/hal/files/hal-0.4.5-net_lockup.patch +++ /dev/null @@ -1,72 +0,0 @@ -=================================================================== -RCS file: /cvs/hal/hal/hald/linux/Attic/net_class_device.c,v -retrieving revision 1.21.2.3 -retrieving revision 1.21.2.4 -diff -u -r1.21.2.3 -r1.21.2.4 ---- net_class_device.c 2005/01/07 03:07:45 1.21.2.3 -+++ net_class_device.c 2005/01/17 20:00:30 1.21.2.4 -@@ -152,6 +152,8 @@ - int res; - guint16 link_word; - -+ HAL_INFO (("Entering")); -+ - ifname = hal_device_property_get_string (d, "net.interface"); - - sockfd = socket (AF_INET, SOCK_DGRAM, 0); -@@ -217,6 +219,8 @@ - int res; - guint16 status_word; - -+ HAL_INFO (("Entering")); -+ - ifname = hal_device_property_get_string (d, "net.interface"); - - sockfd = socket (AF_INET, SOCK_DGRAM, 0); -@@ -340,7 +344,12 @@ - if (hal_device_has_capability (d, "net.80203")) { - if (!hal_device_property_get_bool (d, "net.80203.link")) { - hal_device_property_set_bool (d, "net.80203.link", TRUE); -+#ifdef SYSFS_CARRIER_ENABLE -+ HAL_INFO (("Assuming link speed is 100Mbps")); -+ hal_device_property_set_uint64 (d, "net.80203.rate", 100 * 1000 * 1000); -+#else /* SYSFS_CARRIER_ENABLE */ - mii_get_rate (d); -+#endif /* SYSFS_CARRIER_ENABLE */ - } - } - } else { -@@ -617,7 +626,20 @@ - if (!is_80211 && media_type == ARPHRD_ETHER) { - /* TODO: for some reason IFF_RUNNING isn't exported in flags */ - /*hal_device_property_set_bool (d, "net.80203.link", flags & IFF_RUNNING);*/ -+#ifdef SYSFS_CARRIER_ENABLE -+ attr = sysfs_get_classdev_attr (class_device, "carrier"); -+ if (attr != NULL) { -+ int have_link; -+ -+ have_link = parse_dec (attr->value); -+ HAL_INFO (("According to sysfs link status is %d", have_link)); -+ hal_device_property_set_bool (d, "net.80203.link", have_link != 0); -+ HAL_INFO (("Assuming link speed is 100Mbps")); -+ hal_device_property_set_uint64 (d, "net.80203.rate", 100 * 1000 * 1000); -+ } -+#else /* SYSFS_CARRIER_ENABLE */ - mii_get_link (d); -+#endif /* SYSFS_CARRIER_ENABLE */ - } - } - -@@ -653,7 +675,12 @@ - - if (hal_device_has_property (d, "net.80203.link") && - hal_device_property_get_bool (d, "net.80203.link")) { -+#ifdef SYSFS_CARRIER_ENABLE -+ HAL_INFO (("Assuming link speed is 100Mbps")); -+ hal_device_property_set_uint64 (d, "net.80203.rate", 100 * 1000 * 1000); -+#else /* SYSFS_CARRIER_ENABLE */ - mii_get_rate (d); -+#endif /* SYSFS_CARRIER_ENABLE */ - } - - hal_device_property_set_int (d, "net.arp_proto_hw_id", media_type); diff --git a/sys-apps/hal/files/hal-0.4.5-vat_ntfs_labels.patch b/sys-apps/hal/files/hal-0.4.5-vat_ntfs_labels.patch deleted file mode 100644 index 9bd6bf0399de..000000000000 --- a/sys-apps/hal/files/hal-0.4.5-vat_ntfs_labels.patch +++ /dev/null @@ -1,98 +0,0 @@ -=================================================================== -RCS file: /cvs/hal/hal/hald/linux/volume_id/Attic/volume_id.c,v -retrieving revision 1.45.2.4 -retrieving revision 1.45.2.6 -diff -u -r1.45.2.4 -r1.45.2.6 ---- volume_id.c 2005/01/12 02:05:31 1.45.2.4 -+++ volume_id.c 2005/01/17 15:25:00 1.45.2.6 -@@ -774,6 +774,8 @@ - #define FAT16_MAX 0xfff5 - #define FAT_ATTR_VOLUME_ID 0x08 - #define FAT_ATTR_DIR 0x10 -+#define FAT_ATTR_LONG_NAME 0x0f -+#define FAT_ATTR_MASK 0x3f - #define FAT_ENTRY_FREE 0xe5 - static int probe_vfat(struct volume_id *id, __u64 off) - { -@@ -859,6 +861,9 @@ - /* believe only that's fat, don't trust the version - * the cluster_count will tell us - */ -+ if (strncmp(vs->sysid, "NTFS", 4) == 0) -+ return -1; -+ - if (strncmp(vs->type.fat32.magic, "MSWIN", 5) == 0) - goto valid; - -@@ -956,7 +961,7 @@ - - dir = (struct vfat_dir_entry*) buf; - -- for (i = 0; i <= root_dir_entries; i++) { -+ for (i = 0; i < root_dir_entries; i++) { - /* end marker */ - if (dir[i].name[0] == 0x00) { - dbg("end of dir"); -@@ -967,7 +972,15 @@ - if (dir[i].name[0] == FAT_ENTRY_FREE) - continue; - -+ /* long name */ -+ if ((dir[i].attr & FAT_ATTR_MASK) == FAT_ATTR_LONG_NAME) -+ continue; -+ - if ((dir[i].attr & (FAT_ATTR_VOLUME_ID | FAT_ATTR_DIR)) == FAT_ATTR_VOLUME_ID) { -+ /* labels do not have file data */ -+ if (dir[i].cluster_high != 0 || dir[i].cluster_low != 0) -+ continue; -+ - dbg("found ATTR_VOLUME_ID id in root dir"); - label = dir[i].name; - break; -@@ -976,6 +989,10 @@ - dbg("skip dir entry"); - } - -+ vs = (struct vfat_super_block *) get_buffer(id, off, 0x200); -+ if (vs == NULL) -+ return -1; -+ - if (label != NULL && strncmp(label, "NO NAME ", 11) != 0) { - set_label_raw(id, label, 11); - set_label_string(id, label, 11); -@@ -1015,7 +1032,7 @@ - count = buf_size / sizeof(struct vfat_dir_entry); - dbg("expected entries 0x%x", count); - -- for (i = 0; i <= count; i++) { -+ for (i = 0; i < count; i++) { - /* end marker */ - if (dir[i].name[0] == 0x00) { - dbg("end of dir"); -@@ -1026,7 +1043,15 @@ - if (dir[i].name[0] == FAT_ENTRY_FREE) - continue; - -+ /* long name */ -+ if ((dir[i].attr & FAT_ATTR_MASK) == FAT_ATTR_LONG_NAME) -+ continue; -+ - if ((dir[i].attr & (FAT_ATTR_VOLUME_ID | FAT_ATTR_DIR)) == FAT_ATTR_VOLUME_ID) { -+ /* labels do not have file data */ -+ if (dir[i].cluster_high != 0 || dir[i].cluster_low != 0) -+ continue; -+ - dbg("found ATTR_VOLUME_ID id in root dir"); - label = dir[i].name; - goto fat32_label; -@@ -1050,6 +1075,10 @@ - dbg("reached maximum follow count of root cluster chain, give up"); - - fat32_label: -+ vs = (struct vfat_super_block *) get_buffer(id, off, 0x200); -+ if (vs == NULL) -+ return -1; -+ - if (label != NULL && strncmp(label, "NO NAME ", 11) != 0) { - set_label_raw(id, label, 11); - set_label_string(id, label, 11); diff --git a/sys-apps/hal/hal-0.5.5.1-r2.ebuild b/sys-apps/hal/hal-0.5.5.1-r3.ebuild index 1818c6ecc8ef..5590da6abd55 100644 --- a/sys-apps/hal/hal-0.5.5.1-r2.ebuild +++ b/sys-apps/hal/hal-0.5.5.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.5.1-r2.ebuild,v 1.2 2005/12/29 20:01:14 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.5.1-r3.ebuild,v 1.1 2005/12/29 22:06:06 cardoe Exp $ inherit eutils linux-info debug @@ -94,6 +94,8 @@ src_compile() { $(use_enable doc doxygen-docs) \ || die "configure failed" +# --disable-acpi-acpid when HAL handles all that acpid handles + emake || die "make failed" } |