Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package google-guest-agent for
openSUSE:Factory checked in at 2025-04-16 20:39:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-guest-agent (Old)
and /work/SRC/openSUSE:Factory/.google-guest-agent.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-guest-agent"
Wed Apr 16 20:39:39 2025 rev:45 rq:1269694 version:20250411.00
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-guest-agent/google-guest-agent.changes
2025-04-04 18:10:10.294818325 +0200
+++
/work/SRC/openSUSE:Factory/.google-guest-agent.new.30101/google-guest-agent.changes
2025-04-20 19:55:25.269517222 +0200
@@ -1,0 +2,7 @@
+Mon Apr 14 07:39:06 UTC 2025 - John Paul Adrian Glaubitz
<adrian.glaub...@suse.com>
+
+- Update to version 20250411.00
+ * Re-enable disabled services if the core plugin was enabled (#521)
+- Add -buildmode=pie to go build command line (bsc#1239944)
+
+-------------------------------------------------------------------
Old:
----
guest-agent-20250327.01.tar.gz
New:
----
guest-agent-20250411.00.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-guest-agent.spec ++++++
--- /var/tmp/diff_new_pack.mx4Kd6/_old 2025-04-20 19:55:27.577613848 +0200
+++ /var/tmp/diff_new_pack.mx4Kd6/_new 2025-04-20 19:55:27.601614853 +0200
@@ -24,7 +24,7 @@
%global import_path %{provider_prefix}
Name: google-guest-agent
-Version: 20250327.01
+Version: 20250411.00
Release: 0
Summary: Google Cloud Guest Agent
License: Apache-2.0
@@ -61,7 +61,7 @@
%goprep %{import_path}
for bin in google_guest_agent google_metadata_script_runner; do
pushd "$bin"
- CGO_ENABLED=0 go build -ldflags="-s -w -X main.version=%{version}"
-mod=vendor
+ CGO_ENABLED=0 go build -buildmode=pie -ldflags="-s -w -X
main.version=%{version}" -mod=vendor
popd
done
++++++ _service ++++++
--- /var/tmp/diff_new_pack.mx4Kd6/_old 2025-04-20 19:55:27.969630259 +0200
+++ /var/tmp/diff_new_pack.mx4Kd6/_new 2025-04-20 19:55:28.005631767 +0200
@@ -3,8 +3,8 @@
<param
name="url">https://github.com/GoogleCloudPlatform/guest-agent/</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="versionformat">20250327.01</param>
- <param name="revision">20250327.01</param>
+ <param name="versionformat">20250411.00</param>
+ <param name="revision">20250411.00</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
@@ -15,7 +15,7 @@
<param name="basename">guest-agent</param>
</service>
<service name="go_modules" mode="disabled">
- <param name="archive">guest-agent-20250327.01.tar.gz</param>
+ <param name="archive">guest-agent-20250411.00.tar.gz</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.mx4Kd6/_old 2025-04-20 19:55:28.189639470 +0200
+++ /var/tmp/diff_new_pack.mx4Kd6/_new 2025-04-20 19:55:28.229641144 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/GoogleCloudPlatform/guest-agent/</param>
- <param
name="changesrevision">bdc0a12cb28433745106c088c80a553ffff2d466</param></service></servicedata>
+ <param
name="changesrevision">23475f2b198e8ecceac7e9af213e1fd83df299e8</param></service></servicedata>
(No newline at EOF)
++++++ guest-agent-20250327.01.tar.gz -> guest-agent-20250411.00.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/gce_workload_cert_refresh/main.go
new/guest-agent-20250411.00/gce_workload_cert_refresh/main.go
--- old/guest-agent-20250327.01/gce_workload_cert_refresh/main.go
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/gce_workload_cert_refresh/main.go
2025-03-24 23:50:14.000000000 +0100
@@ -149,16 +149,13 @@
func main() {
ctx := context.Background()
+
opts := logger.LogOpts{
LoggerName: programName,
FormatFunction: logFormat,
// No need for syslog.
DisableLocalLogging: true,
}
- createdByBytes, err := getMetadata(ctx,
"/instance/attributes/created-by")
- if err == nil {
- opts.MIG = string(createdByBytes)
- }
opts.Writers = []io.Writer{os.Stderr}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/guest-agent-20250327.01/go.mod
new/guest-agent-20250411.00/go.mod
--- old/guest-agent-20250327.01/go.mod 2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/go.mod 2025-03-24 23:50:14.000000000 +0100
@@ -1,12 +1,12 @@
module github.com/GoogleCloudPlatform/guest-agent
-go 1.23.0
+go 1.20
replace github.com/GoogleCloudPlatform/guest-agent/metadata => ../metadata
require (
cloud.google.com/go/storage v1.31.0
- github.com/GoogleCloudPlatform/guest-logging-go
v0.0.0-20250327013322-4be06cdc8bd8
+ github.com/GoogleCloudPlatform/guest-logging-go
v0.0.0-20250108002221-76154e4b3bd9
github.com/Microsoft/go-winio v0.6.1
github.com/go-ini/ini v1.66.6
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
@@ -17,7 +17,7 @@
github.com/kardianos/service v1.2.2
github.com/robfig/cron/v3 v3.0.1
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
- golang.org/x/crypto v0.35.0
+ golang.org/x/crypto v0.33.0
golang.org/x/sys v0.30.0
google.golang.org/api v0.134.0
google.golang.org/grpc v1.57.1
@@ -44,7 +44,7 @@
github.com/pkg/errors v0.9.1 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/mod v0.17.0 // indirect
- golang.org/x/net v0.36.0 // indirect
+ golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sync v0.11.0 // indirect
golang.org/x/text v0.22.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/guest-agent-20250327.01/go.sum
new/guest-agent-20250411.00/go.sum
--- old/guest-agent-20250327.01/go.sum 2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/go.sum 2025-03-24 23:50:14.000000000 +0100
@@ -15,8 +15,8 @@
cloud.google.com/go/storage v1.31.0
h1:+S3LjjEN2zZ+L5hOwj4+1OkGCsLVe0NzpXKQ1pSdTCI=
cloud.google.com/go/storage v1.31.0/go.mod
h1:81ams1PrhW16L4kF7qg+4mTq7SRs5HsbDTM0bWvrwJ0=
github.com/BurntSushi/toml v0.3.1/go.mod
h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/GoogleCloudPlatform/guest-logging-go
v0.0.0-20250327013322-4be06cdc8bd8
h1:XHFUi3AVH/bsqoNIniftXTVgHYZuMalB/s/5LiLkf9c=
-github.com/GoogleCloudPlatform/guest-logging-go
v0.0.0-20250327013322-4be06cdc8bd8/go.mod
h1:6ZqSUIZRAPR5dNMWJ+FwIarFFQ9t5qalaKQs20o6h+I=
+github.com/GoogleCloudPlatform/guest-logging-go
v0.0.0-20250108002221-76154e4b3bd9
h1:7qCQS+ERyBX6NCxH857rhrxntIwyAIuIk9+s0iETYWU=
+github.com/GoogleCloudPlatform/guest-logging-go
v0.0.0-20250108002221-76154e4b3bd9/go.mod
h1:6ZqSUIZRAPR5dNMWJ+FwIarFFQ9t5qalaKQs20o6h+I=
github.com/Microsoft/go-winio v0.6.1
h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod
h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/antihax/optional v1.0.0/go.mod
h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -63,9 +63,7 @@
github.com/golang/protobuf v1.5.3
h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod
h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/certificate-transparency-go v1.1.2
h1:4hE0GEId6NAW28dFpC+LrRGwQX5dtmXQGDbg8+/MZOM=
-github.com/google/certificate-transparency-go v1.1.2/go.mod
h1:3OL+HKDqHPUfdKrHVQxO6T8nDLO0HF7LRTlkIWXaWvQ=
github.com/google/go-attestation v0.4.4-0.20230613144338-a9b6eb1eb888
h1:HURgKPRPJSozDuMHpjdV+iyFVLhB6bi1JanhGgSzI1k=
-github.com/google/go-attestation v0.4.4-0.20230613144338-a9b6eb1eb888/go.mod
h1:xCfWZojUHwedNcs780T8cblW9XHss9XKD2s3U44FVbo=
github.com/google/go-cmp v0.2.0/go.mod
h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod
h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod
h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -82,11 +80,9 @@
github.com/google/go-tpm-tools v0.4.0
h1:bYRZAUvQEmn11WTKCkTLRCCv4aTlOBgBBeqCK0ABT2A=
github.com/google/go-tpm-tools v0.4.0/go.mod
h1:G7PFUk8KKQzdYYGv/cpV9LB9sPT7czAAomnceugzNKQ=
github.com/google/go-tspi v0.3.0
h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus=
-github.com/google/go-tspi v0.3.0/go.mod
h1:xfMGI3G0PhxCdNVcYr1C4C+EizojDg/TXuX5by8CiHI=
github.com/google/logger v1.1.1 h1:+6Z2geNxc9G+4D4oDO9njjjn2d0wN5d7uOo0vOIW1NQ=
github.com/google/logger v1.1.1/go.mod
h1:BkeJZ+1FhQ+/d087r4dzojEg1u2ZX+ZqG1jTUrLM+zQ=
github.com/google/martian/v3 v3.3.2
h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
-github.com/google/martian/v3 v3.3.2/go.mod
h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
github.com/google/s2a-go v0.1.4/go.mod
h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
github.com/google/tink/go v1.7.0
h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w=
@@ -128,15 +124,13 @@
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod
h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/atomic v1.9.0/go.mod
h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
-go.uber.org/multierr v1.8.0/go.mod
h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod
h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod
h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod
h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
-golang.org/x/crypto v0.35.0/go.mod
h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod
h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod
h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod
h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod
h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -157,8 +151,8 @@
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod
h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod
h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod
h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
-golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
+golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
+golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
@@ -187,7 +181,6 @@
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod
h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
-golang.org/x/term v0.29.0/go.mod
h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/google-guest-agent-manager.service
new/guest-agent-20250411.00/google-guest-agent-manager.service
--- old/guest-agent-20250327.01/google-guest-agent-manager.service
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/google-guest-agent-manager.service
2025-03-24 23:50:14.000000000 +0100
@@ -1,7 +1,7 @@
[Unit]
Description=Google Compute Engine Guest Agent Plugin Manager
-After=network-online.target syslog.service
-After=network.service networking.service NetworkManager.service
systemd-networkd.service
+After=google-guest-agent.service
+Wants=google-guest-agent.service
[Service]
Type=notify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/google-guest-compat-manager.service
new/guest-agent-20250411.00/google-guest-compat-manager.service
--- old/guest-agent-20250327.01/google-guest-compat-manager.service
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/google-guest-compat-manager.service
1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-[Unit]
-Description=Google Compute Engine Guest Compat Manager
-After=network-online.target syslog.service
-After=network.service networking.service NetworkManager.service
systemd-networkd.service
-
-[Service]
-Type=notify
-ExecStart=/usr/bin/google_guest_compat_manager
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/google-shutdown-scripts.service
new/guest-agent-20250411.00/google-shutdown-scripts.service
--- old/guest-agent-20250327.01/google-shutdown-scripts.service 2025-03-27
17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/google-shutdown-scripts.service 2025-03-24
23:50:14.000000000 +0100
@@ -8,7 +8,7 @@
ExecStart=/bin/true
RemainAfterExit=true
# This service does nothing on start, and runs shutdown scripts on stop.
-ExecStop=/bin/sh -c 'if [ -e /usr/bin/gce_compat_metadata_script_runner ];
then /usr/bin/gce_compat_metadata_script_runner shutdown; else
/usr/bin/google_metadata_script_runner shutdown; fi'
+ExecStop=/usr/bin/google_metadata_script_runner shutdown
TimeoutStopSec=0
KillMode=process
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/google-startup-scripts.service
new/guest-agent-20250411.00/google-startup-scripts.service
--- old/guest-agent-20250327.01/google-startup-scripts.service 2025-03-27
17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/google-startup-scripts.service 2025-03-24
23:50:14.000000000 +0100
@@ -6,7 +6,7 @@
[Service]
Type=oneshot
-ExecStart=/bin/sh -c 'if [ -e /usr/bin/gce_compat_metadata_script_runner ];
then /usr/bin/gce_compat_metadata_script_runner startup; else
/usr/bin/google_metadata_script_runner startup; fi'
+ExecStart=/usr/bin/google_metadata_script_runner startup
#TimeoutStartSec is ignored for Type=oneshot service units.
KillMode=process
StandardOutput=journal+console
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/google_authorized_keys/main.go
new/guest-agent-20250411.00/google_authorized_keys/main.go
--- old/guest-agent-20250327.01/google_authorized_keys/main.go 2025-03-27
17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/google_authorized_keys/main.go 2025-03-24
23:50:14.000000000 +0100
@@ -143,11 +143,9 @@
ctx := context.Background()
username := os.Args[1]
- createdBy, _ := client.GetKey(ctx, "/instance/attributes/created-by",
nil)
opts := logger.LogOpts{
LoggerName: programName,
FormatFunction: logFormat,
- MIG: createdBy,
}
if runtime.GOOS == "windows" {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/guest-agent-20250327.01/google_guest_agent/main.go
new/guest-agent-20250411.00/google_guest_agent/main.go
--- old/guest-agent-20250327.01/google_guest_agent/main.go 2025-03-27
17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/google_guest_agent/main.go 2025-03-24
23:50:14.000000000 +0100
@@ -207,7 +207,6 @@
// TODO: move all this metadata dependent code to its own metadata
event handler.
if newMetadata != nil {
opts.ProjectName = newMetadata.Project.ProjectID
- opts.MIG = newMetadata.Instance.Attributes.CreatedBy
if err := logger.Init(ctx, opts); err != nil {
logger.Errorf("Error initializing logger: %v", err)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/google_metadata_script_runner/main.go
new/guest-agent-20250411.00/google_metadata_script_runner/main.go
--- old/guest-agent-20250327.01/google_metadata_script_runner/main.go
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/google_metadata_script_runner/main.go
2025-03-24 23:50:14.000000000 +0100
@@ -452,10 +452,6 @@
if err == nil {
opts.ProjectName = projectID
}
- createdBy, err := getMetadataKey(ctx, "/instance/attributes/created-by")
- if err == nil {
- opts.MIG = createdBy
- }
if err := logger.Init(ctx, opts); err != nil {
fmt.Printf("Error initializing logger: %+v", err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/guest-agent-20250327.01/metadata/metadata.go
new/guest-agent-20250411.00/metadata/metadata.go
--- old/guest-agent-20250327.01/metadata/metadata.go 2025-03-27
17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/metadata/metadata.go 2025-03-24
23:50:14.000000000 +0100
@@ -205,7 +205,6 @@
// Attributes describes the project's attributes keys.
type Attributes struct {
- CreatedBy string
BlockProjectKeys bool
HTTPSMDSEnableNativeStore *bool
DisableHTTPSMdsSetup *bool
@@ -235,7 +234,6 @@
}
// Unmarshal to literal JSON types before doing anything else.
type inner struct {
- CreatedBy string `json:"created-by"`
BlockProjectKeys string
`json:"block-project-ssh-keys"`
Diagnostics string `json:"diagnostics"`
DisableAccountManager string
`json:"disable-account-manager"`
@@ -264,7 +262,6 @@
a.WSFCAddresses = temp.WSFCAddresses
a.WSFCAgentPort = temp.WSFCAgentPort
a.WindowsKeys = temp.WindowsKeys
- a.CreatedBy = temp.CreatedBy
value, err := strconv.ParseBool(temp.DisableHTTPSMdsSetup)
if err == nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/guest-agent-20250327.01/packaging/debian/prerm
new/guest-agent-20250411.00/packaging/debian/prerm
--- old/guest-agent-20250327.01/packaging/debian/prerm 2025-03-27
17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/packaging/debian/prerm 1970-01-01
01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "purge" -o "$1" = "remove" ] ; then
- systemctl stop google-guest-agent-manager >/dev/null 2>&1 || :
- ggactl_plugin_cleanup all >/dev/null 2>&1 || :
-fi
-
-#DEBHELPER#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/guest-agent-20250327.01/packaging/debian/rules
new/guest-agent-20250411.00/packaging/debian/rules
--- old/guest-agent-20250327.01/packaging/debian/rules 2025-03-27
17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/packaging/debian/rules 2025-03-24
23:50:14.000000000 +0100
@@ -24,13 +24,7 @@
install -d debian/google-guest-agent/lib/systemd/system
install -p -m 0644 gce-workload-cert-refresh.timer
debian/google-guest-agent/lib/systemd/system/
if [ -d google-guest-agent ]; then\
- install -d
debian/google-guest-agent/usr/lib/google/guest_agent;\
- install -p -m 0755
google-guest-agent/cmd/gce_metadata_script_runner/gce_metadata_script_runner
debian/google-guest-agent/usr/bin/gce_metadata_script_runner;\
- install -p -m 0755
google-guest-agent/cmd/google_guest_compat_manager/google_guest_compat_manager
debian/google-guest-agent/usr/bin/google_guest_compat_manager;\
- install -p -m 0755
google-guest-agent/cmd/google_guest_agent/google_guest_agent
debian/google-guest-agent/usr/bin/google_guest_agent_manager;\
- install -p -m 0755
google-guest-agent/cmd/ggactl/ggactl_plugin_cleanup
debian/google-guest-agent/usr/bin/ggactl_plugin_cleanup;\
- install -p -m 0755
google-guest-agent/cmd/core_plugin/core_plugin
debian/google-guest-agent/usr/lib/google/guest_agent/core_plugin;\
- install -p -m 0755
google-guest-agent/cmd/metadata_script_runner_compat/gce_compat_metadata_script_runner
debian/google-guest-agent/usr/bin/gce_compat_metadata_script_runner;\
+ install -p -m 0644
google-guest-agent/cmd/google_guest_agent/google_guest_agent
debian/google-guest-agent/usr/bin/google_guest_agent_manager;\
fi
override_dh_golang:
@@ -39,12 +33,7 @@
override_dh_auto_build:
dh_auto_build -O--buildsystem=golang -- -ldflags="-s -w -X
main.version=$(VERSION)" -mod=readonly
if [ -d google-guest-agent ]; then\
- VERSION=$(VERSION) make -C google-guest-agent
cmd/google_guest_compat_manager/google_guest_compat_manager;\
VERSION=$(VERSION) make -C google-guest-agent
cmd/google_guest_agent/google_guest_agent;\
- VERSION=$(VERSION) make -C google-guest-agent
cmd/ggactl/ggactl_plugin_cleanup;\
- VERSION=$(VERSION) make -C google-guest-agent
cmd/core_plugin/core_plugin;\
- VERSION=$(VERSION) make -C google-guest-agent
cmd/gce_metadata_script_runner/gce_metadata_script_runner;\
- VERSION=$(VERSION) make -C google-guest-agent
cmd/metadata_script_runner_compat/gce_compat_metadata_script_runner;\
fi
override_dh_installinit:
@@ -55,14 +44,12 @@
install -p -m 0644 *.service
debian/google-guest-agent/lib/systemd/system/
# Don't include guest agent manager if not building with it.
if [ ! -d google-guest-agent ]; then\
- rm -f
debian/google-guest-agent/lib/systemd/system/google-guest-compat-manager.service;\
rm -f
debian/google-guest-agent/lib/systemd/system/google-guest-agent-manager.service;\
fi
install -d debian/google-guest-agent/lib/systemd/system-preset
install -p -m 0644 *.preset
debian/google-guest-agent/lib/systemd/system-preset/
dh_systemd_enable google-guest-agent.service
google-startup-scripts.service google-shutdown-scripts.service
gce-workload-cert-refresh.timer
if [ -d google-guest-agent ]; then\
- dh_systemd_enable google-guest-compat-manager.service;\
dh_systemd_enable google-guest-agent-manager.service;\
fi
@@ -71,6 +58,5 @@
dh_systemd_start google-guest-agent.service
dh_systemd_start gce-workload-cert-refresh.timer
if [ -d google-guest-agent ]; then\
- dh_systemd_start google-guest-compat-manager.service;\
dh_systemd_start google-guest-agent-manager.service;\
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/packaging/googet/agent_install.ps1
new/guest-agent-20250411.00/packaging/googet/agent_install.ps1
--- old/guest-agent-20250327.01/packaging/googet/agent_install.ps1
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/packaging/googet/agent_install.ps1
2025-03-24 23:50:14.000000000 +0100
@@ -22,11 +22,6 @@
$manager_display_name = 'Google Compute Engine Agent Manager'
$manager_description = 'Google Compute Engine Agent Manager'
-$compat_manager = 'GCEWindowsCompatManager'
-$compat_path = '"C:\Program Files\Google\Compute
Engine\agent\GCEWindowsCompatManager.exe"'
-$compat_display_name = 'Google Compute Engine Compat Manager'
-$compat_description = 'Google Compute Engine Compat Manager'
-
$initial_config = @'
# GCE Instance Configuration
@@ -77,19 +72,11 @@
Set-New-Service $name $display_name $description $path
Set-ServiceConfig $name $path
- # Guest Agent Manager and Compat Manager service
+ # Guest Agent Manager service
if ($install_manager) {
- Set-New-Service $compat_manager $compat_display_name $compat_description
$compat_path
- Set-ServiceConfig $compat_manager $compat_path
-
Set-New-Service $manager_name $manager_display_name $manager_description
$manager_path
Set-ServiceConfig $manager_name $manager_path
} else {
- if (Get-Service $compat_manager -ErrorAction SilentlyContinue) {
- Stop-Service $compat_manager
- & sc.exe delete $compat_manager
- }
-
if (Get-Service $manager_name -ErrorAction SilentlyContinue) {
Stop-Service $manager_name
& sc.exe delete $manager_name
@@ -104,7 +91,6 @@
Restart-Service $name -Verbose
if ($install_manager) {
- Restart-Service $compat_manager -Verbose
Restart-Service $manager_name -Verbose
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/packaging/googet/agent_uninstall.ps1
new/guest-agent-20250411.00/packaging/googet/agent_uninstall.ps1
--- old/guest-agent-20250327.01/packaging/googet/agent_uninstall.ps1
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/packaging/googet/agent_uninstall.ps1
2025-03-24 23:50:14.000000000 +0100
@@ -15,20 +15,9 @@
Stop-Service GCEAgent -Verbose
& sc.exe delete GCEAgent
-$compat_manager = 'GCEWindowsCompatManager'
$name = 'GCEAgentManager'
-$cleanup_exe = "C:\Program Files\Google\Compute
Engine\agent\ggactl_plugin_cleanup.exe"
-
-# Stop and Delete compat manager.
-if (Get-Service $compat_manager -ErrorAction SilentlyContinue) {
- Stop-Service $compat_manager -Verbose
- & sc.exe delete $compat_manager
-}
-
-# Stop Guest Agent Manager, cleanup all plugins (if present) and delete the
service.
if (Get-Service $name -ErrorAction SilentlyContinue) {
Stop-Service $name -Verbose
- & $cleanup_exe all
& sc.exe delete $name
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/packaging/googet/google-compute-engine-windows.goospec
new/guest-agent-20250411.00/packaging/googet/google-compute-engine-windows.goospec
---
old/guest-agent-20250327.01/packaging/googet/google-compute-engine-windows.goospec
2025-03-27 17:31:22.000000000 +0100
+++
new/guest-agent-20250411.00/packaging/googet/google-compute-engine-windows.goospec
2025-03-24 23:50:14.000000000 +0100
@@ -7,14 +7,9 @@
"description": "Google Compute Engine Windows agent",
"source": "https://github.com/GoogleCloudPlatform/guest-agent/";,
"files": {
- "CorePlugin.exe": "<ProgramFiles>/Google/Compute
Engine/agent/CorePlugin.exe",
- "GCEMetadataScriptRunner.exe": "<ProgramFiles>/Google/Compute
Engine/agent/GCEMetadataScriptRunner.exe",
"GCEWindowsAgentManager.exe": "<ProgramFiles>/Google/Compute
Engine/agent/GCEWindowsAgentManager.exe",
- "GCEWindowsCompatManager.exe": "<ProgramFiles>/Google/Compute
Engine/agent/GCEWindowsCompatManager.exe",
- "GCECompatMetadataScripts.exe": "<ProgramFiles>/Google/Compute
Engine/metadata_scripts/GCECompatMetadataScripts.exe",
"GCEWindowsAgent.exe": "<ProgramFiles>/Google/Compute
Engine/agent/GCEWindowsAgent.exe",
"GCEAuthorizedKeysCommand.exe": "<ProgramFiles>/Google/Compute
Engine/agent/GCEAuthorizedKeysCommand.exe",
- "ggactl_plugin_cleanup.exe": "<ProgramFiles>/Google/Compute
Engine/agent/ggactl_plugin_cleanup.exe",
"THIRD_PARTY_LICENSES": "<ProgramFiles>/Google/Compute
Engine/THIRD_PARTY_LICENSES/",
"LICENSE": "<ProgramFiles>/Google/Compute Engine/agent/LICENSE.txt"
},
@@ -41,12 +36,7 @@
],
"sources": [{
"include": [
- "CorePlugin.exe",
- "ggactl_plugin_cleanup.exe",
"GCEWindowsAgent.exe",
- "GCECompatMetadataScripts.exe",
- "GCEWindowsCompatManager.exe",
- "GCEMetadataScriptRunner.exe",
"GCEWindowsAgentManager.exe",
"GCEAuthorizedKeysCommand.exe",
"packaging/googet/agent_install.ps1",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/packaging/googet/run_shutdown_scripts.cmd
new/guest-agent-20250411.00/packaging/googet/run_shutdown_scripts.cmd
--- old/guest-agent-20250327.01/packaging/googet/run_shutdown_scripts.cmd
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/packaging/googet/run_shutdown_scripts.cmd
2025-03-24 23:50:14.000000000 +0100
@@ -16,8 +16,4 @@
REM Run shutdown scripts that should happen as soon as the instance
REM begins to power down
-IF EXIST "C:\Program Files\Google\Compute
Engine\metadata_scripts\GCECompatMetadataScripts.exe" (
- "C:\Program Files\Google\Compute
Engine\metadata_scripts\GCECompatMetadataScripts.exe" "shutdown"
-) ELSE (
- "C:\Program Files\Google\Compute
Engine\metadata_scripts\GCEMetadataScripts.exe" "shutdown"
-)
+"C:\Program Files\Google\Compute
Engine\metadata_scripts\GCEMetadataScripts.exe" "shutdown"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/packaging/googet/run_startup_scripts.cmd
new/guest-agent-20250411.00/packaging/googet/run_startup_scripts.cmd
--- old/guest-agent-20250327.01/packaging/googet/run_startup_scripts.cmd
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/packaging/googet/run_startup_scripts.cmd
2025-03-24 23:50:14.000000000 +0100
@@ -19,8 +19,4 @@
REM We execute the startup script asynchronously so it may run without
REM this three day maximum runtime limitation.
-IF EXIST "C:\Program Files\Google\Compute
Engine\metadata_scripts\GCECompatMetadataScripts.exe" (
- start "" "C:\Program Files\Google\Compute
Engine\metadata_scripts\GCECompatMetadataScripts.exe" "startup"
-) ELSE (
- start "" "C:\Program Files\Google\Compute
Engine\metadata_scripts\GCEMetadataScripts.exe" "startup"
-)
\ No newline at end of file
+start "" "C:\Program Files\Google\Compute
Engine\metadata_scripts\GCEMetadataScripts.exe" "startup"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/packaging/googet/windows_agent_build.sh
new/guest-agent-20250411.00/packaging/googet/windows_agent_build.sh
--- old/guest-agent-20250327.01/packaging/googet/windows_agent_build.sh
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/packaging/googet/windows_agent_build.sh
2025-03-24 23:50:14.000000000 +0100
@@ -33,27 +33,11 @@
# This is a placeholder file for guest-agent package,
google-compute-engine-windows.goospec
# looks for this file during goopack packaging and will fail if not found.
echo "This is a placeholder file so guest agent package build without
error. Package will have actual Guest Agent Manager executable instead if both
repos are cloned side-by-side." > GCEWindowsAgentManager.exe
- echo "This is a placeholder file so guest agent package build without
error. Package will have actual Guest Agent Manager executable instead if both
repos are cloned side-by-side." > ggactl_plugin_cleanup.exe
- echo "This is a placeholder file so guest agent package build without
error. Package will have actual Guest Agent Manager executable instead if both
repos are cloned side-by-side." > GCEWindowsCompatManager.exe
- echo "This is a placeholder file so guest agent package build without
error. Package will have actual Guest Agent Manager executable instead if both
repos are cloned side-by-side." > CorePlugin.exe
- echo "This is a placeholder file so guest agent package build without
error. Package will have actual Guest Agent Manager executable instead if both
repos are cloned side-by-side." > GCEMetadataScriptRunner.exe
- echo "This is a placeholder file so guest agent package build without
error. Package will have actual Guest Agent Manager executable instead if both
repos are cloned side-by-side." > GCECompatMetadataScripts.exe
exit 0
fi
BUILD_DIR=$(pwd)
pushd $GUEST_AGENT_REPO
GOOS=windows VERSION=$version make cmd/google_guest_agent/google_guest_agent
-GOOS=windows VERSION=$version make cmd/ggactl/ggactl_plugin_cleanup
-GOOS=windows VERSION=$version make
cmd/google_guest_compat_manager/google_guest_compat_manager
-GOOS=windows VERSION=$version make cmd/core_plugin/core_plugin
-GOOS=windows VERSION=$version make
cmd/gce_metadata_script_runner/gce_metadata_script_runner
-GOOS=windows VERSION=$version make
cmd/metadata_script_runner_compat/gce_compat_metadata_script_runner
-
cp cmd/google_guest_agent/google_guest_agent
$BUILD_DIR/GCEWindowsAgentManager.exe
-cp cmd/ggactl/ggactl_plugin_cleanup $BUILD_DIR/ggactl_plugin_cleanup.exe
-cp cmd/google_guest_compat_manager/google_guest_compat_manager
$BUILD_DIR/GCEWindowsCompatManager.exe
-cp cmd/core_plugin/core_plugin $BUILD_DIR/CorePlugin.exe
-cp cmd/gce_metadata_script_runner/gce_metadata_script_runner
$BUILD_DIR/GCEMetadataScriptRunner.exe
-cp cmd/metadata_script_runner_compat/gce_compat_metadata_script_runner
$BUILD_DIR/GCECompatMetadataScripts.exe
popd
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20250327.01/packaging/google-guest-agent.spec
new/guest-agent-20250411.00/packaging/google-guest-agent.spec
--- old/guest-agent-20250327.01/packaging/google-guest-agent.spec
2025-03-27 17:31:22.000000000 +0100
+++ new/guest-agent-20250411.00/packaging/google-guest-agent.spec
2025-03-24 23:50:14.000000000 +0100
@@ -63,11 +63,6 @@
%if 0%{?build_plugin_manager}
pushd %{name}-extra-%{version}/
VERSION=%{version} make cmd/google_guest_agent/google_guest_agent
- VERSION=%{version} make cmd/ggactl/ggactl_plugin_cleanup
- VERSION=%{version} make
cmd/google_guest_compat_manager/google_guest_compat_manager
- VERSION=%{version} make cmd/core_plugin/core_plugin
- VERSION=%{version} make
cmd/gce_metadata_script_runner/gce_metadata_script_runner
- VERSION=%{version} make
cmd/metadata_script_runner_compat/gce_compat_metadata_script_runner
popd
%endif
@@ -84,13 +79,7 @@
# Compat agent, it will become google_guest_agent after the full package
transition.
%if 0%{?build_plugin_manager}
-install -d %{buildroot}%{_exec_prefix}/lib/google/guest_agent
-install -p -m 0755
%{name}-extra-%{version}/cmd/gce_metadata_script_runner/gce_metadata_script_runner
%{buildroot}%{_bindir}/gce_metadata_script_runner
install -p -m 0755
%{name}-extra-%{version}/cmd/google_guest_agent/google_guest_agent
%{buildroot}%{_bindir}/google_guest_agent_manager
-install -p -m 0755 %{name}-extra-%{version}/cmd/ggactl/ggactl_plugin_cleanup
%{buildroot}%{_bindir}/ggactl_plugin_cleanup
-install -p -m 0755
%{name}-extra-%{version}/cmd/google_guest_compat_manager/google_guest_compat_manager
%{buildroot}%{_bindir}/google_guest_compat_manager
-install -p -m 0755 %{name}-extra-%{version}/cmd/core_plugin/core_plugin
%{buildroot}%{_exec_prefix}/lib/google/guest_agent/core_plugin
-install -p -m 0755
%{name}-extra-%{version}/cmd/metadata_script_runner_compat/gce_compat_metadata_script_runner
%{buildroot}%{_bindir}/gce_compat_metadata_script_runner
%endif
%if 0%{?el6}
@@ -105,7 +94,6 @@
%if 0%{?build_plugin_manager}
install -p -m 0644 google-guest-agent-manager.service %{buildroot}%{_unitdir}
-install -p -m 0644 google-guest-compat-manager.service %{buildroot}%{_unitdir}
%endif
install -p -m 0644 google-startup-scripts.service %{buildroot}%{_unitdir}
@@ -122,12 +110,7 @@
%{_bindir}/google_guest_agent
%if 0%{?build_plugin_manager}
-%{_bindir}/gce_metadata_script_runner
-%{_bindir}/google_guest_compat_manager
-%{_bindir}/gce_compat_metadata_script_runner
%{_bindir}/google_guest_agent_manager
-%{_bindir}/ggactl_plugin_cleanup
-%{_exec_prefix}/lib/google/guest_agent/core_plugin
%endif
%{_bindir}/google_metadata_script_runner
@@ -141,7 +124,6 @@
%if 0%{?build_plugin_manager}
%{_unitdir}/google-guest-agent-manager.service
-%{_unitdir}/google-guest-compat-manager.service
%endif
%{_unitdir}/google-startup-scripts.service
@@ -169,7 +151,6 @@
systemctl enable gce-workload-cert-refresh.timer >/dev/null 2>&1 || :
%if 0%{?build_plugin_manager}
- systemctl enable google-guest-compat-manager.service >/dev/null 2>&1 || :
systemctl enable google-guest-agent-manager.service >/dev/null 2>&1 || :
%endif
@@ -178,7 +159,6 @@
systemctl start google-guest-agent.service >/dev/null 2>&1 || :
systemctl start gce-workload-cert-refresh.timer >/dev/null 2>&1 || :
%if 0%{?build_plugin_manager}
- systemctl start google-guest-compat-manager.service >/dev/null 2>&1 || :
systemctl start google-guest-agent-manager.service >/dev/null 2>&1 || :
%endif
fi
@@ -186,16 +166,11 @@
else
# Package upgrade
- %if 0%{?build_plugin_manager}
- systemctl enable google-guest-compat-manager.service >/dev/null 2>&1 || :
- systemctl enable google-guest-agent-manager.service >/dev/null 2>&1 || :
- %endif
-
if [ -d /run/systemd/system ]; then
systemctl daemon-reload >/dev/null 2>&1 || :
systemctl try-restart google-guest-agent.service >/dev/null 2>&1 || :
%if 0%{?build_plugin_manager}
- systemctl restart google-guest-compat-manager.service >/dev/null 2>&1 ||
:
+ systemctl enable google-guest-agent-manager.service >/dev/null 2>&1 || :
systemctl restart google-guest-agent-manager.service >/dev/null 2>&1 || :
%endif
fi
@@ -214,7 +189,6 @@
if [ $1 -eq 0 ]; then
# Package removal, not upgrade
%if 0%{?build_plugin_manager}
- systemctl --no-reload disable google-guest-compat-manager.service
>/dev/null 2>&1 || :
systemctl --no-reload disable google-guest-agent-manager.service
>/dev/null 2>&1 || :
%endif
systemctl --no-reload disable google-guest-agent.service >/dev/null 2>&1 || :
@@ -224,9 +198,7 @@
if [ -d /run/systemd/system ]; then
systemctl stop google-guest-agent.service >/dev/null 2>&1 || :
%if 0%{?build_plugin_manager}
- systemctl stop google-guest-compat-manager.service >/dev/null 2>&1 || :
systemctl stop google-guest-agent-manager.service >/dev/null 2>&1 || :
- ggactl_plugin_cleanup all >/dev/null 2>&1 || :
%endif
fi
fi
++++++ vendor.tar.gz ++++++
++++ 4678 lines of diff (skipped)
