# ChangeLog for sys-apps/hal
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.11 2004/11/11 11:59:47 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.12 2004/11/30 00:22:35 foser Exp $
+
+*hal-0.4.1-r1 (30 Nov 2004)
+
+ 30 Nov 2004; foser <foser@gentoo.org> hal-0.4.1-r1.ebuild :
+ Make use of managed keyword, with updated util-linux dep
11 Nov 2004; Mike Gardiner <obz@gentoo.org> hal-0.2.98-r1.ebuild:
Keyworded ppc for GNOME 2.8
MD5 4265ce12f38a8dc8ef24fe9e56c449d9 hal-0.4.1.ebuild 2396
+MD5 90547a95bd5c26e49711a482c1eaef26 hal-0.4.1-r1.ebuild 2507
MD5 3e506a597274c818f662edbe0c7d2b59 hal-0.2.98-r1.ebuild 2062
-MD5 bb29de306f1e6900914864dcc9f4e82f hal-0.4.0.ebuild 2478
-MD5 23af34ddec66e4196d1c68852a95b284 ChangeLog 1798
+MD5 3623707794adfd9e8fd4381df20dc27f ChangeLog 1951
MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
-MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738
MD5 72d398ab014b2630043ef2a4d9990e2f files/digest-hal-0.2.98-r1 63
+MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1-r1 62
MD5 399570c945e0f4bffbeb645e057e027b files/hal-0.4.1-dm_devices_tab.patch 1028
-MD5 14380bf35823146ebc30fb47bfcad39c files/hal-0.4.0-storage-policy-never-use-uuid.patch 1405
-MD5 467820e480b84fd75a783dbcbb282c2a files/digest-hal-0.4.0 62
MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1 62
MD5 fa38b59d0ab9bdf0ff3363cd756d902a files/hal-0.4.0-old_storage_policy.patch 1217
-MD5 3eb5f234297bb915e58f5e7b1dc39e7e files/hal-0.4.0-fix-fstab-sync-crasher.patch 2422
MD5 90ea63d4a4b9885b7a6eab147dcb428b files/hal-0.4.0-clean-on-startup.patch 2653
+MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
+++ /dev/null
-MD5 2ced1620a85cd547c53aa72787d8b06e hal-0.4.0.tar.gz 1319354
--- /dev/null
+MD5 8c06c46ff1925c521cd4196d8b61d8ae hal-0.4.1.tar.gz 1333684
+++ /dev/null
-Index: fdi/90defaultpolicy/storage-policy.fdi
-===================================================================
-RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
-retrieving revision 1.5
-diff -u -p -r1.5 storage-policy.fdi
---- fdi/90defaultpolicy/storage-policy.fdi 15 Oct 2004 20:46:08 -0000 1.5
-+++ fdi/90defaultpolicy/storage-policy.fdi 18 Oct 2004 23:51:33 -0000
-@@ -30,6 +30,9 @@
- <match key="storage.bus" string="sata">
- <merge key="storage.policy.should_mount" type="bool">true</merge>
- </match>
-+ <match key="storage.bus" string="platform">
-+ <merge key="storage.policy.should_mount" type="bool">true</merge>
-+ </match>
- </match>
-
- <!-- Handle drives with non-partitioned media -->
+++ /dev/null
-Index: tools/fstab-sync.c
-===================================================================
-RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
-retrieving revision 1.25
-diff -u -p -r1.25 fstab-sync.c
---- tools/fstab-sync.c 15 Oct 2004 20:53:45 -0000 1.25
-+++ tools/fstab-sync.c 19 Oct 2004 00:17:10 -0000
-@@ -1653,27 +1653,23 @@ main (int argc, const char *argv[])
- openlog (PROGRAM_NAME, LOG_PID, LOG_USER);
-
- struct poptOption options[] = {
-- {"add", 'a', POPT_ARG_STRING, &udi_to_add, 0,
-- N_("add an entry to fstab"), N_("UDI")},
-- {"remove", 'r', POPT_ARG_STRING, &udi_to_remove, 0,
-- N_("remove an entry from fstab"), N_("UDI")},
-- {"clean", 'c', POPT_ARG_NONE, &should_clean, 0,
-- N_("Remove all generated entries from fstab")},
-- {"verbose", 'v', POPT_ARG_NONE, &verbose, 0,
-- N_("Report detailed information about operation progress")},
-+ {"add", 'a', POPT_ARG_STRING, &udi_to_add, 0, N_("add an entry to fstab"), N_("UDI")},
-+ {"remove", 'r', POPT_ARG_STRING, &udi_to_remove, 0, N_("remove an entry from fstab"), N_("UDI")},
-+ {"clean", 'c', POPT_ARG_NONE, &should_clean, 0, N_("Remove all generated entries from fstab"), NULL},
-+ {"verbose", 'v', POPT_ARG_NONE, &verbose, 0, N_("Report detailed information about operation progress"), NULL},
-
- POPT_AUTOHELP
-
-- {NULL, '\0', 0, NULL},
-+ {NULL, '\0', 0, NULL, 0, NULL, NULL}
- };
-
- popt_context = poptGetContext (PROGRAM_NAME, argc, argv, options, 0);
--
-+
- while ((i = poptGetNextOpt (popt_context)) != -1)
- {
- if (i < -1)
- {
-- poptPrintHelp (popt_context, stderr, 0);
-+ poptPrintHelp (popt_context, stderr, 0);
- return 1;
- }
- }
-@@ -1760,7 +1756,6 @@ main (int argc, const char *argv[])
- break;
- }
- }
-- poptFreeContext (popt_context);
-
- hal_context = hal_initialize (NULL, FALSE);
- fsy_mount_root = hal_drive_policy_default_get_mount_root (hal_context);
-@@ -1792,8 +1787,8 @@ main (int argc, const char *argv[])
- retval = clean ();
- else
- {
-- poptPrintHelp (popt_context, stderr, 0);
-- return 1;
-+ poptPrintHelp (popt_context, stderr, 0);
-+ return 1;
- }
-
- if (hal_device_udi != NULL) {
-@@ -1816,6 +1811,8 @@ main (int argc, const char *argv[])
- fstab_update_debug (_("\n"));
- }
-
-+ poptFreeContext (popt_context);
-+
- out:
- return retval;
- }
+++ /dev/null
-Index: fdi/90defaultpolicy/storage-policy.fdi
-===================================================================
-RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
-retrieving revision 1.4
-diff -u -r1.4 storage-policy.fdi
---- fdi/90defaultpolicy/storage-policy.fdi 14 Oct 2004 21:58:55 -0000 1.4
-+++ fdi/90defaultpolicy/storage-policy.fdi 15 Oct 2004 20:43:16 -0000
-@@ -83,13 +83,10 @@
- <merge key="volume.policy.should_mount" type="bool">true</merge>
- <merge key="volume.policy.mount_filesystem" type="copy_property">volume.fstype</merge>
-
-- <!-- Fallback is '<storage.drive_type>', e.g. disk, compact_flash etc. -->
-- <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.drive_type</merge>
--
-- <!-- Better: if available use UUID -->
-- <match key="volume.uuid" empty="false">
-- <merge key="volume.policy.desired_mount_point" type="copy_property">volume.uuid</merge>
-- </match>
-+ <!-- Fallback is '<storage.bus>', appended with 'disk', e.g. usbdisk,
-+ idedisk, scsidisk etc. -->
-+ <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.bus</merge>
-+ <append key="volume.policy.desired_mount_point" type="string">disk</append>
-
- <!-- Best: If available use filesystem label -->
- <match key="volume.label" empty="false">
--- /dev/null
+--- hal-0.4.0/fdi/90defaultpolicy/storage-policy.fdi 2004-10-14 23:59:29.000000000 +0200
++++ hal-0.4.0/fdi/90defaultpolicy/storage-policy.fdi.patched 2004-10-21 12:48:16.223876512 +0200
+@@ -6,11 +6,12 @@
+ <device>
+ <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
+ <merge key="storage.policy.default.mount_root" type="string">/media</merge>
+- <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
++ <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
+ <merge key="storage.policy.default.managed_keyword.primary" type="string">managed</merge>
+ <merge key="storage.policy.default.managed_keyword.secondary" type="string">kudzu</merge>
+ <merge key="storage.policy.default.mount_option.noauto" type="bool">true</merge>
+- <merge key="storage.policy.default.mount_option.pamconsole" type="bool">true</merge>
++ <merge key="storage.policy.default.mount_option.pamconsole" type="bool">false</merge>
++ <merge key="storage.policy.default.mount_option.user" type="bool">true</merge>
+ <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
+ </match>
+ </device>
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.0.ebuild,v 1.2 2004/11/08 21:41:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.1-r1.ebuild,v 1.1 2004/11/30 00:22:35 foser Exp $
inherit eutils debug python
LICENSE="|| ( GPL-2 AFL-2.0 )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64"
IUSE=""
RDEPEND=">=dev-libs/glib-2.2.2
sys-fs/udev
sys-apps/hotplug
sys-libs/libcap
+ >=sys-apps/util-linux-2.12i
sys-kernel/linux26-headers"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+# dep on a specific util-linux version for
+# managed mount patches #70873
+
src_unpack() {
unpack ${A}
cd ${S}
- # remove RH only stuff
- epatch ${FILESDIR}/${P}-old_storage_policy.patch
+ # remove pamconsole option
+ epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch
# fix floppy drives be shown
- epatch ${FILESDIR}/${P}-allow-floppy-drives.patch
- # fix default drivenames fallback & other RH goodies
- epatch ${FILESDIR}/${P}-storage-policy-never-use-uuid.patch
- epatch ${FILESDIR}/${P}-clean-on-startup.patch
- epatch ${FILESDIR}/${P}-fix-fstab-sync-crasher.patch
+ epatch ${FILESDIR}/${PN}-0.4.0-allow-floppy-drives.patch
+ # smallish device manaager fix
+ cd ${S}/tools/device-manager
+ epatch ${FILESDIR}/${P}-dm_devices_tab.patch
}
projects / gentoo.git / commitdiff