diff options
| -rw-r--r-- | sys-power/nut/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-power/nut/Manifest | 4 | ||||
| -rw-r--r-- | sys-power/nut/nut-2.2.2.ebuild | 18 |
3 files changed, 22 insertions, 5 deletions
diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog index 6d3af9aa9caf..43c5a995d4c7 100644 --- a/sys-power/nut/ChangeLog +++ b/sys-power/nut/ChangeLog @@ -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@gentoo.org> nut-2.2.2.ebuild: + Bug #229345 - do not bother with the CGI files unless USE=cgi. 05 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +files/nut-2.2.2-no-libdummy.patch, nut-2.2.2.ebuild: diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest index 8b54635afc40..0aaa3efdb93e 100644 --- a/sys-power/nut/Manifest +++ b/sys-power/nut/Manifest @@ -16,6 +16,6 @@ DIST nut-2.2.2.tar.gz 1184406 RMD160 4dc1d2b729fc0e02c0475008c44bc62e1901f705 SH EBUILD nut-2.0.5-r2.ebuild 5267 RMD160 f362f6a45271e42790628cd7b5713f64c3901feb SHA1 007caacbb0b61fc2c1a73eb0e3abde8720b0d311 SHA256 025dda38a95e65de8b32c0a329fba2325196cb0fd007a5ff670ab467a8479717 EBUILD nut-2.2.0.ebuild 5571 RMD160 c33ecc31fb43183cb756f6220b41f772da4dc61d SHA1 7c38071303ffaaeefbe6c8540ebcfc4b63e05c3c SHA256 4a2add25611a7f3689c62bbaee92b0445f45abcb4d179d5192f0c893bc513766 EBUILD nut-2.2.1.ebuild 5875 RMD160 05852fcbf41fa9f865a501eaab1a95fb2003d0a8 SHA1 3d093f2dbbe65888137abbfd508473289e2d9a13 SHA256 12355204b83d33f420905d28454d80f6c85d361060ad49d9a3d058ebbd7f6652 -EBUILD nut-2.2.2.ebuild 6151 RMD160 e0f47ff470ad675ddaf1f256f70080f8bd4cfea6 SHA1 0394ffcd8f22c10803cc62d82f9111134a0cc439 SHA256 8d84f46ce7208e647ed94c4dac2528b196d98b2165136306431a5e91b794e0e5 -MISC ChangeLog 15663 RMD160 223ffcab72bf2c0f50c81ccc0e0596be04702c2f SHA1 3ce44707ec3d29557c9a1934ed49ee1d7e36746c SHA256 a47318b9242509827d09e90db5445da7ae2873f9e75b0a818589322e8c3f6404 +EBUILD nut-2.2.2.ebuild 6646 RMD160 aa590229685531edbeba6ad28d8b8662ef95c49d SHA1 d8002fc4f15b4e722cc48c8736d04449d14dbc05 SHA256 815487f12f063fa1c841a669a26b0d4d533899e91bb470aa4eeeb92bd8d83258 +MISC ChangeLog 15800 RMD160 49179b50a5b444569e697fcb627452842686ccd5 SHA1 b4dddf226cd07d40d44b102859c3ff1de2ac87ac SHA256 8f3612755aacacac25b76218f1fcdbe565ef13fb51600feb4f8a588aa20025f7 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b diff --git a/sys-power/nut/nut-2.2.2.ebuild b/sys-power/nut/nut-2.2.2.ebuild index efac2ac7c3f7..6a23faaf0439 100644 --- a/sys-power/nut/nut-2.2.2.ebuild +++ b/sys-power/nut/nut-2.2.2.ebuild @@ -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 @@ -151,6 +153,12 @@ src_install() { # Do not remove eval here, because the variables contain shell expansions. 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 @@ -183,6 +191,12 @@ pkg_postinst() { # Do not remove eval here, because the variables contain shell expansions. 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 } |