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

[Jan de Groot]

    Date: Sunday, October 28, 2007 @ 15:58:29
  Author: jgc
    Path: /home/cvs-extra/extra/system/hal

   Added: ntfs3g-valid-options.patch (1.1)
Modified: PKGBUILD (1.43 -> 1.44)
 Removed: add-flush-option.patch (1.2)

upgpkg: hal 0.5.10-1
Update to 0.5.10, add patch to handle ntfs-3g mount options


----------------------------+
 PKGBUILD                   |   16 +++++++++-------
 add-flush-option.patch     |   18 ------------------
 ntfs3g-valid-options.patch |   11 +++++++++++
 3 files changed, 20 insertions(+), 25 deletions(-)


Index: extra/system/hal/PKGBUILD
diff -u extra/system/hal/PKGBUILD:1.43 extra/system/hal/PKGBUILD:1.44
--- extra/system/hal/PKGBUILD:1.43	Wed Jun 27 16:30:18 2007
+++ extra/system/hal/PKGBUILD	Sun Oct 28 15:58:29 2007
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD,v 1.43 2007/06/27 20:30:18 jgc Exp $
+# $Id: PKGBUILD,v 1.44 2007/10/28 19:58:29 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=hal
-pkgver=0.5.9.1
+pkgver=0.5.10
 pkgrel=1
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.73' 'libusb' 'udev>=089' 'filesystem>=0.7.1-5' 'hal-info>=0.20070618' 'eject' 'libsmbios>=0.13.6' 'dmidecode')
-makedepends=('pkgconfig')
+depends=('dbus-glib>=0.74' 'libusb' 'udev>=111' 'filesystem>=0.7.1-5' 'hal-info>=0.20071011' 'eject' 'libsmbios>=0.13.6' 'dmidecode' 'pciutils>=2.2.8-2' 'usbutils>=0.73-3' 'pm-utils')
+makedepends=('pkgconfig' 'gperf')
 options=('!libtool')
 install=hal.install
-source=(http://people.freedesktop.org/~david/dist/${pkgname}-${pkgver}.tar.gz
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
 	hal
 	hal-policy.patch
 	cryptsetup_location.patch
-	hal-0.5.9-hide-diagnostic.patch)
-md5sums=('6a40f49f964e64358e53652038f3059f'
+	hal-0.5.9-hide-diagnostic.patch
+	ntfs3g-valid-options.patch)
+md5sums=('fce852c428e7cda0b937087c79eec63f'
          '882f67668cb14a0a9e4a27ef22278027'
          '5ba8b610aa9763a5f42b9f7cbd7a86ad'
          'c688a3c6574699365926f4fef7441545'
@@ -29,6 +30,7 @@
   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/hal-0.5.9-hide-diagnostic.patch || return 1
+  patch -Np0 -i ${startdir}/src/ntfs3g-valid-options.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.2 extra/system/hal/add-flush-option.patch:removed
--- extra/system/hal/add-flush-option.patch:1.2	Tue May  1 17:56:44 2007
+++ extra/system/hal/add-flush-option.patch	Sun Oct 28 15:58:29 2007
@@ -1,18 +0,0 @@
---- 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">
- 	<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/ntfs3g-valid-options.patch
diff -u /dev/null extra/system/hal/ntfs3g-valid-options.patch:1.1
--- /dev/null	Sun Oct 28 15:58:29 2007
+++ extra/system/hal/ntfs3g-valid-options.patch	Sun Oct 28 15:58:29 2007
@@ -0,0 +1,11 @@
+--- fdi/policy/10osvendor/20-storage-methods.fdi.orig	2007-10-28 19:40:22.000000000 +0000
++++ fdi/policy/10osvendor/20-storage-methods.fdi	2007-10-28 19:40:58.000000000 +0000
+@@ -240,6 +240,8 @@
+ 	  <append key="volume.mount.valid_options" type="strlist">uid=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">gid=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">umask=</append>
++	  <append key="volume.mount.valid_options" type="strlist">dmask=</append>
++	  <append key="volume.mount.valid_options" type="strlist">fmask=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">locale=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
+ 	</match>