From c340ad632fcd9b2c481c8de8b51637306770edb7 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 6 Jun 2006 04:58:26 +0000 Subject: [PATCH] Revbump with suspend patch (bug #133743) patch based on the one from d_kopete@hotmail.com Package-Manager: portage-2.1_rc4-r2 --- sys-apps/hal/ChangeLog | 8 +- sys-apps/hal/Manifest | 31 +-- sys-apps/hal/files/digest-hal-0.5.7-r3 | 3 + sys-apps/hal/files/hal-0.5.7-hibernate.patch | 12 ++ sys-apps/hal/hal-0.5.7-r3.ebuild | 187 +++++++++++++++++++ 5 files changed, 225 insertions(+), 16 deletions(-) create mode 100644 sys-apps/hal/files/digest-hal-0.5.7-r3 create mode 100644 sys-apps/hal/files/hal-0.5.7-hibernate.patch create mode 100644 sys-apps/hal/hal-0.5.7-r3.ebuild diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index eb19283ba98e..1f256506728b 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,12 @@ # 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.88 2006/05/18 21:45:13 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.89 2006/06/06 04:58:26 compnerd Exp $ + +*hal-0.5.7-r3 (06 Jun 2006) + + 06 Jun 2006; Saleem Abdulrasool + +files/hal-0.5.7-hibernate.patch, +hal-0.5.7-r3.ebuild: + Revision bump for patch to suspend (bug #133743) from b_kopete@hotmail.com 18 May 2006; Bryan Østergaard hal-0.5.5.1-r3.ebuild: Stable on alpha, bug 113818. diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index 5f94906fbd83..8c2f6dab8bee 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0.5-hald.rc 660 RMD160 6e0d9388502e6d83f9729dd4ceb018ac78470c21 SHA1 7943d6e8478e4440b8b45bbf3016aaf9d34a9669 SHA256 0f03055ee662987b1a8010948979d27cce07003a5c9e7e23b7b3901d20c2d82a MD5 a1059812bd1e8a1fe46f132c96a3d002 files/0.5-hald.rc 660 RMD160 6e0d9388502e6d83f9729dd4ceb018ac78470c21 files/0.5-hald.rc 660 @@ -49,6 +46,10 @@ AUX hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f30186060 MD5 521a06ba0845bd3246d6ed4b589f110f files/hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f files/hal-0.5.7-hald-scripts.patch 8636 SHA256 d0b713f84c7bc782ba7b13f439630a995588097db2141f4a97c110036f64001a files/hal-0.5.7-hald-scripts.patch 8636 +AUX hal-0.5.7-hibernate.patch 405 RMD160 1d98e55ffc6ca9fd8ed32bf7e7a5b174da619088 SHA1 811ea39b956c213c4603a7ae97e28ebc42fd8774 SHA256 dfa5d976868fb755f441cea17fed94f5128d14e3049f7cbeac7fe7010786f7cc +MD5 d654d65c7d398523342deb94bec68925 files/hal-0.5.7-hibernate.patch 405 +RMD160 1d98e55ffc6ca9fd8ed32bf7e7a5b174da619088 files/hal-0.5.7-hibernate.patch 405 +SHA256 dfa5d976868fb755f441cea17fed94f5128d14e3049f7cbeac7fe7010786f7cc files/hal-0.5.7-hibernate.patch 405 AUX hal-0.5.7-ignored-volumes.patch 1639 RMD160 7e56e8d2c8196baf3dcb3057296f24f6bb96f4fb SHA1 14eeacaf96ebaba14af9506ae8e7869b797957f7 SHA256 2b66eba6b8d34c88219ac126e5f86843a8b207332c1e78c260bcc5458c3b3a63 MD5 74ec55ccd95f9be1c3b68443bffa8ee4 files/hal-0.5.7-ignored-volumes.patch 1639 RMD160 7e56e8d2c8196baf3dcb3057296f24f6bb96f4fb files/hal-0.5.7-ignored-volumes.patch 1639 @@ -91,7 +92,7 @@ RMD160 3d15723862416de29b6e2d18c53aec05b05216c3 files/hald 522 SHA256 92f584b631026307485faa9ba386353b6d833349999e052fae0e8e9f82f83b6e files/hald 522 DIST hal-0.4.7.tar.gz 1349064 DIST hal-0.4.8.tar.gz 1353568 -DIST hal-0.5.5.1.tar.gz 1517882 RMD160 fad4ec6a23d8dc26bb20b659e4f9ff86e7bc62d0 SHA256 e89ab31aede3b689ef5cd54a17a3db1a2e7e868bd2d0b4b8f53a9b259723b8ee +DIST hal-0.5.5.1.tar.gz 1517882 RMD160 fad4ec6a23d8dc26bb20b659e4f9ff86e7bc62d0 SHA1 f4daef79c54a7047484a48bb2727fa627de06c93 SHA256 e89ab31aede3b689ef5cd54a17a3db1a2e7e868bd2d0b4b8f53a9b259723b8ee DIST hal-0.5.7.tar.gz 1528632 RMD160 342b00bea138ddf9f0f75e769612373bcf935d43 SHA1 f3962b29f3dad65fdaf708f680b5ba752a26227f SHA256 63c78e9b9c8308914372f9a762b02fa057bca2c6a1c7478ab595ba0fa92781d5 EBUILD hal-0.4.7-r2.ebuild 3429 RMD160 79839d470277cd22e578802a4fae533fa17b9e43 SHA1 c62397e7e5ede121ed785f124e05c70ac41c8853 SHA256 b204f8aa83e5a746bd28cc40c58e1fc465e9a41d624dd26a0c05d1cab4d16c11 MD5 9be5fc181975453c4f2ff2e7b16f3b74 hal-0.4.7-r2.ebuild 3429 @@ -113,14 +114,18 @@ EBUILD hal-0.5.7-r2.ebuild 5577 RMD160 4f9a15e6d9be7ab4dd3b5873296b7224004edcae MD5 6ffc90b8f1d1c3a492913acf79a8fd0d hal-0.5.7-r2.ebuild 5577 RMD160 4f9a15e6d9be7ab4dd3b5873296b7224004edcae hal-0.5.7-r2.ebuild 5577 SHA256 758333e27e5b7b7da04f56231ac1d416ab6b4ec22fd906f651375b381926ff9f hal-0.5.7-r2.ebuild 5577 +EBUILD hal-0.5.7-r3.ebuild 5669 RMD160 651c4f956487deba6d7f3a438d0e31448a642554 SHA1 07eaf8f69ad50f3f184777d5df9e8978b0c18d39 SHA256 e95243d219d73197e95bdbda204deb5647a3da64f52aad71f92aac75a8a8ec8f +MD5 a1336c5bc92ecbbc1ce61aabb47a3b79 hal-0.5.7-r3.ebuild 5669 +RMD160 651c4f956487deba6d7f3a438d0e31448a642554 hal-0.5.7-r3.ebuild 5669 +SHA256 e95243d219d73197e95bdbda204deb5647a3da64f52aad71f92aac75a8a8ec8f hal-0.5.7-r3.ebuild 5669 EBUILD hal-0.5.7.ebuild 5043 RMD160 1ef68363d3e3df3b5714a02cbd7652a5146616d1 SHA1 8a59e8414482710b5f3543983492245a25d5d963 SHA256 078d056f53abd974bcfe7e32c4e7ff18506e2847476758e56e68a27c613fcb75 MD5 b2c6466417f81e53acc48e428a33c2a4 hal-0.5.7.ebuild 5043 RMD160 1ef68363d3e3df3b5714a02cbd7652a5146616d1 hal-0.5.7.ebuild 5043 SHA256 078d056f53abd974bcfe7e32c4e7ff18506e2847476758e56e68a27c613fcb75 hal-0.5.7.ebuild 5043 -MISC ChangeLog 12913 RMD160 928e349c898b585bef71d766ab152e8d9ea24e7c SHA1 8fc5ca2711b992a280219ffbf73ccf9e366c4e36 SHA256 f36d5f362e52f7fd25cc34ff0066b0d2e21e6c9a1ccdaf27ea5bf505cd7dbea5 -MD5 9964e2b70cf92e5774c35c3a67a1e76a ChangeLog 12913 -RMD160 928e349c898b585bef71d766ab152e8d9ea24e7c ChangeLog 12913 -SHA256 f36d5f362e52f7fd25cc34ff0066b0d2e21e6c9a1ccdaf27ea5bf505cd7dbea5 ChangeLog 12913 +MISC ChangeLog 13136 RMD160 d346789c6a05e2cb1c5bcf2bc728601ecdc96e62 SHA1 97f9cf8bbcd5ecd39d239b86f7efe421a2bd607e SHA256 e66da06c6c73548640d90cfa86c557a342a5ed8106e9e6af567a3cbe04b5e908 +MD5 c823e62c700095bb9e63815f03a5a515 ChangeLog 13136 +RMD160 d346789c6a05e2cb1c5bcf2bc728601ecdc96e62 ChangeLog 13136 +SHA256 e66da06c6c73548640d90cfa86c557a342a5ed8106e9e6af567a3cbe04b5e908 ChangeLog 13136 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d MD5 885e3073744523eaf2450514a311758b metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223 @@ -143,10 +148,6 @@ SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/di MD5 2cab9d9e3415f54f6368f796cf3df8ff files/digest-hal-0.5.7-r2 232 RMD160 a3f08885fb362e481bd884a8f2192d3dc995fbee files/digest-hal-0.5.7-r2 232 SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/digest-hal-0.5.7-r2 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) - -iD8DBQFEeUrUoeSe8B0zEfwRAtRUAJ9GMwElGYwdiyrJ32tky1WXoUudHQCfavGs -XIZHme9kHaG3sLTTWmZhvXw= -=PyyE ------END PGP SIGNATURE----- +MD5 2cab9d9e3415f54f6368f796cf3df8ff files/digest-hal-0.5.7-r3 232 +RMD160 a3f08885fb362e481bd884a8f2192d3dc995fbee files/digest-hal-0.5.7-r3 232 +SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/digest-hal-0.5.7-r3 232 diff --git a/sys-apps/hal/files/digest-hal-0.5.7-r3 b/sys-apps/hal/files/digest-hal-0.5.7-r3 new file mode 100644 index 000000000000..5c84accce85a --- /dev/null +++ b/sys-apps/hal/files/digest-hal-0.5.7-r3 @@ -0,0 +1,3 @@ +MD5 4163afb8285db64e00e7b1392b401d92 hal-0.5.7.tar.gz 1528632 +RMD160 342b00bea138ddf9f0f75e769612373bcf935d43 hal-0.5.7.tar.gz 1528632 +SHA256 63c78e9b9c8308914372f9a762b02fa057bca2c6a1c7478ab595ba0fa92781d5 hal-0.5.7.tar.gz 1528632 diff --git a/sys-apps/hal/files/hal-0.5.7-hibernate.patch b/sys-apps/hal/files/hal-0.5.7-hibernate.patch new file mode 100644 index 000000000000..fa25bbe91c6b --- /dev/null +++ b/sys-apps/hal/files/hal-0.5.7-hibernate.patch @@ -0,0 +1,12 @@ +--- tools/hal-system-power-suspend 2006-06-05 23:49:08.000000000 -0500 ++++ tools/hal-system-power-suspend 2006-06-05 23:50:49.000000000 -0500 +@@ -61,6 +61,9 @@ + # Use the raw kernel sysfs interface + echo "mem" > /sys/power/state + RET=$? ++ elif [ -x "/usr/sbin/hibernate-ram" ] ; then ++ /usr/sbin/hibernate-ram ++ RET=$? + else + # TODO: add other scripts support + unsupported diff --git a/sys-apps/hal/hal-0.5.7-r3.ebuild b/sys-apps/hal/hal-0.5.7-r3.ebuild new file mode 100644 index 000000000000..dd6e20625049 --- /dev/null +++ b/sys-apps/hal/hal-0.5.7-r3.ebuild @@ -0,0 +1,187 @@ +# 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-r3.ebuild,v 1.1 2006/06/06 04:58:26 compnerd 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 ~sparc ~x86" +IUSE="acpi crypt debug doc dmi pcmcia selinux" + +RDEPEND=">=dev-libs/glib-2.6 + >=sys-apps/dbus-0.60 + >=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 + 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() { + linux-info_pkg_setup + + kernel_is ge 2 6 15 || die "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}" + + # sony screen brightness patch +# epatch "${FILESDIR}"/${PN}-0.5.7-sony-brightness.patch + + # handle ignored volumes properly + epatch "${FILESDIR}"/${PN}-0.5.7-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 +} + +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 + + 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\`" + echo + einfo "Looking for automounting support? Add yourself to the plugdev group" +} -- 2.26.2