a few fixes

Package-Manager: portage-2.0.51.19

6 files changed, 186 insertions, 16 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 810ca49a99a6..df0250354c1f 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.33 2005/04/09 12:59:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.34 2005/04/17 19:02:48 foser Exp $
+
+*hal-0.4.7-r2 (17 Apr 2005)
+
+  17 Apr 2005; foser <foser@gentoo.org> hal-0.4.7-r2.ebuild :
+  Fix floppy detection with newer kernels
+  Change policy on mounting removable drives (#83025)
+  Keepdir some policy dirs (#87167)
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org> hal-0.4.5-r2.ebuild:
   Stable on ppc64
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 90f20dc7ea65..3f961a778c7c 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,32 +1,36 @@
-MD5 8c2f2071bc07277e9f1ffcec71aa242e ChangeLog 4737
-MD5 8a56df2be3b94b0e0e958c48e6c14df5 hal-0.2.98-r1.ebuild 2102
-MD5 f6c71019d8f7b2dab5ef13de1abd9244 hal-0.4.1-r1.ebuild 2567
 MD5 68b02e534da4448b4c5a5ea56c5fa192 hal-0.4.2-r1.ebuild 2728
-MD5 4de36bde0054e10e722225fe4ffd6c6b hal-0.4.4-r1.ebuild 2758
 MD5 3421ea82543d71c44ee06c3f9605d775 hal-0.4.5-r1.ebuild 2592
-MD5 3b9d6ecf1a10560bad449e55b5d34f90 hal-0.4.5-r2.ebuild 3235
+MD5 f6c71019d8f7b2dab5ef13de1abd9244 hal-0.4.1-r1.ebuild 2567
+MD5 50823e9ebfd0bcd18659743dbc9183eb hal-0.4.7-r2.ebuild 3487
+MD5 8a56df2be3b94b0e0e958c48e6c14df5 hal-0.2.98-r1.ebuild 2102
+MD5 4de36bde0054e10e722225fe4ffd6c6b hal-0.4.4-r1.ebuild 2758
 MD5 df44cfbd597367a6ac40680750d2b3bd hal-0.4.7-r1.ebuild 3150
+MD5 3b9d6ecf1a10560bad449e55b5d34f90 hal-0.4.5-r2.ebuild 3235
+MD5 ba44aec8889423b4e1e83334ef73ece1 ChangeLog 4959
 MD5 2a96836a252f05c62f1df2bc078d6804 hal-0.4.7.ebuild 2986
 MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
+MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
+MD5 64253ef1f2dcf68b2d82429026280085 files/hal-0.4.7-dont_add_device_twice-r1.patch 691
+MD5 2396bfac6dd9b68615328b1b9325ed2c files/hal-0.4.4-iso_label_selection.patch 1541
+MD5 442da36fd75002bb8300b0fcb65a1371 files/hal-0.4.5-vat_ntfs_labels.patch 2874
+MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738
 MD5 72d398ab014b2630043ef2a4d9990e2f files/digest-hal-0.2.98-r1 63
+MD5 c1624c9456f164c1b611e3ab22fb105d files/hal-0.4.7-device_info_leak.patch 2203
 MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1-r1 62
 MD5 a9afa7e41b21ea5f012765a8ced6c10d files/digest-hal-0.4.2-r1 62
 MD5 11d67cf37182e289664f50de3ee6172f files/digest-hal-0.4.4-r1 62
 MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r1 62
 MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r2 62
-MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7 62
 MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r1 62
-MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738
-MD5 399570c945e0f4bffbeb645e057e027b files/hal-0.4.1-dm_devices_tab.patch 1028
-MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
+MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r2 62
 MD5 0693dbefb790150740986cce82039b82 files/hal-0.4.2-cdrom_media_check.patch 1194
-MD5 eeb1838cdb78726ab674194f0d268270 files/hal-0.4.2-fstab_sync_crash.patch 468
+MD5 399570c945e0f4bffbeb645e057e027b files/hal-0.4.1-dm_devices_tab.patch 1028
+MD5 a4d2c4884a3dedf2450cf37508d3c122 files/hal-0.4.7-vfat_mount_utf8.patch 670
+MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7 62
 MD5 314ebeadb0a53e448e74ad6a3eead3f8 files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch 1920
-MD5 2396bfac6dd9b68615328b1b9325ed2c files/hal-0.4.4-iso_label_selection.patch 1541
 MD5 2b00af86c624d74107035a007ac3c9da files/hal-0.4.4-volume_id_fat.patch 849
 MD5 b0e12a62ce698e1eb2a32139498330cd files/hal-0.4.5-gentoo_gphoto2_usermap.patch 817
 MD5 f3ba6ada28cf947f8a7b7ec8fdd708ba files/hal-0.4.5-net_lockup.patch 2429
-MD5 442da36fd75002bb8300b0fcb65a1371 files/hal-0.4.5-vat_ntfs_labels.patch 2874
-MD5 c1624c9456f164c1b611e3ab22fb105d files/hal-0.4.7-device_info_leak.patch 2203
-MD5 64253ef1f2dcf68b2d82429026280085 files/hal-0.4.7-dont_add_device_twice-r1.patch 691
-MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
+MD5 eeb1838cdb78726ab674194f0d268270 files/hal-0.4.2-fstab_sync_crash.patch 468
+MD5 58ed07e2de5e898a1e4eeedf595ddb06 files/hal-0.4.7-sys_floppy_detection.patch 568
+MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
diff --git a/sys-apps/hal/files/digest-hal-0.4.7-r2 b/sys-apps/hal/files/digest-hal-0.4.7-r2
new file mode 100644
index 000000000000..031b4dff3230
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.4.7-r2
@@ -0,0 +1 @@
+MD5 3386817a6811cce803bcfa8a20b05c51 hal-0.4.7.tar.gz 1349064
diff --git a/sys-apps/hal/files/hal-0.4.7-sys_floppy_detection.patch b/sys-apps/hal/files/hal-0.4.7-sys_floppy_detection.patch
new file mode 100644
index 000000000000..b04168bf01c0
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.7-sys_floppy_detection.patch
@@ -0,0 +1,12 @@
+diff -x '*~' -uNr hal-0.4.7/hald/linux/platform_bus_device.c hal-0.4.7.patched/hald/linux/platform_bus_device.c
+--- hal-0.4.7/hald/linux/platform_bus_device.c	2004-11-22 22:53:50.000000000 +0100
++++ hal-0.4.7.patched/hald/linux/platform_bus_device.c	2005-04-17 19:20:37.000000000 +0200
+@@ -66,7 +66,7 @@
+ 	if (strncmp (device->bus_id, "floppy", 6) != 0)
+ 		return FALSE;
+ 
+-	sscanf (device->bus_id, "floppy%d", &number);
++	sscanf (device->bus_id, "%*[flopy.]%d", &number);
+ 
+ 	/* get device file */
+ 	snprintf (fd_sysfs_path, sizeof (fd_sysfs_path), "%s/block/fd%d", 
diff --git a/sys-apps/hal/files/hal-0.4.7-vfat_mount_utf8.patch b/sys-apps/hal/files/hal-0.4.7-vfat_mount_utf8.patch
new file mode 100644
index 000000000000..0c973e3d6a64
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.7-vfat_mount_utf8.patch
@@ -0,0 +1,12 @@
+diff -uNr hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.7.patched/fdi/90defaultpolicy/storage-policy.fdi
+--- hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi	2005-01-20 18:03:57.000000000 +0100
++++ hal-0.4.7.patched/fdi/90defaultpolicy/storage-policy.fdi	2005-04-17 20:40:57.000000000 +0200
+@@ -166,7 +166,7 @@
+ 
+ 	  <!-- Use UTF-8 charset for vfat -->
+ 	  <match key="volume.fstype" string="vfat">
+-	    <merge key="volume.policy.mount_option.iocharset=utf8" type="bool">true</merge>
++	    <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
+ 	  </match>
+ 	  
+ 	  <!-- whitelist of partition table id's, if from a msdos partition table -->
diff --git a/sys-apps/hal/hal-0.4.7-r2.ebuild b/sys-apps/hal/hal-0.4.7-r2.ebuild
new file mode 100644
index 000000000000..71ca57a2cb7d
--- /dev/null
+++ b/sys-apps/hal/hal-0.4.7-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.7-r2.ebuild,v 1.1 2005/04/17 19:02:48 foser Exp $
+
+inherit eutils python linux-info versionator flag-o-matic
+
+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="~x86 ~amd64 ~ia64 ~ppc ~ppc64"
+IUSE="debug pcmcia doc"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=sys-apps/dbus-0.22-r1
+	dev-libs/expat
+	sys-fs/udev
+	sys-apps/hotplug
+	sys-libs/libcap
+	dev-libs/popt
+	>=sys-apps/util-linux-2.12i
+	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( app-doc/doxygen )"
+# dep on a specific util-linux version for 
+# managed mount patches #70873
+
+# We need to run at least a 2.6.10 kernel, this is a
+# way to ensure that to some extent
+pkg_setup() {
+
+	if get_version; then
+		kernel_is ge 2 6 10 && break
+	else
+		RKV=$(uname -r)
+		RKV=${RKV//-*}
+		if version_is_at_least "2.6.10" ${RKV}; then
+			break
+		fi
+	fi
+	die "You need a 2.6.10 or newer kernel to build this pack"
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# remove pamconsole option
+	epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch
+	# pick up the gentoo usermap
+	epatch ${FILESDIR}/${PN}-0.4.5-gentoo_gphoto2_usermap.patch
+	# don't doubleadd devices
+	epatch ${FILESDIR}/${P}-dont_add_device_twice-r1.patch
+	# fix memleaks
+	cd ${S}/hald
+	epatch ${FILESDIR}/${P}-device_info_leak.patch
+	# detect floppy drives on >=2.6.12 kernels as well
+	epatch ${FILESDIR}/${P}-sys_floppy_detection.patch
+	# set defaultpolicy for vfat from iocharset=utf8 to utf8 (#83025)
+	cd ${S}
+	epatch ${FILESDIR}/${P}-vfat_mount_utf8.patch
+
+}
+
+src_compile() {
+
+	# FIXME : docs
+	econf \
+		`use_enable debug verbose-mode` \
+		`use_enable pcmcia pcmcia-support` \
+		--enable-sysfs-carrier \
+		--enable-fstab-sync \
+		--enable-hotplug-map \
+		--disable-docbook-docs \
+		`use_enable doc doxygen-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
+
+	# keep the policy setup intact
+	keepdir /usr/share/hal/fdi/{95userpolicy,50user,40oem,30osvendor,10generic}
+
+	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 should be considered a security risk."
+	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\`"
+
+}