Bump.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 233 insertions, 25 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 25d855acb1a7..78cdb37d0533 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.104 2012/09/20 11:53:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.105 2012/10/16 02:01:53 robbat2 Exp $
+
+*nut-2.6.5 (16 Oct 2012)
+
+  16 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> +nut-2.6.5.ebuild:
+  Bump.
 
   20 Sep 2012; Kacper Kowalik <xarthisius@gentoo.org> nut-2.6.3.ebuild:
   ppc64 stable wrt #419377
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 9be59b39bf69..1ef073bde391 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX lighttpd_nut.conf-2.2.0 971 SHA256 f0b1b3e574766557dbf92704eb4cf81b166bb4db68ddecee581cb8b0b6638f65 SHA512 011ed0bc5fc66f7e7bb3d307cc3a548d6c424ce38a76cfe73b593e5be5a03e94e977b1539e5a96317f35662c41171528c98dd7bdab3cebc2a82cab804437ba26 WHIRLPOOL d221a8e6e64bcb578873d86b3ea1c6a6028649918799a5953e5175c141503f9d00aeeb4546820cd74af76fe99ce29070106621279abc711f2e8fd58aa659fc18
 AUX nut-2.2.2-init.d-upsd 790 SHA256 81b0b82850d528d682544b452599159510dd93ba43e2c6133d0c9aab0b4c0210 SHA512 fcc15f6c272842711bce1bf6af46cb9371722479da944a3c191be2ad36327f4d8b74d8f05b2a06dabc1de04817c61d9eb0842618d43e4501c5800d778fc9bd9d WHIRLPOOL 6a52d222d9f2f5347ad568d5a4ccef7cbee1c23c76ad7aadef252ca9b6f9f5d8cdfa991c915f7a2f1335a3f8fc38d50961854158824625fedcbce5930535192c
 AUX nut-2.2.2-init.d-upsdrv 979 SHA256 72f41864cef57aea0617f75cc6478c1c8cffc979e0e4136d179dcf665915fa0d SHA512 89b59ac77466cd52a30307c43aea099a90e96886edf8647dcc0e3bd37e1bf57297e14ce1564270ffb4c39e549e8f1338f3260e5c4bd6339dc0bb6b3b47184684 WHIRLPOOL 2abe2c1b7703bf6ef5333776aa4d7cc21b85af1a1ca0746b529e796492c54cac0c6680968027c51b316e96eb691c06c470f6f7ae1275ff469fa8708dd289c236
@@ -10,28 +7,13 @@ AUX nut-2.4.3-lowspeed-buffer-size.patch 725 SHA256 74ed963e039413472907ebdbba07
 AUX nut-2.6.2-lowspeed-buffer-size.patch 534 SHA256 77bc0f996d2eb9c3d7d0cf68f5053108df54a6ce6baf2d7b3edfd1f2cfafd41b SHA512 783a754871b55b40d745161c71bca851b5c6c8a72622d0b9ce17ef523e243ed41ff7bfbac33f19d8732b7a361b494fbf9f21669bac3816fe5f71a583e882a385 WHIRLPOOL 0dfcc0db960720a109cfe514be2559a88a500daeeefd304a8f69695607651e94c8387f8821b843bab0ce9eaf33f6d5ec8a09a425c1ed3fe44c6eb4ec3e9ef73b
 AUX nut-2.6.3-CVE-2012-2944.patch 736 SHA256 47101a0827cd3cb0eb119a79d58c26b2f065af2f44eaeae5139a85ef8cc83993 SHA512 00ff1cfd5fd60cf671df45f28da0adbfba2d9c2e48f05481abaff70d4a442196e75b8becc8d787cbd6710e7d5df3e09f1894a40cf70e4a1d3f41f32afefdfd3b WHIRLPOOL e9269a42cd940cfdaf85778fa9eaca9908228e52a7141e0a5325e3238ab222a9b26e28efbdd7b51c74b30299b255b196ab0552c3d32e46e7c19b5da1e60aba13
 AUX nut.powerfail.initd 1395 SHA256 3ef933724169dbe08645fed19674a1576ced5f54a88985b5b32baf2a9c178ae7 SHA512 2c7bdb0f4ada8014a09bc21205cafa49496950c49f3bfed6b21fe7e400b818024e5fbd402c0bccca5bc4624606cb52b10f87b0074a4d7372e1b67976d5ca68f9 WHIRLPOOL 7163a0b0203b9d96e4317468bd2f2f7af41fb755a7312afdbe58dadce9cb8fc78b716ca35a19fc8160159fc5376d0bb779c4d3a31d1e72abf5026ddef749c4d1
-DIST nut-2.6.0.tar.gz 1703273 SHA256 febaa230b6b5f0ad27d780851047527d36c8c7a34e557b3832d6d55174d7a0d5
-DIST nut-2.6.2.tar.gz 1897691 SHA256 343554add0713348f8b09bca8d83eee2eb2ae8bad9cdad9a39e0f0e2d0f5d375
-DIST nut-2.6.3.tar.gz 1952115 SHA256 34913b729d2032faaf6f31e800a400bcd874f1f4daacae6fe0d388bd235b633a
+DIST nut-2.6.0.tar.gz 1703273 SHA256 febaa230b6b5f0ad27d780851047527d36c8c7a34e557b3832d6d55174d7a0d5 SHA512 82bf03ef01931c819d550babed48806a45411083bc0a79d1e10e44ec798fb07032e0f8eda409ddd591faf4506955bd98656afc97bc6d357276de70d0ce15b775 WHIRLPOOL e7da975a7c1eafd3b9d7e90456b6924ded74e9576746a91e3692b9e58dfa24878567596fa850776a88542673a35098cc0b22ca79ec3c597dccf03ee2119c001c
+DIST nut-2.6.2.tar.gz 1897691 SHA256 343554add0713348f8b09bca8d83eee2eb2ae8bad9cdad9a39e0f0e2d0f5d375 SHA512 848dfb9e1aebdab47a9892e4f2c5cba7afb87f422b7edcf5d4c8843dda917edf86d8f747ff655b2026635eb803d09c4d393b212279907e371308d3efe7bd8145 WHIRLPOOL 8beb421f168f546bfa1a763db411074dbd5ab8da8638d33c9ee0106f9102332c8ac5c8beeda0f71d5dfe89e09e0f651a4bc8d3a49e2f2177fb4c935d23bb8e68
+DIST nut-2.6.3.tar.gz 1952115 SHA256 34913b729d2032faaf6f31e800a400bcd874f1f4daacae6fe0d388bd235b633a SHA512 8f6fede6c8891e9f4844cb8a82301334a33b31e832effec7f83ed756e1b263e103503f5a0178a588b29df5bc2a6eb6b6d42121cfb839c16f082ffd901788fdd4 WHIRLPOOL a6e96419b604027aa89b67d2a13dd4690185dc16cc378383a66e7a1ee72b6d35f192d39b0f71c20e284ccd449729410667c485bf0e8f5b8dc9a1e0eb83c22e78
+DIST nut-2.6.5.tar.gz 2038832 SHA256 618df71cf1ca6e3700d1d3c282773a2dec85f9f20324c0d3234c824e97feb93f SHA512 f1c76e6280057dc558d53451e7de2bdc7f37a0f175b1c52c27e7dcb83deeb78f6885007ad188a7a3a19e411eba87e03eb2246310bd7a5a5bb6fa3ad2bebd49d8 WHIRLPOOL 2b189f77d18d26303c60f2c084796075b0a50b8aa9cbefc3ba9a83f037450ffc3ecdb289367435e784a6bbe8569f768a97130a1ccdf123e53f13e0cf8813fb9a
 EBUILD nut-2.6.0-r1.ebuild 6852 SHA256 efc91a3a32232f0321885f90ad84e051d09840dca206ed86800b66e5c6358d24 SHA512 dc0feeb83434f41edb81fb4d691b1ddfc784041ed5d025445b1636ef9d3918a282ee052be0b8111ca23cbc68639b3386d1761afed6d1e6f7ebc6bd8ae673b49f WHIRLPOOL 5910685f168e6eddd02ec83ff3e6c5a6b9de61302f4323bc01c86e36ef7f697c29ab93d61fe78a555b84807d6021134e853c26086c2c3a81bca21ed2cfa31fba
 EBUILD nut-2.6.2.ebuild 6853 SHA256 1b662ca6184da533d8c21e919ed6cb1afda945c2af822972fd9d9acd6ad4452f SHA512 60ede20d682bf6c3e68a8b6369d1ecaad6aff57452b5c08e3168dac97e2bc21dee77e905de0a6666de50b98b9819925006a15fe3239abd3dbd4e070b02ef31c3 WHIRLPOOL c6848a52239964a49be1453476014aec65edfccb43ec71e9505b711ff537645433d726846cf5b33176ead3e182adee20cfd4c678a90ba438cbc9132f15bd70a0
 EBUILD nut-2.6.3.ebuild 6965 SHA256 6cf842e562da9ae20424424f68bf75561d4de261a0c66614d04f93479639ea7c SHA512 f39182aa6eadd14c84217a533f94f57378fe198bec046576ca732a8848ff6189544aafb96904451e388cc046c6d9d7cdda284a4246732d6b8419b56ac8103dc4 WHIRLPOOL 420747828a50ce8a977e4d0ffbbe374831287fa3b65ff7fa224df342c9fd71597c4e84373c7890ebfab06d9e398966d89f8b20d8fc2e8574d626d6bec3612511
-MISC ChangeLog 22131 SHA256 c53abcdec9adc5887db58e0b7a3db5e3c4c3c76bbf3d9aae3a5ad654dd81f2e8 SHA512 20849180a15016b4b24ce93c1c420fbaa4600c806e9ee5e7cb431567039c49714e40395425c9372784c292540360f0d3bf9eafb095849c8c910a83119349851b WHIRLPOOL cd5d81824716de6d0fe157b5dbca87b0bd5854ed2fea08200f38e46cb3a8849a1815230d484607b924657f73ba7922cca9bcda1f6d0da46afd6b57080a5e9573
+EBUILD nut-2.6.5.ebuild 6967 SHA256 a4add8397e8d84a708071bc8d7ae8ddcf5185622583a268b47b0a33a37f9894a SHA512 4fc761bcbc2753cc1adab555d6b5f862f427830f603e69c6effda7eb9639a9b59aaa7f824236cb0656fd258cf9c8f90fe30232fe9c19264c1fe4eabde708bb3b WHIRLPOOL eccd09e8f7c2b6c388e860056c7047f295fbb1838920886b4d78071146274331e19cd2d703c0116f34b998372ceccaeb5bd28b4ac7bdb63dc3bcdbf06627b7b8
+MISC ChangeLog 22235 SHA256 61606ab21590bc389e663a805edc35d538751229239f3b299eac385a4cb63e3a SHA512 64165f4e02c29bfc50eea8ced86eee7ae9242175d009cf1634836293d0a9d4dc35bb0715c04e62e3a05ce392b8a0166b8ee8b81e45fa69e63164c662166978fa WHIRLPOOL 90fa4e6fe1ba58e0e3aab834874c5946ee65359cc99575ee7d393a69e5e8e04174850676f5d718ac7b82edc610d87ecb3e1b5d7e796b1dd81cc8e19a1ba801ba
 MISC metadata.xml 242 SHA256 e82b2cc8fc830e2925c899d4b88c444b0b52e2de9f1bc28d5e08b545a195854f SHA512 43e74caad0e70954140d742d8718761d443f01372a159b54a5af5f677f8a9bf5af83cbdc351d62b4d9eed8f60e440d32bab76c0694da29c5eabaeb4142b14cd3 WHIRLPOOL ecccd3ae24c1bf48abcfbbe9dd33f3886f51b35c968e38e0d2e94055ecef43104594b8312ec3c864483e8ab9bfdb217ad2d02f40652b07acb5f1134d9fc09555
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQWwPrAAoJEF0huFKJUZL52cMP/Rio4qGEZVvNvHM9pu1QeOUS
-KeUXDqaoHwWPorVltSjNjmZ/3HwSyi8TSiBwLFjPVsNZaE10upKsP7USFcw13mey
-mE3e2hNUIoOwVllJ/FEvClPnRQH2/0lbXuBX54mrpL1NSCU+BlG7jtAfXqmXmbb4
-ZmqG2+bBUFci9mJLhkSh3xVNqEM8zcqFQE7n+aV09LBXxUqth0MIpq/vbsBbkt35
-MilIGHPY5U0cykg0DHBdIDbFreKK4I2y3UsCs22sC6+4g9FdZdtG7DQ6LAi5064Z
-uyzuzfB8Yeb8W+cO7OVbXY4k1sBdkDJq4n1SrVzvYmF9tsItvdJmEkKBiRV+x4mY
-lS2qGqVxTlsSH4D0xteBkeizjOCY9Vxx+3LBkB/u/POucKws3bnx4MOZfulch4Oc
-9wNcEIED2ZcTyL564JFvHX9JFUt3qAJseUwGtKa0UZmdRNJimiZgzBBHgzO9ZjoX
-wkzh+kutrQcq6UkiPE4DUNe6zOokcPIKzn+m5i2g7mFm7MpcO8PHDG/H6Hk/eAcS
-9hXBH1Z1/awyYYS9ZOpwBUfN2XnKtlCKHZ6JzBhQ48hEQDGNrEze3OuV6zRMjm6z
-ORK8Xrjd4UcXyd+AB9GXoOKawiZsC5q4+E3HfoHMtomYQJBQ9Ff8vYatzY72JeT9
-DJRGkkuBTPM5R5qMEMht
-=cQom
------END PGP SIGNATURE-----
diff --git a/sys-power/nut/nut-2.6.5.ebuild b/sys-power/nut/nut-2.6.5.ebuild
new file mode 100644
index 000000000000..ddfbeddc794c
--- /dev/null
+++ b/sys-power/nut/nut-2.6.5.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.6.5.ebuild,v 1.1 2012/10/16 02:01:53 robbat2 Exp $
+
+EAPI=2
+inherit autotools bash-completion eutils fixheadtails multilib user
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="avahi cgi snmp usb ssl tcpd xml"
+
+RDEPEND="avahi? ( net-dns/avahi )
+	cgi? ( >=media-libs/gd-2[png] )
+	snmp? ( net-analyzer/net-snmp )
+	usb? ( virtual/libusb:0 )
+	ssl? ( >=dev-libs/openssl-1 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	xml? ( >=net-libs/neon-0.25.0 )
+	>=sys-fs/udev-114"
+DEPEND="$RDEPEND
+	>=sys-apps/sed-4
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+# 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
+	# 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
+	epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
+	#epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch
+
+	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+		-i configure.in || die
+
+	sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+		-i scripts/udev/Makefile.am || die
+
+	rm -f ltmain.sh m4/lt* m4/libtool.m4
+
+	sed -i \
+		-e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
+		lib/libupsclient{.pc,-config}.in || die #361685
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if [ -n "${NUT_DRIVERS}" ]; then
+		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
+	fi
+
+	use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
+
+	# TODO: USE flag for sys-power/powerman
+	econf \
+		--sysconfdir=/etc/nut \
+		--datarootdir=/usr/share/nut \
+		--datadir=/usr/share/nut \
+		--disable-static \
+		--with-dev \
+		$(use_with usb) \
+		--without-hal \
+		$(use_with snmp) \
+		$(use_with xml neon) \
+		--without-powerman \
+		$(use_with ssl) \
+		$(use_with tcpd wrap) \
+		$(use_with cgi) \
+		$(use_with avahi) \
+		--with-statepath=/var/lib/nut \
+		--with-drvpath=/$(get_libdir)/nut \
+		--with-htmlpath=/usr/share/nut/html \
+		--with-user=nut \
+		--with-group=nut \
+		--with-logfacility=LOG_DAEMON \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+
+	dodir /sbin
+	dosym /$(get_libdir)/nut/upsdrvctl /sbin/upsdrvctl
+	# This needs to exist for the scripts
+	dosym /$(get_libdir)/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 AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING || 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 "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv || die
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsmon upsmon || die
+	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail || die
+
+	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
+
+	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} "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} ''
+
+}