changes

vendors/debian/CVEParse.py

@@ -24,7 +24,7 @@ class CVEParse:
         """
         logging.info('Fetching CVE: ' + cve_id + '\n')
 
-        # Make this subtitution for some reason
+        # Make this subtitution in case it is necessary
         cve_id = re.sub('^CAN', 'CVE', cve_id)
         cve_id = CVEParse.correctCVE(cve_id)
         ##

vendors/debian/DebianModel.py

@@ -104,7 +104,7 @@ class DebianModel(VendorModel):
         self.src2pop = self.load_single_db_from_cache('src2pop')
         self.pkg_with_cvss = self.load_single_db_from_cache('pkg_with_cvss')
         self.src2monthDLA = self.load_single_db_from_cache('src2monthDLA')
-        self.pkg_with_cvss_DLA = self.load_single_db_from_cache('plg_with_cvss_DLA')
+        self.pkg_with_cvss_DLA = self.load_single_db_from_cache('pkg_with_cvss_DLA')
         self.src2cwe = self.load_single_db_from_cache('src2cwe')
 
     def load_single_db_from_cache(self, file_name):
@@ -339,7 +339,7 @@ class DebianModel(VendorModel):
                         for i in ret_roots(temp_cwe):
                             if i == 0:
                                 with_cwe[tt][11] += 1
-                                print('Problem with cve: ', cve_id)
+                                print('Problem with cve: ', cve_id, temp_cwe)
                             for j in range(len(root_list)):
                                 print('This is the with_cwe')
                                 if i == root_list[j]:
@@ -390,7 +390,7 @@ class DebianModel(VendorModel):
 
         items.sort(key=lambda tup: tup[0])
 
-        for i in range(2000,2019):
+        for i in range(2000,2020):
             temp = []
             for j in range(12):
                 temp.append([0]*12)
@@ -431,7 +431,7 @@ class DebianModel(VendorModel):
 
         items.sort(key=lambda tup: tup[0])
 
-        for i in range(2000, 2019):
+        for i in range(2000, 2020):
             temp = []
             for j in range(12):
                 if cvss:

vendors/debian/cache/state

@@ -1 +1 @@
-{"cache_dir": "cache/", "vendor": "debian", "next_adv": 4335, "next_fsa": 0, "Packages": "", "Sources": "", "Sha1Sums": ""}
+{"cache_dir": "cache/", "vendor": "debian", "next_adv": 4505, "next_fsa": 0, "Packages": "", "Sources": "", "Sha1Sums": ""}

vendors/debian/config_default.txt

@@ -14,7 +14,7 @@ arch = amd64
 first_dsa = 11
 first_usn = 1
 first_fsa = 1
-blacklist = DSA-1975, DSA-2360, DSA-2134, DSA-3043, DSA-3156
+blacklist = DSA-1975, DSA-2360, DSA-2134, DSA-3043, DSA-3156, DSA-4342
 
 
 [TRUST]

vendors/debian/src_name_unifications.txt

@@ -1,49 +1,50 @@
 mozilla-firefox->firefox-esr
 iceweasel->firefox-esr
-mozilla->firefox-esr
+mozilla$->firefox-esr
 mozilla-thunderbird->icedove
 thunderbird->icedove
 squid\d->squid3
 squid->squid3
-tk8.*->tk8
+tk8.->tk8
 xpdf-i->xpdf
-zope*->zope-common
+zope->zope-common
 librmagick-ruby->ruby-rmagick
 libcompass-ruby->ruby-compass
 bio-ruby->ruby-bio
-request-tracker*->request-tracker4
+request-tracker->request-tracker4
 perl-5.005->perl
-openldap*->openldap
-openoffice*->libreoffice
+openldap->openldap
+openoffice->libreoffice
 nsd3->nsd
 network-manager/network-manager-applet->network-manager
 nagios3->nagios
 nagios2->nagios
-^mysql-\d*->mysql-transitional
-linux-2.6*->linux
-linux-4*->linux
-linux-latest*->linux
-linux-kernel-alpha->linux
-linux-kernel-i386->linux
-libmusicbrainz*->libmusicbrainz
+^mysql-\d->mysql-transitional
+php->php7
+PHP->php7
+linux-2->linux
+linux-4->linux
+linux-3->linux
+linux-latest->linux
+linux-kernel->linux
+kernel-source->linux
+libmusicbrainz->libmusicbrainz
 libgtop1->libgtop2
 libgd1->libgd2
-libast*->libast2
+libast->libast2
 libmozjs0d->libast
 tiff3->tiff
 tiff4->tiff
-^kernel-source*->linux
-^kernel-patch*->linux
-^kernel-source-2.4.*->linux
-^kernel-image-2.2.*->linux
-^kernel-image*->linux
-^kernel-patch-*->linux
+^kernel-source->linux
+^kernel-patch->linux
+^kernel-image->linux
+^kernel-patch-->linux
 kernel-patch-benh->linux
 kernel-patch-vserver->linux
-^kernel-source*->linux
-gnutls*->gnutls28
+^kernel-source->linux
+gnutls->gnutls28
 gallery2->gallery
-firebird*->firebird3.0
+firebird->firebird3.0
 fltk1.1->fltk1.3
 fox1.4->fox1.6
 exim-tls->exim4
@@ -51,13 +52,13 @@ epic4->epic
 drupal\d->drupal7
 dhcp->dhcpcd5
 cyrus-sasl->cyrus-sasl2
-^cyrus-imapd.*->cyrus-imapd
-^kolab-cyrus-imapd.*->cyrus-imapd
+^cyrus-imapd.->cyrus-imapd
+^kolab-cyrus-imapd.->cyrus-imapd
 cfengine->cfengine2
 bind->bind9
 apache->apache2
 horde\d->php-horde
-mediawiki*->mediawiki
+mediawiki->mediawiki
 ffmpeg-debian->ffmpeg
 xserver-xorg->xorg-server
 xfree86-1->xorg-server
@@ -79,7 +80,7 @@ xen-3->xen
 xen-utils->xen
 kde-icons-gorilla->kde-icons-korilla
 libcgi-application-extra-plugin-bundle-perl->libcgi-application-plugins-perl
-^openssl*->openssl
+^openssl->openssl
 ^tomcat\d->tomcat8
 ^tomcat\d.\d$->tomcat8
 ^libgda\d->libgda
@@ -92,16 +93,17 @@ libcgi-application-extra-plugin-bundle-perl->libcgi-application-plugins-perl
 ^libticalcs\d->libticals
 ^libtifiles\d->libtifiles
 ^db\d.\d$->db4.8
-^gcc-.*->gcc
-^automake\d+.*->automake
+^gcc-.->gcc
+^automake\d+.->automake
 ^sun-java\d->sun-java6
-^open-jdk\d->open-jdk7
+^open-jdk\d->openjdk
+^openjdk->openjdk
 ^mbrola-es\d->mbrola-es
-^mgltools-.*->mgltools
+^mgltools-.->mgltools
 ^coin\d$->coin
-^adobereader-\.*->adobereader
-^picon-\.*->picon
-^nvidia-graphics-drivers\.*->nvidia-graphics-drivers
+^adobereader-\.->adobereader
+^picon-\.->picon
+^nvidia-graphics-drivers\.->nvidia-graphics-drivers
 ^boost\d\.\d\d->boost
 ^llvm-\d.\d->llvm
 ^octave\d.\d->octave
@@ -111,13 +113,13 @@ libcgi-application-extra-plugin-bundle-perl->libcgi-application-plugins-perl
 ^libupnp\d->libupnp
 ^python\d.\d->python3.5
 ^python\d->python3.5
-^postgresql-\d*->postgresql-9.6
+^postgresql-\d->postgresql-9.6
 ^ruby\d.\d->ruby2.3
 ^ruby\d.\d.\d->ruby2.3
 ^ruby->ruby2.3
-^mariadb-10.*->mariadb-10.1
-^ruby-actionpack*->rails
-^ruby-activerecord*->rails
+^mariadb-10.->mariadb-10.1
+^ruby-actionpack->rails
+^ruby-activerecord->rails
 ^librack-ruby->ruby-rack
 ^libopenssl-ruby->ruby-defaults
 krb4->krb5
@@ -129,7 +131,8 @@ phpbb2->phpbb3
 libpng->libpng1.6
 eglibc->glibc
 gnupg->gnupg2
-xine-lib*->xine-lib-1.2
-kfreebsd-\d*->kfreebsd-10
-pdfkit*->pdfkit
+xine-lib->xine-lib-1.2
+kfreebsd-\d->kfreebsd-10
+pdfkit->pdfkit
 gforge->fusionforge
+chromium->chromium-browser