CVS commit: pkgsrc/sysutils/ups-nut

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Sep 18 16:27:28 UTC 2025

Modified Files:
        pkgsrc/sysutils/ups-nut: Makefile.common distinfo

Log Message:
ups-nut: Fix distinfo harder

Upstream placed an rc1 distfile at nut-2.8.4.tar.gz, and later
replaced it with a distfile corresponding to rc4 (which was the actual
release).  This wrong distfile was picked up by ftp.netbsd.org.

This commit does not affect anyone who was able to build before,
because the diff from rc1 to rc4 is about CI and about defaults for
doc building.

Add DIST_SUBDIR, temporararily until the next update.  Committed
before hearing back from upstream because the freeze clock is ticking,
and examining the original and replaced 2.8.4 distfile (and the wip
distfiles I was concerned that we were confused about) is pretty
conclusive.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/ups-nut/Makefile.common
cvs rdiff -u -r1.46 -r1.47 pkgsrc/sysutils/ups-nut/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.21 pkgsrc/sysutils/ups-nut/Makefile.common:1.22
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.21        Sun Aug 10 21:51:59 2025
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Thu Sep 18 16:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2025/08/10 21:51:59 gdt Exp $
+# $NetBSD: Makefile.common,v 1.22 2025/09/18 16:27:28 gdt Exp $
 # used by sysutils/ups-nut/Makefile
 # used by sysutils/ups-nut-cgi/Makefile
 # used by sysutils/ups-nut-snmp/Makefile
@@ -8,6 +8,11 @@
 DISTNAME=              nut-2.8.4
 CATEGORIES=            sysutils
 MASTER_SITES=          https://networkupstools.org/source/${PKGVERSION_NOREV:R}/
+# Upstream placed an rc1 distfile at nut-2.8.4.tar.gz, and later
+# replaced it with a distfile corresponding to rc4 (which was the
+# actual release).
+# This is temporary until the next update.
+DIST_SUBDIR=           ups-nut-2.8.4bis
 
 MAINTAINER?=           gdt%NetBSD.org@localhost
 HOMEPAGE=              http://www.networkupstools.org/

Index: pkgsrc/sysutils/ups-nut/distinfo
diff -u pkgsrc/sysutils/ups-nut/distinfo:1.46 pkgsrc/sysutils/ups-nut/distinfo:1.47
--- pkgsrc/sysutils/ups-nut/distinfo:1.46       Tue Sep 16 12:23:20 2025
+++ pkgsrc/sysutils/ups-nut/distinfo    Thu Sep 18 16:27:28 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.46 2025/09/16 12:23:20 gdt Exp $
+$NetBSD: distinfo,v 1.47 2025/09/18 16:27:28 gdt Exp $
 
-BLAKE2s (nut-2.8.4.tar.gz) = 2225617ef46a46cc0b6e08b93877ad0391b44a349efa2c8ea82fb3ef5ca8f7d2
-SHA512 (nut-2.8.4.tar.gz) = ddaca1d0cba17817fd27d036442395d11d64541b0782cd3c33d7b93712a15587dbad54fd7ed8a3ff14b89d75211560f76c30f5b9559e963adb4df7b05b66ec26
-Size (nut-2.8.4.tar.gz) = 6522704 bytes
+BLAKE2s (ups-nut-2.8.4bis/nut-2.8.4.tar.gz) = 2225617ef46a46cc0b6e08b93877ad0391b44a349efa2c8ea82fb3ef5ca8f7d2
+SHA512 (ups-nut-2.8.4bis/nut-2.8.4.tar.gz) = ddaca1d0cba17817fd27d036442395d11d64541b0782cd3c33d7b93712a15587dbad54fd7ed8a3ff14b89d75211560f76c30f5b9559e963adb4df7b05b66ec26
+Size (ups-nut-2.8.4bis/nut-2.8.4.tar.gz) = 6522704 bytes
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
 SHA1 (patch-conf_Makefile.in) = 8d02a0b05659cb210a77e863a28a3b9caa596dfc
 SHA1 (patch-configure) = fb27deb020020635d4345c2850099bbc7bc03af7