diff -Nur smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/40Xt_Geoip smeserver-xt_geoip-1.0.1/root/etc/e-smith/templates/etc/rc.d/init.d/masq/40Xt_Geoip --- smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/40Xt_Geoip 2019-02-18 21:13:42.739000000 -0500 +++ smeserver-xt_geoip-1.0.1/root/etc/e-smith/templates/etc/rc.d/init.d/masq/40Xt_Geoip 2019-02-18 21:31:14.383000000 -0500 @@ -6,9 +6,10 @@ chomp($KERNEL); my $PATH_MODULE = "/lib/modules/$KERNEL/extra/xt_geoip.ko"; my $PATH2_MODULE = "/lib/modules/$KERNEL/weak-updates/xt_geoip.ko"; + my $PATH3_MODULE = "/lib/modules/$KERNEL/weak-updates/xtables-addons/xt_geoip.ko"; if ($GP eq 'enabled' and $BC ne '') { - if (-s $PATH_MODULE || -s $PATH2_MODULE) + if (-s $PATH_MODULE || -s $PATH2_MODULE || -s $PATH3_MODULE) { $OUT .= " ## xtables-addons GEOIP ##\n"; $OUT .= " /sbin/iptables -A INPUT -m geoip --src-cc $BC -j ULOG --ulog-prefix \"GeoIP BAN: ALL\"\n"; diff -Nur 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 2019-02-18 21:13:42.743000000 -0500 +++ smeserver-xt_geoip-1.0.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm 2019-02-18 21:30:16.327000000 -0500 @@ -139,7 +139,7 @@ sub get_geoip { - return $db->get_prop("masq", "GeoIP"); + return $db->get_prop("masq", "GeoIP") || 'disabled'; } =head2 get_stat_geoip @@ -150,7 +150,7 @@ sub get_stat_geoip { my $fm = shift; - if ( get_geoip() == 'enabled' && system ( "/sbin/iptables -L -n | grep 'GeoIP' > /dev/null") != 0 ) { + if ( get_geoip() eq 'enabled' && system ( "/sbin/iptables -L -n | grep 'GeoIP' > /dev/null") != 0 ) { return $fm->localise('ERROR_STATUS_GEOIP'); } else { return ''; @@ -163,7 +163,8 @@ sub get_date_update { my $file = "/usr/share/xt_geoip/LE/A1.iv4"; - return strftime("%Y/%m/%d %H:%M", localtime( (stat($file))[9] )) || ''; + my $filetime = ( -e $file ) ? (stat($file))[9] : 0; + return strftime("%Y/%m/%d %H:%M", localtime( $filetime )) || ''; } =head2 change_settings