rev bump to 1.5.1. Use azarah's patch for g-v-m's pmount usage since it's better

(Portage version: 2.0.51.22-r2)

6 files changed, 69 insertions, 65 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index a19c1cdb1205..442345f45ded 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.35 2005/09/07 13:11:24 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.36 2005/09/08 02:05:13 cardoe Exp $
+
+*gnome-volume-manager-1.5.1 (08 Sep 2005)
+
+  08 Sep 2005; Doug Goldstein <cardoe@gentoo.org>
+  +files/gnome-volume-manager-1.5.1-use-pmount-2.patch,
+  -files/gvm-use-pmount-if-available-nochangelog.patch,
+  -gnome-volume-manager-1.5.0.ebuild, +gnome-volume-manager-1.5.1.ebuild:
+  rev bump to 1.5.1. Use azarah's patch for g-v-m's pmount usage since it's
+  better
 
   07 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-volume-manager-1.2.2.ebuild:
diff --git a/gnome-base/gnome-volume-manager/Manifest b/gnome-base/gnome-volume-manager/Manifest
index c2ec79d241d7..820acce0ae6d 100644
--- a/gnome-base/gnome-volume-manager/Manifest
+++ b/gnome-base/gnome-volume-manager/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 530f59750872dae8a4e06b56da855e58 ChangeLog 4987
 MD5 c6349a883ff4a07cc8acbded5dd9bd3b gnome-volume-manager-1.2.2.ebuild 1032
+MD5 7390ed01b53fc68fa11c77b1d5b3be9f gnome-volume-manager-1.5.1.ebuild 1533
 MD5 72c1bae8ef38e67c06baafe764e34065 gnome-volume-manager-1.2.1.ebuild 1008
-MD5 e686074972da9266f00210b851924735 gnome-volume-manager-1.5.0.ebuild 1606
-MD5 1148577a72eb0f87fa98116f02e1c4d0 ChangeLog 4622
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 fcd04d3a6284a16bdffaddaf7311cfe8 files/digest-gnome-volume-manager-1.2.1 79
 MD5 16d8909214e29b02eb989b948601461c files/digest-gnome-volume-manager-1.2.2 79
-MD5 8204147a3c0e44731e1baef264383fc1 files/digest-gnome-volume-manager-1.5.0 173
-MD5 a037ca860b7fc7519f2e19ab5c1c0c82 files/gvm-use-pmount-if-available-nochangelog.patch 1741
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDHucUKRy60XGEcJIRAlCoAKCNDpjVJHdUE/ZCdW+hFImSiFDHmwCfcH7b
-elPq5gm3qTjIC7zFZNymqzU=
-=m0MI
------END PGP SIGNATURE-----
+MD5 23333330820921c756db73277bd99084 files/gnome-volume-manager-1.5.1-use-pmount-2.patch 1805
+MD5 019e01caf376cfa12bd42566ab4d4f44 files/digest-gnome-volume-manager-1.5.1 173
+MD5 fcd04d3a6284a16bdffaddaf7311cfe8 files/digest-gnome-volume-manager-1.2.1 79
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.1
index c15ec916c182..ccf8e6da83c3 100644
--- a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0
+++ b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.1
@@ -1,2 +1,2 @@
-MD5 dfd61938c2dde0f41487f823e02ebb8e gnome-volume-manager-1.5.0.tar.gz 298517
+MD5 b442fa2cc217f9d5fcfdaeedaa7225be gnome-volume-manager-1.5.1.tar.gz 310768
 MD5 3054a930a0eddef2be59d4a602719bb1 gnome-volume-manager-1.3.3-reconnect_dbus.patch.bz2 12026
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch
new file mode 100644
index 000000000000..962d0e1f55ef
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch
@@ -0,0 +1,50 @@
+diff -urpN gnome-volume-manager-1.5.1/src/manager.c gnome-volume-manager-1.5.1.az/src/manager.c
+--- gnome-volume-manager-1.5.1/src/manager.c	2005-08-25 22:53:51.000000000 +0200
++++ gnome-volume-manager-1.5.1.az/src/manager.c	2005-09-07 22:33:43.000000000 +0200
+@@ -47,6 +47,11 @@
+ 
+ #define NAUTILUS_COMMAND	 BIN_NAUTILUS" -n --no-desktop %m"
+ 
++#define BIN_PMOUNT		 "/usr/bin/pmount-hal"
++#define PMOUNT_COMMAND		 BIN_PMOUNT" %h"
++#define BIN_PUNMOUNT		 "/usr/bin/pumount"
++#define PUNMOUNT_COMMAND	 BIN_PUNMOUNT" %d"
++
+ static struct gvm_configuration config;
+ static LibHalContext *hal_ctx;
+ 
+@@ -1170,13 +1175,18 @@ gvm_device_mounted (const char *udi)
+ static gboolean
+ gvm_device_mount (const char *udi, const char *device, const char *mount_point)
+ {
++	char *mount_command = MOUNT_COMMAND;
+ 	char *key;
+ 	
+ 	key = g_strdup (udi);
+ 	g_hash_table_insert (mount_table, key, key);
++
++	/* Only check executable, as suid binaries might not be readable */
++	if (g_file_test (BIN_PMOUNT, G_FILE_TEST_IS_EXECUTABLE))
++		mount_command = PMOUNT_COMMAND;
+ 	
+ 	dbg ("mounting %s...\n", udi);
+-	if (gvm_run_command (MOUNT_COMMAND, udi, device, mount_point))
++	if (gvm_run_command (mount_command, udi, device, mount_point))
+ 		return TRUE;
+ 	
+ 	dbg ("mount failed: %s\n", udi);
+@@ -1194,7 +1204,13 @@ gvm_device_mount (const char *udi, const
+ static gboolean
+ gvm_device_unmount (const char *udi, const char *device, const char *mount_point)
+ {
+-	return gvm_run_command (UNMOUNT_COMMAND, udi, device, mount_point);
++	char *unmount_command = UNMOUNT_COMMAND;
++	
++	/* Only check executable, as suid binaries might not be readable */
++	if (g_file_test (BIN_PUNMOUNT, G_FILE_TEST_IS_EXECUTABLE))
++		unmount_command = PUNMOUNT_COMMAND;
++	
++	return gvm_run_command (unmount_command, udi, device, mount_point);
+ }
+ 
+ /*
diff --git a/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch b/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch
deleted file mode 100644
index 8afaba3ab756..000000000000
--- a/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/configure.in,v
-retrieving revision 1.94
-diff -u -b -B -r1.94 configure.in
---- configure.in	3 Aug 2005 17:52:49 -0000	1.94
-+++ configure.in	8 Aug 2005 18:10:06 -0000
-@@ -8,14 +8,28 @@
- AC_PROG_CC
- 
- AC_PATH_PROG(mount_path, mount, mount)
-+AC_PATH_PROG(pmount_hal_path, pmount-hal, NOTFOUND)
- AC_PATH_PROG(umount_path, umount, umount)
-+AC_PATH_PROG(pumount_path, pumount, NOTFOUND)
-+
-+if test ! x$pmount_hal_path = xNOTFOUND; then
-+        mount_path="${pmount_hal_path} %h"
-+else
-+        mount_path="${mount_path} %d"
-+fi
-+
-+if test ! x$pumount_path = xNOTFOUND; then
-+        umount_path="${pumount_path} %d"
-+else
-+        umount_path="${umount_path} %d"
-+fi
- 
- AC_ARG_WITH(mount-command, AC_HELP_STRING(--with-mount-command], [Command to invoke in order to mount a device]), 
--            mount_command="$withval", mount_command="${mount_path} %d")
-+            mount_command="$withval", mount_command="${mount_path}")
- AC_DEFINE_UNQUOTED([MOUNT_COMMAND], ["${mount_command}"], [mount command])
- 
- AC_ARG_WITH(unmount-command, AC_HELP_STRING(--with-unmount-command], [Command to invoke in order to unmount a device]), 
--            unmount_command="$withval", unmount_command="${umount_path} %d")
-+            unmount_command="$withval", unmount_command="${umount_path}")
- AC_DEFINE_UNQUOTED([UNMOUNT_COMMAND], ["${unmount_command}"], [unmount command])
- 
- AC_PATH_PROG(nautilus_path, nautilus, nautilus)
-Index: src/manager.c
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
-retrieving revision 1.72
-diff -u -b -B -r1.72 manager.c
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.0.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.1.ebuild
index a74efc3e4381..9dfc34180976 100644
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.0.ebuild
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.0.ebuild,v 1.2 2005/08/31 08:59:21 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.1.ebuild,v 1.1 2005/09/08 02:05:13 cardoe Exp $
 
 inherit eutils gnome2
 
@@ -30,9 +30,7 @@ USE_DESTDIR="1"
 
 
 pkg_setup() {
-	G2CONF="pmount_hal_path=/usr/bin/pmount-hal \
-		umount_path=/usr/bin/pumount \
-		--with-eject-command=/usr/bin/eject"
+	G2CONF="--with-eject-command=/usr/bin/eject"
 }
 
 src_unpack() {
@@ -43,7 +41,7 @@ src_unpack() {
 	epatch ${DISTDIR}/gnome-volume-manager-1.3.3-reconnect_dbus.patch.bz2
 	# Doesn't apply to current cvs.  Must look at leater.
 	#epatch ${FILESDIR}/gnome-volume-manager-1.3.3-pmount_crypt.patch
-	epatch ${FILESDIR}/gvm-use-pmount-if-available-nochangelog.patch
+	epatch ${FILESDIR}/gnome-volume-manager-1.5.1-use-pmount-2.patch
 }
 
 pkg_postinst() {