10 files changed, 66 insertions, 221 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index bc99090e54f4..113e3cfd0f67 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2004/12/20 09:31:34 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.18 2004/12/22 17:51:30 foser Exp $
+
+*hal-0.4.2-r1 (22 Dec 2004)
+
+  22 Dec 2004; foser <foser@gentoo.org> hal-0.4.2-r1.ebuild :
+  Add some minor bugfixing patches
 
   20 Dec 2004; Joe McCann <joem@gentoo.org> hal-0.4.1-r1.ebuild,
   hal-0.4.1.ebuild, hal-0.4.2.ebuild:
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 4f46fa0bb37a..48e206b12cdf 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,16 +1,14 @@
-MD5 573e836bd58a609e5c19bda0ba50f93e ChangeLog 2470
-MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
-MD5 9a7ac1196fbd830f28b77bda560d2c0b hal-0.4.1.ebuild 2420
+MD5 bb7a85ec3632609303b29906c2daca49 hal-0.4.2-r1.ebuild 2686
 MD5 6e4743bdb465990bb5b63311bf4e46d9 hal-0.4.1-r1.ebuild 2529
 MD5 3e506a597274c818f662edbe0c7d2b59 hal-0.2.98-r1.ebuild 2062
-MD5 a5e4bd167f910344314b415a63f0d56c hal-0.4.2.ebuild 2498
+MD5 d7ca668a47f31f354f6814e663134f71 ChangeLog 2598
+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 62
 MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1-r1 62
-MD5 90ea63d4a4b9885b7a6eab147dcb428b files/hal-0.4.0-clean-on-startup.patch 2653
-MD5 fa38b59d0ab9bdf0ff3363cd756d902a files/hal-0.4.0-old_storage_policy.patch 1217
+MD5 a9afa7e41b21ea5f012765a8ced6c10d files/digest-hal-0.4.2-r1 62
+MD5 0693dbefb790150740986cce82039b82 files/hal-0.4.2-cdrom_media_check.patch 1194
 MD5 399570c945e0f4bffbeb645e057e027b files/hal-0.4.1-dm_devices_tab.patch 1028
+MD5 eeb1838cdb78726ab674194f0d268270 files/hal-0.4.2-fstab_sync_crash.patch 468
 MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
-MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
-MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738
-MD5 a9afa7e41b21ea5f012765a8ced6c10d files/digest-hal-0.4.2 62
diff --git a/sys-apps/hal/files/digest-hal-0.4.1 b/sys-apps/hal/files/digest-hal-0.4.1
deleted file mode 100644
index c130690c7dfa..000000000000
--- a/sys-apps/hal/files/digest-hal-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c06c46ff1925c521cd4196d8b61d8ae hal-0.4.1.tar.gz 1333684
diff --git a/sys-apps/hal/files/digest-hal-0.4.2 b/sys-apps/hal/files/digest-hal-0.4.2-r1
index 6b8be036974e..6b8be036974e 100644
--- a/sys-apps/hal/files/digest-hal-0.4.2
+++ b/sys-apps/hal/files/digest-hal-0.4.2-r1
diff --git a/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch b/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch
deleted file mode 100644
index 237c5712524e..000000000000
--- a/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-? changes
-? foo.c
-? hal-0.4.0-clean-on-startup.patch
-? hal-0.4.0.tar.gz
-? hal-storage.pc
-? intltool-extract
-? intltool-extract.in
-? intltool-merge
-? intltool-merge.in
-? intltool-update
-? intltool-update.in
-? mkinstalldirs
-? doc/api/Doxyfile
-? doc/api/Makefile
-? doc/api/Makefile.in
-? doc/api/html
-? doc/conf/Makefile
-? doc/conf/Makefile.in
-? doc/spec/Makefile
-? doc/spec/Makefile.in
-? doc/spec/hal-spec.xml
-? doc/spec/spec.tar
-? fdi/30osvendor/Makefile
-? fdi/30osvendor/Makefile.in
-? fdi/40oem/Makefile
-? fdi/40oem/Makefile.in
-? fdi/50user/Makefile
-? fdi/50user/Makefile.in
-? fdi/90defaultpolicy/Makefile
-? fdi/90defaultpolicy/Makefile.in
-? fdi/95userpolicy/Makefile
-? fdi/95userpolicy/Makefile.in
-? hald/foo
-? libhal-storage/.deps
-? libhal-storage/.libs
-? libhal-storage/Makefile
-? libhal-storage/Makefile.in
-? libhal-storage/libhal-storage.la
-? libhal-storage/libhal-storage.lo
-? po/Makefile
-? po/Makefile.in
-? po/Makefile.in.in
-? po/POTFILES
-? po/da.gmo
-? po/de.gmo
-? po/fr.gmo
-? po/hal.pot
-? po/nl.gmo
-? tools/foo
-? tools/fstab-sync
-? tools/fstab-sync.8
-? tools/linux/hal-hotplug-map
-Index: tools/fstab-sync.c
-===================================================================
-RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
-retrieving revision 1.23
-diff -u -p -r1.23 fstab-sync.c
---- tools/fstab-sync.c	14 Oct 2004 18:37:28 -0000	1.23
-+++ tools/fstab-sync.c	15 Oct 2004 00:33:54 -0000
-@@ -74,11 +74,6 @@ static boolean verbose = FALSE;
- #define TEMP_FSTAB_PREFIX ".fstab.hal."
- #define TEMP_FSTAB_MAX_LENGTH 64
- 
--#undef FSTAB_SYNC_MOUNT_ROOT
--#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD
--#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC
--#undef FSTAB_SYNC_MOUNT_ACCESS
--
- #ifndef TRUE
- #define TRUE 1
- #endif
-@@ -1657,10 +1652,8 @@ main (int argc, const char *argv[])
-         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")},
--#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
-       {"clean", 'c', POPT_ARG_NONE, &should_clean, 0,
-         N_("Remove all generated entries from fstab")},
--#endif
-       {"verbose", 'v', POPT_ARG_NONE, &verbose, 0,
-         N_("Report detailed information about operation progress")},
- 
-@@ -1694,9 +1687,7 @@ main (int argc, const char *argv[])
-       
-       /* when invoked for the /org/freedesktop/Hal/devices/computer UDI we clean the fstab */
-       if (getenv ("HALD_STARTUP") != NULL && strcmp (hal_device_udi, "/org/freedesktop/Hal/devices/computer") == 0) {
--#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
- 	should_clean = TRUE;
--#endif
-       } else {
-       
- 	/* when we are invoked by hald, make some early tests using the
diff --git a/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch b/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch
deleted file mode 100644
index a2df781eb710..000000000000
--- a/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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">false</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>
diff --git a/sys-apps/hal/files/hal-0.4.2-cdrom_media_check.patch b/sys-apps/hal/files/hal-0.4.2-cdrom_media_check.patch
new file mode 100644
index 000000000000..979531d77767
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.2-cdrom_media_check.patch
@@ -0,0 +1,31 @@
+--- hal-0.4.2/hald/linux/block_class_device.c
++++ hal-0.4.2.new/hald/linux/block_class_device.c
+@@ -354,7 +354,7 @@
+ 	}
+ 	
+ 	/* while we're at it, check if we support media changed */
+-	if (ioctl (fd, CDROM_MEDIA_CHANGED) >= 0) {
++	if (capabilities & CDC_MEDIA_CHANGED) {
+ 		hal_device_property_set_bool (d, "storage.cdrom.support_media_changed", TRUE);
+ 	} else {
+ 		hal_device_property_set_bool (d, "storage.cdrom.support_media_changed", FALSE);
+@@ -879,7 +879,18 @@
+ 			break;
+ 			
+ 		case CDS_DISC_OK:
+-			got_media = TRUE;
++			HAL_INFO (("CD-ROM drive %s is reported to contain a CD.", device_file));
++
++			/* some CD-ROMs report CDS_DISK_OK even with an open
++			 * tray; if media check has the same value two times in
++			 * a row then this seems to be the case and we must not
++			 * report that there is a media in it. */
++			if (hal_device_property_get_bool (d, "storage.cdrom.support_media_changed") &&
++			    ioctl (fd, CDROM_MEDIA_CHANGED, CDSL_CURRENT) && 
++			    ioctl (fd, CDROM_MEDIA_CHANGED, CDSL_CURRENT)) 
++				HAL_INFO (("CD-ROM drive %s: media checking is broken, assuming no CD is inside.", device_file));
++			else
++			    got_media = TRUE;
+ 			break;
+ 			
+ 		case -1:
diff --git a/sys-apps/hal/files/hal-0.4.2-fstab_sync_crash.patch b/sys-apps/hal/files/hal-0.4.2-fstab_sync_crash.patch
new file mode 100644
index 000000000000..955652cc09d2
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.2-fstab_sync_crash.patch
@@ -0,0 +1,16 @@
+Index: tools/fstab-sync.c
+===================================================================
+RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
+retrieving revision 1.27
+diff -u -r1.27 fstab-sync.c
+--- tools/fstab-sync.c	21 Oct 2004 21:27:44 -0000	1.27
++++ tools/fstab-sync.c	8 Dec 2004 13:14:04 -0000
+@@ -1506,7 +1506,7 @@
+ 
+ static boolean fs_table_line_is_mounted (FSTableLine *line)
+ {
+-  FILE *f;
++  FILE *f = NULL;
+   boolean is_mounted = FALSE;
+   struct mntent *m;
+ 
diff --git a/sys-apps/hal/hal-0.4.1.ebuild b/sys-apps/hal/hal-0.4.1.ebuild
deleted file mode 100644
index 04996c25b7aa..000000000000
--- a/sys-apps/hal/hal-0.4.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.1.ebuild,v 1.4 2004/12/20 09:31:34 joem Exp $
-
-inherit eutils debug python
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.2.2
-	>=sys-apps/dbus-0.22-r1
-	dev-libs/expat
-	sys-fs/udev
-	sys-apps/hotplug
-	sys-libs/libcap
-	sys-kernel/linux26-headers"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# remove RH only stuff
-	epatch ${FILESDIR}/${PN}-0.4.0-old_storage_policy.patch
-	# fix floppy drives be shown
-	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
-
-}
-
-src_compile() {
-
-	# FIXME : docs
-	econf \
-		--enable-fstab-sync \
-		--enable-hotplug-map \
-		--disable-doxygen-docs \
-		--disable-docbook-docs \
-		--with-pid-file=/var/run/hald/hald.pid \
-		|| die
-
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	# We install this in a seperate package to avoid gnome-python dep
-	rm ${D}/usr/bin/hal-device-manager
-
-	# initscript
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/hald
-
-	# place our pid file
-	keepdir /var/run/hald
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-
-}
-
-pkg_preinst() {
-
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewuser haldaemon -1 /bin/false /dev/null haldaemon || die "Problem adding haldaemon user"
-
-}
-
-pkg_postinst() {
-
-	# make sure the permissions on the pid dir are alright & after preinst
-	chown haldaemon:haldaemon /var/run/hald
-
-	ewarn "Enabled in this ebuild by default is the usage of fstab-sync"
-	ewarn "that will create mount rules for non-existing devices in"
-	ewarn "fstab if needed, mount points will be created in /media."
-	ewarn "This functionality alters /etc/fstab runtime on the filesystem"
-	ewarn "and might have unforseen side-effects."
-	echo
-	einfo "The HAL daemon needs to be running for certain applications to"
-	einfo "work. Suggested is to add the init script to your start-up"
-	einfo "scripts, this should be done like this :"
-	einfo "\`rc-update add hald default\`"
-
-}
diff --git a/sys-apps/hal/hal-0.4.2.ebuild b/sys-apps/hal/hal-0.4.2-r1.ebuild
index 4d163d102733..2d86680419d7 100644
--- a/sys-apps/hal/hal-0.4.2.ebuild
+++ b/sys-apps/hal/hal-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.3 2004/12/20 09:31:34 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.2-r1.ebuild,v 1.1 2004/12/22 17:51:30 foser Exp $
 
 inherit eutils python
 
@@ -38,6 +38,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch
 	# fix floppy drives be shown
 	epatch ${FILESDIR}/${PN}-0.4.0-allow-floppy-drives.patch
+	# fix for some odd cdromdrives giving misinformation
+	epatch ${FILESDIR}/${P}-cdrom_media_check.patch
+	# fix possible fstab sync crash
+	epatch ${FILESDIR}/${P}-fstab_sync_crash.patch
 
 }