[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 06fd466154bb85e2ff505c3d7676d09cc01a6a54
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:45 2008 +0100

    Revert "merge patch for bb #925 from trunk (r3782 and r3789)"
    
    This reverts commit aa97c3c4f35c5d496994eecb2c95c847ace5e494.

diff --git a/ChangeLog b/ChangeLog
index 7cd943c..643745f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Mon Apr 14 22:46:17 EEST 2008
------------------------------
-  * libclamav/iana_tld.h, libclamav/phishcheck.c: update TLD list (bb #925)
-
 Wed Apr  9 17:58:43 CEST 2008
 -----------------------------
   V 0.93:
diff --git a/contrib/phishing/regex_opt.py b/contrib/phishing/regex_opt.py
index f6f2d60..4d57871 100755
--- a/contrib/phishing/regex_opt.py
+++ b/contrib/phishing/regex_opt.py
@@ -15,7 +15,7 @@ def getcommon_prefix(a,b):
 	else:
 		return ""
 
-fil = file("iana_tld.h")
+fil = file("libclamav/iana_tld.h")
 left = fil.read().split("(")
 out=[]
 for i in range(1,len(left)):
diff --git a/contrib/phishing/update_iana_data.sh b/contrib/phishing/update_iana_data.sh
index fa412e9..6501963 100755
--- a/contrib/phishing/update_iana_data.sh
+++ b/contrib/phishing/update_iana_data.sh
@@ -42,7 +42,7 @@ echo ")\"" >>$OUTFILE
 echo "Downloading updated country-code list from iana.org"
 wget $IANA_CCTLD -O $TMP || exit 2
 echo "Download complete, parsing data"
-CCTLDLIST=$(cat $TMP | egrep -oi "<a href=[^>]+>\\.([a-zA-Z]+).+</a>" | egrep -o ">.[a-zA-Z]+" | colrm 1 2 | tr \\n \\174 | sed 's/[^a-zA-Z]$//')
+CCTLDLIST=$(cat $TMP | egrep -oi "<a href=[^>]+>\\.([a-z]+).+</a>" | egrep -o ">.[a-z]+" | colrm 1 2 | tr \\n \\174 | sed 's/[^a-zA-Z]$//')
 echo "Parse complete, removing tmpfile"
 rm $TMP
 echo "Generating cctld list in $OUTFILE"
diff --git a/libclamav/iana_tld.h b/libclamav/iana_tld.h
index e3fd17b..01ef3da 100644
--- a/libclamav/iana_tld.h
+++ b/libclamav/iana_tld.h
@@ -22,7 +22,7 @@
 
 #ifndef IANA_TLD_H
 #define IANA_TLD_H
-#define iana_tld "(A[CDEFGILMNOQRSTUWXZ]|B[ABDEFGHIJMNORSTVWYZ]|C[ACDFGHIKLMNORUVXYZ]|D[EJKMOZ]|E[CEGRSTU]|F[IJKMOR]|G[ABDEFGHILMNPQRSTUWY]|H[KMNRTU]|I[DELMNOQRST]|J[EMOP]|K[EGHIMNPRWYZ]|L[ABCIKRSTUVY]|M[ACDEGHKLMNOPQRSTUVWXYZ]|N[ACEFGILOPRUZ]|OM|P[AEFGHKLMNRSTWY]|QA|R[EOSUW]|S[ABCDEGHIJKLMNORTUVYZ]|T[CDFGHJKLMNOPRTVWZ]|U[AGKMSYZ]|V[ACEGINU]|W[FS]|Y[ETU]|Z[AMW]|BIZ|CAT|COM|EDU|GOV|INT|MIL|NET|ORG|PRO|TEL|AERO|ARPA|ASIA|COOP|INFO|JOBS|MOBI|NAME|MUSEUM|TRAVEL|XN--ZCKZAH|XN--0ZWM56D|XN--DEBA0AD|XN--G6W251D|XN--JXALPDLP|XN--KGBECHTV|XN--9T4B11YI5A|XN--80AKHBYKNJ4F|XN--11B5BS3A9AJ6G|XN--HGBK6AJ7F53BBA)"
-#define iana_cctld "(A[CDEFGILMNOQRSTUWXZ]|B[ABDEFGHIJLMNORSTVWYZ]|C[ACDFGHIKLMNORUVXYZ]|D[EJKMOZ]|E[CEGHRSTU]|F[IJKMOR]|G[ABDEFGHILMNPQRSTUWY]|H[KMNRTU]|I[DELMNOQRST]|J[EMOP]|K[EGHIMNPRWYZ]|L[ABCIKRSTUVY]|M[ACDEFGHKLMNOPQRSTUVWXYZ]|N[ACEFGILOPRUZ]|OM|P[AEFGHKLMNRSTWY]|QA|R[EOSUW]|S[ABCDEGHIJKLMNORTUVYZ]|T[CDFGHJKLMNOPRTVWZ]|U[AGKMSYZ]|V[ACEGINU]|W[FS]|Y[ETU]|Z[AMW]|BIZ|CAT|COM|EDU|GOV|IN[TT]|MIL|NET|ORG|PRO|TEL|AERO|ARP[AA]|ASIA|COOP|INFO|JOBS|MOBI|NAME|MUSEUM)"
+#define iana_tld "(A[CDEFGILMNOQRSTUWXZ]|B[ABDEFGHIJMNORSTVWYZ]|C[ACDFGHIKLMNORUVXYZ]|D[EJKMOZ]|E[CEGRSTU]|F[IJKMOR]|G[ABDEFGHILMNPQRSTUWY]|H[KMNRTU]|I[DELMNOQRST]|J[EMOP]|K[EGHIMNRWYZ]|L[ABCIKRSTUVY]|M[ACDGHKLMNOPQRSTUVWXYZ]|N[ACEFGILOPRUZ]|OM|P[AEFGHKLMNRSTWY]|QA|R[EOUW]|S[ABCDEGHIJKLMNORTUVYZ]|T[CDFGHJKLMNOPRTVWZ]|U[AGKMSYZ]|V[ACEGINU]|W[FS]|Y[ETU]|Z[AMW]|BIZ|CAT|COM|EDU|GOV|INT|MIL|NET|ORG|PRO|AERO|ARPA|COOP|INFO|JOBS|MOBI|NAME|MUSEUM)"
+#define iana_cctld "(a[dfilmoqrtuwxz]|b[bdeghijmorstwyz]|c[ahlmnosuy]|d[ejkmz]|e[cegrstu]|f[ijr]|g[abdeghilmnprtuwy]|h[nrtu]|i[delnqst]|j[emop]|k[eghimwz]|l[birstuv]|m[acglmnoqrstuvwxyz]|n[aegilopru]|om|p[aehkltwy]|qa|r[ow]|s[cdeginorz]|t[dghjklmnorvwz]|u[agyz]|v[enu]|ws|y[etu])"
 #endif
 
diff --git a/libclamav/phishcheck.c b/libclamav/phishcheck.c
index 4589eb5..fc51b63 100644
--- a/libclamav/phishcheck.c
+++ b/libclamav/phishcheck.c
@@ -495,7 +495,7 @@ static void get_domain(const struct phishcheck* pchk,struct string* dest,struct
 			string_assign(dest,host);
 			return;
 		}
-		if(!isTLD(pchk,tld+1,countrycode-tld-2)) {
+		if(!isTLD(pchk,tld+1,countrycode-tld-1)) {
 			string_assign_ref(dest,host,tld+1);
 			return;/*it was a name like: subdomain.domain.uk, return domain.uk*/
 		}

-- 
Debian repository for ClamAV