openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2024
- 2 participants
- 1220 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cilium-cli for openSUSE:Factory checked in at 2024-06-03 17:42:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cilium-cli (Old)
and /work/SRC/openSUSE:Factory/.cilium-cli.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cilium-cli"
Mon Jun 3 17:42:02 2024 rev:67 rq:1178034 version:0.16.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/cilium-cli/cilium-cli.changes 2024-05-30 15:35:53.991791729 +0200
+++ /work/SRC/openSUSE:Factory/.cilium-cli.new.24587/cilium-cli.changes 2024-06-03 17:42:19.760531710 +0200
@@ -1,0 +2,10 @@
+Sat Jun 01 09:11:49 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.16.9:
+ * Prepare for v0.16.9 release
+ * fix(deps): update github.com/cilium/charts digest to f365292
+ * clustermesh: fix status retrieval on v1.14 with kvstoremesh
+ enabled
+ * Update stable release to v0.16.8
+
+-------------------------------------------------------------------
Old:
----
cilium-cli-0.16.8.obscpio
New:
----
cilium-cli-0.16.9.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cilium-cli.spec ++++++
--- /var/tmp/diff_new_pack.OQ4y8p/_old 2024-06-03 17:42:23.132654897 +0200
+++ /var/tmp/diff_new_pack.OQ4y8p/_new 2024-06-03 17:42:23.132654897 +0200
@@ -21,7 +21,7 @@
%define executable_name cilium
Name: cilium-cli
-Version: 0.16.8
+Version: 0.16.9
Release: 0
Summary: CLI to install, manage & troubleshoot Kubernetes clusters running Cilium
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.OQ4y8p/_old 2024-06-03 17:42:23.164656066 +0200
+++ /var/tmp/diff_new_pack.OQ4y8p/_new 2024-06-03 17:42:23.164656066 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/cilium/cilium-cli</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.16.8</param>
+ <param name="revision">v0.16.9</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.OQ4y8p/_old 2024-06-03 17:42:23.200657381 +0200
+++ /var/tmp/diff_new_pack.OQ4y8p/_new 2024-06-03 17:42:23.204657528 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/cilium/cilium-cli</param>
- <param name="changesrevision">3d71144d223f1062c7226211418ddebe524cc53d</param></service></servicedata>
+ <param name="changesrevision">d86ae1ca5755139d6ca9423b9606cb047fc8e00f</param></service></servicedata>
(No newline at EOF)
++++++ cilium-cli-0.16.8.obscpio -> cilium-cli-0.16.9.obscpio ++++++
/work/SRC/openSUSE:Factory/cilium-cli/cilium-cli-0.16.8.obscpio /work/SRC/openSUSE:Factory/.cilium-cli.new.24587/cilium-cli-0.16.9.obscpio differ: char 50, line 1
++++++ cilium-cli.obsinfo ++++++
--- /var/tmp/diff_new_pack.OQ4y8p/_old 2024-06-03 17:42:23.240658843 +0200
+++ /var/tmp/diff_new_pack.OQ4y8p/_new 2024-06-03 17:42:23.244658989 +0200
@@ -1,5 +1,5 @@
name: cilium-cli
-version: 0.16.8
-mtime: 1717019629
-commit: 3d71144d223f1062c7226211418ddebe524cc53d
+version: 0.16.9
+mtime: 1717172885
+commit: d86ae1ca5755139d6ca9423b9606cb047fc8e00f
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/cilium-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.cilium-cli.new.24587/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package eww for openSUSE:Factory checked in at 2024-06-03 17:42:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eww (Old)
and /work/SRC/openSUSE:Factory/.eww.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eww"
Mon Jun 3 17:42:00 2024 rev:2 rq:1178025 version:0.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/eww/eww.changes 2024-03-03 20:20:08.983628624 +0100
+++ /work/SRC/openSUSE:Factory/.eww.new.24587/eww.changes 2024-06-03 17:42:15.048359569 +0200
@@ -1,0 +2,18 @@
+Mon Apr 22 07:30:42 UTC 2024 - Muhammad Akbar Yanuar Mantari <mantarimay(a)pm.me>
+
+- Update to version 0.6.0
+ + Fixes
+ - The shell-completions subcommand is now run before anything
+ is set up
+ - Fix nix flake
+ - Fix jq
+ - Labels now use gtk's truncation system
+ + Features
+ - Add libdbusmenu-gtk3-devel BuildRequires: add systray widget
+ - Add :checked property to checkbox
+- Disable cargo update: could not find `ObjectExt` in `glib`
+ (gh#elkowar/eww#1062 gh#elkowar/eww#1063)
+- Add cargo test script
+- Add CHANGELOG.md to doc
+
+-------------------------------------------------------------------
Old:
----
eww-0.5.0.tar.gz
New:
----
eww-0.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eww.spec ++++++
--- /var/tmp/diff_new_pack.M7iQI0/_old 2024-06-03 17:42:17.400445494 +0200
+++ /var/tmp/diff_new_pack.M7iQI0/_new 2024-06-03 17:42:17.404445639 +0200
@@ -16,8 +16,9 @@
#
+%bcond_without test
Name: eww
-Version: 0.5.0
+Version: 0.6.0
Release: 0
Summary: ElKowars wacky widgets
License: MIT
@@ -25,6 +26,7 @@
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: vendor.tar.zst
BuildRequires: cargo-packaging
+BuildRequires: libdbusmenu-gtk3-devel
BuildRequires: gtk-layer-shell-devel
BuildRequires: gtk3-devel
BuildRequires: rust >= 1.70.0
@@ -35,7 +37,6 @@
%prep
%autosetup -a1 -p1
-
rm docs/.gitignore
sed -i '1s|#!/bin/sh|#!/usr/bin/sh|' examples/eww-bar/scripts/getvol
@@ -45,8 +46,13 @@
%install
install -Dm755 target/release/%{name} -t %{buildroot}%{_bindir}
+%check
+%if %{with test}
+%{cargo_test}
+%endif
+
%files
%license LICEN*
-%doc README* docs examples
+%doc README* docs examples CHANGELOG.md
%{_bindir}/%{name}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.M7iQI0/_old 2024-06-03 17:42:17.436446809 +0200
+++ /var/tmp/diff_new_pack.M7iQI0/_new 2024-06-03 17:42:17.440446955 +0200
@@ -3,7 +3,7 @@
<service name="cargo_vendor" mode="manual">
<param name="src">eww-*.tar.gz</param>
<param name="compression">zst</param>
- <param name="update">true</param>
+ <param name="update">false</param>
</service>
<service name="cargo_audit" mode="manual"/>
</services>
++++++ eww-0.5.0.tar.gz -> eww-0.6.0.tar.gz ++++++
++++ 5106 lines of diff (skipped)
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/eww/vendor.tar.zst /work/SRC/openSUSE:Factory/.eww.new.24587/vendor.tar.zst differ: char 7, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apko for openSUSE:Factory checked in at 2024-06-03 17:41:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apko (Old)
and /work/SRC/openSUSE:Factory/.apko.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apko"
Mon Jun 3 17:41:57 2024 rev:11 rq:1178037 version:0.14.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/apko/apko.changes 2024-05-31 22:15:57.658150200 +0200
+++ /work/SRC/openSUSE:Factory/.apko.new.24587/apko.changes 2024-06-03 17:42:11.720237989 +0200
@@ -1,0 +2,19 @@
+Sat Jun 01 09:23:29 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.14.7:
+ * ensure homedir respects non-defaults
+ * build(deps): bump github/codeql-action from 3.25.6 to 3.25.7
+
+-------------------------------------------------------------------
+Sat Jun 01 09:10:13 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.14.6:
+ * plumb through HomeDir as optional build configuration
+ * Pull in the auth fix in go-apk (#1145)
+ * Update internal/cli/build.go
+ * Update internal/cli/publish.go
+ * This fixes the boolean logic to pass auth.
+ * go mod tidy
+ * support basic HTTP auth
+
+-------------------------------------------------------------------
Old:
----
apko-0.14.5.obscpio
New:
----
apko-0.14.7.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apko.spec ++++++
--- /var/tmp/diff_new_pack.aDIWcw/_old 2024-06-03 17:42:12.608270429 +0200
+++ /var/tmp/diff_new_pack.aDIWcw/_new 2024-06-03 17:42:12.608270429 +0200
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: apko
-Version: 0.14.5
+Version: 0.14.7
Release: 0
Summary: Build OCI images from APK packages directly without Dockerfile
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.aDIWcw/_old 2024-06-03 17:42:12.644271744 +0200
+++ /var/tmp/diff_new_pack.aDIWcw/_new 2024-06-03 17:42:12.648271891 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/chainguard-dev/apko</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.14.5</param>
+ <param name="revision">v0.14.7</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.aDIWcw/_old 2024-06-03 17:42:12.664272475 +0200
+++ /var/tmp/diff_new_pack.aDIWcw/_new 2024-06-03 17:42:12.668272621 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/chainguard-dev/apko</param>
- <param name="changesrevision">b69d852e8fc29b2eb2f412e0fdee150aed03645c</param></service></servicedata>
+ <param name="changesrevision">f5aa053346e01a693dedca1e7d86a2df76dec6ab</param></service></servicedata>
(No newline at EOF)
++++++ apko-0.14.5.obscpio -> apko-0.14.7.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/.github/workflows/codeql.yaml new/apko-0.14.7/.github/workflows/codeql.yaml
--- old/apko-0.14.5/.github/workflows/codeql.yaml 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/.github/workflows/codeql.yaml 2024-05-31 18:54:55.000000000 +0200
@@ -29,7 +29,7 @@
check-latest: true
- name: Initialize CodeQL
- uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276
+ uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f
with:
languages: go
@@ -37,4 +37,4 @@
run: make apko
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276
+ uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/go.mod new/apko-0.14.7/go.mod
--- old/apko-0.14.5/go.mod 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/go.mod 2024-05-31 18:54:55.000000000 +0200
@@ -4,7 +4,7 @@
require (
github.com/chainguard-dev/clog v1.3.1
- github.com/chainguard-dev/go-apk v0.0.0-20240529154108-3de67a94ddad
+ github.com/chainguard-dev/go-apk v0.0.0-20240530214935-2ff9aee8385a
github.com/charmbracelet/log v0.4.0
github.com/dominodatalab/os-release v0.0.0-20190522011736-bcdb4a3e3c2f
github.com/go-git/go-git/v5 v5.12.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/go.sum new/apko-0.14.7/go.sum
--- old/apko-0.14.5/go.sum 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/go.sum 2024-05-31 18:54:55.000000000 +0200
@@ -28,8 +28,8 @@
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chainguard-dev/clog v1.3.1 h1:CDNCty5WKQhJzoOPubk0GdXt+bPQyargmfClqebrpaQ=
github.com/chainguard-dev/clog v1.3.1/go.mod h1:cV516KZWqYc/phZsCNwF36u/KMGS+Gj5Uqeb8Hlp95Y=
-github.com/chainguard-dev/go-apk v0.0.0-20240529154108-3de67a94ddad h1:MweFfBg9pmE4X+3SdlqJy3SVwbm3XEOze94IkXb3uwY=
-github.com/chainguard-dev/go-apk v0.0.0-20240529154108-3de67a94ddad/go.mod h1:4UVB5GXk5yVOVwe3QPdmMLMVTpYbvzygjXlRrJxJPMc=
+github.com/chainguard-dev/go-apk v0.0.0-20240530214935-2ff9aee8385a h1:E8EgiRgZsmq1Twz6H2gyyzDB0OxHfZ+h3g8R9BimdAU=
+github.com/chainguard-dev/go-apk v0.0.0-20240530214935-2ff9aee8385a/go.mod h1:4UVB5GXk5yVOVwe3QPdmMLMVTpYbvzygjXlRrJxJPMc=
github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/internal/cli/build.go new/apko-0.14.7/internal/cli/build.go
--- old/apko-0.14.5/internal/cli/build.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/internal/cli/build.go 2024-05-31 18:54:55.000000000 +0200
@@ -22,6 +22,7 @@
"log/slog"
"os"
"path/filepath"
+ "strings"
"sync"
"github.com/chainguard-dev/clog"
@@ -91,6 +92,18 @@
}
defer os.RemoveAll(tmp)
+ var user, pass string
+ if auth, ok := os.LookupEnv("HTTP_AUTH"); !ok {
+ // Fine, no auth.
+ } else if parts := strings.SplitN(auth, ":", 4); len(parts) != 4 {
+ return fmt.Errorf("HTTP_AUTH must be in the form 'basic:REALM:USERNAME:PASSWORD' (got %d parts)", len(parts))
+ } else if parts[0] != "basic" {
+ return fmt.Errorf("HTTP_AUTH must be in the form 'basic:REALM:USERNAME:PASSWORD' (got %q for first part)", parts[0])
+ } else {
+ // NB: parts[1] is the realm, which we ignore.
+ user, pass = parts[2], parts[3]
+ }
+
return BuildCmd(cmd.Context(), args[1], args[2], archs,
[]string{args[1]},
writeSBOM,
@@ -109,6 +122,7 @@
build.WithCacheDir(cacheDir, offline),
build.WithLockFile(lockfile),
build.WithTempDir(tmp),
+ build.WithAuth(user, pass),
)
},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/internal/cli/publish.go new/apko-0.14.7/internal/cli/publish.go
--- old/apko-0.14.5/internal/cli/publish.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/internal/cli/publish.go 2024-05-31 18:54:55.000000000 +0200
@@ -99,6 +99,18 @@
}
defer os.RemoveAll(tmp)
+ var user, pass string
+ if auth, ok := os.LookupEnv("HTTP_AUTH"); !ok {
+ // Fine, no auth.
+ } else if parts := strings.SplitN(auth, ":", 4); len(parts) != 4 {
+ return fmt.Errorf("HTTP_AUTH must be in the form 'basic:REALM:USERNAME:PASSWORD' (got %d parts)", len(parts))
+ } else if parts[0] != "basic" {
+ return fmt.Errorf("HTTP_AUTH must be in the form 'basic:REALM:USERNAME:PASSWORD' (got %q for first part)", parts[0])
+ } else {
+ // NB: parts[1] is the realm, which we ignore.
+ user, pass = parts[2], parts[3]
+ }
+
if err := PublishCmd(cmd.Context(), imageRefs, archs, remoteOpts,
sbomPath,
[]build.Option{
@@ -115,6 +127,7 @@
build.WithAnnotations(annotations),
build.WithCacheDir(cacheDir, offline),
build.WithTempDir(tmp),
+ build.WithAuth(user, pass),
},
[]PublishOption{
// these are extra here just for publish; everything before is the same for BuildCmd as PublishCmd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/internal/cli/testdata/packages/melange.rsa.pub new/apko-0.14.7/internal/cli/testdata/packages/melange.rsa.pub
--- old/apko-0.14.5/internal/cli/testdata/packages/melange.rsa.pub 1970-01-01 01:00:00.000000000 +0100
+++ new/apko-0.14.7/internal/cli/testdata/packages/melange.rsa.pub 2024-05-31 18:54:55.000000000 +0200
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuE9aHvpBoe7HNnWxhp2p
+x+HGjbPhzP0CyQYMNMcHjd76UcaPwWNTVqJI8JMT2u72mPsEXpC+J6KqjIggJoOa
+QYg87oYEdthoJZjyDaKzezNZKndzVQkg4RfQPiCPQkm4r9v6So0MCDa4rwRYnqrf
+s3Je9/wi8B/wG1sz7P4wOG23djxpORDsMI9CyZhnAKfNg/uqmF/sxEwOL4FaDZMg
+0oo7Kx3FjtqqKTV8uFbCDsTxV3CR0pm3WJdX9TNfjXLXfp2a6QDYk1JoYl++UUHK
++7izMXro6xgY7OPT+F48/YNYxS/ciH90DmN7ysJnQ2otZHSqhOkJV4UrYCKBHY55
+XjpDe7+nmwXaqVyAlCS6pDqHeYUUpYTpnv4b9bbst9NtYPRY8W00Oc5Cs3KdHeV6
+LqvHAGwNTZziv91UTpi0hMf27I+MLaXx+jNWm5j40a+ZyswLAQSLI+u3LxfPlHda
+lhpaQw+CoM3ucX9rcnJaBgowXclDAAvRNIj7EJNW5sk+3SbpmKKDkrD7Cl0rMSrd
+1dixDZZPzA8UtwheNTmV+I+0r1kQMcNYcB8iUKsoWIpaur0CBCww02WTHpOMcMGw
++rVr/wzPP3Iqo1+EVrzVI5kSnZ7VLRtO5VdMLw0PlIK4ShJ+X5OtVtWnJ9jIiLaI
+se0tr8lpqU40eV862X+jKz0CAwEAAQ==
+-----END PUBLIC KEY-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/accounts.go new/apko-0.14.7/pkg/build/accounts.go
--- old/apko-0.14.5/pkg/build/accounts.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/build/accounts.go 2024-05-31 18:54:55.000000000 +0200
@@ -44,11 +44,14 @@
if user.Shell == "" {
user.Shell = "/bin/sh"
}
+ if user.HomeDir == "" {
+ user.HomeDir = "/home/" + user.UserName
+ }
return passwd.UserEntry{
UserName: user.UserName,
UID: user.UID,
GID: user.GID,
- HomeDir: "/home/" + user.UserName,
+ HomeDir: user.HomeDir,
Password: "x",
Info: "Account created by apko",
Shell: user.Shell,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/build.go new/apko-0.14.7/pkg/build/build.go
--- old/apko-0.14.5/pkg/build/build.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/build/build.go 2024-05-31 18:54:55.000000000 +0200
@@ -267,6 +267,10 @@
log.Warnf("cache disabled because cache dir was not set, and cannot determine system default: %v", err)
}
+ if bc.o.User != "" || bc.o.Pass != "" {
+ apkOpts = append(apkOpts, apk.WithAuth(bc.o.User, bc.o.Pass))
+ }
+
if bc.ic.Contents.BaseImage != nil {
baseImg, err := baseimg.New(bc.ic.Contents.BaseImage.Image, bc.ic.Contents.BaseImage.APKIndex, bc.Arch(), bc.o.TempDir())
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/build_test.go new/apko-0.14.7/pkg/build/build_test.go
--- old/apko-0.14.5/pkg/build/build_test.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/build/build_test.go 2024-05-31 18:54:55.000000000 +0200
@@ -16,6 +16,8 @@
import (
"context"
+ "net/http"
+ "net/http/httptest"
"path/filepath"
"testing"
@@ -23,6 +25,7 @@
"github.com/stretchr/testify/require"
"chainguard.dev/apko/pkg/build"
+ "chainguard.dev/apko/pkg/build/types"
)
func TestBuildLayer(t *testing.T) {
@@ -102,3 +105,75 @@
"locked package pretend-baselayout has missing checksum (please regenerate the lock file with Apko >=0.13)",
err.Error())
}
+
+func TestAuth_good(t *testing.T) {
+ called := false
+ testUser, testPass := "user", "pass"
+ s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("ETag", "123")
+ if r.Method == http.MethodHead {
+ return
+ }
+
+ called = true
+ if gotuser, gotpass, ok := r.BasicAuth(); !ok || gotuser != testUser || gotpass != testPass {
+ t.Logf("got user: %q, pass: %q", gotuser, gotpass)
+ w.WriteHeader(http.StatusForbidden)
+ return
+ }
+ http.FileServer(http.Dir("testdata/packages")).ServeHTTP(w, r)
+ }))
+ defer s.Close()
+
+ ctx := context.Background()
+ bc, err := build.New(ctx, fs.NewMemFS(),
+ build.WithAuth(testUser, testPass),
+ build.WithImageConfiguration(types.ImageConfiguration{
+ Contents: types.ImageContents{
+ Repositories: []string{s.URL},
+ Keyring: []string{s.URL + "/melange.rsa.pub"},
+ Packages: []string{"pretend-baselayout"},
+ },
+ Archs: types.ParseArchitectures([]string{"amd64", "arm64"}),
+ }),
+ )
+ if err != nil {
+ t.Fatal(err)
+ }
+ err = bc.BuildImage(ctx)
+ require.NoError(t, err, "build image failed")
+ require.True(t, called)
+}
+
+func TestAuth_bad(t *testing.T) {
+ called := false
+ testUser, testPass := "user", "pass"
+ s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("ETag", "123")
+ if r.Method == http.MethodHead {
+ return
+ }
+
+ called = true
+ if gotuser, gotpass, ok := r.BasicAuth(); !ok || gotuser != testUser || gotpass != testPass {
+ w.WriteHeader(http.StatusForbidden)
+ return
+ }
+ http.FileServer(http.Dir("testdata/packages")).ServeHTTP(w, r)
+ }))
+ defer s.Close()
+
+ ctx := context.Background()
+ _, err := build.New(ctx, fs.NewMemFS(),
+ build.WithAuth("baduser", "badpass"),
+ build.WithImageConfiguration(types.ImageConfiguration{
+ Contents: types.ImageContents{
+ Keyring: []string{s.URL + "/melange.rsa.pub"},
+ // We don't even need to specify repository or packages, since keyring init will fail without auth.
+ },
+ Archs: types.ParseArchitectures([]string{"amd64", "arm64"}),
+ }),
+ )
+ require.Error(t, err, "build should have failed to init keyring")
+ require.True(t, called)
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/options.go new/apko-0.14.7/pkg/build/options.go
--- old/apko-0.14.5/pkg/build/options.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/build/options.go 2024-05-31 18:54:55.000000000 +0200
@@ -207,3 +207,11 @@
return nil
}
}
+
+func WithAuth(user, pass string) Option {
+ return func(bc *Context) error {
+ bc.o.User = user
+ bc.o.Pass = pass
+ return nil
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/types/image_configuration.go new/apko-0.14.7/pkg/build/types/image_configuration.go
--- old/apko-0.14.5/pkg/build/types/image_configuration.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/build/types/image_configuration.go 2024-05-31 18:54:55.000000000 +0200
@@ -164,7 +164,7 @@
}
}
- for _, u := range ic.Accounts.Users {
+ for i, u := range ic.Accounts.Users {
if u.UserName == "" {
return fmt.Errorf("configured user %v has no configured user name", u)
}
@@ -172,6 +172,10 @@
if u.UID == 0 {
return fmt.Errorf("configured user %v has UID 0 (to run as root, use `run-as: 0`)", u)
}
+
+ if u.HomeDir == "" {
+ ic.Accounts.Users[i].HomeDir = "/home/" + u.UserName
+ }
}
for _, g := range ic.Accounts.Groups {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/types/image_configuration_test.go new/apko-0.14.7/pkg/build/types/image_configuration_test.go
--- old/apko-0.14.5/pkg/build/types/image_configuration_test.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/build/types/image_configuration_test.go 2024-05-31 18:54:55.000000000 +0200
@@ -36,3 +36,19 @@
require.ElementsMatch(t, ic.Contents.Keyring, []string{"key"})
require.ElementsMatch(t, ic.Contents.Packages, []string{"package", "other_package"})
}
+
+func TestUserContents(t *testing.T) {
+ ctx := context.Background()
+
+ configPath := filepath.Join("testdata", "users.apko.yaml")
+ hasher := sha256.New()
+ ic := types.ImageConfiguration{}
+
+ require.NoError(t, ic.Load(ctx, configPath, hasher))
+ if err := ic.Validate(); err != nil {
+ t.Fatal(err)
+ }
+
+ require.Equal(t, "/not/home", ic.Accounts.Users[0].HomeDir)
+ require.Equal(t, "/home/user", ic.Accounts.Users[1].HomeDir)
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/types/schema.json new/apko-0.14.7/pkg/build/types/schema.json
--- old/apko-0.14.5/pkg/build/types/schema.json 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/build/types/schema.json 2024-05-31 18:54:55.000000000 +0200
@@ -274,7 +274,11 @@
},
"shell": {
"type": "string",
- "description": "Required: The user's shell"
+ "description": "Optional: The user's shell"
+ },
+ "homedir": {
+ "type": "string",
+ "description": "Optional: The user's home directory"
}
},
"additionalProperties": false,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/types/testdata/users.apko.yaml new/apko-0.14.7/pkg/build/types/testdata/users.apko.yaml
--- old/apko-0.14.5/pkg/build/types/testdata/users.apko.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/apko-0.14.7/pkg/build/types/testdata/users.apko.yaml 2024-05-31 18:54:55.000000000 +0200
@@ -0,0 +1,17 @@
+contents:
+ repositories:
+ - "repository"
+ keyring:
+ - "key"
+ packages:
+ - "package"
+
+accounts:
+ users:
+ - gid: 1
+ uid: 2
+ homedir: "/not/home"
+ username: "something-else"
+ - gid: 2
+ uid: 3
+ username: "user"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/build/types/types.go new/apko-0.14.7/pkg/build/types/types.go
--- old/apko-0.14.5/pkg/build/types/types.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/build/types/types.go 2024-05-31 18:54:55.000000000 +0200
@@ -30,8 +30,10 @@
UID uint32 `json:"uid,omitempty"`
// Required: The user's group ID
GID uint32 `json:"gid,omitempty"`
- // Required: The user's shell
+ // Optional: The user's shell
Shell string `json:"shell,omitempty"`
+ // Optional: The user's home directory
+ HomeDir string `json:"homedir,omitempty"`
}
type Group struct {
@@ -138,9 +140,9 @@
// Required: The user to run the container as. This can be a username or UID.
RunAs string `json:"run-as,omitempty" yaml:"run-as"`
// Required: List of users to populate the image with
- Users []User `json:"users,omitempty"`
+ Users []User `json:"users,omitempty" yaml:"users"`
// Required: List of groups to populate the image with
- Groups []Group `json:"groups,omitempty"`
+ Groups []Group `json:"groups,omitempty" yaml:"groups"`
}
type ImageConfiguration struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.14.5/pkg/options/options.go new/apko-0.14.7/pkg/options/options.go
--- old/apko-0.14.5/pkg/options/options.go 2024-05-29 19:10:29.000000000 +0200
+++ new/apko-0.14.7/pkg/options/options.go 2024-05-31 18:54:55.000000000 +0200
@@ -48,6 +48,8 @@
CacheDir string `json:"cacheDir,omitempty"`
Offline bool `json:"offline,omitempty"`
Lockfile string `json:"lockfile,omitempty"`
+ User string `json:"user"`
+ Pass string `json:"-"`
}
var Default = Options{
++++++ apko.obsinfo ++++++
--- /var/tmp/diff_new_pack.aDIWcw/_old 2024-06-03 17:42:12.868279928 +0200
+++ /var/tmp/diff_new_pack.aDIWcw/_new 2024-06-03 17:42:12.872280074 +0200
@@ -1,5 +1,5 @@
name: apko
-version: 0.14.5
-mtime: 1717002629
-commit: b69d852e8fc29b2eb2f412e0fdee150aed03645c
+version: 0.14.7
+mtime: 1717174495
+commit: f5aa053346e01a693dedca1e7d86a2df76dec6ab
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/cache.go new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/cache.go
--- old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/cache.go 2024-05-30 10:59:08.000000000 +0200
+++ new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/cache.go 2024-06-01 11:23:30.000000000 +0200
@@ -54,7 +54,9 @@
// Do all the expensive things inside the once.
once, _ := e.etags.LoadOrStore(url, &sync.Once{})
once.(*sync.Once).Do(func() {
- resp, rerr := t.wrapped.Head(url)
+ req := request.Clone(request.Context())
+ req.Method = http.MethodHead
+ resp, rerr := t.wrapped.Do(req)
if resp != nil {
// We don't expect any body from a HEAD so just always close it to appease the linter.
resp.Body.Close()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/implementation.go new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/implementation.go
--- old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/implementation.go 2024-05-30 10:59:08.000000000 +0200
+++ new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/implementation.go 2024-06-01 11:23:30.000000000 +0200
@@ -65,6 +65,7 @@
cache *cache
ignoreSignatures bool
noSignatureIndexes []string
+ user, pass string
// filename to owning package, last write wins
installedFiles map[string]*Package
@@ -93,6 +94,8 @@
cache: opt.cache,
noSignatureIndexes: opt.noSignatureIndexes,
installedFiles: map[string]*Package{},
+ user: opt.user,
+ pass: opt.pass,
}, nil
}
@@ -377,7 +380,7 @@
var asURL *url.URL
var err error
- if strings.HasPrefix(element, "https://") {
+ if strings.HasPrefix(element, "https://") || strings.HasPrefix(element, "http://") {
asURL, err = url.Parse(element)
} else {
// Attempt to parse non-https elements into URI's so they are translated into
@@ -395,7 +398,7 @@
if err != nil {
return fmt.Errorf("failed to read apk key: %w", err)
}
- case "https": //nolint:goconst
+ case "https", "http": //nolint:goconst
client := a.client
if a.cache != nil {
client = a.cache.client(client, true)
@@ -404,11 +407,15 @@
if err != nil {
return err
}
+
// if the URL contains HTTP Basic Auth credentials, add them to the request
if asURL.User != nil {
user := asURL.User.Username()
pass, _ := asURL.User.Password()
req.SetBasicAuth(user, pass)
+ req.URL.User = nil
+ } else if a.user != "" && a.pass != "" {
+ req.SetBasicAuth(a.user, a.pass)
}
resp, err := client.Do(req)
@@ -714,6 +721,7 @@
if err != nil {
return err
}
+ // NB: Not setting basic auth, since we know Alpine doesn't support it.
res, err := client.Do(req)
if err != nil {
return fmt.Errorf("failed to fetch alpine releases: %w", err)
@@ -748,6 +756,7 @@
if err != nil {
return err
}
+ // NB: Not setting basic auth, since we know Alpine doesn't support it.
res, err := client.Do(req)
if err != nil {
return fmt.Errorf("failed to fetch alpine key %s: %w", u, err)
@@ -995,7 +1004,7 @@
func packageAsURI(pkg InstallablePackage) (uri.URI, error) {
u := pkg.URL()
- if strings.HasPrefix(u, "https://") {
+ if strings.HasPrefix(u, "https://") || strings.HasPrefix(u, "http://") {
return uri.Parse(u)
}
@@ -1035,7 +1044,7 @@
return nil, fmt.Errorf("failed to read repository package apk %s: %w", u, err)
}
return f, nil
- case "https":
+ case "https", "http":
client := a.client
if a.cache != nil {
client = a.cache.client(client, false)
@@ -1044,6 +1053,9 @@
if err != nil {
return nil, err
}
+ if a.user != "" && a.pass != "" {
+ req.SetBasicAuth(a.user, a.pass)
+ }
// This will return a body that retries requests using Range requests if Read() hits an error.
rrt := newRangeRetryTransport(ctx, client)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/index.go new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/index.go
--- old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/index.go 2024-05-30 10:59:08.000000000 +0200
+++ new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/index.go 2024-06-01 11:23:30.000000000 +0200
@@ -64,7 +64,7 @@
}
func (i *indexCache) get(ctx context.Context, u string, keys map[string][]byte, arch string, opts *indexOpts) (*APKIndex, error) {
- if strings.HasPrefix(u, "https://") {
+ if strings.HasPrefix(u, "https://") || strings.HasPrefix(u, "http://") {
// We don't want remote indexes to change while we're running.
once, _ := i.onces.LoadOrStore(u, &sync.Once{})
once.(*sync.Once).Do(func() {
@@ -173,7 +173,7 @@
return true
}
-func getRepositoryIndex(ctx context.Context, u string, keys map[string][]byte, arch string, opts *indexOpts) (*APKIndex, error) {
+func getRepositoryIndex(ctx context.Context, u string, keys map[string][]byte, arch string, opts *indexOpts) (*APKIndex, error) { //nolint:gocyclo
// Normalize the repo as a URI, so that local paths
// are translated into file:// URLs, allowing them to be parsed
// into a url.URL{}.
@@ -182,7 +182,7 @@
asURL *url.URL
err error
)
- if strings.HasPrefix(u, "https://") {
+ if strings.HasPrefix(u, "https://") || strings.HasPrefix(u, "http://") {
asURL, err = url.Parse(u)
} else {
// Attempt to parse non-https elements into URI's so they are translated into
@@ -202,7 +202,7 @@
}
return nil, nil
}
- case "https":
+ case "https", "http":
client := opts.httpClient
req, err := http.NewRequestWithContext(ctx, http.MethodGet, asURL.String(), nil)
if err != nil {
@@ -213,6 +213,8 @@
user := asURL.User.Username()
pass, _ := asURL.User.Password()
req.SetBasicAuth(user, pass)
+ } else if opts.user != "" || opts.pass != "" {
+ req.SetBasicAuth(opts.user, opts.pass)
}
// This will return a body that retries requests using Range requests if Read() hits an error.
@@ -318,6 +320,7 @@
ignoreSignatures bool
noSignatureIndexes []string
httpClient *http.Client
+ user, pass string
}
type IndexOption func(*indexOpts)
@@ -338,3 +341,10 @@
o.httpClient = c
}
}
+
+func WithIndexAuth(user, pass string) IndexOption {
+ return func(o *indexOpts) {
+ o.user = user
+ o.pass = pass
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/options.go new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/options.go
--- old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/options.go 2024-05-30 10:59:08.000000000 +0200
+++ new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/options.go 2024-06-01 11:23:30.000000000 +0200
@@ -30,6 +30,7 @@
version string
cache *cache
noSignatureIndexes []string
+ user, pass string
}
type Option func(*opts) error
@@ -104,6 +105,14 @@
return nil
}
}
+
+func WithAuth(user, pass string) Option {
+ return func(o *opts) error {
+ o.user = user
+ o.pass = pass
+ return nil
+ }
+}
func defaultOpts() *opts {
return &opts{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/repo.go new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/repo.go
--- old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/repo.go 2024-05-30 10:59:08.000000000 +0200
+++ new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/repo.go 2024-06-01 11:23:30.000000000 +0200
@@ -176,7 +176,11 @@
if a.cache != nil {
httpClient = a.cache.client(httpClient, true)
}
- return GetRepositoryIndexes(ctx, repos, keys, arch, WithIgnoreSignatures(ignoreSignatures), WithHTTPClient(httpClient), WithIgnoreSignatureForIndexes(a.noSignatureIndexes...))
+ return GetRepositoryIndexes(ctx, repos, keys, arch,
+ WithIgnoreSignatures(ignoreSignatures),
+ WithIgnoreSignatureForIndexes(a.noSignatureIndexes...),
+ WithHTTPClient(httpClient),
+ WithIndexAuth(a.user, a.pass))
}
// PkgResolver resolves packages from a list of indexes.
@@ -193,7 +197,7 @@
nameMap map[string][]*repositoryPackage
installIfMap map[string][]*repositoryPackage // contains any package that should be installed if the named package is installed
- parsedVersions map[string]packageVersion
+ parsedVersions map[string]Version
depForVersion map[string]parsedConstraint
}
@@ -211,7 +215,7 @@
)
p := &PkgResolver{
indexes: indexes,
- parsedVersions: map[string]packageVersion{},
+ parsedVersions: map[string]Version{},
depForVersion: map[string]parsedConstraint{},
}
@@ -695,7 +699,7 @@
if allowSelfFulfill && pkg.Name == name {
var (
- actualVersion, requiredVersion packageVersion
+ actualVersion, requiredVersion Version
err1, err2 error
)
actualVersion, err1 = p.parseVersion(pkg.Version)
@@ -787,13 +791,13 @@
return dependencies, conflicts, nil
}
-func (p *PkgResolver) parseVersion(version string) (packageVersion, error) {
+func (p *PkgResolver) parseVersion(version string) (Version, error) {
pkg, ok := p.parsedVersions[version]
if ok {
return pkg, nil
}
- parsed, err := parseVersion(version)
+ parsed, err := ParseVersion(version)
if err != nil {
return parsed, err
}
@@ -906,9 +910,9 @@
// If j fails to parse, prefer i.
return -1
}
- versions := compareVersions(iVersion, jVersion)
+ versions := CompareVersions(iVersion, jVersion)
if versions != equal {
- return -1 * int(versions)
+ return -1 * versions
}
// if versions are equal, they might not be the same as the package versions
if iVersionStr != a.Version || jVersionStr != b.Version {
@@ -921,9 +925,9 @@
// If j fails to parse, prefer i.
return -1
}
- versions := compareVersions(iVersion, jVersion)
+ versions := CompareVersions(iVersion, jVersion)
if versions != equal {
- return -1 * int(versions)
+ return -1 * versions
}
}
// if versions are equal, compare names
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/version.go new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/version.go
--- old/vendor/github.com/chainguard-dev/go-apk/pkg/apk/version.go 2024-05-30 10:59:08.000000000 +0200
+++ new/vendor/github.com/chainguard-dev/go-apk/pkg/apk/version.go 2024-06-01 11:23:30.000000000 +0200
@@ -67,7 +67,7 @@
packageVersionPostModifierMax packageVersionPostModifier = 1000
)
-type packageVersion struct {
+type Version struct {
numbers []int
letter rune
preSuffix packageVersionPreModifier
@@ -77,21 +77,22 @@
revision int
}
-func parseVersion(version string) (packageVersion, error) {
+// ParseVersion parses a version string into a Version struct.
+func ParseVersion(version string) (Version, error) {
parts := versionRegex.FindAllStringSubmatch(version, -1)
if len(parts) == 0 {
- return packageVersion{}, fmt.Errorf("invalid version %s, could not parse", version)
+ return Version{}, fmt.Errorf("invalid version %s, could not parse", version)
}
actuals := parts[0]
numbers := make([]int, 0, 10)
if len(actuals) != 14 {
- return packageVersion{}, fmt.Errorf("invalid version %s, could not find enough components", version)
+ return Version{}, fmt.Errorf("invalid version %s, could not find enough components", version)
}
// get the first version number
num, err := strconv.Atoi(actuals[1])
if err != nil {
- return packageVersion{}, fmt.Errorf("invalid version %s, first part is not number: %w", version, err)
+ return Version{}, fmt.Errorf("invalid version %s, first part is not number: %w", version, err)
}
numbers = append(numbers, num)
@@ -104,7 +105,7 @@
}
num, err := strconv.Atoi(s)
if err != nil {
- return packageVersion{}, fmt.Errorf("invalid version %s, part %d is not number: %w", version, i, err)
+ return Version{}, fmt.Errorf("invalid version %s, part %d is not number: %w", version, i, err)
}
numbers = append(numbers, num)
}
@@ -126,13 +127,13 @@
case "":
preSuffix = packageVersionPreModifierNone
default:
- return packageVersion{}, fmt.Errorf("invalid version %s, pre-suffix %s is not valid", version, actuals[6])
+ return Version{}, fmt.Errorf("invalid version %s, pre-suffix %s is not valid", version, actuals[6])
}
var preSuffixNumber int
if actuals[7] != "" {
num, err := strconv.Atoi(actuals[7])
if err != nil {
- return packageVersion{}, fmt.Errorf("invalid version %s, suffix %s number %s is not number: %w", version, actuals[6], actuals[7], err)
+ return Version{}, fmt.Errorf("invalid version %s, suffix %s number %s is not number: %w", version, actuals[6], actuals[7], err)
}
preSuffixNumber = num
}
@@ -152,13 +153,13 @@
case "":
postSuffix = packageVersionPostModifierNone
default:
- return packageVersion{}, fmt.Errorf("invalid version %s, suffix %s is not valid", version, actuals[9])
+ return Version{}, fmt.Errorf("invalid version %s, suffix %s is not valid", version, actuals[9])
}
var postSuffixNumber int
if actuals[10] != "" {
num, err := strconv.Atoi(actuals[10])
if err != nil {
- return packageVersion{}, fmt.Errorf("invalid version %s, post-suffix %s number %s is not number: %w", version, actuals[9], actuals[10], err)
+ return Version{}, fmt.Errorf("invalid version %s, post-suffix %s number %s is not number: %w", version, actuals[9], actuals[10], err)
}
postSuffixNumber = num
}
@@ -167,11 +168,11 @@
if actuals[13] != "" {
num, err := strconv.Atoi(actuals[13])
if err != nil {
- return packageVersion{}, fmt.Errorf("invalid version %s, revision %s is not number: %w", version, actuals[13], err)
+ return Version{}, fmt.Errorf("invalid version %s, revision %s is not number: %w", version, actuals[13], err)
}
revision = num
}
- return packageVersion{
+ return Version{
numbers: numbers,
letter: letter,
preSuffix: preSuffix,
@@ -182,29 +183,14 @@
}, nil
}
-type versionCompare int
-
const (
- greater versionCompare = 1
- equal versionCompare = 0
- less versionCompare = -1
+ greater = 1
+ equal = 0
+ less = -1
)
-func (vc versionCompare) String() string {
- switch vc {
- case greater:
- return ">"
- case equal:
- return "="
- case less:
- return "<"
- default:
- return "???"
- }
-}
-
-// compare versions based on https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-250003.2
-func compareVersions(actual, required packageVersion) versionCompare {
+// CompareVersions compares versions based on https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-250003.2
+func CompareVersions(actual, required Version) int {
for i := 0; i < len(actual.numbers) && i < len(required.numbers); i++ {
if actual.numbers[i] > required.numbers[i] {
return greater
@@ -283,7 +269,7 @@
}
// includesVersion returns true if the actual version is a strict subset of the required version
-func includesVersion(actual, required packageVersion) bool {
+func includesVersion(actual, required Version) bool {
// if more required numbers than actual numbers, than require is more specific,
// so no match
if len(actual.numbers) < len(required.numbers) {
@@ -340,11 +326,11 @@
versionTilde
)
-func (v versionDependency) satisfies(actualVersion, requiredVersion packageVersion) bool {
+func (v versionDependency) satisfies(actualVersion, requiredVersion Version) bool {
if v == versionTilde {
return includesVersion(actualVersion, requiredVersion)
}
- c := compareVersions(actualVersion, requiredVersion)
+ c := CompareVersions(actualVersion, requiredVersion)
switch v {
case versionAny:
return true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2024-05-30 10:59:09.000000000 +0200
+++ new/vendor/modules.txt 2024-06-01 11:23:31.000000000 +0200
@@ -46,7 +46,7 @@
# github.com/chainguard-dev/clog v1.3.1
## explicit; go 1.21.2
github.com/chainguard-dev/clog
-# github.com/chainguard-dev/go-apk v0.0.0-20240529154108-3de67a94ddad
+# github.com/chainguard-dev/go-apk v0.0.0-20240530214935-2ff9aee8385a
## explicit; go 1.22.3
github.com/chainguard-dev/go-apk/internal/tarfs
github.com/chainguard-dev/go-apk/pkg/apk
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-ansible-compat for openSUSE:Factory checked in at 2024-06-03 17:41:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ansible-compat (Old)
and /work/SRC/openSUSE:Factory/.python-ansible-compat.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ansible-compat"
Mon Jun 3 17:41:55 2024 rev:24 rq:1178017 version:24.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ansible-compat/python-ansible-compat.changes 2024-05-15 21:27:40.139920712 +0200
+++ /work/SRC/openSUSE:Factory/.python-ansible-compat.new.24587/python-ansible-compat.changes 2024-06-03 17:42:10.744202333 +0200
@@ -1,0 +2,14 @@
+Thu May 30 09:40:44 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 24.6.0:
+ * Enhancements
+ - Drop support for Ansible 2.12 and 2.13 (#380) @ssbarnea
+ * Bugfixes
+ - Make collection location cache_dir aware (#384) @ssbarnea
+ - Correctly identify the installed collections when duplicates
+ exist (#379) @ssbarnea
+ - Increase coverage (#378) @ssbarnea
+ - Removed leftover code related to ansible-core before 2.14
+ (#382) @ssbarnea
+
+-------------------------------------------------------------------
Old:
----
python-ansible-compat-24.5.1.tar.gz
New:
----
python-ansible-compat-24.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ansible-compat.spec ++++++
--- /var/tmp/diff_new_pack.lXNlga/_old 2024-06-03 17:42:11.300222645 +0200
+++ /var/tmp/diff_new_pack.lXNlga/_new 2024-06-03 17:42:11.304222791 +0200
@@ -24,7 +24,7 @@
%endif
Name: python-ansible-compat
-Version: 24.5.1
+Version: 24.6.0
Release: 0
Summary: Compatibility shim for Ansible 2.9 and newer
License: MIT
@@ -37,7 +37,7 @@
BuildRequires: python-rpm-macros
# SECTION test
# https://github.com/ansible/ansible-compat/blob/main/.config/requirements.in
-BuildRequires: ansible-core >= 2.12
+BuildRequires: ansible-core >= 2.14
BuildRequires: %{python_module PyYAML}
BuildRequires: %{python_module jsonschema >= 4.17.3}
BuildRequires: %{python_module subprocess-tee >= 0.4.1}
@@ -48,7 +48,7 @@
# /SECTION
BuildRequires: fdupes
BuildRequires: python-rpm-generators
-Requires: ansible-core >= 2.12
+Requires: ansible-core >= 2.14
Requires: python-PyYAML
Requires: python-jsonschema >= 4.17.3
Requires: python-packaging
++++++ python-ansible-compat-24.5.1.tar.gz -> python-ansible-compat-24.6.0.tar.gz ++++++
++++ 1634 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package poke for openSUSE:Factory checked in at 2024-06-03 17:41:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/poke (Old)
and /work/SRC/openSUSE:Factory/.poke.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poke"
Mon Jun 3 17:41:53 2024 rev:11 rq:1178018 version:4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/poke/poke.changes 2024-04-09 16:53:29.097919329 +0200
+++ /work/SRC/openSUSE:Factory/.poke.new.24587/poke.changes 2024-06-03 17:42:09.732165362 +0200
@@ -1,0 +2,9 @@
+Fri May 31 21:15:09 UTC 2024 - Andreas Stieger <andreas.stieger(a)gmx.de>
+
+- update to 4.1:
+ * Execution speed of `pk-jojopatch' has been improved by
+ disabling auto-remap feature
+ * Fixes for invalid memory accesses and crashes
+ * jitter submodule updated
+
+-------------------------------------------------------------------
Old:
----
poke-4.0.tar.gz
poke-4.0.tar.gz.sig
New:
----
poke-4.1.tar.gz
poke-4.1.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poke.spec ++++++
--- /var/tmp/diff_new_pack.ptc6el/_old 2024-06-03 17:42:10.540194880 +0200
+++ /var/tmp/diff_new_pack.ptc6el/_new 2024-06-03 17:42:10.540194880 +0200
@@ -19,14 +19,14 @@
%define sover 1
Name: poke
-Version: 4.0
+Version: 4.1
Release: 0
Summary: An interactive, extensible editor for binary data
License: GPL-3.0-or-later
URL: https://www.gnu.org/software/poke/
Source0: https://ftp.gnu.org/gnu/poke/%{name}-%{version}.tar.gz
Source1: https://ftp.gnu.org/gnu/poke/%{name}-%{version}.tar.gz.sig
-Source2: https://savannah.gnu.org/people/viewgpg.php?user_id=829#/%{name}.keyring
+Source2: https://savannah.gnu.org/people/viewgpg.php?user_id=217829#/%{name}.keyring
BuildRequires: dejagnu
BuildRequires: gawk
BuildRequires: pkgconfig
@@ -80,7 +80,7 @@
Provides Vim support for %{name}.
%prep
-%setup -q
+%autosetup -p1
%build
# jitter fails to build with LTO, disable it for now
@@ -113,6 +113,7 @@
%{_infodir}/%{name}.info-2%{?ext_info}
%{_infodir}/%{name}.info-3%{?ext_info}
%{_mandir}/man1/%{name}.1%{?ext_man}
+%{_mandir}/man1/pokefmt.1%{?ext_man}
%{_mandir}/man1/poked.1%{?ext_man}
%{_datadir}/poke/pickles/
++++++ poke-4.0.tar.gz -> poke-4.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/poke/poke-4.0.tar.gz /work/SRC/openSUSE:Factory/.poke.new.24587/poke-4.1.tar.gz differ: char 12, line 1
++++++ poke.keyring ++++++
--- /var/tmp/diff_new_pack.ptc6el/_old 2024-06-03 17:42:10.596196926 +0200
+++ /var/tmp/diff_new_pack.ptc6el/_new 2024-06-03 17:42:10.596196926 +0200
@@ -1,67 +1,14 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-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
-WBSO97cu7Xry4Z3NIFqbcg==
-=PLks
+mDMEZjJEoBYJKwYBBAHaRw8BAQdAOUZsMeZRA7otN5KHZ0DjzTXZjrbhSqQyQKQF
+jWfW3Ym0Kk1vaGFtbWFkLVJlemEgTmFiaXBvb3IgPG1uYWJpcG9vckBnbnUub3Jn
+PoiTBBMWCgA7FiEE+VHNGBgOILfb2TWdVFg2dFSefjoFAmYyRKACGwMFCwkIBwIC
+IgIGFQoJCAsCBBYCAwECHgcCF4AACgkQVFg2dFSefjpwCwEA+vPbisyY5OL9WGEb
+cTJG+zu+dm3fIIcdWdjfHyaxXRIA/RKq/S/4Lq6z1X8+lptgXupAKU0fy3tyrGwy
+z7zN0ZkAuDgEZjJEoBIKKwYBBAGXVQEFAQEHQAXwyohRmYaJxQ17f5mjNx4pimbC
+P4Hqk3DfVV11TDQkAwEIB4h4BBgWCgAgFiEE+VHNGBgOILfb2TWdVFg2dFSefjoF
+AmYyRKACGwwACgkQVFg2dFSefjoxAwEAzEVIHV1TXv7jZbpLKuAkppv+APo3jmcx
+2SBCmD2lFKABALQo2W6XxUEcL5rJUoxvCQNPGWdI7Z1PB3vp/iCwXNwP
+=T4RY
-----END PGP PUBLIC KEY BLOCK-----
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-py3status for openSUSE:Factory checked in at 2024-06-03 17:41:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-py3status (Old)
and /work/SRC/openSUSE:Factory/.python-py3status.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-py3status"
Mon Jun 3 17:41:51 2024 rev:14 rq:1177998 version:3.57
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-py3status/python-py3status.changes 2023-08-07 15:28:57.120262372 +0200
+++ /work/SRC/openSUSE:Factory/.python-py3status.new.24587/python-py3status.changes 2024-06-03 17:42:07.208073154 +0200
@@ -1,0 +2,53 @@
+Fri May 31 09:50:50 UTC 2024 - Dawid Adam <nyslay(a)gmail.com>
+
+- update to 3.57:
+ * docs: explain how to serve mkdocs locally
+ * add CodeQL workflow for GitHub code scanning
+ * fmt: fix newer black
+ * backlight module: add brightnessctl support
+ * conky module: workaround upstream issues/1479
+ * volume_status module: fix for default source with pamixer
+
+-------------------------------------------------------------------
+Fri May 31 09:50:50 UTC 2024 - Dawid Adam <nyslay(a)gmail.com>
+
+- update to 3.56:
+ * remove audio modules in favor of playerctl
+ * new module dexcom: display glucose readings from your Dexcom CGM system
+ * arch_updates module: hourly cache_timeout, add a note about alpm-hooks
+ * volume_status module: pamixer fix command if device is 0
+ * volume_status module: pamixer: Use default device if none specified
+
+-------------------------------------------------------------------
+Fri May 31 09:50:50 UTC 2024 - Dawid Adam <nyslay(a)gmail.com>
+
+- uprate to 3.55:
+ * pkg: add dbus tag to pull dependencies 'pip install py3status[dbus]'
+ * pkg: drop eol python 3.7 support, add python 3.12
+ * pkg: pull setuptools for 3.12
+ * docs(build): move away from readthedocs and switch to automatic github pages
+ * docs(config): add favicon and rename the site
+ * readme: drop readthedocs build status
+ * docs: fix broken 404 urls
+ * arch_updates module: update auracle from sync to outdated
+ * bluetooth module: reinitialize dbus to fix after sleep behavior
+ * lm_sensors module: fix invalid json if specified more than one chip
+ * nvidia_smi module: fix --list-properties
+ * vpn_status module: add formatters for displaying IP addresses of VPNs
+
+-------------------------------------------------------------------
+Fri May 31 09:50:50 UTC 2024 - Dawid Adam <nyslay(a)gmail.com>
+
+- update to 3.54:
+ * arch_updates module: handle yay return code better when there are no updates
+ * arch_updates module: make it more responsive to system updates
+ * battery_level module: fix code style
+
+-------------------------------------------------------------------
+Fri May 31 09:50:50 UTC 2024 - Dawid Adam <nyslay(a)gmail.com>
+
+- update to 3.53:
+ * argparser: remove deprecated interval option
+ * new module playerctl: control players supported by playerctl
+
+-------------------------------------------------------------------
Old:
----
py3status-3.52.tar.gz
New:
----
py3status-3.57.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-py3status.spec ++++++
--- /var/tmp/diff_new_pack.bzWm2Q/_old 2024-06-03 17:42:07.896098289 +0200
+++ /var/tmp/diff_new_pack.bzWm2Q/_new 2024-06-03 17:42:07.896098289 +0200
@@ -18,12 +18,12 @@
%define skip_python2 1
Name: python-py3status
-Version: 3.52
+Version: 3.57
Release: 0
Summary: Python extensible i3status wrapper
License: BSD-3-Clause
URL: https://github.com/ultrabug/py3status
-Source: https://github.com/ultrabug/py3status/archive/3.52.tar.gz#/py3status-3.52.t…
+Source: https://github.com/ultrabug/py3status/archive/3.57.tar.gz#/py3status-3.57.t…
BuildRequires: %{python_module hatchling}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
++++++ py3status-3.52.tar.gz -> py3status-3.57.tar.gz ++++++
++++ 1921 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-oci-sdk for openSUSE:Factory checked in at 2024-06-03 17:41:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oci-sdk (Old)
and /work/SRC/openSUSE:Factory/.python-oci-sdk.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oci-sdk"
Mon Jun 3 17:41:48 2024 rev:76 rq:1178052 version:2.127.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-oci-sdk/python-oci-sdk.changes 2024-05-15 21:29:27.679813109 +0200
+++ /work/SRC/openSUSE:Factory/.python-oci-sdk.new.24587/python-oci-sdk.changes 2024-06-03 17:42:04.819984272 +0200
@@ -1,0 +2,25 @@
+Fri May 31 11:56:51 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 2.127.0
+ * Support for Demand Signal service
+ * Support for external database connectors in the Database service
+ * Support for monitoring standby databases in the Database Management service
+ * Support for resource overviews in the Capacity Management service
+ * Support for optional parameters in the download API in the
+ Java Management Service Downloads service
+ * The operation list_occ_availabilities can return any string for the params
+ resource_type and workload_type in the OCI Control Center service
+ * The model OccCapacityRequestComputeDetails has been removed
+ in the OCI Control Center service
+ * The params resource_type and workload_type can accept any string in the models
+ OccAvailabilitySummary and OccCapacityRequestBaseDetails in the OCI Control
+ Center service
+- from version 2.126.4
+ * Support for the Resource Scheduler service
+ * Support for Bring Your Own Container (BYOC), custom networking and graceful
+ termination of pipelines in the Data Science service
+ * Support for backup and replacement of master, utility, and edge nodes in the Big Data service
+ * Support for nested resource principal in the Data Science service
+- clean up rpmlintrc
+
+-------------------------------------------------------------------
Old:
----
oci-python-sdk-2.126.3.tar.gz
New:
----
oci-python-sdk-2.127.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oci-sdk.spec ++++++
--- /var/tmp/diff_new_pack.Em8N0z/_old 2024-06-03 17:42:05.692017433 +0200
+++ /var/tmp/diff_new_pack.Em8N0z/_new 2024-06-03 17:42:05.692017433 +0200
@@ -19,7 +19,7 @@
%bcond_without python2
%{?sle15_python_module_pythons}
Name: python-oci-sdk
-Version: 2.126.3
+Version: 2.127.0
Release: 0
Summary: Oracle Cloud Infrastructure Python SDK
License: Apache-2.0 OR UPL-1.0
++++++ oci-python-sdk-2.126.3.tar.gz -> oci-python-sdk-2.127.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-oci-sdk/oci-python-sdk-2.126.3.tar.gz /work/SRC/openSUSE:Factory/.python-oci-sdk.new.24587/oci-python-sdk-2.127.0.tar.gz differ: char 12, line 1
++++++ python-oci-sdk.rpmlintrc ++++++
--- /var/tmp/diff_new_pack.Em8N0z/_old 2024-06-03 17:42:05.744019410 +0200
+++ /var/tmp/diff_new_pack.Em8N0z/_new 2024-06-03 17:42:05.748019562 +0200
@@ -4,6 +4,4 @@
addFilter("python-leftover-require python[0-9]+-requests")
addFilter("python-leftover-require python[0-9]+-six")
addFilter("python-leftover-require python[0-9]+-urllib3")
-# python2 only: rpmlint does not understand the python marker yet
-addFilter("python-missing-require configparser")
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-transitions for openSUSE:Factory checked in at 2024-06-03 17:41:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-transitions (Old)
and /work/SRC/openSUSE:Factory/.python-transitions.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-transitions"
Mon Jun 3 17:41:47 2024 rev:13 rq:1177995 version:0.9.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-transitions/python-transitions.changes 2024-01-12 23:46:12.640319352 +0100
+++ /work/SRC/openSUSE:Factory/.python-transitions.new.24587/python-transitions.changes 2024-06-03 17:41:57.827718378 +0200
@@ -1,0 +2,12 @@
+Thu May 30 08:25:50 UTC 2024 - Markéta Machová <mmachova(a)suse.com>
+
+- update to 0.9.1
+ * several bugfixes
+ * typing improvements
+ * introduces `on_final` callbacks on machines (as well as
+ `NestedState`) and `final` flags for states
+ * see the full list in Changelog.md
+- Add remove-py2-crumbs.patch to get rid of most py2 remnants
+- Add iteritems.patch to clean the rest of six
+
+-------------------------------------------------------------------
Old:
----
transitions-0.9.0.tar.gz
New:
----
iteritems.patch
remove-py2-crumbs.patch
transitions-0.9.1.tar.gz
BETA DEBUG BEGIN:
New:- Add remove-py2-crumbs.patch to get rid of most py2 remnants
- Add iteritems.patch to clean the rest of six
New: * see the full list in Changelog.md
- Add remove-py2-crumbs.patch to get rid of most py2 remnants
- Add iteritems.patch to clean the rest of six
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-transitions.spec ++++++
--- /var/tmp/diff_new_pack.57OCoh/_old 2024-06-03 17:42:00.255810711 +0200
+++ /var/tmp/diff_new_pack.57OCoh/_new 2024-06-03 17:42:00.271811319 +0200
@@ -18,17 +18,20 @@
Name: python-transitions
-Version: 0.9.0
+Version: 0.9.1
Release: 0
Summary: A lightweight, object-oriented Python state machine implementation
License: MIT
Group: Development/Languages/Python
URL: https://github.com/pytransitions/transitions
Source: https://files.pythonhosted.org/packages/source/t/transitions/transitions-%{…
+# PATCH-FIX-UPSTREAM https://github.com/pytransitions/transitions/pull/653 remove Python 2 crumbs
+Patch: remove-py2-crumbs.patch
+# PATCH-FIX-UPSTREAM https://github.com/a-detiste/transitions/pull/1 remove more python crumbs
+Patch: iteritems.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-six
Suggests: python-pygraphviz
Suggests: python-pytest
BuildArch: noarch
@@ -38,7 +41,6 @@
BuildRequires: %{python_module pycodestyle}
BuildRequires: %{python_module pygraphviz}
BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module six}
# png support for graphviz
BuildRequires: graphviz-gnome
BuildRequires: noto-sans-fonts
++++++ iteritems.patch ++++++
Index: transitions-0.9.1/transitions/extensions/factory.py
===================================================================
--- transitions-0.9.1.orig/transitions/extensions/factory.py
+++ transitions-0.9.1/transitions/extensions/factory.py
@@ -9,7 +9,6 @@
from functools import partial
import itertools
-from six import iteritems
from ..core import Machine, Transition
@@ -78,7 +77,7 @@ class LockedGraphMachine(GraphMachine, L
", ".join(itertools.chain(
(str(_) for _ in func.args[1:]),
("%s=%s" % (key, value)
- for key, value in iteritems(func.keywords if func.keywords else {})))))
+ for key, value in (func.keywords.items() if func.keywords else {}.items())))))
return GraphMachine.format_references(func)
Index: transitions-0.9.1/transitions/extensions/markup.py
===================================================================
--- transitions-0.9.1.orig/transitions/extensions/markup.py
+++ transitions-0.9.1/transitions/extensions/markup.py
@@ -13,8 +13,6 @@ import importlib
import itertools
import numbers
-from six import iteritems
-
from ..core import Machine
from .nesting import HierarchicalMachine
@@ -125,7 +123,7 @@ class MarkupMachine(Machine):
", ".join(itertools.chain(
(str(_) for _ in func.args),
("%s=%s" % (key, value)
- for key, value in iteritems(func.keywords if func.keywords else {})))))
+ for key, value in (func.keywords.items() if func.keywords else {}.items())))))
return str(func)
def _convert_states_and_transitions(self, root):
Index: transitions-0.9.1/transitions/extensions/nesting.py
===================================================================
--- transitions-0.9.1.orig/transitions/extensions/nesting.py
+++ transitions-0.9.1/transitions/extensions/nesting.py
@@ -730,11 +730,11 @@ class HierarchicalMachine(Machine):
"""
with self():
source_path = [] if source == "*" \
- else source.split(self.state_cls.separator) if isinstance(source, string_types) \
+ else source.split(self.state_cls.separator) if isinstance(source, str) \
else self._get_enum_path(source) if isinstance(source, Enum) \
else self._get_state_path(source)
dest_path = [] if dest == "*" \
- else dest.split(self.state_cls.separator) if isinstance(dest, string_types) \
+ else dest.split(self.state_cls.separator) if isinstance(dest, str) \
else self._get_enum_path(dest) if isinstance(dest, Enum) \
else self._get_state_path(dest)
self._remove_nested_transitions(trigger, source_path, dest_path)
++++++ remove-py2-crumbs.patch ++++++
From 3758cd4a28dfb162e19e29601d8cfe3b8ae1d410 Mon Sep 17 00:00:00 2001
From: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sun, 14 Apr 2024 14:28:03 +0200
Subject: [PATCH] remove Python 2 crumbs
---
tests/test_nesting.py | 7 +------
transitions/core.py | 23 +++-----------------
transitions/extensions/diagrams_base.py | 4 +---
transitions/extensions/factory.py | 2 +-
transitions/extensions/markup.py | 19 ++++-------------
transitions/extensions/nesting.py | 28 +++++++------------------
6 files changed, 18 insertions(+), 65 deletions(-)
diff --git a/tests/test_nesting.py b/tests/test_nesting.py
index a982aba0..13323869 100644
--- a/tests/test_nesting.py
+++ b/tests/test_nesting.py
@@ -1,10 +1,5 @@
# -*- coding: utf-8 -*-
-try:
- from builtins import object
-except ImportError:
- pass
-
import sys
import tempfile
from os.path import getsize
@@ -37,7 +32,7 @@
default_separator = NestedState.separator
-class Dummy(object):
+class Dummy:
pass
diff --git a/transitions/core.py b/transitions/core.py
index 8b42d553..e9480c2a 100644
--- a/transitions/core.py
+++ b/transitions/core.py
@@ -6,23 +6,7 @@
and transition concepts.
"""
-
-try:
- from builtins import object
-except ImportError: # pragma: no cover
- # python2
- pass
-
-try:
- # Enums are supported for Python 3.4+ and Python 2.7 with enum34 package installed
- from enum import Enum, EnumMeta
-except ImportError: # pragma: no cover
- # If enum is not available, create dummy classes for type checks
- class Enum: # type:ignore
- """This is just an Enum stub for Python 2 and Python 3.3 and before without Enum support."""
-
- class EnumMeta: # type:ignore
- """This is just an EnumMeta stub for Python 2 and Python 3.3 and before without Enum support."""
+from enum import Enum, EnumMeta
import inspect
import itertools
@@ -31,7 +15,6 @@ class EnumMeta: # type:ignore
from collections import OrderedDict, defaultdict, deque
from functools import partial
-from six import string_types
_LOGGER = logging.getLogger(__name__)
_LOGGER.addHandler(logging.NullHandler())
@@ -820,7 +803,7 @@ def add_states(self, states, on_enter=None, on_exit=None,
states = listify(states)
for state in states:
- if isinstance(state, (string_types, Enum)):
+ if isinstance(state, (str, Enum)):
state = self._create_state(
state, on_enter=on_enter, on_exit=on_exit,
ignore_invalid_triggers=ignore, **kwargs)
@@ -1178,7 +1161,7 @@ def resolve_callable(func, event_data):
Returns:
callable function resolved from string or func
"""
- if isinstance(func, string_types):
+ if isinstance(func, str):
try:
func = getattr(event_data.model, func)
if not callable(func): # if a property or some other not callable attribute was passed
diff --git a/transitions/extensions/diagrams_base.py b/transitions/extensions/diagrams_base.py
index b70ae553..c831e5cb 100644
--- a/transitions/extensions/diagrams_base.py
+++ b/transitions/extensions/diagrams_base.py
@@ -8,14 +8,12 @@
import copy
import abc
import logging
-import six
_LOGGER = logging.getLogger(__name__)
_LOGGER.addHandler(logging.NullHandler())
-(a)six.add_metaclass(abc.ABCMeta)
-class BaseGraph(object):
+class BaseGraph(metaclass=abc.ABCMeta):
"""Provides the common foundation for graphs generated either with pygraphviz or graphviz. This abstract class
should not be instantiated directly. Use .(py)graphviz.(Nested)Graph instead.
Attributes:
diff --git a/transitions/extensions/factory.py b/transitions/extensions/factory.py
index e56541c6..30d6a961 100644
--- a/transitions/extensions/factory.py
+++ b/transitions/extensions/factory.py
@@ -34,7 +34,7 @@ class NestedAsyncTransition(NestedTransition): # type: ignore
"""A mock of NestedAsyncTransition for Python 3.6 and earlier."""
-class MachineFactory(object):
+class MachineFactory:
"""Convenience factory for machine class retrieval."""
# get one of the predefined classes which fulfill the criteria
diff --git a/transitions/extensions/markup.py b/transitions/extensions/markup.py
index 7d5e1bdf..b42f9607 100644
--- a/transitions/extensions/markup.py
+++ b/transitions/extensions/markup.py
@@ -7,24 +7,13 @@
also be used to store and transfer machines.
"""
+from enum import Enum, EnumMeta
from functools import partial
import importlib
import itertools
import numbers
-from six import string_types, iteritems
-
-try:
- # Enums are supported for Python 3.4+ and Python 2.7 with enum34 package installed
- from enum import Enum, EnumMeta
-except ImportError: # pragma: no cover
- # If enum is not available, create dummy classes for type checks
- # typing must be prevent redefinition issues with mypy
- class Enum: # type:ignore
- """This is just an Enum stub for Python 2 and Python 3.3 and before without Enum support."""
-
- class EnumMeta: # type:ignore
- """This is just an EnumMeta stub for Python 2 and Python 3.3 and before without Enum support."""
+from six import iteritems
from ..core import Machine
from .nesting import HierarchicalMachine
@@ -229,7 +218,7 @@ class HierarchicalMarkupMachine(MarkupMachine, HierarchicalMachine):
def rep(func, format_references=None):
"""Return a string representation for `func`."""
- if isinstance(func, string_types):
+ if isinstance(func, str):
return func
if isinstance(func, numbers.Number):
return str(func)
@@ -242,7 +231,7 @@ def _convert(obj, attributes, format_references):
val = getattr(obj, key, False)
if not val:
continue
- if isinstance(val, string_types):
+ if isinstance(val, str):
definition[key] = val
else:
try:
diff --git a/transitions/extensions/nesting.py b/transitions/extensions/nesting.py
index d8c54ef7..96ccbfb1 100644
--- a/transitions/extensions/nesting.py
+++ b/transitions/extensions/nesting.py
@@ -9,23 +9,11 @@
from collections import OrderedDict
import copy
+from enum import Enum, EnumMeta
from functools import partial, reduce
import inspect
import logging
-try:
- # Enums are supported for Python 3.4+ and Python 2.7 with enum34 package installed
- from enum import Enum, EnumMeta
-except ImportError: # pragma: no cover
- # If enum is not available, create dummy classes for type checks
- class Enum: # type: ignore
- """This is just an Enum stub for Python 2 and Python 3.3 and before without Enum support."""
-
- class EnumMeta: # type: ignore
- """This is just an EnumMeta stub for Python 2 and Python 3.3 and before without Enum support."""
-
-from six import string_types
-
from ..core import State, Machine, Transition, Event, listify, MachineError, EventData
_LOGGER = logging.getLogger(__name__)
@@ -374,7 +362,7 @@ def __init__(self, model=Machine.self_literal, states=None, initial='initial', t
)
def __call__(self, to_scope=None):
- if isinstance(to_scope, string_types):
+ if isinstance(to_scope, str):
state_name = to_scope.split(self.state_cls.separator)[0]
state = self.states[state_name]
to_scope = (state, state.states, state.events, self.prefix_path + [state_name])
@@ -408,7 +396,7 @@ def add_model(self, model, initial=None):
if hasattr(initial_name, 'name'):
initial_name = initial_name.name
# initial states set by add_model or machine might contain initial states themselves.
- if isinstance(initial_name, string_types):
+ if isinstance(initial_name, str):
initial_states = self._resolve_initial(models, initial_name.split(self.state_cls.separator))
# when initial is set to a (parallel) state, we accept it as it is
else:
@@ -473,7 +461,7 @@ def add_states(self, states, on_enter=None, on_exit=None, ignore_invalid_trigger
state = {'name': state, 'children': state.value}
elif isinstance(state.value, dict):
state = dict(name=state, **state.value)
- if isinstance(state, string_types):
+ if isinstance(state, str):
self._add_string_state(state, on_enter, on_exit, ignore, remap, **kwargs)
elif isinstance(state, Enum):
self._add_enum_state(state, on_enter, on_exit, ignore, remap, **kwargs)
@@ -600,7 +588,7 @@ def get_state(self, state, hint=None):
"""
if isinstance(state, Enum):
state = self._get_enum_path(state)
- elif isinstance(state, string_types):
+ elif isinstance(state, str):
state = state.split(self.state_cls.separator)
if not hint:
state = copy.copy(state)
@@ -652,11 +640,11 @@ def get_transitions(self, trigger="", source="*", dest="*", delegate=False):
"""
with self():
source_path = [] if source == "*" \
- else source.split(self.state_cls.separator) if isinstance(source, string_types) \
+ else source.split(self.state_cls.separator) if isinstance(source, str) \
else self._get_enum_path(source) if isinstance(source, Enum) \
else self._get_state_path(source)
dest_path = [] if dest == "*" \
- else dest.split(self.state_cls.separator) if isinstance(dest, string_types) \
+ else dest.split(self.state_cls.separator) if isinstance(dest, str) \
else self._get_enum_path(dest) if isinstance(dest, Enum) \
else self._get_state_path(dest)
matches = self.get_nested_transitions(trigger, source_path, dest_path)
@@ -1064,7 +1052,7 @@ def _init_state(self, state):
self._init_state(substate)
def _recursive_initial(self, value):
- if isinstance(value, string_types):
+ if isinstance(value, str):
path = value.split(self.state_cls.separator, 1)
if len(path) > 1:
state_name, suffix = path
++++++ transitions-0.9.0.tar.gz -> transitions-0.9.1.tar.gz ++++++
++++ 5517 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-xdg-base-dirs for openSUSE:Factory checked in at 2024-06-03 17:41:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-xdg-base-dirs (Old)
and /work/SRC/openSUSE:Factory/.python-xdg-base-dirs.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-xdg-base-dirs"
Mon Jun 3 17:41:46 2024 rev:2 rq:1177991 version:6.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-xdg-base-dirs/python-xdg-base-dirs.changes 2024-05-30 15:34:57.093709410 +0200
+++ /work/SRC/openSUSE:Factory/.python-xdg-base-dirs.new.24587/python-xdg-base-dirs.changes 2024-06-03 17:41:56.155654795 +0200
@@ -1,0 +2,5 @@
+Fri May 31 21:11:37 UTC 2024 - Matej Cepl <mcepl(a)cepl.eu>
+
+- Add %{?sle15_python_module_pythons}
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-xdg-base-dirs.spec ++++++
--- /var/tmp/diff_new_pack.tI8OQw/_old 2024-06-03 17:41:56.923684000 +0200
+++ /var/tmp/diff_new_pack.tI8OQw/_new 2024-06-03 17:41:56.927684152 +0200
@@ -16,6 +16,7 @@
#
+%{?sle15_python_module_pythons}
%define modname xdg-base-dirs
Name: python-xdg-base-dirs
Version: 6.0.1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ansible-variables for openSUSE:Factory checked in at 2024-06-03 17:41:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ansible-variables (Old)
and /work/SRC/openSUSE:Factory/.ansible-variables.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansible-variables"
Mon Jun 3 17:41:44 2024 rev:5 rq:1177978 version:0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ansible-variables/ansible-variables.changes 2024-03-17 22:14:29.693072650 +0100
+++ /work/SRC/openSUSE:Factory/.ansible-variables.new.24587/ansible-variables.changes 2024-06-03 17:41:54.371586952 +0200
@@ -1,0 +2,7 @@
+Fri May 31 13:11:07 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 0.7.0:
+ Features
+ * support for ansible-core 2.17
+
+-------------------------------------------------------------------
Old:
----
ansible-variables-0.6.1.tar.gz
New:
----
ansible-variables-0.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ansible-variables.spec ++++++
--- /var/tmp/diff_new_pack.7xcZ7h/_old 2024-06-03 17:41:55.355624372 +0200
+++ /var/tmp/diff_new_pack.7xcZ7h/_new 2024-06-03 17:41:55.355624372 +0200
@@ -38,7 +38,7 @@
%endif
Name: ansible-variables
-Version: 0.6.1
+Version: 0.7.0
Release: 0
Summary: Tool to show origin of Ansible host context variables
License: GPL-3.0-or-later
++++++ ansible-variables-0.6.1.tar.gz -> ansible-variables-0.7.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-variables-0.6.1/.github/workflows/tox.yml new/ansible-variables-0.7.0/.github/workflows/tox.yml
--- old/ansible-variables-0.6.1/.github/workflows/tox.yml 2024-03-10 12:45:44.000000000 +0100
+++ new/ansible-variables-0.7.0/.github/workflows/tox.yml 2024-05-31 08:31:22.000000000 +0200
@@ -40,12 +40,15 @@
py310-2.14
py310-2.15
py310-2.16
+ py310-2.17
py310-devel
py311-2.14
py311-2.15
py311-2.16
+ py311-2.17
py311-devel
py312-2.16
+ py312-2.17
py312-devel
build:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-variables-0.6.1/.pre-commit-config.yaml new/ansible-variables-0.7.0/.pre-commit-config.yaml
--- old/ansible-variables-0.6.1/.pre-commit-config.yaml 2024-03-10 12:45:44.000000000 +0100
+++ new/ansible-variables-0.7.0/.pre-commit-config.yaml 2024-05-31 08:31:22.000000000 +0200
@@ -8,7 +8,7 @@
for more information, see https://pre-commit.ci
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks.git
- rev: v4.5.0
+ rev: v4.6.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
@@ -21,18 +21,18 @@
language_version: python3
- repo: https://github.com/crate-ci/typos
- rev: v1.18.1
+ rev: v1.21.0
hooks:
- id: typos
- repo: https://github.com/psf/black
- rev: 24.1.1
+ rev: 24.4.2
hooks:
- id: black
exclude: ".ci/hack"
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: 'v0.2.0'
+ rev: 'v0.4.3'
hooks:
- id: ruff
args:
@@ -40,7 +40,7 @@
- --exit-non-zero-on-fix
- repo: https://github.com/jackdewinter/pymarkdown
- rev: 0.9.16
+ rev: v0.9.19
hooks:
- id: pymarkdown
args:
@@ -50,7 +50,7 @@
exclude: CHANGELOG.md # is autogenerated
- repo: https://github.com/pycqa/pylint
- rev: v3.0.3
+ rev: v3.1.0
hooks:
- id: pylint
pass_filenames: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-variables-0.6.1/CHANGELOG.md new/ansible-variables-0.7.0/CHANGELOG.md
--- old/ansible-variables-0.6.1/CHANGELOG.md 2024-03-10 12:45:44.000000000 +0100
+++ new/ansible-variables-0.7.0/CHANGELOG.md 2024-05-31 08:31:22.000000000 +0200
@@ -1,5 +1,12 @@
# Changelog
+## [0.7.0](https://github.com/hille721/ansible-variables/compare/v0.6.1...v0.7.… (2024-05-31)
+
+
+### Features
+
+* support for ansible-core 2.17 ([#67](https://github.com/hille721/ansible-variables/issues/67)) ([fa1967a](https://github.com/hille721/ansible-variables/commit/fa1967abbf28e…)
+
## [0.6.1](https://github.com/hille721/ansible-variables/compare/v0.6.0...v0.6.… (2024-03-10)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-variables-0.6.1/README.md new/ansible-variables-0.7.0/README.md
--- old/ansible-variables-0.6.1/README.md 2024-03-10 12:45:44.000000000 +0100
+++ new/ansible-variables-0.7.0/README.md 2024-05-31 08:31:22.000000000 +0200
@@ -19,7 +19,7 @@
Based on one host it will return a list with all variables, values and variable type.
-Tested with `ansible-core` 2.11 - 2.16.
+Tested with `ansible-core` 2.11 - 2.17.
## Installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-variables-0.6.1/setup.cfg new/ansible-variables-0.7.0/setup.cfg
--- old/ansible-variables-0.6.1/setup.cfg 2024-03-10 12:45:44.000000000 +0100
+++ new/ansible-variables-0.7.0/setup.cfg 2024-05-31 08:31:22.000000000 +0200
@@ -1,6 +1,6 @@
[metadata]
name = ansible-variables
-version = 0.6.1
+version = 0.7.0
description = Keep track of Ansible host context variables
long_description = file: README.md
long_description_content_type = text/markdown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-variables-0.6.1/tox.ini new/ansible-variables-0.7.0/tox.ini
--- old/ansible-variables-0.6.1/tox.ini 2024-03-10 12:45:44.000000000 +0100
+++ new/ansible-variables-0.7.0/tox.ini 2024-05-31 08:31:22.000000000 +0200
@@ -3,9 +3,9 @@
linters
py38-{2.11,2.12,2.13}
py39-{2.11,2.12,2.13,2.14,2.15}
- py310-{2.12,2.13,2.14,2.15,2.16,devel}
- py311-{2.14,2.15,2.16,devel}
- py312-{2.16,devel}
+ py310-{2.12,2.13,2.14,2.15,2.16,2.17,devel}
+ py311-{2.14,2.15,2.16,2.17,devel}
+ py312-{2.16,2.17,devel}
minversion = 4.4.11
[testenv]
@@ -20,6 +20,7 @@
2.14: https://github.com/ansible/ansible/archive/stable-2.14.tar.gz
2.15: https://github.com/ansible/ansible/archive/stable-2.15.tar.gz
2.16: https://github.com/ansible/ansible/archive/stable-2.16.tar.gz
+ 2.17: https://github.com/ansible/ansible/archive/stable-2.17.tar.gz
devel: https://github.com/ansible/ansible/archive/devel.tar.gz
commands =
1
0