smeserver-geoip/contribs10/smeserver-geoip-fix-city-createlinks.patch

diff -ruN smeserver-geoip-1.2.old/createlinks smeserver-geoip-1.2/createlinks
--- smeserver-geoip-1.2.old/createlinks 2018-10-29 11:10:49.225239125 +0100
+++ smeserver-geoip-1.2/createlinks     2018-10-29 12:20:27.873192195 +0100
@@ -15,7 +15,7 @@
 
 
 
-#my $event = "geoipupdate";
+my $event = "geoip-update";
 
 foreach (qw(
         /var/service/qpsmtpd/config/badcountries
@@ -24,7 +24,7 @@
         ))
 {
         templates2events("$_", qw(
-        geoipupdate
+        geoip-update
         ));
 }
 
diff -ruN smeserver-geoip-1.2.old/root/usr/share/qpsmtpd/plugins/check_badcountries smeserver-geoip-1.2/root/usr/share/qpsmtpd/plugins/check_badcountries
--- smeserver-geoip-1.2.old/root/usr/share/qpsmtpd/plugins/check_badcountries   2018-10-29 11:10:49.225239125 +0100
+++ smeserver-geoip-1.2/root/usr/share/qpsmtpd/plugins/check_badcountries       2018-10-29 11:15:33.708125673 +0100
@@ -261,7 +261,7 @@
     }
 
     # City Information in case we want to play later
-    my $city = $self->qp->connection->notes('geoip_city');
+    my $city = $self->qp->connection->notes('geoip_city') // '';
     #warn ("At City (check): $city");
     if ($city eq '') {
         $self->log(LOGINFO, "Information: City NA RemoteIP $ip");
1	diff -ruN smeserver-geoip-1.2.old/createlinks smeserver-geoip-1.2/createlinks
2	--- smeserver-geoip-1.2.old/createlinks 2018-10-29 11:10:49.225239125 +0100
3	+++ smeserver-geoip-1.2/createlinks 2018-10-29 12:20:27.873192195 +0100
4	@@ -15,7 +15,7 @@
5
6
7
8	-#my $event = "geoipupdate";
9	+my $event = "geoip-update";
10
11	foreach (qw(
12	/var/service/qpsmtpd/config/badcountries
13	@@ -24,7 +24,7 @@
14	))
15	{
16	templates2events("$_", qw(
17	- geoipupdate
18	+ geoip-update
19	));
20	}
21
22	diff -ruN smeserver-geoip-1.2.old/root/usr/share/qpsmtpd/plugins/check_badcountries smeserver-geoip-1.2/root/usr/share/qpsmtpd/plugins/check_badcountries
23	--- smeserver-geoip-1.2.old/root/usr/share/qpsmtpd/plugins/check_badcountries 2018-10-29 11:10:49.225239125 +0100
24	+++ smeserver-geoip-1.2/root/usr/share/qpsmtpd/plugins/check_badcountries 2018-10-29 11:15:33.708125673 +0100
25	@@ -261,7 +261,7 @@
26	}
27
28	# City Information in case we want to play later
29	- my $city = $self->qp->connection->notes('geoip_city');
30	+ my $city = $self->qp->connection->notes('geoip_city') // '';
31	#warn ("At City (check): $city");
32	if ($city eq '') {
33	$self->log(LOGINFO, "Information: City NA RemoteIP $ip");