瀏覽代碼

updated 14 packages

audit-4.0.2-1

c-ares-1.33.0-1

dovecot-2.3.21-2

fetchmail-6.4.39-1

iproute-6.10.0-1

kernel-6.6.44-1

nsd-4.10.1-1

php82-8.2.22-1

php83-8.3.10-1

ruby-3.3.4-3

samba-4.20.4-1

valkey-7.2.6-2

vim-9.1.0665-1

zabbix-7.0.2-1
Tomohiro "Tomo-p" KATO 4 月之前
父節點
當前提交
abc7e0ec33

+ 4 - 1
a/audit/audit-vl.spec

@@ -5,7 +5,7 @@
 
 Summary: User space tools for kernel auditing
 Name: audit
-Version: 4.0.1
+Version: 4.0.2
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 License: GPLv2+
 Group: system,admin-tools
@@ -427,6 +427,9 @@ fi
 
 
 %changelog
+* Fri Aug 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.2-1
+- new upstream release.
+
 * Thu Apr 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.1-1
 - new upstream release.
 

+ 4 - 1
c/c-ares/c-ares-vl.spec

@@ -2,7 +2,7 @@
 
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
-Version: 1.32.3
+Version: 1.33.0
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -115,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 03 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.33.0-1
+- updated to 1.33.0.
+
 * Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.32.3-1
 - updated to 1.32.3.
 

+ 59 - 71
d/dovecot/dovecot-vl.spec

@@ -9,14 +9,13 @@
 %define build_pigeonhole 1
 %define pigeonholever 0.5.21
 
-# pop before smtp (drac)
-%define build_drac 0
+%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: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: servers
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -32,25 +31,24 @@ Source2: dovecot.pam
 Source8: https://pigeonhole.dovecot.org/releases/%{shortver}/dovecot-%{shortver}-pigeonhole-%{pigeonholever}.tar.gz
 Source9: dovecot.sysconfig
 Source10: dovecot.tmpfilesd
-
-#our own
 Source14: dovecot.conf.5
-
-# drac plugin (pop before smtp)
-# Source100: http://www.dovecot.org/patches/1.1/drac.c
-# Source100: http://sourceforge.jp/projects/dovecot2-drac/downloads/53176/dovecot2-drac-0.1.tar.gz
-# Source110: README.plugin-drac
+Source16: dovecot.sysusers
 
 Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 # local filesystem rules
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 Patch4: dovecot-2.2-mkcert-10years.patch
+Patch5: dovecot-2.1.10-waitonline.patch
+Patch22: dovecot-configure-c99.patch
 
 Patch100: dovecot-2.3.14-opensslv3.patch
+# Fix assert-crash after "Process .. is ignoring idle SIGINT" error
+# https://github.com/dovecot/core/commit/5dbe5119f3a0b7782d8c2ce67c35f0df2fc61747
+Patch101: 5dbe5119f3a0b7782d8c2ce67c35f0df2fc61747.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: openssl-devel, pam-devel, zlib-devel
+BuildRequires: openssl-devel, pam-devel, pkgconfig(zlib)
 BuildRequires: bzip2-devel, libcap-devel
 BuildRequires: libtool autoconf automake, gettext-devel
 BuildRequires: pkgconfig
@@ -88,10 +86,6 @@ BuildRequires: sqlite3-devel
 BuildRequires: openldap-devel
 %endif
 
-%if %{build_drac}
-BuildRequires: dracd
-%endif
-
 %global __provides_exclude_from %{_docdir}
 %global __requires_exclude_from %{_docdir}
 
@@ -156,18 +150,6 @@ Group: servers
 This package provides the LDAP auth plugin for dovecot-auth etc.
 %endif
 
-%if %{build_drac}
-%package drac
-Summary: Dovecot plugin module for support drac (POP before SMTP)
-Group: servers
-Requires: %{name} = %{version}-%{release}
-Requires: dracd
-Obsoletes: %{name}-plugin-drac < %{version}-%{release}
-
-%description drac
-Dovecot plugin module for support drac (POP before SMTP)
-%endif
-
 %package devel
 Requires: %{name} = %{version}-%{release}
 Summary: Development files dor dovecot
@@ -182,20 +164,7 @@ This package provides the development files for dovecot.
 %prep
 
 %setup -q
-
-%patch1 -p1 -b .default-settings
-%patch2 -p1 
-%patch3 -p1 
-%patch4 -p1 
-
-%patch100 -p1 
-
-%if %{build_drac}
-%setup -T -D -q -a 100
-mv dovecot2-drac/README README.dovecot2-drac
-mv dovecot2-drac/README.j README.dovecot2-drac.jp
-cp %{SOURCE110} .
-%endif
+%autopatch -p1
 
 %if %{build_pigeonhole}
 %setup -q -D -T -a 8
@@ -203,12 +172,16 @@ cp %{SOURCE110} .
 
 
 %build
+export CFLAGS="%{__global_cflags} -fno-strict-aliasing -fstack-reuse=none"
+export LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}"
 # rm -f ./configure
 # autoreconf -i -f
 %configure                       \
     INSTALL_DATA="install -c -p -m644" \
+    --with-rundir=%{_rundir}/%{name} \
     --docdir=%{_docdir}/%{name}  \
     --disable-static             \
+    --disable-rpath              \
 %if %{build_postgres}
     --with-pgsql                 \
 %endif
@@ -229,7 +202,7 @@ cp %{SOURCE110} .
     --with-ldap=plugin           \
 %endif
 %if %{with systemd}
-    --with-rundir=%{_rundir}/%{name} \
+    --with-systemd               \
     --with-systemdsystemunitdir=%{_unitdir} \
 %endif
     --with-docs
@@ -254,12 +227,6 @@ make %{?_smp_mflags}
 popd
 %endif
 
-%if %{build_drac}
-pushd dovecot2-drac
-make DOVDIR=../
-popd
-%endif
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -276,20 +243,11 @@ rm -rf pkgdoc
 mkdir -p pkgdoc
 mv -f %{buildroot}%{_pkgdocdir}/* pkgdoc/
 
-%if %{build_drac}
-pushd dovecot2-drac
-install -m 755 drac_plugin.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/dovecot/imap/
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/dovecot/pop3/
-ln -s ../drac_plugin.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/imap/
-ln -s ../drac_plugin.so $RPM_BUILD_ROOT/%{_libdir}/dovecot/pop3/
-popd
-%endif
-
 # install -p -m 755 src/plugins/convert/convert-tool $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
 %if %{with systemd}
 install -p -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_tmpfilesdir}/dovecot.conf
+install -p -D -m 0644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysusersdir}/dovecot.sysusers
 %else
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dovecot
@@ -344,7 +302,7 @@ find $RPM_BUILD_ROOT%{_libdir}/%{name}/ -name '*.la' | xargs rm -f
 (
     find ${RPM_BUILD_ROOT}%{_libdir}/%{name} -type d | sed -e "s|^|%dir |";
     find ${RPM_BUILD_ROOT}%{_libdir}/%{name} -! -type d | \
-        grep -v 'dovecot-config\|lib90_cmusieve_plugin\.so\|libdriver_.*\.so\|libauthdb_.*\.so\|libmech_.*\.so\|drac\.so';
+        grep -v 'dovecot-config\|lib90_cmusieve_plugin\.so\|libdriver_.*\.so\|libauthdb_.*\.so\|libmech_.*\.so';
 ) | sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist
 
 #remove what we don't want
@@ -367,12 +325,28 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
+%if %{with systemd}
+%sysusers_create_compat %{SOURCE16}
+# do not let dovecot run during upgrade rhbz#134325
+if [ "$1" = "2" ]; then
+  rm -f %restart_flag
+  /bin/systemctl is-active %{name}.service >/dev/null 2>&1 && touch %restart_flag ||:
+  /bin/systemctl stop %{name}.service >/dev/null 2>&1
+fi
+%else
 getent group dovecot >/dev/null || groupadd -r dovecot
 getent passwd dovecot >/dev/null || \
 useradd -r -g dovecot -d /usr/libexec/dovecot -s /sbin/nologin -c "Dovecot IMAP server" dovecot
 getent group dovenull >/dev/null || groupadd -r dovenull
 getent passwd dovenull >/dev/null || \
 useradd -r -g dovenull -d /usr/libexec/dovecot -s /sbin/nologin -c "Dovecot's unauthorized user" dovenull
+if [ "$1" = "2" ]; then
+  install -d -m 0755 -g dovecot -d /run/dovecot >/dev/null 2>&1 ||:
+  rm -f %restart_flag
+  /sbin/service dovecot status >/dev/null 2>&1 && touch %restart_flag ||:
+  /sbin/service dovecot stop 2>/dev/null ||:
+fi
+%endif
 exit 0
 
 %post
@@ -408,10 +382,29 @@ fi
 
 %postun
 %if %{with systemd}
-%systemd_postun_with_restart dovecot.service
+/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ "$1" -ge "1" -a -e %restart_flag ]; then
+	/usr/bin/systemctl start dovecot.service >/dev/null 2>&1 || :
+rm -f %restart_flag
+fi
+%else
+if [ "$1" -ge "1" -a -e %restart_flag ]; then
+	/sbin/service %{name} start 2>/dev/null ||:
+fi
+%endif
+
+%posttrans
+%if %{with systemd}
+# dovecot should be started again in %%postun, but it's not executed on reinstall
+# if it was already started, restart_flag won't be here, so it's ok to test it again
+if [ -e %restart_flag ]; then
+	/usr/bin/systemctl start dovecot.service >/dev/null 2>&1 || :
+	rm -f %restart_flag
+fi
 %else
-if [ "$1" -ge "1" ]; then
-    /sbin/service %{name} condrestart 2>/dev/null || :
+if [ -e %restart_flag ]; then
+	/sbin/service %{name} start 2>/dev/null ||:
+	rm -f %restart_flag
 fi
 %endif
 
@@ -434,6 +427,7 @@ fi
 %{_unitdir}/dovecot.service
 %{_unitdir}/dovecot.socket
 %{_tmpfilesdir}/dovecot.conf
+%{_sysusersdir}/dovecot.sysusers
 %else
 %{_initrddir}/dovecot
 %endif
@@ -522,15 +516,6 @@ fi
 %{_libdir}/%{name}/auth/libauthdb_ldap.so
 %endif
 
-%if %{build_drac}
-%files drac
-%defattr(-,root,root)
-%{_libdir}/%{name}/drac_plugin.so
-%{_libdir}/%{name}/imap/drac_plugin.so
-%{_libdir}/%{name}/pop3/drac_plugin.so
-%doc README.plugin-drac
-%endif
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
@@ -542,6 +527,9 @@ fi
 
 
 %changelog
+* 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.
+
 * Fri Sep 15 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.21-1
 - new upstream release.
 

+ 7 - 2
f/fetchmail/fetchmail-vl.spec

@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Summary(ja): 遠隔メール取得/フォワード用ユーティリティ
 Name: fetchmail
-Version: 6.4.22
+Version: 6.4.39
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: internet
 Vendor: Project Vine
@@ -99,10 +99,12 @@ export PYTHON=":"
 %configure \
      --enable-POP3 \
      --enable-IMAP \
+     --enable-ETRN \
+     --enable-nls \
      --enable-NTLM \
-     --with-ssl \
      --with-kerberos5 \
      --with-gssapi \
+     --with-ssl \
      --enable-fallback=no
 
 %__make %{?_smp_mflags}
@@ -162,6 +164,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Aug 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.4.39-1
+- new upstream release.
+
 * Tue Oct 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.4.22-1
 - new upstream release.
 - built with openssl-3.0.0.

+ 32 - 62
i/iproute/iproute-vl.spec

@@ -1,9 +1,7 @@
-%bcond_without tipc
-
 Summary:        Advanced IP routing and network device configuration tools
 Summary(ja):    IP ルーティング,ネットワークデバイスの設定ツール
 Name:           iproute
-Version:        5.14.0
+Version:        6.10.0
 Release:        1%{?_dist_release}
 Group:          system,network,admin-tools
 Vendor:         Project Vine
@@ -15,15 +13,16 @@ Source:         https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{versi
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison flex
+BuildRequires: elfutils-libelf-devel
 BuildRequires: iptables-devel >= 1.4.10
-BuildRequires: libdb-devel
+BuildRequires: libbpf-devel
+BuildRequires: libmnl-devel
 BuildRequires: libpcap-devel
 BuildRequires: pkgconfig
-%if %{with tipc}
-BuildRequires: libmnl-devel
-%endif
 
 Requires: iptables >= 1.4.10
+Obsoletes: arpd < 6.0.0
+Obsoletes: iproute2-doc < 6.0.0
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for example)
@@ -35,16 +34,6 @@ kernel.
 設計されたネットワーキングユーティリティ(ip, rtmon等々)が収録されています。
 
 
-%package doc
-Summary: ip and tc documentation with examples
-Summary(ja): ip, tcのドキュメントとサンプル
-Group: documentation
-License: GPLv2+
-
-%description doc
-The iproute documentation contains howtos and examples of settings.
-
-
 %package devel
 Summary: Libraries, includes, etc. to develop iptables
 Summary(ja): iproute の開発用ライブラリ,ヘッダファイル
@@ -55,18 +44,6 @@ Requires: %{name} = %{version}
 Libraries, include files, etc you can use to develop iproute2.
 
 
-%package -n arpd
-Summary: arpd - userspace arp daemon
-Summary(ja): arpd - ユーザー空間のarpデーモン
-Group: network,system
-Requires: %{name} = %{version}
-
-%description -n arpd
- The arpd daemon collects gratuitous ARP information, saving it on local
-disk  and  feeding it to the kernel on demand to avoid redundant broad
-casting due to limited size of the kernel ARP cache.
-
-
 %debug_package
 
 
@@ -75,43 +52,43 @@ casting due to limited size of the kernel ARP cache.
 
 
 %build
-export CFLAGS="%{optflags}"
-export LIBDIR=/%{_libdir}
-export IPT_LIB_DIR=/%{_lib}/xtables
-./configure
-make %{?_smp_mflags}
+%configure --color auto
+echo -e "\nPREFIX=%{_prefix}\nSBINDIR=%{_sbindir}" >> config.mk
+%make_build
 
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%make_install
+
+# libnetlink
+install -D -m644 include/libnetlink.h %{buildroot}%{_includedir}/libnetlink.h
+install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 
-export DESTDIR='%{buildroot}'
-export SBINDIR='%{_sbindir}'
-export MANDIR='%{_mandir}'
-export LIBDIR='%{_libdir}'
-export CONFDIR='%{_sysconfdir}/iproute2'
-export DOCDIR='%{_docdir}'
-make install
+# drop these files, iproute-doc package extracts files directly from _builddir
+rm -rf '%{buildroot}%{_docdir}'
 
 mkdir -p %{buildroot}/sbin
-for f in ifcfg ip rtmon tc; do
+for f in ip rtmon tc; do
   mv -f %{buildroot}%{_sbindir}/$f %{buildroot}/sbin/
 done
 
-# libnetlink
-install -D -m644 include/libnetlink.h %{buildroot}%{_includedir}/libnetlink.h
-install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
-
 
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%posttrans
+if [ -d %{_sysconfdir}/iproute2 -a ! -L %{_sysconfdir}/iproute2 ]; then
+	for f in %{_sysconfdir}/iproute2/*; do
+		cp -af $f %{_datadir}/ >/dev/null 2>&1 ||:
+	done
+	rm -rf %{_sysconfdir}/iproute2
+	ln -sf %{_datadir}/iproute2 %{_sysconfdir}/iproute2
+fi
 
 
 %files
 %license COPYING
-%doc README
-%dir %{_sysconfdir}/iproute2
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
+%doc README README.devel
+%ghost %{_sysconfdir}/iproute2
+%dir %{_datadir}/iproute2
+%attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/*
 /sbin/*
 %{_sbindir}/*
 %exclude %{_sbindir}/arpd
@@ -124,11 +101,6 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 %{_mandir}/man8/*
 %exclude %{_mandir}/man8/arpd.8*
 
-%files doc
-%license COPYING
-%doc doc/*
-%doc examples
-
 %files devel
 %license COPYING
 %{_mandir}/man3/*
@@ -136,13 +108,11 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 %{_includedir}/libnetlink.h
 %{_includedir}/iproute2/bpf_elf.h
 
-%files -n arpd
-%license COPYING
-%{_sbindir}/arpd
-%{_mandir}/man8/arpd.8*
-
 
 %changelog
+* Tue Aug 06 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.10.0-1
+- new upstream release.
+
 * Sat Oct 30 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.14.0-1
 - new upstream release.
 

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

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

+ 4 - 1
n/nsd/nsd-vl.spec

@@ -3,7 +3,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Summary(ja): 高速で最小限のAuthoritative専用DNSネームサーバ
 Name: nsd
-Version: 4.10.0
+Version: 4.10.1
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: servers
 Vendor: Project Vine
@@ -192,6 +192,9 @@ fi
 
 
 %changelog
+* Sat Aug 03 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.10.1-1
+- new upstream release.
+
 * Thu Jun 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.10.0-1
 - new upstream release.
 

+ 10 - 1
p/php82/php82-vl.spec

@@ -37,7 +37,7 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 8.2.21
+Version: 8.2.22
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
@@ -434,6 +434,12 @@ mkdir build-cgi build-fpm build-apache2
 
 #======================================================================
 %build
+# This package fails to build with LTO due to undefined symbols.  LTO
+# was disabled in OpenSuSE as well, but with no real explanation why
+# beyond the undefined symbols.  It really shold be investigated further.
+# Disable LTO
+%define _lto_cflags %{nil}
+
 # Regenerate configure scripts (patches change config.m4's)
 # ./buildconf --force
 
@@ -899,6 +905,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Fri Aug 02 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.22-1
+- new upstream release.
+
 * Fri Jul 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.21-1
 - new upstream release.
 

+ 9 - 3
p/php83/php83-vl.spec

@@ -37,7 +37,7 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 8.3.9
+Version: 8.3.10
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
@@ -434,8 +434,11 @@ mkdir build-cgi build-fpm build-apache2
 
 #======================================================================
 %build
-# Regenerate configure scripts (patches change config.m4's)
-# ./buildconf --force
+# This package fails to build with LTO due to undefined symbols.  LTO
+# was disabled in OpenSuSE as well, but with no real explanation why
+# beyond the undefined symbols.  It really shold be investigated further.
+# Disable LTO
+%define _lto_cflags %{nil}
 
 # Install extension modules in %{_libdir}/%{_name}
 export EXTENSION_DIR=%{_libdir}/%{_name}
@@ -899,6 +902,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Fri Aug 02 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.3.10-1
+- new upstream release.
+
 * Fri Jul 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.3.9-1
 - new upstream release.
 

+ 205 - 197
r/ruby/ruby-vl.spec

@@ -1,10 +1,14 @@
-%bcond_without test
 %bcond_without json
 %bcond_without emacsen
+%ifarch x86_64
+%bcond_without test
+%else
+%bcond_with test
+%endif
 
 %global major_version 3
-%global minor_version 0
-%global teeny_version 3
+%global minor_version 3
+%global teeny_version 4
 
 # Note:
 # As seen on perl srpm, as this (ruby) srpm contains several sub-components,
@@ -14,7 +18,7 @@
 #
 # 全てのサブパッケージのバージョンが上がる場合を除き、rubyのmainバージョンが
 # 更新されても1には戻さずに必ず+1してください。
-%global ruby_rel 2
+%global ruby_rel 3
 
 %global major_minor_version %{major_version}.%{minor_version}
 
@@ -28,49 +32,51 @@
 %global rubygems_dir %{_datadir}/rubygems
 
 # lib/rubygems.rb
-%global rubygems_version 3.2.32
+%global rubygems_version 3.5.11
 # lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb 
-%global rubygems_molinillo_version 0.7.0
+%global rubygems_molinillo_version 0.8.0
 
 # lib/bundler/version.rb
-%global bundler_version 2.2.32
+%global bundler_version 2.5.11
 # lib/bundler/vendor/fileutils/lib/fileutils.rb
-%global bundler_fileutils_version 1.4.1
+%global bundler_fileutils_version 1.7.2
 # lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
-%global bundler_molinillo_version 0.7.0
+%global bundler_molinillo_version %{rubygems_molinillo_version}
 # lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
-%global bundler_net_http_persistent_version 4.0.0
+%global bundler_net_http_persistent_version 4.0.2
 # lib/bundler/vendor/thor/lib/thor/version.rb
-%global bundler_thor_version 1.1.0
+%global bundler_thor_version 1.3.0
 # lib/bundler/vendor/tmpdir/lib/tmpdir.rb
-%global bundler_tmpdir_version 0.1.0
+%global bundler_tmpdir_version 0.2.0
 # lib/bundler/vendor/uri/lib/uri/version.rb 
-%global bundler_uri_version 0.10.0
+%global bundler_uri_version 0.13.0
 # lib/rdoc/version.rb
-%global rdoc_version 6.3.3
+%global rdoc_version 6.6.3.1
 
 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
 # http://redmine.ruby-lang.org/issues/5313
 # lib/irb/version.rb 1.3.5
-%global irb_version 1.3.5
+%global irb_version 1.13.1
 
 # ext/bigdecimal/bigdecimal.gemspec
-%global bigdecimal_version 3.0.0
+%global bigdecimal_version 3.1.5
+%global debug_version 1.9.1
 # ext/io/console/io-console.gemspec
-%global io_console_version 0.5.7
+%global io_console_version 0.7.1
 # ext/json/VERSION
-%global json_version 2.5.1
+%global json_version 2.7.1
 # ext/psych/lib/psych/versions.rb
-%global psych_version 3.3.2
+%global psych_version 5.1.2
 # gems/bundled_gems
-%global minitest_version 5.14.2
-%global power_assert_version 1.2.0
-%global rake_version 13.0.3
-%global rbs_version 1.4.0
-%global test_unit_version 3.3.7
-%global rexml_version 3.2.5
-%global rss_version 0.2.9
-%global typeprof_version 0.15.2
+%global minitest_version 5.20.0
+%global power_assert_version 2.0.3
+%global racc_version 1.7.3
+%global rake_version 13.1.0
+%global rbs_version 3.4.0
+%global test_unit_version 3.6.1
+%global rexml_version 3.2.8
+%global rss_version 0.3.0
+%global typeprof_version 0.21.9
 
 %define rbmode          ruby-mode
 %define rbmode_el       ruby-mode
@@ -116,7 +122,6 @@ Source1002: %{rbmode_el}-init.el
 %{?load:%{SOURCE4}}
 %{?load:%{SOURCE5}}
 
-### Patch[0-99] from fedora package
 # Fix ruby_version abuse.
 # https://bugs.ruby-lang.org/issues/11002
 Patch0: ruby-2.3.0-ruby_version.patch
@@ -132,8 +137,6 @@ Patch3: ruby-2.1.0-always-use-i386.patch
 # Allows to install RubyGems into custom directory, outside of Ruby's tree.
 # http://bugs.ruby-lang.org/issues/5617
 Patch4: ruby-2.1.0-custom-rubygems-location.patch
-# Make mkmf verbose by default
-Patch5: ruby-1.9.3-mkmf-verbose.patch
 # The ABRT hook used to be initialized by preludes via following patches:
 # https://bugs.ruby-lang.org/issues/8566
 # https://bugs.ruby-lang.org/issues/15306
@@ -143,93 +146,15 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch
 # https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/
 # For now, load the ABRT hook via this simple patch:
 Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch
-# Workaround "an invalid stdio handle" error on PPC, due to recently introduced
-# hardening features of glibc (rhbz#1361037).
-# https://bugs.ruby-lang.org/issues/12666
-Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
-# Fix DWARF5 support.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1920533
-# https://bugs.ruby-lang.org/issues/17585
-Patch15: ruby-dwarf5-avoid_crash-r1.patch
-# Fix segfaults with enabled LTO.
-# https://bugs.ruby-lang.org/issues/18062
-# https://github.com/ruby/ruby/pull/4716
-Patch16: ruby-3.1.0-Get-rid-of-type-punning-pointer-casts.patch
-# DWARF5/LTO fixes for SIGSEV handler.
-# https://bugs.ruby-lang.org/issues/17052
-# https://github.com/ruby/ruby/commit/72317b333b85eed483ad00bcd4f40944019a7c13
-Patch17: ruby-3.1.0-Ignore-DW_FORM_ref_addr.patch
-# https://bugs.ruby-lang.org/issues/17052#note-9
-# https://bugs.ruby-lang.org/attachments/download/8974/ruby-addr2line-DW_FORM_ref_addr.patch
-# https://github.com/ruby/ruby/commit/a9977ba2f9863e3fb1b2346589ebbca67d80536c
-Patch18: ruby-3.1.0-addr2line-DW_FORM_ref_addr.patch
-# Avoid possible timeout errors in TestBugReporter#test_bug_reporter_add.
-# https://bugs.ruby-lang.org/issues/16492
-Patch19: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
-# Add AC_PROG_CC to make C++ compiler dependency optional on autoconf >= 2.70.
-# https://github.com/ruby/ruby/commit/912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6
-Patch20: ruby-3.1.0-autoconf-2.70-add-ac-prog-cc.patch
-# Allow to exclude test with fully qualified name.
-# https://bugs.ruby-lang.org/issues/16936
-# https://github.com/ruby/ruby/pull/5026
-Patch21: ruby-3.1.0-Properly-exclude-test-cases.patch
-
-# OpenSSL 3.0 compatibility patches
-
-# Fix test broken by wrongly formatted distinguished name submitted to
-# `OpenSSL::X509::Name.parse`.
-# https://github.com/ruby/openssl/issues/470
-# https://github.com/rubygems/rubygems/pull/5030
-Patch31: rubygems-3.2.30-Provide-distinguished-name-which-will-be-correctly-p.patch
-
-# Refactor PEM/DER serialization code.
-# https://github.com/ruby/openssl/pull/328
-Patch40: ruby-3.1.0-Refactor-PEM-DER-serialization-code.patch
-# Implement more 'generic' operations using the EVP API.
-# https://github.com/ruby/openssl/pull/329
-Patch41: ruby-3.1.0-Add-more-support-for-generic-pkey-types.patch
-# Allow setting algorithm-specific options in #sign and #verify.
-# https://github.com/ruby/openssl/pull/374
-Patch42: ruby-3.1.0-Allow-setting-algorithm-specific-options-in-sign-and-verify.patch
-# Use high level EVP interface to generate parameters and keys.
-# https://github.com/ruby/openssl/pull/397
-Patch43: ruby-3.1.0-Use-high-level-EVP-interface-to-generate-parameters-and-keys.patch
-# Use EVP API in more places.
-# https://github.com/ruby/openssl/pull/436
-Patch44: ruby-3.1.0-Use-EVP-API-in-more-places.patch
-# Implement PKey#{encrypt,decrypt,sign_raw,verify_{raw,verify_recover}}.
-# https://github.com/ruby/openssl/pull/382
-Patch45: ruby-3.1.0-Implement-PKey-encrypt-decrypt-sign_raw-verify_raw-and-verify_recover.patch
-# Fix `OpenSSL::TestSSL#test_dup` test failure.
-# https://github.com/ruby/openssl/commit/7b66eaa2dbabb6570dbbbdfac24c4dcdcc6793d7
-Patch46: ruby-3.1.0-test-openssl-utils-remove-dup_public-helper-method.patch
-# Fix `OpenSSL::TestDigest#test_digest_constants` test case.
-# https://github.com/ruby/openssl/commit/a3e59f4c2e200c76ef1d93945ff8737a05715e17
-Patch47: ruby-3.1.0-test-openssl-test_digest-do-not-test-constants-for-l.patch
-# Fix `OpenSSL::TestSSL#test_connect_certificate_verify_failed_exception_message`
-# test case.
-# https://github.com/ruby/openssl/commit/b5a0a198505452c7457b192da2e5cd5dda04f23d
-Patch48: ruby-3.1.0-test-openssl-test_ssl-relax-regex-to-match-OpenSSL-s.patch
-# Fix `OpenSSL::TestPKCS12#test_{new_with_no_keys,new_with_one_key_and_one_cert}`
-# test failures.
-# https://github.com/ruby/openssl/commit/998406d18f2acf73090e9fd9d92a7b4227ac593b
-Patch49: ruby-3.1.0-test-openssl-test_pkcs12-fix-test-failures-with-Open.patch
-# Fix `OpenSSL::TestPKey#test_s_generate_key` test case.
-# https://github.com/ruby/openssl/commit/c732387ee5aaa8c5a9717e8b3ffebb3d7430e99a
-Patch50: ruby-3.1.0-test-openssl-test_pkey-use-EC-keys-for-PKey.generate.patch
-# Miscellaneous changes for OpenSSL 3.0 support.
-# https://github.com/ruby/openssl/pull/468
-Patch51: ruby-3.1.0-Miscellaneous-changes-for-OpenSSL-3.0-support.patch
-# Support OpenSSL 3.0.
-# https://github.com/ruby/openssl/pull/399
-Patch52: ruby-3.1.0-Support-OpenSSL-3.0.patch
-# Fix `TestPumaControlCli#test_control_ssl` testcase in Puma.
-# https://github.com/ruby/openssl/pull/399#issuecomment-966239736
-Patch53: ruby-3.1.0-SSL_read-EOF-handling.patch
-
-# to revert "ext/openssl/extconf.rb: require OpenSSL version >= 1.0.1, < 3"
-# https://github.com/ruby/openssl/commit/202ff1372a40a8adf9aac74bfe8a39141b0c57e5
-Patch1000: https://github.com/ruby/openssl/commit/202ff1372a40a8adf9aac74bfe8a39141b0c57e5.patch
+# Disable syntax_suggest test suite, which tries to download its dependencies.
+# https://bugs.ruby-lang.org/issues/19297
+Patch9: ruby-3.3.0-Disable-syntax-suggest-test-case.patch
+# Armv8.3+ capable CPUs might segfault with incorrect compilation options.
+# See related upstream report: https://bugs.ruby-lang.org/issues/20085
+# https://bugs.ruby-lang.org/issues/20154
+# Make sure hardeding flags are correctly applied.
+# https://bugs.ruby-lang.org/issues/20520
+Patch12: ruby-3.4.0-Extract-hardening-CFLAGS-to-a-special-hardenflags-variable.patch
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: ruby(rubygems) >= %{rubygems_version}
@@ -255,7 +180,7 @@ BuildRequires: libyaml-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel
 BuildRequires: readline-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 # Needed to pass test_set_program_name(TestRubyOptions)
 BuildRequires: procps
 
@@ -581,6 +506,43 @@ Bundler manages an application's dependencies through its entire life, across
 many machines, systematically and repeatably.
 
 
+%package -n rubygem-racc
+Version:    %{racc_version}
+Summary:    Racc is a LALR(1) parser generator
+Group:      programming
+License:    Ruby OR BSD-2-Clause
+URL:        https://github.com/ruby/racc
+Provides:   bundled(rubygem-racc) = %{racc_version}
+
+%description -n rubygem-racc
+Racc is a LALR(1) parser generator.
+It is written in Ruby itself, and generates Ruby program.
+
+
+%package -n rubygem-rbs
+Summary:    Type signature for Ruby
+Version:    %{rbs_version}
+Group:      programming
+License:    Ruby OR BSD-2-Clause
+Provides:   bundled(rubygem-rbs) = %{rbs_version}
+
+%description -n rubygem-rbs
+RBS is the language for type signatures for Ruby and standard library
+definitions.
+
+
+%package -n rubygem-debug
+Summary:    Debugging functionality for Ruby
+Version:    %{debug_version}
+Group:      programming
+License:    MIT AND (Ruby OR BSD-2-Clause)
+Provides:   bundled(rubygem-debug) = %{debug_version}
+
+%description -n rubygem-debug
+ This is completely rewritten debug.rb which was contained by the ancient
+Ruby versions.
+  
+
 %if %{with emacsen}
 %package mode
 Summary: Emacs-lisp ruby-mode for the scripting language Ruby
@@ -604,42 +566,14 @@ Emacs上でRubyスクリプトを書くのに便利なモードです.
 %prep
 %setup -q -n %{ruby_archive}
 
-# Remove bundled libraries to be sure they are not used.
-rm -rf ext/psych/yaml
-rm -rf ext/fiddle/libffi*
-
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch9 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch31 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-
-%patch1000 -p1 -R
+%patch12 -p1
 
 cp -a %{SOURCE3} .
 
@@ -663,17 +597,16 @@ autoconf
         --with-ruby-pc='%{name}.pc' \
         --with-compress-debug-sections=no \
         --disable-rpath \
+        --enable-mkmf-verbose \
         --enable-shared \
         --with-ruby-version='' \
         --enable-multiarch \
         %{nil}
 
-# Q= makes the build output more verbose and allows to check compiler options.
-make %{?_smp_mflags} COPY="cp -p" Q=
+%make_build COPY="cp -p"
 
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 # Version is empty if --with-ruby-version is specified.
@@ -806,10 +739,14 @@ ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby
 
 # Move the binary extensions into proper place (if no gem has binary extension,
 # the extensions directory might be empty).
-find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{ruby_version}/* -maxdepth 0 \
+find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{major_minor_version}.*/* -maxdepth 0 \
   -exec mv '{}' %{buildroot}%{_libdir}/gems/%{name}/ \; \
   || echo "No gem binary extensions to move."
 
+# Remove the extension sources and library copies from `lib` dir.
+find %{buildroot}%{gem_dir}/gems/*/ext -maxdepth 0 -exec rm -rf '{}' +
+find %{buildroot}%{gem_dir}/gems/*/lib -name \*.so -delete
+
 # Move man pages into proper location
 mkdir -p %{buildroot}%{_mandir}/man{1,5}
 mv %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/doc/rake.1 %{buildroot}%{_mandir}/man1
@@ -831,16 +768,23 @@ popd
 # https://github.com/ruby/rake/pull/333
 rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github
 
-# Use standalone rubygem-racc if Racc binary is required. Shipping this
-# executable in both packages might possibly cause conflicts. The situation
-# could be better if Ruby generated these files:
-# https://github.com/ruby/ruby/pull/2545
-rm -f %{buildroot}%{_bindir}/racc
-rm -f %{buildroot}%{gem_dir}/gems/racc-%{racc_version}/bin
+# Prepare -doc subpackage file lists.
+find doc -maxdepth 1 -type f ! -name '.*' ! -name '*.ja*' > .ruby-doc.en
+echo 'doc/images' >> .ruby-doc.en
+echo 'doc/syntax' >> .ruby-doc.en
+
+find doc -maxdepth 1 -type f -name '*.ja*' > .ruby-doc.ja
+echo 'doc/irb' >> .ruby-doc.ja
+echo 'doc/pty' >> .ruby-doc.ja
+
+sed -i 's/^/%doc /' .ruby-doc.*
+sed -i 's/^/%lang(ja) /' .ruby-doc.ja
 
 
 %if %{with test}
 %check
+make -C ./test/net/fixtures regen_certs
+
 # Check RubyGems version.
 [ "`make runruby TESTRUN_SCRIPT='bin/gem -v' | tail -1`" == '%{rubygems_version}' ]
 
@@ -859,6 +803,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_built
 DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_by_id_string/"
 DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_digest_sha1/"
 DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_id_name_inspect/"
+DISABLE_TESTS="$DISABLE_TESTS -n !/TestZlibGzipFile#test_path_tmpfile/"
 
 make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %endif
@@ -892,9 +837,7 @@ fi
 %lang(ja) %license COPYING.ja
 %license GPL
 %license LEGAL
-%{_bindir}/erb
 %{_bindir}/ruby
-%{_mandir}/man1/erb*
 %{_mandir}/man1/ruby*
 
 %files devel
@@ -917,12 +860,11 @@ fi
 %license LEGAL
 %doc README.md
 %lang(ja) %doc README.ja.md
-%doc NEWS
-%doc doc/NEWS-*
+%doc NEWS.md
 %{ruby_sitelibdir}
 %{ruby_sitearchdir}
-%{ruby_vendorlibdir}
-%{ruby_vendorarchdir}
+%dir %{ruby_vendorlibdir}
+%dir %{ruby_vendorarchdir}
 
 # List all these files explicitly to prevent surprises
 # Platform independent libraries.
@@ -931,30 +873,71 @@ fi
 %exclude %{ruby_libdir}/irb*
 %exclude %{ruby_libdir}/json*
 %exclude %{ruby_libdir}/psych*
-%{ruby_libdir}/*.rb
+%{ruby_libdir}/abbrev.rb
+%{ruby_libdir}/base64.rb
 %{ruby_libdir}/benchmark*
-%{ruby_libdir}/cgi
-%{ruby_libdir}/csv
-%{ruby_libdir}/did_you_mean*
-%{ruby_libdir}/digest
-%{ruby_libdir}/drb
-%{ruby_libdir}/fiddle
-%{ruby_libdir}/forwardable
+%{ruby_libdir}/bundled_gems.rb
+%{ruby_libdir}/cgi*
+%{ruby_libdir}/coverage.rb
+%{ruby_libdir}/csv*
+%{ruby_libdir}/date.rb
+%{ruby_libdir}/delegate*
+%{ruby_libdir}/digest*
+%{ruby_libdir}/drb*
+%{ruby_libdir}/English.rb
+%{ruby_libdir}/erb*
+%{ruby_libdir}/error_highlight*
+%{ruby_libdir}/expect.rb
+%{ruby_libdir}/fiddle*
+%{ruby_libdir}/fileutils.rb
+%{ruby_libdir}/find.rb
+%{ruby_libdir}/forwardable*
+%{ruby_libdir}/getoptlong*
+%{ruby_libdir}/ipaddr.rb
+%{ruby_libdir}/kconv.rb
 %{ruby_libdir}/logger*
-%{ruby_libdir}/matrix
+%{ruby_libdir}/mkmf.rb
+%{ruby_libdir}/monitor.rb
+%{ruby_libdir}/mutex_m.rb
 %{ruby_libdir}/net
-%{ruby_libdir}/openssl
-%{ruby_libdir}/optparse
-%{ruby_libdir}/psych
-%{ruby_libdir}/racc
+%{ruby_libdir}/objspace*
+%{ruby_libdir}/observer*
+%{ruby_libdir}/open-uri.rb
+%{ruby_libdir}/open3*
+%{ruby_libdir}/optionparser.rb
+%{ruby_libdir}/optparse*
+%{ruby_libdir}/ostruct*
+%{ruby_libdir}/pathname.rb
+%{ruby_libdir}/pp.rb
+%{ruby_libdir}/prettyprint.rb
+%{ruby_libdir}/prism*
+%{ruby_libdir}/pstore*
+%{ruby_libdir}/random
+%{ruby_libdir}/readline.rb
 %{ruby_libdir}/reline*
+%{ruby_libdir}/resolv.rb
+%{ruby_libdir}/resolv-replace.rb
 %{ruby_libdir}/rinda
-%{ruby_libdir}/ripper
+%{ruby_libdir}/ripper*
+%dir %{ruby_libdir}/ruby_vm
+%{ruby_libdir}/ruby_vm/rjit
+%{ruby_libdir}/securerandom.rb
 %{ruby_libdir}/set*
+%{ruby_libdir}/shellwords.rb
+%{ruby_libdir}/singleton*
+%{ruby_libdir}/socket.rb
+%{ruby_libdir}/syntax_suggest*
 %{ruby_libdir}/syslog
+%{ruby_libdir}/tempfile.rb
+%{ruby_libdir}/timeout*
+%{ruby_libdir}/time.rb
+%{ruby_libdir}/tmpdir.rb
+%{ruby_libdir}/tsort.rb
 %{ruby_libdir}/unicode_normalize
-%{ruby_libdir}/uri
-%{ruby_libdir}/yaml
+%{ruby_libdir}/un.rb
+%{ruby_libdir}/uri*
+%{ruby_libdir}/weakref*
+%{ruby_libdir}/yaml*
 
 # Platform specific libraries.
 %{_libdir}/libruby.so.*
@@ -964,7 +947,6 @@ fi
 %{ruby_libarchdir}/continuation.so
 %{ruby_libarchdir}/coverage.so
 %{ruby_libarchdir}/date_core.so
-%{ruby_libarchdir}/dbm.so
 %dir %{ruby_libarchdir}/digest
 %{ruby_libarchdir}/digest.so
 %{ruby_libarchdir}/digest/bubblebabble.so
@@ -1035,38 +1017,44 @@ fi
 %{ruby_libarchdir}/enc/windows_1254.so
 %{ruby_libarchdir}/enc/windows_1257.so
 %{ruby_libarchdir}/enc/windows_31j.so
+%{ruby_libarchdir}/erb/escape.so
 %{ruby_libarchdir}/etc.so
 %{ruby_libarchdir}/fcntl.so
-%{ruby_libarchdir}/fiber.so
 %{ruby_libarchdir}/fiddle.so
-%{ruby_libarchdir}/gdbm.so
 %dir %{ruby_libarchdir}/io
 %{ruby_libarchdir}/io/nonblock.so
 %{ruby_libarchdir}/io/wait.so
 %{ruby_libarchdir}/monitor.so
 %{ruby_libarchdir}/nkf.so
 %{ruby_libarchdir}/objspace.so
-%{ruby_libarchdir}/openssl.so
 %{ruby_libarchdir}/pathname.so
-%{ruby_libarchdir}/psych.so
 %{ruby_libarchdir}/pty.so
-%dir %{ruby_libarchdir}/racc
-%{ruby_libarchdir}/racc/cparse.so
-%{ruby_libarchdir}/rbconfig.rb
 %dir %{ruby_libarchdir}/rbconfig
+%{ruby_libarchdir}/rbconfig.rb
 %{ruby_libarchdir}/rbconfig/sizeof.so
-%{ruby_libarchdir}/readline.so
 %{ruby_libarchdir}/ripper.so
 %{ruby_libarchdir}/socket.so
 %{ruby_libarchdir}/stringio.so
 %{ruby_libarchdir}/strscan.so
 %{ruby_libarchdir}/syslog.so
 %{ruby_libarchdir}/zlib.so
+# Default gems
+%{ruby_libdir}/did_you_mean*
+%{ruby_libdir}/openssl*
+%{ruby_libarchdir}/openssl.so
+
+%files doc -f .ruby-doc.en -f .ruby-doc.ja
+%doc README.md
+%lang(ja) %doc README.ja.md
+%doc ChangeLog
+%{_datadir}/ri
 
 %files rubygems
+%{_bindir}/erb
 %{_bindir}/gem
-%{_bindir}/rbs
+%{_bindir}/syntax_suggest
 %{_bindir}/typeprof
+%{_mandir}/man1/erb*
 %{rubygems_dir}
 %{gem_dir}
 %{_libdir}/gems
@@ -1076,6 +1064,9 @@ fi
 %exclude %{_libdir}/gems/%{name}/json-%{json_version}
 %endif
 %exclude %{_libdir}/gems/%{name}/psych-%{psych_version}
+%exclude %{_libdir}/gems/%{name}/racc-%{racc_version}
+%exclude %{_libdir}/gems/%{name}/rbs-%{rbs_version}
+%exclude %{_libdir}/gems/%{name}/debug-%{debug_version}
 %exclude %{gem_dir}/gems/rake-%{rake_version}
 %exclude %{gem_dir}/gems/rdoc-%{rdoc_version}
 %exclude %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
@@ -1088,6 +1079,10 @@ fi
 %exclude %{gem_dir}/specifications/rake-%{rake_version}.gemspec
 %exclude %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
 %exclude %{gem_dir}/specifications/psych-%{psych_version}.gemspec
+%exclude %{gem_dir}/specifications/racc-%{racc_version}.gemspec
+%exclude %{gem_dir}/specifications/rbs-%{rbs_version}.gemspec
+%exclude %{gem_dir}/specifications/debug-%{debug_version}.gemspec
+%exclude %{gem_dir}/cache/*
 
 %files rubygems-devel
 %{_rpmconfigdir}/macros.d/macros.rubygems
@@ -1116,14 +1111,6 @@ fi
 %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
 %{_mandir}/man1/ri*
 
-%files doc
-%doc README.md
-%lang(ja) %doc README.ja.md
-%doc ChangeLog
-%doc doc/ChangeLog-*
-%{_datadir}/ri
-%{_docdir}/ruby
-
 %files -n rubygem-bigdecimal
 %{ruby_libdir}/bigdecimal*
 %{ruby_libarchdir}/bigdecimal*
@@ -1177,6 +1164,24 @@ fi
 %{_mandir}/man1/bundle*.1*
 %{_mandir}/man5/gemfile.5*
 
+%files -n rubygem-rbs
+%{_bindir}/rbs
+%{_libdir}/gems/%{name}/rbs-%{rbs_version}
+%{gem_dir}/gems/rbs-%{rbs_version}
+%{gem_dir}/specifications/rbs-%{rbs_version}.gemspec
+
+%files -n rubygem-racc
+%{_bindir}/racc
+%{_libdir}/gems/%{name}/racc-%{racc_version}
+%{gem_dir}/gems/racc-%{racc_version}
+%{gem_dir}/specifications/racc-%{racc_version}.gemspec
+
+%files -n rubygem-debug
+%{_bindir}/rdbg
+%{_libdir}/gems/%{name}/debug-%{debug_version}
+%{gem_dir}/gems/debug-%{debug_version}
+%{gem_dir}/specifications/debug-%{debug_version}.gemspec
+
 %if %{with emacsen}
 %files mode
 %defattr(-, root, root)
@@ -1188,6 +1193,9 @@ fi
 
 
 %changelog
+* Thu Aug 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.7-1
+- updated to 3.0.7.
+
 * Fri Nov 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.3-2
 - updated to 3.0.3.
 - dropped Patch10: fixed in upstream.

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

@@ -3,7 +3,7 @@
 %bcond_with tracker
 %bcond_without pidl
 
-%define samba_version 4.20.2
+%define samba_version 4.20.4
 #define rc_number rc4
 %define samba_release 1
 
@@ -1838,6 +1838,12 @@ fi
 
 
 %changelog
+* Tue Aug 06 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.20.4-1
+- new upstream release.
+
+* Sat Aug 03 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.20.3-1
+- new upstream release.
+
 * Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.20.2-1
 - new upstream release.
 

+ 6 - 3
v/valkey/valkey-vl.spec

@@ -6,10 +6,10 @@
 Name:              valkey
 Summary:           A persistent key-value database
 Version:           7.2.6
-Release:           1%{?_dist_release}%{?with_systemd:.systemd}
+Release:           2%{?_dist_release}%{?with_systemd:.systemd}
 Group:             servers
-Vendor:           Project Vine
-Distribution:     Vine Linux
+Vendor:            Project Vine
+Distribution:      Vine Linux
 # valkey: BSD-3-Clause
 # hiredis: BSD-3-Clause
 # hdrhistogram, jemalloc, lzf, linenoise: BSD-2-Clause
@@ -330,6 +330,9 @@ fi
 
 
 %changelog
+* Thu Aug 01 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.2.6-2
+- fixed initscripts.
+
 * Thu Aug 01 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.2.6-1
 - initial build for Vine Linux.
 - new upstream release.

+ 1 - 1
v/vim/vim-vl.spec

@@ -2,7 +2,7 @@
 
 # version, patch version
 %define vimversion	9.1
-%define vimsrcpversion	0399
+%define vimsrcpversion	0665
 %define vimpversion	%{vimsrcpversion}
 
 %define vimsubdir	vim%(echo %{vimversion} | sed -e's/\\.//')

+ 122 - 29
z/zabbix/zabbix-vl.spec

@@ -13,13 +13,13 @@
 %endif
 
 %bcond_without agent
-%bcond_with agent2
+%bcond_without agent2
 
 %global php_pkgname php74
 
 Summary: The Enterprise-class Monitoring Solution for Everyone
 Name: zabbix
-Version: 7.0.1
+Version: 7.0.2
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
@@ -33,19 +33,25 @@ Source0: https://cdn.zabbix.com/zabbix/sources/stable/%{shortver}/%{name}-%{vers
 Source1: zabbix_server.init
 Source2: zabbix_proxy.init
 Source3: zabbix_agentd.init
-Source4: zabbix_server.logrotate
-Source5: zabbix_proxy.logrotate
-Source6: zabbix_agentd.logrotate
-
-Source9:        %{name}-tmpfiles-zabbix.conf
+Source4: zabbix_agent2.init
+Source5: zabbix_server.logrotate
+Source6: zabbix_proxy.logrotate
+Source7: zabbix_agentd.logrotate
+Source8: zabbix_agent2.logrotate
+Source9: %{name}-tmpfiles-zabbix.conf
 # systemd units -- Alternatives switches between them (they state their dependencies)
 # https://support.zabbix.com/browse/ZBXNEXT-1593
-Source10:       %{name}-agent.service
-Source11:       %{name}-proxy-mysql.service
-Source12:       %{name}-proxy-pgsql.service
-Source14:       %{name}-server-mysql.service
-Source15:       %{name}-server-pgsql.service
-Source17:       %{name}-tmpfiles-zabbixsrv.conf
+Source110: %{name}-agent.service
+Source111: %{name}-agent2.service
+Source112: %{name}-proxy-mysql.service
+Source113: %{name}-proxy-pgsql.service
+Source114: %{name}-server-mysql.service
+Source115: %{name}-server-pgsql.service
+Source120: %{name}-tmpfiles-zabbixsrv.conf
+%if %{with agent2}
+# cd zabbix-7.0.2/src/go; GOPROXY=https://proxy.golang.org,direct go mod vendor
+Source1000: vendor.tar.xz
+%endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 %if %{with server}%{with proxy}
@@ -130,6 +136,24 @@ Zabbix Agent
 %endif
 
 
+%if %{with agent2}
+%package agent2
+Summary: Zabbix Agent2
+Group: system
+Requires: %{name} == %{version}-%{release}
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires(post,preun): chkconfig
+Requires(preun,postun): initscripts
+%endif
+
+%description agent2
+Zabbix Agent2
+
+%endif
+
+
 %if %{with proxy}
 %package proxy-common
 Summary: common files for Zabbix Proxy
@@ -206,6 +230,11 @@ Zabbix web frontend with PHP and PostgreSQL.
 
 %prep
 %setup -q -T -a 0 -c -n zabbix-%{version}
+%if %{with agent2}
+pushd zabbix-%{version}/src/go
+tar xvf %{SOURCE1000}
+popd
+%endif
 mv zabbix-%{version} zabbix_mysql
 
 %if %{with server}%{with proxy}
@@ -213,6 +242,7 @@ mv zabbix-%{version} zabbix_mysql
 mv zabbix-%{version} zabbix_pgsql
 %endif
 
+
 for v in mysql pgsql; do
 pushd zabbix_$v
 sed -i -e 's/DejaVuSans/VL-Gothic-Regular/g' ./ui/include/defines.inc.php
@@ -243,8 +273,6 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
 %configure \
            %{?with_server:--enable-server} \
            %{?with_proxy:--enable-proxy} \
-           %{?with_agent:--enable-agent} \
-           %{?with_agent2:--enable-agent2} \
            --enable-ipv6 \
            --sysconfdir=%{_sysconfdir}/zabbix \
            --with-libcurl \
@@ -261,7 +289,11 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
 
 %if %{with server}%{with proxy}
 pushd zabbix_mysql
-Build --with-mysql
+Build \
+	--with-mysql \
+	%{?with_agent:--enable-agent} \
+	%{?with_agent2:--enable-agent2} \
+	%{nil}
 popd
 
 pushd zabbix_pgsql
@@ -296,15 +328,23 @@ mv -f %{buildroot}%{_sbindir}/zabbix_proxy %{buildroot}%{_sbindir}/zabbix_proxy.
 %__cp -a database/mysql %{buildroot}%{_datadir}/zabbix/
 %endif
 
+%if %{with agent2}
+sed -i \
+	-e '/^# PidFile=/a PidFile=/run/zabbix/zabbix_agent2.pid' \
+	-e '/^# LogFile=/a LogFile=/var/log/zabbix/zabbix_agent2.log' \
+	%{buildroot}/etc/zabbix/zabbix_agent2.conf
+%endif
+
 %if %{with systemd}
 # unit files
 %__mkdir_p %{buildroot}%{_unitdir}
 # Install different systemd units because of the requirements for DBMS daemons
-install -m 0644 -p %{SOURCE10} %{buildroot}%{_unitdir}/zabbix-agent.service
-install -m 0644 -p %{SOURCE11} %{buildroot}%{_unitdir}/zabbix-proxy-mysql.service
-install -m 0644 -p %{SOURCE12} %{buildroot}%{_unitdir}/zabbix-proxy-pgsql.service
-install -m 0644 -p %{SOURCE14} %{buildroot}%{_unitdir}/zabbix-server-mysql.service
-install -m 0644 -p %{SOURCE15} %{buildroot}%{_unitdir}/zabbix-server-pgsql.service
+install -m 0644 -p %{SOURCE110} %{buildroot}%{_unitdir}/zabbix-agent.service
+install -m 0644 -p %{SOURCE111} %{buildroot}%{_unitdir}/zabbix-agent2.service
+install -m 0644 -p %{SOURCE112} %{buildroot}%{_unitdir}/zabbix-proxy-mysql.service
+install -m 0644 -p %{SOURCE113} %{buildroot}%{_unitdir}/zabbix-proxy-pgsql.service
+install -m 0644 -p %{SOURCE114} %{buildroot}%{_unitdir}/zabbix-server-mysql.service
+install -m 0644 -p %{SOURCE115} %{buildroot}%{_unitdir}/zabbix-server-pgsql.service
 
 # systemd tmpfiles
 mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
@@ -322,18 +362,24 @@ install -m 0644 -p %{SOURCE9} %{buildroot}%{_prefix}/lib/tmpfiles.d/zabbix.conf
 %if %{with agent}
 %__cp %{SOURCE3} %{buildroot}%{_initddir}/zabbix_agentd
 %endif
+%if %{with agent2}
+%__cp %{SOURCE4} %{buildroot}%{_initddir}/zabbix_agent2
+%endif
 %endif
 
 # logrotate
 %__mkdir_p %{buildroot}%{_sysconfdir}/logrotate.d
 %if %{with server}
-%__cp %{SOURCE4}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_server
+%__cp %{SOURCE5}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_server
 %endif
 %if %{with proxy}
-%__cp %{SOURCE5}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_proxy
+%__cp %{SOURCE6}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_proxy
 %endif
 %if %{with agent}
-%__cp %{SOURCE6}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_agentd
+%__cp %{SOURCE7}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_agentd
+%endif
+%if %{with agent2}
+%__cp %{SOURCE8}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_agent2
 %endif
 
 %if %{with frontend}
@@ -363,10 +409,6 @@ popd
 %endif
 
 
-%clean
-%__rm -rf %{buildroot}
-
-
 %pre
 getent group zabbix >/dev/null || groupadd -r zabbix
 getent passwd zabbix >/dev/null || \
@@ -420,7 +462,15 @@ exit 0
 %else
 /sbin/chkconfig --add zabbix_agentd
 %endif
+%endif
 
+%if %{with agent2}
+%post agent2
+%if %{with systemd}
+%systemd_post zabbix-agent2.service
+%else
+/sbin/chkconfig --add zabbix_agent2
+%endif
 %endif
 
 %if %{with server}
@@ -487,6 +537,18 @@ fi
 %endif
 %endif
 
+%if %{with agent2}
+%preun agent2
+%if %{with systemd}
+%systemd_preun zabbix-agent2.service
+%else
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
+        /sbin/service zabbix_agent2 stop >/dev/null 2>&1
+        /sbin/chkconfig --del zabbix_agent2
+fi
+%endif
+%endif
+
 %if %{with server}
 %postun server-mysql
 %if %{with systemd}
@@ -525,7 +587,9 @@ if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
 fi
 %endif
+%endif
 
+%if %{with agent}
 %postun agent
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-agent.service
@@ -534,7 +598,17 @@ if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_agentd condrestart >/dev/null 2>&1 || :
 fi
 %endif
+%endif
 
+%if %{with agent2}
+%postun agent2
+%if %{with systemd}
+%systemd_postun_with_restart zabbix-agent2.service
+%else
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
+        /sbin/service zabbix_agent2 condrestart >/dev/null 2>&1 || :
+fi
+%endif
 %endif
 
 
@@ -577,7 +651,6 @@ fi
 %if %{with systemd}
 %{_unitdir}/zabbix-server-pgsql.service
 %endif
-
 %endif
 
 %if %{with agent}
@@ -597,7 +670,24 @@ fi
 %{_mandir}/man1/zabbix_get.1*
 %{_mandir}/man1/zabbix_sender.1*
 %{_mandir}/man8/zabbix_agentd.8*
+%endif
 
+%if %{with agent2}
+%files agent2
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/zabbix
+%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix_agent2
+%dir %{_sysconfdir}/zabbix/zabbix_agent2.d
+%dir %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d
+%{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/*.conf
+%{_sbindir}/zabbix_agent2
+%{_mandir}/man8/zabbix_agent2.8*
+%if %{with systemd}
+%{_unitdir}/zabbix-agent2.service
+%else
+%{_initddir}/zabbix_agent2
+%endif
 %endif
 
 %if %{with proxy}
@@ -644,6 +734,9 @@ fi
 
 
 %changelog
+* Mon Aug 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.2-1
+- new upstream release.
+
 * Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.1-1
 - new upstream release.