fossology · shaheemazmalmmd · Jul 24, 2017 · Jul 24, 2017
diff --git a/install/db/licenseref.sql b/install/db/licenseref.sql
@@ -4265,7 +4265,7 @@ Portions created by ______________________ are Copyright (C) ___________________
 Contributor(s): ______________________________________.
 
 NOTE: THE TEXT OF THIS EXHIBIT A MAY DIFFER SLIGHTLY FROM THE TEXT OF THE NOTICES IN THE SOURCE CODE FILES OF THE ORIGINAL CODE. YOU SHOULD USE THE TEXT OF THIS EXHIBIT A RATHER THAN THE TEXT FOUND IN THE ORIGINAL CODE SOURCE CODE FOR YOUR MODIFICATIONS.', 'http://www.terracotta.org/legal/terracotta-public-license', NULL, NULL, NULL, 'Terracotta Public License', NULL, NULL, NULL, '', NULL, false, true, false, '7778c72d705d02c59966c0c6770b9a55', 1, false);
-INSERT INTO license_ref (rf_pk, rf_shortname, rf_text, rf_url, rf_add_date, rf_copyleft, "rf_OSIapproved", rf_fullname, "rf_FSFfree", "rf_GPLv2compatible", "rf_GPLv3compatible", rf_notes, "rf_Fedora", marydone, rf_active, rf_text_updatable, rf_md5, rf_detector_type, rf_spdx_compatible) VALUES (199, '3DFX', '1. PREAMBLE 
+INSERT INTO license_ref (rf_pk, rf_shortname, rf_text, rf_url, rf_add_date, rf_copyleft, "rf_OSIapproved", rf_fullname, "rf_FSFfree", "rf_GPLv2compatible", "rf_GPLv3compatible", rf_notes, "rf_Fedora", marydone, rf_active, rf_text_updatable, rf_md5, rf_detector_type, rf_spdx_compatible) VALUES (199, 'Glide', '1. PREAMBLE 
 
 This license is for software that provides a 3D graphics application 
 program interface (API).The license is intended to offer terms similar 

diff --git a/install/fossinit.php b/install/fossinit.php
@@ -312,6 +312,31 @@ function explainUsage()
   $sysconfig['Release'] = '3.0.1';
 }
 
+// Update '3dfx' licence shortname to 'Glide'. Since shortname is used as an
+// identifier, this is not done as part of the licenseref updates.
+if($isUpdating && (empty($sysconfig['Release']) || $sysconfig['Release'] == '3.0.1'))
+{
+  $dbManager->begin();
+  $row = $dbManager->getSingleRow("
+    SELECT rf1.rf_pk AS id_3dfx,
+           rf2.rf_pk AS id_glide
+    FROM license_ref rf1
+      INNER JOIN license_ref rf2 USING (rf_fullname)
+    WHERE rf1.rf_shortname='3DFX'
+      AND rf2.rf_shortname='Glide'
+    LIMIT 1", array(), 'old.3dfx.rf_pk');
+  if (count($row))
+  {
+    $id_3dfx = intval($row['id_3dfx']);
+    $id_glide = intval($row['id_glide']);
+    $dbManager->queryOnce("DELETE FROM license_ref WHERE rf_pk=$id_glide");
+    $dbManager->queryOnce("UPDATE license_ref SET rf_shortname='Glide' WHERE rf_pk=$id_3dfx");
+  }
+  $dbManager->commit();
+
+  $sysconfig['Release'] = "3.0.2";
+}
+
 $dbManager->begin();
 $dbManager->getSingleRow("DELETE FROM sysconfig WHERE variablename=$1",array('Release'),$sqlLog='drop.sysconfig.release');
 $dbManager->insertTableRow('sysconfig',

diff --git a/src/deciderjob/agent_tests/Functional/schedulerTest.php b/src/deciderjob/agent_tests/Functional/schedulerTest.php
@@ -162,7 +162,7 @@ private function runnerDeciderScanWithTwoEventAndNoAgentShouldMakeADecision($run
     $jobId = 42;
 
     $licenseRef1 = $this->licenseDao->getLicenseByShortName("GPL-3.0")->getRef();
-    $licenseRef2 = $this->licenseDao->getLicenseByShortName("3DFX")->getRef();
+    $licenseRef2 = $this->licenseDao->getLicenseByShortName("Glide")->getRef();
 
     $addedLicenses = array($licenseRef1, $licenseRef2);
 
@@ -334,7 +334,7 @@ private function runnerDeciderScanWithForceDecision($runner)
     $jobId = 42;
 
     $licenseRef1 = $this->licenseDao->getLicenseByShortName("GPL-3.0")->getRef();
-    $licenseRef2 = $this->licenseDao->getLicenseByShortName("3DFX")->getRef();
+    $licenseRef2 = $this->licenseDao->getLicenseByShortName("Glide")->getRef();
 
     $agentLicId = $this->licenseDao->getLicenseByShortName("Adaptec")->getRef()->getId();
 

diff --git a/src/lib/php/Test/testdata.sql b/src/lib/php/Test/testdata.sql
@@ -705,7 +705,7 @@ INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (11, 9, 1, 7, 32768, 9, 10, 'Adaptec');
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (12, 9, 1, 8, 32768, 11, 12, 'Adobe');
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (9, 4, 1, 0, 536888320, 6, 13, '2');
-INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (7, 5, 1, 4, 32768, 15, 16, '3DFX');
+INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (7, 5, 1, 4, 32768, 15, 16, 'Glide');
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (6, 5, 1, 3, 32768, 17, 18, 'ACE');
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (8, 5, 1, 5, 32768, 19, 20, 'AAL');
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (5, 4, 1, 0, 536888320, 14, 21, '1');
@@ -735,4 +735,4 @@ INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (37, 36, 3, 0, 536888320, 14, 21, '2b');
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (36, 35, 3, 0, 536888320, 5, 22, 'B');
 INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (35, 33, 3, 0, 805323776, 4, 23, 'artifact.dir');
-INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (33, NULL, 3, 9, 536904704, 1, 24, 'C.zip');
+INSERT INTO uploadtree_a (uploadtree_pk, parent, upload_fk, pfile_fk, ufile_mode, lft, rgt, ufile_name) VALUES (33, NULL, 3, 9, 536904704, 1, 24, 'C.zip');
diff --git a/src/nomos/agent/parse.c b/src/nomos/agent/parse.c
@@ -4396,7 +4396,7 @@ char *parseLicenses(char *filetext, int size, scanres_t *scp,
    */
   if (INFILE(_CR_3DFX_1) || INFILE(_CR_3DFX_2)) {
     if (INFILE(_LT_GLIDE_3DFX)) {
-      INTERESTING("3DFX");
+      INTERESTING("Glide");
     }
     else if (INFILE(_LT_GLIDE_GPL)) {
       INTERESTING("3DFX-PL");

diff --git a/src/nomos/agent_tests/testdata/LastGoodNomosTestfilesScan b/src/nomos/agent_tests/testdata/LastGoodNomosTestfilesScan
@@ -32,8 +32,8 @@ File NomosTestfiles/Zlib/zutil.h contains license(s) Zlib-possibility
 File NomosTestfiles/Zlib/zlibLicense-1.2.2-2004-Oct-03 contains license(s) Zlib
 File NomosTestfiles/Zlib/blast.c contains license(s) Zlib-possibility
 File NomosTestfiles/Zlib/OSIzlibLicense-2006-10-31 contains license(s) Zlib
-File NomosTestfiles/3DFX/test2.dtd contains license(s) 3DFX
-File NomosTestfiles/3DFX/test1.dtd contains license(s) 3DFX
+File NomosTestfiles/Glide/test2.dtd contains license(s) Glide
+File NomosTestfiles/Glide/test1.dtd contains license(s) Glide
 File NomosTestfiles/SugarCRM/SugarCRM-1.1.3.txt contains license(s) SugarCRM-1.1.3
 File NomosTestfiles/Public-domain/dirent.c contains license(s) Public-domain
 File NomosTestfiles/Public-domain/nwlib.c contains license(s) Public-domain

diff --git a/...ts/testdata/NomosTestfiles/3DFX/test1.dtd → ...s/testdata/NomosTestfiles/Glide/test1.dtd b/...ts/testdata/NomosTestfiles/3DFX/test1.dtd → ...s/testdata/NomosTestfiles/Glide/test1.dtd
diff --git a/...ts/testdata/NomosTestfiles/3DFX/test2.dtd → ...s/testdata/NomosTestfiles/Glide/test2.dtd b/...ts/testdata/NomosTestfiles/3DFX/test2.dtd → ...s/testdata/NomosTestfiles/Glide/test2.dtd
diff --git a/src/reuser/agent_tests/Functional/schedulerTest.php b/src/reuser/agent_tests/Functional/schedulerTest.php
@@ -184,7 +184,7 @@ private function runnerReuserScanWithoutAnyUploadToCopyAndNoClearing(SchedulerTe
   protected function insertDecisionFromTwoEvents($scope=DecisionScopes::ITEM,$originallyClearedItemId=23)
   {
     $licenseRef1 = $this->licenseDao->getLicenseByShortName("GPL-3.0")->getRef();
-    $licenseRef2 = $this->licenseDao->getLicenseByShortName("3DFX")->getRef();
+    $licenseRef2 = $this->licenseDao->getLicenseByShortName("Glide")->getRef();
 
     $addedLicenses = array($licenseRef1, $licenseRef2);
     assertThat($addedLicenses, not(arrayContaining(null)));

diff --git a/src/spdx2/agent_tests/Functional/fo_report.sql b/src/spdx2/agent_tests/Functional/fo_report.sql
@@ -578,7 +578,7 @@ INSERT INTO upload_clearing_license VALUES (1, 2, 199);
 
 INSERT INTO uploadtree_a (uploadtree_pk,realparent,parent,upload_fk,pfile_fk,ufile_mode,lft,rgt,ufile_name) VALUES (7, 6, 6, 1, 4, 33188, 4, 5, 'test1.dtd');
 INSERT INTO uploadtree_a (uploadtree_pk,realparent,parent,upload_fk,pfile_fk,ufile_mode,lft,rgt,ufile_name) VALUES (8, 6, 6, 1, 5, 33188, 6, 7, 'test2.dtd');
-INSERT INTO uploadtree_a (uploadtree_pk,realparent,parent,upload_fk,pfile_fk,ufile_mode,lft,rgt,ufile_name) VALUES (6, 1, 2, 1, 0, 536888320, 3, 8, '3DFX');
+INSERT INTO uploadtree_a (uploadtree_pk,realparent,parent,upload_fk,pfile_fk,ufile_mode,lft,rgt,ufile_name) VALUES (6, 1, 2, 1, 0, 536888320, 3, 8, 'Glide');
 INSERT INTO uploadtree_a (uploadtree_pk,realparent,parent,upload_fk,pfile_fk,ufile_mode,lft,rgt,ufile_name) VALUES (10, 9, 9, 1, 6, 33188, 10, 11, 'hash_md5prime.c');
 INSERT INTO uploadtree_a (uploadtree_pk,realparent,parent,upload_fk,pfile_fk,ufile_mode,lft,rgt,ufile_name) VALUES (9, 1, 2, 1, 0, 536888320, 9, 12, 'Beerware');
 INSERT INTO uploadtree_a (uploadtree_pk,realparent,parent,upload_fk,pfile_fk,ufile_mode,lft,rgt,ufile_name) VALUES (4, 3, 3, 1, 2, 33188, 14, 15, 'Condor-1.0');