updated 5 packages

mariadb-10.5.6-1

nsd-4.3.3-1

pcre2-10.35-1

rspamd-2.6-2

unbound-1.12.0-1

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

m/mariadb/mariadb-vl.spec

@@ -15,10 +15,10 @@
 
 %define _unpackaged_files_terminate_build 1
 
-%define mariadb_version		10.5.5
+%define mariadb_version		10.5.6
 %define mariadb_base_version	10.5
-%define mroonga_version		10.05
+%define mroonga_version		10.07
-%define groonga_version		10.0.5
+%define groonga_version		10.0.7
 %define client_version		18
 
 %define galera_api_version	26.4
@@ -52,8 +52,6 @@ Source1000:	macros.mariadb.in
 Patch0:		mariadb-scripts.patch
 # replace mroonga to the newest version.
 Patch1000: 0001-MariaDB-%{mariadb_version}-Mroonga-v%{mroonga_version}-Groonga-v%{groonga_version}.patch
-Patch1001: mariadb-10.5.5-fix-FTBFS.patch
-
 #
 #Patch2000:	mysql-srv_buf_size.patch
 
@@ -64,8 +62,10 @@ BuildRequires:	ncurses-devel, perl, openssl-devel, readline-devel
 BuildRequires:	jemalloc-devel
 BuildRequires:	pam-devel
 BuildRequires:	unixODBC-devel
-BuildRequires:	zlib-devel
 BuildRequires:	mecab-devel
+BuildRequires:	pcre2-devel
+BuildRequires:	zlib-devel
+BuildRequires:	libzstd-devel
 BuildRequires:	lz4-devel
 Requires:	fileutils sh-utils
 Provides:	msqlormysql MySQL mysql
@@ -226,7 +226,6 @@ AutoReqProv: no
 
 %description source
 This package contains the sources files of MariaDB.
-
 %endif
 
 
@@ -263,9 +262,6 @@ into a client application instead of running as a separate process.
 %patch0 -p1
 %endif
 git --git-dir= apply -p1 %{PATCH1000}
-pushd ./storage/mroonga/
-%patch1001 -p1
-popd
 
 cp -f \
 	%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE14} \
@@ -318,9 +314,9 @@ mkdir release
 %if %{without onigmo}
       -DGRN_WITH_ONIGMO="no"
 %endif
+      -DWITH_PCRE="system" 
 
 #      -DWITHOUT_TOKUDB="yes"
-#      -DWITH_PCRE="system" 
 
 ln -sf ../../../../../../release/storage/mroonga/vendor/groonga/include/groonga/version.h ../storage/mroonga/vendor/groonga/include/groonga/version.h
 
@@ -860,6 +856,10 @@ fi
 
 
 %changelog
+* Thu Oct 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.5.6-1
+- new upstream release.
+- replaced patch1000 to update Groonga to v10.0.7.
+- dropped Patch1001: fixed in upstream.
 
 * Wed Aug 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.5.5-1
 - new upstream release.

n/nsd/nsd-vl.spec

@@ -3,9 +3,9 @@
 Summary: Fast and lean authoritative DNS Name Server
 Summary(ja): 高速で最小限のAuthoritative専用DNSネームサーバ
 Name: nsd
-Version: 4.3.2
+Version: 4.3.3
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Daemons
+Group: servers
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -43,6 +43,9 @@ NSD は Authoritative DNSネームサーバの完全な実装です。
 NSD に関する詳しい情報は REQUIREMENTS ドキュメントを参照してください。
 
 
+%debug_package
+
+
 %prep
 %setup -q
 autoreconf
@@ -181,6 +184,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.3.3-1
+- new upstream release.
+
 * Wed Jul 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.3.2-1
 - new upstream release.
 

p/pcre2/pcre2-vl.spec

@@ -1,15 +1,17 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Name: pcre2
-Version: 10.34
-Release: 1%{?_dist_release}
 Summary: Perl-compatible regular expression library
 Summary(ja): Perl 互換の正規表現ライブラリ
+Name: pcre2
+Version: 10.35
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: inagaki
 
-Group: System Environment/Libraries
 License: BSD
-URL: http://www.pcre.org/
+URL: https://www.pcre.org/
-
 Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2
 # Upstream thinks RPATH is good idea.
 Patch0: pcre2-10.31-multilib.patch
@@ -21,11 +23,6 @@ BuildRequires: libedit-devel
 # New libtool to get rid of rpath
 BuildRequires: autoconf, automake, libtool
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
-Packager: inagaki
-
 %description
 Perl-compatible regular expression library.
 PCRE has its own native API, but a set of "wrapper" functions that are based on
@@ -34,10 +31,11 @@ just provides a POSIX calling interface to PCRE: the regular expressions
 themselves still follow Perl syntax and semantics. The header file
 for the POSIX-style functions is called pcreposix.h.
 
+
 %package devel
 Summary: Development files for %{name}
 Summary(ja): %{name} の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -47,7 +45,7 @@ Development files (Headers, libraries for static linking, etc) for %{name}.
 %package -n compat32-%{name}
 Summary: Perl-compatible regular expression library
 Summary(ja): Perl 互換の正規表現ライブラリ
-Group: System Environment/Libraries
+Group: system
 
 %description -n compat32-%{name}
 Perl-compatible regular expression library.
@@ -61,13 +59,16 @@ for the POSIX-style functions is called pcreposix.h.
 %package -n compat32-%{name}-devel
 Summary: Development files for %{name}
 Summary(ja): %{name} の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-devel
 Development files (Headers, libraries for static linking, etc) for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 # Get rid of rpath
@@ -81,6 +82,7 @@ for F in ChangeLog; do
     mv "${F}.utf8" "$F"
 done
 
+
 %build
 %configure \
     --enable-jit \
@@ -96,6 +98,7 @@ done
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -103,6 +106,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+
 %check
 %ifarch s390 s390x ppc
 # larger stack is needed on s390, ppc
@@ -110,15 +114,15 @@ ulimit -s 10240
 %endif
 make %{?_smp_mflags} check VERBOSE=yes
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %post -n compat32-%{name} -p /sbin/ldconfig
-
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 
@@ -154,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.35-1
+- new upstream release.
+
 * Sun Mar 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.34-1
 - new upstream release.
 

r/rspamd/rspamd-vl.spec

@@ -12,7 +12,7 @@
 Summary:        Rapid spam filtering system
 Name:           rspamd
 Version:        2.6
-Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -242,6 +242,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6-2
+- updated Patch0.
+
 * Fri Oct 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6-1
 - new upstream release.
 - added Patch0 to build with lua-5.4.

u/unbound/unbound-vl.spec

@@ -1,4 +1,4 @@
- %bcond_with systemd
+%bcond_with systemd
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %global with_munin 0
@@ -11,9 +11,9 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.11.0
+Version: 1.12.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Daemons
+Group: servers
 Distribution: Vine Linux
 Vendor: Project Vine
 Packager: iwaim, daisuke
@@ -44,13 +44,14 @@ BuildRequires: flex
 BuildRequires: libevent-devel
 BuildRequires: expat-devel
 %if %{with_python}
-BuildRequires:  python-devel python-rpm-macros swig
+BuildRequires:  python3-devel python3-rpm-macros swig
 %endif
 %if %{enable_gost}
 BuildRequires: openssl-devel >= 1.0.0
 %else
 BuildRequires: openssl-devel
 %endif
+BuildRequires: libnghttp2-devel
 # Required for SVN versions
 #BuildRequires: bison
 
@@ -79,11 +80,12 @@ Unbound is designed as a set of modular components, so that also
 DNSSEC (secure DNS) validation and stub-resolvers (that do not run
 as a server, but are linked into an application) are easily possible.
 
+
 %if %{with_munin}
 %package munin
 Summary: Plugin for the munin / munin-node monitoring package
 Summary(ja): munin/munin-node モニタリングパッケージ用のプラグイン
-Group:     System Environment/Daemons
+Group: servers
 Requires: munin-node
 Requires: %{name} = %{version}-%{release}, bc
 
@@ -91,17 +93,19 @@ Requires: %{name} = %{version}-%{release}, bc
 Plugin for the munin / munin-node monitoring package
 %endif
 
+
 %package devel
 Summary: Development package that includes the unbound header files
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-libs = %{version}-%{release}, openssl-devel
 
 %description devel
 The devel package contains the unbound library and the include files
 
+
 %package libs
 Summary: Libraries used by the unbound server and client applications
-Group: Applications/System
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: openssl >= 0.9.8g-12
@@ -109,19 +113,21 @@ Requires: openssl >= 0.9.8g-12
 %description libs
 Contains libraries used by the unbound server and client applications
 
+
 %if %{with_python}
 %package python
 Summary: Python modules and extensions for unbound
-Group: Applications/System
+Group: programming
 Requires: %{name}-libs = %{version}-%{release}
 
 %description python
 Python modules and extensions for unbound
 %endif
 
+
 %package -n compat32-%{name}-libs
 Summary: Libraries used by the unbound server and client applications
-Group: Applications/System
+Group: system
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -131,6 +137,9 @@ Requires: openssl >= 0.9.8g-12
 Contains libraries used by the unbound server and client applications
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -150,6 +159,7 @@ Contains libraries used by the unbound server and client applications
 %endif
             --enable-sha2 \
             --disable-sha1 \
+            --with-libnghttp2 \
             --with-rootkey-file=%{_sharedstatedir}/unbound/root.key
 
 %{__make} %{?_smp_mflags}
@@ -246,7 +256,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %if %{with_python}
 %files python
-%{python_sitelib}/*
+%{python3_sitelib}/*
 %endif
 
 %if %{with_munin}
@@ -360,7 +370,11 @@ fi
 
 
 %changelog
+* Thu Oct 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.0-1
+- updated to 1.12.1.
+
 * Mon Jul 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.11.0-1
+- updated to 1.11.1.
 
 * Tue May 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-1
 - updated to 1.10.1.