smeserver-xt_geoip/contribs10/smeserver-xt_geoip-1.3.1-bz12029_backup-bz10863_bases.patch

diff -urN smeserver-xt_geoip-1.3.1.old/createlinks smeserver-xt_geoip-1.3.1/createlinks
--- smeserver-xt_geoip-1.3.1.old/createlinks    2022-03-09 22:16:38.099000000 +0400
+++ smeserver-xt_geoip-1.3.1/createlinks        2022-06-28 22:21:29.958000000 +0400
@@ -45,3 +45,13 @@
 event_link('navigation2-conf', "$event", '80');
 event_link('routes2-conf', "$event", '80');
 event_link('locales2-conf', "$event", '80');
+
+use esmith::Build::Backup qw(:all);
+backup_includes("smeserver-xt_geoip", qw(
+/usr/share/xt_geoip/BE/
+/usr/share/xt_geoip/LE/
+/var/lib/xt_geoip/
+));
+backup_excludes("smeserver-xt_geoip", qw(
+/var/lib/xt_geoip/README.txt
+));
diff -urN smeserver-xt_geoip-1.3.1.old/root/usr/share/xt_geoip/geoip_stats smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_stats
--- smeserver-xt_geoip-1.3.1.old/root/usr/share/xt_geoip/geoip_stats    2022-03-09 22:16:38.066000000 +0400
+++ smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_stats        2022-07-02 17:36:21.880000000 +0400
@@ -34,12 +34,15 @@
 # permanent files
 BASEFILE="$STATDIR/Base_${PREF}_ip.lst"
 BASE2FILE="$STATDIR/Base_${PREF}_country.lst"
+ARCHFILE="$STATDIR/ArchBase_${PREF}_ip.lst"
+ARCH2FILE="$STATDIR/ArchBase_${PREF}_country.lst"
 # tempo
 TMPFILE=$(mktemp $STATDIR/xt_${PREF}.XXXXXXX)
 # Day - 1
 MONTH=$(date --date '1 day ago' +%B)
 LOGDAY="${MONTH:0:3} $(date --date '1 day ago' +%d)"
 DATE=$(date --date '1 day ago' '+%Y-%m-%d')
+ARCHDATE=$(date --date '90 day ago' '+%Y-%m-%d')
 
 cd $EXECDIR
 
@@ -80,8 +83,30 @@
 cat $RESFILE >> $BASEFILE
 cat $RES2FILE >> $BASE2FILE
 
-# delete files of today
-#rm -f $RESFILE $RES2FILE
+touch ${TMPFILE}_last3m
+touch ${TMPFILE}_older
+
+# split IP bases file between 'last 3 months' and 'archives'
+awk -F ';' "\$1 > \"$ARCHDATE\" {print > (\"${TMPFILE}_last3m\"); next} {print > (\"${TMPFILE}_older\")}" $BASEFILE
+
+if [ -f ${TMPFILE}_older ]
+then
+    cat ${TMPFILE}_older >> $ARCHFILE
+    cp ${TMPFILE}_last3m $BASEFILE
+fi
+cp /dev/null ${TMPFILE}_last3m
+cp /dev/null ${TMPFILE}_older
+ 
+# split COUNTRY bases file between 'last 3 months' and archives
+ awk -F ';' "\$1 > \"$ARCHDATE\" {print > (\"${TMPFILE}_last3m\"); next} {print > (\"${TMPFILE}_older\")}" $BASE2FILE
+ 
+if [ -f ${TMPFILE}_older ]
+then
+     cat ${TMPFILE}_older >> $ARCH2FILE
+     cp ${TMPFILE}_last3m $BASE2FILE
+fi
+
+rm -f ${TMPFILE}_last3m ${TMPFILE}_older
 
 # for mail
 if [ -s $RES2FILE ]
@@ -89,3 +114,7 @@
     echo "parse $LOGDIR for $PREF events"
     cat $RES2FILE
 fi
+
+# delete files of today
+#rm -f $RESFILE $RES2FILE
+
1	michel	1.1	diff -urN smeserver-xt_geoip-1.3.1.old/createlinks smeserver-xt_geoip-1.3.1/createlinks
2			--- smeserver-xt_geoip-1.3.1.old/createlinks 2022-03-09 22:16:38.099000000 +0400
3			+++ smeserver-xt_geoip-1.3.1/createlinks 2022-06-28 22:21:29.958000000 +0400
4			@@ -45,3 +45,13 @@
5			event_link('navigation2-conf', "$event", '80');
6			event_link('routes2-conf', "$event", '80');
7			event_link('locales2-conf', "$event", '80');
8			+
9			+use esmith::Build::Backup qw(:all);
10			+backup_includes("smeserver-xt_geoip", qw(
11			+/usr/share/xt_geoip/BE/
12			+/usr/share/xt_geoip/LE/
13			+/var/lib/xt_geoip/
14			+));
15			+backup_excludes("smeserver-xt_geoip", qw(
16			+/var/lib/xt_geoip/README.txt
17			+));
18			diff -urN smeserver-xt_geoip-1.3.1.old/root/usr/share/xt_geoip/geoip_stats smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_stats
19			--- smeserver-xt_geoip-1.3.1.old/root/usr/share/xt_geoip/geoip_stats 2022-03-09 22:16:38.066000000 +0400
20			+++ smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_stats 2022-07-02 17:36:21.880000000 +0400
21			@@ -34,12 +34,15 @@
22			# permanent files
23			BASEFILE="$STATDIR/Base_${PREF}_ip.lst"
24			BASE2FILE="$STATDIR/Base_${PREF}_country.lst"
25			+ARCHFILE="$STATDIR/ArchBase_${PREF}_ip.lst"
26			+ARCH2FILE="$STATDIR/ArchBase_${PREF}_country.lst"
27			# tempo
28			TMPFILE=$(mktemp $STATDIR/xt_${PREF}.XXXXXXX)
29			# Day - 1
30			MONTH=$(date --date '1 day ago' +%B)
31			LOGDAY="${MONTH:0:3} $(date --date '1 day ago' +%d)"
32			DATE=$(date --date '1 day ago' '+%Y-%m-%d')
33			+ARCHDATE=$(date --date '90 day ago' '+%Y-%m-%d')
34
35			cd $EXECDIR
36
37			@@ -80,8 +83,30 @@
38			cat $RESFILE >> $BASEFILE
39			cat $RES2FILE >> $BASE2FILE
40
41			-# delete files of today
42			-#rm -f $RESFILE $RES2FILE
43			+touch ${TMPFILE}_last3m
44			+touch ${TMPFILE}_older
45			+
46			+# split IP bases file between 'last 3 months' and 'archives'
47			+awk -F ';' "\$1 > \"$ARCHDATE\" {print > (\"${TMPFILE}_last3m\"); next} {print > (\"${TMPFILE}_older\")}" $BASEFILE
48			+
49			+if [ -f ${TMPFILE}_older ]
50			+then
51			+ cat ${TMPFILE}_older >> $ARCHFILE
52			+ cp ${TMPFILE}_last3m $BASEFILE
53			+fi
54			+cp /dev/null ${TMPFILE}_last3m
55			+cp /dev/null ${TMPFILE}_older
56			+
57			+# split COUNTRY bases file between 'last 3 months' and archives
58			+ awk -F ';' "\$1 > \"$ARCHDATE\" {print > (\"${TMPFILE}_last3m\"); next} {print > (\"${TMPFILE}_older\")}" $BASE2FILE
59			+
60			+if [ -f ${TMPFILE}_older ]
61			+then
62			+ cat ${TMPFILE}_older >> $ARCH2FILE
63			+ cp ${TMPFILE}_last3m $BASE2FILE
64			+fi
65			+
66			+rm -f ${TMPFILE}_last3m ${TMPFILE}_older
67
68			# for mail
69			if [ -s $RES2FILE ]
70			@@ -89,3 +114,7 @@
71			echo "parse $LOGDIR for $PREF events"
72			cat $RES2FILE
73			fi
74			+
75			+# delete files of today
76			+#rm -f $RESFILE $RES2FILE
77			+