From 2e9a638f509d848bc88295ededc91bbebef010ca Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 5 Apr 2007 17:29:55 +0000 Subject: [PATCH] Re-work acpi USE flag usage. Add pam USE flag for sys-auth/consolekit. Remove mactel USE flag since it will auto build and that's how it should. Added linux-sources depend on having a Linux kernel. Check for Linux or FreeBSD kernel to support both Gentoo/Linux and Gentoo/FreeBSD. Add building of dell utilies based on dell USE flag so we don't have an automagical depend. 2 upstream fixes. One for duplicate acpi messages. One for a possible crasher. Package-Manager: portage-2.1.2.3 --- sys-apps/hal/ChangeLog | 14 ++++++- sys-apps/hal/Manifest | 38 +++++++++++------- .../02_acpi_repeated_property_change.patch | 39 +++++++++++++++++++ .../03_crasher_fix_fail_to_return_value.patch | 19 +++++++++ sys-apps/hal/files/0.5.9/series | 2 + sys-apps/hal/hal-0.5.9.ebuild | 33 +++++++++++++--- 6 files changed, 123 insertions(+), 22 deletions(-) create mode 100644 sys-apps/hal/files/0.5.9/02_acpi_repeated_property_change.patch create mode 100644 sys-apps/hal/files/0.5.9/03_crasher_fix_fail_to_return_value.patch diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index e2bb17d157c0..0d97cd03a4e3 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,18 @@ # 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.145 2007/04/05 02:18:28 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.146 2007/04/05 17:29:55 cardoe Exp $ + + 05 Apr 2007; Doug Goldstein + +files/0.5.9/02_acpi_repeated_property_change.patch, + +files/0.5.9/03_crasher_fix_fail_to_return_value.patch, + files/0.5.9/series, hal-0.5.9.ebuild: + Re-work acpi USE flag usage. Add pam USE flag for sys-auth/consolekit. + Remove mactel USE flag since it will auto build and that's how it should. + Added linux-sources depend on having a Linux kernel. Check for Linux or + FreeBSD kernel to support both Gentoo/Linux and Gentoo/FreeBSD. Add building + of dell utilies based on dell USE flag so we don't have an automagical + depend. 2 upstream fixes. One for duplicate acpi messages. One for a + possible crasher. 05 Apr 2007; Doug Goldstein +files/0.5.9-hald.rc, +files/0.5.9/series, -files/hald, hal-0.5.9.ebuild: diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index a457a8ad01d4..3367e7b65b09 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -13,10 +13,18 @@ AUX 0.5.9/01_luks_mount_fix.patch 2605 RMD160 00d6b01a0c96123ce6ee66d1762a00988c MD5 526e8c9b50700bca6340f6a0d73f1aa4 files/0.5.9/01_luks_mount_fix.patch 2605 RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 files/0.5.9/01_luks_mount_fix.patch 2605 SHA256 f1dfdd118055efbc97163273e0f3930f8badf2be3e4f1ca327654c221faa951e files/0.5.9/01_luks_mount_fix.patch 2605 -AUX 0.5.9/series 24 RMD160 12dfd75a9ba2f9c5bbaf5fad0b90e052f0464f17 SHA1 b6d6c3b3a3a1684ff3e12022257c550595171c6a SHA256 9a579045b0c76a53dce6842b5189b8d5399e17db370fa06a1e596f1a0906b3f5 -MD5 9723afa558e74a4f64a7b68f864b3336 files/0.5.9/series 24 -RMD160 12dfd75a9ba2f9c5bbaf5fad0b90e052f0464f17 files/0.5.9/series 24 -SHA256 9a579045b0c76a53dce6842b5189b8d5399e17db370fa06a1e596f1a0906b3f5 files/0.5.9/series 24 +AUX 0.5.9/02_acpi_repeated_property_change.patch 1562 RMD160 8243ebff1f2e2cba8317fdc9816f635ddcc715ca SHA1 99a28ceda34d88f41c3be147c684fac4c648ccd5 SHA256 cf452140904d9972ff7daa515afab465f0726d0852f907b77d349a8a8884e1bf +MD5 4f6b54421b81124805a69fb71aa50004 files/0.5.9/02_acpi_repeated_property_change.patch 1562 +RMD160 8243ebff1f2e2cba8317fdc9816f635ddcc715ca files/0.5.9/02_acpi_repeated_property_change.patch 1562 +SHA256 cf452140904d9972ff7daa515afab465f0726d0852f907b77d349a8a8884e1bf files/0.5.9/02_acpi_repeated_property_change.patch 1562 +AUX 0.5.9/03_crasher_fix_fail_to_return_value.patch 759 RMD160 02095de1648ed581202f9d5e3f697b007ebb7154 SHA1 5c0be328f55f343b61b834114f942913808fd9d4 SHA256 f6b8821c89bf2063a0cabc6d67a051e476960e17d510f9e688132b727a5e6e92 +MD5 801a95446b348b13ba7d34c96c0c4c74 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759 +RMD160 02095de1648ed581202f9d5e3f697b007ebb7154 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759 +SHA256 f6b8821c89bf2063a0cabc6d67a051e476960e17d510f9e688132b727a5e6e92 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759 +AUX 0.5.9/series 105 RMD160 60017746422b9c0f815fb433957951388d324460 SHA1 a07d13b05b96cbc6b18d2a84acbc440c66cc10e0 SHA256 dadf5c7e7319f45624a911d73f06099155b462d8b3cd63f1db6ebc2c366d45f6 +MD5 27b18ac60f14ac1aff58bf9e39f17807 files/0.5.9/series 105 +RMD160 60017746422b9c0f815fb433957951388d324460 files/0.5.9/series 105 +SHA256 dadf5c7e7319f45624a911d73f06099155b462d8b3cd63f1db6ebc2c366d45f6 files/0.5.9/series 105 AUX fix-scsi-fake-host-event.patch 3108 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea SHA1 af1d5c9a2cde091bd7abe04ed5e91a4bb815b675 SHA256 199749c188e5fb4858e4c1dac8800525377daf6a680dcd13e7096e71266ed05d MD5 3b6df9a24978d931781dc029c85288a9 files/fix-scsi-fake-host-event.patch 3108 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea files/fix-scsi-fake-host-event.patch 3108 @@ -131,14 +139,14 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498 MD5 709ca20b11819f2e13e381be47e19535 hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498e hal-0.5.7.1-r5.ebuild 6426 SHA256 6e020d3a29d82b993984f58ab8ef3659d837c11bce25f3ad25df6f4748e11207 hal-0.5.7.1-r5.ebuild 6426 -EBUILD hal-0.5.9.ebuild 5215 RMD160 4a4a35016052cf78ccfff56ac05878c117335669 SHA1 601759fcc3f4c5a05e61db46b6430e7aa7c58a28 SHA256 14eee6f575e35b1133648981e292da1c1c7976c474b3fdb71619f8cee34ab0d9 -MD5 17834cfcca0c1c34ea2177c0a22ee0bf hal-0.5.9.ebuild 5215 -RMD160 4a4a35016052cf78ccfff56ac05878c117335669 hal-0.5.9.ebuild 5215 -SHA256 14eee6f575e35b1133648981e292da1c1c7976c474b3fdb71619f8cee34ab0d9 hal-0.5.9.ebuild 5215 -MISC ChangeLog 22702 RMD160 f394e484635d5d62db13728218a64ffe0582646e SHA1 401901fde44b316b212f09035875ffb8dc5233fc SHA256 42721118c9f615531406ea007ea2e6e927cc39f162bbc9a49be4c0b3e2353b23 -MD5 a894505dd246ea5977b0c2baf47cf997 ChangeLog 22702 -RMD160 f394e484635d5d62db13728218a64ffe0582646e ChangeLog 22702 -SHA256 42721118c9f615531406ea007ea2e6e927cc39f162bbc9a49be4c0b3e2353b23 ChangeLog 22702 +EBUILD hal-0.5.9.ebuild 5636 RMD160 66d488627003579845c36c105d24e82f03a9f0bc SHA1 f0d045951423128c7e05f82d22a550bcda57e25b SHA256 00a789c73117b4791f1f8309b34e09d5e981413176f214bc1a1c9795ace1bab2 +MD5 27b3916c2aa70f93cadf985999a29afe hal-0.5.9.ebuild 5636 +RMD160 66d488627003579845c36c105d24e82f03a9f0bc hal-0.5.9.ebuild 5636 +SHA256 00a789c73117b4791f1f8309b34e09d5e981413176f214bc1a1c9795ace1bab2 hal-0.5.9.ebuild 5636 +MISC ChangeLog 23372 RMD160 0f737edbc558ec12d9a6d745182bb9f3ba839f0a SHA1 791acc921e51256213f3875d50307758380cc564 SHA256 83a5620c3122ae3d41dcb60ef516583bb2e504bbbc1af77473ecea3242bef459 +MD5 296bd65e71908fab77c8b8a477beefa4 ChangeLog 23372 +RMD160 0f737edbc558ec12d9a6d745182bb9f3ba839f0a ChangeLog 23372 +SHA256 83a5620c3122ae3d41dcb60ef516583bb2e504bbbc1af77473ecea3242bef459 ChangeLog 23372 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345 @@ -155,7 +163,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGFFx9oeSe8B0zEfwRAogGAKCIM/OIwj6eCFAj3mGEYZZ97XyX3gCfb3ur -b6oga7nVWRJALYE0ylQts8Y= -=NDjf +iD8DBQFGFTIVoeSe8B0zEfwRArtMAJ9oEKwNdSZlk9Te6hxlYj54kFXxXQCdE70i +9+1O1Aqa9x4548WJQAXuMRU= +=pI41 -----END PGP SIGNATURE----- diff --git a/sys-apps/hal/files/0.5.9/02_acpi_repeated_property_change.patch b/sys-apps/hal/files/0.5.9/02_acpi_repeated_property_change.patch new file mode 100644 index 000000000000..69d415af04be --- /dev/null +++ b/sys-apps/hal/files/0.5.9/02_acpi_repeated_property_change.patch @@ -0,0 +1,39 @@ +From: Danny Kukawka +Date: Wed, 4 Apr 2007 22:48:10 +0000 (-0400) +Subject: fix problem with repeated property-changed signals +X-Git-Tag: HAL_0_2 +X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=3ede8e2ce38e48ba7c292ed17d348f6e810db2c1 + +fix problem with repeated property-changed signals + +> On Mittwoch, 4. April 2007, Richard Hughes wrote: +> > With git I'm getting the following when I remove AC: +> > +> > 15:56:02.865: acpi_ACAD property ac_adapter.present = false +> > 15:56:03.041: acpi_ACAD property ac_adapter.present = false +> > 15:56:03.048: acpi_BAT1 property battery.charge_level.percentage = 96 +> > (0x60) 15:56:03.051: acpi_BAT1 property battery.charge_level.percentage = +> > 96 (0x60) +> > +> > acpi_listen seems to think that there is one event from either device, +> > so I'm unsure what the problem is here. +> +> I can confirm this, I take a look at the problem. It is IMO something in +> the acpi code, could not see this atm for other devices. + +This is a general problem. The signal for device_property_changed is listed +twice in hald.c in function hald_get_gdl(). +--- + +--- a/hald/hald.c ++++ b/hald/hald.c +@@ -203,9 +203,6 @@ hald_get_gdl (void) + "device_capability_added", + G_CALLBACK (gdl_capability_added), NULL); + g_signal_connect (global_device_list, +- "device_property_changed", +- G_CALLBACK (gdl_property_changed), NULL); +- g_signal_connect (global_device_list, + "device_lock_acquired", + G_CALLBACK (gdl_lock_acquired), NULL); + g_signal_connect (global_device_list, diff --git a/sys-apps/hal/files/0.5.9/03_crasher_fix_fail_to_return_value.patch b/sys-apps/hal/files/0.5.9/03_crasher_fix_fail_to_return_value.patch new file mode 100644 index 000000000000..ec08b92b0224 --- /dev/null +++ b/sys-apps/hal/files/0.5.9/03_crasher_fix_fail_to_return_value.patch @@ -0,0 +1,19 @@ +From: David Zeuthen +Date: Thu, 5 Apr 2007 05:04:53 +0000 (-0400) +Subject: fix a potential crasher +X-Git-Tag: HAL_0_2 +X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=7ce45a77001031a0d7777d7e1e5269256791b6f1 + +fix a potential crasher +--- + +--- a/hald/hald_dbus.c ++++ b/hald/hald_dbus.c +@@ -2161,6 +2161,7 @@ device_is_caller_locked_out (DBusConnect + /* only allow HAL helpers / privileged users to ask this question */ + if (!local_interface && !access_check_message_caller_is_root_or_hal (ci_tracker, message)) { + raise_permission_denied (connection, message, "IsCallerLockedOut: not privileged"); ++ return DBUS_HANDLER_RESULT_HANDLED; + } + + dbus_error_init (&error); diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series index c1fdfb94d58c..7bf644648466 100644 --- a/sys-apps/hal/files/0.5.9/series +++ b/sys-apps/hal/files/0.5.9/series @@ -1 +1,3 @@ 01_luks_mount_fix.patch +02_acpi_repeated_property_change.patch +03_crasher_fix_fail_to_return_value.patch diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild index 413e9e833ad7..19fb0767813e 100644 --- a/sys-apps/hal/hal-0.5.9.ebuild +++ b/sys-apps/hal/hal-0.5.9.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.3 2007/04/05 02:18:28 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.4 2007/04/05 17:29:55 cardoe Exp $ inherit eutils linux-info autotools flag-o-matic @@ -11,13 +11,13 @@ 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" -IUSE="acpi crypt debug dell disk-partition doc mactel pcmcia selinux" +IUSE="acpi crypt debug dell disk-partition doc pam pcmcia selinux" RDEPEND=">=dev-libs/glib-2.6 >=dev-libs/dbus-glib-0.61 >=sys-fs/udev-104 >=sys-apps/util-linux-2.12r-r1 - >=sys-kernel/linux-headers-2.6.17 + kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 ) >=dev-libs/expat-1.95.8 >=sys-apps/pciutils-2.2.3 >=dev-libs/libusb-0.1.10a @@ -28,7 +28,8 @@ RDEPEND=">=dev-libs/glib-2.6 dell? ( >=sys-libs/libsmbios-0.13.4 ) disk-partition? ( >=sys-apps/parted-1.7.1 ) crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) - selinux? ( sys-libs/libselinux )" + selinux? ( sys-libs/libselinux ) + pam? ( sys-auth/consolekit )" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -92,23 +93,43 @@ src_unpack() { } src_compile() { + local backend="" + local acpi="" + # TODO :: policykit should have a pam useflag append-flags -rdynamic + if use kernel_linux ; then + backend="linux" + elif use kernel_FreeBSD ; then + backend="freebsd" + else + eerror "Invalid backend" + fi + + if use acpi ; then + acpi="--enable-acpi-toshiba --enable-acpi-ibm" + else + acpi="--disable-acpi-proc --disable-acpi-acpid" + fi + econf --disable-policy-kit \ --with-doc-dir=/usr/share/doc/${PF} \ --with-os-type=gentoo \ --with-pid-file=/var/run/hald.pid \ --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 acpi acpi-proc) \ $(use_enable doc docbook-docs) \ $(use_enable doc doxygen-docs) \ - $(use_with mactel macbookpro) \ $(use_enable selinux) \ + $(use_enable pam console-kit) \ + ${acpi} \ || die "configure failed" emake || die "make failed" -- 2.26.2