[arch-commits] Commit in hal/repos (3 files)

[Pierre Schmitz]

    Date: Sunday, September 14, 2008 @ 06:49:05
  Author: pierre
Revision: 12450

Merged revisions 12446,12448 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/hal/trunk

........
  r12446 | pierre | 2008-09-14 10:43:40 +0000 (So, 14 Sep 2008) | 2 lines
  
  upgpkg: hal 0.5.11-4
      fix FS#8677
........
  r12448 | pierre | 2008-09-14 10:46:14 +0000 (So, 14 Sep 2008) | 2 lines
  
  upgpkg: hal 0.5.11-4
      fix FS#8677
........

Added:
  hal/repos/testing-i686/ntfs-mount-fix.patch
    (from rev 12448, hal/trunk/ntfs-mount-fix.patch)
Modified:
  hal/repos/testing-i686/	(properties)
  hal/repos/testing-i686/PKGBUILD

----------------------+
 PKGBUILD             |    9 ++++++---
 ntfs-mount-fix.patch |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)


Property changes on: hal/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /hal/trunk:1-12313
   + /hal/trunk:1-12449

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-09-14 10:46:57 UTC (rev 12449)
+++ testing-i686/PKGBUILD	2008-09-14 10:49:05 UTC (rev 12450)
@@ -4,7 +4,7 @@
 
 pkgname=hal
 pkgver=0.5.11
-pkgrel=3
+pkgrel=4
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
@@ -19,14 +19,16 @@
 	cryptsetup_location.patch
 	hal-0.5.9-hide-diagnostic.patch
 	ntfs3g-valid-options.patch
-	fix-udev-compatibility.patch)
+	fix-udev-compatibility.patch
+	ntfs-mount-fix.patch)
 md5sums=('5e8935ab61bcb14afd2d4548084aace0'
          '277e96ac130d7bfce0b30f0b80db8782'
          '18dcdaa79952e2057c2e4745fbc8ad52'
          'c688a3c6574699365926f4fef7441545'
          '4d4b6801a1cedca22b8bdd9db73b16fb'
          '4242a2c78885e396f639d0cd5e33218c'
-         '1a33d73fa422df2f05b7e3483836f778')
+         '1a33d73fa422df2f05b7e3483836f778'
+         '96cf8835c30dc581c4fcf72b6ad7675e')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -36,6 +38,7 @@
   patch -Np0 -i ${startdir}/src/ntfs3g-valid-options.patch || return 1
   # Fix compatibility with udev 126 and later
   patch -Np1 -i ${startdir}/src/fix-udev-compatibility.patch || return 1
+  patch -p0 -i ${srcdir}/ntfs-mount-fix.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --libexecdir=/usr/lib/hal --enable-static=no \

Copied: hal/repos/testing-i686/ntfs-mount-fix.patch (from rev 12448, hal/trunk/ntfs-mount-fix.patch)
===================================================================
--- testing-i686/ntfs-mount-fix.patch	                        (rev 0)
+++ testing-i686/ntfs-mount-fix.patch	2008-09-14 10:49:05 UTC (rev 12450)
@@ -0,0 +1,18 @@
+--- tools/hal-storage-mount.c.orig	2008-04-21 01:48:27.000000000 +0200
++++ tools/hal-storage-mount.c	2008-04-21 01:47:44.000000000 +0200
+@@ -769,13 +769,13 @@
+ 
+ 	if (pol_is_fixed) {
+ 		if (pol_change_uid) {
+-			action = NULL; /* "hal-storage-mount-fixed-extra-options"; TODO: rethink */
++			action = "hal-storage-mount-fixed-extra-options"; /*TODO: rethink */
+ 		} else {
+ 			action = "org.freedesktop.hal.storage.mount-fixed";
+ 		}
+ 	} else {
+ 		if (pol_change_uid) {
+-			action = NULL; /* "hal-storage-mount-removable-extra-options"; TODO: rethink "extra-options" */
++			action = "hal-storage-mount-removable-extra-options"; /*TODO: rethink "extra-options" */
+ 		} else {
+ 			action = "org.freedesktop.hal.storage.mount-removable";
+ 		}