From: Doug Goldstein Date: Thu, 19 Apr 2007 19:49:52 +0000 (+0000) Subject: Add missing fdi matching rules to spec file. Implemented missing double match. Cleane... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4b15cded81fc763287c30c8805d2fd836c49d50;p=gentoo.git Add missing fdi matching rules to spec file. Implemented missing double match. Cleaned up ignored volumes patch. Package-Manager: portage-2.1.2.4 --- diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 418e81eb233a..c81d7960328c 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,12 @@ # 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.172 2007/04/19 16:34:58 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.173 2007/04/19 19:49:52 cardoe Exp $ + + 19 Apr 2007; Doug Goldstein + +files/0.5.9/15_spec_fdi_matching.patch, + files/0.5.9/97_ignore_fixed_drives.patch, files/0.5.9/series: + Add missing fdi matching rules to spec file. Implemented missing double + match. Cleaned up ignored volumes patch. 19 Apr 2007; Doug Goldstein files/0.5.9-hald.rc: init script tweak to require /dev/root diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index e42b627f3dcb..f3c2886fc4db 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -69,6 +69,10 @@ AUX 0.5.9/14_ntfs_allows_utf8.patch 791 RMD160 51dd2eab4d77bdc10f63500d05621650e MD5 6f0b723829536ff43e7d9f42dcd89317 files/0.5.9/14_ntfs_allows_utf8.patch 791 RMD160 51dd2eab4d77bdc10f63500d05621650ebb58738 files/0.5.9/14_ntfs_allows_utf8.patch 791 SHA256 eac2b172054dc8c658428f65e2d88454cecf7a5766b359ff7b3a6744878ee65f files/0.5.9/14_ntfs_allows_utf8.patch 791 +AUX 0.5.9/15_spec_fdi_matching.patch 7872 RMD160 c11ebdaa69ed60ccd052bf45e0a04e2d2c3b2e63 SHA1 1f9722ed3a2e32dc0ffafd4948fde2dee9a830d0 SHA256 b80324f79b9da7ad61a650f51090041f632f1491d23378fb1e0db2d566e1a5a4 +MD5 b42a0bd27c128e2e172ccd7bec33c879 files/0.5.9/15_spec_fdi_matching.patch 7872 +RMD160 c11ebdaa69ed60ccd052bf45e0a04e2d2c3b2e63 files/0.5.9/15_spec_fdi_matching.patch 7872 +SHA256 b80324f79b9da7ad61a650f51090041f632f1491d23378fb1e0db2d566e1a5a4 files/0.5.9/15_spec_fdi_matching.patch 7872 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 @@ -77,14 +81,14 @@ 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/97_ignore_fixed_drives.patch 1628 RMD160 33b8a24ec2dedc11c4111e0f6644fe26351f9d40 SHA1 e4450893014f62f0e39c1b933c43398df78baf60 SHA256 c6870e48076de7afa19db10d910c6c005d41d9e715e125aed170bce9e9a0d700 -MD5 cc5d04f4046c5fac323a27160ffe317a files/0.5.9/97_ignore_fixed_drives.patch 1628 -RMD160 33b8a24ec2dedc11c4111e0f6644fe26351f9d40 files/0.5.9/97_ignore_fixed_drives.patch 1628 -SHA256 c6870e48076de7afa19db10d910c6c005d41d9e715e125aed170bce9e9a0d700 files/0.5.9/97_ignore_fixed_drives.patch 1628 -AUX 0.5.9/series 562 RMD160 c6328d785f69416425a1f21ddf397f1eab426b75 SHA1 4bcd93dfee8e4a04277dbc31c873164f2bfd082c SHA256 bbfc7a02a3c108a9ff513bb7f2414669a8db21e4dd1f661f6737c55ed93978e7 -MD5 97085ec48659538a9792effbd0fe6b2a files/0.5.9/series 562 -RMD160 c6328d785f69416425a1f21ddf397f1eab426b75 files/0.5.9/series 562 -SHA256 bbfc7a02a3c108a9ff513bb7f2414669a8db21e4dd1f661f6737c55ed93978e7 files/0.5.9/series 562 +AUX 0.5.9/97_ignore_fixed_drives.patch 1529 RMD160 42ac279e07a7ef7c30b4dabb67a9edff434d3484 SHA1 27da14e0c756f17b0293d758cee58489a68a260f SHA256 81c6882a54abf995df5485e47066c45a34be9b3baa9c6260c21cbb9d091a4220 +MD5 bbcbdcd6d9bf5db050a0f01fdca08c79 files/0.5.9/97_ignore_fixed_drives.patch 1529 +RMD160 42ac279e07a7ef7c30b4dabb67a9edff434d3484 files/0.5.9/97_ignore_fixed_drives.patch 1529 +SHA256 81c6882a54abf995df5485e47066c45a34be9b3baa9c6260c21cbb9d091a4220 files/0.5.9/97_ignore_fixed_drives.patch 1529 +AUX 0.5.9/series 589 RMD160 3095591c5772066288413a51e67ac45322608854 SHA1 4c32628e23b240218a7e13deb030c0e2f0a5e4fa SHA256 54c1e8207bf780567f2d14f51b29e3de180a8700d4caef69ec4761c15186ec6b +MD5 310be431c7d74d4610e81d28ff41fe15 files/0.5.9/series 589 +RMD160 3095591c5772066288413a51e67ac45322608854 files/0.5.9/series 589 +SHA256 54c1e8207bf780567f2d14f51b29e3de180a8700d4caef69ec4761c15186ec6b files/0.5.9/series 589 AUX hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f SHA1 c2ffb779f423e07b38f12a852d942928394abc63 SHA256 d0b713f84c7bc782ba7b13f439630a995588097db2141f4a97c110036f64001a MD5 521a06ba0845bd3246d6ed4b589f110f files/hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f files/hal-0.5.7-hald-scripts.patch 8636 @@ -187,10 +191,10 @@ EBUILD hal-0.5.9.ebuild 7193 RMD160 a36f201410e369b8a939876bd13662c23df1a638 SHA MD5 490583431bbaa7a9e38de2c1c0a89100 hal-0.5.9.ebuild 7193 RMD160 a36f201410e369b8a939876bd13662c23df1a638 hal-0.5.9.ebuild 7193 SHA256 7559e53b5a730ce8c819bd3c424311ef66bde22b1e54cbeb9b7844862f99cd04 hal-0.5.9.ebuild 7193 -MISC ChangeLog 28204 RMD160 9fa1c2bf5d0533873c8a83eaf0c1bfb48a6a928e SHA1 ad1cc37fd9309a3ef26bc7b15d033e9be95b39ec SHA256 22a7ea31a0cd88867756db83b621f4a16b4790def8777fb3733a9e9ea05056f5 -MD5 f1c6fb545249aac6a2b31cd7c4f222dc ChangeLog 28204 -RMD160 9fa1c2bf5d0533873c8a83eaf0c1bfb48a6a928e ChangeLog 28204 -SHA256 22a7ea31a0cd88867756db83b621f4a16b4790def8777fb3733a9e9ea05056f5 ChangeLog 28204 +MISC ChangeLog 28479 RMD160 77bbe1b5ff8c975d8e6f3644f8f759e5c6fdd9e4 SHA1 23a2e0e53b4f227de4de0faa2b9abe8149054bc4 SHA256 d3c8472cfb0e7fec9aabed9c121533eea7f63058e186d82ec7ceb7840fc46267 +MD5 d1676906775763acc531920594df6315 ChangeLog 28479 +RMD160 77bbe1b5ff8c975d8e6f3644f8f759e5c6fdd9e4 ChangeLog 28479 +SHA256 d3c8472cfb0e7fec9aabed9c121533eea7f63058e186d82ec7ceb7840fc46267 ChangeLog 28479 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345 @@ -207,7 +211,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGJ5nloeSe8B0zEfwRAkslAJ4sBL2OBdISgX+1AWYjxPMr9vyHrgCeMzh7 -sljxZmp9TGTiMMW3RqIsmLc= -=cyHy +iD8DBQFGJ8eToeSe8B0zEfwRAjVeAJ9AEy0KKdV3zwqRBZKblBJpUFwmTgCeOlyx +GCPvzjzKJl8FQ2feud7d52A= +=nGLO -----END PGP SIGNATURE----- diff --git a/sys-apps/hal/files/0.5.9/15_spec_fdi_matching.patch b/sys-apps/hal/files/0.5.9/15_spec_fdi_matching.patch new file mode 100644 index 000000000000..9ad9d6589c0d --- /dev/null +++ b/sys-apps/hal/files/0.5.9/15_spec_fdi_matching.patch @@ -0,0 +1,198 @@ +Index: b/doc/spec/hal-spec-fdi-files.xml +=================================================================== +--- a/doc/spec/hal-spec-fdi-files.xml 2007-04-12 21:22:36.000000000 -0400 ++++ b/doc/spec/hal-spec-fdi-files.xml 2007-04-19 15:23:51.000000000 -0400 +@@ -100,6 +100,12 @@ + + + ++ is_ascii - matches only when a string property ++ contain only ASCII characters. Can be used with 'true' or 'false'. ++ ++ ++ ++ + is_absolute_path - matches only when a string + property represents an absolute path (the path doesn't have to exist). + Can be used with 'true' or 'false'. +@@ -107,65 +113,92 @@ + + + +- is_ascii - matches only when a string property +- contain only ASCII characters. Can be used with 'true' or 'false'. ++ sibling_contains - can only be used with string and ++ strlist (string list). ++ For a string key this matches when a sibling item contains the ++ (sub-)string in the same property. For a string list, this is if a string ++ matches an item in the list. + + + + +- compare_lt - can be used on int, uint64, double +- and string properties to compare with a constant. +- Matches when the given property is less than the given constant +- using the default ordering. ++ contains - can only be used with string and ++ strlist (string list). ++ For a string key this matches when the property contains the given ++ (sub-)string. For a string list this match if the given string match ++ a item of the list. + + + + +- compare_le - like compare_lt +- but matches when less than or equal. ++ contains_ncase - like contains ++ but the property and the given key are converted to lowercase before check. + + + + +- compare_gt - like compare_lt +- but matches when greater than. ++ contains_not - can only be used with strlist (string list) ++ and string properties. ++ For a string list this match if the given string not match any of the ++ item of the list (or the property is not set for the device). For a string ++ this match of the property not contains the (sub-)string. You can use this ++ attribute to construct if/else blocks together with e.g. contains. + + + + +- compare_ge - like compare_lt +- but matches when greater than or equal. ++ prefix - can only be used with string properties. ++ Matches if property begins with the key. + + + + +- compare_ne - like compare_lt +- but matches when not equal. ++ prefix_ncase - like prefix but the ++ property and the given key are converted to lowercase before the check. + + + + +- contains - can only be used with string and +- strlist (string list). +- For a string key this matches when the property contains the given +- (sub-)string. For a string list this match if the given string match +- a item of the list. ++ suffix - can only be used with string properties. ++ Matches if property ends with the key. + + + + +- contains_not - can only be used with strlist (string list) +- and string properties. +- For a string list this match if the given string not match any of the +- item of the list (or the property is not set for the device). For a string +- this match of the property not contains the (sub-)string. You can use this +- attribute to construct if/else blocks together with e.g. contains. ++ suffix_ncase - like suffix but the ++ property and the given key are converted to lowercase before the check. + + + + +- contains_ncase - like contains +- but the property and the given key are converted to lowercase before check. ++ compare_lt - can be used on int, uint64, double ++ and string properties to compare with a constant. ++ Matches when the given property is less than the given constant ++ using the default ordering. ++ ++ ++ ++ ++ compare_le - like compare_lt ++ but matches when less than or equal. ++ ++ ++ ++ ++ compare_gt - like compare_lt ++ but matches when greater than. ++ ++ ++ ++ ++ compare_ge - like compare_lt ++ but matches when greater than or equal. ++ ++ ++ ++ ++ compare_ne - like compare_lt ++ but matches when not equal. + + + +Index: b/hald/device_info.c +=================================================================== +--- a/hald/device_info.c 2007-04-12 21:22:36.000000000 -0400 ++++ b/hald/device_info.c 2007-04-19 15:32:52.000000000 -0400 +@@ -71,6 +71,8 @@ + return "uint64"; + case MATCH_BOOL: + return "bool"; ++ case MATCH_DOUBLE: ++ return "double"; + case MATCH_EXISTS: + return "exists"; + case MATCH_EMPTY: +@@ -85,6 +87,8 @@ + return "contains"; + case MATCH_CONTAINS_NCASE: + return "contains_ncase"; ++ case MATCH_CONTAINS_NOT: ++ return "contains_not"; + case MATCH_PREFIX: + return "prefix"; + case MATCH_PREFIX_NCASE: +@@ -105,8 +109,6 @@ + return "compare_ne"; + case MATCH_UNKNOWN: + return "unknown match type"; +- case MATCH_CONTAINS_NOT: +- return "contains_not"; + } + return "invalid match type"; + } +@@ -331,6 +333,17 @@ + return TRUE; + } + ++ case MATCH_DOUBLE: ++ { ++ double val = atof (value); ++ ++ if (hal_device_property_get_type (d, prop_to_check) != HAL_PROPERTY_TYPE_DOUBLE) ++ return FALSE; ++ if (hal_device_property_get_double (d, prop_to_check) != val) ++ return FALSE; ++ return TRUE; ++ } ++ + case MATCH_EXISTS: + { + dbus_bool_t should_exist = TRUE; +Index: b/hald/rule.h +=================================================================== +--- a/hald/rule.h 2007-03-07 16:52:19.000000000 -0500 ++++ b/hald/rule.h 2007-04-19 14:56:41.000000000 -0400 +@@ -63,6 +63,7 @@ + MATCH_INT, + MATCH_UINT64, + MATCH_BOOL, ++ MATCH_DOUBLE, + MATCH_EXISTS, + MATCH_EMPTY, + MATCH_ISASCII, diff --git a/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch b/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch index acc0b4df8cbe..2e80e41e4663 100644 --- a/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch +++ b/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch @@ -1,8 +1,8 @@ Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi 2007-04-18 16:53:05.000000000 -0400 -@@ -0,0 +1,21 @@ ++++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi 2007-04-19 15:33:34.000000000 -0400 +@@ -0,0 +1,19 @@ + + + @@ -13,10 +13,8 @@ Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi + + true + -+ -+ -+ false -+ ++ ++ false + + + @@ -26,8 +24,8 @@ Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi + Index: b/fdi/policy/10osvendor/Makefile.am =================================================================== ---- a/fdi/policy/10osvendor/Makefile.am 2007-04-18 10:17:26.000000000 -0400 -+++ b/fdi/policy/10osvendor/Makefile.am 2007-04-18 16:45:07.000000000 -0400 +--- a/fdi/policy/10osvendor/Makefile.am 2007-04-19 14:29:41.000000000 -0400 ++++ b/fdi/policy/10osvendor/Makefile.am 2007-04-19 15:33:05.000000000 -0400 @@ -7,7 +7,8 @@ 10-rfkill-switch.fdi \ 10-laptop-panel-mgmt-policy.fdi \ diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series index 6406218c700c..1bf2930f2b22 100644 --- a/sys-apps/hal/files/0.5.9/series +++ b/sys-apps/hal/files/0.5.9/series @@ -12,6 +12,7 @@ 12_hal_fix-vol_label_probe_volume.patch 13_detect_newer_macbooks.patch 14_ntfs_allows_utf8.patch +15_spec_fdi_matching.patch 95_gentoo_man_page.patch 96_plugdev_allow_send.patch 97_ignore_fixed_drives.patch