Merge pull request #1467 from xnox/fix-pc-for-all

sca: make pc: provides/vendored use full package version

Author: xnox

pkg/sca/sca.go

@@ -23,7 +23,6 @@ import (
 	"io"
 	"io/fs"
 	"path/filepath"
-	"regexp"
 	"slices"
 	"strings"
 	"unicode"
@@ -379,8 +378,6 @@ func generateSharedObjectNameDeps(ctx context.Context, hdl SCAHandle, generated
 	return nil
 }
 
-var pkgConfigVersionRegexp = regexp.MustCompile("-(alpha|beta|rc|pre)")
-
 // TODO(kaniini): Turn this feature on once enough of Wolfi is built with provider data.
 var generateRuntimePkgConfigDeps = false
 
@@ -439,18 +436,12 @@ func generatePkgConfigDeps(ctx context.Context, hdl SCAHandle, generated *config
 		pcName := filepath.Base(path)
 		pcName, _ = strings.CutSuffix(pcName, ".pc")
 
-		// TODO: https://github.com/chainguard-dev/melange/issues/1172
-		sigh := func(ver string) string {
-			return strings.TrimSuffix(ver, "-release")
-		}
-
-		apkVersion := pkgConfigVersionRegexp.ReplaceAllString(pkg.Version, "_$1")
 		if isInDir(path, []string{"lib/pkgconfig/", "usr/lib/pkgconfig/", "lib64/pkgconfig/", "usr/lib64/pkgconfig/"}) {
 			log.Infof("  found pkg-config %s for %s", pcName, path)
-			generated.Provides = append(generated.Provides, fmt.Sprintf("pc:%s=%s", pcName, sigh(apkVersion)))
+			generated.Provides = append(generated.Provides, fmt.Sprintf("pc:%s=%s", pcName, hdl.Version()))
 		} else {
 			log.Infof("  found vendored pkg-config %s for %s", pcName, path)
-			generated.Vendored = append(generated.Vendored, fmt.Sprintf("pc:%s=%s", pcName, sigh(apkVersion)))
+			generated.Vendored = append(generated.Vendored, fmt.Sprintf("pc:%s=%s", pcName, hdl.Version()))
 		}
 
 		if generateRuntimePkgConfigDeps {

pkg/sca/sca_test.go

@@ -186,14 +186,10 @@ func TestVendoredPkgConfig(t *testing.T) {
 		}),
 		Vendored: util.Dedup([]string{
 			"so:libecpg_compat.so.3=3",
-			"pc:libecpg=14.10",
-			"pc:libecpg_compat=14.10",
-			"pc:libpgtypes=14.10",
-			"pc:libpq=14.10",
-			"pc:libecpg=15.5",
-			"pc:libecpg_compat=15.5",
-			"pc:libpgtypes=15.5",
-			"pc:libpq=15.5",
+			"pc:libecpg=4604-r0",
+			"pc:libecpg_compat=4604-r0",
+			"pc:libpgtypes=4604-r0",
+			"pc:libpq=4604-r0",
 		}),
 	}