updated 6 packages

libmodsecurity-3.0.4-1

nginx-1.16.1-5

pcre-8.44-1

pcre2-10.34-1

sysstat-12.2.1-1

xmlsec1-1.2.29-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12328 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libm/libmodsecurity/libmodsecurity-vl.spec

@@ -1,7 +1,7 @@
 
 Name:           libmodsecurity
-Version:        3.0.3
+Version:        3.0.4
-Release:        4%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:        A library that loads/interprets rules written in the ModSecurity SecRules
 Group:          Development/Libraries
 
@@ -94,6 +94,9 @@ applications that use %{name}.
 
 
 %changelog
+* Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.4-1
+- new upstream release.
+
 * Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.3-4
 - added sample configurations to %%doc.
 

n/nginx/nginx-vl.spec

@@ -35,7 +35,7 @@ Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロ
 Name:           nginx
 Version:        %{nginx_version}
 # do not reset or decrease.
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 
 Group:          System Environment/Daemons   
 # BSD License (two clause)
@@ -93,10 +93,8 @@ Source2030: https://github.com/leev/ngx_http_geoip2_module/archive/%{geoip2_vers
 
 %if %{with modsecurity}
 %global with_modsecurity 1
-%global modsecurity_version 1.0.0
+%global modsecurity_version 1.0.1
 Source2040: https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v%{modsecurity_version}/modsecurity-nginx-v%{modsecurity_version}.tar.gz
-Patch2040: modsecurity-nginx-master.patch
-Patch2041: modsecurity-fix-host_ip.patch
 %endif
 
 # removes -Werror in upstream build scripts.  -Werror conflicts with
@@ -328,8 +326,6 @@ popd
 
 %if %{with modsecurity}
 pushd modsecurity-nginx-v%{modsecurity_version}
-%patch2040 -p1
-%patch2041 -p1
 %endif
 
 %build
@@ -668,6 +664,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.1-5
+- updated modsecurity module to 1.0.1.
+- dropped Patch2040 and 2041: fixed in upstream.
+
 * Wed Nov 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.1-4
 - added Patch2041.
 

p/pcre/pcre-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 Name: pcre
-Version: 8.43
+Version: 8.44
 Release: 1%{?_dist_release}
 Summary: Perl-compatible regular expression library
 Summary(ja): Perl 互換の正規表現ライブラリ
@@ -10,7 +10,7 @@ Group: System Environment/Libraries
 License: BSD
 URL: http://www.pcre.org/
 
-Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
+Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2
 # Upstream thinks RPATH is good idea.
 Patch0: pcre-8.21-multilib.patch
 # Refused by upstream, bug #675477
@@ -137,8 +137,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%license COPYING
+%license COPYING LICENCE
-%doc AUTHORS ChangeLog LICENCE NEWS README
+%doc AUTHORS ChangeLog NEWS README
 %{_bindir}/pcregrep
 %{_libdir}/*.so.*
 %{_mandir}/man1/pcregrep.*
@@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.44-1
+- new upstream release.
+
 * Mon May 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.43-1
 - new upstream release.
 - imported Patch2 and 3 from rawhide.

p/pcre2/pcre2-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 Name: pcre2
-Version: 10.31
+Version: 10.34
 Release: 1%{?_dist_release}
 Summary: Perl-compatible regular expression library
 Summary(ja): Perl 互換の正規表現ライブラリ
@@ -10,7 +10,7 @@ Group: System Environment/Libraries
 License: BSD
 URL: http://www.pcre.org/
 
-Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
+Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2
 # Upstream thinks RPATH is good idea.
 Patch0: pcre2-10.31-multilib.patch
 
@@ -124,7 +124,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog LICENCE NEWS README
+%license COPYING LICENCE
+%doc AUTHORS ChangeLog NEWS README
 %{_bindir}/pcre2grep
 %{_libdir}/*.so.*
 %{_mandir}/man1/pcre2grep.*
@@ -153,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.34-1
+- new upstream release.
+
 * Sun May 20 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 10.31-1
 - new: pcre2 package
 - update multilib patch (Patch0)

s/sysstat/sysstat-vl.spec

@@ -1,7 +1,7 @@
 Summary:	Collection of performance monitoring tools for Linux
 Summary(ja):	Linux 用パフォーマンス計測ツール集
 Name:		sysstat
-Version:	12.1.7
+Version:	12.2.1
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/System
@@ -96,6 +96,9 @@ fi
 %{_localstatedir}/log/sa
 
 %changelog
+* Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 12.2.1-1
+- updated to 12.2.1.
+
 * Wed Oct 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 12.1.7-1
 - updated to 12.1.7.
 

x/xmlsec1/xmlsec1-vl.spec

@@ -1,11 +1,11 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
-Version: 1.2.27
+Version: 1.2.29
 Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
-URL: http://www.aleksey.com/xmlsec/
+URL: https://www.aleksey.com/xmlsec/
-Source: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz
+Source: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -177,7 +177,8 @@ rm -fr %{buildroot}
 
 %files 
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog NEWS README Copyright
+%license Copyright
+%doc AUTHORS ChangeLog NEWS README
 %doc %{_mandir}/man1/xmlsec1.1*
 %{_libdir}/libxmlsec1.so.*
 %{_bindir}/xmlsec1
@@ -185,13 +186,17 @@ rm -fr %{buildroot}
 %files devel
 %defattr(-, root, root)  
 %{_bindir}/xmlsec1-config
-%{_includedir}/xmlsec1/xmlsec/*.h
+%{_includedir}/xmlsec1
-%{_includedir}/xmlsec1/xmlsec/private/*.h
+%exclude %{_includedir}/xmlsec1/xmlsec/gcrypt
+%exclude %{_includedir}/xmlsec1/xmlsec/gnutls
+%exclude %{_includedir}/xmlsec1/xmlsec/nss
+%exclude %{_includedir}/xmlsec1/xmlsec/openssl
 %{_libdir}/libxmlsec1.so
 %{_libdir}/pkgconfig/xmlsec1.pc
 %{_libdir}/xmlsec1Conf.sh
 %{_datadir}/aclocal/*.m4
-%doc AUTHORS HACKING ChangeLog NEWS README Copyright
+%license Copyright
+%doc AUTHORS HACKING ChangeLog NEWS README
 %doc docs-to-install/*
 %doc %{_mandir}/man1/xmlsec1-config.1*
 
@@ -202,7 +207,7 @@ rm -fr %{buildroot}
 
 %files openssl-devel
 %defattr(-, root, root)  
-%{_includedir}/xmlsec1/xmlsec/openssl/*.h
+%{_includedir}/xmlsec1/xmlsec/openssl
 %{_libdir}/pkgconfig/xmlsec1-openssl.pc
 
 %files gcrypt
@@ -212,7 +217,7 @@ rm -fr %{buildroot}
 
 %files gcrypt-devel
 %defattr(-, root, root, -)
-%{_includedir}/xmlsec1/xmlsec/gcrypt/
+%{_includedir}/xmlsec1/xmlsec/gcrypt
 %{_libdir}/pkgconfig/xmlsec1-gcrypt.pc
 
 %files gnutls
@@ -222,7 +227,7 @@ rm -fr %{buildroot}
 
 %files gnutls-devel
 %defattr(-, root, root)  
-%{_includedir}/xmlsec1/xmlsec/gnutls/*.h
+%{_includedir}/xmlsec1/xmlsec/gnutls
 %{_libdir}/pkgconfig/xmlsec1-gnutls.pc
 
 %files nss
@@ -232,10 +237,13 @@ rm -fr %{buildroot}
 
 %files nss-devel
 %defattr(-, root, root)  
-%{_includedir}/xmlsec1/xmlsec/nss/*.h
+%{_includedir}/xmlsec1/xmlsec/nss
 %{_libdir}/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.29-1
+- new upstream release.
+
 * Wed Dec 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.27-1
 - new upstream release.