[patch] New ebuild with patch solving this problem

hal-0.5.11-r4_hal-0.5.11-r5.diff (text/plain), 13.86 KB, created by Yar Odin on 2009-01-05 09:19:36 UTC

diff -ruN hal.orig/files/hal-0.5.11-hugehdd.patch hal/files/hal-0.5.11-hugehdd.patch
--- hal.orig/files/hal-0.5.11-hugehdd.patch	1970-01-01 05:00:00.000000000 +0500
+++ hal/files/hal-0.5.11-hugehdd.patch	2009-01-05 00:41:33.000000000 +0500
@@ -0,0 +1,18 @@
+--- a/hald/linux/blockdev.c	2009-01-05 00:39:49.000000000 +0500
++++ b/hald/linux/blockdev.c	2009-01-05 00:40:55.000000000 +0500
+@@ -1436,13 +1436,13 @@
+ 		 * (block size requires opening the device file)
+ 		 */
+ 		hal_device_property_set_int (d, "volume.block_size", 512);
+-		if (!hal_util_set_int_from_file (d, "volume.num_blocks", sysfs_path_real, "size", 0)) {
++		if (!hal_util_set_uint64_from_file (d, "volume.num_blocks", sysfs_path_real, "size", 0)) {
+ 			HAL_INFO (("Ignoring hotplug event - cannot read 'size'"));
+ 			goto error;
+ 		}
+ 		hal_device_property_set_uint64 (
+ 			d, "volume.size",
+-			((dbus_uint64_t)(512)) * ((dbus_uint64_t)(hal_device_property_get_int (d, "volume.num_blocks"))));
++			((dbus_uint64_t)(512)) * ((dbus_uint64_t)(hal_device_property_get_uint64 (d, "volume.num_blocks"))));
+ 		/* TODO: move to prober? */
+ 		if (is_physical_partition) {
+ 			guint64 start_block;
diff -ruN hal.orig/hal-0.5.11-r5.ebuild hal/hal-0.5.11-r5.ebuild
--- hal.orig/hal-0.5.11-r5.ebuild	1970-01-01 05:00:00.000000000 +0500
+++ hal/hal-0.5.11-r5.ebuild	2009-01-05 00:33:45.000000000 +0500
@@ -0,0 +1,305 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.5 2008/12/24 15:39:11 cardoe Exp $
+
+inherit eutils linux-info autotools flag-o-matic
+
+PATCH_VERSION="3"
+
+DESCRIPTION="Hardware Abstraction Layer"
+HOMEPAGE="http://www.freedesktop.org/Software/hal"
+SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
+		 http://dev.gentoo.org/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
+
+LICENSE="|| ( GPL-2 AFL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+
+KERNEL_IUSE="kernel_linux kernel_FreeBSD"
+IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
+
+RDEPEND=">=dev-libs/dbus-glib-0.61
+		 >=dev-libs/glib-2.14
+		 >=dev-libs/expat-1.95.8
+		 >=dev-libs/libusb-0.1.10a
+		 >=sys-apps/pciutils-2.2.7-r1
+		 >=dev-util/gperf-3.0.3
+		   sys-apps/usbutils
+		   virtual/eject
+		 amd64? ( >=sys-apps/dmidecode-2.7 )
+		 dell? ( >=sys-libs/libsmbios-0.13.4 )
+		 disk-partition? ( >=sys-apps/parted-1.8.0 )
+		 ia64? ( >=sys-apps/dmidecode-2.7 )
+		 kernel_linux?	(
+							>=sys-fs/udev-117
+							>=sys-apps/util-linux-2.13
+							>=sys-kernel/linux-headers-2.6.19
+							crypt?	( >=sys-fs/cryptsetup-1.0.5 )
+						)
+		 kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 )
+		 x86? ( >=sys-apps/dmidecode-2.7 )
+		 selinux? ( sys-libs/libselinux sec-policy/selinux-hal )"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		>=dev-util/intltool-0.35
+		X? ( >=dev-python/pyxf86config-0.3.34-r1 )
+		doc?	(
+					app-text/xmlto
+					dev-libs/libxml2
+					dev-util/gtk-doc
+					app-text/docbook-sgml-utils
+				)"
+PDEPEND="|| ( =app-misc/hal-info-20080310 =app-misc/hal-info-20080508 )
+		 !gnome-extra/hal-device-manager
+		 laptop? ( >=sys-power/pm-utils-0.99.3 )"
+
+## 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 check_hotplug_net() {
+	local CONFIG_CHECK="~HOTPLUG ~NET"
+	local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n"
+	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_inotify() {
+	local CONFIG_CHECK="~INOTIFY_USER"
+	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_acpi_proc() {
+	local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT"
+	local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n"
+	local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then
+			kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer"
+
+			if kernel_is lt 2 6 23 && use acpi ; then
+				check_acpi_proc
+			fi
+		fi
+
+		check_hotplug_net
+		check_inotify
+	fi
+
+	# http://devmanual.gentoo.org/ebuild-writing/functions/
+	# http://bugs.gentoo.org/show_bug.cgi?id=191605
+
+	# Create groups for hotplugging and HAL
+	enewgroup haldaemon
+	enewgroup plugdev
+
+	# 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}
+	elif use kernel_FreeBSD; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
+	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
+}
+
+S="${WORKDIR}/${PF/-r*/}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/${P}-patches/" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	epatch "${FILESDIR}"/${P}-ppc64.patch
+	epatch "${FILESDIR}"/${P}-hugehdd.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	local acpi="$(use_enable acpi)"
+	local backend=
+	local hardware=
+
+	append-flags -rdynamic
+
+	if use kernel_linux ; then
+		backend="linux"
+	elif use kernel_FreeBSD ; then
+		backend="freebsd"
+	else
+		eerror "Invalid backend"
+	fi
+
+	if use kernel_linux ; then
+		if use acpi ; then
+			# Using IBM ACPI and Toshiba ACPI results in double notification as this
+			# was merged into the Linux Kernel 2.6.22
+			if kernel_is lt 2 6 22 ; then
+				acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba"
+			else
+				acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			fi
+
+			acpi="$acpi --enable-acpi-proc --enable-acpi-acpid"
+		else
+			acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			acpi="$acpi --disable-acpi-proc --disable-acpi-acpid"
+		fi
+
+		hardware="--with-cpufreq --with-usb-csr --with-keymaps"
+		use arm && hardware="$hardware --with-omap"
+
+		if use dell ; then
+			hardware="$hardware --with-dell-backlight"
+		else
+			hardware="$hardware --without-dell-backlight"
+		fi
+
+		hardware="$hardware --enable-sonypic"
+	else
+		hardware="--without-cpufreq --without-usb-csr --without-keymaps"
+		hardware="$hardware --without-omap"
+		hardware="$hardware --without-dell-backlight"
+		hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
+		hardware="$hardware --disable-sonypic"
+	fi
+
+	econf --with-backend=${backend} \
+		  --with-os-type=gentoo \
+		  --with-pid-file=/var/run/hald.pid \
+		  --with-hwdata=/usr/share/misc \
+		  --with-socket-dir=/var/run/hald \
+		  --enable-umount-helper \
+		  --enable-man-pages \
+		  --disable-policy-kit \
+		  --disable-console-kit \
+		  --disable-acl-management \
+		  --enable-pci \
+		  $(use_enable apm) \
+		  $(use_enable arm pmu) \
+		  $(use_enable debug verbose-mode) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc gtk-doc) \
+		  --docdir=/usr/share/doc/${PF} \
+		  --localstatedir=/var \
+		  ${acpi} ${hardware} \
+	|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
+
+	# hal umount for unclean unmounts
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
+
+	# initscript
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
+
+	# configuration
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
+		die "failed to copy hald.conf"
+
+	if use debug; then
+		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
+			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
+	fi
+	newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \
+		die "failed to install hald.conf"
+
+	if use X ; then
+		# New Configuration Snippets
+		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || \
+			die "dodoc X examples failed"
+		dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || \
+			die "dodoc X migration script failed"
+
+		# Automagic conversion!
+		elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file"
+		"${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \
+			> "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \
+			ewarn "Failed to migrate your keyboard configuration."
+	fi
+
+	# 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
+	keepdir /var/lib/hal
+}
+
+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/
+
+	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"
+	echo
+	elog "IF you have additional applications which consume ACPI events, you"
+	elog "should consider installing acpid to allow applications to share ACPI"
+	elog "events."
+	if use X ; then
+		echo
+		elog "If you wish to use a non US layout, you may do so by executing:"
+		elog "setxkbmap <layout> or by utilizing your Desktop Environment's"
+		elog "Keyboard Layout Settings mechanism."
+		elog "Under GNOME, this is gnome-keyboard-properties, and under KDE"
+		elog "it is kxkb."
+	fi
+	echo
+	elog "In order have suspend/hibernate function with HAL or apps that use HAL"
+	elog "(such as gnome-power-manager), you should build HAL with the laptop"
+	elog "useflag which will install pm-utils."
+	if use X ; then
+		echo
+		elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)"
+		elog "reads user specific configuration from /etc/hal/fdi/policy/."
+		if [[ $(cat "${ROOT}etc/hal/fdi/policy/10-x11-input.fdi" | wc -c) -gt 0 ]]
+		then
+			elog "We have converted your existing xorg.conf rules and the FDI is stored"
+			elog "at /etc/hal/fdi/policy/10-x11-input.fdi"
+		fi
+		elog "You should remove the Input sections from your xorg.conf once you have"
+		elog "migrated the rules to a HAL fdi file."
+	fi
+
+	ebeep 5
+	epause 5
+}
diff -ruN hal.orig/Manifest hal/Manifest
--- hal.orig/Manifest	2008-12-28 20:06:50.000000000 +0500
+++ hal/Manifest	2009-01-05 00:41:43.000000000 +0500
@@ -35,6 +35,7 @@
 AUX 0.5.9/series 938 RMD160 6b6d5ab5357129e6588db78d251407193ef5fc7b SHA1 9d998a08e37676493386a6e0ba1e220b6ccba158 SHA256 12281e626fc5b9ee3f3b29d1233d698ad0d16e0cb7e134a89a7c3a536afaaabb
 AUX 96_plugdev_allow_send.patch 1781 RMD160 08f0cbb8960d4753d15d02c8694fae09a6ef2a02 SHA1 ad04ac23936ac8f1915b2d25cbc366d6db24cdc9 SHA256 090d666c8df223fc0ea30f473fa3d52412ef22aff85c1eebf609a3f00dbd652a
 AUX hal-0.5.10-autotools.patch 263 RMD160 1d671becb9bcd3bf635bea70026c1d79d552288a SHA1 fde6a5dada34b941b31adfd59b1a31d0952c94f4 SHA256 9d8eaa54a302fa2daa685c279e3de7390c582b052c25c82769d0eb06fa7a0da1
+AUX hal-0.5.11-hugehdd.patch 898 RMD160 32cdef1bf098a1303696b62f46afe4500b5df01d SHA1 03ac4038c3e0ca845fa6b5e414f4b673e2b57d02 SHA256 ab9194fc39aaae153842e6301cdef1e443f45b53566de68f5072790bc6da1ada
 AUX hal-0.5.11-ppc64.patch 1127 RMD160 cbb3483ccc324b6c1c076ad03a3c6fbdf4f99c74 SHA1 31dc51bc11563ba5d4d20d7a05459aa1c77975be SHA256 e3707973bd2589f0dfabbbc2121964afa6c55afb20fc530a454ce7edf2f41c78
 AUX hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f SHA1 c2ffb779f423e07b38f12a852d942928394abc63 SHA256 d0b713f84c7bc782ba7b13f439630a995588097db2141f4a97c110036f64001a
 AUX hal-0.5.7-hibernate.patch 405 RMD160 1d98e55ffc6ca9fd8ed32bf7e7a5b174da619088 SHA1 811ea39b956c213c4603a7ae97e28ebc42fd8774 SHA256 dfa5d976868fb755f441cea17fed94f5128d14e3049f7cbeac7fe7010786f7cc
@@ -66,6 +67,7 @@
 DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
 EBUILD hal-0.5.11-r1.ebuild 9416 RMD160 435f9ebf2893476c51a0dbd9ac5444d2092726ac SHA1 535ef7592de29914a31123636dac983d5d0cabdc SHA256 ab0a9f34b612318486f025ed4b447f7bc8fdcc8f98fe8f64986e7d2ea2c3b34b
 EBUILD hal-0.5.11-r4.ebuild 9493 RMD160 dfede0559f07ccafe98301de4550493abcf5d2d1 SHA1 030f68de81db95a2583e7e40fcff7bb840733b2a SHA256 7421991e965a040a4a29e9875771bffb5aacbdfb401b3e2d595caa70365b34ad
+EBUILD hal-0.5.11-r5.ebuild 9534 RMD160 b35bbd7a8852b2038c124fbce84ea30b883496c5 SHA1 aff07518a910db09c20d1ce99bca03f154e1c1ba SHA256 658a8cb44522ce271370e2d9e47d48e7c04589aba7e946a2fd1282808f621d50
 EBUILD hal-0.5.9.1-r3.ebuild 6694 RMD160 91f751aa5525c0879cf23bcbb95a9fb343742d0f SHA1 a0b0da643a6c7dab8f0517e01bae4d774224b15a SHA256 09338520c2c1278f1fec32c0c8e9fa95ac906d35eefe52f1f4e1507b12953452
 MISC ChangeLog 41962 RMD160 3f2dea79a49cb053f4554c7acbc0537422994747 SHA1 c2729baeb25c32c9f431db0cc442eb905951ce03 SHA256 f27a904636118282cacca7e12cc062f4e2cd8f274aa1e496c26fd5267acb14b9
 MISC metadata.xml 2118 RMD160 c5e854ace21eaef57ae132e7dd9fe6bbcd644214 SHA1 c936358b6965f4f59c408fdaeed2d5ec22e66144 SHA256 c0eeaa1b4b92601ee0e46deafddaad311af80bc4a0111124fabdb0380386c39a