sysupgrade: autodetect of the used stable branch in default.conf

[kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Tue Oct 22 17:10:16 2024 +0200
Changeset:	11cdbee183bd44e540a4e16386c3bf3e5c504a53

Modified Files:
	Makefile
	sysupgrade/distinfo
	sysupgrade/patches/patch-default.conf
Added Files:
	sysupgrade/COMMIT_MSG

Log Message:
sysupgrade: autodetect of the used stable branch in default.conf

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=11cdbee183bd44e540a4e16386c3bf3e5c504a53

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

diffstat:
 Makefile                              | 1 +
 sysupgrade/COMMIT_MSG                 | 3 +++
 sysupgrade/distinfo                   | 2 +-
 sysupgrade/patches/patch-default.conf | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 8b4ed9eb40..b800d54ac7 100644
--- a/Makefile
+++ b/Makefile
@@ -5426,6 +5426,7 @@ SUBDIR+=	system-config-printer
 SUBDIR+=	system-tools-backends
 SUBDIR+=	systemc
 SUBDIR+=	systemsettings
+SUBDIR+=	sysupgrade
 SUBDIR+=	sysvinit
 SUBDIR+=	syx
 SUBDIR+=	t-coffee
diff --git a/sysupgrade/COMMIT_MSG b/sysupgrade/COMMIT_MSG
new file mode 100644
index 0000000000..9ca72c477e
--- /dev/null
+++ b/sysupgrade/COMMIT_MSG
@@ -0,0 +1,3 @@
+sysutils/sysupgrade: autodetect of the used stable branch in default.conf
+
+* Avoid unwanted downgrade, when use sysupgrade auto on NetBSD-10
diff --git a/sysupgrade/distinfo b/sysupgrade/distinfo
index 0c519adcd0..c12321e8f8 100644
--- a/sysupgrade/distinfo
+++ b/sysupgrade/distinfo
@@ -3,6 +3,6 @@ $NetBSD: distinfo,v 1.13 2022/04/15 09:10:56 nia Exp $
 BLAKE2s (sysupgrade-1.5.tar.gz) = 5fb73e83c7b9b1a891ce0cfb26422f07822061e2df42db6a4e3692468d028186
 SHA512 (sysupgrade-1.5.tar.gz) = 47f37ce6802b8ba74d6edd19a2c80d46394c992b58d3077e6d1316e4f5505afbe53a68d28b28779a10a78d7be05f2f5b9d2a55b5b2f845bcc59a78950a8306f8
 Size (sysupgrade-1.5.tar.gz) = 75833 bytes
-SHA1 (patch-default.conf) = 2457714998c86994192ef57c5dd22646f76828c4
+SHA1 (patch-default.conf) = 3807bf21603a4ffc4407093b20ca84c04517875b
 SHA1 (patch-sysupgrade.conf.5.in) = 2e1c0602fd58edb13abac98bf5db0b1e17360d20
 SHA1 (patch-sysupgrade.sh) = a20926d0012a0797aa6f8363661d1a94d14de126
diff --git a/sysupgrade/patches/patch-default.conf b/sysupgrade/patches/patch-default.conf
index 83f6e6c541..a61ca8254b 100644
--- a/sysupgrade/patches/patch-default.conf
+++ b/sysupgrade/patches/patch-default.conf
@@ -17,7 +17,7 @@ $NetBSD: patch-default.conf,v 1.3 2021/03/14 08:44:01 nia Exp $
 +# Upgrade to the latest snapshot of the current branch
 +#RELEASEDIR="https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/latest/$(uname -m)"
 +# Upgrade to the latest snapshot of a stable branch
-+RELEASEDIR="https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/$(uname -m)"
++RELEASEDIR="https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-$(uname -r | cut -d. -f1)/latest/$(uname -m)"
  
  # Name of the kernel to be installed.
  KERNEL=AUTO  # Guess from /netbsd (requires config(1)).