Adding the RBC/disk patch from the hal mailinglist which finally(!) (fixes gen3 (and below) ipods on firewire connections.

Package-Manager: portage-2.0.53

5 files changed, 166 insertions, 5 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 4473e18a7d05..c5f67d9d3e11 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,14 @@
 # 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.57 2005/12/14 07:04:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.58 2005/12/16 15:57:32 spider Exp $
+
+*hal-0.5.5.1-r1 (16 Dec 2005)
+
+  16 Dec 2005; Spider <spider@gentoo.org>  hal-0.5.5.1-r1.ebuild,
+  files/hal-0.5.5.1-RBC.patch:
+  Adding the patch from 
+  http://thread.gmane.org/gmane.comp.freedesktop.hal/3915 which unbreaks old 
+  iPods (gen3 and below) on firewire.
 
   14 Dec 2005; Doug Goldstein <cardoe@gentoo.org> hal-0.4.8.ebuild,
   hal-0.5.4.ebuild, hal-0.5.5.1.ebuild:
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 358e5b7d371b..fe87aa553ec2 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,13 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 87fd6fc780499c35842e891d4e94c2d2 ChangeLog 8137
+MD5 cfb06a73e0598dc0a3060eebdb9e568f ChangeLog 8407
 MD5 40a7b45f127bfdcacaa142660ad8b5f9 files/0.5-hald.rc 537
 MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r2 62
 MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r2 62
 MD5 2bbbb519c89110dfec96cf63cf541afc files/digest-hal-0.4.8 62
 MD5 27cab5d91e93d8b692246d0ce4110122 files/digest-hal-0.5.4 62
 MD5 cf6c7a60aee75f95022e5d25562468eb files/digest-hal-0.5.5.1 64
+MD5 cf6c7a60aee75f95022e5d25562468eb files/digest-hal-0.5.5.1-r1 64
 MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
 MD5 b0e12a62ce698e1eb2a32139498330cd files/hal-0.4.5-gentoo_gphoto2_usermap.patch 817
 MD5 f3ba6ada28cf947f8a7b7ec8fdd708ba files/hal-0.4.5-net_lockup.patch 2429
@@ -18,18 +19,20 @@ MD5 58ed07e2de5e898a1e4eeedf595ddb06 files/hal-0.4.7-sys_floppy_detection.patch
 MD5 a4d2c4884a3dedf2450cf37508d3c122 files/hal-0.4.7-vfat_mount_utf8.patch 670
 MD5 e3ecbfe57c0833d32f0ea57a0de58aee files/hal-0.4.8-fix_dvdram.patch 465
 MD5 25cb64ec27a48a80126b6de5ff6c3340 files/hal-0.5.1-old_storage_policy.patch 856
+MD5 54eaacd46e87bd8025da51f2f9aaf56b files/hal-0.5.5.1-RBC.patch 660
 MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
 MD5 2cf5b3c9219c87b1d9aee01f4f5f19bb hal-0.4.5-r2.ebuild 3118
 MD5 1a146b79d18a689bbc8a96b81f74c7f6 hal-0.4.7-r2.ebuild 3455
 MD5 c6d1202b415d119777b338fd1787592e hal-0.4.8.ebuild 3420
 MD5 4359ce85a732bb15c55819f50ee1e74f hal-0.5.4.ebuild 4040
+MD5 5b5bc48b834909a5c0cfe2aaef2dc670 hal-0.5.5.1-r1.ebuild 3951
 MD5 1909745ea18a261467f2a3b4a5c51deb hal-0.5.5.1.ebuild 3912
 MD5 a60767d83157413d549c69b98fac962c metadata.xml 303
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDn8QKBtvusYtCZMsRAgt9AJ9NfK8Z9q30XINdSnCHnfvloMXwiQCfUxmZ
-0w1lMMVtXQIXAjGgGZz6hlE=
-=b1eK
+iD8DBQFDouP8ZS9CZTi033kRAsuWAKCmF7aSSEjR6dYhSK9LzFyy1LtYBQCfUmGo
+oXzRMWTXig0ZXH0tkMQiHA0=
+=rIyn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/digest-hal-0.5.5.1-r1 b/sys-apps/hal/files/digest-hal-0.5.5.1-r1
new file mode 100644
index 000000000000..9dfb57f4441c
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.5.5.1-r1
@@ -0,0 +1 @@
+MD5 2abd81ed3f5a37789f4fbda2f6a61270 hal-0.5.5.1.tar.gz 1517882
diff --git a/sys-apps/hal/files/hal-0.5.5.1-RBC.patch b/sys-apps/hal/files/hal-0.5.5.1-RBC.patch
new file mode 100644
index 000000000000..ce906e3e5ed7
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.5.5.1-RBC.patch
@@ -0,0 +1,18 @@
+Index: hald/linux2/blockdev.c
+===================================================================
+RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
+retrieving revision 1.27
+diff -u -3 -p -r1.27 blockdev.c
+--- hald/linux2/blockdev.c	2 Nov 2005 15:38:13 -0000	1.27
++++ hald/linux2/blockdev.c	28 Nov 2005 23:04:24 -0000
+@@ -827,7 +827,8 @@ hotplug_event_begin_add_blockdev (const 
+ 
+ 			/* These magic values are documented in the kernel source */
+ 			switch (type) {
+-			case 0:	/* Disk */
++			case 0:	 /* Disk */
++			case 14: /* Simple Direct Access Device, set it to disk */
+ 				hal_device_property_set_string (d, "storage.drive_type", "disk");
+ 				break;
+ 
+ 
diff --git a/sys-apps/hal/hal-0.5.5.1-r1.ebuild b/sys-apps/hal/hal-0.5.5.1-r1.ebuild
new file mode 100644
index 000000000000..0b2fd7bee5cf
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.5.1-r1.ebuild
@@ -0,0 +1,131 @@
+# 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.5.5.1-r1.ebuild,v 1.1 2005/12/16 15:57:32 spider Exp $
+
+inherit eutils linux-info
+
+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 ~sparc"
+IUSE="acpi debug doc pam_console pcmcia"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=sys-apps/dbus-0.50
+	>=sys-fs/udev-071
+	>=sys-apps/util-linux-2.12i
+	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
+	dev-libs/expat
+	dev-libs/libusb
+	sys-apps/hotplug
+	pam_console? ( sys-libs/pam )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
+
+## HAL Daemon drops privledges so we need group access to read disks
+HALDAEMON_GROUPS="haldaemon,disk,cdrom,cdrw,floppy,usb"
+
+function notify_uevent() {
+	eerror
+	eerror "You must enable Kernel Userspace Events in your kernel."
+	eerror "This can be set under 'General Setup'.  It is marked as"
+	eerror "CONFIG_KOBJECT_UEVENT in the config file."
+	eerror
+	ebeep 5
+
+	die "KOBJECT_UEVENT is not set"
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	kernel_is ge 2 6 13 \
+		|| die "You need a 2.6.13 or newer kernel to run this package"
+
+	linux_chkconfig_present KOBJECT_UEVENT \
+		|| notify_uevent
+
+	if use acpi ; then
+		linux_chkconfig_present PROC_FS \
+			|| die "ACPI support requires PROC_FS support in kernel"
+	fi
+
+	if use pam_console && ! built_with_use sys-libs/pam pam_console ; then
+			eerror "You need to build pam with pam_console support"
+			eerror "Please remerge sys-libs/pam with USE=pam_console"
+			die "pam without pam_console detected"
+	fi
+
+	if [ -d ${ROOT}/etc/hal/device.d ]; then
+		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
+		eerror "/etc/hal/device.d/ so please remove this directory"
+		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
+		eerror "This is due to configuration protection of /etc/"
+		die "remove /etc/hal/device.d/"
+	fi
+}
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-RBC.patch
+
+	# remove pamconsole option
+	use pam_console || epatch ${FILESDIR}/${PN}-0.5.1-old_storage_policy.patch
+}
+
+src_compile() {
+	econf \
+		--with-os-type=gentoo \
+		--with-pid-file=/var/run/hald.pid \
+		$(use_enable debug verbose-mode) \
+		$(use_enable pcmcia pcmcia-support) \
+		$(use_enable acpi acpi-proc) \
+		$(use_enable doc docbook-docs) \
+		$(use_enable doc doxygen-docs) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+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
+	newinitd ${FILESDIR}/0.5-hald.rc hald
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+	# Script to unmount devices if they are yanked out (from upstream)
+	exeinto /etc/dev.d/default
+	doexe ${FILESDIR}/hal-unmount.dev
+}
+
+pkg_postinst() {
+	## We need to add the user/groups *after* package compilation/installation, so that we
+	## don't change the user without the package being installed.
+	##
+	enewgroup haldaemon || die "Problem adding haldaemon group"
+	# HAL drops priviledges by default now ...
+	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
+	enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS} || die "Problem adding haldaemon user"
+
+	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
+	# If users have a problem with this, let them file a bug
+	usermod -G ${HALDAEMON_GROUPS} haldaemon
+
+	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\`"
+}