From nobody Wed Apr 27 21:51:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5F9721ABDDA6; Wed, 27 Apr 2022 21:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KpXWs1mGGz3rrZ; Wed, 27 Apr 2022 21:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651096297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DG5fibWEN6GvoCBJiHfcSoxVJFVTZD4geMGrH9WjeKI=; b=hHF6GdTz+a3SkHB7Ub7oUn1e6YFDJhLiXG5jT+407FLkJCejpiPt574Kq0GWkgVowmrV1J 0nI3EMevV1yReEhMCtvu1PZrfYn01E7qYll7H1/Svw10hUsjvtSntJUpIkzVYX3BWEAIa5 rmrUuIwz+lye9iRX02iYjHnG+6hGeWCE/KSSvYn3RaOwDBvGswHeG5UxFnykpqmyPOsuGT urUlyfjPoYR6kIQnRb6CkvqMYboI2RokaFpy+zRAJqUu7Sbetb1aWAJenk7WcKJvDyIhBA OoSEwNb6JiJb5nwaCcT0q0KAIDq4WcD3wk/qVA9bWKZpYGRgTjJphCW+UE4iBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 170FE3DD3; Wed, 27 Apr 2022 21:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23RLpaCh048746; Wed, 27 Apr 2022 21:51:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RLpaBq048745; Wed, 27 Apr 2022 21:51:36 GMT (envelope-from git) Date: Wed, 27 Apr 2022 21:51:36 GMT Message-Id: <202204272151.23RLpaBq048745@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 31418910e0f4 - main - sysutils/nut: Update 2.7.4 --> 2.8.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31418910e0f42df9babb1c12d69dfe2218f2aa03 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651096297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DG5fibWEN6GvoCBJiHfcSoxVJFVTZD4geMGrH9WjeKI=; b=Pq3cTq2lX2kvnk2csoLdoosaCdkyjmmaoscGfp1Tho1htfd92PgMGzDoNT9yeN79Qy3w2h ao8jbPkHIzkqee4XAeaIbrM3qZNwfDFwvt5mR0elD8oSQDqefkurrrgmgeqZ50m5Z2ZV9T VVdtCB2JX4g6RpZGiqC0hgN0uqKTqOih5N4CktNL0ieK/x3AJ2aBMN4MbsoAS4O2O3eSUN 7IJaNX/JnGyWRgCJpJEABS9cXw0cmwuhNox0RKVbuWFCVBussyLP6+L12/1uv23gucL0e5 3bV5wtoL4I3ovugx3mxDEfaBhq61h3LSl0+kNdNOegHLidKgxICCbbjj5cBFKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651096297; a=rsa-sha256; cv=none; b=wB8pqxOXJEywfD6LhmRd0gjLPeIFururvkjiPD6N4cNmtOp7Jn3jlSJ/HbIYTrmtQY9Qxh BDf5jkeR/cMDCBjaH0OcF95P4z7Jd/LJJoSoF6V6dTim0Kv7truX872ZqL1VB60IVUSJ2w nTmEyAGV63lL7jr1fOUdgApi8Hpl7jZSS8Jfc4GPziLaBc5Jg/RgOZiQIvAqxP0J0Qey5X T/xSxE+THT2IQJ+F4EI111d0jx8uc/U9LpBFIESqm6vfZVK2CX/izOtCxOKNqGMVtosWvb dQslwm2TqBggCIRQhnxey77az1/DgdR2AvWLIpanwcqBclyGBsPWR9mkMwnLnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=31418910e0f42df9babb1c12d69dfe2218f2aa03 commit 31418910e0f42df9babb1c12d69dfe2218f2aa03 Author: Cy Schubert AuthorDate: 2022-04-27 21:48:59 +0000 Commit: Cy Schubert CommitDate: 2022-04-27 21:51:21 +0000 sysutils/nut: Update 2.7.4 --> 2.8.0 Welcome to the long awaited nut 2.8.0 --- sysutils/nut/Makefile | 15 +++++++--- sysutils/nut/distinfo | 6 ++-- .../nut/files/patch-m4_nut__check__libopenssl.m4 | 10 ------- sysutils/nut/patch-scripts_Makefile | 8 +++++ sysutils/nut/pkg-plist | 34 +++++++++++++++------- 5 files changed, 46 insertions(+), 27 deletions(-) diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 4122864bb532..278ea0196e08 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -1,8 +1,7 @@ # Created by: Boris Popov PORTNAME= nut -PORTVERSION= 2.7.4 -PORTREVISION= 21 +PORTVERSION= 2.8.0 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -13,7 +12,7 @@ COMMENT= Network UPS Tools GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= autoreconf gmake pkgconfig libtool +USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build NUT_USER?= uucp NUT_GROUP?= uucp @@ -44,10 +43,12 @@ USE_RC_SUBR= nut nut_upsmon nut_upslog SUB_LIST+= STATEDIR=${STATEDIR} PLIST_SUB+= STATEDIR=${STATEDIR} +INSTALL_TARGET= install-strip PORTDOCS= * .include +TMPDIR?= /tmp INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --program-transform-name="" \ @@ -66,6 +67,8 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LIB_DEPENDS+= libltdl.so:devel/libltdl +BUILD_DEPENDS= asciidoc:textproc/asciidoc + .if ${PORT_OPTIONS:MCGI} LIB_DEPENDS+= libgd.so:graphics/gd CGIDIR?= ${PREFIX}/www/cgi-bin/${PORTNAME} @@ -172,9 +175,11 @@ CONFIGURE_ARGS+= --with-nss CONFIGURE_ARGS+= --without-openssl --without-ssl .endif +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|' + pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nut - @${REINPLACE_CMD} -e 's/device-name\*/cdev/g' ${WRKSRC}/scripts/devd/nut-usb.conf post-install: @${MKDIR} ${STAGEDIR}${STATEDIR} @@ -196,5 +201,7 @@ post-install: ${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${EXAMPLESDIR}/syslog.sample ${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog.sample ${MKDIR} ${STAGEDIR}/var/log/nut + @${RM} ${STAGEDIR}${PREFIX}/etc/nut/solaris-init/nut + @${RMDIR} ${STAGEDIR}${PREFIX}/etc/nut/solaris-init .include diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo index 2db9d700c949..f7d0b489a82a 100644 --- a/sysutils/nut/distinfo +++ b/sysutils/nut/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540365195 -SHA256 (nut-2.7.4.tar.gz) = 980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7 -SIZE (nut-2.7.4.tar.gz) = 2509831 +TIMESTAMP = 1651085820 +SHA256 (nut-2.8.0.tar.gz) = c3e5a708da797b7c70b653d37b1206a000fcb503b85519fe4cdf6353f792bfe5 +SIZE (nut-2.8.0.tar.gz) = 3287640 diff --git a/sysutils/nut/files/patch-m4_nut__check__libopenssl.m4 b/sysutils/nut/files/patch-m4_nut__check__libopenssl.m4 deleted file mode 100644 index 7b792c672e0e..000000000000 --- a/sysutils/nut/files/patch-m4_nut__check__libopenssl.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- m4/nut_check_libopenssl.m4.orig 2015-12-29 00:42:34.000000000 -0800 -+++ m4/nut_check_libopenssl.m4 2018-10-23 12:32:09.902960000 -0700 -@@ -58,7 +58,6 @@ - - dnl check if openssl is usable - AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT]) -- AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no]) - - if test "${nut_have_openssl}" = "yes"; then - nut_with_ssl="yes" diff --git a/sysutils/nut/patch-scripts_Makefile b/sysutils/nut/patch-scripts_Makefile new file mode 100644 index 000000000000..0fb15d83ac33 --- /dev/null +++ b/sysutils/nut/patch-scripts_Makefile @@ -0,0 +1,8 @@ +--- scripts/Makefile.am.orig 2020-02-09 10:44:01.000000000 -0800 ++++ scripts/Makefile.am 2020-03-24 19:40:01.084978000 -0700 +@@ -25,4 +25,4 @@ + Windows/halt.c \ + Windows/Makefile + +-SUBDIRS = augeas devd hotplug python systemd udev Solaris upsdrvsvcctl ++SUBDIRS = augeas devd hotplug python udev upsdrvsvcctl diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index c29388ae986c..717336e84b40 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -29,26 +29,33 @@ bin/upssched-cmd %%BASH%%etc/bash_completion.d/nut.bash_completion include/nut-scan.h include/nutclient.h +include/nutclientmem.h include/nutscan-device.h include/nutscan-init.h include/nutscan-ip.h +include/nutscan-serial.h include/parseconf.h include/upsclient.h lib/libnutclient.a lib/libnutclient.so -lib/libnutclient.so.0 -lib/libnutclient.so.0.0.0 -lib/libnutscan.a -lib/libnutscan.so -lib/libnutscan.so.1 -lib/libnutscan.so.1.0.0 +lib/libnutclient.so.2 +lib/libnutclient.so.2.0.0 lib/libupsclient.a lib/libupsclient.so -lib/libupsclient.so.4 -lib/libupsclient.so.4.0.0 +lib/libupsclient.so.6 +lib/libupsclient.so.6.0.0 +lib/libnutclientstub.a +lib/libnutclientstub.so +lib/libnutclientstub.so.1 +lib/libnutclientstub.so.1.0.0 +lib/libnutscan.a +lib/libnutscan.so +lib/libnutscan.so.2 +lib/libnutscan.so.2.0.0 libdata/pkgconfig/libnutclient.pc libdata/pkgconfig/libnutscan.pc libdata/pkgconfig/libupsclient.pc +libdata/pkgconfig/libnutclientstub.pc %%NUT_SERIAL%%libexec/nut/al175 %%NUT_SERIAL%%libexec/nut/apcupsd-ups %%NUT_USB%%libexec/nut/nutdrv_atcl_usb @@ -82,12 +89,13 @@ libdata/pkgconfig/libupsclient.pc %%NUT_SERIAL%%libexec/nut/metasys %%NUT_SERIAL%%libexec/nut/mge-utalk %%NUT_SERIAL%%libexec/nut/microdowell +%%NUT_SERIAL%%libexec/nut/microsol-apc %%NUT_SERIAL%%libexec/nut/mge-shut %%NUT_NEON%%libexec/nut/netxml-ups -%%NUT_SERIAL%%libexec/nut/oldmge-shut %%NUT_SERIAL%%libexec/nut/oneac %%NUT_SERIAL%%libexec/nut/optiups %%NUT_IPMIPSU%%libexec/nut/nut-ipmipsu +%%NUT_SERIAL%%libexec/nut/nutdrv_siemens-sitop %%NUT_SERIAL%%libexec/nut/powercom %%NUT_PDU%%libexec/nut/powerman-pdu %%NUT_SERIAL%%libexec/nut/powerpanel @@ -153,7 +161,7 @@ man/man3/nutscan_scan_ipmi.3.gz man/man3/nutscan_scan_nut.3.gz man/man3/nutscan_scan_snmp.3.gz man/man3/nutscan_scan_usb.3.gz -man/man3/nutscan_scan_xml_http.3.gz +man/man3/nutscan_scan_xml_http_range.3.gz man/man3/upscli_add_host_cert.3.gz man/man3/upscli_cleanup.3.gz man/man3/upscli_connect.3.gz @@ -164,7 +172,9 @@ man/man3/upscli_init.3.gz man/man3/upscli_list_next.3.gz man/man3/upscli_list_start.3.gz man/man3/upscli_readline.3.gz +man/man3/upscli_readline_timeout.3.gz man/man3/upscli_sendline.3.gz +man/man3/upscli_sendline_timeout.3.gz man/man3/upscli_splitaddr.3.gz man/man3/upscli_splitname.3.gz man/man3/upscli_ssl.3.gz @@ -182,10 +192,12 @@ man/man5/upssched.conf.5.gz %%NUT_SERIAL%%man/man8/blazer_ser.8.gz %%NUT_USB%%man/man8/blazer_usb.8.gz %%NUT_NEON%%man/man8/netxml-ups.8.gz +man/man8/nut-driver-enumerator.8.gz man/man8/nut-recorder.8.gz man/man8/nut-scanner.8.gz %%NUT_USB%%man/man8/nutdrv_atcl_usb.8.gz %%NUT_USB%%man/man8/nutdrv_qx.8.gz +%%NUT_SERIAL%%man/man8/nutdrv_siemens_sitop.8.gz man/man8/nutupsdrv.8.gz %%NUT_SERIAL%%man/man8/riello_ser.8.gz %%NUT_USB%%man/man8/riello_usb.8.gz @@ -193,6 +205,7 @@ man/man8/upsc.8.gz man/man8/upscmd.8.gz man/man8/upsd.8.gz man/man8/upsdrvctl.8.gz +man/man8/upsdrvsvcctl.8.gz man/man8/upslog.8.gz man/man8/upsmon.8.gz man/man8/upsrw.8.gz @@ -227,6 +240,7 @@ man/man8/upssched.8.gz %%NUT_SERIAL%%man/man8/mge-shut.8.gz %%NUT_SERIAL%%man/man8/mge-utalk.8.gz %%NUT_SERIAL%%man/man8/microdowell.8.gz +%%NUT_SERIAL%%man/man8/microsol-apc.8.gz %%NUT_SERIAL%%man/man8/oneac.8.gz %%NUT_SERIAL%%man/man8/optiups.8.gz %%NUT_SERIAL%%man/man8/powercom.8.gz