1 |
michel |
1.1 |
%define name smeserver-xt_geoip |
2 |
|
|
%define version 1.3.1 |
3 |
brianr |
1.21 |
%define release 20 |
4 |
michel |
1.1 |
|
5 |
|
|
Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel. |
6 |
|
|
Name: %{name} |
7 |
|
|
Version: %{version} |
8 |
|
|
Release: %{release}%{?dist} |
9 |
|
|
License: GNU GPL version 2 |
10 |
|
|
URL: http://wiki.contribs.org/Main_Page |
11 |
|
|
Group: SMEserver/addon |
12 |
|
|
Source: %{name}-%{version}.tar.xz |
13 |
michel |
1.2 |
Patch0: %{name}-%{version}-comp_e-smith-manager.patch |
14 |
michel |
1.3 |
Patch1: %{name}-%{version}-update_base.patch |
15 |
jpp |
1.4 |
Patch2: smeserver-xt_geoip-1.3.1-update-event-oldManager.patch |
16 |
michel |
1.7 |
Patch3: %{name}-%{version}-logfiles_changes.patch |
17 |
terryfage |
1.8 |
Patch4: smeserver-xt_geoip-1.3.1-locale-2021-08-25.patch |
18 |
terryfage |
1.9 |
Patch5: smeserver-xt_geoip-1.3.1-locale-2021-09-23.patch |
19 |
michel |
1.10 |
Patch6: smeserver-xt_geoip-1.3.1-locale-2021-10-28.patch |
20 |
michel |
1.11 |
Patch7: smeserver-xt_geoip-1.3.1-SME_11676.patch |
21 |
brianr |
1.12 |
Patch8: smeserver-xt_geoip-1.3.1-Add-class-to-div-for-AdminLTE.patch |
22 |
michel |
1.14 |
Patch9: smeserver-xt_geoip-1.3.1-SME_11887.patch |
23 |
michel |
1.15 |
Patch10: smeserver-xt_geoip-1.3.1-bz12029_backup-bz10863_bases.patch |
24 |
michel |
1.16 |
Patch11: smeserver-xt_geoip-1.3.1-bz12097_fix_logs_date_test.patch |
25 |
michel |
1.17 |
Patch12: smeserver-xt_geoip-1.3.1-bz12098_add_fail2ban_stats.patch |
26 |
jpp |
1.18 |
Patch13: smeserver-xt_geoip-1.3.1-locale-2022-11-11.patch |
27 |
michel |
1.19 |
Patch14: smeserver-xt_geoip-1.3.1-bz12291_module_state.patch |
28 |
michel |
1.20 |
Patch15: smeserver-xt_geoip-1.3.1-bz10793_module_load.patch |
29 |
brianr |
1.21 |
Patch16: smeserver-xt_geoip-1.3.1-Alter-menu-category-for-new-arrangement.patch |
30 |
michel |
1.2 |
|
31 |
michel |
1.1 |
BuildArchitectures: noarch |
32 |
|
|
BuildRoot: /var/tmp/%{name}-%{version} |
33 |
|
|
BuildRequires: e-smith-devtools |
34 |
|
|
Requires: e-smith-release >= 10.0 |
35 |
|
|
Requires: server-manager >= 0.1.0-23 |
36 |
|
|
Requires: xtables-addons = 2.14 |
37 |
jpp |
1.6 |
Requires: GeoIP >= 1.5.0 |
38 |
michel |
1.1 |
Requires: libmaxminddb >= 1.1.1 |
39 |
|
|
Requires: libmaxminddb-devel >= 1.1.1 |
40 |
|
|
Requires: geolite2-country |
41 |
|
|
Requires: geolite2-city |
42 |
|
|
AutoReqProv: no |
43 |
|
|
|
44 |
|
|
%description |
45 |
|
|
smserver rpm to setup database, update and configuration for xt_geoip module with a panel. |
46 |
|
|
|
47 |
|
|
|
48 |
|
|
%prep |
49 |
|
|
%setup |
50 |
michel |
1.2 |
%patch0 -p1 |
51 |
michel |
1.3 |
%patch1 -p1 |
52 |
jpp |
1.4 |
%patch2 -p1 |
53 |
michel |
1.7 |
%patch3 -p1 |
54 |
terryfage |
1.8 |
%patch4 -p1 |
55 |
terryfage |
1.9 |
%patch5 -p1 |
56 |
michel |
1.10 |
%patch6 -p1 |
57 |
michel |
1.11 |
# tmp fix before new source archive |
58 |
|
|
rm -rf root/etc/e-smith/events/bootstrap-console-save/templates2expand |
59 |
|
|
rm -rf root/etc/e-smith/events/console-save/templates2expand |
60 |
|
|
rm -rf root/etc/e-smith/events/xt_geoip-modify/templates2expand/usr |
61 |
|
|
rm -rf root/etc/e-smith/events/xt_geoip-update/templates2expand/usr |
62 |
|
|
%patch7 -p1 |
63 |
jpp |
1.13 |
%patch8 -p1 |
64 |
michel |
1.14 |
%patch9 -p1 |
65 |
michel |
1.15 |
%patch10 -p1 |
66 |
michel |
1.16 |
%patch11 -p1 |
67 |
michel |
1.17 |
%patch12 -p1 |
68 |
jpp |
1.18 |
%patch13 -p1 |
69 |
michel |
1.19 |
%patch14 -p1 |
70 |
michel |
1.20 |
%patch15 -p1 |
71 |
brianr |
1.21 |
%patch16 -p1 |
72 |
michel |
1.11 |
|
73 |
michel |
1.1 |
%build |
74 |
|
|
perl createlinks |
75 |
|
|
|
76 |
|
|
|
77 |
|
|
%install |
78 |
|
|
rm -rf $RPM_BUILD_ROOT |
79 |
|
|
|
80 |
|
|
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
81 |
|
|
rm -f %{name}-%{version}-filelist |
82 |
jpp |
1.4 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
83 |
jpp |
1.5 |
--file /usr/share/xt_geoip/geoip_countries_list.txt 'attr(0755, root, root)'\ |
84 |
|
|
--file /usr/share/xt_geoip/geoip_exstat 'attr(0755, root, root)'\ |
85 |
|
|
--file /usr/share/xt_geoip/geoip_listat 'attr(0755, root, root)'\ |
86 |
|
|
--file /usr/share/xt_geoip/geoip_look 'attr(0755, root, root)'\ |
87 |
|
|
--file /usr/share/xt_geoip/geoip_stats 'attr(0755, root, root)'\ |
88 |
|
|
--file /usr/share/xt_geoip/xt_geoip_dl 'attr(0750, root, root)'\ |
89 |
|
|
--file /usr/share/xt_geoip/update_base 'attr(0750, root, root)'\ |
90 |
michel |
1.1 |
> %{name}-%{version}-filelist |
91 |
|
|
echo "%doc COPYING" >> %{name}-%{version}-filelist |
92 |
jpp |
1.5 |
|
93 |
michel |
1.1 |
%clean |
94 |
|
|
cd .. |
95 |
|
|
rm -rf %{name}-%{version} |
96 |
|
|
|
97 |
|
|
%pre |
98 |
|
|
%preun |
99 |
|
|
|
100 |
|
|
%post |
101 |
|
|
|
102 |
brianr |
1.21 |
if (systemctl list-unit-files |grep smanager) then |
103 |
|
|
echo "Smanager restart in spec file" |
104 |
|
|
/sbin/e-smith/signal-event smanager-refresh; |
105 |
|
|
fi |
106 |
|
|
|
107 |
michel |
1.1 |
%postun |
108 |
|
|
|
109 |
|
|
%files -f %{name}-%{version}-filelist |
110 |
|
|
%defattr(-,root,root) |
111 |
|
|
|
112 |
jpp |
1.4 |
|
113 |
|
|
|
114 |
|
|
%changelog |
115 |
brianr |
1.21 |
* Sat Mar 02 2024 Brian Read <brianr@koozali.org> 1.3.1-20.sme |
116 |
|
|
- Edit SM2 Menu entry to conform to new arrangements [SME: 12493] |
117 |
|
|
|
118 |
michel |
1.20 |
* Wed Feb 15 2023 Michel Begue <mab974@misouk.com> 1.3.1-19.sme |
119 |
|
|
- fix module not loaded after update [SME: 10793] |
120 |
|
|
|
121 |
michel |
1.19 |
* Wed Jan 11 2023 Michel Begue <mab974@misouk.com> 1.3.1-18.sme |
122 |
|
|
- add a message if module xt_geoip is missing or not loaded [SME: 12291] |
123 |
|
|
- add a message if chain XTGeoIP is missing (iptables) [SME: 12291] |
124 |
|
|
|
125 |
jpp |
1.18 |
* Fri Nov 11 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.3.1-17.sme |
126 |
|
|
- apply locale 2022-11-11 patch |
127 |
|
|
|
128 |
michel |
1.17 |
* Wed Jul 13 2022 Michel Begue <mab974@misouk.com> 1.3.1-16.sme |
129 |
|
|
- add fail2ban stats [SME: 12098] |
130 |
|
|
|
131 |
michel |
1.16 |
* Mon Jul 11 2022 Michel Begue <mab974@misouk.com> 1.3.1-15.sme |
132 |
|
|
- fix logs date test [SME: 12097] |
133 |
|
|
|
134 |
michel |
1.15 |
* Thu Jul 07 2022 Michel Begue <mab974@misouk.com> 1.3.1-14.sme |
135 |
|
|
- add xt_geoip to backup list [SME: 12029] |
136 |
|
|
- archive and clean up Ip & Country bases [SME: 10863] |
137 |
|
|
|
138 |
michel |
1.14 |
* Wed Mar 09 2022 Michel Begue <mab974@misouk.com> 1.3.1-13.sme |
139 |
|
|
- fix Other and Reverse parameters for SM2 [SME: 11887] |
140 |
|
|
|
141 |
brianr |
1.12 |
* Fri Jan 07 2022 Brian Read <brianr@bjsystems.co.uk> 1.3.1-12.sme |
142 |
|
|
- Add-class-to-div-for-AdminLTE [SME: 11839] |
143 |
|
|
|
144 |
michel |
1.11 |
* Fri Oct 29 2021 Michel Begue <mab974@misouk.com> 1.3.1-11.sme |
145 |
|
|
- fix multiple_rpm_owners [SME: 11676] |
146 |
|
|
- add event for smeserver-manager |
147 |
|
|
- delete expand-template for update_base |
148 |
|
|
|
149 |
michel |
1.10 |
* Thu Oct 28 2021 Michel Begue <mab974@gmail.com> 1.3.1-10.sme |
150 |
|
|
- apply locale 2021-10-28 patch |
151 |
|
|
|
152 |
terryfage |
1.9 |
* Fri Sep 24 2021 Terry Fage <tfage@yahoo.com.au> 1.3.1-09.sme |
153 |
|
|
- apply locale 2021-09-23 patch |
154 |
|
|
|
155 |
terryfage |
1.8 |
* Wed Aug 25 2021 Terry Fage <tfage@yahoo.com.au> 1.3.1-08.sme |
156 |
|
|
- apply locale 2021-08-25 patch |
157 |
|
|
|
158 |
michel |
1.7 |
* Tue Mar 16 2021 Michel Begue <mab974@gmail.com> 1.3.1-07.sme |
159 |
|
|
- Fix script as logfiles change (sshd - iptables) |
160 |
|
|
|
161 |
jpp |
1.6 |
* Sun Mar 14 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.3.1-06.sme |
162 |
|
|
- change Geoip requirement to >= 1.5 |
163 |
|
|
|
164 |
|
|
* Sat Mar 13 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.3.1-05.sme |
165 |
jpp |
1.4 |
- readded changelog from contribs9 |
166 |
|
|
- moved changelog to the end of spec |
167 |
|
|
- TODO review the two section of %files |
168 |
|
|
- added link to wrapper for e-smith-manager |
169 |
|
|
|
170 |
|
|
* Wed Jan 06 2021 Michel Begue <mab974@gmail.com> 1.3.1-03.sme |
171 |
|
|
- Back to compatibility with e-smith-manager |
172 |
|
|
- (s)qpsmtpd replace (s)smtpd (services) |
173 |
|
|
- remove 'update_base' script template |
174 |
|
|
|
175 |
|
|
* Fri Jul 31 2020 Michel Begue <mab974@gmail.com> 1.3.1-01.sme |
176 |
|
|
- initial release for smeserver-manager (sme10) |
177 |
|
|
- [1.0.1-26 sme9] |
178 |
|
|
- xtables-addons v2.14 |
179 |
|
|
|
180 |
|
|
* Mon Feb 24 2020 Michel Begue <mab974@gmail.com> 1.0.1-26.sme |
181 |
|
|
- add localhost to whitelist [SME: 10881] |
182 |
|
|
|
183 |
|
|
* Tue Jan 21 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-25.sme |
184 |
|
|
- add requirement for mmdb provided by rpm to allow accounting [SME: 10860] |
185 |
|
|
|
186 |
|
|
* Sat Jan 18 2020 Michel Begue <mab974@gmail.com> 1.0.1-24.sme |
187 |
|
|
- new download script adapted to SME (from xtables-addons) [SME: 10860] |
188 |
|
|
- change geoiplookup to mmdblookup |
189 |
|
|
|
190 |
|
|
* Sat Jan 11 2020 Michel Begue <mab974@gmail.com> 1.0.1-23.sme |
191 |
|
|
- add license_key in config db and test in panel [SME: 10860] |
192 |
|
|
|
193 |
|
|
* Sat Dec 07 2019 SME Translation Server <translations@contribs.org> 1.0.1-21.sme |
194 |
|
|
- apply locale 2019-12-07 patch |
195 |
|
|
|
196 |
|
|
* Wed Oct 16 2019 Michel Begue <mab974@gmail.com> 1.0.1-20.sme |
197 |
|
|
- panel to add services [SME: 10792] |
198 |
|
|
- french translation |
199 |
|
|
|
200 |
|
|
* Mon Sep 30 2019 Michel Begue <mab974@gmail.com> 1.0.1-19.sme |
201 |
|
|
- add country code list [SME: 10791] |
202 |
|
|
- fix stats SSH errors [SME: 10807] |
203 |
|
|
- improved panel [SME: 10788] |
204 |
|
|
|
205 |
|
|
* Sat Sep 21 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-18.sme |
206 |
|
|
- add more service [SME: 10789] |
207 |
|
|
- no email from log analysis by default [SME: 10797] |
208 |
|
|
|
209 |
|
|
* Sun Jul 28 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-17.sme |
210 |
|
|
- fix empty global filter disable all geoip iptables rules [SME: 10794] |
211 |
|
|
- tidy masq templates for xt geoip [SME: 10794] |
212 |
|
|
|
213 |
|
|
* Wed Jul 24 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-16.sme |
214 |
|
|
- add missing file to patch [SME: 10760] |
215 |
|
|
- workaround link issue in source [SME: 10790] |
216 |
|
|
|
217 |
|
|
* Tue Jul 23 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-15.sme |
218 |
|
|
- improved per service filtering [SME: 10760] |
219 |
|
|
- remove A1 forced as default and allow empty filter [SME: 10785] |
220 |
|
|
|
221 |
|
|
* Sun Jul 21 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-13.sme |
222 |
|
|
- fix network lock out on adjust [SME: 10760] |
223 |
|
|
this arised on initial install with a simple masq adjust |
224 |
|
|
or if XT_geoip is disbaled on any masq restart or adjust |
225 |
|
|
|
226 |
|
|
* Wed Apr 24 2019 Michel Begue <mab974@gmail.com> 1.0.1-12.sme |
227 |
|
|
- add per service management of GeoIP bans [SME: 10760] |
228 |
|
|
- move panel to Security [SME: 10773] |
229 |
|
|
|
230 |
|
|
* Wed Apr 17 2019 Michel Begue <mab974@gmail.com> 1.0.1-9.sme |
231 |
|
|
- add stats access in the panel [SME: 10745] |
232 |
|
|
- add control of maximum number of countries [SME: 10749] |
233 |
|
|
|
234 |
|
|
* Wed Mar 06 2019 Michel Begue <mab974@gmail.com> 1.0.1-7.sme |
235 |
|
|
- add stats of geoip blocked countries [SME: 10745] |
236 |
|
|
- add stats of ssh attacks not geoip blocked [SME: 10744] |
237 |
|
|
- expand /etc/crontab on update |
238 |
|
|
|
239 |
|
|
* Mon Feb 18 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-6.sme |
240 |
|
|
- fix unable to load iptables rules [SME: 10739] |
241 |
|
|
fix warning localtime |
242 |
|
|
fix warning "enabled" isn't numeric in numeric eq (==) |
243 |
|
|
|
244 |
|
|
* Wed Feb 06 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-5.sme |
245 |
|
|
- first import to SME buildsys |
246 |
|
|
|
247 |
|
|
* Sun Oct 29 2017 Michel Begue <mab974@gmail.com> |
248 |
|
|
- bug in crontab update job, |
249 |
|
|
- [1.0.1-4] |
250 |
|
|
|
251 |
|
|
* Mon Oct 16 2017 Michel Begue <mab974@gmail.com> |
252 |
|
|
- new message : inactive GeoIP, |
253 |
|
|
- value of country code added in message "country not found", |
254 |
|
|
- [1.0.1-3] |
255 |
|
|
|
256 |
|
|
* Sat Oct 07 2017 Michel Begue <mab974@gmail.com> |
257 |
|
|
- test kernel module presence in "/lib/modules/weak-updates" directory |
258 |
|
|
- [1.0.1-2] |
259 |
|
|
|
260 |
|
|
* Wed Sep 20 2017 Michel Begue <mab974@gmail.com> |
261 |
|
|
- panel added in server manager |
262 |
|
|
- [1.0.1-1] |
263 |
|
|
|
264 |
|
|
* Tue Sep 12 2017 Michel Begue <mab974@gmail.com> |
265 |
|
|
- initial release |
266 |
|
|
- [1.0.0-1] |