[arch-commits] CVS update of extra/system/hal (3 files)

[Jan de Groot]

    Date: Tuesday, May 1, 2007 @ 17:56:44
  Author: jgc
    Path: /home/cvs-extra/extra/system/hal

   Added: hal-0.5.9-hide-diagnostic.patch (1.1)
Modified: PKGBUILD (1.40 -> 1.41) add-flush-option.patch (1.1 -> 1.2)

upgpkg: hal 0.5.9-2
Add flush as valid mount option again
Fix policy to hide those nasty recovery partitions


---------------------------------+
 PKGBUILD                        |   14 ++++++++++----
 add-flush-option.patch          |   32 ++++++++++++++++----------------
 hal-0.5.9-hide-diagnostic.patch |   14 ++++++++++++++
 3 files changed, 40 insertions(+), 20 deletions(-)


Index: extra/system/hal/PKGBUILD
diff -u extra/system/hal/PKGBUILD:1.40 extra/system/hal/PKGBUILD:1.41
--- extra/system/hal/PKGBUILD:1.40	Mon Apr  9 10:55:39 2007
+++ extra/system/hal/PKGBUILD	Tue May  1 17:56:44 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.40 2007/04/09 14:55:39 jgc Exp $
+# $Id: PKGBUILD,v 1.41 2007/05/01 21:56:44 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=hal
 pkgver=0.5.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
@@ -16,14 +16,20 @@
 source=(http://people.freedesktop.org/~david/dist/${pkgname}-${pkgver}.tar.gz
 	hal
 	hal-policy.patch
-	cryptsetup_location.patch)
+	cryptsetup_location.patch
+	add-flush-option.patch
+	hal-0.5.9-hide-diagnostic.patch)
 md5sums=('a6f532770cf9286e1de38d6570cbc6bc' '882f67668cb14a0a9e4a27ef22278027'
-	 '5ba8b610aa9763a5f42b9f7cbd7a86ad' 'c688a3c6574699365926f4fef7441545')
+         '5ba8b610aa9763a5f42b9f7cbd7a86ad' 'c688a3c6574699365926f4fef7441545'
+         'da23bd552c4239cd933b90d0e13b9d54' '4d4b6801a1cedca22b8bdd9db73b16fb')
+
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np1 -i ${startdir}/src/hal-policy.patch || return 1
   patch -Np1 -i ${startdir}/src/cryptsetup_location.patch || return 1
+  patch -Np1 -i ${startdir}/src/add-flush-option.patch || return 1
+  patch -Np1 -i ${startdir}/src/hal-0.5.9-hide-diagnostic.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --libexecdir=/usr/lib/hal --enable-static=no \
Index: extra/system/hal/add-flush-option.patch
diff -u extra/system/hal/add-flush-option.patch:1.1 extra/system/hal/add-flush-option.patch:1.2
--- extra/system/hal/add-flush-option.patch:1.1	Thu Feb 15 13:01:02 2007
+++ extra/system/hal/add-flush-option.patch	Tue May  1 17:56:44 2007
@@ -1,18 +1,18 @@
---- a/fdi/policy/10osvendor/20-storage-methods.fdi
-+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
-@@ -52,6 +52,7 @@
-         <append key="volume.mount.valid_options" type="strlist">noexec</append>
-         <append key="volume.mount.valid_options" type="strlist">quiet</append>
-         <!-- As this is removable media give some leeway -->
-+	<append key="volume.mount.valid_options" type="strlist">flush</append>
- 	<append key="volume.mount.valid_options" type="strlist">utf8</append>
- 	<append key="volume.mount.valid_options" type="strlist">shortname=</append>
- 	<append key="volume.mount.valid_options" type="strlist">codepage=</append>
-@@ -117,6 +118,7 @@
- 
+--- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi	2007-03-27 05:18:54.000000000 +0000
++++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi	2007-05-01 21:39:31.000000000 +0000
+@@ -60,6 +60,7 @@
+           <append key="volume.mount.valid_options" type="strlist">remount</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">exec</append>
+           <!-- As this is removable media give some leeway -->
++	  <append key="volume.mount.valid_options" type="strlist">flush</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">shortname=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">codepage=</append>
+@@ -144,6 +145,7 @@
        <!-- allow these mount options for vfat -->
        <match key="volume.fstype" string="vfat">
-+	<append key="volume.mount.valid_options" type="strlist">flush</append>
- 	<append key="volume.mount.valid_options" type="strlist">utf8</append>
- 	<append key="volume.mount.valid_options" type="strlist">shortname=</append>
- 	<append key="volume.mount.valid_options" type="strlist">codepage=</append>
+ 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
++	  <append key="volume.mount.valid_options" type="strlist">flush</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">shortname=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">codepage=</append>
Index: extra/system/hal/hal-0.5.9-hide-diagnostic.patch
diff -u /dev/null extra/system/hal/hal-0.5.9-hide-diagnostic.patch:1.1
--- /dev/null	Tue May  1 17:56:44 2007
+++ extra/system/hal/hal-0.5.9-hide-diagnostic.patch	Tue May  1 17:56:44 2007
@@ -0,0 +1,14 @@
+--- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi.orig	2007-05-01 21:39:31.000000000 +0000
++++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi	2007-05-01 21:51:14.000000000 +0000
+@@ -100,6 +100,11 @@
+ 	</match>
+       </match>
+ 
++      <!-- Hide partitions marked as Compaq Diagnostics -->
++      <match key="volume.partition.type" string="0x12">
++        <merge key="volume.ignore" type="bool">true</merge>
++      </match>
++
+       <!-- EFI firmware partitions -->
+       <match key="volume.fstype" string="vfat">
+ 	<match key="volume.label" string="EFI">