Browse Source

updated 10 packages

dhcp-4.1.ESV.R16.P2-2

dovecot-2.3.21.1-1

groonga-normalizer-mysql-1.2.3-1

groonga-14.0.6-1

ipset-7.22-1

kernel-6.6.46-1

mariadb-10.11.9-1

moby-engine-27.1.2-1

stunnel-5.72-2

unbound-1.21.0-1
Tomohiro "Tomo-p" KATO 3 months ago
parent
commit
5112579096

+ 5 - 2
d/dhcp/dhcp-vl.spec

@@ -18,7 +18,7 @@ Name:     dhcp
 # --------------------------------------------------------------------------
 Epoch:    13
 Version:  %{pversion}
-Release:  1%{?_dist_release}%{?with_systemd:.systemd}
+Release:  2%{?_dist_release}%{?with_systemd:.systemd}
 Group:    daemons
 Vendor:   Project Vine
 Distribution: Vine Linux
@@ -243,7 +243,7 @@ autoreconf -ivf
 
 
 %build
-CFLAGS="%{optflags} -fPIC -fno-strict-aliasing -fcommon" \
+CFLAGS="%{optflags} -fPIC -fno-strict-aliasing -Wno-int-conversion -fcommon" \
 %configure \
     --enable-dhcpv6 \
     --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \
@@ -496,6 +496,9 @@ fi
 
 
 %changelog
+* Thu Aug 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R16.P2-2
+- fixed systemd unit.
+
 * Fri Oct 14 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R16.P2-1
 - new upstream release.
 

+ 6 - 3
d/dovecot/dovecot-vl.spec

@@ -7,15 +7,15 @@
 
 # pigeonhole
 %define build_pigeonhole 1
-%define pigeonholever 0.5.21
+%define pigeonholever 0.5.21.1
 
 %global restart_flag /run/%{name}/%{name}-restart-after-rpm-install
 
 Summary: Dovecot Secure imap server
 Summary(ja): Dovecot セキュア IMAP サーバ
 Name: dovecot
-Version: 2.3.21
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Version: 2.3.21.1
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: servers
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -527,6 +527,9 @@ fi
 
 
 %changelog
+* Wed Aug 14 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.31.1-1
+- new upstream release.
+
 * Sun Aug 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.21-2
 - fixed assert-crash after "Process .. is ignoring idle SIGINT" error.
 

+ 8 - 5
g/groonga-normalizer-mysql/groonga-normalizer-mysql-vl.spec

@@ -2,18 +2,18 @@
 
 Name:		groonga-normalizer-mysql
 Summary:	MySQL compatible normalizer plugin for groonga
-Version:	1.1.9
+Version:	1.2.3
 Release:	1%{?_dist_release}
 Group:		office
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
 License:	LGPLv2
-URL:		http://groonga.org/
-Source0:	http://packages.groonga.org/source/%{name}/%{name}-%{version}.tar.gz
+URL:		https://groonga.org/
+Source0:	https://packages.groonga.org/source/%{name}/%{name}-%{version}.tar.gz
 
-BuildRequires:	groonga-devel >= 11.0.0
-Requires:	groonga-libs >= 11.0.0
+BuildRequires:	groonga-devel
+Requires:	groonga-libs >= 14.0.0
 ExclusiveArch:	%{ix86} x86_64
 
 %description
@@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/groonga/plugins/*/*.la
 
 
 %changelog
+* Fri Aug 16 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.3-1
+- new upstream release.
+
 * Wed Nov 09 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.9-1
 - new upstream release.
 

+ 29 - 81
g/groonga/groonga-vl.spec

@@ -4,7 +4,7 @@
 
 Name:		groonga
 Summary:	An Embeddable Fulltext Search Engine
-Version:	12.0.9
+Version:	14.0.6
 Release:	1%{?_dist_release}%{?with_systemd:.systemd}
 Group:		office
 Vendor:		Project Vine
@@ -12,15 +12,16 @@ Distribution:	Vine Linux
 Packager:	tomop, iwaim
 
 License:	LGPLv2
-URL:		http://groonga.org/
-Source0:	http://packages.groonga.org/source/groonga/groonga-%{version}.tar.gz
-Source1:	groonga-httpd.init
+URL:		https://groonga.org/
+Source0:	https://packages.groonga.org/source/groonga/groonga-%{version}.tar.gz
 Source2:	groonga-server-gqtp.init
 Source3:	groonga-server-http.init
 
+Patch0:		rapidjson-gcc14.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:	mecab-devel
-BuildRequires:	zlib-devel
+BuildRequires:	pkgconfig(zlib)
 BuildRequires:	lz4-devel
 BuildRequires:	libzstd-devel
 Requires:	%{name}-libs = %{version}-%{release}
@@ -62,10 +63,14 @@ Group:		servers
 License:	LGPLv2
 Requires:	%{name}-server-common = %{version}-%{release}
 Requires(pre):	shadow-utils
+%if %{with systemd}
+%{?systemd_requires}
+%else
 Requires(post):	/sbin/chkconfig
 Requires(preun):	/sbin/chkconfig
 Requires(preun):	/sbin/service
 Requires(postun):	/sbin/service
+%endif
 Obsoletes:	%{name} < 1.2.2-0
 Obsoletes:	%{name}-server < 2.0.7-0
 
@@ -80,31 +85,22 @@ License:	LGPLv2
 Requires:	%{name}-server-common = %{version}-%{release}
 Requires:	curl
 Requires(pre):	shadow-utils
+%if %{with systemd}
+%{?systemd_requires}
+%else
 Requires(post):	/sbin/chkconfig
 Requires(preun):	/sbin/chkconfig
 Requires(preun):	/sbin/service
 Requires(postun):	/sbin/service
+%endif
 Obsoletes:	%{name} < 1.2.2-0
 Obsoletes:	%{name}-server < 2.0.7-0
+Obsoletes:	%{name}-httpd < 14.0.0
 
 %description	server-http
 This is a transitional package to groonga-httpd.
 
 
-%package	httpd
-Summary:	Groonga HTTP server
-Group:		servers
-License:	LGPLv2 and BSD
-Requires:	%{name}-server-common = %{version}-%{release}
-Provides:	%{name}-server-http = %{version}-%{release}
-Obsoletes:	%{name}-server-http <= 4.0.7-2
-
-%description	httpd
-This package contains the groonga HTTP server. It is experimental
-but has many features. Because it is based on nginx HTTP server.
-It will obsolete groonga-server-http when it is stable.
-
-
 %package	doc
 Summary:	Documentation for groonga
 Group:		documentation
@@ -159,15 +155,18 @@ Munin plugins for Groonga
 
 %prep
 %setup -q
+pushd vendor/rapidjson-1.1.0/
+%patch0 -p1
+popd
 
 
 %build
 %configure \
   --disable-static \
 %if %{with systemd}
-  --with-package-platform=centos8 \
+  --with-package-platform=rhel \
 %else
-  --with-package-platform=centos6 \
+  --with-package-platform=no \
 %endif
   --with-zlib \
   --with-lz4 \
@@ -225,13 +224,10 @@ cat <<EOC > $RPM_BUILD_ROOT%{_sysconfdir}/munin/plugin-conf.d/groonga
 EOC
 
 %if %{with systemd}
-mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_tmpfilesdir}
 mv -f %{buildroot}%{_sysconfdir}/tmpfiles.d/* %{buildroot}%{_tmpfilesdir}/
-mv -f %{buildroot}/usr%{_unitdir}/* %{buildroot}%{_unitdir}/
 %else
 mkdir -p %{buildroot}%{_initdir}
-install -m755 %{SOURCE1} %{buildroot}%{_initdir}/groonga-httpd
 install -m755 %{SOURCE2} %{buildroot}%{_initdir}/groonga-server-gqtp
 install -m755 %{SOURCE3} %{buildroot}%{_initdir}/groonga-server-http
 # this file is needed by systemd only
@@ -272,20 +268,6 @@ exit 0
 /sbin/chkconfig --add groonga-server-http
 %endif
 
-%post httpd
-if [ $1 = 1 ] ; then
-	mkdir -p %{_localstatedir}/log/groonga/httpd
-	chown -R groonga:groonga %{_localstatedir}/log/groonga/httpd
-%if %{with systemd}
-	%systemd_post groonga-httpd.service
-elif [ $1 = 2 ] ; then
-	/usr/sbin/groonga-httpd-restart > /dev/null 2>&1 || :
-%else
-elif [ $1 = 2 ] ; then
-	/sbin/service groonga-httpd restart >/dev/null 2>&1 || :
-%endif
-fi
-
 %post munin-plugins
 %{_sbindir}/munin-node-configure --shell --remove-also | grep -e 'groonga_' | sh
 [ -f %{_localstatedir}/lock/subsys/munin-node ] && \
@@ -334,35 +316,13 @@ if [ $1 -ge 1 ] ; then
 fi
 %endif
 
-%preun httpd
-%if %{with systemd}
-%systemd_preun groonga-httpd.service
-%else
-if [ $1 = 0 -o -x /bin/systemctl ] ; then
-	%{_initdir}/groonga-httpd stop >/dev/null 2>&1 || :
-	/sbin/chkconfig --del groonga-server-gqtp
-fi
-%endif
-
-%postun httpd
-%if %{with systemd}
-%systemd_postun groonga-httpd.service
-%else
-if [ $1 -ge 1 ] ; then
-	%{_initdir}/groonga-httpd condrestart >/dev/null 2>&1 || :
-fi
-%endif
-
 %postun munin-plugins
 %if %{with systemd} 
+		/bin/systemctl try-restart munin-node.service
 %else
 if [ $1 -eq 0 ]; then
 	[ -f %{_localstatedir}/lock/subsys/munin-node ] && \
-%if %{with systemd}
-		/bin/systemctl restart munin-node.service
-%else
 		/sbin/service munin-node restart > /dev/null 2>&1
-%endif
 	:
 fi
 %endif
@@ -394,12 +354,12 @@ chown -R groonga:groonga %{_localstatedir}/run/groonga
 %files server-gqtp
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/groonga/
-%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-gqtp
-%config(noreplace) %{_sysconfdir}/logrotate.d/groonga-server-gqtp
 %ghost %dir %{_localstatedir}/run/%{name}
 %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
 %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
 %if %{with systemd} 
+%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-gqtp
+%config(noreplace) %{_sysconfdir}/logrotate.d/groonga-server-gqtp
 %{_unitdir}/groonga-server-gqtp.service
 %else
 %{_initdir}/groonga-server-gqtp
@@ -408,33 +368,17 @@ chown -R groonga:groonga %{_localstatedir}/run/groonga
 %files server-http
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/groonga/
-%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-http
-%config(noreplace) %{_sysconfdir}/logrotate.d/groonga-server-http
 %ghost %dir %{_localstatedir}/run/%{name}
 %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
 %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
 %if %{with systemd}
+%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-http
+%config(noreplace) %{_sysconfdir}/logrotate.d/groonga-server-http
 %{_unitdir}/groonga-server-http.service
 %else
 %{_initdir}/groonga-server-http
 %endif
 
-%files httpd
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/groonga/httpd/*
-%config(noreplace) %{_sysconfdir}/sysconfig/groonga-httpd
-%config(noreplace) %{_sysconfdir}/logrotate.d/groonga-httpd
-%{_sbindir}/groonga-httpd
-%{_sbindir}/groonga-httpd-restart
-%ghost %dir %{_localstatedir}/run/%{name}
-%attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
-%attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
-%if %{with systemd}
-%{_unitdir}/groonga-httpd.service
-%else
-%{_initdir}/groonga-httpd
-%endif
-
 %files doc
 %defattr(-,root,root,-)
 %license COPYING
@@ -462,7 +406,11 @@ chown -R groonga:groonga %{_localstatedir}/run/groonga
 %{_datadir}/munin/plugins/*
 %config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/*
 
+
 %changelog
+* Thu Aug 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.0.6-1
+- new upstream release.
+
 * Wed Nov 09 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 12.0.9-1
 - new upstream release.
 

+ 28 - 17
i/ipset/ipset-vl.spec

@@ -2,25 +2,33 @@
 
 Name:           ipset
 Summary:        Manage Linux IP sets
-Version:        7.6
+Version:        7.22
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
-Group:          Applications/System
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPLv2
-URL:            http://ipset.netfilter.org/
-Source0:        http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
+URL:            https://ipset.netfilter.org/
+Source0:        https://ipset.netfilter.org/%{name}-%{version}.tar.bz2
 Source1:        %{name}.service
 Source2:        %{name}.start-stop
-Source3:        %{name}.init
+Source3:        %{name}-config
+Source100:      %{name}.init
+
+Patch001: 0001-Replace-BUG_ON-with-WARN_ON_ONCE-according-to-usage-.patch
+Patch002: 0002-lib-data-Fix-for-global-buffer-overflow-warning-by-A.patch
+Patch003: 0003-lib-ipset-Avoid-argv-array-overstepping.patch
+Patch004: 0004-tests-Reduce-testsuite-run-time.patch
 
 BuildRequires:  libmnl-devel
 
 # An explicit requirement is needed here, to avoid cases where a user would
 # explicitly update only one of the two (e.g 'yum update ipset')
 Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
-%if !%{with systemd}
+%if %{with systemd}
+%{?systemd_requires}
+%else
 Requires(post): chkconfig
 Requires(preun): chkconfig /sbin/service
 %endif
@@ -44,7 +52,7 @@ then ipset may be the proper tool for you.
 
 %package libs
 Summary:       Shared library providing the IP sets functionality
-Group:         System Environment/Libraries
+Group:         system
 
 %description libs
 This package contains the libraries which provide the IP sets funcionality.
@@ -52,7 +60,7 @@ This package contains the libraries which provide the IP sets funcionality.
 
 %package devel
 Summary:       Development files for %{name}
-Group:         Development/Libraries
+Group:         programming
 Requires:      %{name}-libs%{?_isa} == %{version}-%{release}
 Requires:      kernel-devel
 
@@ -76,11 +84,14 @@ BuildArch:        noarch
 This package provides the service %{name} that is split
 out of the base package since it is not active by default.
 
-
 %endif
 
+
+%debug_package
+
+
 %prep
-%setup -q
+%autosetup -p1
 
 
 %build
@@ -111,7 +122,7 @@ install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
 install -c -m 755 %{SOURCE2} %{buildroot}%{_libexecdir}/%{name}
 %else
 mkdir -p %{buildroot}%{_initdir}
-install -m755 %{SOURCE3} %{buildroot}%{_initdir}/%{name}
+install -m755 %{SOURCE100} %{buildroot}%{_initdir}/%{name}
 %endif
 
 # Create directory for configuration
@@ -135,11 +146,6 @@ if [[ $1 -eq 0 && -n $(lsmod | grep "^xt_set ") ]]; then
 fi
 
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
 %if %{with systemd}
 %post service
 %systemd_post %{name}.service
@@ -155,11 +161,13 @@ fi
 %systemd_postun_with_restart %{name}.service
 %endif
 
+
 %files
 %license COPYING
 %doc ChangeLog
-%doc %{_mandir}/man8/%{name}.8.gz
+%{_mandir}/man8/%{name}*.8.*
 %{_sbindir}/%{name}
+%{_sbindir}/%{name}-translate
 %if !%{with systemd}
 %{_initdir}/%{name}
 %dir %{_sysconfdir}/%{name}
@@ -185,6 +193,9 @@ fi
 
 
 %changelog
+* Wed Aug 14 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.22-1
+- new upstream release.
+
 * Sat Apr 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.6-1
 - new upstream release.
 

+ 4 - 1
k/kernel/kernel-vl.spec

@@ -44,7 +44,7 @@
 #
 %define majorver 6
 %define sublevel 6
-%define patchlevel 44
+%define patchlevel 46
 %define kversion %{majorver}.%{sublevel}
 %define rpmversion %{majorver}.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -1192,6 +1192,9 @@ fi
 
 
 %changelog
+* Thu Aug 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.6.46-1
+- updated to 6.6.46.
+
 * Sat Aug 03 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.6.44-1
 - updated to 6.6.44.
 

+ 54 - 31
m/mariadb/mariadb-vl.spec

@@ -24,10 +24,11 @@
 
 %define _unpackaged_files_terminate_build 1
 
-%define mariadb_version		10.11.8
+%define mariadb_version		10.11.9
 %define mariadb_base_version	10.11
 %define mroonga_version		14.04
-%define groonga_version		14.0.4
+%define groonga_version		14.0.6
+%define groonga_normalize_mysql_version		1.2.3
 %define client_version		18
 
 %define galera_api_version	26.4
@@ -59,13 +60,11 @@ Source20:	mysql-log-rotate.sh
 Source998:	perl-requires.sh
 Source1000:	macros.mariadb.in
 Source1001:	mysql.init
-Source2000:	groonga-gcc14.patch
+Source2000:	https://github.com/mroonga/mroonga/archive/refs/tags/v%{mroonga_version}.tar.gz#/mroonga-%{mroonga_version}.tar.gz
 
 Patch0:		mariadb-scripts.patch
 Patch1:		mariadb-ownsetup.patch
-
-# replace mroonga to the newest version.
-Patch1000:	0001-MariaDB-%{mariadb_version}-Mroonga-v%{mroonga_version}-Groonga-v%{groonga_version}.patch
+Patch2000:	mroonga-mariadb-10.11.9.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	bison, cmake, gcc-c++, groff, git
@@ -79,6 +78,8 @@ BuildRequires:	pcre2-devel
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:	libzstd-devel
 BuildRequires:	lz4-devel
+BuildRequires:	groonga-devel
+BuildRequires:	groonga-normalizer-mysql-devel
 Requires:	fileutils sh-utils
 Provides:	msqlormysql MySQL mysql
 Obsoletes:	mysql MySQL5
@@ -138,10 +139,13 @@ This package contains a systemd drop-in file to run MariaDB with jemalloc.
 %package mroonga
 ##Version: %{mroonga_version}
 Summary:	A fast fulltext searchable storage engine for MariaDB.
-Version:	%{mariadb_version}
+Version:	%{mariadb_version}_%{mroonga_version}
 Group:		servers
 Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
 Requires:	mariadb-server = %{mariadb_version}-%{release}
+Requires:	groonga-libs >= %{groonga_version}
+Requires:	groonga-tokenizer-mecab >= %{groonga_version}
+Requires:	groonga-normalizer-mysql >= %{groonga_normalize_mysql_version}
 Obsoletes:	MySQL-mroonga < 4.02
 Obsoletes:	mariadb-mroonga < 4.07
 Obsoletes:	mariadb-mroonga-doc < 4.07
@@ -277,7 +281,10 @@ into a client application instead of running as a separate process.
 %patch0 -p1
 %endif
 %patch1 -p1
-git --git-dir= apply -p1 %{PATCH1000}
+tar xvf %{SOURCE2000}
+pushd mroonga-%{mroonga_version}
+%patch2000 -p1
+popd
 
 cp -f \
 	%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE14} \
@@ -294,12 +301,6 @@ set -eu
 # Optional package files
 touch optional-files-devel
 
-export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS}}
-
-# for groonga >= 13.1.1
-sed -i -e 's/CMAKE_CXX_STANDARD 11/CMAKE_CXX_STANDARD 17/' CMakeLists.txt
-
 # Build full release
 # workaround: force TOKUDB_OK=1
 # https://jira.mariadb.org/browse/MDEV-14524?workflowName=MariaDB+v3&stepId=1
@@ -317,29 +318,37 @@ sed -i -e 's/CMAKE_CXX_STANDARD 11/CMAKE_CXX_STANDARD 17/' CMakeLists.txt
       -DDAEMON_NO_PREFIX="%{name}" \
       -DWITH_PIC="ON" \
       -DWITH_EMBEDDED_SERVER="ON" \
-      -DWITH_ZLIB="system" \
       -DWITH_LOCALES="yes" \
+      -DWITH_PCRE="system" \
       -DWITH_SSL="system" \
+      -DWITH_ZLIB="system" \
       -DWITH_UNIT_TESTS="no" \
       -DWITH_SEQUENCE_STORAGE_ENGINE="ON" \
       -DWITH_XTRADB_STORAGE_ENGINE="ON" \
+      -DWITHOUT_MROONGA_STORAGE_ENGINE="yes" \
       -DWITH_JEMALLOC="yes" \
-      -DGRN_WITH_MECAB="yes" \
 %if %{without onigmo}
       -DGRN_WITH_ONIGMO="no"
 %endif
-      -DWITH_PCRE="system" 
-
-%make_build -C %{_vpath_builddir} rapidjson-ep
-pushd %{_vpath_builddir}/storage/mroonga/groonga/rapidjson-ep-install/
-patch -p1 < %{SOURCE2000}
-popd
-
-ln -sf $(pwd)/%{_vpath_builddir}/storage/mroonga/vendor/groonga/include/groonga/version.h storage/mroonga/vendor/groonga/include/groonga/version.h
 
 echo BEGIN_NORMAL_CONFIG ; grep -E '^#define' %{_vpath_builddir}/include/config.h ; echo END_NORMAL_CONFIG
 %cmake_build
 
+pushd mroonga-%{mroonga_version}
+autoreconf -vif
+
+mariadb_source=`realpath -e ../`
+mariadb_build=`realpath -e ../%{_vpath_builddir}`
+
+%configure \
+    --disable-static \
+    --with-mysql-source=${mariadb_source} \
+    --with-mysql-build=${mariadb_build} \
+    --with-mysql-config=${mariadb_build}/scripts/mysql_config \
+    %{?mroonga_configure_options}
+%make_build
+popd
+
 
 %install
 rm -rf %{buildroot}
@@ -350,6 +359,22 @@ install -d %{buildroot}%{_infodir}
 # Install all binaries
 %cmake_install
 
+pushd mroonga-%{mroonga_version}
+%make_install
+
+rm %{buildroot}%{_libdir}/mysql/plugin/*.la
+rm %{buildroot}%{_libdir}/mysql/plugin/ha_mroonga.so
+rm %{buildroot}%{_libdir}/mysql/plugin/ha_mroonga.so.?
+mv %{buildroot}%{_libdir}/mysql/plugin/ha_mroonga.so.?.?.? \
+   %{buildroot}%{_libdir}/mysql/plugin/ha_mroonga.so
+mkdir -p %{buildroot}%{_datadir}/mysql
+rm -rf %{buildroot}%{_datadir}/mroonga/{deb,rpm}
+sed -i -e 's|/usr/share/mroonga/|/usr/share/mysql/mroonga/|' %{buildroot}%{_datadir}/mroonga/{install,uninstall}.sql
+mv %{buildroot}%{_datadir}/mroonga %{buildroot}%{_datadir}/mysql/mroonga
+popd
+rm -rf mroonga-doc
+mv %{buildroot}%{_datadir}/doc/mroonga/ mroonga-doc/
+
 %if %{with systemd}
 install -d %{buildroot}%{_libexecdir}
 pushd %{_vpath_builddir}
@@ -405,9 +430,6 @@ rm -rf ./doc
 mv -f %{buildroot}%{_docdir} ./
 rm doc/README-wsrep
 
-rm -rf ./groonga
-mv -f %{buildroot}%{_datadir}/groonga ./
-
 %if %{with source}
 mkdir -p %{buildroot}%{_datadir}/%{name}-source
 pushd %{buildroot}%{_datadir}/%{name}-source
@@ -593,9 +615,6 @@ Please run a command below:
 EOF
 fi
 
-# Clean up the BuildRoot
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 
 %files server
 %defattr(-,root,root)
@@ -743,7 +762,8 @@ fi
 %files mroonga
 %defattr(-, root, root)
 %{!?_licensedir:%global license %%doc}
-%license groonga/COPYING
+%license mroonga-%{mroonga_version}/COPYING
+%doc mroonga-doc/*
 %{_libdir}/mysql/plugin/ha_mroonga.so
 %{_datadir}/mysql/mroonga
 
@@ -883,6 +903,9 @@ fi
 
 
 %changelog
+* Fri Aug 16 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.11.9-1
+- new upstream release.
+
 * Wed Jun 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.11.8-1
 - new upstream release.
 - updated patch1000.

+ 5 - 1
m/moby-engine/moby-engine-vl.spec

@@ -20,7 +20,7 @@
 
 Name:           moby-engine
 Summary:        The open-source application container engine
-Version:        27.1.1
+Version:        27.1.2
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          virtualization
 Vendor:         Project Vine
@@ -283,7 +283,11 @@ fi
 
 
 %changelog
+* Wed Aug 14 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.1.2-1
+- new upstream release.
+
 * Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.1.1-1
+- new upstream release.
 
 * Tue Jul 23 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.1.0-1
 - new upstream release.

+ 7 - 1
s/stunnel/stunnel-vl.spec

@@ -4,7 +4,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
 Version: 5.72
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: internet
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -20,6 +20,7 @@ Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
 Source7: stunnel@.service
+Source10: stunnel-tmpfiles.conf
 Source100: stunnel.init
 
 Patch0: stunnel-5.50-authpriv.patch
@@ -104,6 +105,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} srpm-docs
 mkdir -p %{buildroot}%{_unitdir}
 cp %{buildroot}%{_datadir}/doc/stunnel/examples/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
 cp %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service
+install -Dpm644 %{SOURCE10} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %else
 install -d -m755 %{buildroot}%{_initdir}
 install -m755 %{SOURCE100} %{buildroot}%{_initdir}/stunnel
@@ -180,6 +182,7 @@ fi
 %exclude %{_sysconfdir}/stunnel/stunnel.pem
 %if %{with systemd}
 %{_unitdir}/%{name}*.service
+%{_tmpfilesdir}/%{name}.conf
 %else
 %{_initdir}/stunnel
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -190,6 +193,9 @@ fi
 
 
 %changelog
+* Thu Aug 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.72-2
+- added tmpfiles configuration.
+
 * Mon Jul 29 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.72-1
 - new upstream release.
 

+ 4 - 1
u/unbound/unbound-vl.spec

@@ -11,7 +11,7 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.20.0
+Version: 1.21.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: servers
 Distribution: Vine Linux
@@ -362,6 +362,9 @@ fi
 
 
 %changelog
+* Thu Aug 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.21.0-1
+- updated to 1.21.0.
+
 * Wed May 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.0-1
 - updated to 1.20.0.