summaryrefslogtreecommitdiff
path: root/sysutils/hal
diff options
context:
space:
mode:
authorJean-Yves Lefort <jylefort@FreeBSD.org>2006-11-17 00:11:33 +0000
committerJean-Yves Lefort <jylefort@FreeBSD.org>2006-11-17 00:11:33 +0000
commit6f5f9cf50630aa532cea098e0f8f5e57b68eaa59 (patch)
treed2db07dff727a0368686027de92bfae5c1deb70d /sysutils/hal
parentUpgrade to JasperReports 1.2.8. (diff)
Revert the previous commit. It appears that the operator group is for
allowing to mount volumes etc while the wheel group is for allowing to su to root. Reported by: kris
Notes
Notes: svn path=/head/; revision=177406
Diffstat (limited to 'sysutils/hal')
-rw-r--r--sysutils/hal/Makefile4
-rw-r--r--sysutils/hal/files/patch-hal.conf.in17
2 files changed, 3 insertions, 18 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index f70ec4eeca9a..f778c22e63d5 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hal
PORTVERSION= ${HALVERSION}.${SNAPVERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= sysutils
MASTER_SITES= http://www.marcuscom.com/downloads/
@@ -97,6 +97,8 @@ post-patch:
${WRKSRC}/hald/Makefile.in
@${REINPLACE_CMD} -e '/^SUBDIRS/ s|txt||' \
${WRKSRC}/policy/Makefile.in
+ @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \
+ ${WRKSRC}/hal.conf.in
@${TOUCH} ${WRKSRC}/doc/spec/hal-spec.html
post-install:
diff --git a/sysutils/hal/files/patch-hal.conf.in b/sysutils/hal/files/patch-hal.conf.in
deleted file mode 100644
index 0c541b900d9b..000000000000
--- a/sysutils/hal/files/patch-hal.conf.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- hal.conf.in.orig Fri Apr 14 12:33:12 2006
-+++ hal.conf.in Thu Nov 16 20:47:25 2006
-@@ -42,7 +42,13 @@
- </policy>
-
- <!-- You can change this to a more suitable user, or make per-group -->
-- <policy user="0">
-+ <policy group="wheel">
-+ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+ <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+ <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
-+ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+ </policy>
-+ <policy group="operator">
- <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
- <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
- <allow send_interface="org.freedesktop.Hal.Device.Volume"/>