k/kernel/kernel-vl.spec

@@ -40,7 +40,7 @@
 # adding some text to the end of the version number.
 #
 %define sublevel 10
-%define patchlevel 115
+%define patchlevel 117
 %define kversion 5.%{sublevel}
 %define rpmversion 5.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -1194,6 +1194,9 @@ fi
 
 
 %changelog
+* Wed May 18 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.10.117-1
+- updated to 5.10.117.
+
 * Fri May 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.10.115-1
 - updated to 5.10.115.
 

l/logrotate/logrotate-vl.spec

@@ -1,8 +1,10 @@
+%bcond_with systemd
+
 Summary: Rotates, compresses, removes and mails system log files.
 Summary(ja): システムのログファイルを圧縮/削除するプログラム
 Name: logrotate
-Version: 3.19.0
-Release: 1%{?_dist_release}
+Version: 3.20.1
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -50,10 +52,8 @@ logrotate パッケージをインストールして下さい．
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -DSTATEFILE=\\\"/var/lib/logrotate/logrotate.status\\\""
-
 ./autogen.sh
-%configure
+%configure --with-state-file-path=/var/lib/logrotate/logrotate.status
 make %{?_smp_mflags}
 
 
@@ -65,13 +65,24 @@ make test
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/logrotate
 
 install -p -m 644 examples/logrotate.conf $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.conf
-install -p -m 755 examples/logrotate.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/logrotate
+install -p -m 644 examples/{b,w}tmp $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
 touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/logrotate/logrotate.status
 
+%if %{with systemd}
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
+install -p -m 644 examples/logrotate.{service,timer} $RPM_BUILD_ROOT%{_unitdir}/
+%else
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
+install -p -m 755 examples/logrotate.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/logrotate
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 
 %pre
 # If /var/lib/logrotate/logrotate.status does not exist, create it and copy
@@ -83,9 +94,23 @@ if [ ! -d %{_localstatedir}/lib/logrotate/ -a -f %{_localstatedir}/lib/logrotate
   cp -a %{_localstatedir}/lib/logrotate.status %{_localstatedir}/lib/logrotate
 fi
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post
+chmod 0640 %{_localstatedir}/lib/logrotate/logrotate.status ||:
+%if %{with systemd}
+%systemd_post logrotate.{service,timer}
+%endif
+
+%if %{with systemd}
+%preun
+%systemd_preun logrotate.{service,timer}
+
+%triggerin -- logrotate < %{version}-%{release}
+if [ -e %{_sysconfdir}/crontab -o -e %{_sysconfdir}/anacrontab ]; then
+  if [ -e %{_sysconfdir}/cron.daily/logrotate ]; then
+    /bin/systemctl enable --now logrotate.timer &>/dev/null || :
+  fi
+fi
+%endif
 
 
 %files
@@ -96,12 +121,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755, root, root) %{_sbindir}/logrotate
 %attr(0644, root, root) %{_mandir}/man8/logrotate.8*
 %attr(0644, root, root) %{_mandir}/man5/logrotate.conf.5*
-%attr(0755, root, root) %{_sysconfdir}/cron.daily/logrotate
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.conf
 %attr(0755, root, root) %dir %{_sysconfdir}/logrotate.d
-%attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate/logrotate.status
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.d/{b,w}tmp
+%attr(0640, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate/logrotate.status
+%if %{with systemd}
+%{_unitdir}/logrotate.*
+%else
+%attr(0755, root, root) %{_sysconfdir}/cron.daily/logrotate
+%endif
+
 
 %changelog
+* Fri May 27 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.20.1-2
+- fixed permission.
+- added systemd support (disabled as default).
+
+* Thu May 26 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.20.1-1
+- new upstream release.
+
 * Fri Jan 14 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.19.0-1
 - new upstream release.
 

m/mariadb/mariadb-vl.spec

@@ -24,10 +24,10 @@
 
 %define _unpackaged_files_terminate_build 1
 
-%define mariadb_version		10.6.7
+%define mariadb_version		10.6.8
 %define mariadb_base_version	10.6
-%define mroonga_version		12.00
-%define groonga_version		12.0.0
+%define mroonga_version		12.03
+%define groonga_version		12.0.3
 %define client_version		18
 
 %define galera_api_version	26.4
@@ -43,7 +43,7 @@ Packager:	tomop
 
 License:	GPL2
 URL:		https://mariadb.org/
-Source:		https://downloads.mariadb.com/MariaDB/mariadb-%{version}/source/mariadb-%{version}.tar.gz
+Source:		https://archive.mariadb.org/mariadb-%{version}/source/mariadb-%{version}.tar.gz
 
 # for systemd
 Source10:	mysql.tmpfiles.d.in
@@ -862,6 +862,10 @@ fi
 
 
 %changelog
+* Sat May 21 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.6.8-1
+- new upstream release.
+- updated patch1000.
+
 * Sun Feb 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.6.7-1
 - new upstream release.
 - updated patch1000.

n/nginx/nginx-vl.spec

@@ -33,7 +33,7 @@ Group:          servers
 %global nginx_version 1.20.2
 Version:        %{nginx_version}
 # do not reset or decrease.
-Release:        16%{?_dist_release}%{?with_systemd:.systemd}
+Release:        17%{?_dist_release}%{?with_systemd:.systemd}
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       daisuke
@@ -94,7 +94,7 @@ Source2030:     https://github.com/leev/ngx_http_geoip2_module/archive/%{geoip2_
 
 %if %{with modsecurity}
 %global         with_modsecurity 1
-%global         modsecurity_version 1.0.2
+%global         modsecurity_version 1.0.3
 Source2040:     https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v%{modsecurity_version}/modsecurity-nginx-v%{modsecurity_version}.tar.gz
 %endif
 
@@ -791,6 +791,9 @@ fi
 
 
 %changelog
+* Sat May 21 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.2-17
+- updated modsecurity-nginx to 1.0.3.
+
 * Fri Nov 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.2-16
 - rebuilt with perl-5.34.0.
 

p/php-composer/php-composer-vl.spec

@@ -1,6 +1,6 @@
 Name: php-composer
 Summary: A tool for dependency management in PHP
-Version: 2.2.12
+Version: 2.2.13
 Release: 1%{?_dist_release}
 Group: programming
 Vendor: Project Vine
@@ -45,6 +45,9 @@ install -m755 %{SOURCE1} %{buildroot}%{_bindir}/composer
 
 
 %changelog
+* Thu May 26 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.13-1
+- new upstream release.
+
 * Wed Apr 20 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.12-1
 - new upstream release.
 

p/postgresql/postgresql-vl.spec

@@ -15,7 +15,7 @@
 Summary: PostgreSQL client programs
 Summary(ja): PostgreSQL のクライアントプログラム群
 Name: postgresql
-Version: 14.2
+Version: 14.3
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: office
 Vendor: Project Vine
@@ -840,6 +840,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 20 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.3-1
+- new upstream release.
+
 * Tue Feb 15 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.2-1
 - new upstream release.
 

r/rsyslog/rsyslog-vl.spec

@@ -6,8 +6,8 @@
 
 Summary:        Enhanced system logging and kernel message trapping daemon
 Name:           rsyslog
-Version:        8.2110.0
-Release:        2%{?_dist_release}%{?with_systemd:.systemd}
+Version:        8.2204.1
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -224,10 +224,10 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart rsyslog.service
 %else
-%endif
 if [ "$1" -ge "1" ]; then
 	service rsyslog condrestart > /dev/null 2>&1 ||:
 fi
+%endif
 
 
 %files
@@ -306,6 +306,9 @@ fi
 
 
 %changelog
+* Thu May 19 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2204.1-1
+- new upstream release.
+
 * Sat Dec 25 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2110.0-2
 - fixed a typo in logrotate script on systemd.
 

r/rust/rust-vl.spec

@@ -9,7 +9,7 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.60.0
+%global rustc_version 1.61.0
 %global cargo_version %{rustc_version}
 %global rustfmt_version %{rustc_version}
 %global rls_version %{rustc_version}
@@ -25,8 +25,8 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.txt
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_rust 1.59.0
-%global bootstrap_cargo 1.59.0
+%global bootstrap_rust 1.60.0
+%global bootstrap_cargo 1.60.0
 %global bootstrap_channel %{bootstrap_rust}
 
 # Only the specified arches will use bootstrap binaries.
@@ -438,9 +438,11 @@ mkdir -p src/llvm-project/libunwind/
 rm -rf src/llvm-emscripten/
 
 # Remove other unused vendored libraries
-#rm -rf vendor/curl-sys/curl/
-rm -rf vendor/jemalloc-sys/jemalloc/
+rm -rf vendor/curl-sys/curl/
+rm -rf vendor/*jemalloc-sys*/jemalloc/
+rm -rf vendor/libmimalloc-sys/c_src/mimalloc/
 rm -rf vendor/libz-sys/src/zlib/
+rm -rf vendor/libz-sys/src/zlib-ng/
 rm -rf vendor/lzma-sys/xz-*/
 rm -rf vendor/openssl-src/openssl/
 %if %{without bundled_libgit2}
@@ -530,18 +532,21 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
   --libdir=%{common_libdir} \
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
   --enable-local-rust --local-rust-root=%{local_rust_root} \
+  --set build.rustfmt=/bin/true \
   %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
     %{!?llvm_has_filecheck: --disable-codegen-tests} \
     %{!?with_llvm_static: --enable-llvm-link-shared } } \
+  --disable-llvm-static-stdcpp \
   --disable-rpath \
   %{enable_debuginfo} \
+  --set rust.codegen-units-std=1 \
   --enable-extended \
+  --tools=analysis,cargo,clippy,rls,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
-  --set rust.codegen-units-std=1 \
   --release-channel=%{channel} \
-  --set rust.deny-warnings=false \
-  --tools=analysis,cargo,clippy,rls,rustfmt,src \
+  --dist-compression-formats=gz \
+  --release-description="Vine Linux %{version}-%{release}" \
   %{nil}
 
 RUST_BACKTRACE=1 %{__python3} ./x.py build -j "$ncpus" --stage 2
@@ -762,6 +767,9 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 
 
 %changelog
+* Sat May 21 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.61.0-1
+- new upstream release.
+
 * Fri Apr 22 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.60.0-1
 - new upstream release.
 

v/vim/vim-vl.spec

@@ -2,8 +2,8 @@
 
 # version, patch version
 %define vimversion	8.2
-%define vimsrcpversion	4833
-%define vimpversion	4833
+%define vimsrcpversion	5024
+%define vimpversion	5024
 
 %define vimsubdir	vim%(echo %{vimversion} | sed -e's/\\.//')
 #define vimdir		%{vimsubdir}
@@ -368,7 +368,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3010 -p1
 %patch3011 -p1
 %patch3013 -p1
-%patch3014 -p1
+#patch3014 -p1
 %patch3017 -p1
 %patch3018 -p1
 
@@ -798,6 +798,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 27 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.5024-1
+- new upstream release.
+
+* Tue May 17 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.4969-1
+- new upstream release.
+
 * Thu Apr 28 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.4833-1
 - new upstream release.