Tue Oct 13 00:50:08 2020 UTC ()
sysupgrade: PKGREVISION->5, handle ARCHIVE_EXTENSION also in sysupgrade clean

>From Sunil Nimmagadda in PR pkg/55713


(maya)
diff -r1.14 -r1.15 pkgsrc/sysutils/sysupgrade/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/sysupgrade/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh
cvs diff -r1.14 -r1.15 pkgsrc/sysutils/sysupgrade/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/sysupgrade/Makefile 2019/06/03 20:35:55 1.14
+++ pkgsrc/sysutils/sysupgrade/Makefile 2020/10/13 00:50:08 1.15
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.14 2019/06/03 20:35:55 triaxx Exp $ 1# $NetBSD: Makefile,v 1.15 2020/10/13 00:50:08 maya Exp $
2 2
3DISTNAME= sysupgrade-1.5 3DISTNAME= sysupgrade-1.5
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_GITHUB:=jmmv/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=jmmv/}
7MAINTAINER= jmmv@NetBSD.org 7MAINTAINER= jmmv@NetBSD.org
8COMMENT= Automate upgrades of NetBSD 8COMMENT= Automate upgrades of NetBSD
9LICENSE= modified-bsd 9LICENSE= modified-bsd
10 10
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12TEST_TARGET= check 12TEST_TARGET= check
13USE_LANGUAGES= # empty 13USE_LANGUAGES= # empty
14USE_TOOLS= pkg-config 14USE_TOOLS= pkg-config
15 15
16BUILD_DEFS+= VARBASE 16BUILD_DEFS+= VARBASE
17SYSUPGRADE_CACHEDIR= ${VARBASE}/cache/sysupgrade 17SYSUPGRADE_CACHEDIR= ${VARBASE}/cache/sysupgrade
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/sysupgrade/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/sysupgrade/distinfo 2019/06/06 16:30:13 1.5
+++ pkgsrc/sysutils/sysupgrade/distinfo 2020/10/13 00:50:08 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2019/06/06 16:30:13 triaxx Exp $ 1$NetBSD: distinfo,v 1.6 2020/10/13 00:50:08 maya Exp $
2 2
3SHA1 (sysupgrade-1.5.tar.gz) = 3141ee4728d6d3b680ed04f552369031bb3b3b09 3SHA1 (sysupgrade-1.5.tar.gz) = 3141ee4728d6d3b680ed04f552369031bb3b3b09
4RMD160 (sysupgrade-1.5.tar.gz) = 5b1d7c6d45643f2f03bff1df16739a6751d0ceda 4RMD160 (sysupgrade-1.5.tar.gz) = 5b1d7c6d45643f2f03bff1df16739a6751d0ceda
5SHA512 (sysupgrade-1.5.tar.gz) = 47f37ce6802b8ba74d6edd19a2c80d46394c992b58d3077e6d1316e4f5505afbe53a68d28b28779a10a78d7be05f2f5b9d2a55b5b2f845bcc59a78950a8306f8 5SHA512 (sysupgrade-1.5.tar.gz) = 47f37ce6802b8ba74d6edd19a2c80d46394c992b58d3077e6d1316e4f5505afbe53a68d28b28779a10a78d7be05f2f5b9d2a55b5b2f845bcc59a78950a8306f8
6Size (sysupgrade-1.5.tar.gz) = 75833 bytes 6Size (sysupgrade-1.5.tar.gz) = 75833 bytes
7SHA1 (patch-default.conf) = ff367ebbdc56e1009a57a8bd254c424033257726 7SHA1 (patch-default.conf) = ff367ebbdc56e1009a57a8bd254c424033257726
8SHA1 (patch-sysupgrade.conf.5.in) = dfe5d90d0360212ea052f2e25a26820ad277480b 8SHA1 (patch-sysupgrade.conf.5.in) = dfe5d90d0360212ea052f2e25a26820ad277480b
9SHA1 (patch-sysupgrade.sh) = e84a8ea01fca16734206a864b0a51f38c27489a8 9SHA1 (patch-sysupgrade.sh) = cf37304667dcadf043b707f9a4436a963f4bdfff
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh (expand / switch to unified diff)

--- pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh 2019/06/06 16:30:13 1.3
+++ pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh 2020/10/13 00:50:08 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-sysupgrade.sh,v 1.3 2019/06/06 16:30:13 triaxx Exp $ 1$NetBSD: patch-sysupgrade.sh,v 1.4 2020/10/13 00:50:08 maya Exp $
2 2
3* Don't reject https in sysupgrade_fetch() 3* Don't reject https in sysupgrade_fetch()
4* Add ARCHIVE_EXTENSION variable (Fix PR pkg/53697) 4* Add ARCHIVE_EXTENSION variable (Fix PR pkg/53697)
5 5
6--- sysupgrade.sh.orig 2013-07-28 21:27:57.000000000 +0000 6--- sysupgrade.sh.orig 2013-07-28 21:27:57.000000000 +0000
7+++ sysupgrade.sh 7+++ sysupgrade.sh
8@@ -39,7 +39,8 @@ shtk_import process 8@@ -39,7 +39,8 @@ shtk_import process
9 # 9 #
10 # Please remember to update sysbuild(1) if you change this list. 10 # Please remember to update sysbuild(1) if you change this list.
11 SYSUPGRADE_CONFIG_VARS="AUTOCLEAN CACHEDIR DESTDIR ETCUPDATE KERNEL 11 SYSUPGRADE_CONFIG_VARS="AUTOCLEAN CACHEDIR DESTDIR ETCUPDATE KERNEL
12- POSTINSTALL_AUTOFIX RELEASEDIR SETS" 12- POSTINSTALL_AUTOFIX RELEASEDIR SETS"
13+ POSTINSTALL_AUTOFIX RELEASEDIR SETS 13+ POSTINSTALL_AUTOFIX RELEASEDIR SETS
14+ ARCHIVE_EXTENSION" 14+ ARCHIVE_EXTENSION"
@@ -123,13 +123,27 @@ $NetBSD: patch-sysupgrade.sh,v 1.3 2019/ @@ -123,13 +123,27 @@ $NetBSD: patch-sysupgrade.sh,v 1.3 2019/
123 shtk_cli_info "Skipping postinstall (no etc sets in SETS)" 123 shtk_cli_info "Skipping postinstall (no etc sets in SETS)"
124 return 0 124 return 0
125@@ -392,8 +409,8 @@ sysupgrade_postinstall() { 125@@ -392,8 +409,8 @@ sysupgrade_postinstall() {
126  126
127 local sflags= 127 local sflags=
128 for set_name in ${sets}; do 128 for set_name in ${sets}; do
129- require_cached_file "${set_name}.tgz" 129- require_cached_file "${set_name}.tgz"
130- sflags="${sflags} -s$(get_cached_file "${set_name}.tgz")" 130- sflags="${sflags} -s$(get_cached_file "${set_name}.tgz")"
131+ require_cached_file "${set_name}.${arch_ext}" 131+ require_cached_file "${set_name}.${arch_ext}"
132+ sflags="${sflags} -s$(get_cached_file "${set_name}.${arch_ext}")" 132+ sflags="${sflags} -s$(get_cached_file "${set_name}.${arch_ext}")"
133 done 133 done
134  134
135 shtk_cli_info "Performing postinstall checks" 135 shtk_cli_info "Performing postinstall checks"
 136@@ -409,10 +426,12 @@ sysupgrade_postinstall() {
 137
 138 # Cleans up the cache directory.
 139 sysupgrade_clean() {
 140+ local arch_ext="$(shtk_config_get ARCHIVE_EXTENSION)"
 141+
 142 [ ${#} -eq 0 ] || shtk_cli_usage_error "clean does not take any arguments"
 143
 144 shtk_cli_info "Cleaning downloaded files"
 145- rm -f "$(shtk_config_get CACHEDIR)"/*.*gz*
 146+ rm -f "$(shtk_config_get CACHEDIR)"/*.${arch_ext}*
 147 }
 148
 149