updated 3 packages

libmodsecurity-3.0.5-1

nginx-1.20.1-12

suricata-6.0.3-1

lib/libm/libmodsecurity/libmodsecurity-vl.spec

@@ -1,17 +1,15 @@
 
 Summary:        A library that loads/interprets rules written in the ModSecurity SecRules
 Name:           libmodsecurity
-Version:        3.0.4
-Release:        2%{?_dist_release}
+Version:        3.0.5
+Release:        1%{?_dist_release}
 Group:          security
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        ASL 2.0
 URL:            https://www.modsecurity.org/
-
 Source0:        https://github.com/SpiderLabs/ModSecurity/releases/download/v%{version}/modsecurity-v%{version}.tar.gz
-Patch1000:      CVE-2020-15598.patch
 
 BuildRequires: gcc-c++
 BuildRequires: make
@@ -75,10 +73,6 @@ applications that use %{name}.
 %make_install
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files
 %license LICENSE
 %doc README.md AUTHORS
@@ -99,6 +93,11 @@ applications that use %{name}.
 
 
 %changelog
+* Sun Jul 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.5-1
+- new upstream release.
+- dropped Patch1000: fixed in upstream.
+- dropped ldconfig scriptlets.
+
 * Wed Oct 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.4-2
 - imported Patch1000 to fix CVE-2020-15598.
 

n/nginx/nginx-vl.spec

@@ -33,7 +33,7 @@ Group:          servers
 %global nginx_version 1.20.1
 Version:        %{nginx_version}
 # do not reset or decrease.
-Release:        11%{?_dist_release}%{?with_systemd:.systemd}
+Release:        12%{?_dist_release}%{?with_systemd:.systemd}
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       daisuke
@@ -94,9 +94,8 @@ Source2030:     https://github.com/leev/ngx_http_geoip2_module/archive/%{geoip2_
 
 %if %{with modsecurity}
 %global         with_modsecurity 1
-%global         modsecurity_version 1.0.1
+%global         modsecurity_version 1.0.2
 Source2040:     https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v%{modsecurity_version}/modsecurity-nginx-v%{modsecurity_version}.tar.gz
-Patch2040:      modsecurity-nginx-1.0.1-20210217.patch
 %endif
 
 # removes -Werror in upstream build scripts.  -Werror conflicts with
@@ -350,7 +349,6 @@ popd
 
 %if %{with modsecurity}
 pushd modsecurity-nginx-v%{modsecurity_version}
-%patch2040 -p1
 %endif
 
 
@@ -795,6 +793,10 @@ fi
 
 
 %changelog
+* Sun Jul 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.1-12
+- updated ModSecurity-nginx to 1.0.2.
+- dropped Patch2040.
+
 * Fri May 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.1-11
 - updated to 1.20.1.
 

s/suricata/suricata-vl.spec

@@ -3,7 +3,7 @@
 
 Summary:        Intrusion Detection System
 Name:           suricata
-Version:        6.0.2
+Version:        6.0.3
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          network,security
 Vendor:         Project Vine
@@ -18,8 +18,8 @@ Source3:        suricata-tmpfiles.conf
 
 Source1000:     suricata.init
 Source1001:     suricata.logrotate
-Source1002:     pre_start
-Source1003:     post_stop
+Source1002:     post_start
+Source1003:     pre_stop
 
 # Irrelevant docs are getting installed, drop them
 Patch1: suricata-2.0.9-docs.patch
@@ -121,16 +121,20 @@ for f in rules/*.rules; do
 done
 install -m 600 *.config %{buildroot}%{_sysconfdir}/%{name}
 install -m 600 suricata.yaml %{buildroot}%{_sysconfdir}/%{name}/
-install -m 755 %{SOURCE1002} %{buildroot}%{_sysconfdir}/%{name}/
-install -m 755 %{SOURCE1003} %{buildroot}%{_sysconfdir}/%{name}/
+
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+install -m 755 %{SOURCE1002} %{buildroot}%{_libexecdir}/%{name}/
+install -m 755 %{SOURCE1003} %{buildroot}%{_libexecdir}/%{name}/
+
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/{start,stop}.d
 
 %if %{with systemd}
 mkdir -p %{buildroot}%{_unitdir}
 install -m 0644 etc/%{name}.service %{buildroot}%{_unitdir}/
 sed -i \
 	-e 's|/var/run/|/run/|' \
-	-e '/ExecStart=/i ExecStartPre=%{_sysconfdir}/%{name}/pre_start' \
-	-e '/ExecStart=/i ExecStopPost=%{_sysconfdir}/%{name}/post_stop' \
+	-e '/ExecStart=/a ExecStartPost=%{_libexecdir}/%{name}/post_start' \
+	-e '/ExecReload=/a ExecStop=%{_libexecdir}/%{name}/pre_stop' \
 	%{buildroot}%{_unitdir}/%{name}.service
 %else
 mkdir -p %{buildroot}%{_initdir}
@@ -218,8 +222,9 @@ fi
 %{python3_sitelib}/suricatasc/*
 %{python3_sitelib}/suricata/*
 %{python3_sitelib}/*egg-info
-%config(noreplace) %attr(0755,root,root) %{_sysconfdir}/%{name}/pre_start
-%config(noreplace) %attr(0755,root,root) %{_sysconfdir}/%{name}/post_stop
+%dir %{_libexecdir}/%{name}
+%attr(0755,root,root) %{_libexecdir}/%{name}/post_start
+%attr(0755,root,root) %{_libexecdir}/%{name}/pre_stop
 %config(noreplace) %attr(0640,suricata,suricata) %{_sysconfdir}/%{name}/suricata.yaml
 %config(noreplace) %attr(0640,suricata,suricata) %{_sysconfdir}/%{name}/*.config
 %ghost %config(noreplace) %attr(0640,suricata,suricata) %{_sysconfdir}/%{name}/rules/*.rules
@@ -228,6 +233,8 @@ fi
 %attr(750,suricata,suricata) %dir %{_var}/log/%{name}
 %attr(750,suricata,suricata) %dir %{_sysconfdir}/%{name}
 %attr(750,suricata,suricata) %dir %{_sysconfdir}/%{name}/rules
+%attr(750,suricata,suricata) %dir %{_sysconfdir}/%{name}/start.d
+%attr(750,suricata,suricata) %dir %{_sysconfdir}/%{name}/stop.d
 %attr(2770,suricata,suricata) %dir %{_var}/lib/%{name}
 %attr(2770,suricata,suricata) %dir /run/%{name}/
 %if %{with systemd}
@@ -240,6 +247,9 @@ fi
 
 
 %changelog
+* Sun Jul 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0.3-1
+- new upstream release.
+
 * Thu Mar 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0.2-1
 - new upstream release.