From 79d6623fe5fd92dd219ce07ae7cb5e6a6e638c85 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 12 Apr 2007 16:43:50 +0000 Subject: [PATCH] haldaemon groups tweak for FreeBSD Package-Manager: portage-2.1.2.3 --- sys-apps/hal/ChangeLog | 5 ++++- sys-apps/hal/Manifest | 22 +++++++++++----------- sys-apps/hal/hal-0.5.9.ebuild | 19 +++++++++++++++---- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 69961e9c553b..4ab1cc059e65 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,9 @@ # 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.162 2007/04/12 16:13:00 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.163 2007/04/12 16:43:50 cardoe Exp $ + + 12 Apr 2007; Doug Goldstein hal-0.5.9.ebuild: + haldaemon groups tweak for FreeBSD 12 Apr 2007; Doug Goldstein files/0.5.9/05_freebsd_partutil_make_fix.patch, diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index b80319b7c00b..08b9a78242ce 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -167,14 +167,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 6397 RMD160 d71434cb5612aef6549b0795433c472d7e39d559 SHA1 77d79b0d30dbf13fbcf8ac6fe59dea0901b4195f SHA256 884ba549e9dceae7d7c702403f4ae53722741c6ccd0234f7362eb683ccee8563 -MD5 5d94a21cd2d6ea32f164ca10814ff5f0 hal-0.5.9.ebuild 6397 -RMD160 d71434cb5612aef6549b0795433c472d7e39d559 hal-0.5.9.ebuild 6397 -SHA256 884ba549e9dceae7d7c702403f4ae53722741c6ccd0234f7362eb683ccee8563 hal-0.5.9.ebuild 6397 -MISC ChangeLog 26013 RMD160 1c1d1cd06832aaf1320b77e90c238c8bf8d4beec SHA1 bad11c5add1669ecd6b9ef9994adcfde0f6c603b SHA256 4523b46c9cbbbd42b478a71861db5ed3f21138c7ad2f61a16258144c17091f58 -MD5 824b1687b71c2d2cbd10506968fceecb ChangeLog 26013 -RMD160 1c1d1cd06832aaf1320b77e90c238c8bf8d4beec ChangeLog 26013 -SHA256 4523b46c9cbbbd42b478a71861db5ed3f21138c7ad2f61a16258144c17091f58 ChangeLog 26013 +EBUILD hal-0.5.9.ebuild 6763 RMD160 440c42459fab10c43d90d4ae9357fe21ed635315 SHA1 a7f88f171ed5dcfa88472dede19bd244f61afd2a SHA256 d55f2c8f4056a4850bbf5b714f606293b89c7c4c7d1a38f72fb6cff4614b50ba +MD5 192292871d72fa19e6632c7c0f83ed58 hal-0.5.9.ebuild 6763 +RMD160 440c42459fab10c43d90d4ae9357fe21ed635315 hal-0.5.9.ebuild 6763 +SHA256 d55f2c8f4056a4850bbf5b714f606293b89c7c4c7d1a38f72fb6cff4614b50ba hal-0.5.9.ebuild 6763 +MISC ChangeLog 26119 RMD160 d46a42a39c4979579f5c55fc6fe64d973ee37a4b SHA1 fd2836e919a0dc3e70a8b5497d7f8063f63cda35 SHA256 6eaeea012bcd4edc6e7b3ec44d6c9c9806981a0721f209d1ff85bf9e67b1bfa6 +MD5 53e5fe6dd166b28863cb8bc3c2af142a ChangeLog 26119 +RMD160 d46a42a39c4979579f5c55fc6fe64d973ee37a4b ChangeLog 26119 +SHA256 6eaeea012bcd4edc6e7b3ec44d6c9c9806981a0721f209d1ff85bf9e67b1bfa6 ChangeLog 26119 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345 @@ -191,7 +191,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD4DBQFGHlq9oeSe8B0zEfwRAm/gAKCC+yxvaJEokNNWw30EUKua3dknPACYwUEj -R2AxUVh3CGdz3Dx+iPDLdw== -=IHGX +iD8DBQFGHmGtoeSe8B0zEfwRAsv8AJ99r7cTCrAo7xp27mMHSzAU4QZiGgCfe2/5 +9Tdwf7TreqcYfvudYQz+icM= +=zVxo -----END PGP SIGNATURE----- diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild index 160560625896..6dcda1417313 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.17 2007/04/12 16:13:00 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.18 2007/04/12 16:43:50 cardoe Exp $ inherit eutils linux-info autotools flag-o-matic @@ -43,7 +43,8 @@ DEPEND="${RDEPEND} PDEPEND="app-misc/hal-info" ## HAL Daemon drops privledges so we need group access to read disks -HALDAEMON_GROUPS="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb" +HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb" +HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator" function notify_uevent() { ewarn @@ -195,11 +196,21 @@ pkg_postinst() { # 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" + 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 - usermod -G ${HALDAEMON_GROUPS} haldaemon + if use kernel_linux; then + usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon + elif use kernel_FreeBSD; then + usermod -G ${HALDAEMON_GROUPS_FREEBSD} haldaemon + 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" -- 2.26.2