.gitignore

@@ -34,6 +34,4 @@ inc/
 /MANIFEST.bak
 /pm_to_blib
 /*.zip
-/*.xz
+
-/*.rpm
-/results/

README.md

@@ -1,8 +1,5 @@
 # smeserver-xt_geoip
 
-from cvs koozali.org  ( T E S T )
+smeserver-xt_geoip
 
-remove all about patches from smeserver-xt_geoip.spec file 
+from cvs koozali.org  ( T E S T )
-rename directory source to package-version
-change gitignore adding all work and built files
-local git-mock to build

smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/actions/xt_geoip_kmod

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-modprobe -r xt_geoip
-weak-modules  --add-kernel 
-modprobe xt_geoip
-

smeserver-xt_geoip-1.3.1/root/etc/yum/post-actions/xt_geoip.action

@@ -1,4 +0,0 @@
-kernel*:any:/etc/e-smith/events/actions/xt_geoip_kmod
-kmod*:any:/etc/e-smith/events/actions/xt_geoip_kmod
-xtables-addons*:any:/etc/e-smith/events/actions/xt_geoip_kmod
-

smeserver-xt_geoip.spec

@@ -1,6 +1,6 @@
 %define name smeserver-xt_geoip
 %define version 1.3.1
-%define release 20
+%define release 18
 
 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 Name: %{name}
@@ -10,6 +10,21 @@ License: GNU GPL version 2
 URL: http://wiki.contribs.org/Main_Page
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.xz
+Patch0: %{name}-%{version}-comp_e-smith-manager.patch
+Patch1: %{name}-%{version}-update_base.patch
+Patch2: smeserver-xt_geoip-1.3.1-update-event-oldManager.patch
+Patch3: %{name}-%{version}-logfiles_changes.patch
+Patch4: smeserver-xt_geoip-1.3.1-locale-2021-08-25.patch
+Patch5: smeserver-xt_geoip-1.3.1-locale-2021-09-23.patch
+Patch6: smeserver-xt_geoip-1.3.1-locale-2021-10-28.patch
+Patch7: smeserver-xt_geoip-1.3.1-SME_11676.patch
+Patch8: smeserver-xt_geoip-1.3.1-Add-class-to-div-for-AdminLTE.patch
+Patch9: smeserver-xt_geoip-1.3.1-SME_11887.patch
+Patch10: smeserver-xt_geoip-1.3.1-bz12029_backup-bz10863_bases.patch
+Patch11: smeserver-xt_geoip-1.3.1-bz12097_fix_logs_date_test.patch
+Patch12: smeserver-xt_geoip-1.3.1-bz12098_add_fail2ban_stats.patch
+Patch13: smeserver-xt_geoip-1.3.1-locale-2022-11-11.patch
+Patch14: smeserver-xt_geoip-1.3.1-bz12291_module_state.patch
 
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
@@ -30,10 +45,31 @@ smserver rpm to setup database, update and configuration for xt_geoip module wit
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+# tmp fix before new source archive
+rm -rf root/etc/e-smith/events/bootstrap-console-save/templates2expand
+rm -rf root/etc/e-smith/events/console-save/templates2expand
+rm -rf root/etc/e-smith/events/xt_geoip-modify/templates2expand/usr
+rm -rf root/etc/e-smith/events/xt_geoip-update/templates2expand/usr
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 perl createlinks
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -67,12 +103,6 @@ rm -rf %{name}-%{version}
 
 
 %changelog
-* Wed Feb 15 2023 Michel Begue <mab974@misouk.com> 1.3.1-20.sme
-- fix module not loaded after update [SME: 10793]
-
-* Wed Feb 08 2023 Michel Begue <mab974@misouk.com> 1.3.1-19.sme
-- no patch infos here in .spec ( F A K E  ) [SME: ]
-
 * Wed Jan 11 2023 Michel Begue <mab974@misouk.com> 1.3.1-18.sme
 - add a message if module xt_geoip is missing or not loaded [SME: 12291]
 - add a message if chain XTGeoIP is missing (iptables) [SME: 12291]

source/createlinks

@@ -32,16 +32,12 @@ for my $event (qw(xt_geoip-service))
 }
 
 # actions to perform
+
 for my $event (qw(xt_geoip-update bootstrap-console-save
         console-save  smeserver-xt_geoip-update))
 {
     event_link("smeserver-xt_geoip-download-action", $event, "10");
 }
-for my $event (qw(bootstrap-console-save e-smith-packetfilter-update
-        smeserver-xt_geoip-update remote-access-update))
-{
-    event_link("xt_geoip_kmod", $event, "15");
-}
 
 # for smeserver-manager
 my $event= "smeserver-xt_geoip-update";
@@ -50,7 +46,6 @@ event_link('navigation2-conf', "$event", '80');
 event_link('routes2-conf', "$event", '80');
 event_link('locales2-conf', "$event", '80');
 
-# backup
 use esmith::Build::Backup qw(:all);
 backup_includes("smeserver-xt_geoip", qw(
 /usr/share/xt_geoip/BE/