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