Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rke2-1.34 for openSUSE:Factory checked in at 2026-04-11 22:25:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rke2-1.34 (Old) and /work/SRC/openSUSE:Factory/.rke2-1.34.new.21863 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rke2-1.34" Sat Apr 11 22:25:49 2026 rev:6 rq:1346011 version:1.34.6+rke2r3 Changes: -------- --- /work/SRC/openSUSE:Factory/rke2-1.34/rke2-1.34.changes 2026-04-02 17:43:07.628215910 +0200 +++ /work/SRC/openSUSE:Factory/.rke2-1.34.new.21863/rke2-1.34.changes 2026-04-11 22:30:06.517554820 +0200 @@ -1,0 +2,7 @@ +Fri Apr 10 08:43:29 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 1.34.6+rke2r3 (r2 was not released): + * Details see + https://github.com/rancher/rke2/releases/tag/v1.34.6+rke2r3 + +------------------------------------------------------------------- Old: ---- rke2-1.34.6+rke2r1.obscpio New: ---- rke2-1.34.6+rke2r3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rke2-1.34.spec ++++++ --- /var/tmp/diff_new_pack.1SBntV/_old 2026-04-11 22:30:07.725604228 +0200 +++ /var/tmp/diff_new_pack.1SBntV/_new 2026-04-11 22:30:07.733604555 +0200 @@ -34,7 +34,7 @@ %define hardened_etcd_version build20260227 Name: rke2-1.34 -Version: 1.34.6+rke2r1 +Version: 1.34.6+rke2r3 Release: 0 Summary: Rancher Kubernetes Engine License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.1SBntV/_old 2026-04-11 22:30:07.805607501 +0200 +++ /var/tmp/diff_new_pack.1SBntV/_new 2026-04-11 22:30:07.813607828 +0200 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="manual"> <param name="url">https://github.com/rancher/rke2</param> <param name="scm">git</param> - <param name="revision">v1.34.6+rke2r1</param> + <param name="revision">v1.34.6+rke2r3</param> <param name="versionformat">@PARENT_TAG@</param> <param name="package-meta">yes</param> <param name="changesgenerate">disable</param> ++++++ rke2-1.34.6+rke2r1.obscpio -> rke2-1.34.6+rke2r3.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/HEAD new/rke2-1.34.6+rke2r3/.git/HEAD --- old/rke2-1.34.6+rke2r1/.git/HEAD 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/HEAD 2026-04-07 20:44:58.000000000 +0200 @@ -1 +1 @@ -e173ab4fee0a538b658b3480870a5af378622a2c +ac640401f29391d11e96099ada919d0a7273151f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/ORIG_HEAD new/rke2-1.34.6+rke2r3/.git/ORIG_HEAD --- old/rke2-1.34.6+rke2r1/.git/ORIG_HEAD 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/ORIG_HEAD 2026-04-07 20:44:58.000000000 +0200 @@ -1 +1 @@ -e173ab4fee0a538b658b3480870a5af378622a2c +ac640401f29391d11e96099ada919d0a7273151f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/applypatch-msg.sample new/rke2-1.34.6+rke2r3/.git/hooks/applypatch-msg.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/applypatch-msg.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/applypatch-msg.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to check the commit log message taken by # applypatch from an e-mail message. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/commit-msg.sample new/rke2-1.34.6+rke2r3/.git/hooks/commit-msg.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/commit-msg.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/commit-msg.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to check the commit log message. # Called by "git commit" with one argument, the name of the file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/fsmonitor-watchman.sample new/rke2-1.34.6+rke2r3/.git/hooks/fsmonitor-watchman.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/fsmonitor-watchman.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/fsmonitor-watchman.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/84mhqfj9amzyvxhp37yh3b0zd8sq0a7p-perl-5.40.0/bin/perl +#!/nix/store/x17gg3w7lcwiqscqmif25688sivchwsn-perl-5.40.0/bin/perl use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/post-update.sample new/rke2-1.34.6+rke2r3/.git/hooks/post-update.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/post-update.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/post-update.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to prepare a packed repository for use over # dumb transports. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/pre-applypatch.sample new/rke2-1.34.6+rke2r3/.git/hooks/pre-applypatch.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/pre-applypatch.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/pre-applypatch.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to verify what is about to be committed # by applypatch from an e-mail message. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/pre-commit.sample new/rke2-1.34.6+rke2r3/.git/hooks/pre-commit.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/pre-commit.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/pre-commit.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to verify what is about to be committed. # Called by "git commit" with no arguments. The hook should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/pre-merge-commit.sample new/rke2-1.34.6+rke2r3/.git/hooks/pre-merge-commit.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/pre-merge-commit.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/pre-merge-commit.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to verify what is about to be committed. # Called by "git merge" with no arguments. The hook should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/pre-push.sample new/rke2-1.34.6+rke2r3/.git/hooks/pre-push.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/pre-push.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/pre-push.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # An example hook script to verify what is about to be pushed. Called by "git # push" after it has checked the remote status, but before anything has been diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/pre-rebase.sample new/rke2-1.34.6+rke2r3/.git/hooks/pre-rebase.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/pre-rebase.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/pre-rebase.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # Copyright (c) 2006, 2008 Junio C Hamano # @@ -65,7 +65,7 @@ fi else not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /nix/store/84mhqfj9amzyvxhp37yh3b0zd8sq0a7p-perl-5.40.0/bin/perl -e ' + /nix/store/x17gg3w7lcwiqscqmif25688sivchwsn-perl-5.40.0/bin/perl -e ' my $topic = $ARGV[0]; my $msg = "* $topic has commits already merged to public branch:\n"; my (%not_in_next) = map { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/pre-receive.sample new/rke2-1.34.6+rke2r3/.git/hooks/pre-receive.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/pre-receive.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/pre-receive.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to make use of push options. # The example simply echoes all push options that start with 'echoback=' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/prepare-commit-msg.sample new/rke2-1.34.6+rke2r3/.git/hooks/prepare-commit-msg.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/prepare-commit-msg.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/prepare-commit-msg.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to prepare the commit log message. # Called by "git commit" with the name of the file that has the @@ -24,11 +24,11 @@ COMMIT_SOURCE=$2 SHA1=$3 -/nix/store/84mhqfj9amzyvxhp37yh3b0zd8sq0a7p-perl-5.40.0/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" +/nix/store/x17gg3w7lcwiqscqmif25688sivchwsn-perl-5.40.0/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" # case "$COMMIT_SOURCE,$SHA1" in # ,|template,) -# /nix/store/84mhqfj9amzyvxhp37yh3b0zd8sq0a7p-perl-5.40.0/bin/perl -i.bak -pe ' +# /nix/store/x17gg3w7lcwiqscqmif25688sivchwsn-perl-5.40.0/bin/perl -i.bak -pe ' # print "\n" . `git diff --cached --name-status -r` # if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; # *) ;; @@ -38,5 +38,5 @@ # git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" # if test -z "$COMMIT_SOURCE" # then -# /nix/store/84mhqfj9amzyvxhp37yh3b0zd8sq0a7p-perl-5.40.0/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# /nix/store/x17gg3w7lcwiqscqmif25688sivchwsn-perl-5.40.0/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" # fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/push-to-checkout.sample new/rke2-1.34.6+rke2r3/.git/hooks/push-to-checkout.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/push-to-checkout.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/push-to-checkout.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # An example hook script to update a checked-out tree on a git push. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/sendemail-validate.sample new/rke2-1.34.6+rke2r3/.git/hooks/sendemail-validate.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/sendemail-validate.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/sendemail-validate.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # An example hook script to validate a patch (and/or patch series) before # sending it via email. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/hooks/update.sample new/rke2-1.34.6+rke2r3/.git/hooks/update.sample --- old/rke2-1.34.6+rke2r1/.git/hooks/update.sample 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/hooks/update.sample 2026-04-07 20:44:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/6ph0zypyfc09fw6hlc1ygjvk2hv4j9vd-bash-5.3p3/bin/bash +#!/nix/store/wv8bpzriikv65xnd1vciqpq7rnr8h2q2-bash-5.3p3/bin/bash # # An example hook script to block unannotated tags from entering. # Called by "git receive-pack" with arguments: refname sha1-old sha1-new Binary files old/rke2-1.34.6+rke2r1/.git/index and new/rke2-1.34.6+rke2r3/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/logs/HEAD new/rke2-1.34.6+rke2r3/.git/logs/HEAD --- old/rke2-1.34.6+rke2r1/.git/logs/HEAD 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/logs/HEAD 2026-04-07 20:44:58.000000000 +0200 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 2e47c22f45640d37dd0f7ea9c9deb24571654f26 kastl <[email protected]> 1774959721 +0200 clone: from https://github.com/rancher/rke2 -2e47c22f45640d37dd0f7ea9c9deb24571654f26 e173ab4fee0a538b658b3480870a5af378622a2c kastl <[email protected]> 1774959721 +0200 checkout: moving from master to v1.34.6+rke2r1 +0000000000000000000000000000000000000000 9513cee66386989327f8f6f2917d3193ea2deea6 Johannes Kastl <[email protected]> 1775810496 +0200 clone: from https://github.com/rancher/rke2 +9513cee66386989327f8f6f2917d3193ea2deea6 ac640401f29391d11e96099ada919d0a7273151f Johannes Kastl <[email protected]> 1775810496 +0200 checkout: moving from master to v1.34.6+rke2r3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/logs/refs/heads/master new/rke2-1.34.6+rke2r3/.git/logs/refs/heads/master --- old/rke2-1.34.6+rke2r1/.git/logs/refs/heads/master 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/logs/refs/heads/master 2026-04-07 20:44:58.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 2e47c22f45640d37dd0f7ea9c9deb24571654f26 kastl <[email protected]> 1774959721 +0200 clone: from https://github.com/rancher/rke2 +0000000000000000000000000000000000000000 9513cee66386989327f8f6f2917d3193ea2deea6 Johannes Kastl <[email protected]> 1775810496 +0200 clone: from https://github.com/rancher/rke2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/logs/refs/remotes/origin/HEAD new/rke2-1.34.6+rke2r3/.git/logs/refs/remotes/origin/HEAD --- old/rke2-1.34.6+rke2r1/.git/logs/refs/remotes/origin/HEAD 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/logs/refs/remotes/origin/HEAD 2026-04-07 20:44:58.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 2e47c22f45640d37dd0f7ea9c9deb24571654f26 kastl <[email protected]> 1774959721 +0200 clone: from https://github.com/rancher/rke2 +0000000000000000000000000000000000000000 9513cee66386989327f8f6f2917d3193ea2deea6 Johannes Kastl <[email protected]> 1775810496 +0200 clone: from https://github.com/rancher/rke2 Binary files old/rke2-1.34.6+rke2r1/.git/objects/pack/pack-67243ed149ee7db9d7eea45e9de92b06f52a5859.idx and new/rke2-1.34.6+rke2r3/.git/objects/pack/pack-67243ed149ee7db9d7eea45e9de92b06f52a5859.idx differ Binary files old/rke2-1.34.6+rke2r1/.git/objects/pack/pack-67243ed149ee7db9d7eea45e9de92b06f52a5859.pack and new/rke2-1.34.6+rke2r3/.git/objects/pack/pack-67243ed149ee7db9d7eea45e9de92b06f52a5859.pack differ Binary files old/rke2-1.34.6+rke2r1/.git/objects/pack/pack-67243ed149ee7db9d7eea45e9de92b06f52a5859.rev and new/rke2-1.34.6+rke2r3/.git/objects/pack/pack-67243ed149ee7db9d7eea45e9de92b06f52a5859.rev differ Binary files old/rke2-1.34.6+rke2r1/.git/objects/pack/pack-adf67f4d5b9e36167ce786e9e211ca2159d8f0f2.idx and new/rke2-1.34.6+rke2r3/.git/objects/pack/pack-adf67f4d5b9e36167ce786e9e211ca2159d8f0f2.idx differ Binary files old/rke2-1.34.6+rke2r1/.git/objects/pack/pack-adf67f4d5b9e36167ce786e9e211ca2159d8f0f2.pack and new/rke2-1.34.6+rke2r3/.git/objects/pack/pack-adf67f4d5b9e36167ce786e9e211ca2159d8f0f2.pack differ Binary files old/rke2-1.34.6+rke2r1/.git/objects/pack/pack-adf67f4d5b9e36167ce786e9e211ca2159d8f0f2.rev and new/rke2-1.34.6+rke2r3/.git/objects/pack/pack-adf67f4d5b9e36167ce786e9e211ca2159d8f0f2.rev differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/packed-refs new/rke2-1.34.6+rke2r3/.git/packed-refs --- old/rke2-1.34.6+rke2r1/.git/packed-refs 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/packed-refs 2026-04-07 20:44:58.000000000 +0200 @@ -4,12 +4,13 @@ 5b9fdf92b7abe2e65cde6dec1acb527682ae82bc refs/remotes/origin/copilot/backport-pr-9555-to-release-1-34 29c55e1911d9fe7ef6bb1056b52326b4da8ab06b refs/remotes/origin/copilot/backport-pr-9555-to-release-1-35 a3ca814f39367ebaea80402d5bcb01a0424cafed refs/remotes/origin/copilot/backport-pr-9590-release-1-32 +2e47c22f45640d37dd0f7ea9c9deb24571654f26 refs/remotes/origin/copilot/check-axios-in-repository b71ab4093cfcfce211850b1664385c7c34ea96c9 refs/remotes/origin/copilot/cherry-pick-pr-9590 6953922bb4f3ef404d4112cbad27b0c80ad1e02a refs/remotes/origin/copilot/cherry-pick-pr-9590-to-release-1-35 228ced060742fd9ba730892452de2e88d8c71a40 refs/remotes/origin/copilot/cherry-pick-pr9590-to-release-1-33 650a63548f44bcd5612add6e07d09fd36f16b76b refs/remotes/origin/copilot/update-charts-and-images-versions 52bbcff014884572a436abd1aec7f09e7432566f refs/remotes/origin/copilot/update-cli-policy -1089eec2bf3030718195590db0f8e454300ba0ad refs/remotes/origin/dependabot/github_actions/actions/setup-go-6.4.0 +28b32e4229f1ce4bd912735347445ac49903f09e refs/remotes/origin/dependabot/github_actions/actions/setup-go-6.4.0 ad7f18810af4eaafbe7b89a5eab13954729ebd1c refs/remotes/origin/dependabot/github_actions/codecov/codecov-action-6.0.0 0de3696851e327bf17e3771ef5b1cf9760eff940 refs/remotes/origin/dependabot/github_actions/docker/setup-buildx-action-4.0.0 e726c893e53b6d344b33ecb3b9209aa50618c2bf refs/remotes/origin/dependabot/github_actions/rancher/ecm-distro-tools-0.66.2 @@ -18,9 +19,10 @@ 8fdbfeae953baad3d0ad752f4915d590788d4ad0 refs/remotes/origin/dependabot/go_modules/github.com/buger/jsonparser-1.1.2 90139132fdf57e241f0a0aa9780065523a3d4510 refs/remotes/origin/dependabot/go_modules/github.com/containernetworking/plugins-1.9.0 f9595d42a0a6c4849535c813734fd21b2d284910 refs/remotes/origin/dependabot/go_modules/github.com/nats-io/nats-server/v2-2.12.6 +7e8caa75f859f383f25cfee48a78aec834d4bcdc refs/remotes/origin/dependabot/go_modules/go.opentelemetry.io/otel/sdk-1.43.0 4981fe19ef2e246c7c61b3c80b1517d8f4264486 refs/remotes/origin/e2e.qase.report 6a6aafa7958fb3e04e5b370e1d9b4a2df6726d8a refs/remotes/origin/gh-pages -2e47c22f45640d37dd0f7ea9c9deb24571654f26 refs/remotes/origin/master +9513cee66386989327f8f6f2917d3193ea2deea6 refs/remotes/origin/master 3e0e3ba0ad85566ab8ff3fe9b2637654547dcf86 refs/remotes/origin/november_2025_master ad6f2bd5821f2ccea8dabc4b3a02ed54021bb24b refs/remotes/origin/release-1.18 9c031fcd2e6acb542d0e410fde0b8087a36d0fec refs/remotes/origin/release-1.19 @@ -36,10 +38,10 @@ ce7981a2f42e217dcf6dea806f9a97dde9ca78be refs/remotes/origin/release-1.29 66f8993a6f9315ce760211954c1a6c28db36cf73 refs/remotes/origin/release-1.30 727f70ecadd1e07faa12f66ce6f1f26634d11fd1 refs/remotes/origin/release-1.31 -80b231cda3bd47bafa2051ff777931f816e9191a refs/remotes/origin/release-1.32 -cd5a6cfeae3b1eaa7544f944458ad37d66c41cef refs/remotes/origin/release-1.33 -e173ab4fee0a538b658b3480870a5af378622a2c refs/remotes/origin/release-1.34 -b3cd4c0c7425c25a7cff8e98861a513490c1707c refs/remotes/origin/release-1.35 +d2b2137dd2cdfd43ca1aa5a0faa29fcfaf633019 refs/remotes/origin/release-1.32 +2dcec00118382207a15bd0d219b8e45cd8b02b2f refs/remotes/origin/release-1.33 +ac640401f29391d11e96099ada919d0a7273151f refs/remotes/origin/release-1.34 +b875dde727128d4ea23e0f4bcc0588341e89358a refs/remotes/origin/release-1.35 7a9a9c969d254518135879e1362c9faa2983efd0 refs/tags/v0.0.1-alpha.1 ce16c4ac8967c5b76dcaa5f73bb2287d0ef61b84 refs/tags/v0.0.1-alpha.2 880410a2b26b9654e582b3233990b5c781e03125 refs/tags/v0.0.1-alpha.3 @@ -955,7 +957,11 @@ 74d4362acaa7234e3fc909841cdaf906c73eb6f5 refs/tags/v1.32.12-rc1+rke2r1 a361386c83e8e581c2634a408bc7e4dd44fdcedc refs/tags/v1.32.13+rke2r1 78473a52d2c064aadd5c62070840703d66171cc4 refs/tags/v1.32.13-rc1+rke2r1 +95c8660af2ea6001f8d3e11c973c29c8b912dc94 refs/tags/v1.32.13-rc1+rke2r2 a361386c83e8e581c2634a408bc7e4dd44fdcedc refs/tags/v1.32.13-rc2+rke2r1 +18b18b7d5f73ebd7dfefb64cde5105840e9b03c5 refs/tags/v1.32.13-rc2+rke2r2 +1446dcdf3321382728634bfb1f19d12eb329df5b refs/tags/v1.32.13-rc3+rke2r2 +d2b2137dd2cdfd43ca1aa5a0faa29fcfaf633019 refs/tags/v1.32.13-rc4+rke2r2 8a5c3a23c25cc9b423a303be5f4f1c0e8b885726 refs/tags/v1.32.2+rke2r1 4cb6e78fe6ba09d76077c0f465b19724871af4a0 refs/tags/v1.32.2-rc1+rke2r1 a7a4e58ed62f6a097e011c7d53b121eaac44c65e refs/tags/v1.32.2-rc2+rke2r1 @@ -991,7 +997,11 @@ 74f203f0085700de05320e44ef99d0ce19a8be34 refs/tags/v1.33.1-rc1+rke2r1 01d605e84711a636d407f6a87060425373b9f09e refs/tags/v1.33.1-rc2+rke2r1 cd5a6cfeae3b1eaa7544f944458ad37d66c41cef refs/tags/v1.33.10+rke2r1 +298a1f75d5d2c99db913b49f93945cc3a17b7d5b refs/tags/v1.33.10+rke2r2 +2dcec00118382207a15bd0d219b8e45cd8b02b2f refs/tags/v1.33.10+rke2r3 9fd70cc5f0dc3c333d7b845654c598fb5ccd5fb9 refs/tags/v1.33.10-rc1+rke2r1 +edd165830dadcd2ed4a3e0d0766523eaeb594712 refs/tags/v1.33.10-rc1+rke2r2 +2dcec00118382207a15bd0d219b8e45cd8b02b2f refs/tags/v1.33.10-rc1+rke2r3 69b223e0f3b3fed70a6a7bcd5a57e453ea637b68 refs/tags/v1.33.10-rc2+rke2r1 b8ec3da5c7897ead9e5b19917a1d87bf23e04749 refs/tags/v1.33.10-rc3+rke2r1 cd5a6cfeae3b1eaa7544f944458ad37d66c41cef refs/tags/v1.33.10-rc4+rke2r1 @@ -1055,7 +1065,11 @@ 474bcc2f701efae453caadc2a03b52d988d6c722 refs/tags/v1.34.5-rc1+rke2r1 105ddbd880270e1edcf8ea26a73e1f9be922ec83 refs/tags/v1.34.5-rc2+rke2r1 e173ab4fee0a538b658b3480870a5af378622a2c refs/tags/v1.34.6+rke2r1 +5a558e9c9b8eec4515d59ed50d8b501e53be4093 refs/tags/v1.34.6+rke2r2 +ac640401f29391d11e96099ada919d0a7273151f refs/tags/v1.34.6+rke2r3 29eb28c776838e5003ff26953e9c22dd1fcdcdca refs/tags/v1.34.6-rc1+rke2r1 +fd11d3016bc59cb32e5c1a860250b031f7d26dcb refs/tags/v1.34.6-rc1+rke2r2 +ac640401f29391d11e96099ada919d0a7273151f refs/tags/v1.34.6-rc1+rke2r3 d637bb592549a2c49dca418f64c71517b20d24c3 refs/tags/v1.34.6-rc2+rke2r1 e173ab4fee0a538b658b3480870a5af378622a2c refs/tags/v1.34.6-rc3+rke2r1 e173ab4fee0a538b658b3480870a5af378622a2c refs/tags/v1.34.6-rc4+rke2r1 @@ -1075,6 +1089,10 @@ 3c929096f3c651267e58c436db3c440f7b92a87e refs/tags/v1.35.2-rc1+rke2r1 b1cd9d8e735bcd84cad7407109423a8dd7b648d8 refs/tags/v1.35.2-rc2+rke2r1 b3cd4c0c7425c25a7cff8e98861a513490c1707c refs/tags/v1.35.3+rke2r1 +70522f16e9541c366396f02d2f622da8997618b7 refs/tags/v1.35.3+rke2r2 +b875dde727128d4ea23e0f4bcc0588341e89358a refs/tags/v1.35.3+rke2r3 c73082ab8d5659e149b22911a370cb9710397afa refs/tags/v1.35.3-rc1+rke2r1 +f2ca376674d9b7205633a784e80a4f27ba7c767e refs/tags/v1.35.3-rc1+rke2r2 +b875dde727128d4ea23e0f4bcc0588341e89358a refs/tags/v1.35.3-rc1+rke2r3 61c8b0d717bf306b5034e38280767fac4d115a01 refs/tags/v1.35.3-rc2+rke2r1 b3cd4c0c7425c25a7cff8e98861a513490c1707c refs/tags/v1.35.3-rc3+rke2r1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.git/refs/heads/master new/rke2-1.34.6+rke2r3/.git/refs/heads/master --- old/rke2-1.34.6+rke2r1/.git/refs/heads/master 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.git/refs/heads/master 2026-04-07 20:44:58.000000000 +0200 @@ -1 +1 @@ -2e47c22f45640d37dd0f7ea9c9deb24571654f26 +9513cee66386989327f8f6f2917d3193ea2deea6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.github/actions/vagrant-setup/action.yaml new/rke2-1.34.6+rke2r3/.github/actions/vagrant-setup/action.yaml --- old/rke2-1.34.6+rke2r1/.github/actions/vagrant-setup/action.yaml 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.github/actions/vagrant-setup/action.yaml 2026-04-07 20:44:58.000000000 +0200 @@ -27,4 +27,11 @@ sudo chmod a+rw /var/run/libvirt/libvirt-sock - name: Install vagrant-libvirt plugin shell: bash - run: vagrant plugin install vagrant-libvirt \ No newline at end of file + env: + VAGRANT_LIBVIRT_VERSION: "0.12.2" + VAGRANT_LIBVIRT_CHECKSUM: "34c8918eb550a36522f67389c290e6349524fbde60b13f39a7014c222c376f04" + run: | + curl -fsSL "https://rubygems.org/gems/vagrant-libvirt-${VAGRANT_LIBVIRT_VERSION}.gem" -o vagrant-libvirt.gem + echo "${VAGRANT_LIBVIRT_CHECKSUM} vagrant-libvirt.gem" | sha256sum -c + vagrant plugin install vagrant-libvirt.gem + rm -f vagrant-libvirt.gem \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/.github/workflows/test-suite.yaml new/rke2-1.34.6+rke2r3/.github/workflows/test-suite.yaml --- old/rke2-1.34.6+rke2r1/.github/workflows/test-suite.yaml 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/.github/workflows/test-suite.yaml 2026-04-07 20:44:58.000000000 +0200 @@ -247,15 +247,38 @@ ~/.vagrant.d/boxes key: vagrant-box-ubuntu-2404 - name: "Vagrant Plugin(s)" - run: vagrant plugin install vagrant-rke2 vagrant-reload vagrant-scp + env: + VAGRANT_RKE2_VERSION: "0.2.0" + VAGRANT_RKE2_CHECKSUM: "b91dbeee2e7f35d4849ff149ce3d4bdb35f1e594b5a889c48b28a2fce346277d" + VAGRANT_RELOAD_VERSION: "0.0.1" + VAGRANT_RELOAD_CHECKSUM: "aa03d5e52737586bd5dab740c8bc61690e63c75c0d96383d9bea7520fa05be6a" + VAGRANT_SCP_VERSION: "0.5.9" + VAGRANT_SCP_CHECKSUM: "e3adda6c6a059f10e9edfa90a8f08892493010f176a18360a5d92d92847cf329" + run: | + for plugin in "vagrant-rke2:${VAGRANT_RKE2_VERSION}:${VAGRANT_RKE2_CHECKSUM}" \ + "vagrant-reload:${VAGRANT_RELOAD_VERSION}:${VAGRANT_RELOAD_CHECKSUM}" \ + "vagrant-scp:${VAGRANT_SCP_VERSION}:${VAGRANT_SCP_CHECKSUM}"; do + name="${plugin%%:*}" + rest="${plugin#*:}" + version="${rest%%:*}" + checksum="${rest##*:}" + curl -fsSL "https://rubygems.org/gems/${name}-${version}.gem" -o "${name}.gem" + echo "${checksum} ${name}.gem" | sha256sum -c + vagrant plugin install "${name}.gem" + rm -f "${name}.gem" + done - name: Install Go uses: ./.github/actions/setup-go - name: Install Kubectl + env: + KUBECTL_VERSION: "v1.34.6" + KUBECTL_CHECKSUM: "3166155b17198c0af34ff5a360bd4d9d58db98bafadc6f3c2a57ae560563cd6b" run: | - STABLE_VERSION=$(yq '.channels[] | select(.name == "stable") | .latest | sub("\+.*", "")' channels.yaml) - curl --retry 3 -LO "https://dl.k8s.io/release/${STABLE_VERSION}/bin/linux/amd64/kubectl" + curl --retry 3 -fsSL "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" -o kubectl + echo "${KUBECTL_CHECKSUM} kubectl" | sha256sum -c sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl + rm -f kubectl - name: Download RKE2 Binary and Runtime Image uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5 with: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/Dockerfile new/rke2-1.34.6+rke2r3/Dockerfile --- old/rke2-1.34.6+rke2r1/Dockerfile 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/Dockerfile 2026-04-07 20:44:58.000000000 +0200 @@ -110,7 +110,7 @@ # This image includes any host level programs that we might need. All binaries # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host -FROM rancher/hardened-kubernetes:v1.34.6-rke2r1-build20260319 AS kubernetes +FROM rancher/hardened-kubernetes:v1.34.6-rke2r3-build20260407 AS kubernetes FROM rancher/hardened-containerd:v2.2.2-k3s1-build20260312 AS containerd FROM rancher/hardened-crictl:v1.34.0-build20260303 AS crictl FROM rancher/hardened-runc:v1.4.1-build20260313 AS runc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/charts/chart_versions.yaml new/rke2-1.34.6+rke2r3/charts/chart_versions.yaml --- old/rke2-1.34.6+rke2r1/charts/chart_versions.yaml 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/charts/chart_versions.yaml 2026-04-07 20:44:58.000000000 +0200 @@ -14,7 +14,7 @@ - version: 1.45.205 filename: /charts/rke2-coredns.yaml bootstrap: true - - version: 4.14.501 + - version: 4.14.503 filename: /charts/rke2-ingress-nginx.yaml bootstrap: false - version: 39.0.502 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/scripts/build-images new/rke2-1.34.6+rke2r3/scripts/build-images --- old/rke2-1.34.6+rke2r1/scripts/build-images 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/scripts/build-images 2026-04-07 20:44:58.000000000 +0200 @@ -20,9 +20,16 @@ # When packaging images.txt, we use docker as rke2-runtime only exists locally PULL_CMD_CORE="${PULL_CMD_CORE:-docker image pull --quiet}" -INGRESS_NGINX_TAG=v1.14.5-hardened1 +INGRESS_NGINX_HARDENED_TAG=v1.14.5-hardened1 +INGRESS_NGINX_PRIME_TAG=v1.14.5-prime1 +INGRESS_IMAGES=" + ${REGISTRY}/rancher/kube-webhook-certgen:${INGRESS_NGINX_HARDENED_TAG} + ${REGISTRY}/rancher/nginx-ingress-controller:${INGRESS_NGINX_HARDENED_TAG}" + if [ "${REGISTRY}" != "docker.io" ]; then - INGRESS_NGINX_TAG=v1.14.5-prime1 + INGRESS_IMAGES="${INGRESS_IMAGES} + ${REGISTRY}/rancher/kube-webhook-certgen:${INGRESS_NGINX_PRIME_TAG} + ${REGISTRY}/rancher/nginx-ingress-controller:${INGRESS_NGINX_PRIME_TAG}" fi xargs -n1 -t $PULL_CMD_CORE << EOF >> $BUILD_DIR/images-core.txt @@ -36,8 +43,7 @@ ${REGISTRY}/rancher/klipper-helm:${KLIPPERHELM_VERSION} ${REGISTRY}/rancher/klipper-lb:v0.4.15 ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION} - ${REGISTRY}/rancher/kube-webhook-certgen:${INGRESS_NGINX_TAG} - ${REGISTRY}/rancher/nginx-ingress-controller:${INGRESS_NGINX_TAG} + ${INGRESS_IMAGES} ${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION} ${REGISTRY}/rancher/hardened-snapshot-controller:v8.4.0-build20260205 EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/scripts/version.sh new/rke2-1.34.6+rke2r3/scripts/version.sh --- old/rke2-1.34.6+rke2r1/scripts/version.sh 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/scripts/version.sh 2026-04-07 20:44:58.000000000 +0200 @@ -34,7 +34,7 @@ RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.34.6} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.34.6-rke2r1-build20260319} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.34.6-rke2r3-build20260407} ETCD_VERSION=${ETCD_VERSION:-v3.6.7-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.34.4-0.20260211145917-c6017918a65c-build20260211} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.34.6+rke2r1/tests/e2e/scripts/install_sonobuoy.sh new/rke2-1.34.6+rke2r3/tests/e2e/scripts/install_sonobuoy.sh --- old/rke2-1.34.6+rke2r1/tests/e2e/scripts/install_sonobuoy.sh 2026-03-27 22:26:23.000000000 +0100 +++ new/rke2-1.34.6+rke2r3/tests/e2e/scripts/install_sonobuoy.sh 2026-04-07 20:44:58.000000000 +0200 @@ -1,5 +1,16 @@ #!/bin/bash +set -e + +SONOBUOY_VERSION="0.56.0" +SONOBUOY_CHECKSUM="01e35fbe2c402a31a766b3f46fe3280136f67d39e153c0b517d035b61608a28d" + +SONOBUOY_PLUGINS_COMMIT="9359729a5a5948250aae78cb8b4b0eda87c0caaf" + git clone https://github.com/phillipsj/my-sonobuoy-plugins.git -wget -q https://github.com/vmware-tanzu/sonobuoy/releases/download/v0.56.0/sonobuoy_0.56.0_linux_amd64.tar.gz -tar -xvf sonobuoy_0.56.0_linux_amd64.tar.gz -chmod +x sonobuoy && mv sonobuoy /usr/local/bin/sonobuoy \ No newline at end of file +cd my-sonobuoy-plugins && git checkout "${SONOBUOY_PLUGINS_COMMIT}" && cd .. + +curl -fsSL "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_amd64.tar.gz" -o sonobuoy.tar.gz +echo "${SONOBUOY_CHECKSUM} sonobuoy.tar.gz" | sha256sum -c +tar -xvf sonobuoy.tar.gz sonobuoy +chmod +x sonobuoy && mv sonobuoy /usr/local/bin/sonobuoy +rm -f sonobuoy.tar.gz ++++++ rke2.obsinfo ++++++ --- /var/tmp/diff_new_pack.1SBntV/_old 2026-04-11 22:30:09.881692412 +0200 +++ /var/tmp/diff_new_pack.1SBntV/_new 2026-04-11 22:30:09.885692576 +0200 @@ -1,5 +1,5 @@ name: rke2 -version: 1.34.6+rke2r1 -mtime: 1774646783 -commit: e173ab4fee0a538b658b3480870a5af378622a2c +version: 1.34.6+rke2r3 +mtime: 1775587498 +commit: ac640401f29391d11e96099ada919d0a7273151f ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/rke2-1.34/vendor.tar.gz /work/SRC/openSUSE:Factory/.rke2-1.34.new.21863/vendor.tar.gz differ: char 13, line 1
