Bug #313883: version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index ccd573e13b8f4cff8b5fb36ea59ab2d3403e3b28..159dffc8dd022a3f2e941872ffac010efe0d0998 100644 (file)
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.71 2010/01/10 14:22:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.72 2010/05/02 22:50:51 robbat2 Exp $
+
+*nut-2.4.3 (02 May 2010)
+
+  02 May 2010; Robin H. Johnson <robbat2@gentoo.org> +nut-2.4.3.ebuild:
+  Bug #313883: version bump.
 
   10 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> nut-2.4.1-r2.ebuild:
   Fix obvious typo.

diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 7999f701c7b1bd1b22267a9dbaa2227f4fc11641..fdf0f794c86e59085554e0aea752c7b3d82ef210 100644 (file)
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX lighttpd_nut.conf 961 RMD160 636b45860713453dc88d7ed0392862735e329099 SHA1 1cde03638637f3b2e302ae939605f2f2b7f464fd SHA256 5604058313d3cfeba426c69a756944bc7cc3ddb3813db68582e69dff1a00f7cb
 AUX lighttpd_nut.conf-2.2.0 971 RMD160 745f65fac2b33e0f2baef7213c2d745c4ebb3dd5 SHA1 62f0bc9d331728023382befb3fc395dc71db032d SHA256 f0b1b3e574766557dbf92704eb4cf81b166bb4db68ddecee581cb8b0b6638f65
 AUX nut-2.0.5-bcmxcp-3phase.patch 2983 RMD160 f27271648742d96952902e27b83e4b5ed39067e7 SHA1 5c87466ddfed6455989871c14d77c488a4e75a58 SHA256 1ce3938251c834e8ea31850635c085ff7f4785d268d2257f4e1c05e8732056ee
@@ -17,17 +14,12 @@ AUX upsstats-upsset-link-2.0.5.patch 625 RMD160 69253155db06c10ea4f8c5b0dd4c6638
 DIST nut-2.0.5.tar.gz 809006 RMD160 e5f90a73932e038d3dfee8cb32faf097d99a7e0b SHA1 d2c07adeac524b8463677c756a90f2f22084f35e SHA256 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203
 DIST nut-2.2.2.tar.gz 1184406 RMD160 4dc1d2b729fc0e02c0475008c44bc62e1901f705 SHA1 f54cc909b229931fb91b4a360f0447b539d4ea6b SHA256 599d0024bcc116137a3eb65030d3dbc7132a64f30a7717f76a8254d8543422eb
 DIST nut-2.4.1.tar.gz 1121152 RMD160 d046a711fb8f94b1a3652dea774d201684292272 SHA1 c8e999da718cfe14211977c19dd9b055cfc6fada SHA256 9e2441e1a7046627715cfe78e22f82f7bb05bf380735f803731b64e06bd19f3c
+DIST nut-2.4.3.tar.gz 1154503 RMD160 6ec6bba67ab2caa761e7b3299e047bc49b85cebd SHA1 3a09b09c03df7e8b12f70576fd703e65d1cf7b06 SHA256 d3b701f21f1e049abb5df94ee9805fce86fe57a876c3bb41217558a846a49335
 EBUILD nut-2.0.5-r2.ebuild 5261 RMD160 b2bd160f2a5b615ad7218ea60594c52e8946ae52 SHA1 cc41c4837f1f2fbd81aad43a72e40a7166b1bd86 SHA256 e62d7f16fe85f7bbff8cb87337d0d26053a70f5fe8b3933889f1ed826e5ddf62
 EBUILD nut-2.2.2.ebuild 6453 RMD160 37794ec27c8815d615ad7ba008af8cfcfdd64cf1 SHA1 7f83bbe2770c7f22832d9bc2dae099c8e1dd36ac SHA256 480e53b6a44b88dcffa1870990074cc7a6e27682faf23a2a21b10a15e0525808
 EBUILD nut-2.4.1-r1.ebuild 6721 RMD160 2a3cdc459357af9be1e20a0df95e80f0a647bdc0 SHA1 2997300833089cfc1d9524dd337fbf2bad73b176 SHA256 aedd646df733a2fd5e3ba95727496bc58e084e5346cb835fcc74631d24618527
 EBUILD nut-2.4.1-r2.ebuild 7211 RMD160 9cbd432a8ec3369a7b7767d6d12f4df42a801062 SHA1 717919fd733ebf52c433edaa9edd411a6413ecaa SHA256 022a8468e93f50029540a09a049784e022530a2816fdcccbfd72983255a93aae
 EBUILD nut-2.4.1.ebuild 6664 RMD160 b9ace7b62a6775df4187e4d9ae62e75ac9837811 SHA1 0d0ee71999aabf92086d4cd914f61914ea1ed9c0 SHA256 1573c28d84e120113605c06030d72ae3bf0eb1651ad53b02bdffa49fa703d7da
-MISC ChangeLog 17740 RMD160 03d9e7c02a8aee5a3184dde2b447dec8b2cb7a2d SHA1 4bed40e6cdb9815b015c83b337b198f698227170 SHA256 005401804b23acf5316c04f82e8f50c8aaa970720ff6fa90ff7afc3c56b8979e
+EBUILD nut-2.4.3.ebuild 7274 RMD160 647de44925715507ac0187f29b03510c08a84a0a SHA1 7c3be9690415799144bfe5dd9a0eff0ade3f91ac SHA256 357d0bd23241e99e567f96825709f8b11b564de92f6c6c95ea58ac6e4513e485
+MISC ChangeLog 17866 RMD160 dc3367a4023e1d92897d062f4b808dd3a121db5b SHA1 66d62aac364a2d2a92d9491bf24606d876305675 SHA256 dd32635e65ba94fdf52ee4b9ee26cec9d88b50da461b5f778635b376e54cac48
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktJ4pcACgkQAiZjviIA2Xg7ZQCgwtNZE5MXfi8xB29ASz+Q7Apa
-XKAAoMQ3pvwjE8p/nGuphORBviA4zpag
-=QIhZ
------END PGP SIGNATURE-----

diff --git a/sys-power/nut/nut-2.4.3.ebuild b/sys-power/nut/nut-2.4.3.ebuild
new file mode 100644 (file)
index 0000000..86972ca
--- /dev/null
+++ b/sys-power/nut/nut-2.4.3.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.4.3.ebuild,v 1.1 2010/05/02 22:50:51 robbat2 Exp $
+
+EAPI="2"
+
+inherit eutils fixheadtails autotools bash-completion
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="http://www.networkupstools.org/"
+# Nut mirrors are presently broken
+SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
+         http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="cgi snmp usb ssl hal xml"
+
+RDEPEND="cgi? ( >=media-libs/gd-2[png] )
+               snmp? ( net-analyzer/net-snmp )
+               usb? ( =virtual/libusb-0* )
+               hal? ( >=sys-apps/hal-0.5.11 )
+               ssl? ( dev-libs/openssl )
+               xml? ( >=net-misc/neon-0.25.0 )
+               >=sys-fs/udev-114"
+DEPEND="$RDEPEND
+               >=sys-apps/sed-4
+               >=sys-devel/autoconf-2.58
+               dev-util/pkgconfig"
+
+# public files should be 644 root:root
+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() {
+       enewgroup nut 84
+       enewuser nut 84 -1 /var/lib/nut nut,uucp
+       # As of udev-104, NUT must be in uucp and NOT in tty.
+       gpasswd -d nut tty 2>/dev/null
+       gpasswd -a nut uucp 2>/dev/null
+       use hal && gpasswd -a haldaemon nut 2>/dev/null
+       # in some cases on old systems it wasn't in the nut group either!
+       gpasswd -a nut nut 2>/dev/null
+       warningmsg ewarn
+}
+
+src_prepare() {
+       ht_fix_file configure.in
+
+       epatch "${FILESDIR}"/${PN}-2.4.1-no-libdummy.patch
+
+       sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+               -i configure.in || die "sed failed"
+
+       sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+               -i scripts/udev/Makefile.am || die "sed failed"
+
+       rm -f ltmain.sh m4/lt* m4/libtool.m4
+
+       WANT_AUTOCONF=2.5 eautoreconf || die "autoconf failed"
+}
+
+src_configure() {
+       local myconf
+
+       if [ -n "${NUT_DRIVERS}" ]; then
+               myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
+       fi
+
+       econf \
+               --with-user=nut \
+               --with-group=nut \
+               --with-drvpath=/lib/nut \
+               --sysconfdir=/etc/nut \
+               --with-logfacility=LOG_DAEMON \
+               --with-statepath=/var/lib/nut \
+               --with-htmlpath=/usr/share/nut/html \
+               --datarootdir=/usr/share/nut \
+               --datadir=/usr/share/nut \
+               --with-dev \
+               $(use_with xml neon) \
+               $(use_with hal) \
+               $(use_with ssl) \
+               $(use_with usb) \
+               $(use_with snmp) \
+               $(use_with cgi) \
+               $(use_with cgi cgipath /usr/share/nut/cgi) \
+               ${myconf} || die "econf failed"
+
+}
+
+src_install() {
+
+       emake DESTDIR="${D}" install || die "make install failed"
+
+       dodir /sbin
+       dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
+       # This needs to exist for the scripts
+       dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
+
+       if use cgi; then
+               elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
+               elog "copy them to your web server's ScriptPath to activate (this is a"
+               elog "change from the old location)."
+               elog "If you use lighttpd, see lighttpd_nut.conf in the documentation."
+       fi
+
+       # this must be done after all of the install phases
+       for i in "${D}"/etc/nut/*.sample ; do
+               mv "${i}" "${i/.sample/}"
+       done
+
+       dodoc ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING \
+                       docs/{FAQ,*.txt} || die
+
+       newdoc lib/README README.lib || die
+
+       newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die
+
+       docinto cables
+       dodoc docs/cables/* || die
+
+       newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsd upsd \
+               || die "newinitd failed"
+       newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv \
+               || die "newinitd failed"
+       newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsmon upsmon \
+               || die "newinitd failed"
+       newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail \
+               || die "newinitd failed"
+
+       # This sets up permissions for nut to access a UPS
+       insinto /etc/udev/rules.d/
+       newins scripts/udev/nut-usbups.rules 70-nut-usbups.rules
+
+       keepdir /var/lib/nut
+
+       einfo "Setting up permissions on files and directories"
+       fperms 0700 /var/lib/nut
+       fowners nut:nut /var/lib/nut
+
+       # Do not remove eval here, because the variables contain shell expansions.
+       eval fperms 0640 ${NUT_PRIVATE_FILES}
+       eval fowners root:nut ${NUT_PRIVATE_FILES}
+
+       # 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
+               einfo "Installing non-udev hotplug support"
+               insinto /etc/hotplug/usb
+               insopts -m 755
+               doins scripts/hotplug/nut-usbups.hotplug
+       fi
+
+       if use hal; then
+               einfo "Installing HAL support"
+               insinto /usr/share/hal/fdi/information/20thirdparty/
+               doins scripts/hal/20-ups-nut-device.fdi
+               insinto /usr/libexec
+               insopts -m 755
+               doins drivers/hald-addon-*
+               rm "${D}"/lib/nut/hald-addon-*
+       fi
+
+       dobashcompletion "${S}"/scripts/misc/nut.bash_completion
+}
+
+pkg_postinst() {
+       # this is to ensure that everybody that installed old versions still has
+       # correct permissions
+
+       chown nut:nut "${ROOT}"/var/lib/nut 2>/dev/null
+       chmod 0700 "${ROOT}"/var/lib/nut 2>/dev/null
+
+       # Do not remove eval here, because the variables contain shell expansions.
+       eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+       eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+
+       # 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
+}
+
+warningmsg() {
+       msgfunc="$1"
+       [ -z "$msgfunc" ] && die "msgfunc not specified in call to warningmsg!"
+       ${msgfunc} "Please note that NUT now runs under the 'nut' user."
+       ${msgfunc} "NUT is in the uucp group for access to RS-232 UPS."
+       ${msgfunc} "However if you use a USB UPS you may need to look at the udev or"
+       ${msgfunc} "hotplug rules that are installed, and alter them suitably."
+       ${msgfunc} ''
+       ${msgfunc} "If you use hald, you may be able to skip the normal init scripts."
+       ${msgfunc} ''
+       ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+       ${msgfunc} ''
+       ${msgfunc} "Please note that upsdrv is NOT automatically started by upsd anymore."
+       ${msgfunc} "If you have multiple UPS units, you can use their NUT names to"
+       ${msgfunc} "have a service per UPS:"
+       ${msgfunc} "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
+       ${msgfunc} ''
+       ${msgfunc} 'If you want apcupsd to power off your UPS when it'
+       ${msgfunc} 'shuts down your system in a power failure, you must'
+       ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
+       ${msgfunc} ''
+       ${msgfunc} 'rc-update add nut.powerfail shutdown'
+       ${msgfunc} ''
+
+}