Index: head/sysutils/apcupsd/Makefile =================================================================== --- head/sysutils/apcupsd/Makefile (revision 547576) +++ head/sysutils/apcupsd/Makefile (revision 547577) @@ -1,95 +1,98 @@ # Created by: Lars Köller # $FreeBSD$ PORTNAME= apcupsd PORTVERSION= 3.14.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION} MAINTAINER= dbaio@FreeBSD.org COMMENT= Set of programs for controlling APC UPS LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \ --with-nologin=/var/run \ --disable-install-distdir \ --sysconfdir=${ETCDIR} \ --with-serial-dev=/dev/usv CONFIGURE_ENV+= LD="${CXX}" \ ac_cv_path_SHUTDOWN="/sbin/shutdown" USE_RC_SUBR= apcupsd SUB_FILES= pkg-message CONFLICTS_INSTALL= apcctrl OPTIONS_DEFINE= APCDUMB_DRV APCSMART_DRV CGI CLIENT_ONLY GAPCMON MODBUS \ MODBUS_USB PCNET_DRV SHUTDOWN_POWEROFF SNMP_DRV SNMP_DRV_OLD \ - TCP_WRAPPERS TEST_DRV USB_DRV + TCP_WRAPPERS TEST_DRV USB_DRV USB_REPORTING OPTIONS_DEFAULT= APCDUMB_DRV APCSMART_DRV MODBUS MODBUS_USB PCNET_DRV \ SNMP_DRV TCP_WRAPPERS USB_DRV OPTIONS_SUB= yes APCDUMB_DRV_DESC= Dumb UPS driver support APCSMART_DRV_DESC= APC SmartUPS serial driver support CGI_DESC= Build CGI programs to show status CLIENT_ONLY_DESC= Only NIS client (no network server or drivers) GAPCMON_DESC= Build GTK GUI front-end MODBUS_DESC= MODBUS driver support MODBUS_USB_DESC= MODBUS USB driver support PCNET_DRV_DESC= PowerChute Network Shutdown driver support SHUTDOWN_POWEROFF_DESC= Shutdown behavior with Halt and Power off SNMP_DRV_DESC= SNMP driver support SNMP_DRV_OLD_DESC= Old SNMP driver support TCP_WRAPPERS_DESC= ${LIBWRAP_DESC} TEST_DRV_DESC= Test driver support USB_DRV_DESC= USB driver support +USB_REPORTING_DESC= Experimental patch for faulty USB reporting APCDUMB_DRV_CONFIGURE_ENABLE= dumb APCSMART_DRV_CONFIGURE_ENABLE= apcsmart CGI_CONFIGURE_ENABLE= cgi CGI_CONFIGURE_ON= --with-cgi-bin=${ETCDIR}/cgi CGI_LIB_DEPENDS= libgd.so:graphics/gd CLIENT_ONLY_CONFIGURE_ON= --enable-net \ --disable-apcsmart --disable-dumb --disable-usb \ --disable-snmp --disable-test --disable-pcnet GAPCMON_CONFIGURE_ENABLE= gapcmon GAPCMON_USES= gnome pkgconfig xorg GAPCMON_USE= GNOME=cairo,gconf2,gdkpixbuf2 XORG=x11,xext GAPCMON_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GAPCMON_CONFLICTS= gapcmon MODBUS_CONFIGURE_ENABLE= modbus MODBUS_USB_CONFIGURE_ENABLE= modbus-usb PCNET_DRV_CONFIGURE_ENABLE= pcnet SNMP_DRV_CONFIGURE_ENABLE= snmp SNMP_DRV_OLD_CONFIGURE_ENABLE= net-snmp SNMP_DRV_OLD_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp TCP_WRAPPERS_CONFIGURE_WITH= libwrap=yes TEST_DRV_CONFIGURE_ENABLE= test USB_DRV_CONFIGURE_ENABLE= usb + +USB_REPORTING_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-usb-reporting .include post-patch-SHUTDOWN_POWEROFF-on: ${REINPLACE_CMD} -e 's|-h now|-p now|' \ ${WRKSRC}/platforms/freebsd/apccontrol.in pre-configure: .if ${PORT_OPTIONS:MCLIENT_ONLY} && ( ${PORT_OPTIONS:MAPCSMART_DRV} || \ ${PORT_OPTIONS:MAPCDUMB_DRV} || ${PORT_OPTIONS:MPCNET_DRV} || \ ${PORT_OPTIONS:MUSB_DRV} || \ ${PORT_OPTIONS:MSNMP_DRV} || ${PORT_OPTIONS:MTEST_DRV} ) @${ECHO_CMD} "It doesn't make sense to build drivers if all you want is" @${ECHO_CMD} "the client; please do make config and select either" @${ECHO_CMD} "CLIENT_ONLY or the *_DRV you need" @${FALSE} .endif .include Index: head/sysutils/apcupsd/files/extra-patch-usb-reporting =================================================================== --- head/sysutils/apcupsd/files/extra-patch-usb-reporting (nonexistent) +++ head/sysutils/apcupsd/files/extra-patch-usb-reporting (revision 547577) @@ -0,0 +1,51 @@ +--- include/HidUps.h.orig 2015-02-08 18:00:05 UTC ++++ include/HidUps.h +@@ -107,6 +107,7 @@ class HidUps (private) + /* Fetch a descriptor from an interface (as opposed to from the device) */ + int GetIntfDescr( + unsigned char type, unsigned char index, void *buf, int size); ++ int GetIntfDescrLength(unsigned char index); + + bool init_device(struct usb_device *dev, const char *serno); + +--- src/libusbhid/HidUps.cpp.orig 2015-02-08 18:00:05 UTC ++++ src/libusbhid/HidUps.cpp +@@ -244,6 +244,26 @@ int HidUps::GetIntfDescr( + (type << 8) + index, 0, (char*)buf, size, 1000); + } + ++/* Get the interface descriptor's length */ ++int HidUps::GetIntfDescrLength(unsigned char index) ++{ ++ /* usb_hid_descriptor */ ++ char buf[9]; ++ memset(buf, 0, sizeof(buf)); ++ int ret = usb_control_msg(_fd, USB_ENDPOINT_IN | USB_RECIP_INTERFACE, ++ USB_REQ_GET_DESCRIPTOR, ++ (USB_DT_HID << 8) + index, 0, (char*)buf, sizeof(buf), 1000); ++ ++ int len = MAX_SANE_DESCRIPTOR_LEN; ++ if (ret >= 0) { ++ /* wDescriptorLength */ ++ int desclen = buf[7] | (buf[8] << 8); ++ if (desclen > 0) ++ len = desclen; ++ } ++ return len; ++} ++ + /* + * Fetch the report descriptor from the device given an _fd for the + * device's control endpoint. Descriptor length is written to the +@@ -255,8 +275,9 @@ unsigned char *HidUps::FetchReportDescr(int *rlen) + unsigned char *ptr; + int rdesclen; + +- ptr = (unsigned char*)malloc(MAX_SANE_DESCRIPTOR_LEN); +- rdesclen = GetIntfDescr(USB_DT_REPORT, 0, ptr, MAX_SANE_DESCRIPTOR_LEN); ++ int desclen = GetIntfDescrLength(0); ++ ptr = (unsigned char*)malloc(desclen); ++ rdesclen = GetIntfDescr(USB_DT_REPORT, 0, ptr, desclen); + if (rdesclen <= 0) { + Dmsg(100, "Unable to get REPORT descriptor (%d).\n", rdesclen); + free(ptr); Property changes on: head/sysutils/apcupsd/files/extra-patch-usb-reporting ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/apcupsd/files/pkg-message.in =================================================================== --- head/sysutils/apcupsd/files/pkg-message.in (revision 547576) +++ head/sysutils/apcupsd/files/pkg-message.in (revision 547577) @@ -1,33 +1,37 @@ [ { type: install message: <