Merge pull request #1550 from justinvreeland/jvreeland/revert-melange…

…-changes

sca: revert melange changes for naked sca

pkg/sca/e2e_test.go

@@ -74,7 +74,6 @@ func TestAnalyze(t *testing.T) {
 				"so:liblcms2-e69eef39.so.2.0.16",
 				"so:liblzma-13fa198c.so.5.4.5",
 				"so:libm.so.6",
-				"so:libopenblas64_p-r0-0cf96a72.3.23.dev.so",
 				"so:libopenjp2-eca49203.so.2.5.0",
 				"so:libpng16-78d422d5.so.16.40.0",
 				"so:libpthread.so.0",
@@ -132,8 +131,6 @@ func TestAnalyze(t *testing.T) {
 				"so:libm.so.6",
 				"so:libmount.so.1",
 				"so:libssl.so.3",
-				"so:libsystemd-core-256.so",
-				"so:libsystemd-shared-256.so",
 				"so:libudev.so.1",
 			},
 			Provides: []string{

pkg/sca/sca.go

@@ -247,9 +247,8 @@ func generateSharedObjectNameDeps(ctx context.Context, hdl SCAHandle, generated
 
 				for _, soname := range sonames {
 					log.Infof("  found soname %s for %s", soname, path)
-					if isInDir(path, libDirs) {
-						generated.Runtime = append(generated.Runtime, fmt.Sprintf("so:%s", soname))
-					}
+
+					generated.Runtime = append(generated.Runtime, fmt.Sprintf("so:%s", soname))
 				}
 			}
 
@@ -311,7 +310,7 @@ func generateSharedObjectNameDeps(ctx context.Context, hdl SCAHandle, generated
 			if lib == "libcuda.so.1" {
 				continue
 			}
-			if strings.Contains(lib, ".so") {
+			if strings.Contains(lib, ".so.") {
 				log.Infof("  found lib %s for %s", lib, path)
 				generated.Runtime = append(generated.Runtime, fmt.Sprintf("so:%s", lib))
 			}