diff options
author | 2010-09-12 13:24:25 +0000 | |
---|---|---|
committer | 2010-09-12 13:24:25 +0000 | |
commit | 7251fe898aa4bcadd7ccbeb05ea039eb3adc9215 (patch) | |
tree | e81e70cccec085ccb78103a6197844c153ab14f8 /sys-apps/ivman/files | |
parent | Automated update of use.local.desc (diff) | |
download | gentoo-2-7251fe898aa4bcadd7ccbeb05ea039eb3adc9215.tar.gz gentoo-2-7251fe898aa4bcadd7ccbeb05ea039eb3adc9215.tar.bz2 gentoo-2-7251fe898aa4bcadd7ccbeb05ea039eb3adc9215.zip |
Remove ivman per bug #257058
Diffstat (limited to 'sys-apps/ivman/files')
-rw-r--r-- | sys-apps/ivman/files/ivman-0.3.init | 20 | ||||
-rw-r--r-- | sys-apps/ivman/files/ivman-0.6-hotpluggable.patch | 40 | ||||
-rw-r--r-- | sys-apps/ivman/files/ivman-0.6.14-no_xmlCleanupParser.patch | 58 |
3 files changed, 0 insertions, 118 deletions
diff --git a/sys-apps/ivman/files/ivman-0.3.init b/sys-apps/ivman/files/ivman-0.3.init deleted file mode 100644 index b1a807652354..000000000000 --- a/sys-apps/ivman/files/ivman-0.3.init +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/files/ivman-0.3.init,v 1.1 2004/10/19 17:15:33 eradicator Exp $ - -depend() { - need hald -} - -start() { - ebegin "Starting Automounter" - start-stop-daemon --start --pidfile /var/run/ivman.pid --exec /usr/bin/ivman > /dev/null - eend $? -} - -stop() { - ebegin "Stopping Automounter" - start-stop-daemon --stop --pidfile /var/run/ivman.pid - eend $? -} diff --git a/sys-apps/ivman/files/ivman-0.6-hotpluggable.patch b/sys-apps/ivman/files/ivman-0.6-hotpluggable.patch deleted file mode 100644 index 2f662a2fecc5..000000000000 --- a/sys-apps/ivman/files/ivman-0.6-hotpluggable.patch +++ /dev/null @@ -1,40 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=169593 - iulica@box.co.uk -This patch tests also for a storage if it is hotpluggable and mounts it -automatically. A reason of creating the patch can be found here: -http://lists.freedesktop.org/archives/hal/2005-October/003441.html - ---- src/IvmConfig/IvmConfigCommon.c.old 2007-03-05 15:28:49.000000000 +0100 -+++ src/IvmConfig/IvmConfigCommon.c 2007-03-05 15:34:36.000000000 +0100 -@@ -146,7 +146,9 @@ - volume.policy.should_mount does not exist - AND { storage.policy.should_mount == TRUE on block.storage_device - OR { storage.policy.should_mount does not exist on -- block.storage_device AND storage.removable == TRUE on -+ block.storage_device AND { storage.removable == TRUE -+ OR storage.hotpluggable == TRUE -+ } on - block.storage_device - } - } -@@ -216,14 +218,16 @@ - { - ivm_check_dbus_error(&dbus_error); - // OK, so no storage policy was specified anywhere. Now we'll mount -- // if parent device is removable. -+ // if parent device is removable or hotpluggable. - if ( -- !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) || -- !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL ) -+ (!libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) || -+ !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL )) && -+ (!libhal_device_property_exists( hal_ctx, new_udi, "storage.hotpluggable", NULL ) || -+ !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.hotpluggable", NULL )) - ) { - DEBUG(_("\ - Device %s won't be mounted because no mount policy was specified on \ --volume or storage device and storage device does not appear to be removable"), device -+volume or storage device and storage device does not appear to be removable or hotpluggable"), device - ); - libhal_free_string( device ); - libhal_free_string( new_udi ); diff --git a/sys-apps/ivman/files/ivman-0.6.14-no_xmlCleanupParser.patch b/sys-apps/ivman/files/ivman-0.6.14-no_xmlCleanupParser.patch deleted file mode 100644 index c5b212b983a9..000000000000 --- a/sys-apps/ivman/files/ivman-0.6.14-no_xmlCleanupParser.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: ivman-0.6.14/src/IvmConfig/IvmConfigActions.c -=================================================================== ---- ivman-0.6.14.orig/src/IvmConfig/IvmConfigActions.c -+++ ivman-0.6.14/src/IvmConfig/IvmConfigActions.c -@@ -244,7 +244,5 @@ nextOption: - } - xmlFreeDoc(doc); - -- xmlCleanupParser(); -- - return ret; - } -Index: ivman-0.6.14/src/IvmConfig/IvmConfigBase.c -=================================================================== ---- ivman-0.6.14.orig/src/IvmConfig/IvmConfigBase.c -+++ ivman-0.6.14/src/IvmConfig/IvmConfigBase.c -@@ -144,7 +144,5 @@ nextOption: - } - xmlFreeDoc(doc); - -- xmlCleanupParser(); -- - return ret; - } -Index: ivman-0.6.14/src/IvmConfig/IvmConfigConditions.c -=================================================================== ---- ivman-0.6.14.orig/src/IvmConfig/IvmConfigConditions.c -+++ ivman-0.6.14/src/IvmConfig/IvmConfigConditions.c -@@ -177,7 +177,5 @@ nextCondition: - } - xmlFreeDoc(doc); - -- xmlCleanupParser(); -- - return ret; - } -Index: ivman-0.6.14/src/IvmConfig/IvmConfigProperties.c -=================================================================== ---- ivman-0.6.14.orig/src/IvmConfig/IvmConfigProperties.c -+++ ivman-0.6.14/src/IvmConfig/IvmConfigProperties.c -@@ -275,8 +275,6 @@ nextAction: - } - xmlFreeDoc(doc); - -- xmlCleanupParser(); -- - ivm_check_dbus_error(&dbus_error); - - return ret; -@@ -522,8 +520,6 @@ nextActionAll: - } - xmlFreeDoc(doc); - -- xmlCleanupParser(); -- - ivm_check_dbus_error(&dbus_error); - - return ret; |