summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmg <dmg@uvic.ca>2013-07-02 11:44:32 -0400
committerdmg <dmg@uvic.ca>2013-07-02 11:44:32 -0400
commitac20a70fb89de915202fa6576255c2b13c2b6e31 (patch)
treea6d1f6ed73006dac9cbac7ed0e7a4f98eb3a3064
parentedd7eb2a70fa23366db19f2766abb38943995044 (diff)
downloadninka-ac20a70fb89de915202fa6576255c2b13c2b6e31.tar.gz
Renamed the openSSLvar2 to Apachev1.0
-rw-r--r--ChangeLog2
-rw-r--r--matcher/rules.dict2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b92a5a..0e7a84d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2013-07-02 dmg <dmg@uvic.ca>
+ * matcher/rules.dict: Renamed the openSSLvar2 to Apachev1.0
+
* matcher/matcher.pl: added fields to ignore in MPLv1.1
* the mozilla trilicense was not properly identified in the GPLv2+ or LGPLv2.1+
diff --git a/matcher/rules.dict b/matcher/rules.dict
index c49443e..046ca17 100644
--- a/matcher/rules.dict
+++ b/matcher/rules.dict
@@ -130,9 +130,9 @@ ZLIBref:ZLibLic
openSSL:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdv,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,OpenSSLAck,BSDasIs,BSDWarr
openSSLvar1:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart1,BSDcondAdvPart2,SSLeayWindows,BSDcondAdvPart2,BSDasIs,BSDWarr,NoLicenseChangeAllowed
-openSSLvar2:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart1,BSDcondAdvPart2,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,OpenSSLAckPart1,BSDcondAdvPart2,BSDasIs,BSDWarr
openSSLvar3:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart1,BSDcondAdvPart2,OpenSSLendorse,OpenSSLwritCond,BSDasIs,BSDWarr
+Apachev1.0:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart1,BSDcondAdvPart2,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,OpenSSLAckPart1,BSDcondAdvPart2,BSDasIs,BSDWarr
Apachev1.1:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdv,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,OpenSSLAck,BSDasIs,BSDWarr
Apachev1.1:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart1,BSDcondAdvPart2,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,BSDasIs,BSDWarr
Apachev1.1:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart2,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,BSDasIs,BSDWarr