--- rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip-1.0.1-bz10860-license_key.patch	2020/01/11 07:29:10	1.1
+++ rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip-1.0.1-bz10860-license_key.patch	2020/01/14 14:45:40	1.2
@@ -11,6 +11,18 @@ diff -urN smeserver-xt_geoip-1.0.1.old/r
 +    </entry>
  
  </lexicon>
+diff -urN smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/templates/usr/share/xt_geoip/update_base/10All smeserver-xt_geoip-1.0.1/root/etc/e-smith/templates/usr/share/xt_geoip/update_base/10All
+--- smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/templates/usr/share/xt_geoip/update_base/10All	2017-09-15 15:05:44.000000000 +0400
++++ smeserver-xt_geoip-1.0.1/root/etc/e-smith/templates/usr/share/xt_geoip/update_base/10All	2020-01-12 22:22:08.798000000 +0400
+@@ -1,3 +1,5 @@
+ cd /usr/share/xt_geoip
+-/usr/libexec/xtables-addons/xt_geoip_dl
+-/usr/libexec/xtables-addons/xt_geoip_build GeoIPCountryWhois.csv
++if ( /usr/libexec/xtables-addons/xt_geoip_dl )
++then
++    /usr/libexec/xtables-addons/xt_geoip_build GeoIPCountryWhois.csv
++fi
+\ Pas de fin de ligne à la fin du fichier
 diff -urN smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.0.1/root/etc/e-smith/web/functions/xt_geoip
 --- smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/web/functions/xt_geoip	2020-01-11 09:35:29.000000000 +0400
 +++ smeserver-xt_geoip-1.0.1/root/etc/e-smith/web/functions/xt_geoip	2020-01-11 10:04:19.498000000 +0400
@@ -30,7 +42,7 @@ diff -urN smeserver-xt_geoip-1.0.1.old/r
              <description>COUNTRY_LIST_DESCRIPTION</description>
 diff -urN smeserver-xt_geoip-1.0.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm smeserver-xt_geoip-1.0.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm
 --- smeserver-xt_geoip-1.0.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm	2020-01-11 09:35:29.000000000 +0400
-+++ smeserver-xt_geoip-1.0.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm	2020-01-11 10:38:43.843000000 +0400
++++ smeserver-xt_geoip-1.0.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm	2020-01-12 18:05:02.757000000 +0400
 @@ -25,6 +25,7 @@
      get_value
      get_badcountries
@@ -39,7 +51,7 @@ diff -urN smeserver-xt_geoip-1.0.1.old/r
      get_reverse
      print_service_table
      get_stat_geoip
-@@ -189,6 +190,20 @@
+@@ -189,6 +190,23 @@
  	}
  }
  
@@ -51,10 +63,13 @@ diff -urN smeserver-xt_geoip-1.0.1.old/r
 +sub get_stat_license_key {
 +
 +    my $fm = shift;
-+    if ( (get_value( $fm, 'xt_geoip_LicenseKey' ) || '') eq '' ) {
-+        return $fm->localise('ERROR_LICENSE_KEY');
++    if ((get_prop( 'geoip','status' ) || 'disabled') eq 'enabled' ) {
++	if ( (get_prop( 'geoip','LicenseKey' ) || '') ne '' ) {
++	    return '';
++	}
 +    }
-+    return '';
++    return $fm->localise('ERROR_LICENSE_KEY');
++
 +}
 +
  =head2 get_date_update