Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nfpm for openSUSE:Factory checked in
at 2025-05-22 16:56:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nfpm (Old)
and /work/SRC/openSUSE:Factory/.nfpm.new.2732 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfpm"
Thu May 22 16:56:33 2025 rev:9 rq:1279058 version:2.42.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/nfpm/nfpm.changes 2025-03-31
11:43:35.161169825 +0200
+++ /work/SRC/openSUSE:Factory/.nfpm.new.2732/nfpm.changes 2025-05-22
16:57:01.994331180 +0200
@@ -1,0 +2,25 @@
+Wed May 21 13:50:24 UTC 2025 - Johannes Kastl
<opensuse_buildserv...@ojkastl.de>
+
+- Update to version 2.42.1:
+ * Bugfixes
+ - c94b6a1: fix: lint issues, modernize codebase (#922)
+ (@caarlos0)
+ * Other work
+ - a543547: docs: update cmd docs (@caarlos0)
+ * Dependencies
+ - chore(deps): update rpmpack to last commit
+ - chore(deps): bump anchore/sbom-action from 0.19.0 to 0.20.0
+ (#930)
+ - chore(deps): bump dependabot/fetch-metadata from 2.3.0 to
+ 2.4.0 (#929)
+ - chore(deps): bump dario.cat/mergo from 1.0.1 to 1.0.2 (#928)
+ - chore(deps): bump golangci/golangci-lint-action from 7 to 8
+ (#926)
+ - chore(deps): bump anchore/sbom-action from 0.18.0 to 0.19.0
+ (#925)
+ - chore(deps): bump sigstore/cosign-installer from 3.8.1 to
+ 3.8.2 (#924)
+ - chore(deps): bump github.com/ProtonMail/go-crypto from 1.1.6
+ to 1.2.0 (#923)
+
+-------------------------------------------------------------------
Old:
----
nfpm-2.42.0.obscpio
New:
----
nfpm-2.42.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nfpm.spec ++++++
--- /var/tmp/diff_new_pack.E6Awks/_old 2025-05-22 16:57:02.478351957 +0200
+++ /var/tmp/diff_new_pack.E6Awks/_new 2025-05-22 16:57:02.482352128 +0200
@@ -17,7 +17,7 @@
Name: nfpm
-Version: 2.42.0
+Version: 2.42.1
Release: 0
Summary: Simple deb, rpm, apk and arch linux packager written in Go
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.E6Awks/_old 2025-05-22 16:57:02.510353330 +0200
+++ /var/tmp/diff_new_pack.E6Awks/_new 2025-05-22 16:57:02.514353502 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/goreleaser/nfpm</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v2.42.0</param>
+ <param name="revision">v2.42.1</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.E6Awks/_old 2025-05-22 16:57:02.538354532 +0200
+++ /var/tmp/diff_new_pack.E6Awks/_new 2025-05-22 16:57:02.542354704 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/goreleaser/nfpm</param>
- <param
name="changesrevision">3f640c7115613881aa3eb58c234e4676300153d2</param></service></servicedata>
+ <param
name="changesrevision">9f029a49563c197ac1f83795a816afaae977b068</param></service></servicedata>
(No newline at EOF)
++++++ nfpm-2.42.0.obscpio -> nfpm-2.42.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/.golangci.yml
new/nfpm-2.42.1/.golangci.yml
--- old/nfpm-2.42.0/.golangci.yml 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/.golangci.yml 2025-05-20 04:44:15.000000000 +0200
@@ -1,36 +1,56 @@
+version: "2"
run:
- go: "1.20"
- timeout: 5m
+ go: "1.24"
linters:
enable:
+ - depguard
+ - forbidigo
+ - misspell
+ - revive
+ - tagliatelle
+ - testifylint
- thelper
- - gofumpt
- tparallel
- unconvert
+ - usetesting
- unparam
- wastedassign
- - revive
- - forbidigo
- - tagliatelle
- - misspell
- - depguard
- - testifylint
-linters-settings:
- forbidigo:
- forbid:
- - 'ioutil\.*'
- tagliatelle:
- case:
- use-field-name: false
+ settings:
+ depguard:
rules:
- yaml: snake
- json: snake
- depguard:
- rules:
- main:
- deny:
- - pkg: "github.com/pkg/errors"
- desc: "use stdlib instead"
- testifylint:
- disable:
- - encoded-compare
+ main:
+ deny:
+ - pkg: github.com/pkg/errors
+ desc: use stdlib instead
+ forbidigo:
+ forbid:
+ - pattern: ioutil\.*
+ tagliatelle:
+ case:
+ rules:
+ json: snake
+ yaml: snake
+ use-field-name: false
+ testifylint:
+ disable:
+ - encoded-compare
+ exclusions:
+ generated: lax
+ presets:
+ - comments
+ - common-false-positives
+ - legacy
+ - std-error-handling
+ paths:
+ - third_party$
+ - builtin$
+ - examples$
+formatters:
+ enable:
+ - gofumpt
+ exclusions:
+ generated: lax
+ paths:
+ - third_party$
+ - builtin$
+ - examples$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/arch/arch.go new/nfpm-2.42.1/arch/arch.go
--- old/nfpm-2.42.0/arch/arch.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/arch/arch.go 2025-05-20 04:44:15.000000000 +0200
@@ -10,6 +10,7 @@
"fmt"
"io"
"os"
+ "slices"
"strconv"
"strings"
"time"
@@ -107,12 +108,7 @@
// isOneOf checks whether a rune is one of the runes in rr
func isOneOf(r rune, rr ...rune) bool {
- for _, char := range rr {
- if r == char {
- return true
- }
- }
- return false
+ return slices.Contains(rr, r)
}
// Package writes a new archlinux package to the given writer using the given
info.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/deb/deb.go new/nfpm-2.42.1/deb/deb.go
--- old/nfpm-2.42.0/deb/deb.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/deb/deb.go 2025-05-20 04:44:15.000000000 +0200
@@ -607,15 +607,15 @@
mode: 0o755,
},
"rules": {
- fileName: info.Overridables.Deb.Scripts.Rules,
+ fileName: info.Deb.Scripts.Rules,
mode: 0o755,
},
"templates": {
- fileName: info.Overridables.Deb.Scripts.Templates,
+ fileName: info.Deb.Scripts.Templates,
mode: 0o644,
},
"config": {
- fileName: info.Overridables.Deb.Scripts.Config,
+ fileName: info.Deb.Scripts.Config,
mode: 0o755,
},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/deprecation/deprecation.go
new/nfpm-2.42.1/deprecation/deprecation.go
--- old/nfpm-2.42.0/deprecation/deprecation.go 2025-03-28 21:15:55.000000000
+0100
+++ new/nfpm-2.42.1/deprecation/deprecation.go 2025-05-20 04:44:15.000000000
+0200
@@ -26,6 +26,6 @@
}
// Printf printfs the given string to the Noticer.
-func Printf(format string, a ...interface{}) {
+func Printf(format string, a ...any) {
fmt.Fprintf(Noticer, format, a...)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/files/files.go
new/nfpm-2.42.1/files/files.go
--- old/nfpm-2.42.0/files/files.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/files/files.go 2025-05-20 04:44:15.000000000 +0200
@@ -187,7 +187,7 @@
}
// Sys to part of the os.FileInfo interface
-func (c *Content) Sys() interface{} {
+func (c *Content) Sys() any {
return nil
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/files/files_test.go
new/nfpm-2.42.1/files/files_test.go
--- old/nfpm-2.42.0/files/files_test.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/files/files_test.go 2025-05-20 04:44:15.000000000 +0200
@@ -282,7 +282,7 @@
errs := make(chan error, 10)
t.Cleanup(func() { close(errs) })
var wg sync.WaitGroup
- for i := 0; i < 10; i++ {
+ for range 10 {
wg.Add(1)
go func() {
defer wg.Done()
@@ -298,7 +298,7 @@
}
wg.Wait()
- for i := 0; i < 10; i++ {
+ for range 10 {
require.NoError(t, <-errs)
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/files/fs.go new/nfpm-2.42.1/files/fs.go
--- old/nfpm-2.42.0/files/fs.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/files/fs.go 2025-05-20 04:44:15.000000000 +0200
@@ -1,13 +1,10 @@
package files
+import "slices"
+
func ownedByFilesystem(path string) bool {
p := ToNixPath(path)
- for _, pp := range append(fsPaths, logrotatePaths...) {
- if p == pp {
- return true
- }
- }
- return false
+ return slices.Contains(append(fsPaths, logrotatePaths...), p)
}
// yum install yum-utils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/go.mod new/nfpm-2.42.1/go.mod
--- old/nfpm-2.42.0/go.mod 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/go.mod 2025-05-20 04:44:15.000000000 +0200
@@ -3,14 +3,14 @@
go 1.23.0
require (
- dario.cat/mergo v1.0.1
+ dario.cat/mergo v1.0.2
github.com/AlekSi/pointer v1.2.0
github.com/Masterminds/semver/v3 v3.3.1
- github.com/ProtonMail/go-crypto v1.1.6
+ github.com/ProtonMail/go-crypto v1.2.0
github.com/ProtonMail/gopenpgp/v2 v2.7.1
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
github.com/caarlos0/go-version v0.2.0
- github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a
+ github.com/google/rpmpack v0.6.1-0.20250405124433-758cc6896cbc
github.com/goreleaser/chglog v0.7.0
github.com/goreleaser/fileglob v1.3.0
github.com/invopop/jsonschema v0.13.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/go.sum new/nfpm-2.42.1/go.sum
--- old/nfpm-2.42.0/go.sum 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/go.sum 2025-05-20 04:44:15.000000000 +0200
@@ -1,5 +1,5 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
+dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
github.com/AlekSi/pointer v1.2.0
h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w=
github.com/AlekSi/pointer v1.2.0/go.mod
h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0=
github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
@@ -14,8 +14,8 @@
github.com/Microsoft/go-winio v0.6.2
h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod
h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod
h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
-github.com/ProtonMail/go-crypto v1.1.6
h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
-github.com/ProtonMail/go-crypto v1.1.6/go.mod
h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/ProtonMail/go-crypto v1.2.0
h1:+PhXXn4SPGd+qk76TlEePBfOfivE0zkWFenhGhFLzWs=
+github.com/ProtonMail/go-crypto v1.2.0/go.mod
h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f
h1:tCbYj7/299ekTTXpdwKYF8eBlsYsDVoggDAuAjoK66k=
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod
h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw=
github.com/ProtonMail/gopenpgp/v2 v2.7.1
h1:Awsg7MPc2gD3I7IFac2qE3Gdls0lZW8SzrFZ3k1oz0s=
@@ -69,8 +69,8 @@
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod
h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod
h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a
h1:JJBdjSfqSy3mnDT0940ASQFghwcZ4y4cb6ttjAoXqwE=
-github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a/go.mod
h1:uqVAUVQLq8UY2hCDfmJ/+rtO3aw7qyhc90rCVEabEfI=
+github.com/google/rpmpack v0.6.1-0.20250405124433-758cc6896cbc
h1:qES+d3PvR9CN+zARQQH/bNXH0ybzmdjNMHICrBwXD28=
+github.com/google/rpmpack v0.6.1-0.20250405124433-758cc6896cbc/go.mod
h1:uqVAUVQLq8UY2hCDfmJ/+rtO3aw7qyhc90rCVEabEfI=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gopherjs/gopherjs v1.17.2
h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/internal/glob/glob.go
new/nfpm-2.42.1/internal/glob/glob.go
--- old/nfpm-2.42.0/internal/glob/glob.go 2025-03-28 21:15:55.000000000
+0100
+++ new/nfpm-2.42.1/internal/glob/glob.go 2025-05-20 04:44:15.000000000
+0200
@@ -29,18 +29,13 @@
}
func strlcp(a, b string) string {
- var min int
- if len(a) > len(b) {
- min = len(b)
- } else {
- min = len(a)
- }
- for i := 0; i < min; i++ {
+ minlen := min(len(a), len(b))
+ for i := range minlen {
if a[i] != b[i] {
return a[0:i]
}
}
- return a[0:min]
+ return a[0:minlen]
}
// ErrGlobNoMatch happens when no files matched the given glob.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/internal/glob/glob_test.go
new/nfpm-2.42.1/internal/glob/glob_test.go
--- old/nfpm-2.42.0/internal/glob/glob_test.go 2025-03-28 21:15:55.000000000
+0100
+++ new/nfpm-2.42.1/internal/glob/glob_test.go 2025-05-20 04:44:15.000000000
+0200
@@ -22,7 +22,7 @@
empty := []string{}
lcp2 := longestCommonPrefix(empty)
- require.Equal(t, "", lcp2)
+ require.Empty(t, lcp2)
unique := []string{
"every",
@@ -35,7 +35,7 @@
}
lcp3 := longestCommonPrefix(unique)
- require.Equal(t, "", lcp3)
+ require.Empty(t, lcp3)
}
func TestGlob(t *testing.T) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/internal/sign/pgp.go
new/nfpm-2.42.1/internal/sign/pgp.go
--- old/nfpm-2.42.0/internal/sign/pgp.go 2025-03-28 21:15:55.000000000
+0100
+++ new/nfpm-2.42.1/internal/sign/pgp.go 2025-05-20 04:44:15.000000000
+0200
@@ -254,7 +254,7 @@
}
func isASCII(s []byte) bool {
- for i := 0; i < len(s); i++ {
+ for i := range s {
if s[i] > unicode.MaxASCII {
return false
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/ipk/ipk_test.go
new/nfpm-2.42.1/ipk/ipk_test.go
--- old/nfpm-2.42.0/ipk/ipk_test.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/ipk/ipk_test.go 2025-05-20 04:44:15.000000000 +0200
@@ -1034,7 +1034,7 @@
stripDisallowedFields(tc.info)
- assert.Equal(tc.expect, tc.info.Overridables.IPK.Fields)
+ assert.Equal(tc.expect, tc.info.IPK.Fields)
})
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/nfpm.go new/nfpm-2.42.1/nfpm.go
--- old/nfpm-2.42.0/nfpm.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/nfpm.go 2025-05-20 04:44:15.000000000 +0200
@@ -8,6 +8,7 @@
"io"
"io/fs"
"os"
+ "slices"
"sort"
"strings"
"sync"
@@ -182,7 +183,7 @@
}
for i := 0; i < len(items); i++ {
if items[i] == "" {
- items = append(items[:i], items[i+1:]...)
+ items = slices.Delete(items, i, i+1)
i-- // Since we just deleted items[i], we must redo
that index
}
}
@@ -204,11 +205,11 @@
func (c *Config) expandEnvVars() {
// Version related fields
- c.Info.Release = os.Expand(c.Info.Release, c.envMappingFunc)
- c.Info.Version = os.Expand(c.Info.Version, c.envMappingFunc)
- c.Info.Prerelease = os.Expand(c.Info.Prerelease, c.envMappingFunc)
- c.Info.Platform = os.Expand(c.Info.Platform, c.envMappingFunc)
- c.Info.Arch = os.Expand(c.Info.Arch, c.envMappingFunc)
+ c.Release = os.Expand(c.Release, c.envMappingFunc)
+ c.Version = os.Expand(c.Version, c.envMappingFunc)
+ c.Prerelease = os.Expand(c.Prerelease, c.envMappingFunc)
+ c.Platform = os.Expand(c.Platform, c.envMappingFunc)
+ c.Arch = os.Expand(c.Arch, c.envMappingFunc)
for or := range c.Overrides {
c.Overrides[or].Conflicts =
c.expandEnvVarsStringSlice(c.Overrides[or].Conflicts)
c.Overrides[or].Depends =
c.expandEnvVarsStringSlice(c.Overrides[or].Depends)
@@ -218,67 +219,67 @@
c.Overrides[or].Suggests =
c.expandEnvVarsStringSlice(c.Overrides[or].Suggests)
c.Overrides[or].Contents =
c.expandEnvVarsContents(c.Overrides[or].Contents)
}
- c.Info.Conflicts = c.expandEnvVarsStringSlice(c.Info.Conflicts)
- c.Info.Depends = c.expandEnvVarsStringSlice(c.Info.Depends)
- c.Info.Replaces = c.expandEnvVarsStringSlice(c.Info.Replaces)
- c.Info.Recommends = c.expandEnvVarsStringSlice(c.Info.Recommends)
- c.Info.Provides = c.expandEnvVarsStringSlice(c.Info.Provides)
- c.Info.Suggests = c.expandEnvVarsStringSlice(c.Info.Suggests)
- c.Info.Contents = c.expandEnvVarsContents(c.Info.Contents)
+ c.Conflicts = c.expandEnvVarsStringSlice(c.Conflicts)
+ c.Depends = c.expandEnvVarsStringSlice(c.Depends)
+ c.Replaces = c.expandEnvVarsStringSlice(c.Replaces)
+ c.Recommends = c.expandEnvVarsStringSlice(c.Recommends)
+ c.Provides = c.expandEnvVarsStringSlice(c.Provides)
+ c.Suggests = c.expandEnvVarsStringSlice(c.Suggests)
+ c.Contents = c.expandEnvVarsContents(c.Contents)
// Basic metadata fields
- c.Info.Name = os.Expand(c.Info.Name, c.envMappingFunc)
- c.Info.Homepage = os.Expand(c.Info.Homepage, c.envMappingFunc)
- c.Info.Maintainer = os.Expand(c.Info.Maintainer, c.envMappingFunc)
- c.Info.Vendor = os.Expand(c.Info.Vendor, c.envMappingFunc)
- c.Info.Description = os.Expand(c.Info.Description, c.envMappingFunc)
+ c.Name = os.Expand(c.Name, c.envMappingFunc)
+ c.Homepage = os.Expand(c.Homepage, c.envMappingFunc)
+ c.Maintainer = os.Expand(c.Maintainer, c.envMappingFunc)
+ c.Vendor = os.Expand(c.Vendor, c.envMappingFunc)
+ c.Description = os.Expand(c.Description, c.envMappingFunc)
// Package signing related fields
- c.Info.Deb.Signature.KeyFile = os.Expand(c.Deb.Signature.KeyFile,
c.envMappingFunc)
- c.Info.RPM.Signature.KeyFile = os.Expand(c.RPM.Signature.KeyFile,
c.envMappingFunc)
- c.Info.APK.Signature.KeyFile = os.Expand(c.APK.Signature.KeyFile,
c.envMappingFunc)
- c.Info.Deb.Signature.KeyID =
pointer.ToString(os.Expand(pointer.GetString(c.Deb.Signature.KeyID),
c.envMappingFunc))
- c.Info.RPM.Signature.KeyID =
pointer.ToString(os.Expand(pointer.GetString(c.RPM.Signature.KeyID),
c.envMappingFunc))
- c.Info.APK.Signature.KeyID =
pointer.ToString(os.Expand(pointer.GetString(c.APK.Signature.KeyID),
c.envMappingFunc))
+ c.Deb.Signature.KeyFile = os.Expand(c.Deb.Signature.KeyFile,
c.envMappingFunc)
+ c.RPM.Signature.KeyFile = os.Expand(c.RPM.Signature.KeyFile,
c.envMappingFunc)
+ c.APK.Signature.KeyFile = os.Expand(c.APK.Signature.KeyFile,
c.envMappingFunc)
+ c.Deb.Signature.KeyID =
pointer.ToString(os.Expand(pointer.GetString(c.Deb.Signature.KeyID),
c.envMappingFunc))
+ c.RPM.Signature.KeyID =
pointer.ToString(os.Expand(pointer.GetString(c.RPM.Signature.KeyID),
c.envMappingFunc))
+ c.APK.Signature.KeyID =
pointer.ToString(os.Expand(pointer.GetString(c.APK.Signature.KeyID),
c.envMappingFunc))
// Package signing passphrase
generalPassphrase := os.Expand("$NFPM_PASSPHRASE", c.envMappingFunc)
- c.Info.Deb.Signature.KeyPassphrase = generalPassphrase
- c.Info.RPM.Signature.KeyPassphrase = generalPassphrase
- c.Info.APK.Signature.KeyPassphrase = generalPassphrase
+ c.Deb.Signature.KeyPassphrase = generalPassphrase
+ c.RPM.Signature.KeyPassphrase = generalPassphrase
+ c.APK.Signature.KeyPassphrase = generalPassphrase
debPassphrase := os.Expand("$NFPM_DEB_PASSPHRASE", c.envMappingFunc)
if debPassphrase != "" {
- c.Info.Deb.Signature.KeyPassphrase = debPassphrase
+ c.Deb.Signature.KeyPassphrase = debPassphrase
}
rpmPassphrase := os.Expand("$NFPM_RPM_PASSPHRASE", c.envMappingFunc)
if rpmPassphrase != "" {
- c.Info.RPM.Signature.KeyPassphrase = rpmPassphrase
+ c.RPM.Signature.KeyPassphrase = rpmPassphrase
}
apkPassphrase := os.Expand("$NFPM_APK_PASSPHRASE", c.envMappingFunc)
if apkPassphrase != "" {
- c.Info.APK.Signature.KeyPassphrase = apkPassphrase
+ c.APK.Signature.KeyPassphrase = apkPassphrase
}
// RPM specific
- c.Info.RPM.Packager = os.Expand(c.RPM.Packager, c.envMappingFunc)
+ c.RPM.Packager = os.Expand(c.RPM.Packager, c.envMappingFunc)
// Deb specific
- for k, v := range c.Info.Deb.Fields {
- c.Info.Deb.Fields[k] = os.Expand(v, c.envMappingFunc)
+ for k, v := range c.Deb.Fields {
+ c.Deb.Fields[k] = os.Expand(v, c.envMappingFunc)
}
- c.Info.Deb.Predepends =
c.expandEnvVarsStringSlice(c.Info.Deb.Predepends)
+ c.Deb.Predepends = c.expandEnvVarsStringSlice(c.Deb.Predepends)
// IPK specific
- for k, v := range c.Info.IPK.Fields {
- c.Info.IPK.Fields[k] = os.Expand(v, c.envMappingFunc)
+ for k, v := range c.IPK.Fields {
+ c.IPK.Fields[k] = os.Expand(v, c.envMappingFunc)
}
- c.Info.IPK.Predepends =
c.expandEnvVarsStringSlice(c.Info.IPK.Predepends)
+ c.IPK.Predepends = c.expandEnvVarsStringSlice(c.IPK.Predepends)
// RPM specific
- c.Info.RPM.Packager = os.Expand(c.RPM.Packager, c.envMappingFunc)
+ c.RPM.Packager = os.Expand(c.RPM.Packager, c.envMappingFunc)
}
// Info contains information about a single package.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/nfpm_test.go new/nfpm-2.42.1/nfpm_test.go
--- old/nfpm-2.42.0/nfpm_test.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/nfpm_test.go 2025-05-20 04:44:15.000000000 +0200
@@ -52,21 +52,21 @@
})
require.NotEmpty(t, info.Platform)
require.Equal(t, "1.0.0", info.Version)
- require.Equal(t, "", info.Release)
- require.Equal(t, "", info.Prerelease)
+ require.Empty(t, info.Release)
+ require.Empty(t, info.Prerelease)
info = nfpm.WithDefaults(&nfpm.Info{
Version: "v1.0.0-rc1",
})
require.Equal(t, "1.0.0", info.Version)
- require.Equal(t, "", info.Release)
+ require.Empty(t, info.Release)
require.Equal(t, "rc1", info.Prerelease)
info = nfpm.WithDefaults(&nfpm.Info{
Version: "v1.0.0-beta1",
})
require.Equal(t, "1.0.0", info.Version)
- require.Equal(t, "", info.Release)
+ require.Empty(t, info.Release)
require.Equal(t, "beta1", info.Prerelease)
info = nfpm.WithDefaults(&nfpm.Info{
@@ -180,20 +180,20 @@
},
})
require.NoError(t, nfpm.PrepareForPackager(info, ""))
- require.Len(t, info.Overridables.Contents, 5)
- asdFile := info.Overridables.Contents[0]
+ require.Len(t, info.Contents, 5)
+ asdFile := info.Contents[0]
require.Equal(t, "/asd", asdFile.Destination)
require.Equal(t, files.TypeFile, asdFile.Type)
require.Equal(t, "-rw-r--r--", asdFile.FileInfo.Mode.String())
require.Equal(t, "root", asdFile.FileInfo.Owner)
require.Equal(t, "root", asdFile.FileInfo.Group)
- usrDir := info.Overridables.Contents[1]
+ usrDir := info.Contents[1]
require.Equal(t, "/usr/", usrDir.Destination)
require.Equal(t, files.TypeImplicitDir, usrDir.Type)
require.Equal(t, "-rwxr-xr-x", usrDir.FileInfo.Mode.String())
require.Equal(t, "root", usrDir.FileInfo.Owner)
require.Equal(t, "root", usrDir.FileInfo.Group)
- aDir := info.Overridables.Contents[2]
+ aDir := info.Contents[2]
require.Equal(t, "/usr/a/", aDir.Destination)
require.Equal(t, files.TypeDir, aDir.Type)
require.Equal(t, "-rwxr-xr-x", aDir.FileInfo.Mode.String())
@@ -239,7 +239,7 @@
},
}
require.NoError(t, nfpm.Validate(&info))
- require.Len(t, info.Overridables.Contents, 2)
+ require.Len(t, info.Contents, 2)
})
t.Run("config", func(t *testing.T) {
@@ -322,7 +322,7 @@
require.Equal(t, "My description", config.Description)
require.Equal(t, "my/rpm/key/file", config.RPM.Signature.KeyFile)
require.Equal(t, "hard/coded/file", config.Deb.Signature.KeyFile)
- require.Equal(t, "", config.APK.Signature.KeyFile)
+ require.Empty(t, config.APK.Signature.KeyFile)
}
func TestParseEnhancedFile(t *testing.T) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/rpm/rpm_test.go
new/nfpm-2.42.1/rpm/rpm_test.go
--- old/nfpm-2.42.0/rpm/rpm_test.go 2025-03-28 21:15:55.000000000 +0100
+++ new/nfpm-2.42.1/rpm/rpm_test.go 2025-05-20 04:44:15.000000000 +0200
@@ -736,19 +736,19 @@
require.NoError(t, err)
times, ok := _times.([]uint32)
require.True(t, ok)
- require.Equal(t, len(changelog), len(times))
+ require.Len(t, changelog, len(times))
_titles, err := rpm.Header.Get(tagChangelogName)
require.NoError(t, err)
titles, ok := _titles.([]string)
require.True(t, ok)
- require.Equal(t, len(changelog), len(titles))
+ require.Len(t, changelog, len(titles))
_notes, err := rpm.Header.Get(tagChangelogText)
require.NoError(t, err)
allNotes, ok := _notes.([]string)
require.True(t, ok)
- require.Equal(t, len(changelog), len(allNotes))
+ require.Len(t, changelog, len(allNotes))
for i, entry := range changelog {
timestamp := time.Unix(int64(times[i]), 0).UTC()
@@ -758,7 +758,7 @@
require.Equal(t, entry.Date, timestamp)
require.Contains(t, title, entry.Packager)
require.Contains(t, title, entry.Semver)
- require.Equal(t, len(entry.Changes), len(notes))
+ require.Len(t, entry.Changes, len(notes))
for j, change := range entry.Changes {
require.Contains(t, notes[j], change.Note)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nfpm-2.42.0/www/docs/static/latest
new/nfpm-2.42.1/www/docs/static/latest
--- old/nfpm-2.42.0/www/docs/static/latest 2025-03-28 21:15:55.000000000
+0100
+++ new/nfpm-2.42.1/www/docs/static/latest 2025-05-20 04:44:15.000000000
+0200
@@ -1 +1 @@
-v2.41.3
+v2.42.0
++++++ nfpm.obsinfo ++++++
--- /var/tmp/diff_new_pack.E6Awks/_old 2025-05-22 16:57:02.830367067 +0200
+++ /var/tmp/diff_new_pack.E6Awks/_new 2025-05-22 16:57:02.834367238 +0200
@@ -1,5 +1,5 @@
name: nfpm
-version: 2.42.0
-mtime: 1743192955
-commit: 3f640c7115613881aa3eb58c234e4676300153d2
+version: 2.42.1
+mtime: 1747709055
+commit: 9f029a49563c197ac1f83795a816afaae977b068
++++++ vendor.tar.gz ++++++
++++ 3760 lines of diff (skipped)
