# 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.121 2007/01/29 15:49:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.122 2007/01/30 16:42:06 cardoe Exp $
+
+*hal-0.5.7.1-r4 (30 Jan 2007)
+
+ 30 Jan 2007; Doug Goldstein <cardoe@gentoo.org>
+ +files/hal-0.5.7.1-autofs-subfs.patch,
+ +files/hal-0.5.7.1-floppies-fix.patch,
+ +files/hal-0.5.7.1-hald-scripts.patch,
+ -files/hal-0.5.7.1-hibernate-fix-r1.patch,
+ +files/hal-0.5.7.1-ipod-nano.patch, -hal-0.5.5.1-r3.ebuild,
+ -hal-0.5.7.1-r2.ebuild, hal-0.5.7.1-r3.ebuild, +hal-0.5.7.1-r4.ebuild:
+ Fixed hotplug depend. Fixed installing old unused udev rule. Fix for bug
+ #133743 from Gilles Dartiguelongue <dartigug@esiee.fr>. Fix bug #154648. Fix
+ bug #158304. Fix bug #163233.
29 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> hal-0.5.7.1-r3.ebuild:
Stable on sparc wrt #162942
MD5 3e44b8f198ffe5c5d1a6d7915d9d3399 files/hal-0.5.7-unclean-unmount-r1.patch 342
RMD160 768f6274dab1be8c535d681d7f61a0544bb7c26d files/hal-0.5.7-unclean-unmount-r1.patch 342
SHA256 2036e0e0e46edf347982a20e9ffeb8b7dc7added85a8ef9f23083c225709eca3 files/hal-0.5.7-unclean-unmount-r1.patch 342
+AUX hal-0.5.7.1-autofs-subfs.patch 3051 RMD160 7a0d89fc77ae2bc752517873dd9d302431a5234b SHA1 0715a7a0dfc9cfc9c1dcd86177a0c691990d53a6 SHA256 82ea42ea380a6f4544739ff2f28f47f3182604af0ebb0525d0613b5f24fa296c
+MD5 68943a0abbca466218b41a5bf700b17e files/hal-0.5.7.1-autofs-subfs.patch 3051
+RMD160 7a0d89fc77ae2bc752517873dd9d302431a5234b files/hal-0.5.7.1-autofs-subfs.patch 3051
+SHA256 82ea42ea380a6f4544739ff2f28f47f3182604af0ebb0525d0613b5f24fa296c files/hal-0.5.7.1-autofs-subfs.patch 3051
AUX hal-0.5.7.1-dbus-close.patch 859 RMD160 942829e237154e6612d806d9f3af0d393582f418 SHA1 a190efb43c22dbe7aa3363f3b0fb5e93497bb2da SHA256 7739541fde66bcfcb6bbeb2d5e66976e856ea066aed34c847b38539a2c42b183
MD5 1fa646b45e845031f09515731dba40c7 files/hal-0.5.7.1-dbus-close.patch 859
RMD160 942829e237154e6612d806d9f3af0d393582f418 files/hal-0.5.7.1-dbus-close.patch 859
SHA256 7739541fde66bcfcb6bbeb2d5e66976e856ea066aed34c847b38539a2c42b183 files/hal-0.5.7.1-dbus-close.patch 859
-AUX hal-0.5.7.1-hibernate-fix-r1.patch 461 RMD160 c88c5f307321d4981d3ee1bbaf299e9d42c5c636 SHA1 e9b0d89943b4eab1e60f86227b7f478fb55abee0 SHA256 0230f7686fa8584565776ba4024cc399094ab64414d77b21a68f50318c5ad021
-MD5 088e3e7a6c3d2be3bf27b13a2ca05333 files/hal-0.5.7.1-hibernate-fix-r1.patch 461
-RMD160 c88c5f307321d4981d3ee1bbaf299e9d42c5c636 files/hal-0.5.7.1-hibernate-fix-r1.patch 461
-SHA256 0230f7686fa8584565776ba4024cc399094ab64414d77b21a68f50318c5ad021 files/hal-0.5.7.1-hibernate-fix-r1.patch 461
+AUX hal-0.5.7.1-floppies-fix.patch 581 RMD160 ebb1a1a3edfdfe1eb380226d4092422d8d9a26d0 SHA1 b12ef26f7d335343b85cad1d8ba8495b249c82e5 SHA256 7b780fd26a7de2354890b526737d995f63316fded04a4af061926c95a1cc90fc
+MD5 80832a688c51720cdd01981be6494f36 files/hal-0.5.7.1-floppies-fix.patch 581
+RMD160 ebb1a1a3edfdfe1eb380226d4092422d8d9a26d0 files/hal-0.5.7.1-floppies-fix.patch 581
+SHA256 7b780fd26a7de2354890b526737d995f63316fded04a4af061926c95a1cc90fc files/hal-0.5.7.1-floppies-fix.patch 581
+AUX hal-0.5.7.1-hald-scripts.patch 8854 RMD160 e54b2c512a6db2ed948d43efe0ce05ea2efaaeb1 SHA1 0631540ded9a0ef83f7633ce8a02b761b67a6cde SHA256 0a227ccbdb90aa30a87a5112ff27518299880aafac85c4b879c11f0a76f8c944
+MD5 216c7c8b2576abb9a5f59d777c4d46ff files/hal-0.5.7.1-hald-scripts.patch 8854
+RMD160 e54b2c512a6db2ed948d43efe0ce05ea2efaaeb1 files/hal-0.5.7.1-hald-scripts.patch 8854
+SHA256 0a227ccbdb90aa30a87a5112ff27518299880aafac85c4b879c11f0a76f8c944 files/hal-0.5.7.1-hald-scripts.patch 8854
AUX hal-0.5.7.1-hibernate-fix.patch 421 RMD160 126228bda942a061e87d15bdf6df0740b53f924c SHA1 9412c4c6dbab4133bb3dbbb6baae1cef9dd054a1 SHA256 9f27c993bc54010aec22b4955c149882e18ff2629155dcab372fec4695141826
MD5 eb37b5e42e81753922463ad6f463aee2 files/hal-0.5.7.1-hibernate-fix.patch 421
RMD160 126228bda942a061e87d15bdf6df0740b53f924c files/hal-0.5.7.1-hibernate-fix.patch 421
MD5 d7bd86d8837014d37208a3604c4fcb33 files/hal-0.5.7.1-ignored-volumes.patch 2864
RMD160 2b4031e24b57c2b8685eb95e39f7b3e6eb0c7576 files/hal-0.5.7.1-ignored-volumes.patch 2864
SHA256 054a2db0fd30d6ae9ef828fec930cf55df4e5cbbcc20f3cb86c8801714063790 files/hal-0.5.7.1-ignored-volumes.patch 2864
+AUX hal-0.5.7.1-ipod-nano.patch 1411 RMD160 295b3d19d0f3a55343ca5ab95a256fac34e6439c SHA1 18bea5459a848789e22cd3458efaa9120274f342 SHA256 4df49efb2657cb21ca8d7597fc1e83e33d387d0bd07a403f0749bfe6a23bebb5
+MD5 f9a92273f54f17c14db923a315ec1542 files/hal-0.5.7.1-ipod-nano.patch 1411
+RMD160 295b3d19d0f3a55343ca5ab95a256fac34e6439c files/hal-0.5.7.1-ipod-nano.patch 1411
+SHA256 4df49efb2657cb21ca8d7597fc1e83e33d387d0bd07a403f0749bfe6a23bebb5 files/hal-0.5.7.1-ipod-nano.patch 1411
AUX hal-0.5.7.1-sr-driver.patch 654 RMD160 86a98b6ceb98f797badd3e1c653f181d498138b1 SHA1 8c1538eb5d1192e336627f1c59c365b2b73b0a6d SHA256 52191c2230af31f0bf18f39a5f0e6d24728da5c7e0de627be55046561318ca55
MD5 a6cfdd91f94b01684e1c3063dd07cbd8 files/hal-0.5.7.1-sr-driver.patch 654
RMD160 86a98b6ceb98f797badd3e1c653f181d498138b1 files/hal-0.5.7.1-sr-driver.patch 654
MD5 35750516d24e67c9f24f5f1e0da22ca0 files/hald 522
RMD160 3d15723862416de29b6e2d18c53aec05b05216c3 files/hald 522
SHA256 92f584b631026307485faa9ba386353b6d833349999e052fae0e8e9f82f83b6e files/hald 522
-DIST hal-0.5.5.1.tar.gz 1517882 RMD160 fad4ec6a23d8dc26bb20b659e4f9ff86e7bc62d0 SHA1 f4daef79c54a7047484a48bb2727fa627de06c93 SHA256 e89ab31aede3b689ef5cd54a17a3db1a2e7e868bd2d0b4b8f53a9b259723b8ee
DIST hal-0.5.7.1.tar.gz 1503156 RMD160 2861818b29546bd3628b1bda3d41238cf644c644 SHA1 233b67e724e68f41ec3f53adcfb7d139328c5813 SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b
DIST hal-0.5.7.tar.gz 1528632 RMD160 342b00bea138ddf9f0f75e769612373bcf935d43 SHA1 f3962b29f3dad65fdaf708f680b5ba752a26227f SHA256 63c78e9b9c8308914372f9a762b02fa057bca2c6a1c7478ab595ba0fa92781d5
-EBUILD hal-0.5.5.1-r3.ebuild 3763 RMD160 501706c7028e920b95b61b2fdb137e5c4015f781 SHA1 4999ee634f4e5d2da79566771d2367e64e9c633c SHA256 1e67c280bdff031a020bc82233a007220495c825e5104184009702e4e723e442
-MD5 6c58d31a8fa25e5f77088cf37543fc63 hal-0.5.5.1-r3.ebuild 3763
-RMD160 501706c7028e920b95b61b2fdb137e5c4015f781 hal-0.5.5.1-r3.ebuild 3763
-SHA256 1e67c280bdff031a020bc82233a007220495c825e5104184009702e4e723e442 hal-0.5.5.1-r3.ebuild 3763
EBUILD hal-0.5.7-r3.ebuild 5770 RMD160 cad0f030042f5fc4a0953fc2fdccfd1e48bd78a9 SHA1 a451108d7f2c88619f54bb74f8aa39196cd44fc0 SHA256 b2f8275c56ed75e6645ad891f183b6359ec99b3e03d7f3c5f36f3c2cca8ee501
MD5 ee0bb11c71fafebd0ed733d11eb9485b hal-0.5.7-r3.ebuild 5770
RMD160 cad0f030042f5fc4a0953fc2fdccfd1e48bd78a9 hal-0.5.7-r3.ebuild 5770
SHA256 b2f8275c56ed75e6645ad891f183b6359ec99b3e03d7f3c5f36f3c2cca8ee501 hal-0.5.7-r3.ebuild 5770
-EBUILD hal-0.5.7.1-r2.ebuild 6250 RMD160 3d43fda979029a82ef10d7248ecd9e947f0bcdcd SHA1 20e33b11240a53e27292f2ee89daff4edead4375 SHA256 f3edf6b2b1dbde75c78a83b1f0833d9f0440fd7d34ceab203ae7e4e6210d1946
-MD5 6c46d418da0afb445a975c6726ae192a hal-0.5.7.1-r2.ebuild 6250
-RMD160 3d43fda979029a82ef10d7248ecd9e947f0bcdcd hal-0.5.7.1-r2.ebuild 6250
-SHA256 f3edf6b2b1dbde75c78a83b1f0833d9f0440fd7d34ceab203ae7e4e6210d1946 hal-0.5.7.1-r2.ebuild 6250
-EBUILD hal-0.5.7.1-r3.ebuild 6250 RMD160 917707a89db6b539fbc6f6223e2892333f44bc0e SHA1 38af32cc082346f839a52f256de2bd9c641021aa SHA256 39546dc88ddc613826b52291480aa3797d17df781e6f55711360d0a97f616ea0
-MD5 a08943564be0182678c934c860638661 hal-0.5.7.1-r3.ebuild 6250
-RMD160 917707a89db6b539fbc6f6223e2892333f44bc0e hal-0.5.7.1-r3.ebuild 6250
-SHA256 39546dc88ddc613826b52291480aa3797d17df781e6f55711360d0a97f616ea0 hal-0.5.7.1-r3.ebuild 6250
-MISC ChangeLog 18303 RMD160 0b3e7c3ae76cee9aec6b27ffc02306b684a8ac9a SHA1 21a30fb460dc0b8609c9e1697df87cae0ccecbdb SHA256 a6f691ba62a4a4af90c30beed8794dd62ce6a86c29cb5e46f2d01504e5e091b9
-MD5 114c655f075a923e6786bf36226679e2 ChangeLog 18303
-RMD160 0b3e7c3ae76cee9aec6b27ffc02306b684a8ac9a ChangeLog 18303
-SHA256 a6f691ba62a4a4af90c30beed8794dd62ce6a86c29cb5e46f2d01504e5e091b9 ChangeLog 18303
+EBUILD hal-0.5.7.1-r3.ebuild 6226 RMD160 93bbce60b7c612f3565a335aef953bd2749aae66 SHA1 5a6077b5667605d8e90dc8094f17c50a7da2291b SHA256 6f7a3cefce8d61306e4af19b5f69466e115e495d9ee5fe5f514e62d655cf03ca
+MD5 ad6374e9272fd66d1db2aee97817a724 hal-0.5.7.1-r3.ebuild 6226
+RMD160 93bbce60b7c612f3565a335aef953bd2749aae66 hal-0.5.7.1-r3.ebuild 6226
+SHA256 6f7a3cefce8d61306e4af19b5f69466e115e495d9ee5fe5f514e62d655cf03ca hal-0.5.7.1-r3.ebuild 6226
+EBUILD hal-0.5.7.1-r4.ebuild 6077 RMD160 3911ee1e7d4eb741d03618dcfd0eaed743a9d774 SHA1 76f4df786f4b2e990c97d6e2017bbd0a4ce73bc2 SHA256 8a733fed634382a116184178ecce1d910174e0fe24e5f03aec6c696084d08d92
+MD5 f118e329546d38566e88d12c2e67219c hal-0.5.7.1-r4.ebuild 6077
+RMD160 3911ee1e7d4eb741d03618dcfd0eaed743a9d774 hal-0.5.7.1-r4.ebuild 6077
+SHA256 8a733fed634382a116184178ecce1d910174e0fe24e5f03aec6c696084d08d92 hal-0.5.7.1-r4.ebuild 6077
+MISC ChangeLog 18872 RMD160 c0906188e24eb7a8e01c240852e7de3912bdd22d SHA1 6e309faf729b1945aa0069605dd55c14fa13a11a SHA256 d704237d88609a694cdbf4b161186c9450005472700f159547daa9a8079ea536
+MD5 b652c47f4c700e5ad34d424e3f92742f ChangeLog 18872
+RMD160 c0906188e24eb7a8e01c240852e7de3912bdd22d ChangeLog 18872
+SHA256 d704237d88609a694cdbf4b161186c9450005472700f159547daa9a8079ea536 ChangeLog 18872
MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d
MD5 885e3073744523eaf2450514a311758b metadata.xml 223
RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223
SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d metadata.xml 223
-MD5 de294d053aafe67786058131d2d3806c files/digest-hal-0.5.5.1-r3 238
-RMD160 a73765bc36afe8776818ad80bb6c4ee1515e51e2 files/digest-hal-0.5.5.1-r3 238
-SHA256 51107ff7d6a8b82a6be18a1707160591f325fa1a16d47aa8cc5c0045a1addb14 files/digest-hal-0.5.5.1-r3 238
MD5 2cab9d9e3415f54f6368f796cf3df8ff files/digest-hal-0.5.7-r3 232
RMD160 a3f08885fb362e481bd884a8f2192d3dc995fbee files/digest-hal-0.5.7-r3 232
SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/digest-hal-0.5.7-r3 232
-MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r2 238
-RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r2 238
-SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r2 238
MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r3 238
RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r3 238
SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r3 238
+MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r4 238
+RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r4 238
+SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r4 238
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
-iD8DBQFFvhedKRy60XGEcJIRAi4WAKCbjRW4DSBVSr0VBLxBKGNaVbrwigCgn+Q7
-1pLHUjc50hoHzLmIQs3Cpmw=
-=dS5c
+iD8DBQFFv3VkoeSe8B0zEfwRAuh7AJoCHJqQyV1TUA4i7DtoOwwFT3jqmgCdHv5Z
+C4831jEqIRfDJqeEzV/XDaI=
+=ieL1
-----END PGP SIGNATURE-----
+++ /dev/null
-MD5 2abd81ed3f5a37789f4fbda2f6a61270 hal-0.5.5.1.tar.gz 1517882
-RMD160 fad4ec6a23d8dc26bb20b659e4f9ff86e7bc62d0 hal-0.5.5.1.tar.gz 1517882
-SHA256 e89ab31aede3b689ef5cd54a17a3db1a2e7e868bd2d0b4b8f53a9b259723b8ee hal-0.5.5.1.tar.gz 1517882
--- /dev/null
+diff -Naur hal-0.5.7-orig/hald/linux2/blockdev.c hal-0.5.7/hald/linux2/blockdev.c
+--- hal-0.5.7-orig/hald/linux2/blockdev.c 2006-02-24 07:29:06 +0300
++++ hal-0.5.7/hald/linux2/blockdev.c 2006-06-02 23:45:51 +0400
+@@ -185,6 +185,7 @@
+ dev_t devt = makedev(0, 0);
+ GSList *volumes = NULL;
+ GSList *volume;
++ GSList *autofs_mounts = NULL;
+
+ /* open /proc/mounts */
+ g_snprintf (buf, sizeof (buf), "%s/mounts", get_hal_proc_path ());
+@@ -205,6 +206,43 @@
+ while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
+ struct stat statbuf;
+
++ /* If this is a nfs mount or autofs
++ * (fstype == 'nfs' || fstype == 'autofs')
++ * ignore the mount. Reason:
++ * 1. we don't list nfs devices in HAL
++ * 2. more problematic: stat on mountpoints with
++ * 'stale nfs handle' never come
++ * back and block complete HAL and all applications
++ * using HAL fail.
++ * 3. autofs and HAL butt heads causing drives to never
++ * be unmounted
++ */
++ if (strcmp(mnt.mnt_type, "nfs") == 0)
++ continue;
++
++ /* If this is an autofs mount (fstype == 'autofs' or fstype == 'subfs')
++ * store the mount in a list for later use.
++ * On mounts managed by autofs or subfs accessing files below the mount
++ * point cause the mount point to be remounted after an
++ * unmount. We keep the list so we do not check for
++ * the .created-by-hal file on mounts under autofs or subfs mount points
++ */
++ if (strcmp(mnt.mnt_type, "autofs") == 0 ||
++ strcmp(mnt.mnt_type, "subfs") == 0) {
++ char *mnt_dir;
++
++ if (mnt.mnt_dir[strlen (mnt.mnt_dir) - 1] != '/')
++ mnt_dir = g_strdup_printf ("%s/", mnt.mnt_dir);
++ else
++ mnt_dir = g_strdup (mnt.mnt_dir);
++
++ autofs_mounts = g_slist_append (autofs_mounts,
++ mnt_dir);
++
++
++ continue;
++ }
++
+ /* check the underlying device of the mount point */
+ if (stat (mnt.mnt_dir, &statbuf) != 0)
+ continue;
+@@ -242,6 +280,7 @@
+ HalDevice *dev;
+ char *mount_point;
+ char *mount_point_hal_file;
++ GSList *autofs_node;
+
+ dev = HAL_DEVICE (volume->data);
+ mount_point = g_strdup (hal_device_property_get_string (dev, "volume.mount_point"));
+@@ -251,8 +290,20 @@
+ device_property_atomic_update_end ();
+ HAL_INFO (("set %s to unmounted", hal_device_get_udi (dev)));
+
++ /* check to see if mount point falls under autofs */
++ autofs_node = autofs_mounts;
++ while (autofs_node != NULL) {
++ char *am = (char *)autofs_node->data;
++
++ if (strncmp (am, mount_point, strlen (am)) == 0);
++ break;
++
++ autofs_node = autofs_node->next;
++ }
++
+ mount_point_hal_file = g_strdup_printf ("%s/.created-by-hal", mount_point);
+- if (g_file_test (mount_point_hal_file, G_FILE_TEST_EXISTS)) {
++ if (!autofs_node &&
++ g_file_test (mount_point_hal_file, G_FILE_TEST_EXISTS)) {
+ char *cleanup_stdin;
+ char *extra_env[2];
+
+@@ -279,6 +330,8 @@
+ g_free (mount_point);
+ }
+ g_slist_free (volumes);
++ g_slist_foreach (autofs_mounts, (GFunc) g_free, NULL);
++ g_slist_free (autofs_mounts);
+ exit:
+ endmntent (f);
+ }
--- /dev/null
+diff -Naur hal-0.5.7.1.orig/hald/linux2/hotplug.c hal-0.5.7.1/hald/linux2/hotplug.c
+--- hal-0.5.7.1.orig/hald/linux2/hotplug.c 2007-01-22 15:31:45.322111812 +0100
++++ hal-0.5.7.1/hald/linux2/hotplug.c 2007-01-22 15:31:15.594276651 +0100
+@@ -283,6 +283,7 @@
+
+ len = strlen(hotplug_event->sysfs.sysfs_path);
+ is_partition = (isdigit(hotplug_event->sysfs.sysfs_path[len - 1])
++ && (! strstr(hotplug_event->sysfs.sysfs_path, "/block/fd"))
+ && ! strstr(hotplug_event->sysfs.sysfs_path, "/block/sr")) ||
+ strstr (hotplug_event->sysfs.sysfs_path, "/fakevolume") ;
+
--- /dev/null
+# this patch modifies a lot of script in tools, please double check
+# before adding another patch on top of it.
+#
+Index: tools/hal-system-lcd-get-brightness
+===================================================================
+RCS file: /cvs/hal/hal/tools/hal-system-lcd-get-brightness,v
+retrieving revision 1.7
+diff -u -r1.7 hal-system-lcd-get-brightness
+--- hal-0.5.7/tools/hal-system-lcd-get-brightness 18 Feb 2006 23:11:23 -0000 1.7
++++ hal-0.5.7/tools/hal-system-lcd-get-brightness 19 Feb 2006 22:44:22 -0000
+@@ -8,13 +8,13 @@
+ # (at your option) any later version.
+
+ # Check for environment variables
+-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "" ]; then
++if [ -z "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" ]; then
+ echo "Missing or empty environment variable(s)." >&2
+ echo "This script should be started by hald." >&2
+ exit 1
+ fi
+
+-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then
++if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then
+ value="`hal-system-power-pmu getlcd`"
+ if [ $? -ne 0 ]; then
+ echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
+@@ -24,37 +24,37 @@
+ fi
+
+ # Check for file existance and that it's readable
+-if [ ! -r $HAL_PROP_LINUX_ACPI_PATH ]; then
++if [ ! -r "$HAL_PROP_LINUX_ACPI_PATH" ]; then
+ echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
+ echo "$1 not readable!" >&2
+ exit 1
+ fi
+
+-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "toshiba" ]; then
++if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "toshiba" ]; then
+ # cat /proc/acpi/toshiba/lcd
+ # brightness: 5
+ # brightness_levels: 8
+ value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep brightness: | awk '{print $2;}'`"
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "asus" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "asus" ]; then
+ # cat /proc/acpi/asus/brn
+ # 5
+ value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "panasonic" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then
+ # cat /proc/acpi/pcc/brightness
+ # 5
+ value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "ibm" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then
+ # cat /proc/acpi/ibm/brightness
+ # level: 5
+ # commands: up, down
+ # commands: level <level> (<level> is 0-7)
+ value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep level: | awk '{print $2;}'`"
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "sony" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then
+ # cat /proc/acpi/sony/brightness
+ # 5
+ value="`cat $HAL_PROP_LINUX_ACPI_PATH`"
+ let "value = ${value} - 1"
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "omnibook" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then
+ # cat /proc/omnibook/lcd
+ # LCD brightness: 7
+ value="`cat $HAL_PROP_LINUX_ACPI_PATH | awk '{print $3;}'`"
+Index: tools/hal-system-lcd-set-brightness
+===================================================================
+RCS file: /cvs/hal/hal/tools/hal-system-lcd-set-brightness,v
+retrieving revision 1.7
+diff -u -r1.7 hal-system-lcd-set-brightness
+--- hal-0.5.7/tools/hal-system-lcd-set-brightness 18 Feb 2006 23:11:23 -0000 1.7
++++ hal-0.5.7/tools/hal-system-lcd-set-brightness 19 Feb 2006 22:44:23 -0000
+@@ -8,8 +8,8 @@
+ # (at your option) any later version.
+
+ # Check for environment variables
+-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "" ] ||
+- [ "$HAL_PROP_LAPTOP_PANEL_NUM_LEVELS" == "" ] ; then
++if [ -z "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" ] ||
++ [ -z "$HAL_PROP_LAPTOP_PANEL_NUM_LEVELS" ] ; then
+ echo "Missing or empty environment variable(s)." >&2
+ echo "This script should be started by hald." >&2
+ exit 1
+@@ -18,7 +18,14 @@
+ # read value for set brightness
+ read value
+
+-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then
++# Check for values outside range
++if [ ${value} -lt 0 ] || [ ${value} -gt $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS ]; then
++ echo "org.freedesktop.Hal.Device.LaptopPanel.Invalid" >&2
++ echo "Brightness has to be between 0 and $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS!" >&2
++ exit 1
++fi
++
++if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then
+ hal-system-power-pmu setlcd $value
+ if [ $? -ne 0 ]; then
+ echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
+@@ -28,39 +35,33 @@
+ fi
+
+ # Check for file existance and that it's writable
+-if [ ! -w $HAL_PROP_LINUX_ACPI_PATH ]; then
++if [ ! -w "$HAL_PROP_LINUX_ACPI_PATH" ]; then
+ echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
+ echo "$1 not writable!" >&2
+ exit 1
+ fi
+
+-# Check for values outside range
+-if [ ${value} -lt 0 ] || [ ${value} -gt $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS ]; then
+- echo "org.freedesktop.Hal.Device.LaptopPanel.Invalid" >&2
+- echo "Brightness has to be between 0 and $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS!" >&2
+- exit 1
+-fi
+
+-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "toshiba" ]; then
++if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "toshiba" ]; then
+ # echo "brightness: {0..x}" >/proc/acpi/toshiba/lcd
+ echo "brightness: $value" > $HAL_PROP_LINUX_ACPI_PATH
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "asus" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "asus" ]; then
+ # echo {0..15} > /proc/acpi/asus/brn
+ # http://www.taupro.com/wiki/ChemBook/LCDdisplayPowerConfiguration
+ echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "panasonic" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then
+ # echo {0..15} > /proc/acpi/pcc/brightness
+ # http://readlist.com/lists/vger.kernel.org/linux-kernel/7/36405.html
+ echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "ibm" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then
+ # echo "level {0..7}" > /proc/acpi/ibm/brightness
+ # http://ibm-acpi.sourceforge.net/README
+ echo "level $value" > $HAL_PROP_LINUX_ACPI_PATH
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "sony" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then
+ # echo "{1..8}" > /proc/acpi/sony/brightness
+ # http://popies.net/sonypi/2.6-sony_acpi4.patch
+ echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
+-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "omnibook" ]; then
++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then
+ # echo "{0..7}" > /proc/omnibook/lcd
+ # http://bugzilla.gnome.org/show_bug.cgi?id=331458
+ echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
+Index: tools/hal-system-power-hibernate
+===================================================================
+RCS file: /cvs/hal/hal/tools/hal-system-power-hibernate,v
+retrieving revision 1.6
+diff -u -r1.6 hal-system-power-hibernate
+--- hal-0.5.7/tools/hal-system-power-hibernate 16 Jan 2006 12:47:40 -0000 1.6
++++ hal-0.5.7/tools/hal-system-power-hibernate 19 Feb 2006 22:44:23 -0000
+@@ -43,8 +43,9 @@
+ # Suspend2 tools installed
+ /usr/sbin/hibernate --force
+ RET=$?
+- elif [ -w "/sys/power/state" ] ; then
+- # Use the raw kernel sysfs interface
++ elif [ -w "/sys/power/state" ] &&
++ [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" != pmu ] ; then
++ # Use the raw kernel sysfs interface if possible (not on pmu yet)
+ echo "disk" > /sys/power/state
+ RET=$?
+ else
+Index: tools/hal-system-power-suspend
+===================================================================
+RCS file: /cvs/hal/hal/tools/hal-system-power-suspend,v
+retrieving revision 1.6
+diff -u -r1.6 hal-system-power-suspend
+--- hal-0.5.7/tools/hal-system-power-suspend 2007-01-18 22:50:15.000000000 +0100
++++ hal-0.5.7/tools/hal-system-power-suspend 2007-01-18 22:53:04.000000000 +0100
+@@ -18,15 +18,6 @@
+
+ read seconds_to_sleep
+
+-#PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
+-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then
+- hal-system-power-pmu sleep
+- if [ $? -ne 0 ]; then
+- echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2
+- exit 1
+- fi
+- exit 0
+-fi
+
+ #SuSE and ALTLinux only support powersave
+ if [ -f "/etc/altlinux-release" ] || [ -f "/etc/SuSE-release" ] ; then
+@@ -62,6 +53,13 @@
+ elif [ -x "/usr/sbin/pmi" ] ; then
+ /usr/sbin/pmi action suspend force
+ RET=$?
++ elif [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" = "pmu" ]; then
++ #PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
++ hal-system-power-pmu sleep
++ RET=$?
++ elif [ -x "/usr/sbin/hibernate-ram" ] ; then
++ /usr/sbin/hibernate-ram
++ RET=$?
+ elif [ -w "/sys/power/state" ] ; then
+ # Use the raw kernel sysfs interface
+ echo "mem" > /sys/power/state
+@@ -72,4 +70,8 @@
+ fi
+ fi
+
++if [ $RET -ne 0 ]; then
++ echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2
++ exit 1
++fi
+ exit $RET
+++ /dev/null
---- tools/hal-system-power-suspend 2006-02-19 00:00:55.000000000 +0100
-+++ tools/hal-system-power-suspend2 2006-09-23 11:22:42.000000000 +0200
-@@ -62,6 +62,9 @@
- elif [ -x "/usr/sbin/pmi" ] ; then
- /usr/sbin/pmi action suspend force
- RET=$?
-+ elif [ -x "/usr/sbin/hibernate-ram" ] ; then
-+ /usr/sbin/hibernate-ram
-+ RET=$?
- elif [ -w "/sys/power/state" ] ; then
- # Use the raw kernel sysfs interface
- echo "mem" > /sys/power/state
--- /dev/null
+--- hal-0.5.7.1/volume_id/via_raid.c 2006-02-21 20:15:17.000000000 +0100
++++ hal-0.5.7.1/volume_id/via_raid.c-new 2006-12-16 17:48:31.000000000 +0100
+@@ -3,6 +3,9 @@
+ *
+ * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
+ *
++ * Based on information taken from dmraid:
++ * Copyright (C) 2004-2006 Heinz Mauelshagen, Red Hat GmbH
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2 of the License.
+@@ -31,7 +34,7 @@
+ uint16_t signature;
+ uint8_t version_number;
+ struct via_array {
+- uint16_t disk_bits;
++ uint16_t disk_bit_mask;
+ uint8_t disk_array_ex;
+ uint32_t capacity_low;
+ uint32_t capacity_high;
+@@ -43,6 +46,17 @@
+
+ #define VIA_SIGNATURE 0xAA55
+
++/* 8 bit checksum on first 50 bytes of metadata. */
++static uint8_t meta_checksum(struct via_meta *via)
++{
++ uint8_t i = 50, sum = 0;
++
++ while (i--)
++ sum += ((uint8_t*) via)[i];
++
++ return sum == via->checksum;
++}
++
+ int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size)
+ {
+ const uint8_t *buf;
+@@ -68,6 +82,9 @@
+ if (via->version_number > 1)
+ return -1;
+
++ if (!meta_checksum(via))
++ return -1;
++
+ volume_id_set_usage(id, VOLUME_ID_RAID);
+ snprintf(id->type_version, sizeof(id->type_version)-1, "%u", via->version_number);
+ id->type = "via_raid_member";
+++ /dev/null
-# Copyright 1999-2007 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-r3.ebuild,v 1.16 2007/01/05 04:41:12 flameeyes Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="acpi debug doc pam_console pcmcia selinux"
-
-RDEPEND=">=dev-libs/glib-2.6
- >=sys-apps/dbus-0.50
- >=sys-fs/udev-071
- >=sys-apps/util-linux-2.12i
- || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
- dev-libs/expat
- dev-libs/libusb
- sys-apps/hotplug
- pam_console? ( sys-libs/pam )
- selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=dev-util/intltool-0.29
- doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS="haldaemon,disk,cdrom,cdrw,floppy,usb"
-
-function notify_uevent() {
- eerror
- eerror "You must enable Kernel Userspace Events in your kernel."
- eerror "This can be set under 'General Setup'. It is marked as"
- eerror "CONFIG_KOBJECT_UEVENT in the config file."
- eerror
- ebeep 5
-
- die "KOBJECT_UEVENT is not set"
-}
-
-pkg_setup() {
- linux-info_pkg_setup
-
- kernel_is ge 2 6 13 \
- || die "You need a 2.6.13 or newer kernel to run this package"
-
- if kernel_is lt 2 6 15; then
- linux_chkconfig_present KOBJECT_UEVENT || notify_uevent
- fi
-
- if use acpi ; then
- linux_chkconfig_present PROC_FS \
- || die "ACPI support requires PROC_FS support in kernel"
- fi
-
- if use pam_console && ! built_with_use sys-libs/pam pam_console ; then
- eerror "You need to build pam with pam_console support"
- eerror "Please remerge sys-libs/pam with USE=pam_console"
- die "pam without pam_console detected"
- fi
-
- if [ -d "${ROOT}"/etc/hal/device.d ]; then
- eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
- eerror "/etc/hal/device.d/ so please remove this directory"
- eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
- eerror "This is due to configuration protection of /etc/"
- die "remove /etc/hal/device.d/"
- fi
-}
-
-
-src_unpack() {
- unpack "${A}"
- cd "${S}"
- epatch "${FILESDIR}"/${P}-RBC.patch
-
- # remove pamconsole option
- use pam_console || epatch "${FILESDIR}"/${PN}-0.5.1-old_storage_policy.patch
-}
-
-src_compile() {
- econf \
- --with-doc-dir=/usr/share/doc/${PF} \
- --with-os-type=gentoo \
- --with-pid-file=/var/run/hald.pid \
- $(use_enable debug verbose-mode) \
- $(use_enable pcmcia pcmcia-support) \
- $(use_enable acpi acpi-proc) \
- $(use_enable doc docbook-docs) \
- $(use_enable doc doxygen-docs) \
- $(use_enable selinux) \
- || die "configure failed"
-
-# --disable-acpi-acpid when HAL handles all that acpid handles
-
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- # We install this in a seperate package to avoid gnome-python dep
- rm "${D}"/usr/bin/hal-device-manager
-
- # initscript
- newinitd "${FILESDIR}"/0.5-hald.rc hald
-
- dodoc AUTHORS ChangeLog NEWS README
-
- # Script to unmount devices if they are yanked out (from upstream)
- exeinto /etc/dev.d/default
- doexe "${FILESDIR}"/hal-unmount.dev
-}
-
-pkg_preinst() {
- enewgroup haldaemon || die "Problem adding haldaemon group"
- enewuser haldaemon -1 "-1" -1 ${HALDAEMON_GROUPS} || die "Problem adding haldaemon user"
- usermod -G ${HALDAEMON_GROUPS} haldaemon
-}
-
-pkg_postinst() {
- einfo "The HAL daemon needs to be running for certain applications to"
- einfo "work. Suggested is to add the init script to your start-up"
- einfo "scripts, this should be done like this :"
- einfo "\`rc-update add hald default\`"
-}
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r3.ebuild,v 1.9 2007/01/29 15:49:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r3.ebuild,v 1.10 2007/01/30 16:42:06 cardoe Exp $
inherit eutils linux-info
sys-libs/libcap
sys-apps/pciutils
dev-libs/libusb
- sys-apps/hotplug-base
virtual/eject
dmi? ( >=sys-apps/dmidecode-2.7 )
crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 )
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r2.ebuild,v 1.5 2007/01/18 05:34:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r4.ebuild,v 1.1 2007/01/30 16:42:06 cardoe Exp $
inherit eutils linux-info
sys-libs/libcap
sys-apps/pciutils
dev-libs/libusb
- sys-apps/hotplug-base
virtual/eject
dmi? ( >=sys-apps/dmidecode-2.7 )
crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 )
epatch "${FILESDIR}"/${PN}-0.5.7.1-ignored-volumes.patch
# Fix bash in hald scripts
- epatch "${FILESDIR}"/${PN}-0.5.7-hald-scripts.patch
+ epatch "${FILESDIR}"/${PN}-0.5.7.1-hald-scripts.patch
# probe partition table
epatch "${FILESDIR}"/${PN}-0.5.7-part-table.patch
# rescan devices on resume
epatch "${FILESDIR}"/${PN}-0.5.7-rescan-on-resume.patch
- # detect hibernate-ram script as well
- epatch "${FILESDIR}"/${PN}-0.5.7-hibernate.patch
-
# dbus deprecated dbus_connection_disconnect
epatch "${FILESDIR}"/${PN}-0.5.7.1-dbus-close.patch
# sr driver fix
epatch "${FILESDIR}"/${PN}-0.5.7.1-sr-driver.patch
- # hibernate sequence fix
- epatch "${FILESDIR}"/${PN}-0.5.7.1-hibernate-fix.patch
+ # mounting autofs & subfs fixes
+ epatch "${FILESDIR}"/${PN}-0.5.7.1-autofs-subfs.patch
+
+ # iPod Nano detected as RAID fix
+ epatch "${FILESDIR}"/${PN}-0.5.7.1-ipod-nano.patch
+
+ # Floppies mounting fix
+ epatch "${FILESDIR}"/${PN}-0.5.7.1-floppies-fix.patch
}
src_compile() {
--with-doc-dir=/usr/share/doc/${PF} \
--with-os-type=gentoo \
--with-pid-file=/var/run/hald.pid \
- --with-data=${hwdata}
+ --with-hwdata=${hwdata} \
--enable-hotplug-map \
$(use_enable debug verbose-mode) \
$(use_enable pcmcia pcmcia-support) \
# remove dep on gnome-python
mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
- # hal umount for unclean unmounts
- exeinto /lib/udev/
- newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
# initscript
newinitd "${FILESDIR}"/0.5-hald.rc hald
- # Script to unmount devices if they are yanked out (from upstream)
- exeinto /etc/dev.d/default
- doexe "${FILESDIR}"/hal-unmount.dev
-
# We now create and keep /media here as both gnome-mount and pmount
# use these directories, to avoid collision.
dodir /media
projects / gentoo.git / commitdiff