[gentoo-commits] gentoo-x86 commit in sys-power/nut: ChangeLog nut-2.2.2.ebuild

[Robin H. Johnson (robbat2)]

robbat2     08/07/05 03:22:15

  Modified:             ChangeLog nut-2.2.2.ebuild
  Log:
  Bug #229345 - do not bother with the CGI files unless USE=cgi.
  (Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)

Revision  Changes    Path
1.58                 sys-power/nut/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?r1=1.57&r2=1.58

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -p -w -b -B -u -u -r1.57 -r1.58
--- ChangeLog	5 Jul 2008 03:15:15 -0000	1.57
+++ ChangeLog	5 Jul 2008 03:22:14 -0000	1.58
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.57 2008/07/05 03:15:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.58 2008/07/05 03:22:14 robbat2 Exp $
+
+  05 Jul 2008; Robin H. Johnson <robbat2@g.o> nut-2.2.2.ebuild:
+  Bug #229345 - do not bother with the CGI files unless USE=cgi.
 
   05 Jul 2008; Robin H. Johnson <robbat2@g.o>
   +files/nut-2.2.2-no-libdummy.patch, nut-2.2.2.ebuild:



1.4                  sys-power/nut/nut-2.2.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?r1=1.3&r2=1.4

Index: nut-2.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -w -b -B -u -u -r1.3 -r1.4
--- nut-2.2.2.ebuild	5 Jul 2008 03:15:15 -0000	1.3
+++ nut-2.2.2.ebuild	5 Jul 2008 03:22:14 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.3 2008/07/05 03:15:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.4 2008/07/05 03:22:14 robbat2 Exp $
 
 inherit eutils fixheadtails autotools
 
@@ -30,9 +30,11 @@ DEPEND="$RDEPEND
 		>=sys-devel/autoconf-2.58"
 
 # public files should be 644 root:root
-NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.html}"
+NUT_PUBLIC_FILES="/etc/nut/{{ups,upssched}.conf}"
 # private files should be 640 root:nut - readable by nut, writeable by root,
 NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
+# public files should be 644 root:root, only installed if USE=cgi
+NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
 
 pkg_setup() {
 	if use cgi && ! built_with_use media-libs/gd png ; then
@@ -152,6 +154,12 @@ src_install() {
 	eval fperms 0644 ${NUT_PUBLIC_FILES}
 	eval fowners root:root ${NUT_PUBLIC_FILES}
 
+	# Do not remove eval here, because the variables contain shell expansions.
+	if use cgi; then
+		eval fperms 0644 ${NUT_CGI_FILES}
+		eval fowners root:root ${NUT_CGI_FILES}
+	fi
+
 	# this is installed for 2.4 and fbsd guys
 	if ! has_version sys-fs/udev; then
 		insinto /etc/hotplug/usb
@@ -184,6 +192,12 @@ pkg_postinst() {
 	eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
 	eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
 
+	# Do not remove eval here, because the variables contain shell expansions.
+	if use cgi; then
+		eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+		eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+	fi
+
 	warningmsg elog
 }
 



-- 
gentoo-commits@l.g.o mailing list