Fix for bug #176274

(Portage version: 2.1.2.9)

5 files changed, 288 insertions, 1 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index be4faebc33fb..c83c569bd232 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.197 2007/07/14 14:26:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.198 2007/07/26 19:27:09 gustavoz Exp $
+
+*hal-0.5.9.1-r1 (26 Jul 2007)
+
+  26 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/0.5.9/23_runner_64bit_values.patch, files/0.5.9/series,
+  +hal-0.5.9.1-r1.ebuild:
+  Fix for bug #176274
 
   14 Jul 2007; Raúl Porcel <armin76@gentoo.org> hal-0.5.9-r1.ebuild:
   ia64 stable
diff --git a/sys-apps/hal/files/0.5.9/23_runner_64bit_values.patch b/sys-apps/hal/files/0.5.9/23_runner_64bit_values.patch
new file mode 100644
index 000000000000..c878db98c9f9
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/23_runner_64bit_values.patch
@@ -0,0 +1,34 @@
+diff --git a/hald-runner/main.c b/hald-runner/main.c
+index 3b170b3..3842cb8 100644
+--- a/hald-runner/main.c
++++ b/hald-runner/main.c
+@@ -128,9 +128,10 @@ handle_start(DBusConnection *con, DBusMessage *msg)
+ 		goto malformed;
+ 
+ 	if (run_request_run(r, con, NULL, &pid)) {
++		gint64 ppid = pid;
+ 		reply = dbus_message_new_method_return(msg);
+ 		dbus_message_append_args (reply, 
+-					  DBUS_TYPE_INT64, &pid,
++					  DBUS_TYPE_INT64, &ppid,
+ 					  DBUS_TYPE_INVALID);
+ 					  
+ 	} else {
+diff --git a/hald-runner/runner.c b/hald-runner/runner.c
+index 57a2a80..8cbc777 100644
+--- a/hald-runner/runner.c
++++ b/hald-runner/runner.c
+@@ -175,11 +175,12 @@ out:
+ 	/* emit a signal that this PID exited */
+ 	if(rd->con != NULL && rd->emit_pid_exited) {
+ 		DBusMessage *signal;
++		gint64 ppid = rd->pid;
+ 		signal = dbus_message_new_signal ("/org/freedesktop/HalRunner",
+ 						  "org.freedesktop.HalRunner",
+ 						  "StartedProcessExited");
+ 		dbus_message_append_args (signal, 
+-					  DBUS_TYPE_INT64, &(rd->pid),
++					  DBUS_TYPE_INT64, &(ppid),
+ 					  DBUS_TYPE_INVALID);
+ 		dbus_connection_send(rd->con, signal, NULL);
+ 	}
diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index 415275d6c17e..5fd8882fc9fb 100644
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -20,6 +20,7 @@
 20_firewire_prober_ioctls_fix.patch
 21_pm-suspend_correct_options.patch
 22_pm-hibernate_correct_options.patch
+23_runner_64bit_values.patch
 95_gentoo_man_page.patch
 96_plugdev_allow_send.patch
 97_ignore_fixed_drives.patch
diff --git a/sys-apps/hal/files/digest-hal-0.5.9.1-r1 b/sys-apps/hal/files/digest-hal-0.5.9.1-r1
new file mode 100644
index 000000000000..1964bb97ee92
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.5.9.1-r1
@@ -0,0 +1,3 @@
+MD5 6a40f49f964e64358e53652038f3059f hal-0.5.9.1.tar.gz 1596347
+RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f hal-0.5.9.1.tar.gz 1596347
+SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b hal-0.5.9.1.tar.gz 1596347
diff --git a/sys-apps/hal/hal-0.5.9.1-r1.ebuild b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
new file mode 100644
index 000000000000..13a3d2033fba
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.1 2007/07/26 19:27:09 gustavoz Exp $
+
+inherit eutils linux-info autotools flag-o-matic
+
+DESCRIPTION="Hardware Abstraction Layer"
+HOMEPAGE="http://www.freedesktop.org/Software/hal"
+SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc -ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+KERNEL_IUSE="kernel_linux kernel_FreeBSD"
+IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}"
+
+RDEPEND=">=dev-libs/glib-2.6
+		>=dev-libs/dbus-glib-0.61
+		kernel_linux? ( >=sys-fs/udev-104 )
+		kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 )
+		kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 )
+		kernel_FreeBSD? ( dev-libs/libvolume_id )
+		>=dev-libs/expat-1.95.8
+		>=sys-apps/pciutils-2.2.3
+		>=dev-libs/libusb-0.1.10a
+		sys-apps/usbutils
+		virtual/eject
+		amd64? ( >=sys-apps/dmidecode-2.7 )
+		x86? ( >=sys-apps/dmidecode-2.7 )
+		ia64? ( >=sys-apps/dmidecode-2.7 )
+		dell? ( >=sys-libs/libsmbios-0.13.4 )
+		disk-partition? ( >=sys-apps/parted-1.7.1 )
+		kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) )
+		selinux? ( sys-libs/libselinux
+					sec-policy/selinux-hal )"
+#		pam? ( sys-auth/consolekit )"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		>=dev-util/intltool-0.35
+		doc? ( app-doc/doxygen
+				app-text/docbook-sgml-utils
+				app-text/xmlto )"
+
+PDEPEND="app-misc/hal-info"
+
+## HAL Daemon drops privledges so we need group access to read disks
+HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
+HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
+
+function notify_uevent() {
+	ewarn
+	ewarn "You must enable Kernel Userspace Events in your kernel."
+	ewarn "For this you need to enable 'Hotplug' under 'General Setup' and"
+	ewarn "basic networking.  They are marked CONFIG_HOTPLUG and CONFIG_NET"
+	ewarn "in the config file."
+	ewarn
+	ebeep 5
+}
+
+function notify_procfs() {
+	ewarn
+	ewarn "You must enable the proc filesystem in your kernel."
+	ewarn "For this you need to enable '/proc file system support' under"
+	ewarn "'Pseudo filesystems' in 'File systems'.  It is marked"
+	ewarn "CONFIG_PROC_FS in the config file."
+	ewarn
+	ebeep 5
+}
+
+function notify_inotify() {
+	ewarn
+	ewarn "You must enable the Inotify system in your kernel."
+	ewarn "For this you need to enable 'Inotify support for userspace'"
+	ewarn "in 'File systems'. It is marked CONFIG_INOTIFY_USER in the config file."
+	ewarn
+	ebeep 5
+}
+
+pkg_setup() {
+	if built_with_use --missing false sys-apps/pciutils zlib ; then
+		eerror "You MUST build sys-apps/pciutils without the zlib USE flag"
+		die "You MUST build sys-apps/pciutils without the zlib USE flag"
+	fi
+
+	if use kernel_linux; then
+		kernel_is ge 2 6 17 || ewarn "HAL requires a kernel version 2.6.17 or newer"
+
+		if ! ( linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET )
+		then
+			notify_uevent
+		fi
+
+		linux_chkconfig_present INOTIFY_USER || notify_inotify
+
+		if use acpi ; then
+			linux_chkconfig_present PROC_FS || notify_procfs
+		fi
+	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}
+
+	# Gentoo patchset
+	epatch ${FILESDIR}/0.5.9/07_malloc_h_for_stdlib_h.patch
+	epatch ${FILESDIR}/0.5.9/23_runner_64bit_values.patch
+	#epatch ${FILESDIR}/0.5.9/95_gentoo_man_page.patch
+	epatch ${FILESDIR}/0.5.9/96_plugdev_allow_send.patch
+	epatch ${FILESDIR}/0.5.9/97_ignore_fixed_drives.patch
+	epatch ${FILESDIR}/0.5.9/98_hald_cache_test_path.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	local backend=""
+	local acpi=""
+
+	# TODO :: policykit should have a pam useflag
+	append-flags -rdynamic
+
+	if use kernel_linux ; then
+		backend="linux"
+		use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm"
+	elif use kernel_FreeBSD ; then
+		backend="freebsd"
+	else
+		eerror "Invalid backend"
+	fi
+
+	if ! use acpi ; then
+		acpi="--disable-acpi-proc --disable-acpi-acpid"
+	fi
+
+	econf --disable-policy-kit \
+		  --docdir=/usr/share/doc/${PF} \
+		  --with-os-type=gentoo \
+		  --with-pid-file=/var/run/hald.pid \
+		  --with-socket-dir=/var/run/hald \
+		  --with-hwdata=/usr/share/misc \
+		  --enable-hotplug-map \
+		  --enable-man-pages \
+		  --with-backend=${backend} \
+		  $(use_enable debug verbose-mode) \
+		  $(use_with dell dell-backlight) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable pcmcia pcmcia-support) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc doxygen-docs) \
+		  $(use_enable selinux) \
+		  --disable-console-kit \
+		  ${acpi} \
+	|| die "configure failed"
+#$(use_enable pam console-kit)
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	# remove dep on gnome-python
+	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
+
+	# hal umount for unclean unmounts
+	exeinto /lib/udev/
+	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
+
+	# initscript
+	newinitd "${FILESDIR}"/0.5.9-hald.rc hald
+	cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/
+#	if use pam; then
+#		sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf
+#	fi
+	if use debug; then
+		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
+		-i "${WORKDIR}"/0.5.9-hald.conf
+	fi
+	newconfd "${WORKDIR}"/0.5.9-hald.conf hald
+
+	# We now create and keep /media here as both gnome-mount and pmount
+	# use these directories, to avoid collision.
+	keepdir /media
+
+	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
+	# or else hal bombs.
+	keepdir /etc/hal/fdi/{information,policy,preprobe}
+
+	# HAL stores it's fdi cache in /var/lib/cache/hald
+	keepdir /var/lib/cache/hald
+
+	# HAL keeps its unix socket here
+	keepdir /var/run/hald
+}
+
+pkg_postinst() {
+	# Despite what people keep changing this location. Either one works.. it doesn't matter
+	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
+
+	# Create groups for hotplugging and HAL
+	enewgroup haldaemon || die "Problem adding haldaemon group"
+	enewgroup plugdev || die "Problem adding plugdev group"
+
+	# HAL drops priviledges by default now ...
+	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
+	if use kernel_linux; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
+			|| die "Problem adding haldaemon user"
+	elif use kernel_FreeBSD; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
+			|| die "Problem addding haldaemon user"
+	fi
+
+	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
+	# If users have a problem with this, let them file a bug
+	if [[ ${ROOT} == / ]] ; then
+		if use kernel_linux; then
+			usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
+		elif use kernel_FreeBSD; then
+			pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
+		fi
+	fi
+
+	elog "The HAL daemon needs to be running for certain applications to"
+	elog "work. Suggested is to add the init script to your start-up"
+	elog "scripts, this should be done like this :"
+	elog "\`rc-update add hald default\`"
+	echo
+	elog "Looking for automounting support? Add yourself to the plugdev group"
+}