Bug #318937: Fix support for low-speed USB devices.
authorRobin H. Johnson <robbat2@gentoo.org>
Tue, 25 May 2010 20:19:58 +0000 (20:19 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Tue, 25 May 2010 20:19:58 +0000 (20:19 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

sys-power/nut/ChangeLog
sys-power/nut/Manifest
sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch [new file with mode: 0644]
sys-power/nut/nut-2.4.3-r1.ebuild [new file with mode: 0644]

index 159dffc8dd022a3f2e941872ffac010efe0d0998..c9d2a87accecd2c018c6f27c88ab764d26004b8b 100644 (file)
@@ -1,6 +1,12 @@
 # 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.72 2010/05/02 22:50:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.73 2010/05/25 20:19:58 robbat2 Exp $
+
+*nut-2.4.3-r1 (25 May 2010)
+
+  25 May 2010; Robin H. Johnson <robbat2@gentoo.org> +nut-2.4.3-r1.ebuild,
+  +files/nut-2.4.3-lowspeed-buffer-size.patch:
+  Bug #318937: Fix support for low-speed USB devices.
 
 *nut-2.4.3 (02 May 2010)
 
index fdf0f794c86e59085554e0aea752c7b3d82ef210..36e25867bef4736aa272943ccfb5fbda6e8904e2 100644 (file)
@@ -6,6 +6,7 @@ AUX nut-2.2.2-init.d-upsdrv 978 RMD160 249292e9338ae68b956c5858db7588447c3f41d7
 AUX nut-2.2.2-init.d-upsmon 655 RMD160 04ba8bdc74c296f7126dcc06a748fbeac630ab64 SHA1 c69bd2d85fcf9e59d49b57fd5a3d51575bd688b0 SHA256 f8063853e446dc4012254ac6f81d4c1921f3e9f5c8dabe49bec3420bad98bc06
 AUX nut-2.2.2-no-libdummy.patch 1421 RMD160 aa7156a547922c38db419a69ccf70c3f83119a4a SHA1 49038db25dc33836adbcdab821286db7ade34b94 SHA256 1a9dfcd2b9bb96e43642f70087e290a27ae631fca0f8c2c9c976f417ec4007fb
 AUX nut-2.4.1-no-libdummy.patch 791 RMD160 2a8ed4c000b3bd2a271e1e169486a0cd1cbdb809 SHA1 a48e71e06bb590cb296b7deead51b7b31420d68b SHA256 c9cf34980e79a4b9f07c338d10bc4ef4e90608ee7543cbc483898ee4f3f4f2a4
+AUX nut-2.4.3-lowspeed-buffer-size.patch 746 RMD160 1cb00bcfb116f117e5610dba4b696b813092855b SHA1 e73fe84d2f6ab9aaa87a01763d0b7e890192e60b SHA256 40d3cdaee565189364d6442cbe6072dc19996e0a09a6e757824777ad67885fad
 AUX nut.powerfail.initd 1109 RMD160 48c26c0173ffcf4ef2c3228984757367285777e7 SHA1 4e80350d6430cb001fa210d519b5730d39172d58 SHA256 fa4a22c15427655fe09395b0f26a14964aafb2523010ed46c82f2d81d99b1be5
 AUX upsd.rc6 733 RMD160 e95d9885a27059b16f17c6f124a43f158fef3b19 SHA1 7ffcd039a7a2e58f1608a7fe29898c13b3c4a762 SHA256 f78f9ef953e4f9b17f40eb36fe404118a39bb0baba9ccde0fb4ea0274440bb93
 AUX upsdrv.rc6-r1 490 RMD160 b13a0dcc1facd1d857d15838da65a5bc360daa83 SHA1 ffbcc64d07317e6a3275156bbdcbbb08497415aa SHA256 4b2f21251cdf789ebe0688ad27ad699940f5cfb0ddaa4d9c5d22f8343ccbfd84
@@ -20,6 +21,7 @@ EBUILD nut-2.2.2.ebuild 6453 RMD160 37794ec27c8815d615ad7ba008af8cfcfdd64cf1 SHA
 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
+EBUILD nut-2.4.3-r1.ebuild 7338 RMD160 cdf1e7bf2fd456d1cb4817294bf0e5d723751c0d SHA1 ffc205089b4206f37e907238cbd6ecb27cacc9b4 SHA256 27036a208da2a87e5c490ff38a59d1ab1edc6129b98e2ad05cb16dbb11d664ac
 EBUILD nut-2.4.3.ebuild 7274 RMD160 647de44925715507ac0187f29b03510c08a84a0a SHA1 7c3be9690415799144bfe5dd9a0eff0ade3f91ac SHA256 357d0bd23241e99e567f96825709f8b11b564de92f6c6c95ea58ac6e4513e485
-MISC ChangeLog 17866 RMD160 dc3367a4023e1d92897d062f4b808dd3a121db5b SHA1 66d62aac364a2d2a92d9491bf24606d876305675 SHA256 dd32635e65ba94fdf52ee4b9ee26cec9d88b50da461b5f778635b376e54cac48
+MISC ChangeLog 18072 RMD160 dcad9808798b36bb8be933d94543f573a64415f8 SHA1 e7974cdb23dfe9f7fe731cc33fd6ce3ad6ad4cf7 SHA256 4380dbaa065615b0788dcf5b568db6db1a0996926b30e13b0aacc1496c1e603e
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
diff --git a/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch b/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch
new file mode 100644 (file)
index 0000000..6ef6ca8
--- /dev/null
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/show_bug.cgi?id=318937\r
+http://boxster.ghz.cc/projects/nut/changeset/2407\r
+\r
+Index: /trunk/drivers/libhid.c\r
+===================================================================\r
+--- /trunk/drivers/libhid.c (revision 2336)\r
++++ /trunk/drivers/libhid.c (revision 2407)\r
+@@ -142,5 +142,5 @@\r
+       int     id = pData->ReportID;\r
+       int     r;\r
+-      unsigned char   buf[SMALLBUF];\r
++      unsigned char   buf[8]; /* Maximum size for low-speed USB devices */\r
+ \r
+       if (rbuf->ts[id] + age > time(NULL)) {\r
+@@ -470,5 +470,5 @@\r
+ int HIDGetEvents(hid_dev_handle_t udev, HIDData_t **event, int eventsize)\r
+ {\r
+-      unsigned char   buf[SMALLBUF];\r
++      unsigned char   buf[8]; /* Maximum size for low-speed USB devices */\r
+       int             itemCount = 0;\r
+       int             buflen, r, i;\r
diff --git a/sys-power/nut/nut-2.4.3-r1.ebuild b/sys-power/nut/nut-2.4.3-r1.ebuild
new file mode 100644 (file)
index 0000000..3821255
--- /dev/null
@@ -0,0 +1,234 @@
+# 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-r1.ebuild,v 1.1 2010/05/25 20:19:58 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
+       epatch "${FILESDIR}"/${PN}-2.4.3-lowspeed-buffer-size.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} ''
+
+}