fix: update gcc checker

ffontaine · ffontaine · commit b2092d3ef210 · 2025-04-05T18:22:29.000+02:00
Fix gcc pattern to detect the following pattern:

GCC: (crosstool-NG git+9f5f159-dirty) 4.8.3

Signed-off-by: Fabrice Fontaine &lt;fabrice.fontaine@orange.com&gt;
diff --git a/cve_bin_tool/checkers/gcc.py b/cve_bin_tool/checkers/gcc.py
@@ -32,7 +32,7 @@ class GccChecker(Checker):
     ]
     FILENAME_PATTTERN = [r"gcc"]
     VERSION_PATTERNS = [
-        r"GCC: \([a-zA-Z ,0-9]+\) ([0-9]+\.[0-9]+(\.[0-9]+)?)",
+        r"GCC: \([a-zA-Z ,0-9_+\-\.]+\) ([0-9]+\.[0-9]+(\.[0-9]+)?)",
         # r"gcc ([0-9]+\.[0-9]+(\.[0-9]+)?)",  # does not return correct version number on some packages
     ]
     VENDOR_PRODUCT = [("gnu", "gcc")]
diff --git a/test/test_data/apr.py b/test/test_data/apr.py
@@ -32,5 +32,6 @@
         "package_name": "apr-1.7.0-r0.apk",
         "product": "portable_runtime",
         "version": "1.7.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/axel.py b/test/test_data/axel.py
@@ -22,5 +22,6 @@
         "package_name": "axel-2.17.6-r1.apk",
         "product": "axel",
         "version": "2.17.6",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/bash.py b/test/test_data/bash.py
@@ -16,5 +16,6 @@
         "package_name": "bash_4.4.18-2ubuntu1_amd64.deb",
         "product": "bash",
         "version": "4.4.19",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/cairo.py b/test/test_data/cairo.py
@@ -33,5 +33,6 @@
         "package_name": "cairo-1.16.0-r3.apk",
         "product": "cairo",
         "version": "1.16.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/cups_filters.py b/test/test_data/cups_filters.py
@@ -26,5 +26,6 @@
         "package_name": "cups-filters-1.26.0-r0.apk",
         "product": "cups-filters",
         "version": "1.26.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/docker.py b/test/test_data/docker.py
@@ -13,6 +13,7 @@
         "version": "19.03.15",
         "package_name": "docker-19.03.15-1.mga8.armv7hl.rpm",
         "other_products": [
+            "gcc",
             "go",
         ],
     },
diff --git a/test/test_data/ed.py b/test/test_data/ed.py
@@ -23,5 +23,6 @@
         "package_name": "ed-1.15-r0.apk",
         "product": "ed",
         "version": "1.15",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/firejail.py b/test/test_data/firejail.py
@@ -26,5 +26,6 @@
         "package_name": "firejail-0.9.60-r0.apk",
         "product": "firejail",
         "version": "0.9.60",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/gettext.py b/test/test_data/gettext.py
@@ -42,5 +42,6 @@
         "package_name": "gettext-0.20.1-r2.apk",
         "product": "gettext",
         "version": "0.20.1",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/glibc.py b/test/test_data/glibc.py
@@ -39,5 +39,6 @@
         "package_name": "libc6-amd64_2.24-11+deb9u4_i386.deb",
         "product": "glibc",
         "version": "2.24",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/go.py b/test/test_data/go.py
@@ -22,6 +22,6 @@
         "package_name": "go-1.13.13-r0.apk",
         "product": "go",
         "version": "1.13.13",
-        "other-products": ["llvm"],
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/gsasl.py b/test/test_data/gsasl.py
@@ -26,5 +26,6 @@
         "package_name": "libgsasl-1.8.1-r0.apk",
         "product": "gnu_sasl",
         "version": "1.8.1",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/heimdal.py b/test/test_data/heimdal.py
@@ -35,5 +35,6 @@
         "package_name": "heimdal-7.7.0-r0.apk",
         "product": "heimdal",
         "version": "7.7.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/indent.py b/test/test_data/indent.py
@@ -22,5 +22,6 @@
         "package_name": "indent-2.2.12-r0.apk",
         "product": "indent",
         "version": "2.2.12",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/inetutils.py b/test/test_data/inetutils.py
@@ -26,5 +26,6 @@
         "package_name": "inetutils-syslogd-1.9.4-r3.apk",
         "product": "inetutils",
         "version": "1.9.4",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/iwd.py b/test/test_data/iwd.py
@@ -31,5 +31,6 @@
         "package_name": "iwd-1.2-r1.apk",
         "product": "inet_wireless_daemon",
         "version": "1.2",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/kexectools.py b/test/test_data/kexectools.py
@@ -26,11 +26,13 @@
         "package_name": "kexec-tools_2.0.16-1ubuntu1_amd64.deb",
         "product": "kexec-tools",
         "version": "2.0.16",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/base/",
         "package_name": "kexec_2.0.16-2_x86_64.ipk",
         "product": "kexec-tools",
         "version": "2.0.16",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/kodi.py b/test/test_data/kodi.py
@@ -11,6 +11,7 @@
         "package_name": "kodi-20.1-2.mga9.aarch64.rpm",
         "product": "kodi",
         "version": "20.1",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/k/kodi/",
diff --git a/test/test_data/libcap.py b/test/test_data/libcap.py
@@ -22,5 +22,6 @@
         "package_name": "libcap2-2.69-r0.apk",
         "product": "libcap",
         "version": "2.69",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/libde265.py b/test/test_data/libde265.py
@@ -22,5 +22,6 @@
         "package_name": "libde265-1.0.3-r0.apk",
         "product": "libde265",
         "version": "1.0.3",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/libheif.py b/test/test_data/libheif.py
@@ -22,5 +22,6 @@
         "package_name": "libheif-1.6.0-r0.apk",
         "product": "libheif",
         "version": "1.6.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/liblouis.py b/test/test_data/liblouis.py
@@ -22,5 +22,6 @@
         "package_name": "liblouis-3.29.0-r0.apk",
         "product": "liblouis",
         "version": "3.29.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/libreoffice.py b/test/test_data/libreoffice.py
@@ -20,5 +20,6 @@
         "package_name": "libreoffice-base-6.3.2.2-r3.apk",
         "product": "libreoffice",
         "version": "6.3.2.2",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/libreswan.py b/test/test_data/libreswan.py
@@ -28,5 +28,6 @@
         "package_name": "libreswan-3.29-r1.apk",
         "product": "libreswan",
         "version": "3.29",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/libyang.py b/test/test_data/libyang.py
@@ -34,5 +34,6 @@
         "package_name": "libyang-2.0.194-r0.apk",
         "product": "libyang",
         "version": "2.0.194",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/linux_kernel.py b/test/test_data/linux_kernel.py
@@ -27,12 +27,14 @@
         "package_name": "linux-image-3.16.0-6-586_3.16.56-1+deb8u1_i386.deb",
         "product": "linux_kernel",
         "version": "3.16.0",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/l/linux/",
         "package_name": "linux-image-5.10.0-21-s390x_5.10.162-1_s390x.deb",
         "product": "linux_kernel",
         "version": "5.10.0",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://downloads.openwrt.org/releases/17.01.0/targets/x86/generic/",
diff --git a/test/test_data/lrzip.py b/test/test_data/lrzip.py
@@ -31,5 +31,6 @@
         "package_name": "lrzip-0.631-r0.apk",
         "product": "long_range_zip",
         "version": "0.631",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/mbedtls.py b/test/test_data/mbedtls.py
@@ -31,5 +31,6 @@
         "package_name": "mbedtls-2.16.9-r0.apk",
         "product": "mbed_tls",
         "version": "2.16.9",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/mini_httpd.py b/test/test_data/mini_httpd.py
@@ -10,6 +10,7 @@
         "package_name": "mini_httpd-1.30-r5.apk",
         "product": "mini_httpd",
         "version": "1.30",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/m/mini-httpd/",
diff --git a/test/test_data/monit.py b/test/test_data/monit.py
@@ -28,5 +28,6 @@
         "package_name": "monit-5.26.0-r2.apk",
         "product": "monit",
         "version": "5.26.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/mpg123.py b/test/test_data/mpg123.py
@@ -28,5 +28,6 @@
         "package_name": "mpg123-1.25.13-r0.apk",
         "product": "mpg123",
         "version": "1.25.13",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/mupdf.py b/test/test_data/mupdf.py
@@ -22,5 +22,6 @@
         "package_name": "mupdf-tools-1.16.1-r1.apk",
         "product": "mupdf",
         "version": "1.16.1",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/nano.py b/test/test_data/nano.py
@@ -38,6 +38,7 @@
         "package_name": "nano-4.6-r0.apk",
         "product": "nano",
         "version": "4.6",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/n/nano/",
diff --git a/test/test_data/ofono.py b/test/test_data/ofono.py
@@ -22,5 +22,6 @@
         "package_name": "ofono-1.34-r0.apk",
         "product": "ofono",
         "version": "1.34",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/open_vm_tools.py b/test/test_data/open_vm_tools.py
@@ -29,6 +29,7 @@
         "package_name": "open-vm-tools-10.3.10-r2.apk",
         "product": "open-vm-tools",
         "version": "10.3.10",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/o/open-vm-tools/",
diff --git a/test/test_data/openjpeg.py b/test/test_data/openjpeg.py
@@ -39,5 +39,6 @@
         "package_name": "openjpeg-2.4.0-r1.apk",
         "product": "openjpeg",
         "version": "2.4.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/openvswitch.py b/test/test_data/openvswitch.py
@@ -32,5 +32,6 @@
         "package_name": "openvswitch-2.12.0-r2.apk",
         "product": "openvswitch",
         "version": "2.12.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/pcsc_lite.py b/test/test_data/pcsc_lite.py
@@ -29,5 +29,6 @@
         "package_name": "pcsc-lite-1.8.25-r2.apk",
         "product": "pcsc-lite",
         "version": "1.8.25",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/perl.py b/test/test_data/perl.py
@@ -27,5 +27,6 @@
         "package_name": "perl_5.28.1-4_x86_64.ipk",
         "product": "perl",
         "version": "5.28.1",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/php.py b/test/test_data/php.py
@@ -28,5 +28,6 @@
         "package_name": "php7-7.3.22-r0.apk",
         "product": "php",
         "version": "7.3.22",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/pigz.py b/test/test_data/pigz.py
@@ -31,6 +31,7 @@
         "package_name": "pigz-2.6-r0.apk",
         "product": "pigz",
         "version": "2.6",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/os/Packages/p/",
diff --git a/test/test_data/pjsip.py b/test/test_data/pjsip.py
@@ -23,5 +23,6 @@
         "package_name": "pjproject-2.9-r0.apk",
         "product": "pjsip",
         "version": "2.9",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/poppler.py b/test/test_data/poppler.py
@@ -43,5 +43,6 @@
         "package_name": "poppler-0.82.0-r1.apk",
         "product": "poppler",
         "version": "0.82.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/python.py b/test/test_data/python.py
@@ -65,6 +65,7 @@
         "package_name": "python-base_2.7.18-3_x86_64.ipk",
         "product": "python",
         "version": "2.7.18",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://downloads.openwrt.org/releases/22.03.3/packages/x86_64/packages/",
diff --git a/test/test_data/redis.py b/test/test_data/redis.py
@@ -34,6 +34,6 @@
         "package_name": "redis-5.0.14-r0.apk",
         "product": "redis",
         "version": "5.0.14",
-        "other_products": ["lua"],
+        "other_products": ["gcc", "lua"],
     },
 ]
diff --git a/test/test_data/rsyslog.py b/test/test_data/rsyslog.py
@@ -22,5 +22,6 @@
         "package_name": "rsyslog-8.2012.0-r3.apk",
         "product": "rsyslog",
         "version": "8.2012.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/ruby.py b/test/test_data/ruby.py
@@ -29,5 +29,6 @@
         "package_name": "ruby-libs-2.6.8-r0.apk",
         "product": "ruby",
         "version": "2.6.8",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/seahorse.py b/test/test_data/seahorse.py
@@ -27,5 +27,6 @@
         "package_name": "seahorse-3.38.1-r0.apk",
         "product": "seahorse",
         "version": "3.38.1",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/sngrep.py b/test/test_data/sngrep.py
@@ -28,5 +28,6 @@
         "package_name": "sngrep-1.8.1-r0.apk",
         "product": "sngrep",
         "version": "1.8.1",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/strongswan.py b/test/test_data/strongswan.py
@@ -32,5 +32,6 @@
         "package_name": "strongswan-5.8.1-r2.apk",
         "product": "strongswan",
         "version": "5.8.1",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/twonky_server.py b/test/test_data/twonky_server.py
@@ -14,6 +14,6 @@
         "package_name": "twonky-x86-64-glibc-2.22-8.5.2.zip",
         "product": "twonky_server",
         "version": "8.5.2",
-        "other_products": ["libjpeg"],
+        "other_products": ["gcc", "libjpeg"],
     },
 ]
diff --git a/test/test_data/vlc.py b/test/test_data/vlc.py
@@ -16,5 +16,6 @@
         "package_name": "vlc-3.0.12-r0.apk",
         "product": "vlc",
         "version": "3.0.12",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/wavpack.py b/test/test_data/wavpack.py
diff --git a/test/test_data/xpdf.py b/test/test_data/xpdf.py
diff --git a/test/test_data/xz.py b/test/test_data/xz.py
diff --git a/test/test_data/zbar.py b/test/test_data/zbar.py
diff --git a/test/test_scanner.py b/test/test_scanner.py

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class GccChecker(Checker):`
`32`	`32`	`]`
`33`	`33`	`FILENAME_PATTTERN = [r"gcc"]`
`34`	`34`	`VERSION_PATTERNS = [`
`35`		`- r"GCC: \([a-zA-Z ,0-9]+\) ([0-9]+\.[0-9]+(\.[0-9]+)?)",`
	`35`	`+ r"GCC: \([a-zA-Z ,0-9_+\-\.]+\) ([0-9]+\.[0-9]+(\.[0-9]+)?)",`
`36`	`36`	`# r"gcc ([0-9]+\.[0-9]+(\.[0-9]+)?)", # does not return correct version number on some packages`
`37`	`37`	`]`
`38`	`38`	`VENDOR_PRODUCT = [("gnu", "gcc")]`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,6 @@`
`32`	`32`	`"package_name": "apr-1.7.0-r0.apk",`
`33`	`33`	`"product": "portable_runtime",`
`34`	`34`	`"version": "1.7.0",`
	`35`	`+ "other_products": ["gcc"],`
`35`	`36`	`},`
`36`	`37`	`]`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,6 @@`
`22`	`22`	`"package_name": "axel-2.17.6-r1.apk",`
`23`	`23`	`"product": "axel",`
`24`	`24`	`"version": "2.17.6",`
	`25`	`+ "other_products": ["gcc"],`
`25`	`26`	`},`
`26`	`27`	`]`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,6 @@`
`16`	`16`	`"package_name": "bash_4.4.18-2ubuntu1_amd64.deb",`
`17`	`17`	`"product": "bash",`
`18`	`18`	`"version": "4.4.19",`
	`19`	`+ "other_products": ["gcc"],`
`19`	`20`	`},`
`20`	`21`	`]`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,6 @@`
`33`	`33`	`"package_name": "cairo-1.16.0-r3.apk",`
`34`	`34`	`"product": "cairo",`
`35`	`35`	`"version": "1.16.0",`
	`36`	`+ "other_products": ["gcc"],`
`36`	`37`	`},`
`37`	`38`	`]`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,6 @@`
`26`	`26`	`"package_name": "cups-filters-1.26.0-r0.apk",`
`27`	`27`	`"product": "cups-filters",`
`28`	`28`	`"version": "1.26.0",`
	`29`	`+ "other_products": ["gcc"],`
`29`	`30`	`},`
`30`	`31`	`]`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,6 @@`
`23`	`23`	`"package_name": "ed-1.15-r0.apk",`
`24`	`24`	`"product": "ed",`
`25`	`25`	`"version": "1.15",`
	`26`	`+ "other_products": ["gcc"],`
`26`	`27`	`},`
`27`	`28`	`]`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,6 @@`
`42`	`42`	`"package_name": "gettext-0.20.1-r2.apk",`
`43`	`43`	`"product": "gettext",`
`44`	`44`	`"version": "0.20.1",`
	`45`	`+ "other_products": ["gcc"],`
`45`	`46`	`},`
`46`	`47`	`]`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,6 @@`
`39`	`39`	`"package_name": "libc6-amd64_2.24-11+deb9u4_i386.deb",`
`40`	`40`	`"product": "glibc",`
`41`	`41`	`"version": "2.24",`
	`42`	`+ "other_products": ["gcc"],`
`42`	`43`	`},`
`43`	`44`	`]`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@`
`22`	`22`	`"package_name": "go-1.13.13-r0.apk",`
`23`	`23`	`"product": "go",`
`24`	`24`	`"version": "1.13.13",`
`25`		`- "other-products": ["llvm"],`
	`25`	`+ "other_products": ["gcc"],`
`26`	`26`	`},`
`27`	`27`	`]`