NetBSD Problem Report #55713
From www@netbsd.org Sat Oct 10 15:40:53 2020
Return-Path: <www@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
by mollari.NetBSD.org (Postfix) with ESMTPS id 832AC1A9239
for <gnats-bugs@gnats.NetBSD.org>; Sat, 10 Oct 2020 15:40:53 +0000 (UTC)
Message-Id: <20201010154052.82BAB1A923A@mollari.NetBSD.org>
Date: Sat, 10 Oct 2020 15:40:52 +0000 (UTC)
From: sunil@nimmagadda.net
Reply-To: sunil@nimmagadda.net
To: gnats-bugs@NetBSD.org
Subject: sysutils/sysupgrade: Use ARCHIVE_EXTENSION in clean command as well
X-Send-Pr-Version: www-1.0
>Number: 55713
>Category: pkg
>Synopsis: sysutils/sysupgrade: Use ARCHIVE_EXTENSION in clean command as well
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: jmmv
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sat Oct 10 15:45:00 +0000 2020
>Closed-Date: Tue Oct 13 00:51:22 +0000 2020
>Last-Modified: Tue Oct 13 00:55:01 +0000 2020
>Originator: Sunil Nimmagadda
>Release: pkgsrc-2020Q3
>Organization:
>Environment:
NetBSD somehost 9.99.73 NetBSD 9.99.73 (GENERIC) #0: Thu Oct 8 16:00:09 UTC 2020 mkrepro@mkrepro.NetBSD.org:/usr/src/sys/arch/amd64/compile/GENERIC amd64
>Description:
The clean command still uses a glob (*gz*) with rm(1) which fails to remove sets when ARCHIVE_EXTENSION is set to "tar.xz". Subsequent 'sysupgrade auto' command sees these stale sets in /var/cache/sysupgrade and wouldn't download the latest sets from RELEASEDIR.
>How-To-Repeat:
# sysupgrade auto
...
sysupgrade: I: Cleaning downloaded files
$ ls /var/cache/sysupgrade
base.tar.xz etc.tar.xz man.tar.xz modules.tar.xz tests.tar.xz xbase.tar.xz xetc.tar.xz xserver.tar.xz
comp.tar.xz games.tar.xz misc.tar.xz rescue.tar.xz text.tar.xz xcomp.tar.xz xfont.tar.xz
# sysupgrade clean
sysupgrade: I: Cleaning downloaded files
# ls /var/cache/sysupgrade
base.tar.xz etc.tar.xz man.tar.xz modules.tar.xz tests.tar.xz xbase.tar.xz xetc.tar.xz xserver.tar.xz
comp.tar.xz games.tar.xz misc.tar.xz rescue.tar.xz text.tar.xz xcomp.tar.xz xfont.tar.xz
# sysupgrade auto
sysupgrade: I: Starting auto-update with stages: fetch modules kernel sets etcupdate postinstall clean
sysupgrade: W: Reusing existing /var/cache/sysupgrade/base.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/comp.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/etc.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/games.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/man.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/misc.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/modules.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/rescue.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/tests.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/text.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/xbase.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/xcomp.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/xetc.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/xfont.tar.xz
sysupgrade: W: Reusing existing /var/cache/sysupgrade/xserver.tar.xz
...
>Fix:
diff --git a/sysutils/sysupgrade/distinfo b/sysutils/sysupgrade/distinfo
--- a/sysutils/sysupgrade/distinfo
+++ b/sysutils/sysupgrade/distinfo
@@ -6,4 +6,4 @@
Size (sysupgrade-1.5.tar.gz) = 75833 bytes
SHA1 (patch-default.conf) = ff367ebbdc56e1009a57a8bd254c424033257726
SHA1 (patch-sysupgrade.conf.5.in) = dfe5d90d0360212ea052f2e25a26820ad277480b
-SHA1 (patch-sysupgrade.sh) = e84a8ea01fca16734206a864b0a51f38c27489a8
+SHA1 (patch-sysupgrade.sh) = 35f0197f16bd0824fbbe39894870f0e38e963fa2
diff --git a/sysutils/sysupgrade/patches/patch-sysupgrade.sh b/sysutils/sysupgrade/patches/patch-sysupgrade.sh
--- a/sysutils/sysupgrade/patches/patch-sysupgrade.sh
+++ b/sysutils/sysupgrade/patches/patch-sysupgrade.sh
@@ -133,3 +133,12 @@
done
shtk_cli_info "Performing postinstall checks"
+@@ -412,7 +429,7 @@ sysupgrade_clean() {
+ [ ${#} -eq 0 ] || shtk_cli_usage_error "clean does not take any arguments"
+
+ shtk_cli_info "Cleaning downloaded files"
+- rm -f "$(shtk_config_get CACHEDIR)"/*.*gz*
++ rm -f "$(shtk_config_get CACHEDIR)"/*."$(shtk_config_get ARCHIVE_EXTENSION)"
+ }
+
+
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->jmmv
Responsible-Changed-By: leot@NetBSD.org
Responsible-Changed-When: Sat, 10 Oct 2020 16:04:43 +0000
Responsible-Changed-Why:
Julio, can you please give it a look?
(over to MAINTAINER)
State-Changed-From-To: open->closed
State-Changed-By: maya@NetBSD.org
State-Changed-When: Tue, 13 Oct 2020 00:51:22 +0000
State-Changed-Why:
Applied, thanks!
From: "Maya Rashish" <maya@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/55713 CVS commit: pkgsrc/sysutils/sysupgrade
Date: Tue, 13 Oct 2020 00:50:08 +0000
Module Name: pkgsrc
Committed By: maya
Date: Tue Oct 13 00:50:08 UTC 2020
Modified Files:
pkgsrc/sysutils/sysupgrade: Makefile distinfo
pkgsrc/sysutils/sysupgrade/patches: patch-sysupgrade.sh
Log Message:
sysupgrade: PKGREVISION->5, handle ARCHIVE_EXTENSION also in sysupgrade clean
From Sunil Nimmagadda in PR pkg/55713
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/sysupgrade/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/sysupgrade/distinfo
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.