From nobody Wed Jan 15 19:44:48 2025 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 4YYGfm5wNsz5kZ9B; Wed, 15 Jan 2025 19:44:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYGfm4jMVz3TbB; Wed, 15 Jan 2025 19:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736970288; 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=b6iOnq+M90J9MgHZpl8i3EByofw96GlnSqtVGJDWNDQ=; b=tBljYyC4ummDwTY3u99Q9TPU0tWJDns/Rmb/p9/6qY50QwZzt+qgR+pGX+hmTse+FSThz2 RqOT+dzTgf/umz59xS8tuklmcxSJjglRaUKnJUvu7tJEjmQEF1WQNxWCcRxmmHL4Jj0X7e 5tH0aPGTmvV42QU2SRf/A182JjK9uWP1YCTTwyCsLitdl654yPagkOJxfxJXgtcU6LiXOV fAEYCR4RYfnbVjjs0yZIrtWSZGU9hskwrCuR/ktzf1AKQJtk/BRYLgf/yIZuMPqsFKobkL oc20ySbAR7+4j8Xx2gGxdr3myDXNlhrDW/yibbyPgDuV+HRQxJwQssW3ZDlaiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736970288; 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=b6iOnq+M90J9MgHZpl8i3EByofw96GlnSqtVGJDWNDQ=; b=VIPDlc64kD0sjz6/Zqtv9lCuvWlVEEIJ2DGgg/Kjd+ylWLle0PQFFw9zewsGj4Sy/QlB1x yG3zrPaq3EMp/TsweeUa3VZV50mQv7C5zdtF6vXGCz8jiL1opa2XP0RbrLBqPNGwzIwezm ZpRhwI7LJZlRQg8KiFRXJeHxUzVMp4RXrTcJl8uZTIOkTVHf/p96Ds2z+H7gWjvCHGD30Y dVGEMnZoqPnJozOhPkH7KEJsG0FO4wtI2r1FeY+QICxECBSDpsKISlKujdGc7AwA5hMa1O 6Ba8pT1S3CASmTE4syEaZfcBYoila5rdvd020119CKeTV4GIK/cXqj3pP9RSoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736970288; a=rsa-sha256; cv=none; b=UVvY8vyIkHfp0Zn8zIaa633N5grKAm7aYaj28VuWSz64fyjcbht7Mcwd+Tx6wa5uWpzFqq 97r9l9SMvZJVQoQ5LLAebADgfyaM+bSwhqR/etHL6hA5lid6gC65T6TY/jlvehRXDWU2Kh L0PdvqIqmfwO2rsTq/T0VKxXWR4TDvhZp8URnJRzXiUUoLo75KZjhpUH7z8tG8HAp7b3d5 VMz8/fJkVz5t9x+pyQqeHOEqtIJGbwMnv4gDqf+dWal1QvBDnyEAp83UN3iP+kfwh2WGq8 g3tINLLMDvKZY3sti/ddnLSm/F0wvmsSdWpvPfyVbyMjfMA03kyqjj7Eooc9vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YYGfm3hT9z113x; Wed, 15 Jan 2025 19:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50FJimkp078122; Wed, 15 Jan 2025 19:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50FJimmf078119; Wed, 15 Jan 2025 19:44:48 GMT (envelope-from git) Date: Wed, 15 Jan 2025 19:44:48 GMT Message-Id: <202501151944.50FJimmf078119@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Danilo G. Baio" Subject: git: 7f625a5cf695 - main - sysutils/apcupsd: Add patch to increase the PCNET commlost timeout 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f625a5cf6959cb84bb2f112583ea9cc6bb7c7fb Auto-Submitted: auto-generated The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f625a5cf6959cb84bb2f112583ea9cc6bb7c7fb commit 7f625a5cf6959cb84bb2f112583ea9cc6bb7c7fb Author: Steven Stallion AuthorDate: 2025-01-15 19:35:15 +0000 Commit: Danilo G. Baio CommitDate: 2025-01-15 19:41:11 +0000 sysutils/apcupsd: Add patch to increase the PCNET commlost timeout PR: 283900 Reviewed by: dbaio --- sysutils/apcupsd/Makefile | 12 +++++++----- sysutils/apcupsd/files/extra-patch-pcnet-commlost | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 05ffa81769f8..993d5b9128ce 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,6 +1,6 @@ PORTNAME= apcupsd PORTVERSION= 3.14.14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION} @@ -29,10 +29,10 @@ 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 USB_REPORTING -OPTIONS_DEFAULT= APCDUMB_DRV APCSMART_DRV MODBUS MODBUS_USB PCNET_DRV \ - SNMP_DRV TCP_WRAPPERS USB_DRV + MODBUS_USB PCNET_COMMLOST PCNET_DRV SHUTDOWN_POWEROFF SNMP_DRV \ + SNMP_DRV_OLD TCP_WRAPPERS TEST_DRV USB_DRV USB_REPORTING +OPTIONS_DEFAULT= APCDUMB_DRV APCSMART_DRV MODBUS MODBUS_USB PCNET_COMMLOST \ + PCNET_DRV SNMP_DRV TCP_WRAPPERS USB_DRV OPTIONS_SUB= yes APCDUMB_DRV_DESC= Dumb UPS driver support @@ -42,6 +42,7 @@ 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_COMMLOST_DESC= Experimental patch for faulty PCNET timeouts PCNET_DRV_DESC= PowerChute Network Shutdown driver support SHUTDOWN_POWEROFF_DESC= Shutdown behavior with Halt and Power off SNMP_DRV_DESC= SNMP driver support @@ -75,6 +76,7 @@ TCP_WRAPPERS_CONFIGURE_WITH= libwrap=yes TEST_DRV_CONFIGURE_ENABLE= test USB_DRV_CONFIGURE_ENABLE= usb +PCNET_COMMLOST_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-pcnet-commlost USB_REPORTING_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-usb-reporting .include diff --git a/sysutils/apcupsd/files/extra-patch-pcnet-commlost b/sysutils/apcupsd/files/extra-patch-pcnet-commlost new file mode 100644 index 000000000000..0cf5de3f977b --- /dev/null +++ b/sysutils/apcupsd/files/extra-patch-pcnet-commlost @@ -0,0 +1,17 @@ +# https://sourceforge.net/p/apcupsd/mailman/apcupsd-users/thread/CAGGHmKEjHQfRkB1EvHdv5b54buNKwQpMVmQzznpB%2BWNx_nEvWw%40mail.gmail.com/#msg59114143 +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283900 +--- src/drivers/pcnet/pcnet.c (revision 2381) ++++ src/drivers/pcnet/pcnet.c (working copy) +@@ -32,10 +32,10 @@ + + /* + * Number of seconds with no data before we declare COMMLOST. +- * UPS should report in every 25 seconds. We allow 2 missing ++ * UPS should report in every 25 seconds. We allow 3 missing + * reports plus a fudge factor. + */ +-#define COMMLOST_TIMEOUT 55 ++#define COMMLOST_TIMEOUT 80 + + /* Win32 needs a special close for sockets */ + #ifdef HAVE_MINGW