CVS commit: pkgsrc/sysutils/sysupgrade

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Thu Jun  6 16:30:13 UTC 2019

Modified Files:
        pkgsrc/sysutils/sysupgrade: distinfo
        pkgsrc/sysutils/sysupgrade/patches: patch-default.conf
            patch-sysupgrade.sh

Log Message:
Fix patch comment and default.conf

Thanks to leot@


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/sysupgrade/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/sysupgrade/patches/patch-default.conf
cvs rdiff -u -r1.2 -r1.3 \
    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.

Modified files:

Index: pkgsrc/sysutils/sysupgrade/distinfo
diff -u pkgsrc/sysutils/sysupgrade/distinfo:1.4 pkgsrc/sysutils/sysupgrade/distinfo:1.5
--- pkgsrc/sysutils/sysupgrade/distinfo:1.4     Mon Jun  3 20:35:55 2019
+++ pkgsrc/sysutils/sysupgrade/distinfo Thu Jun  6 16:30:13 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2019/06/03 20:35:55 triaxx Exp $
+$NetBSD: distinfo,v 1.5 2019/06/06 16:30:13 triaxx Exp $
 
 SHA1 (sysupgrade-1.5.tar.gz) = 3141ee4728d6d3b680ed04f552369031bb3b3b09
 RMD160 (sysupgrade-1.5.tar.gz) = 5b1d7c6d45643f2f03bff1df16739a6751d0ceda
 SHA512 (sysupgrade-1.5.tar.gz) = 47f37ce6802b8ba74d6edd19a2c80d46394c992b58d3077e6d1316e4f5505afbe53a68d28b28779a10a78d7be05f2f5b9d2a55b5b2f845bcc59a78950a8306f8
 Size (sysupgrade-1.5.tar.gz) = 75833 bytes
-SHA1 (patch-default.conf) = 9c5163b5342c7306973df5a61dd13622265f5142
+SHA1 (patch-default.conf) = ff367ebbdc56e1009a57a8bd254c424033257726
 SHA1 (patch-sysupgrade.conf.5.in) = dfe5d90d0360212ea052f2e25a26820ad277480b
-SHA1 (patch-sysupgrade.sh) = 52a3cf92d7fa4d5ea795de8f74b44f8b86328c86
+SHA1 (patch-sysupgrade.sh) = e84a8ea01fca16734206a864b0a51f38c27489a8

Index: pkgsrc/sysutils/sysupgrade/patches/patch-default.conf
diff -u pkgsrc/sysutils/sysupgrade/patches/patch-default.conf:1.1 pkgsrc/sysutils/sysupgrade/patches/patch-default.conf:1.2
--- pkgsrc/sysutils/sysupgrade/patches/patch-default.conf:1.1   Mon Jun  3 20:35:55 2019
+++ pkgsrc/sysutils/sysupgrade/patches/patch-default.conf       Thu Jun  6 16:30:13 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-default.conf,v 1.1 2019/06/03 20:35:55 triaxx Exp $
+$NetBSD: patch-default.conf,v 1.2 2019/06/06 16:30:13 triaxx Exp $
 
 * Add variable for archive file extension
 
@@ -11,4 +11,4 @@ $NetBSD: patch-default.conf,v 1.1 2019/0
 +
 +# Archive file extension of the sets. For now it can be either 'tgz' or
 +# 'tar.xz'.
-+#ARCHIVE=tar.xz
++#ARCHIVE_EXTENSION=tar.xz

Index: pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh
diff -u pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh:1.2 pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh:1.3
--- pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh:1.2  Mon Jun  3 20:35:55 2019
+++ pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh      Thu Jun  6 16:30:13 2019
@@ -1,6 +1,7 @@
-$NetBSD: patch-sysupgrade.sh,v 1.2 2019/06/03 20:35:55 triaxx Exp $
+$NetBSD: patch-sysupgrade.sh,v 1.3 2019/06/06 16:30:13 triaxx Exp $
 
-Don't reject https
+* Don't reject https in sysupgrade_fetch()
+* Add ARCHIVE_EXTENSION variable (Fix PR pkg/53697)
 
 --- sysupgrade.sh.orig 2013-07-28 21:27:57.000000000 +0000
 +++ sysupgrade.sh