From: Doug Goldstein Date: Wed, 15 Nov 2006 21:02:48 +0000 (+0000) Subject: Fixing bug #155275, bug #147867, bug #140666 (the HAL parts not the KDE parts of... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91ba3e98bf9f4b53e274b375693703de0ba0aef5;p=gentoo.git Fixing bug #155275, bug #147867, bug #140666 (the HAL parts not the KDE parts of it), bug #133743, and refactored patch from bug #146910 so I don't have to kill Ivan and Fabio. Package-Manager: portage-2.1.2_rc1-r3 --- diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 37ca3ae42e95..f515dce0864b 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.107 2006/10/31 03:05:21 christel Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.108 2006/11/15 21:02:48 cardoe Exp $ + +*hal-0.5.7.1-r2 (15 Nov 2006) + + 15 Nov 2006; Doug Goldstein + +files/hal-0.5.7.1-hibernate-fix.patch, + +files/hal-0.5.7.1-ignored-volumes.patch, hal-0.5.7.1-r1.ebuild, + +hal-0.5.7.1-r2.ebuild: + Fixing bug #155275, bug #147867, bug #140666 (the HAL parts not the KDE + parts of it), bug #133743, and refactored patch from bug #146910 so I don't + have to kill Ivan and Fabio. 31 Oct 2006; hal-0.5.7-r3.ebuild: Alpha stable diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index 0d5a0694be27..2fab7d61917a 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161 MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681 @@ -46,6 +49,14 @@ AUX hal-0.5.7.1-dbus-close.patch 859 RMD160 942829e237154e6612d806d9f3af0d393582 MD5 1fa646b45e845031f09515731dba40c7 files/hal-0.5.7.1-dbus-close.patch 859 RMD160 942829e237154e6612d806d9f3af0d393582f418 files/hal-0.5.7.1-dbus-close.patch 859 SHA256 7739541fde66bcfcb6bbeb2d5e66976e856ea066aed34c847b38539a2c42b183 files/hal-0.5.7.1-dbus-close.patch 859 +AUX hal-0.5.7.1-hibernate-fix.patch 461 RMD160 c88c5f307321d4981d3ee1bbaf299e9d42c5c636 SHA1 e9b0d89943b4eab1e60f86227b7f478fb55abee0 SHA256 0230f7686fa8584565776ba4024cc399094ab64414d77b21a68f50318c5ad021 +MD5 088e3e7a6c3d2be3bf27b13a2ca05333 files/hal-0.5.7.1-hibernate-fix.patch 461 +RMD160 c88c5f307321d4981d3ee1bbaf299e9d42c5c636 files/hal-0.5.7.1-hibernate-fix.patch 461 +SHA256 0230f7686fa8584565776ba4024cc399094ab64414d77b21a68f50318c5ad021 files/hal-0.5.7.1-hibernate-fix.patch 461 +AUX hal-0.5.7.1-ignored-volumes.patch 2864 RMD160 2b4031e24b57c2b8685eb95e39f7b3e6eb0c7576 SHA1 c7dc9a6ff210cea6546dfc50c0817308dbe7397c SHA256 054a2db0fd30d6ae9ef828fec930cf55df4e5cbbcc20f3cb86c8801714063790 +MD5 d7bd86d8837014d37208a3604c4fcb33 files/hal-0.5.7.1-ignored-volumes.patch 2864 +RMD160 2b4031e24b57c2b8685eb95e39f7b3e6eb0c7576 files/hal-0.5.7.1-ignored-volumes.patch 2864 +SHA256 054a2db0fd30d6ae9ef828fec930cf55df4e5cbbcc20f3cb86c8801714063790 files/hal-0.5.7.1-ignored-volumes.patch 2864 AUX hal-0.5.7.1-sr-driver.patch 654 RMD160 86a98b6ceb98f797badd3e1c653f181d498138b1 SHA1 8c1538eb5d1192e336627f1c59c365b2b73b0a6d SHA256 52191c2230af31f0bf18f39a5f0e6d24728da5c7e0de627be55046561318ca55 MD5 a6cfdd91f94b01684e1c3063dd07cbd8 files/hal-0.5.7.1-sr-driver.patch 654 RMD160 86a98b6ceb98f797badd3e1c653f181d498138b1 files/hal-0.5.7.1-sr-driver.patch 654 @@ -65,14 +76,18 @@ EBUILD hal-0.5.7-r3.ebuild 5710 RMD160 ed2e1a1f3f5d6caacb42350901c9be27033b7129 MD5 fc3f2afae81bb28c7f2955a699606fb3 hal-0.5.7-r3.ebuild 5710 RMD160 ed2e1a1f3f5d6caacb42350901c9be27033b7129 hal-0.5.7-r3.ebuild 5710 SHA256 b919df1f99c86df595024d66201ecd351bccf216247b4b1e126a13c77da978a6 hal-0.5.7-r3.ebuild 5710 -EBUILD hal-0.5.7.1-r1.ebuild 5905 RMD160 cf1963739884fceada57d8064ce32c33337736fe SHA1 7358d294f731856e74f19f65613f293f186eb939 SHA256 007339efc63697a1bb3211cbf9d7f67cc6b030b1fd73d9065cb4c657e98da763 -MD5 93a2ffa74943bc533caca2cdb60b6c85 hal-0.5.7.1-r1.ebuild 5905 -RMD160 cf1963739884fceada57d8064ce32c33337736fe hal-0.5.7.1-r1.ebuild 5905 -SHA256 007339efc63697a1bb3211cbf9d7f67cc6b030b1fd73d9065cb4c657e98da763 hal-0.5.7.1-r1.ebuild 5905 -MISC ChangeLog 16138 RMD160 506be9be5dd1a9a1ed7e53f30b2882769a85db53 SHA1 6068e8155d6fc70fed6d40cb46446711a509eada SHA256 b93a0f7a198a3b8e43cadff1d65ab3f00cfc1f489e08950f51da34898071ba58 -MD5 7c4f53f99d81c9b5c8a813c0b1d058ec ChangeLog 16138 -RMD160 506be9be5dd1a9a1ed7e53f30b2882769a85db53 ChangeLog 16138 -SHA256 b93a0f7a198a3b8e43cadff1d65ab3f00cfc1f489e08950f51da34898071ba58 ChangeLog 16138 +EBUILD hal-0.5.7.1-r1.ebuild 5917 RMD160 b7ff504a6522d1b45d65fc3d5e27e84b3f661383 SHA1 f61526316df27ad8740bc9367d4298ddfd72c298 SHA256 47fba625ecffa7737364e283f46675024f775efd3dfa7c669474dd8ad3972c83 +MD5 0761d07be52b7c56065ae2fbff047a92 hal-0.5.7.1-r1.ebuild 5917 +RMD160 b7ff504a6522d1b45d65fc3d5e27e84b3f661383 hal-0.5.7.1-r1.ebuild 5917 +SHA256 47fba625ecffa7737364e283f46675024f775efd3dfa7c669474dd8ad3972c83 hal-0.5.7.1-r1.ebuild 5917 +EBUILD hal-0.5.7.1-r2.ebuild 5927 RMD160 541c023e3f7a2981087a65f6d028cc3496e2ac89 SHA1 bed185e5377efc7cf50eae3abfed915ac54aa7d5 SHA256 82099a78707b22e69f532cb9a09c682933ffd5096fa9c1a3de78a8b492a1902a +MD5 732c9bda37514b0be81e57a1d94de4a9 hal-0.5.7.1-r2.ebuild 5927 +RMD160 541c023e3f7a2981087a65f6d028cc3496e2ac89 hal-0.5.7.1-r2.ebuild 5927 +SHA256 82099a78707b22e69f532cb9a09c682933ffd5096fa9c1a3de78a8b492a1902a hal-0.5.7.1-r2.ebuild 5927 +MISC ChangeLog 16536 RMD160 dd5f976a56a7c38bbeb04c4d8151dcda6b7ebadf SHA1 23d24af160cbbed3d47d0396a7e6f71f0fcc9e7c SHA256 882018380ea65b35bb8776bd8f43466ffb4eaf0d9d9e57a03eec694d346b4db0 +MD5 0aec4d038da53c38fb12a94576b3b48a ChangeLog 16536 +RMD160 dd5f976a56a7c38bbeb04c4d8151dcda6b7ebadf ChangeLog 16536 +SHA256 882018380ea65b35bb8776bd8f43466ffb4eaf0d9d9e57a03eec694d346b4db0 ChangeLog 16536 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d MD5 885e3073744523eaf2450514a311758b metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223 @@ -86,3 +101,13 @@ SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/di MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r1 238 RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r1 238 SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r1 238 +MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r2 238 +RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r2 238 +SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r2 238 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFW4BDoeSe8B0zEfwRAkUAAJ93sQ7fzi0qNNZj2GVZcCF02j7+RgCdEQ3T +hz1AjHrViK90luCtqx7sO1Y= +=t8h0 +-----END PGP SIGNATURE----- diff --git a/sys-apps/hal/files/digest-hal-0.5.7.1-r2 b/sys-apps/hal/files/digest-hal-0.5.7.1-r2 new file mode 100644 index 000000000000..3042516ecf0a --- /dev/null +++ b/sys-apps/hal/files/digest-hal-0.5.7.1-r2 @@ -0,0 +1,3 @@ +MD5 d7a7741808ba130f8aff3f5d3b5689e4 hal-0.5.7.1.tar.gz 1503156 +RMD160 2861818b29546bd3628b1bda3d41238cf644c644 hal-0.5.7.1.tar.gz 1503156 +SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b hal-0.5.7.1.tar.gz 1503156 diff --git a/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix.patch b/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix.patch new file mode 100644 index 000000000000..71a299b713d0 --- /dev/null +++ b/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix.patch @@ -0,0 +1,12 @@ +--- tools/hal-system-power-suspend 2006-02-19 00:00:55.000000000 +0100 ++++ tools/hal-system-power-suspend2 2006-09-23 11:22:42.000000000 +0200 +@@ -62,6 +62,9 @@ + elif [ -x "/usr/sbin/pmi" ] ; then + /usr/sbin/pmi action suspend force + RET=$? ++ elif [ -x "/usr/sbin/hibernate-ram" ] ; then ++ /usr/sbin/hibernate-ram ++ RET=$? + elif [ -w "/sys/power/state" ] ; then + # Use the raw kernel sysfs interface + echo "mem" > /sys/power/state diff --git a/sys-apps/hal/files/hal-0.5.7.1-ignored-volumes.patch b/sys-apps/hal/files/hal-0.5.7.1-ignored-volumes.patch new file mode 100644 index 000000000000..a0cc0fd3023d --- /dev/null +++ b/sys-apps/hal/files/hal-0.5.7.1-ignored-volumes.patch @@ -0,0 +1,65 @@ +--- hal-0.5.7.1/fdi/policy/10osvendor/20-storage-methods.fdi 2006-02-22 15:15:33.000000000 +0100 ++++ hal-0.5.7.1/fdi/policy/10osvendor/20-storage-methods.fdi 2006-10-09 10:46:36.000000000 +0200 +@@ -63,21 +63,54 @@ + + + ++ ++ ++ ++ ++ ++ false ++ ++ ++ true ++ ++ ++ ++ ++ ++ false ++ ++ ++ ++ ++ ++ ++ + + + + + + false ++ ++ ++ ++ ++ ++ ++ true ++ ++ ++ + + ++ true + +- +- +- +- +- +- true ++ ++ ++ ++ ++ false ++ + + + diff --git a/sys-apps/hal/hal-0.5.7.1-r1.ebuild b/sys-apps/hal/hal-0.5.7.1-r1.ebuild index 5515c76184f1..13374354e2bb 100644 --- a/sys-apps/hal/hal-0.5.7.1-r1.ebuild +++ b/sys-apps/hal/hal-0.5.7.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r1.ebuild,v 1.4 2006/10/16 17:48:16 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r1.ebuild,v 1.5 2006/11/15 21:02:48 cardoe Exp $ inherit eutils linux-info debug @@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="acpi crypt debug doc dmi pcmcia selinux" RDEPEND=">=dev-libs/glib-2.6 - || ( dev-libs/dbus-glib sys-apps/dbus ) + || ( >=dev-libs/dbus-glib-0.71 =sys-fs/udev-078 >=sys-apps/util-linux-2.12r || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 ) diff --git a/sys-apps/hal/hal-0.5.7.1-r2.ebuild b/sys-apps/hal/hal-0.5.7.1-r2.ebuild new file mode 100644 index 000000000000..6436a54e2cc7 --- /dev/null +++ b/sys-apps/hal/hal-0.5.7.1-r2.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r2.ebuild,v 1.1 2006/11/15 21:02:48 cardoe Exp $ + +inherit eutils linux-info debug + +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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="acpi crypt debug doc dmi pcmcia selinux" + +RDEPEND=">=dev-libs/glib-2.6 + || ( >=dev-libs/dbus-glib-0.71 =sys-fs/udev-078 + >=sys-apps/util-linux-2.12r + || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 ) + dev-libs/expat + sys-libs/libcap + sys-apps/pciutils + dev-libs/libusb + sys-apps/hotplug + virtual/eject + dmi? ( >=sys-apps/dmidecode-2.7 ) + crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) + selinux? ( sys-libs/libselinux )" + +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,plugdev,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 +} + +function notify_uevent_2_6_16() { + eerror + eerror "You must enable Kernel Userspace Events in your kernel." + eerror "For this you need to enable 'Hotplug' under 'General Setup' and" + eerror "basic networking. They are marked CONFIG_HOTPLUG and CONFIG_NET" + eerror "in the config file." + eerror + ebeep 5 +} + +function notify_procfs() { + eerror + eerror "You must enable the proc filesystem in your kernel." + eerror "For this you need to enable '/proc file system support' under" + eerror "'Pseudo filesystems' in 'File systems'. It is marked" + eerror "CONFIG_PROC_FS in the config file." + eerror + ebeep 5 +} + +pkg_setup() { + get_version || eerror "Unable to calculate Linux Kernel version" + + kernel_is ge 2 6 15 || eerror "HAL requires a kernel version 2.6.15 or newer" + + if kernel_is lt 2 6 16 ; then + linux_chkconfig_present KOBJECT_UEVENT || notify_uevent + else + (linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET) \ + || notify_uevent_2_6_16 + fi + + if use acpi ; then + linux_chkconfig_present PROC_FS || notify_procfs + 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}" + + # handle ignored volumes properly + epatch "${FILESDIR}"/${PN}-0.5.7.1-ignored-volumes.patch + + # Fix bash in hald scripts + epatch "${FILESDIR}"/${PN}-0.5.7-hald-scripts.patch + + # probe partition table + epatch "${FILESDIR}"/${PN}-0.5.7-part-table.patch + + # fix pmu support crash + epatch "${FILESDIR}"/${PN}-0.5.7-pmu-fix.patch + + # unclean unmount + epatch "${FILESDIR}"/${PN}-0.5.7-unclean-unmount-r1.patch + + # allow plugdev group people to mount + epatch "${FILESDIR}"/${PN}-0.5.7-plugdev-allow-send.patch + + # rescan devices on resume + epatch "${FILESDIR}"/${PN}-0.5.7-rescan-on-resume.patch + + # detect hibernate-ram script as well + epatch "${FILESDIR}"/${PN}-0.5.7-hibernate.patch + + # dbus deprecated dbus_connection_disconnect + epatch "${FILESDIR}"/${PN}-0.5.7.1-dbus-close.patch + + # sr driver fix + epatch "${FILESDIR}"/${PN}-0.5.7.1-sr-driver.patch + + # hibernate sequence fix + epatch "${FILESDIR}"/${PN}-0.5.7.1-hibernate-fix.patch +} + +src_compile() { + econf \ + --with-doc-dir=/usr/share/doc/${PF} \ + --with-os-type=gentoo \ + --with-pid-file=/var/run/hald.pid \ + --enable-hotplug-map \ + $(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) \ + $(use_enable selinux) \ + || die "configure failed" + + 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-hald.rc hald + + # Script to unmount devices if they are yanked out (from upstream) + exeinto /etc/dev.d/default + doexe "${FILESDIR}"/hal-unmount.dev + + # We now create and keep /media here as both gnome-mount and pmount + # use these directories, to avoid collision. + dodir /media + keepdir /media +} + +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) + 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 + + 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" +}