Revert "refactor: split ksplice1 and ksplice2"

This reverts commit ed3cdbf.

pkg/vulnsrc/oracle-oval/oracle-oval.go

@@ -250,17 +250,15 @@ func resolveVersions(vers []string) (string, []string) {
 type PkgFlavor string
 
 const (
-	NormalPackageFlavor   PkgFlavor = "normal"
-	FipsPackageFlavor     PkgFlavor = "fips"
-	Ksplice1PackageFlavor PkgFlavor = "ksplice1"
-	Ksplice2PackageFlavor PkgFlavor = "ksplice2"
+	NormalPackageFlavor  PkgFlavor = "normal"
+	FipsPackageFlavor    PkgFlavor = "fips"
+	KsplicePackageFlavor PkgFlavor = "ksplice"
 )
 
 // PackageFlavor determinants the package "flavor" based on its version string
 //   - normal
 //   - FIPS validated
-//   - ksplice1 userspace
-//   - ksplice2 userspace
+//   - ksplice userspace
 func PackageFlavor(version string) PkgFlavor {
 	version = strings.ToLower(version)
 	if strings.HasSuffix(version, "_fips") {
@@ -269,12 +267,8 @@ func PackageFlavor(version string) PkgFlavor {
 
 	subs := strings.Split(version, ".")
 	for _, s := range subs {
-		if strings.HasPrefix(s, "ksplice1") {
-			return Ksplice1PackageFlavor
-		}
-
-		if strings.HasPrefix(s, "ksplice2") {
-			return Ksplice2PackageFlavor
+		if strings.HasPrefix(s, "ksplice") {
+			return KsplicePackageFlavor
 		}
 	}
 	return NormalPackageFlavor

pkg/vulnsrc/oracle-oval/oracle-oval_test.go

@@ -380,9 +380,6 @@ func TestVulnSrc_Update(t *testing.T) {
 					Key: []string{"advisory-detail", "CVE-2016-10228", "Oracle Linux 8", "glibc"},
 					Value: types.Advisories{
 						Entries: []types.Advisory{
-							{
-								FixedVersion: "2:2.28-151.0.1.ksplice1.el8",
-							},
 							{
 								FixedVersion: "2:2.28-151.0.1.ksplice2.el8",
 							},