6 Commits adae04a4b6 ... abc7e0ec33

Author SHA1 Message Date
  Tomohiro "Tomo-p" KATO abc7e0ec33 updated 14 packages 3 months ago
  Tomohiro "Tomo-p" KATO f23ec2f241 updated 4 packages 3 months ago
  Tomohiro "Tomo-p" KATO 6fb1f4f91d valkey-7.2.6-1 3 months ago
  Tomohiro "Tomo-p" KATO ff7ceb9020 updated 9 packages 3 months ago
  Tomohiro "Tomo-p" KATO 995ccf5a98 updated 5 packages 4 months ago
  Tomohiro "Tomo-p" KATO 0e1fb24582 updated 5 packages 4 months ago

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

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

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

@@ -2,7 +2,7 @@
 
 
 Summary: A library that performs asynchronous DNS operations
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
 Name: c-ares
-Version: 1.32.2
+Version: 1.33.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
@@ -115,6 +115,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %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.
+
 * Mon Jul 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.32.2-1
 * Mon Jul 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.32.2-1
 - updated to 1.32.2.
 - updated to 1.32.2.
 
 

+ 111 - 0
c/containerd/containerd-vl.spec

@@ -0,0 +1,111 @@
+%bcond_with systemd
+%bcond_without check
+
+Name:           containerd
+Version:        1.7.20
+Release:        1%{_dist_release}%{?with_systemd:.systemd}
+Summary:        An open and reliable container runtime
+Group:          virtualization
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+# Generated by go-vendor-tools
+# SourceLicense:  Apache-2.0
+License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
+URL:            https://github.com/containerd/containerd
+Source0:        https://github.com/containerd/containerd/archive/refs/tags/v%{version}.tar.gz#/containerd-%{version}.tar.gz
+
+Patch:          0001-Makefile-fix-GO_LDFLAGS-quoting.patch
+
+%if %{with man}
+BuildRequires:  /usr/bin/go-md2man
+%endif
+BuildRequires:  btrfs-progs-devel
+BuildRequires:  libseccomp-devel
+BuildRequires:  make
+BuildRequires:  golang
+
+Requires:       runc
+
+%description
+Containerd is an industry-standard container runtime with an emphasis on
+simplicity, robustness and portability. It is available as a daemon for Linux
+and Windows, which can manage the complete container lifecycle of its host
+system: image transfer and storage, container execution and supervision,
+low-level storage and network attachments, etc.
+
+
+%prep
+%setup -q
+%autopatch -p1
+# Replace default bin directory
+sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service
+
+
+%build
+GO_LDFLAGS="-s -w" GO_BUILDFLAGS="-E -trimpath"
+%global makeflags %{expand:\\
+    DATADIR=%{_datadir} \\
+    DESTDIR=%{buildroot} \\
+    MANDIR=%{_mandir} \\
+    PREFIX=%{_prefix} \\
+    SHIM_CGO_ENABLED=1 \\
+    BUILDTAGS="apparmor selinux seccomp" \\
+    VERSION=%{version} \\
+    REVISION=%{release} \\
+}
+%if %{with man}
+%make_build %{makeflags} binaries man
+%else
+%make_build %{makeflags} binaries
+%endif
+
+
+%install
+%if %{with man}
+%make_build %{makeflags} install install-man
+%else
+%make_build %{makeflags} install
+%endif
+
+# Set up dummy configuration.
+install -d -m755 %{buildroot}/%{_sysconfdir}/%{name}
+echo "# See containerd-config.toml(5) for documentation." >%{buildroot}/%{_sysconfdir}/%{name}/config.toml
+
+%if %{with systemd}
+install -Dpm 0644 containerd.service -t %{buildroot}%{_unitdir}
+%endif
+
+
+%check
+%if %{with check}
+%make_build %{makeflags} test
+%endif
+
+
+%files
+%license vendor/modules.txt
+%doc ROADMAP.md ADOPTERS.md BUILDING.md README.md RELEASES.md SCOPE.md
+%{_bindir}/ctr
+%{_bindir}/containerd
+%{_bindir}/containerd-stress
+%{_bindir}/containerd-shim*
+%if %{with man}
+%{_mandir}/man5/containerd-config.toml.5*
+%{_mandir}/man8/ctr.8*
+%{_mandir}/man8/containerd.8*
+%{_mandir}/man8/containerd-config.8*
+%endif
+%dir %{_sysconfdir}/containerd
+%config(noreplace) %{_sysconfdir}/containerd/config.toml
+%if %{with systemd}
+%{_unitdir}/containerd.service
+%endif
+
+
+%changelog
+* Thu Jul 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.20-1
+- new upstream release.
+
+* Mon Jul 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.19-1
+- initial build for Vine Linux.

+ 8 - 2
c/curl/curl-vl.spec

@@ -3,7 +3,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
 Name: curl 
-Version: 8.8.0
+Version: 8.9.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: internet
 Group: internet
 Vendor: Project Vine
 Vendor: Project Vine
@@ -45,7 +45,7 @@ authentication, FTP upload, HTTP post, and file transfer resume.
 Summary: Files needed for building applications with libcurl.
 Summary: Files needed for building applications with libcurl.
 Group: programming
 Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
-Requires: openssl-devel libidn2-devel zlib-devel
+Requires: openssl-devel libidn2-devel pkgconfig(zlib) libnghttp2-devel
 
 
 %description devel
 %description devel
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -189,6 +189,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Thu Aug 01 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.9.1-1
+- new upstream release.
+
+* Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.9.0-1
+- new upstream release.
+
 * Wed May 22 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.8.0-1
 * Wed May 22 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.8.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 10 - 24
c/cyrus-sasl/cyrus-sasl-vl.spec

@@ -3,11 +3,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
 %global username    saslauth
 %global username    saslauth
-%if %{with systemd}
 %global homedir     /run/saslauthd
 %global homedir     /run/saslauthd
-%else
-%global homedir     /var/run/saslauthd
-%endif
 
 
 %define _plugindir2 %{_libdir}/sasl2
 %define _plugindir2 %{_libdir}/sasl2
 
 
@@ -15,7 +11,7 @@ Summary: The Cyrus SASL library.
 Summary(ja): Cyrus SASL ライブラリ
 Summary(ja): Cyrus SASL ライブラリ
 Name: cyrus-sasl
 Name: cyrus-sasl
 Version: 2.1.28
 Version: 2.1.28
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Release: 3%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -51,6 +47,9 @@ Patch109: cyrus-sasl-2.1.27-Migration-from-BerkeleyDB.patch
 Patch500: cyrus-sasl-2.1.27-coverity.patch
 Patch500: cyrus-sasl-2.1.27-coverity.patch
 Patch501: cyrus-sasl-2.1.27-cumulative-digestmd5.patch
 Patch501: cyrus-sasl-2.1.27-cumulative-digestmd5.patch
 Patch502: cyrus-sasl-2.1.27-cumulative-ossl3.patch
 Patch502: cyrus-sasl-2.1.27-cumulative-ossl3.patch
+Patch503: cyrus-sasl-2.1.28-SAST.patch
+
+Patch599: cyrus-sasl-2.1.28-fedora-c99.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, libtool
 BuildRequires: autoconf, automake, libtool
@@ -61,8 +60,8 @@ BuildRequires: pam-devel
 BuildRequires: libmariadb-devel
 BuildRequires: libmariadb-devel
 BuildRequires: libpq-devel
 BuildRequires: libpq-devel
 BuildRequires: openldap-devel
 BuildRequires: openldap-devel
-BuildRequires: zlib-devel
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig
+BuildRequires: pkgconfig(zlib)
 BuildRequires: krb5-devel
 BuildRequires: krb5-devel
 BuildRequires: groff
 BuildRequires: groff
 BuildRequires: libxcrypt-devel
 BuildRequires: libxcrypt-devel
@@ -298,24 +297,7 @@ the GS2 authentication scheme.
 %setup -q
 %setup -q
 chmod -x doc/legacy/*.html
 chmod -x doc/legacy/*.html
 chmod -x include/*.h
 chmod -x include/*.h
-%patch11 -p1 -b .no_rpath
-%if %{with systemd}
-%patch15 -p1 -b .path
-%else
-sed -i -e 's|/usr/local/etc|/etc|g' saslauthd/saslauthd.mdoc
-%endif
-%patch23 -p1 -b .man
-%patch24 -p1 -b .sizes
-%patch49 -p1 -b .md5global.h
-%patch101 -p1 -b .tests
-%patch102 -p1 -b .gssapi_cbs
-%patch106 -p1 -b .nostrncpy
-%patch107 -p1 -b .moretests
-%patch108 -p1 -b .maxssf0
-%patch109 -p1 -b .frombdb
-%patch500 -p1 -b .coverity
-%patch501 -p1 -b .digestmd5
-%patch502 -p1 -b .ossl3
+%autopatch -p1
 
 
 
 
 %build
 %build
@@ -601,6 +583,10 @@ exit 0
 
 
 
 
 %changelog
 %changelog
+* Mon Jul 22 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.28-3
+- rebuilt with current environment.
+- imported Patch503 and 599 from rawhide.
+
 * Sun Nov 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.28-2
 * Sun Nov 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.28-2
 - rebuilt with openldap-2.6.3.
 - rebuilt with openldap-2.6.3.
 
 

+ 48 - 68
d/docker-compose/docker-compose-vl.spec

@@ -1,91 +1,71 @@
-%bcond_with build_nosrc
-
-%if !%{with build_nosrc}
-%global _disable_source_fetch 0
-%endif
-
-Name: docker-compose
-Summary: Define and run multi-container applications with Docker
-Version: 2.18.1
-Release: 1%{?_dist_release}
-Group: admin-tools,virtualization
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
-
-License: ASL 2.0
-URL: https://www.docker.com
-Source0: https://github.com/docker/compose/releases/download/v%{version}/docker-compose-linux-x86_64#/docker-compose-%{version}
-Source1: https://raw.githubusercontent.com/docker/compose/%{version}/README.md
-Source2: https://raw.githubusercontent.com/docker/compose/%{version}/LICENSE
-
-%if %{with build_nosrc}
-NoSource: 0
-NoSource: 1
-NoSource: 2
-%endif
-
-Requires: docker-ce-cli
+Name:           docker-compose
+Summary:        Define and run multi-container applications with Docker
+Version:        2.29.1
+Release:        1%{_dist_release}
+Group:          virtualization
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        Apache-2.0
+URL:            https://github.com/docker/compose
+Source:         https://github.com/docker/compose/archive/refs/tags/v%{version}.tar.gz#/compose-%{version}.tar.gz
+# GOPROXY=https://proxy.golang.org,direct go mod vendor
+Source1:        vendor.tar.xz
+BuildRequires:  golang
+Requires:       moby-engine
 
 
 %description
 %description
-Compose is a tool for defining and running multi-container Docker applications. With Compose, you use a Compose file to configure your application's services. Then, using a single command, you create and start all the services from your configuration.
+Docker Compose is a tool for running multi-container applications on Docker defined using the Compose file format. A Compose file is used to define how the one or more containers that make up your application are configured. Once you have a Compose file, you can create and start your application with a single command: docker compose up.
+About update and backward compatibility
+
+Docker Compose V2 is a major version bump release of Docker Compose. It has been completely rewritten from scratch in Golang (V1 was in Python). The installation instructions for Compose V2 differ from V1. V2 is not a standalone binary anymore, and installation scripts will have to be adjusted. Some commands are different.
+
+For a smooth transition from legacy docker-compose 1.xx, please consider installing compose-switch to translate docker-compose ... commands into Compose V2's docker compose .... . Also check V2's --compatibility flag.
 
 
 
 
 %prep
 %prep
+%setup -q -a 1 -n compose-%{version}
 
 
 
 
 %build
 %build
+go build \
+   -mod=vendor \
+   -buildmode=pie \
+   -trimpath \
+   -ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=%{version}" \
+   -o _build/docker-compose ./cmd/
 
 
 
 
 %install
 %install
-# install binary
-install -d %{buildroot}%{_bindir}
+install -Dpm 0755 _build/%{name} %{buildroot}%{_bindir}/%{name}
+mkdir -p %{buildroot}/usr/lib/docker/cli-plugins
+ln -sf ../../../bin/%{name} %{buildroot}/usr/lib/docker/cli-plugins/%{name}
+
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
+ln -sf docker %{buildroot}%{_datadir}/bash-completion/completions/docker-compose
 
 
-install -p -m 755 %{SOURCE0} %{buildroot}%{_bindir}/docker-compose
-install -p -m 755 %{SOURCE1} ./
-install -p -m 755 %{SOURCE2} ./
+
+%pre
+if [ -e /usr/lib/docker/cli-plugins/%{name} -a ! -L /usr/lib/docker/cli-plugins/%{name} ]; then
+	rm -f /usr/lib/docker/cli-plugins/%{name}
+fi
 
 
 
 
 %files
 %files
-%defattr(-,root,root,-)
 %license LICENSE
 %license LICENSE
 %doc README.md
 %doc README.md
-%{_bindir}/docker-compose
+%{_bindir}/*
+%dir /usr/lib/docker/
+%dir /usr/lib/docker/cli-plugins/
+/usr/lib/docker/cli-plugins/%{name}
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/docker-compose
 
 
 
 
 %changelog
 %changelog
-* Thu Jun 08 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.18.1-1
-- new upstream release.
-
-* Mon Feb 13 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.16.0-1
-- new upstream release.
-
-* Mon Sep 12 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.2-1
-- new upstream release.
-
-* Tue Dec 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.2-1
-- new upstream release.
-
-* Wed Dec 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.1-1
+* Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.29.1-1
 - new upstream release.
 - new upstream release.
 
 
-* Wed May 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.29.2-1
-- new upstream release.
-
-* Thu Feb 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.28.2-1
-- new upstream release.
-
-* Thu Dec 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.27.4-1
-- new upstream release.
-
-* Sun Jul 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.2-1
-- new upstream release.
-
-* Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.25.4-1
-- new upstream release.
-
-* Thu Oct 10 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.24.1-2
-- rebuilt to upload to VineSeed official repository.
-
-* Tue Aug 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.24.1-1
+* Tue Jul 16 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.28.1-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.

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

@@ -9,14 +9,13 @@
 %define build_pigeonhole 1
 %define build_pigeonhole 1
 %define pigeonholever 0.5.21
 %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: Dovecot Secure imap server
 Summary(ja): Dovecot セキュア IMAP サーバ
 Summary(ja): Dovecot セキュア IMAP サーバ
 Name: dovecot
 Name: dovecot
 Version: 2.3.21
 Version: 2.3.21
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: servers
 Group: servers
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -32,25 +31,24 @@ Source2: dovecot.pam
 Source8: https://pigeonhole.dovecot.org/releases/%{shortver}/dovecot-%{shortver}-pigeonhole-%{pigeonholever}.tar.gz
 Source8: https://pigeonhole.dovecot.org/releases/%{shortver}/dovecot-%{shortver}-pigeonhole-%{pigeonholever}.tar.gz
 Source9: dovecot.sysconfig
 Source9: dovecot.sysconfig
 Source10: dovecot.tmpfilesd
 Source10: dovecot.tmpfilesd
-
-#our own
 Source14: dovecot.conf.5
 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
 Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 # local filesystem rules
 # local filesystem rules
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 Patch4: dovecot-2.2-mkcert-10years.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
 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
 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: bzip2-devel, libcap-devel
 BuildRequires: libtool autoconf automake, gettext-devel
 BuildRequires: libtool autoconf automake, gettext-devel
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig
@@ -88,10 +86,6 @@ BuildRequires: sqlite3-devel
 BuildRequires: openldap-devel
 BuildRequires: openldap-devel
 %endif
 %endif
 
 
-%if %{build_drac}
-BuildRequires: dracd
-%endif
-
 %global __provides_exclude_from %{_docdir}
 %global __provides_exclude_from %{_docdir}
 %global __requires_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.
 This package provides the LDAP auth plugin for dovecot-auth etc.
 %endif
 %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
 %package devel
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Summary: Development files dor dovecot
 Summary: Development files dor dovecot
@@ -182,20 +164,7 @@ This package provides the development files for dovecot.
 %prep
 %prep
 
 
 %setup -q
 %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}
 %if %{build_pigeonhole}
 %setup -q -D -T -a 8
 %setup -q -D -T -a 8
@@ -203,12 +172,16 @@ cp %{SOURCE110} .
 
 
 
 
 %build
 %build
+export CFLAGS="%{__global_cflags} -fno-strict-aliasing -fstack-reuse=none"
+export LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}"
 # rm -f ./configure
 # rm -f ./configure
 # autoreconf -i -f
 # autoreconf -i -f
 %configure                       \
 %configure                       \
     INSTALL_DATA="install -c -p -m644" \
     INSTALL_DATA="install -c -p -m644" \
+    --with-rundir=%{_rundir}/%{name} \
     --docdir=%{_docdir}/%{name}  \
     --docdir=%{_docdir}/%{name}  \
     --disable-static             \
     --disable-static             \
+    --disable-rpath              \
 %if %{build_postgres}
 %if %{build_postgres}
     --with-pgsql                 \
     --with-pgsql                 \
 %endif
 %endif
@@ -229,7 +202,7 @@ cp %{SOURCE110} .
     --with-ldap=plugin           \
     --with-ldap=plugin           \
 %endif
 %endif
 %if %{with systemd}
 %if %{with systemd}
-    --with-rundir=%{_rundir}/%{name} \
+    --with-systemd               \
     --with-systemdsystemunitdir=%{_unitdir} \
     --with-systemdsystemunitdir=%{_unitdir} \
 %endif
 %endif
     --with-docs
     --with-docs
@@ -254,12 +227,6 @@ make %{?_smp_mflags}
 popd
 popd
 %endif
 %endif
 
 
-%if %{build_drac}
-pushd dovecot2-drac
-make DOVDIR=../
-popd
-%endif
-
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -276,20 +243,11 @@ rm -rf pkgdoc
 mkdir -p pkgdoc
 mkdir -p pkgdoc
 mv -f %{buildroot}%{_pkgdocdir}/* 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}
 # install -p -m 755 src/plugins/convert/convert-tool $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
 
 %if %{with systemd}
 %if %{with systemd}
 install -p -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_tmpfilesdir}/dovecot.conf
 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
 %else
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dovecot
 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 | sed -e "s|^|%dir |";
     find ${RPM_BUILD_ROOT}%{_libdir}/%{name} -! -type d | \
     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
 ) | sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist
 
 
 #remove what we don't want
 #remove what we don't want
@@ -367,12 +325,28 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %pre
 %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 group dovecot >/dev/null || groupadd -r dovecot
 getent passwd dovecot >/dev/null || \
 getent passwd dovecot >/dev/null || \
 useradd -r -g dovecot -d /usr/libexec/dovecot -s /sbin/nologin -c "Dovecot IMAP server" dovecot
 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 group dovenull >/dev/null || groupadd -r dovenull
 getent passwd dovenull >/dev/null || \
 getent passwd dovenull >/dev/null || \
 useradd -r -g dovenull -d /usr/libexec/dovecot -s /sbin/nologin -c "Dovecot's unauthorized user" dovenull
 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
 exit 0
 
 
 %post
 %post
@@ -408,10 +382,29 @@ fi
 
 
 %postun
 %postun
 %if %{with systemd}
 %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
 %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
 fi
 %endif
 %endif
 
 
@@ -434,6 +427,7 @@ fi
 %{_unitdir}/dovecot.service
 %{_unitdir}/dovecot.service
 %{_unitdir}/dovecot.socket
 %{_unitdir}/dovecot.socket
 %{_tmpfilesdir}/dovecot.conf
 %{_tmpfilesdir}/dovecot.conf
+%{_sysusersdir}/dovecot.sysusers
 %else
 %else
 %{_initrddir}/dovecot
 %{_initrddir}/dovecot
 %endif
 %endif
@@ -522,15 +516,6 @@ fi
 %{_libdir}/%{name}/auth/libauthdb_ldap.so
 %{_libdir}/%{name}/auth/libauthdb_ldap.so
 %endif
 %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
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
 %{_includedir}/%{name}
@@ -542,6 +527,9 @@ fi
 
 
 
 
 %changelog
 %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
 * Fri Sep 15 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.21-1
 - new upstream release.
 - new upstream release.
 
 

+ 70 - 0
d/duktape/duktape-vl.spec

@@ -0,0 +1,70 @@
+Name:           duktape
+Version:        2.7.0
+Release:        1%{?_dist_release}
+Summary:        Embeddable Javascript engine
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://duktape.org/
+Source0:        http://duktape.org/%{name}-%{version}.tar.xz
+Source1000:     ChangeLog.fedora
+Patch0:         duktape-2.7.0-link-against-libm.patch
+
+BuildRequires:  gcc
+BuildRequires:  pkgconfig
+BuildRequires:  make
+
+%description
+Duktape is an embeddable Javascript engine, with a focus on portability and
+compact footprint.
+
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          programming
+Requires:       %{name} = %{version}
+
+%description    devel
+Embeddable Javascript engine.
+
+This package contains header files and libraries needed to develop
+application that use %{name}.
+
+
+%debug_package
+
+
+%prep
+%autosetup -p1
+
+cp -f %{SOURCE1000} ./
+
+
+%build
+%make_build -f Makefile.sharedlibrary INSTALL_PREFIX=%{_prefix} LIBDIR=/%{_lib}
+
+
+%install
+%make_install -f Makefile.sharedlibrary INSTALL_PREFIX=%{_prefix} LIBDIR=/%{_lib}
+
+
+%files
+%license LICENSE.txt
+%doc AUTHORS.rst ChangeLog.fedora
+%{_libdir}/libduktape.so.*
+%{_libdir}/libduktaped.so.*
+
+%files devel
+%doc examples/ README.rst
+%{_includedir}/duk_config.h
+%{_includedir}/duktape.h
+%{_libdir}/libduktape.so
+%{_libdir}/libduktaped.so
+%{_libdir}/pkgconfig/duktape.pc
+
+
+%changelog
+* Thu Jul 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.7.0-1
+- initial build for Vine Linux.

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

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

+ 5 - 8
g/gjs/gjs-vl.spec

@@ -1,9 +1,9 @@
-%define mozjs mozjs102
+%define mozjs mozjs115
 
 
 Summary:        Javascript binding for GNOME
 Summary:        Javascript binding for GNOME
 Summary(ja):    GNOME 向け JavaScript バインディング
 Summary(ja):    GNOME 向け JavaScript バインディング
 Name:           gjs
 Name:           gjs
-Version:        1.75.1
+Version:        1.81.1
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Group:          system
 Group:          system
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -69,12 +69,7 @@ Development files of the gjs library.
 #{__make} %{?_smp_mflags} check
 #{__make} %{?_smp_mflags} check
 
 
 
 
-%clean
-%{__rm} -rf %{buildroot}
-
-
 %files
 %files
-%defattr(-,root,root)
 %license COPYING
 %license COPYING
 %doc ChangeLog NEWS README
 %doc ChangeLog NEWS README
 %{_bindir}/gjs*
 %{_bindir}/gjs*
@@ -82,7 +77,6 @@ Development files of the gjs library.
 %{_libdir}/gjs/*
 %{_libdir}/gjs/*
 
 
 %files devel
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/gjs-1.0
 %{_includedir}/gjs-1.0
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
@@ -94,6 +88,9 @@ Development files of the gjs library.
 
 
 
 
 %changelog
 %changelog
+* Thu Jul 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.81.1-1
+- new upstream release.
+
 * Tue Nov 01 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.75.1-1
 * Tue Nov 01 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.75.1-1
 - new upstream release.
 - new upstream release.
 
 

+ 36 - 62
g/groff/groff-vl.spec

@@ -2,41 +2,43 @@
 # is uninstalled.
 # is uninstalled.
 %define cache_clean_ver 1.18.1.1-4%{?_dist_release}
 %define cache_clean_ver 1.18.1.1-4%{?_dist_release}
 
 
-%global _pkgdocdir %{_docdir}/%{name}-%{version}
 %global __requires_exclude perl\\(.*\\.pl\\)$
 %global __requires_exclude perl\\(.*\\.pl\\)$
 
 
 Summary: A document formatting system.
 Summary: A document formatting system.
 Summary(ja): GNU groff 日本語対応版
 Summary(ja): GNU groff 日本語対応版
 Name: groff
 Name: groff
-Version: 1.22.4
+Version: 1.23.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-License: GPL
-Group: Applications/Publishing
-URL: http://groff.ffii.org
+Group: publishing
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
 
-Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
+License: GPL-3.0-or-later AND GFDL-1.3-or-later AND BSD-4-Clause-UC AND MIT AND X11 AND LicenseRef-Fedora-Public-Domain
+URL: https://www.gnu.org/software/groff/
+Source0: https://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
 
 
 # resolves: #530788
 # resolves: #530788
 Patch0: 0001-missing-groff-x11-info-message-when-gxditview-not-fo.patch
 Patch0: 0001-missing-groff-x11-info-message-when-gxditview-not-fo.patch
 Patch1: 0002-load-site-font-and-site-tmac-from-etc-groff.patch
 Patch1: 0002-load-site-font-and-site-tmac-from-etc-groff.patch
+# resolves: #709413, #720058, #720057
+Patch2: 0003-various-security-fixes.patch
 # resolves: #987069
 # resolves: #987069
 Patch3: 0004-don-t-use-usr-bin-env-in-shebang.patch
 Patch3: 0004-don-t-use-usr-bin-env-in-shebang.patch
+# allow to specify custom docdir
+Patch4: 0005-do-not-overwrite-docdir.patch
+# Revert upstream change of mapping special characters for UTF-8 devices
+# Debian commit: https://salsa.debian.org/debian/groff/-/commit/d5394c68d70e6c5199b01d2522e094c8fd52e64e
+Patch5: 0006-Revert-upstream-change-of-mapping-special-characters.patch
 
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libX11-devel, libICE-devel, libSM-devel, libXext-devel
-BuildRequires: libXmu-devel, libXpm-devel, libXt-devel
-BuildRequires: libXaw-devel >= 1.0.5
-BuildRequires: psutils, byacc, imake, netpbm-progs, ghostscript
+BuildRequires: libXmu-devel
+BuildRequires: libXaw-devel
+BuildRequires: psutils, bison, imake, netpbm-progs, ghostscript
 BuildRequires: texinfo
 BuildRequires: texinfo
-Requires(post): install-info
-Requires(preun): install-info
 Requires(postun): findutils
 Requires(postun): findutils
 Obsoletes: groff-tools
 Obsoletes: groff-tools
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 %description
 Groff is a document formatting system.  Groff takes standard text and
 Groff is a document formatting system.  Groff takes standard text and
 formatting commands as input and produces formatted output.  The
 formatting commands as input and produces formatted output.  The
@@ -56,7 +58,7 @@ GNU roff (groff) 日本語対応版です。日本語で書かれたマニュア
 
 
 %package perl
 %package perl
 Summary: Parts of the groff formatting system that require Perl.
 Summary: Parts of the groff formatting system that require Perl.
-Group: Applications/Publishing
+Group: publishing
 Requires: %{name} = %{version}
 Requires: %{name} = %{version}
 Requires: mktemp
 Requires: mktemp
 
 
@@ -70,7 +72,7 @@ troff-to-ps print filter.
 
 
 %package gxditview
 %package gxditview
 Summary: An X previewer for groff text processor output.
 Summary: An X previewer for groff text processor output.
-Group: Applications/Publishing
+Group: publishing
 Requires: %{name} = %{version}
 Requires: %{name} = %{version}
 
 
 %description gxditview
 %description gxditview
@@ -82,15 +84,15 @@ gxditview so that you preview your processed text files in X.  You'll also
 need to install the groff package and the X Window System.
 need to install the groff package and the X Window System.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
-
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
+%autopatch -p1
 
 
 for file in NEWS src/devices/grolbp/grolbp.1.man doc/{groff.texi*,webpage.ms} \
 for file in NEWS src/devices/grolbp/grolbp.1.man doc/{groff.texi*,webpage.ms} \
-            contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom}
+            contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom,mom.vim}
 do
 do
     iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
     iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
     mv "${file}_" "$file"
     mv "${file}_" "$file"
@@ -101,20 +103,19 @@ done
 export PAGE=A4
 export PAGE=A4
 export YACC='bison -y'
 export YACC='bison -y'
 %configure \
 %configure \
-	--with-appresdir=%{_datadir}/X11/app-defaults \
+	--docdir=%{_pkgdocdir} \
+	--with-appdefdir=%{_datadir}/X11/app-defaults \
 	--with-grofferdir=%{_datadir}/%{name}/%{version}/groffer
 	--with-grofferdir=%{_datadir}/%{name}/%{version}/groffer
 
 
-make %{?_smp_mflags}
+%make_build
 
 
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
-%{__make} install DESTDIR=%{buildroot} \
-                  docdir=%{_docdir}/%{name}-%{version}
+%install
+%make_install
 
 
 # some binaries need alias with 'g' or 'z' prefix
 # some binaries need alias with 'g' or 'z' prefix
 
 
-for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} ; do
+for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim; do
         ln -s ${file#?} %{buildroot}%{_bindir}/${file}
         ln -s ${file#?} %{buildroot}%{_bindir}/${file}
         ln -s ${file#?}.1.gz %{buildroot}%{_mandir}/man1/${file}.1.gz
         ln -s ${file#?}.1.gz %{buildroot}%{_mandir}/man1/${file}.1.gz
 done
 done
@@ -130,7 +131,6 @@ for file in $(find %{buildroot}%{_datadir}/%{name}/%{version}/font/devps -name "
 done
 done
 sed --in-place 's/\.pfa$/.pfa_/' %{buildroot}%{_datadir}/%{name}/%{version}/font/devps/download
 sed --in-place 's/\.pfa$/.pfa_/' %{buildroot}%{_datadir}/%{name}/%{version}/font/devps/download
 
 
-
 # perl dependent files in /usr/bin will be in separate package
 # perl dependent files in /usr/bin will be in separate package
 
 
 rm -f files-perl files-nonperl
 rm -f files-perl files-nonperl
@@ -158,68 +158,39 @@ install -m644 doc/groff.info* $RPM_BUILD_ROOT%{_infodir}
 # remove unnecessary files and fix privileges
 # remove unnecessary files and fix privileges
 rm -f %{buildroot}%{_infodir}/dir
 rm -f %{buildroot}%{_infodir}/dir
 
 
-# fix privileges
-chmod 755 %{buildroot}%{_datadir}/groff/%{version}/groffer/version.sh
-chmod 755 %{buildroot}%{_datadir}/groff/%{version}/font/devlj4/generate/special.awk
-
 # remove CreationDate from documentation
 # remove CreationDate from documentation
 pushd %{buildroot}%{_pkgdocdir}
 pushd %{buildroot}%{_pkgdocdir}
     find -name "*.html" | xargs sed -i "/^<!-- CreationDate: /d"
     find -name "*.html" | xargs sed -i "/^<!-- CreationDate: /d"
     find -name "*.ps"   | xargs sed -i "/^%%%%CreationDate: /d"
     find -name "*.ps"   | xargs sed -i "/^%%%%CreationDate: /d"
 popd
 popd
 
 
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-
-%post
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/groff.info.gz ||:
-
-
-%preun
-if [ "$1" = 0 ]; then
-    /sbin/install-info --delete \
-	--info-dir=%{_infodir} %{_infodir}/groff.info.gz ||:
-fi
 
 
 %triggerpostun -- %{name} <= %{cache_clean_ver}
 %triggerpostun -- %{name} <= %{cache_clean_ver}
 find %{_var}/cache/man -type f -name "*.bz2" -exec %{__rm} -f {} \;
 find %{_var}/cache/man -type f -name "*.bz2" -exec %{__rm} -f {} \;
 
 
+
 %files -f files-nonperl
 %files -f files-nonperl
-%defattr(-,root,root)
 %license COPYING FDL LICENSES
 %license COPYING FDL LICENSES
+%doc %{_pkgdocdir}/*
 %doc BUG-REPORT MORE.STUFF NEWS PROBLEMS
 %doc BUG-REPORT MORE.STUFF NEWS PROBLEMS
-%doc doc/*.html doc/*.css doc/*xpm doc/img
 %dir %{_sysconfdir}/groff/
 %dir %{_sysconfdir}/groff/
 %dir %{_sysconfdir}/groff/site-font
 %dir %{_sysconfdir}/groff/site-font
 %dir %{_sysconfdir}/groff/site-tmac
 %dir %{_sysconfdir}/groff/site-tmac
 %config(noreplace) %{_sysconfdir}/groff/site-tmac/*
 %config(noreplace) %{_sysconfdir}/groff/site-tmac/*
-%dir %{_libdir}/groff
-%{_libdir}/groff/groff_opts_no_arg.txt
-%{_libdir}/groff/groff_opts_with_arg.txt
 %{_datadir}/groff/
 %{_datadir}/groff/
 # manpages for binaries are covered by -f
 # manpages for binaries are covered by -f
 %{_mandir}/man1/grohtml.*
 %{_mandir}/man1/grohtml.*
 %{_mandir}/man5/*
 %{_mandir}/man5/*
 %{_mandir}/man7/*
 %{_mandir}/man7/*
 %{_infodir}/groff.info*
 %{_infodir}/groff.info*
-%exclude %{_datadir}/groff/%{version}/groffer
 %exclude %{_bindir}/gxditview
 %exclude %{_bindir}/gxditview
 %exclude %{_bindir}/xtotroff
 %exclude %{_bindir}/xtotroff
 %exclude %{_mandir}/man1/gxditview.*
 %exclude %{_mandir}/man1/gxditview.*
 %exclude %{_mandir}/man1/xtotroff.*
 %exclude %{_mandir}/man1/xtotroff.*
 
 
-
 %files perl -f files-perl
 %files perl -f files-perl
-%defattr(-,root,root)
-%{_datadir}/groff/%{version}/groffer/
-%{_libdir}/groff/glilypond
-%{_libdir}/groff/gpinyin
-%{_libdir}/groff/grog
-
 
 
 %files gxditview
 %files gxditview
-%defattr(-,root,root)
 %{_bindir}/gxditview
 %{_bindir}/gxditview
 %{_bindir}/xtotroff
 %{_bindir}/xtotroff
 %{_datadir}/X11/app-defaults/GXditview
 %{_datadir}/X11/app-defaults/GXditview
@@ -229,6 +200,9 @@ find %{_var}/cache/man -type f -name "*.bz2" -exec %{__rm} -f {} \;
 
 
 
 
 %changelog
 %changelog
+* Fri Jul 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.23.0-1
+- new upstream release.
+
 * Mon May 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.4-1
 * Mon May 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.4-1
 - new upstream release.
 - new upstream release.
 - dropped all patches.
 - dropped all patches.

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

@@ -1,9 +1,7 @@
-%bcond_without tipc
-
 Summary:        Advanced IP routing and network device configuration tools
 Summary:        Advanced IP routing and network device configuration tools
 Summary(ja):    IP ルーティング,ネットワークデバイスの設定ツール
 Summary(ja):    IP ルーティング,ネットワークデバイスの設定ツール
 Name:           iproute
 Name:           iproute
-Version:        5.14.0
+Version:        6.10.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Group:          system,network,admin-tools
 Group:          system,network,admin-tools
 Vendor:         Project Vine
 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)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison flex
 BuildRequires: bison flex
+BuildRequires: elfutils-libelf-devel
 BuildRequires: iptables-devel >= 1.4.10
 BuildRequires: iptables-devel >= 1.4.10
-BuildRequires: libdb-devel
+BuildRequires: libbpf-devel
+BuildRequires: libmnl-devel
 BuildRequires: libpcap-devel
 BuildRequires: libpcap-devel
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig
-%if %{with tipc}
-BuildRequires: libmnl-devel
-%endif
 
 
 Requires: iptables >= 1.4.10
 Requires: iptables >= 1.4.10
+Obsoletes: arpd < 6.0.0
+Obsoletes: iproute2-doc < 6.0.0
 
 
 %description
 %description
 The iproute package contains networking utilities (ip and rtmon, for example)
 The iproute package contains networking utilities (ip and rtmon, for example)
@@ -35,16 +34,6 @@ kernel.
 設計されたネットワーキングユーティリティ(ip, rtmon等々)が収録されています。
 設計されたネットワーキングユーティリティ(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
 %package devel
 Summary: Libraries, includes, etc. to develop iptables
 Summary: Libraries, includes, etc. to develop iptables
 Summary(ja): iproute の開発用ライブラリ,ヘッダファイル
 Summary(ja): iproute の開発用ライブラリ,ヘッダファイル
@@ -55,18 +44,6 @@ Requires: %{name} = %{version}
 Libraries, include files, etc you can use to develop iproute2.
 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
 %debug_package
 
 
 
 
@@ -75,43 +52,43 @@ casting due to limited size of the kernel ARP cache.
 
 
 
 
 %build
 %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
 %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
 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/
   mv -f %{buildroot}%{_sbindir}/$f %{buildroot}/sbin/
 done
 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
 %files
 %license COPYING
 %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/*
 /sbin/*
 %{_sbindir}/*
 %{_sbindir}/*
 %exclude %{_sbindir}/arpd
 %exclude %{_sbindir}/arpd
@@ -124,11 +101,6 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 %{_mandir}/man8/*
 %{_mandir}/man8/*
 %exclude %{_mandir}/man8/arpd.8*
 %exclude %{_mandir}/man8/arpd.8*
 
 
-%files doc
-%license COPYING
-%doc doc/*
-%doc examples
-
 %files devel
 %files devel
 %license COPYING
 %license COPYING
 %{_mandir}/man3/*
 %{_mandir}/man3/*
@@ -136,13 +108,11 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 %{_includedir}/libnetlink.h
 %{_includedir}/libnetlink.h
 %{_includedir}/iproute2/bpf_elf.h
 %{_includedir}/iproute2/bpf_elf.h
 
 
-%files -n arpd
-%license COPYING
-%{_sbindir}/arpd
-%{_mandir}/man8/arpd.8*
-
 
 
 %changelog
 %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
 * Sat Oct 30 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.14.0-1
 - new upstream release.
 - new upstream release.
 
 

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

@@ -44,7 +44,7 @@
 #
 #
 %define majorver 6
 %define majorver 6
 %define sublevel 6
 %define sublevel 6
-%define patchlevel 40
+%define patchlevel 44
 %define kversion %{majorver}.%{sublevel}
 %define kversion %{majorver}.%{sublevel}
 %define rpmversion %{majorver}.%{sublevel}.%{patchlevel}
 %define rpmversion %{majorver}.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -1192,6 +1192,18 @@ fi
 
 
 
 
 %changelog
 %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.
+
+* Fri Jul 26 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.6.42-1
+- updated to 6.6.42.
+
+* Fri Jul 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.6.41-1
+- updated to 6.6.41.
+
 * Mon Jul 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.6.40-1
 * Mon Jul 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.6.40-1
 - updated to 6.6.40.
 - updated to 6.6.40.
 
 

+ 7 - 1
l/logwatch/logwatch-vl.spec

@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Summary: A log file analysis program
 Summary(ja): ログファイル分析プログラム
 Summary(ja): ログファイル分析プログラム
 Name: logwatch
 Name: logwatch
-Version: 7.10
+Version: 7.11
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
@@ -10,6 +10,7 @@ Distribution: Vine Linux
 License: MIT
 License: MIT
 URL: https://sourceforge.net/projects/logwatch/
 URL: https://sourceforge.net/projects/logwatch/
 Source: https://downloads.sourceforge.net/project/logwatch/logwatch-%{version}/logwatch-%{version}.tar.gz
 Source: https://downloads.sourceforge.net/project/logwatch/logwatch-%{version}/logwatch-%{version}.tar.gz
+Patch0: logwatch-openssh-9.8.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildArch: noarch
@@ -31,6 +32,7 @@ Logwatch はカスタマイズやプラグイン拡張ができるログ監視
 
 
 %prep
 %prep
 %setup -q
 %setup -q
+%autopatch -p1
 
 
 
 
 %build
 %build
@@ -159,6 +161,10 @@ rm -rf %{buildroot}
 
 
 
 
 %changelog
 %changelog
+* Sat Jul 27 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.11-1
+- new upstream release.
+- modified scripts for openssh >= 9.8.
+
 * Tue Jun 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.10-1
 * Tue Jun 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.10-1
 - new upstream release.
 - new upstream release.
 
 

+ 4 - 5
l/lz4/lz4-vl.spec

@@ -1,6 +1,6 @@
 Name:           lz4
 Name:           lz4
 Summary:        Extremely fast compression algorithm
 Summary:        Extremely fast compression algorithm
-Version:        1.9.4
+Version:        1.10.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Group:          accessories
 Group:          accessories
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -63,10 +63,6 @@ rm -rf %{buildroot}
 %make_install LIBDIR=%{_libdir} PREFIX=%{_prefix} INSTALL="install -p"
 %make_install LIBDIR=%{_libdir} PREFIX=%{_prefix} INSTALL="install -p"
 
 
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
 %files
 %license programs/COPYING
 %license programs/COPYING
 %doc NEWS
 %doc NEWS
@@ -95,6 +91,9 @@ rm -rf %{buildroot}
 
 
 
 
 %changelog
 %changelog
+* Mon Jul 22 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.10.0-1
+- new upstream release.
+
 * Wed Aug 17 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.9.4-1
 * Wed Aug 17 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.9.4-1
 - new upstream release.
 - new upstream release.
 - dropped Patch1000: fixed in upstream.
 - dropped Patch1000: fixed in upstream.

+ 4 - 1
lib/libn/libnl3/libnl3-vl.spec

@@ -1,7 +1,7 @@
 Name: libnl3
 Name: libnl3
 Summary: Convenience library for kernel netlink sockets
 Summary: Convenience library for kernel netlink sockets
 Summary(ja): Netlink ソケットの利用に便利なライブラリ
 Summary(ja): Netlink ソケットの利用に便利なライブラリ
-Version: 3.9.0
+Version: 3.10.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
@@ -88,6 +88,9 @@ find %{buildroot} -name \*.la -delete
 
 
 
 
 %changelog
 %changelog
+* Fri Jul 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.10.0-1
+- new upstream release.
+
 * Mon Dec 04 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.9.0-1
 * Mon Dec 04 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.9.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 570 - 0
m/moby-engine/moby-engine-vl.spec

@@ -0,0 +1,570 @@
+%bcond_with systemd
+%bcond_with man
+
+# moby
+%global goipath_moby github.com/docker/docker
+%global git_moby https://%%{goipath_moby}
+#%%global commit_moby 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d
+#%%global shortcommit_moby %%(c=%%{commit_moby}; echo ${c:0:7})
+
+# cli
+%global goipath_cli github.com/docker/cli
+%global git_cli https://%%{goipath_cli}
+#%%global commit_cli baeda1f82a10204ec5708d5fbba130ad76cfee49
+#%%global shortcommit_cli %%(c=%%{commit_cli}; echo ${c:0:7})
+
+# tini
+%global git_tini https://github.com/krallin/tini
+%global commit_tini 0b44d3665869e46ccbac7414241b8256d6234dc4
+%global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7})
+
+Name:           moby-engine
+Summary:        The open-source application container engine
+Version:        27.1.1
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          virtualization
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        Apache-2.0
+URL:            https://www.docker.com
+Source0:        %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz
+Source1:        %{git_cli}/archive/refs/tags/v%{version}.tar.gz#/cli-%{version}.tar.gz
+Source2:        %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz
+Source3:        docker.service
+Source4:        docker.sysconfig
+Source5:        moby-engine-systemd-sysusers.conf
+
+Source100:      docker.init
+Source101:      docker.sysconfig-sysvinit
+
+# Specfile license
+Source200:      moby-engine.spec.license
+
+ExclusiveArch:  i686 x86_64
+
+BuildRequires:  containerd
+BuildRequires:  btrfs-progs-devel
+BuildRequires:  device-mapper-devel
+BuildRequires:  golang
+BuildRequires:  pkgconfig(libseccomp) >= 2.3.0
+BuildRequires:  make
+BuildRequires:  pkgconfig(audit)
+
+# Build dependencies for tini
+BuildRequires:  cmake
+BuildRequires:  glibc-static
+
+# required packages on install
+Requires:       containerd
+Requires:       iptables
+Requires:       runc
+Requires:       tar
+Requires:       xz
+
+%if %{with systemd}
+BuildRequires:  systemd-devel
+#BuildRequires:  firewalld-filesystem
+Requires:       systemd
+%endif
+
+# Replace the old Docker packages
+Provides:       docker = %{version}-%{release}
+Provides:       docker-latest = %{version}-%{release}
+
+# conflicting packages
+Conflicts:      docker-ce
+Conflicts:      docker-ce-cli
+Conflicts:      docker-common
+Conflicts:      docker-ee
+Conflicts:      docker-engine-cs
+Conflicts:      docker-io
+Conflicts:      podman-docker
+
+%description
+Docker is an open source project to build, ship and run any application as a
+lightweight container.
+
+Docker containers are both hardware-agnostic and platform-agnostic. This means
+they can run anywhere, from your laptop to the largest EC2 compute instance and
+everything in between - and they don't require you to use a particular
+language, framework or packaging system. That makes them great building blocks
+for deploying and scaling web apps, databases, and backend services without
+depending on a particular stack or provider.
+
+
+%package nano
+Summary:        GNU nano syntax highlighting files for Moby
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Requires:       nano
+
+%description nano
+This package installs %{summary}.
+
+
+%prep
+%setup -q -a 1 -a 2 -n moby-%{version}
+
+# correct rpmlint errors for bash completion
+sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker
+
+
+%build
+mkdir -p _build/bin
+mkdir -p src/github.com/docker
+ln -sf `pwd` src/github.com/docker/docker
+
+# build docker-proxy / libnetwork
+(
+
+        # Build binary using `golang-github-docker-libnetwork-devel`
+        # (github.com/docker/libnetwork) installed in system GOPATH.
+        export GOPATH="%{_datadir}/gocode:"`pwd`
+        export GO111MODULE=off
+        go build -o _build/bin/docker-proxy github.com/docker/docker/cmd/docker-proxy
+)
+
+# build tini (installed as docker-init)
+(
+        cd tini-%{commit_tini}
+        %cmake
+        make tini-static -C "%{__cmake_builddir}"
+)
+
+%global buildtime %(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +"%Y-%m-%dT%H:%M:%SZ")
+# build engine
+(
+        mkdir -p src/github.com/docker
+        # Link source and vendored deps into local GOPATH.
+        ln -fns ../../.. src/%{goipath_moby}
+        # Build using source and vendored deps in local GOPATH.
+        export GOPATH="${PWD}"
+        export GO111MODULE=off
+        export LDFLAGS="-s -w"
+        export LDFLAGS+=" -X github.com/docker/docker/dockerversion.Version=%{version}"
+        export LDFLAGS+=" -X github.com/docker/docker/dockerversion.GitCommit=%{shortcommit_moby}"
+        export LDFLAGS+=" -X github.com/docker/docker/dockerversion.IAmStatic=false"
+        export LDFLAGS+=" -X 'github.com/docker/docker/dockerversion.BuildTime=%{buildtime}'"
+        export DOCKER_BUILDTAGS="seccomp selinux journald"
+        export BUILDTAGS="${DOCKER_BUILDTAGS}"
+        export GOBUILDTAGS="${BUILDTAGS}"
+        go build -o _build/bin/dockerd %{goipath_moby}/cmd/dockerd
+        # VERSION=%%{version} DOCKER_GITCOMMIT=%%{shortcommit_moby} bash sh dynbinary
+        # mv bundles/dynbinary-daemon/dockerd-%%{version} _build/bin/dockerd
+)
+
+# build cli
+(
+        cd cli-%{version}
+        mkdir -p src/github.com/docker
+        # Link source and vendored deps into local GOPATH.
+        ln -fns ../../.. src/%{goipath_cli}
+        # export DISABLE_WARN_OUTSIDE_CONTAINER=1
+        # Build using source and vendored deps in local GOPATH.
+        export GOPATH="${PWD}"
+        export GO111MODULE=off
+        export LDFLAGS="\
+            -w \
+            -X \"github.com/docker/cli/cli/version.GitCommit=%{shortcommit_cli}\" \
+            -X \"github.com/docker/cli/cli/version.BuildTime=%{buildtime}\" \
+            -X \"github.com/docker/cli/cli/version.Version=%{version}\" \
+    "
+        export BUILDTAGS="pkcs11"
+        export GOBUILDTAGS="${BUILDTAGS}"
+        go build -o ../_build/bin/docker %{goipath_cli}/cmd/docker
+        # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary
+)
+
+%install
+# install binary
+install -Dpm 755 _build/bin/docker _build/bin/dockerd -t %{buildroot}%{_bindir}/
+
+# install proxy
+install -Dpm 755 _build/bin/docker-proxy -t %{buildroot}%{_libexecdir}/docker/
+
+# install tini
+install -Dpm 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/docker/docker-init
+
+# install udev rules
+install -Dpm 644 contrib/udev/80-docker.rules -t %{buildroot}%{_usr}/lib/udev/rules.d/
+
+%if %{with systemd}
+# add init scripts
+install -Dpm 644 %{SOURCE3} contrib/init/systemd/docker.socket -t %{buildroot}%{_unitdir}/
+
+# for additional args
+install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/docker
+
+# Install sysusers configuration
+install -Dpm 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/moby-engine.conf
+%else
+# for additional args
+install -Dpm 755 %{SOURCE100} %{buildroot}%{_initdir}/docker
+install -Dpm 644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/docker
+%endif
+
+# add bash completions
+install -Dpm 644 cli-%{version}/contrib/completion/bash/docker -t %{buildroot}%{_datadir}/bash-completion/completions/
+
+# add nano files
+install -Dpm 644 contrib/syntax/nano/Dockerfile.nanorc -t %{buildroot}%{_datadir}/nano/
+
+for cli_file in LICENSE MAINTAINERS NOTICE README.md; do
+    cp "cli-%{version}/$cli_file" "cli-$cli_file"
+done
+
+
+%pre
+%if %{with systemd}
+%sysusers_create_compat %{SOURCE5}
+%else
+if ! getent group docker > /dev/null; then
+    groupadd --system docker
+fi
+%endif
+
+%post
+%if %{with systemd}
+if [ ! -L /var/run -a ! -e /var/run/docker ]; then
+  ln -sf /run/docker /var/run/docker
+fi
+%systemd_post docker.service docker.socket
+%else
+if [ $1 -eq 1 ]; then
+  /sbin/chkconfig --add docker
+fi
+%endif
+
+%preun
+%if %{with systemd}
+%systemd_preun docker.service docker.socket
+%else
+if [ $1 -eq 0 -o -x /usr/bin/systemctl ]; then
+  /sbin/chkconfig docker off
+  /sbin/chkconfig --del docker
+fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart docker.service
+%endif
+
+
+%files
+%license LICENSE cli-LICENSE
+%doc AUTHORS CONTRIBUTING.md MAINTAINERS NOTICE README.md
+%doc cli-MAINTAINERS cli-NOTICE cli-README.md
+%config(noreplace) %{_sysconfdir}/sysconfig/docker
+%{_bindir}/docker
+%{_bindir}/dockerd
+%dir %{_libexecdir}/docker/
+%{_libexecdir}/docker/docker-proxy
+%{_libexecdir}/docker/docker-init
+%{_usr}/lib/udev/rules.d/80-docker.rules
+%{_datadir}/bash-completion/completions/docker
+%if %{with man}
+%{_mandir}/man1/docker*.1*
+%{_mandir}/man5/{Dockerfile,docker-config-json}.5*
+%{_mandir}/man8/dockerd.8*
+%endif
+%if %{with systemd}
+%{_unitdir}/docker.service
+%{_unitdir}/docker.socket
+%{_sysusersdir}/moby-engine.conf
+%else
+%{_initdir}/docker
+%endif
+
+%files nano
+%dir %{_datadir}/nano
+%{_datadir}/nano/Dockerfile.nanorc
+
+
+%changelog
+* Wed Jul 24 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.1.1-1
+
+* Tue Jul 23 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.1.0-1
+- new upstream release.
+
+* Thu Jul 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.0.3-2
+- added i686 support.
+
+* Mon Jul 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 27.0.3-1
+- initial build for Vine Linux.
+
+* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 24.0.5-4
+- Rebuild for golang 1.22.0
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Aug 23 2023 LuK1337 <priv.luk@gmail.com> - 24.0.5-1
+- Update moby-engine to 24.0.5
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jan 29 2023 John Ghatas <john@johnghatas.com>
+- Update moby-engine to 23.0.4
+
+* Sun Jan 29 2023 Sérgio Basto <sergio@serjux.com>
+- Update moby-engine to 20.10.23
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sun Jan 01 2023 Sérgio Basto <sergio@serjux.com>
+- Update moby-engine to 20.10.22
+
+* Wed Dec 14 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 20.10.21-1
+- Update to 20.10.21
+- Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta
+
+* Thu Oct 20 2022 Jan Kuparinen <copperi@fedoraproject.org> - 20.10.20-1
+- Update to 20.10.20.
+- Mitigates CVE-2022-39253
+
+* Tue Oct 18 2022 Jan Kuparinen <copperi@fedoraproject.org> - 20.10.19-1
+- Update to 20.10.19.
+
+* Sat Sep 10 2022 Maxwell G <gotmax@e.email> - 20.10.18-1
+- Update to 20.10.18.
+- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4
+
+* Tue Aug 30 2022 Luca BRUNO <lucab@lucabruno.net> - 20.10.17-8
+- Move 'docker' group creation logic to a sysusers.d fragment
+  Resolves: rhbz#1745936
+
+* Fri Aug 05 2022 Maxwell G <gotmax@e.email> - 20.10.17-7
+- Migrate to SPDX license identifiers
+- Generate debuginfo
+- Specfile improvements
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 20.10.17-5
+- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in
+  golang
+
+* Mon Jul 04 2022 Maxwell G <gotmax@e.email> - 20.10.17-4
+- Only build on %%golang_arches (i.e. where golang is available).
+
+* Sun Jun 19 2022 Maxwell G <gotmax@e.email> - 20.10.17-3
+- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
+  CVE-2022-29526, CVE-2022-30629.
+
+* Sat Jun 11 2022 Maxwell G <gotmax@e.email> - 20.10.17-2
+- Rebuild for new golang-github-docker-libnetwork
+
+* Fri Jun 10 2022 Maxwell G <gotmax@e.email> - 20.10.17-1
+- Update to 20.10.17. Fixes rhbz#2095714.
+
+* Fri May 13 2022 Maxwell G <gotmax@e.email> - 20.10.16-1
+- Update to 20.10.16.
+
+* Sat May 07 2022 Maxwell G <gotmax@e.email> - 20.10.15-1
+- Update to 20.10.15 (rhbz#2082501).
+- Fix BUILDTAGS (rhbz#2082924).
+- Make non-binary subpackages noarch.
+
+* Mon Apr 11 2022 Maxwell G <gotmax@e.email> - 20.10.14-1
+- Update to 20.10.14. Fixes rhbz#2063052.
+- Mitigate CVE-2022-24769.
+
+* Mon Jan 31 2022 Maxwell G <gotmax@e.email> - 20.10.12-3
+- Fixes FTBFS. Closes rhbz#2046748.
+- Use %%gobuild instead of Makefile to build binaries
+- Add explanatory comments.
+- Normalize install commands
+- Make compliant with SourceURL Guidelines
+- Remove no longer necessary `ExcludeArch: ppc64`.
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 11 2022 Maxwell G <gotmax@e.email> - 20.10.12-1
+- Update to 20.10.12. Fixes rhbz#2032534.
+- Install zsh completions to the correct directory. Fixes rhbz#2038888.
+
+* Mon Nov 22 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10-11-1
+- Update to upstream 20.10.11 (fixes rhbz#2024384)
+- Mitigates CVE-2021-41190 (fixes rhbz#2024940)
+
+* Fri Oct 29 2021 Maxwell G <gotmax@e.email> - 20.10.10-1
+- Update to 20.10.10 (fixes rhbz#2015385)
+- Update virtual provides
+
+* Fri Oct 08 2021 Maxwell G <gotmax@e.email> - 20.10.9-1
+- Update to 20.10.9 (fixes rhbz#2010508)
+- Patch seccomp policy to fix clone3() issue (fixes rhbz#2011523 and rhbz#1988199)
+
+* Sun Aug 15 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.8-1
+- Update to upstream 20.10.8 (fixes rhbz#1990148)
+- Fix seccomp support (fixes rhbz#1986092)
+
+* Sun Aug 15 2021 Dusty Mabe <dusty@dustymabe.com> - 20.10.7-3
+- Remove `Requires(post)` on firewalld-filesystem.
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jul 16 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.7-1
+- Update to upstream 20.10.7 (fixes rhbz#1967390)
+
+* Tue May 04 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.6-2
+- Add conflict with podman-docker
+
+* Tue Apr 20 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.6-1
+- Update to upstream 20.10.6 (#1948605)
+- Re-bundle moby dependencies to fix gRPC issues with Swarm
+  (https://github.com/coreos/fedora-coreos-tracker/issues/793)
+
+* Sun Mar 14 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.5-1
+- Update to latest upstream 20.10.5 - fixes #1903426
+- Upstream brings compatibility with cgroups v2 - fixes #1746355
+- Remove package moby-engine-vim (dockerfile.vim has been merged in upstream vim)
+- Remove firewalld docker zone, since dockerd can now communicate with firewalld - fixes #1852680
+- Build dockerd and docker-proxy from unbundled source packages
+- Remove fixed storage-driver (cf. https://src.fedoraproject.org/rpms/moby-engine/pull-request/6)
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 19.03.13-3.ce.git4484c46
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.13-2.ce.git4484c46
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.13-1.ce.git4484c46
+- Update to upstream 19.03.13 (#1837641)
+
+* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-4.ce.git42e35e6
+- Fix FTBFS: adapt to change to CMake builds (#1864160)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.11-3.ce.git42e35e6
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.11-2.ce.git42e35e6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-1.ce.git42e35e6
+- Update to upstream 19.03.11 to prevent CVE-2020-13401
+
+* Thu May 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.8-2.ce.gitafacb8b
+- Configure storage-driver explicitely (fixes #1832301)
+- Add firewalld zone: trust interface docker0, as firewalld now uses nftables
+  by default and docker communicates with iptables (fixes #1817022)
+
+* Mon Mar 16 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.8-1.ce.gitafacb8b
+- Update to latest upstream release - Docker CE 19.03.8
+- Prune unused BuildRequires
+
+* Sun Mar 8 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.7-2.ce.git7141c19
+- Add Conflicts with docker-ce-cli and Obsoletes docker-common
+
+* Sat Mar 7 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.7-1.ce.git7141c19
+- Update to latest upstream release - Docker CE 19.03.7
+- Add Epoch: 2 to Obsoletes for docker and docker-latest
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18.09.8-3.ce.git0dd43dd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.09.8-2.ce.git0dd43dd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 18 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.8-1.ce.git0dd43dd
+- Update to latest upstream release - Docker CE 18.09.8
+
+* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-5.ce.git2d0083d
+- Move docker-init and docker-proxy to /usr/libexec/docker
+- Update moby-engine-nano summary to follow guidelines
+
+* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-4.ce.git2d0083d
+- Add nofile ulimit to default docker daemon options (#1715254, #1708115)
+
+* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-3.ce.git2d0083d
+- rebuilt
+
+* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-2.ce.git2d0083d
+- Depend on packaged versions "runc" and "containerd" instead of building them.
+
+* Thu Jun 27 2019 David Michael <dm0@redhat.com> - 18.09.7-1.ce.git2d0083d
+- Update docker-ce to commit 2d0083d (version 18.09.7).
+- Update runc to commit 425e105.
+- Update containerd to commit 894b81a (1.2.6).
+- Update docker-proxy to commit e7933d4.
+
+* Tue May 14 2019 David Michael <dm0@redhat.com> - 18.09.6-1.ce.git481bc77
+- Update docker-ce to commit 481bc77 (version 18.09.6).
+- Update docker-proxy to commit 872f0a8.
+- Obsolete and provide the docker and docker-latest packages. (#1700006)
+
+* Thu Apr 11 2019 David Michael <dm0@redhat.com> - 18.09.5-1.ce.gite8ff056
+- Update docker-ce to commit e8ff056 (version 18.09.5).
+- Update docker-runc to commit 2b18fe1.
+- Update docker-containerd to commit bb71b10 (version 1.2.5).
+- Update docker-proxy to commit 4725f21.
+- Report the correct engine version.
+- Install symlinks to unprefixed runc/containerd program names.
+
+* Thu Mar 28 2019 David Michael <dm0@redhat.com> - 18.06.3-2.ce.gitd7080c1
+- Conflict with docker-common. (#1693397)
+
+* Thu Feb 21 2019 David Michael <dm0@redhat.com> - 18.06.3-1.ce.gitd7080c1
+- Update docker-ce to commit d7080c1 (version 18.06.3).
+
+* Tue Feb 12 2019 David Michael <dm0@redhat.com> - 18.06.2-1.ce.git6d37f41
+- Update docker-ce to commit 6d37f41 (version 18.06.2).
+- Update docker-runc to commit a592beb.
+
+* Mon Feb 11 2019 David Michael <dm0@redhat.com> - 18.06.1-3.ce.gite68fc7a
+- Apply a runc patch for CVE-2019-5736.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.06.1-2.ce.gite68fc7a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 29 2018 David Michael <dm0@redhat.com> - 18.06.1-1.ce.gite68fc7a
+- Update docker-ce to commit e68fc7a (version 18.06.1).
+- Update docker-runc to commit 69663f0.
+- Update docker-containerd to commit 468a545 (version 1.1.2).
+- Update docker-proxy to commit 3ac297b.
+- Backport a fix for mounting named volumes.
+- Create a "docker" group for non-root Docker access.
+- Support systemd socket-activation.
+- Make runc and containerd commit IDs match their expected values.
+- Preserve containerd debuginfo.
+
+* Mon Nov 12 2018 Marcin Skarbek <rpm@skarbek.name> - 18.06.0-2.ce.git0ffa825
+- add configuration file
+- update service file
+
+* Sat Aug 18 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 18.06.0-1.ce.git0ffa825
+- Resolves: #1539161 - first upload to Fedora
+- built docker-ce commit 0ffa825
+- built docker-runc commit ad0f5255
+- built docker-containerd commit a88b631
+- built docker-proxy commit a79d368
+- built docker-init commit fec3683
+
+* Tue Mar 20 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-4.ce.gitf5ec1e2
+- correct some rpmlint errors
+
+* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-3.ce
+- docker-* symlinks to moby-* (RE: gh PR 34226)
+
+* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-2.ce
+- rename binaries as per upstream gh PR 34226
+
+* Fri Jan 26 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-1
+- initial build
+- built moby commit f5ec1e2
+- built cli commit 4b61f56
+- built docker-runc commit 2d41c047
+- built docker-containerd commit 3addd84
+- built docker-proxy commit 7b2b1fe

+ 19 - 2
m/mozjs115/mozjs115-vl.spec

@@ -1,7 +1,13 @@
 %global major 115
 %global major 115
 
 
+%bcond_with bootstrap
+%if %{with bootstrap}
+%define bootstrap_number 1
+%else
 # LTO - Enable in Release builds, but consider disabling for development as it increases compile time
 # LTO - Enable in Release builds, but consider disabling for development as it increases compile time
 %global build_with_lto    1
 %global build_with_lto    1
+%endif
+
 
 
 # Require tests to pass?
 # Require tests to pass?
 %global require_tests     0
 %global require_tests     0
@@ -18,8 +24,8 @@
 %endif
 %endif
 
 
 Name:           mozjs%{major}
 Name:           mozjs%{major}
-Version:        115.4.0
-Release:        1%{?_dist_release}
+Version:        115.13.0
+Release:        1%{?with_bootstrap:~bootstrap%{bootstrap_number}}%{?_dist_release}
 Summary:        SpiderMonkey JavaScript library
 Summary:        SpiderMonkey JavaScript library
 
 
 License:        MPL-2.0 AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-3.0-or-later
 License:        MPL-2.0 AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-3.0-or-later
@@ -55,6 +61,9 @@ Patch20:        spidermonkey_checks_disable.patch
 # s390x/ppc64 fixes
 # s390x/ppc64 fixes
 Patch21:        0001-Skip-failing-tests-on-ppc64-and-s390x.patch
 Patch21:        0001-Skip-failing-tests-on-ppc64-and-s390x.patch
 
 
+# Tests Fixes
+Patch30:        tests-Replace-pipes-with-shlex-for-Python-3.13.patch
+
 BuildRequires:  cargo
 BuildRequires:  cargo
 BuildRequires:  ccache
 BuildRequires:  ccache
 BuildRequires:  clang-devel
 BuildRequires:  clang-devel
@@ -80,6 +89,11 @@ BuildRequires:  readline-devel
 BuildRequires:  wget
 BuildRequires:  wget
 BuildRequires:  zip
 BuildRequires:  zip
 
 
+%if %{without bootstrap}
+Obsoletes: mozjs78 < 115.0.0
+Obsoletes: mozjs102 < 115.0.0
+%endif
+
 %description
 %description
 SpiderMonkey is the code-name for Mozilla Firefox's C++ implementation of
 SpiderMonkey is the code-name for Mozilla Firefox's C++ implementation of
 JavaScript. It is intended to be embedded in other applications
 JavaScript. It is intended to be embedded in other applications
@@ -237,6 +251,9 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
 
 
 
 
 %changelog
 %changelog
+* Thu Jul 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 115.13.0-1
+- new upstream release.
+
 * Wed Nov 01 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 115.4.0-1
 * Wed Nov 01 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 115.4.0-1
 - new upstream release.
 - new upstream release.
 
 

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

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

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

@@ -37,7 +37,7 @@
 Name: php%{majorver}
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 8.2.21
+Version: 8.2.22
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
@@ -434,6 +434,12 @@ mkdir build-cgi build-fpm build-apache2
 
 
 #======================================================================
 #======================================================================
 %build
 %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)
 # Regenerate configure scripts (patches change config.m4's)
 # ./buildconf --force
 # ./buildconf --force
 
 
@@ -899,6 +905,9 @@ rm -f files.*
 
 
 #======================================================================
 #======================================================================
 %changelog
 %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
 * Fri Jul 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.21-1
 - new upstream release.
 - new upstream release.
 
 

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

@@ -37,7 +37,7 @@
 Name: php%{majorver}
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 8.3.9
+Version: 8.3.10
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
@@ -434,8 +434,11 @@ mkdir build-cgi build-fpm build-apache2
 
 
 #======================================================================
 #======================================================================
 %build
 %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}
 # Install extension modules in %{_libdir}/%{_name}
 export EXTENSION_DIR=%{_libdir}/%{_name}
 export EXTENSION_DIR=%{_libdir}/%{_name}
@@ -899,6 +902,9 @@ rm -f files.*
 
 
 #======================================================================
 #======================================================================
 %changelog
 %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
 * Fri Jul 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.3.9-1
 - new upstream release.
 - new upstream release.
 
 

+ 42 - 39
p/polkit/polkit-vl.spec

@@ -3,24 +3,27 @@
 Summary: PolicyKit Authorization Framework
 Summary: PolicyKit Authorization Framework
 Summary(ja): PolicyKit 認証フレームワーク
 Summary(ja): PolicyKit 認証フレームワーク
 Name: polkit
 Name: polkit
-Version: 0.120
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Version: 124
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
 License: LGPLv2+
 License: LGPLv2+
 URL: https://www.freedesktop.org/wiki/Software/polkit
 URL: https://www.freedesktop.org/wiki/Software/polkit
-Source0: https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.gz
-Patch0: polkit-0.115-elogind.patch
-Patch1001: CVE-2021-4034.patch
-Patch1002: CVE-2021-4115.patch
+Source0: https://github.com/polkit-org/polkit/archive/refs/tags/%{version}.tar.gz
+Source1: polkit.sysusers
+Patch1: no-session-for-cookie.patch
+Patch2: pkttyagent-coredump-after-eof.patch
+Patch3: session-monitor-watch-sessions-only.patch
+Patch4: pkpermission-watch-changed-ssn-only.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: meson
 BuildRequires: glib2-devel
 BuildRequires: glib2-devel
 BuildRequires: expat-devel
 BuildRequires: expat-devel
 BuildRequires: pam-devel
 BuildRequires: pam-devel
-BuildRequires: mozjs78-devel
+BuildRequires: duktape-devel
 BuildRequires: gtk-doc
 BuildRequires: gtk-doc
 BuildRequires: intltool
 BuildRequires: intltool
 BuildRequires: gobject-introspection-devel
 BuildRequires: gobject-introspection-devel
@@ -77,50 +80,50 @@ Development documentation for PolicyKit.
 
 
 
 
 %prep
 %prep
-%setup -q
-%if !%{with systemd}
-%patch0 -p1
+%autosetup -p1
+
+%if %{without systemd}
+sed -i -e '/systemd_sysusers_dir = /d' meson.build
 %endif
 %endif
-%patch1001 -p1
-%patch1002 -p1
 
 
 
 
 %build
 %build
-autoreconf -vif
-%configure \
-	--with-os-type=redhat \
-	--enable-gtk-doc \
-	--disable-static \
-	--libexecdir=%{_libexecdir}/polkit-1 \
-	--enable-introspection \
+%meson \
+	-D authfw=pam \
+	-D examples=false \
+	-D gtk_doc=true \
+	-D introspection=true \
+	-D man=true \
 %if %{with systemd}
 %if %{with systemd}
-	--enable-libsystemd-login=yes \
+	-D session_tracking=libsystemd-login \
 %else
 %else
-	--enable-libelogind=yes \
+	-D session_tracking=libelogind \
 %endif
 %endif
-	--enable-examples
+	-D tests=false
 
 
-make %{?_smp_mflags}
+%meson_build
 
 
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
+%if %{with systemd}
+install -Dpm 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/polkit.conf
+%endif
 
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.la
+mv -f %{buildroot}%{_prefix}/lib/pam.d %{buildroot}%{_sysconfdir}/
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %find_lang polkit-1
 %find_lang polkit-1
 
 
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %pre
 %pre
+%if %{with systemd}
+%sysusers_create_compat %{SOURCE1}
+%else
 groupadd -g 27 -r polkitd >/dev/null 2>&1 || :
 groupadd -g 27 -r polkitd >/dev/null 2>&1 || :
 useradd -u 27 -g polkitd -r -d '/' -s /sbin/nologin -c "User for polkitd" polkitd >/dev/null 2>&1 || :
 useradd -u 27 -g polkitd -r -d '/' -s /sbin/nologin -c "User for polkitd" polkitd >/dev/null 2>&1 || :
 exit 0
 exit 0
+%endif
 
 
 %post
 %post
 %if %{with systemd}
 %if %{with systemd}
@@ -139,22 +142,23 @@ exit 0
 
 
 
 
 %files -f polkit-1.lang
 %files -f polkit-1.lang
-%defattr(-,root,root,-)
 %license COPYING
 %license COPYING
-%doc NEWS README
+%doc NEWS.md README.md
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.so.*
 %{_datadir}/man/man1/*
 %{_datadir}/man/man1/*
 %{_datadir}/man/man8/*
 %{_datadir}/man/man8/*
 %{_datadir}/dbus-1/system-services/*
 %{_datadir}/dbus-1/system-services/*
 %if %{with systemd}
 %if %{with systemd}
 %{_unitdir}/polkit.service
 %{_unitdir}/polkit.service
+%{_sysusersdir}/polkit.conf
 %endif
 %endif
 %dir %{_datadir}/polkit-1/
 %dir %{_datadir}/polkit-1/
 %dir %{_datadir}/polkit-1/actions
 %dir %{_datadir}/polkit-1/actions
-%attr(0700,polkitd,root) %dir %{_datadir}/polkit-1/rules.d
 %{_datadir}/polkit-1/actions/org.freedesktop.policykit.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.policykit.policy
+%attr(0700,polkitd,root) %dir %{_datadir}/polkit-1/rules.d
+%{_datadir}/polkit-1/rules.d/50-default.rules
+%{_datadir}/polkit-1/policyconfig-1.dtd
 %dir %{_sysconfdir}/polkit-1
 %dir %{_sysconfdir}/polkit-1
-%{_sysconfdir}/polkit-1/rules.d/50-default.rules
 %attr(0700,polkitd,root) %dir %{_sysconfdir}/polkit-1/rules.d
 %attr(0700,polkitd,root) %dir %{_sysconfdir}/polkit-1/rules.d
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/system.d
 %dir %{_datadir}/dbus-1/system.d
@@ -172,23 +176,22 @@ exit 0
 %attr(4755,root,root) %{_prefix}/lib/polkit-1/polkit-agent-helper-1
 %attr(4755,root,root) %{_prefix}/lib/polkit-1/polkit-agent-helper-1
 
 
 %files devel
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gir-1.0/*.gir
 %{_datadir}/gir-1.0/*.gir
 %{_includedir}/*
 %{_includedir}/*
-%{_bindir}/pk-example-frobnicate
-%{_datadir}/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
 %dir %{_datadir}/gettext
 %dir %{_datadir}/gettext
 %dir %{_datadir}/gettext/its
 %dir %{_datadir}/gettext/its
 %{_datadir}/gettext/its/*
 %{_datadir}/gettext/its/*
 
 
 %files docs
 %files docs
-%defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/*
 %{_datadir}/gtk-doc/html/*
 
 
 
 
 %changelog
 %changelog
+* Thu Jul 18 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 124-1
+- new upstream release.
+
 * Sat Mar 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.120-2
 * Sat Mar 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.120-2
 - imported Patch1002 from upstream to fix CVE-2021-4115.
 - imported Patch1002 from upstream to fix CVE-2021-4115.
 
 

+ 4 - 1
p/postfix/postfix-vl.spec

@@ -31,7 +31,7 @@
 Summary:        Postfix Mail Transport Agent
 Summary:        Postfix Mail Transport Agent
 Summary(ja):    Postfix メールトランスポートエージェント
 Summary(ja):    Postfix メールトランスポートエージェント
 Name:           postfix
 Name:           postfix
-Version:        3.8.6
+Version:        3.9.0
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Group:          servers
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -583,6 +583,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Mon Jul 22 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.9.0-1
+- new upstream release.
+
 * Thu Jun 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.6-1
 * Thu Jun 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.6-1
 - new upstream release.
 - new upstream release.
 
 

+ 4 - 1
r/rspamd/rspamd-vl.spec

@@ -13,7 +13,7 @@
 
 
 Summary:        Rapid spam filtering system
 Summary:        Rapid spam filtering system
 Name:           rspamd
 Name:           rspamd
-Version:        3.9.0
+Version:        3.9.1
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Group:          servers
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -267,6 +267,9 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Tue Jul 23 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.9.1-1
+- new upstream release.
+
 * Sat Jul 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.9.0-1
 * Sat Jul 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.9.0-1
 - new upstream release.
 - new upstream release.
 
 

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

@@ -1,10 +1,14 @@
-%bcond_without test
 %bcond_without json
 %bcond_without json
 %bcond_without emacsen
 %bcond_without emacsen
+%ifarch x86_64
+%bcond_without test
+%else
+%bcond_with test
+%endif
 
 
 %global major_version 3
 %global major_version 3
-%global minor_version 0
-%global teeny_version 3
+%global minor_version 3
+%global teeny_version 4
 
 
 # Note:
 # Note:
 # As seen on perl srpm, as this (ruby) srpm contains several sub-components,
 # As seen on perl srpm, as this (ruby) srpm contains several sub-components,
@@ -14,7 +18,7 @@
 #
 #
 # 全てのサブパッケージのバージョンが上がる場合を除き、rubyのmainバージョンが
 # 全てのサブパッケージのバージョンが上がる場合を除き、rubyのmainバージョンが
 # 更新されても1には戻さずに必ず+1してください。
 # 更新されても1には戻さずに必ず+1してください。
-%global ruby_rel 2
+%global ruby_rel 3
 
 
 %global major_minor_version %{major_version}.%{minor_version}
 %global major_minor_version %{major_version}.%{minor_version}
 
 
@@ -28,49 +32,51 @@
 %global rubygems_dir %{_datadir}/rubygems
 %global rubygems_dir %{_datadir}/rubygems
 
 
 # lib/rubygems.rb
 # lib/rubygems.rb
-%global rubygems_version 3.2.32
+%global rubygems_version 3.5.11
 # lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb 
 # 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
 # lib/bundler/version.rb
-%global bundler_version 2.2.32
+%global bundler_version 2.5.11
 # lib/bundler/vendor/fileutils/lib/fileutils.rb
 # 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
 # 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
 # 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
 # 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
 # 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 
 # 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
 # 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.
 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
 # http://redmine.ruby-lang.org/issues/5313
 # http://redmine.ruby-lang.org/issues/5313
 # lib/irb/version.rb 1.3.5
 # lib/irb/version.rb 1.3.5
-%global irb_version 1.3.5
+%global irb_version 1.13.1
 
 
 # ext/bigdecimal/bigdecimal.gemspec
 # 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
 # ext/io/console/io-console.gemspec
-%global io_console_version 0.5.7
+%global io_console_version 0.7.1
 # ext/json/VERSION
 # ext/json/VERSION
-%global json_version 2.5.1
+%global json_version 2.7.1
 # ext/psych/lib/psych/versions.rb
 # ext/psych/lib/psych/versions.rb
-%global psych_version 3.3.2
+%global psych_version 5.1.2
 # gems/bundled_gems
 # 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          ruby-mode
 %define rbmode_el       ruby-mode
 %define rbmode_el       ruby-mode
@@ -116,7 +122,6 @@ Source1002: %{rbmode_el}-init.el
 %{?load:%{SOURCE4}}
 %{?load:%{SOURCE4}}
 %{?load:%{SOURCE5}}
 %{?load:%{SOURCE5}}
 
 
-### Patch[0-99] from fedora package
 # Fix ruby_version abuse.
 # Fix ruby_version abuse.
 # https://bugs.ruby-lang.org/issues/11002
 # https://bugs.ruby-lang.org/issues/11002
 Patch0: ruby-2.3.0-ruby_version.patch
 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.
 # Allows to install RubyGems into custom directory, outside of Ruby's tree.
 # http://bugs.ruby-lang.org/issues/5617
 # http://bugs.ruby-lang.org/issues/5617
 Patch4: ruby-2.1.0-custom-rubygems-location.patch
 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:
 # 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/8566
 # https://bugs.ruby-lang.org/issues/15306
 # 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/
 # https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/
 # For now, load the ABRT hook via this simple patch:
 # For now, load the ABRT hook via this simple patch:
 Patch6: ruby-2.7.0-Initialize-ABRT-hook.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: %{name}-libs = %{version}-%{release}
 Requires: ruby(rubygems) >= %{rubygems_version}
 Requires: ruby(rubygems) >= %{rubygems_version}
@@ -255,7 +180,7 @@ BuildRequires: libyaml-devel
 BuildRequires: ncurses-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel
 BuildRequires: openssl-devel
 BuildRequires: readline-devel
 BuildRequires: readline-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 # Needed to pass test_set_program_name(TestRubyOptions)
 # Needed to pass test_set_program_name(TestRubyOptions)
 BuildRequires: procps
 BuildRequires: procps
 
 
@@ -581,6 +506,43 @@ Bundler manages an application's dependencies through its entire life, across
 many machines, systematically and repeatably.
 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}
 %if %{with emacsen}
 %package mode
 %package mode
 Summary: Emacs-lisp ruby-mode for the scripting language Ruby
 Summary: Emacs-lisp ruby-mode for the scripting language Ruby
@@ -604,42 +566,14 @@ Emacs上でRubyスクリプトを書くのに便利なモードです.
 %prep
 %prep
 %setup -q -n %{ruby_archive}
 %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
 %patch0 -p1
 %patch1 -p1
 %patch1 -p1
 %patch2 -p1
 %patch2 -p1
 %patch3 -p1
 %patch3 -p1
 %patch4 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch6 -p1
 %patch9 -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} .
 cp -a %{SOURCE3} .
 
 
@@ -663,17 +597,16 @@ autoconf
         --with-ruby-pc='%{name}.pc' \
         --with-ruby-pc='%{name}.pc' \
         --with-compress-debug-sections=no \
         --with-compress-debug-sections=no \
         --disable-rpath \
         --disable-rpath \
+        --enable-mkmf-verbose \
         --enable-shared \
         --enable-shared \
         --with-ruby-version='' \
         --with-ruby-version='' \
         --enable-multiarch \
         --enable-multiarch \
         %{nil}
         %{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
 %install
-rm -rf %{buildroot}
 %make_install
 %make_install
 
 
 # Version is empty if --with-ruby-version is specified.
 # 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,
 # Move the binary extensions into proper place (if no gem has binary extension,
 # the extensions directory might be empty).
 # 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}/ \; \
   -exec mv '{}' %{buildroot}%{_libdir}/gems/%{name}/ \; \
   || echo "No gem binary extensions to move."
   || 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
 # Move man pages into proper location
 mkdir -p %{buildroot}%{_mandir}/man{1,5}
 mkdir -p %{buildroot}%{_mandir}/man{1,5}
 mv %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/doc/rake.1 %{buildroot}%{_mandir}/man1
 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
 # https://github.com/ruby/rake/pull/333
 rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github
 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}
 %if %{with test}
 %check
 %check
+make -C ./test/net/fixtures regen_certs
+
 # Check RubyGems version.
 # Check RubyGems version.
 [ "`make runruby TESTRUN_SCRIPT='bin/gem -v' | tail -1`" == '%{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_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_digest_sha1/"
 DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_id_name_inspect/"
 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"
 make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %endif
 %endif
@@ -892,9 +837,7 @@ fi
 %lang(ja) %license COPYING.ja
 %lang(ja) %license COPYING.ja
 %license GPL
 %license GPL
 %license LEGAL
 %license LEGAL
-%{_bindir}/erb
 %{_bindir}/ruby
 %{_bindir}/ruby
-%{_mandir}/man1/erb*
 %{_mandir}/man1/ruby*
 %{_mandir}/man1/ruby*
 
 
 %files devel
 %files devel
@@ -917,12 +860,11 @@ fi
 %license LEGAL
 %license LEGAL
 %doc README.md
 %doc README.md
 %lang(ja) %doc README.ja.md
 %lang(ja) %doc README.ja.md
-%doc NEWS
-%doc doc/NEWS-*
+%doc NEWS.md
 %{ruby_sitelibdir}
 %{ruby_sitelibdir}
 %{ruby_sitearchdir}
 %{ruby_sitearchdir}
-%{ruby_vendorlibdir}
-%{ruby_vendorarchdir}
+%dir %{ruby_vendorlibdir}
+%dir %{ruby_vendorarchdir}
 
 
 # List all these files explicitly to prevent surprises
 # List all these files explicitly to prevent surprises
 # Platform independent libraries.
 # Platform independent libraries.
@@ -931,30 +873,71 @@ fi
 %exclude %{ruby_libdir}/irb*
 %exclude %{ruby_libdir}/irb*
 %exclude %{ruby_libdir}/json*
 %exclude %{ruby_libdir}/json*
 %exclude %{ruby_libdir}/psych*
 %exclude %{ruby_libdir}/psych*
-%{ruby_libdir}/*.rb
+%{ruby_libdir}/abbrev.rb
+%{ruby_libdir}/base64.rb
 %{ruby_libdir}/benchmark*
 %{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}/logger*
-%{ruby_libdir}/matrix
+%{ruby_libdir}/mkmf.rb
+%{ruby_libdir}/monitor.rb
+%{ruby_libdir}/mutex_m.rb
 %{ruby_libdir}/net
 %{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}/reline*
+%{ruby_libdir}/resolv.rb
+%{ruby_libdir}/resolv-replace.rb
 %{ruby_libdir}/rinda
 %{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}/set*
+%{ruby_libdir}/shellwords.rb
+%{ruby_libdir}/singleton*
+%{ruby_libdir}/socket.rb
+%{ruby_libdir}/syntax_suggest*
 %{ruby_libdir}/syslog
 %{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}/unicode_normalize
-%{ruby_libdir}/uri
-%{ruby_libdir}/yaml
+%{ruby_libdir}/un.rb
+%{ruby_libdir}/uri*
+%{ruby_libdir}/weakref*
+%{ruby_libdir}/yaml*
 
 
 # Platform specific libraries.
 # Platform specific libraries.
 %{_libdir}/libruby.so.*
 %{_libdir}/libruby.so.*
@@ -964,7 +947,6 @@ fi
 %{ruby_libarchdir}/continuation.so
 %{ruby_libarchdir}/continuation.so
 %{ruby_libarchdir}/coverage.so
 %{ruby_libarchdir}/coverage.so
 %{ruby_libarchdir}/date_core.so
 %{ruby_libarchdir}/date_core.so
-%{ruby_libarchdir}/dbm.so
 %dir %{ruby_libarchdir}/digest
 %dir %{ruby_libarchdir}/digest
 %{ruby_libarchdir}/digest.so
 %{ruby_libarchdir}/digest.so
 %{ruby_libarchdir}/digest/bubblebabble.so
 %{ruby_libarchdir}/digest/bubblebabble.so
@@ -1035,38 +1017,44 @@ fi
 %{ruby_libarchdir}/enc/windows_1254.so
 %{ruby_libarchdir}/enc/windows_1254.so
 %{ruby_libarchdir}/enc/windows_1257.so
 %{ruby_libarchdir}/enc/windows_1257.so
 %{ruby_libarchdir}/enc/windows_31j.so
 %{ruby_libarchdir}/enc/windows_31j.so
+%{ruby_libarchdir}/erb/escape.so
 %{ruby_libarchdir}/etc.so
 %{ruby_libarchdir}/etc.so
 %{ruby_libarchdir}/fcntl.so
 %{ruby_libarchdir}/fcntl.so
-%{ruby_libarchdir}/fiber.so
 %{ruby_libarchdir}/fiddle.so
 %{ruby_libarchdir}/fiddle.so
-%{ruby_libarchdir}/gdbm.so
 %dir %{ruby_libarchdir}/io
 %dir %{ruby_libarchdir}/io
 %{ruby_libarchdir}/io/nonblock.so
 %{ruby_libarchdir}/io/nonblock.so
 %{ruby_libarchdir}/io/wait.so
 %{ruby_libarchdir}/io/wait.so
 %{ruby_libarchdir}/monitor.so
 %{ruby_libarchdir}/monitor.so
 %{ruby_libarchdir}/nkf.so
 %{ruby_libarchdir}/nkf.so
 %{ruby_libarchdir}/objspace.so
 %{ruby_libarchdir}/objspace.so
-%{ruby_libarchdir}/openssl.so
 %{ruby_libarchdir}/pathname.so
 %{ruby_libarchdir}/pathname.so
-%{ruby_libarchdir}/psych.so
 %{ruby_libarchdir}/pty.so
 %{ruby_libarchdir}/pty.so
-%dir %{ruby_libarchdir}/racc
-%{ruby_libarchdir}/racc/cparse.so
-%{ruby_libarchdir}/rbconfig.rb
 %dir %{ruby_libarchdir}/rbconfig
 %dir %{ruby_libarchdir}/rbconfig
+%{ruby_libarchdir}/rbconfig.rb
 %{ruby_libarchdir}/rbconfig/sizeof.so
 %{ruby_libarchdir}/rbconfig/sizeof.so
-%{ruby_libarchdir}/readline.so
 %{ruby_libarchdir}/ripper.so
 %{ruby_libarchdir}/ripper.so
 %{ruby_libarchdir}/socket.so
 %{ruby_libarchdir}/socket.so
 %{ruby_libarchdir}/stringio.so
 %{ruby_libarchdir}/stringio.so
 %{ruby_libarchdir}/strscan.so
 %{ruby_libarchdir}/strscan.so
 %{ruby_libarchdir}/syslog.so
 %{ruby_libarchdir}/syslog.so
 %{ruby_libarchdir}/zlib.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
 %files rubygems
+%{_bindir}/erb
 %{_bindir}/gem
 %{_bindir}/gem
-%{_bindir}/rbs
+%{_bindir}/syntax_suggest
 %{_bindir}/typeprof
 %{_bindir}/typeprof
+%{_mandir}/man1/erb*
 %{rubygems_dir}
 %{rubygems_dir}
 %{gem_dir}
 %{gem_dir}
 %{_libdir}/gems
 %{_libdir}/gems
@@ -1076,6 +1064,9 @@ fi
 %exclude %{_libdir}/gems/%{name}/json-%{json_version}
 %exclude %{_libdir}/gems/%{name}/json-%{json_version}
 %endif
 %endif
 %exclude %{_libdir}/gems/%{name}/psych-%{psych_version}
 %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/rake-%{rake_version}
 %exclude %{gem_dir}/gems/rdoc-%{rdoc_version}
 %exclude %{gem_dir}/gems/rdoc-%{rdoc_version}
 %exclude %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
 %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/rake-%{rake_version}.gemspec
 %exclude %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
 %exclude %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
 %exclude %{gem_dir}/specifications/psych-%{psych_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
 %files rubygems-devel
 %{_rpmconfigdir}/macros.d/macros.rubygems
 %{_rpmconfigdir}/macros.d/macros.rubygems
@@ -1116,14 +1111,6 @@ fi
 %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
 %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
 %{_mandir}/man1/ri*
 %{_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
 %files -n rubygem-bigdecimal
 %{ruby_libdir}/bigdecimal*
 %{ruby_libdir}/bigdecimal*
 %{ruby_libarchdir}/bigdecimal*
 %{ruby_libarchdir}/bigdecimal*
@@ -1177,6 +1164,24 @@ fi
 %{_mandir}/man1/bundle*.1*
 %{_mandir}/man1/bundle*.1*
 %{_mandir}/man5/gemfile.5*
 %{_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}
 %if %{with emacsen}
 %files mode
 %files mode
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -1188,6 +1193,9 @@ fi
 
 
 
 
 %changelog
 %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
 * Fri Nov 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.3-2
 - updated to 3.0.3.
 - updated to 3.0.3.
 - dropped Patch10: fixed in upstream.
 - dropped Patch10: fixed in upstream.

+ 119 - 0
r/runc/runc-vl.spec

@@ -0,0 +1,119 @@
+%bcond_with man
+%global with_debug 0
+
+%if 0%{?with_debug}
+%global _find_debuginfo_dwz_opts %{nil}
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package   %{nil}
+%endif
+
+%global provider github
+%global provider_tld com
+%global project opencontainers
+%global repo runc
+# https://github.com/opencontainers/runc
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider_prefix}
+%global git0 https://github.com/opencontainers/runc
+
+Name: %{repo}
+Version: 1.1.13
+Release: 1%{_dist_release}
+Summary: CLI for running Open Containers
+Group: virtualization
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and MIT
+URL: %{git0}
+Source0: %{git0}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1: ChangeLog.fedora
+BuildRequires: make
+BuildRequires: golang
+BuildRequires: pkgconfig(libseccomp)
+%if %{with man}
+BuildRequires: go-md2man
+%endif
+Provides: oci-runtime
+
+%ifnarch s390x
+#Recommends: criu
+%endif
+
+%description
+The runc command can be used to start containers which are packaged
+in accordance with the Open Container Initiative's specifications,
+and to manage containers running under runc.
+
+
+%debug_package
+
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
+sed -i 's/ -trimpath//g' Makefile
+
+cp -f %{SOURCE1} ./
+
+
+%build
+%set_build_flags
+export CGO_CFLAGS=$CFLAGS
+# These extra flags present in $CFLAGS have been skipped for now as they break the build
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g')
+CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g')
+
+%ifarch x86_64
+export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
+%endif
+
+mkdir -p GOPATH
+pushd GOPATH
+    mkdir -p src/%{provider}.%{provider_tld}/%{project}
+    ln -s $(dirs +1 -l) src/%{import_path}
+popd
+
+pushd GOPATH/src/%{import_path}
+export GOPATH=$(pwd)/GOPATH
+
+make BUILDTAGS="apparmor selinux seccomp" all
+
+sed -i '/\#\!\/bin\/bash/d' contrib/completions/bash/%{name}
+
+
+%install
+install -d -p %{buildroot}%{_bindir}
+install -p -m 755 %{name} %{buildroot}%{_bindir}
+
+%if %{with man}
+# generate man pages
+man/md2man-all.sh
+
+# install man pages
+#install -d -p %{buildroot}%{_mandir}/man8
+install -p -m 0644 man/man8/*.8 %{buildroot}%{_mandir}/man8/.
+%endif
+# install bash completion
+install -d -p %{buildroot}%{_datadir}/bash-completion/completions
+install -p -m 0644 contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash-completion/completions
+
+
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
+%files
+%license LICENSE
+%doc MAINTAINERS_GUIDE.md PRINCIPLES.md README.md CONTRIBUTING.md
+%doc ChangeLog.fedora
+%{_bindir}/%{name}
+%if %{with man}
+%{_mandir}/man8/%{name}*
+%endif
+%{_datadir}/bash-completion/completions/%{name}
+
+
+%changelog
+* Sun Jul 14 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.13-1
+- initial build for Vine Linux.

+ 6 - 3
r/rust/rust-vl.spec

@@ -9,7 +9,7 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # 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
 # 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!
 # number should still increase, not be reset to 1!
-%global rustc_version 1.79.0
+%global rustc_version 1.80.0
 %global cargo_version %{rustc_version}
 %global cargo_version %{rustc_version}
 %global rustfmt_version %{rustc_version}
 %global rustfmt_version %{rustc_version}
 %global rls_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
 # 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
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_rust 1.78.0
-%global bootstrap_cargo 1.78.0
+%global bootstrap_rust 1.79.0
+%global bootstrap_cargo 1.79.0
 %global bootstrap_channel %{bootstrap_rust}
 %global bootstrap_channel %{bootstrap_rust}
 
 
 # Only the specified arches will use bootstrap binaries.
 # Only the specified arches will use bootstrap binaries.
@@ -750,6 +750,9 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 
 
 
 
 %changelog
 %changelog
+* Sat Jul 27 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.80.0-1
+- new upstream release.
+
 * Thu Jun 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.79.0-1
 * Thu Jun 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.79.0-1
 - new upstream release.
 - new upstream release.
 
 

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

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

+ 35 - 26
s/stunnel/stunnel-vl.spec

@@ -3,7 +3,7 @@
 
 
 Summary: An SSL-encrypting socket wrapper
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
 Name: stunnel
-Version: 5.60
+Version: 5.72
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: internet
 Group: internet
 Vendor: Project Vine
 Vendor: Project Vine
@@ -23,14 +23,11 @@ Source7: stunnel@.service
 Source100: stunnel.init
 Source100: stunnel.init
 
 
 Patch0: stunnel-5.50-authpriv.patch
 Patch0: stunnel-5.50-authpriv.patch
-Patch1: stunnel-5.50-systemd-service.patch
-Patch3: stunnel-5.56-system-ciphers.patch
-Patch4: stunnel-5.56-coverity.patch
-Patch5: stunnel-5.56-default-tls-version.patch
+Patch1: stunnel-5.61-systemd-service.patch
+Patch3: stunnel-5.69-system-ciphers.patch
+Patch5: stunnel-5.72-default-tls-version.patch
 Patch6: stunnel-5.56-curves-doc-update.patch
 Patch6: stunnel-5.56-curves-doc-update.patch
 
 
-Patch100: stunnel-5.60-compile.patch
-
 BuildRoot: %{_tmppath}/stunnel-root
 BuildRoot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 # util-linux is needed for rename
 BuildRequires: openssl-devel
 BuildRequires: openssl-devel
@@ -44,11 +41,7 @@ Requires(preun): chkconfig /sbin/service
 Requires(postun): /sbin/service
 Requires(postun): /sbin/service
 %endif
 %endif
 
 
-%if %{with systemd}
-%global pidfile %{_rundir}/stunnel.pid
-%else
-%global pidfile %{_localstatedir}/run/stunnel.pid
-%endif
+%global pidfile %{_rundir}/stunnel/stunnel.pid
 
 
 # Do not generate provides for private libraries
 # Do not generate provides for private libraries
 %global __provides_exclude_from ^%{_libdir}/stunnel/.*$
 %global __provides_exclude_from ^%{_libdir}/stunnel/.*$
@@ -69,14 +62,11 @@ in conjunction with imapd to create an SSL secure IMAP server.
 %if %{with crypto_policies}
 %if %{with crypto_policies}
 %patch3 -p1
 %patch3 -p1
 %endif
 %endif
-%patch4 -p1
 %patch5 -p1
 %patch5 -p1
 %patch6 -p1
 %patch6 -p1
 
 
-%patch100 -p1
-
-# Fix a testcase with system-ciphers support
-sed -i '/client = yes/a \\  ciphers = PSK' tests/recipes/014_PSK_secrets
+# Fix the stack protector flag
+sed -i 's/-fstack-protector/-fstack-protector-strong/' configure
 
 
 # modify systemd service unit
 # modify systemd service unit
 sed -i '/Type=forking/a \\PrivateTmp=true' tools/stunnel.service.in
 sed -i '/Type=forking/a \\PrivateTmp=true' tools/stunnel.service.in
@@ -86,10 +76,11 @@ sed -i '/Type=forking/a \\PrivateTmp=true' tools/stunnel.service.in
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 if pkg-config openssl ; then
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
-	LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
+	LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"; export LDFLAGS
 fi
 fi
 %configure --disable-fips --enable-ipv6 --with-ssl=%{_prefix} \
 %configure --disable-fips --enable-ipv6 --with-ssl=%{_prefix} \
-	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{pidfile}\"'"
+	--with-bashcompdir=%{_datadir}/bash-completion/completions \
+	CPPFLAGS="$CPPFLAGS -UPIDFILE -DPIDFILE='\"%{pidfile}\"'"
 make LDADD="-pie -Wl,-z,defs,-z,relro,-z,now"
 make LDADD="-pie -Wl,-z,defs,-z,relro,-z,now"
 
 
 
 
@@ -126,8 +117,18 @@ EOF
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+%if %{without systemd}
+%pre
+if /sbin/service stunnel status >/dev/null; then
+  touch /var/lib/rpm-state/stunnel
+  /sbin/service stunnel stop
+fi
+%endif
 
 
 %post
 %post
+if [ -e /etc/stunnel/stunnel.conf ]; then
+  sed -i -e 's|/var/run/|/run/stunnel/|' /etc/stunnel/stunnel.conf
+fi
 %if %{with systemd}
 %if %{with systemd}
 %systemd_post %{name}.service
 %systemd_post %{name}.service
 %else
 %else
@@ -138,20 +139,22 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with systemd}
 %if %{with systemd}
 %systemd_preun %{name}.service
 %systemd_preun %{name}.service
 %else
 %else
-if [ $1 -eq 0 -o -x /bin/systemctl ]; then
+if [ $1 -eq 0 -o -x /usr/bin/systemctl ]; then
   /sbin/service stunnel stop /dev/null 2>/dev/null ||:
   /sbin/service stunnel stop /dev/null 2>/dev/null ||:
   /sbin/chkconfig --del stunnel
   /sbin/chkconfig --del stunnel
 fi
 fi
 %endif
 %endif
 
 
-%postun
 %if %{with systemd}
 %if %{with systemd}
+%postun
 %systemd_postun_with_restart %{name}.service
 %systemd_postun_with_restart %{name}.service
-%else
-if [ $1 -gt 0 ]; then
-  if /sbin/service stunnel status >/dev/null; then
-    /sbin/service stunnel restart
-  fi
+%endif
+
+%if %{without systemd}
+%posttrans
+if [ -e /var/lib/rpm-state/stunnel -a ! -x /usr/bin/systemctl ]; then
+  rm -f /var/lib/rpm-state/stunnel
+  /sbin/service stunnel start
 fi
 fi
 %endif
 %endif
 
 
@@ -181,9 +184,15 @@ fi
 %{_initdir}/stunnel
 %{_initdir}/stunnel
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %endif
 %endif
+%dir %{_datadir}/bash-completion/completions
+%dir %{_datadir}/bash-completion
+%{_datadir}/bash-completion/completions/*
 
 
 
 
 %changelog
 %changelog
+* Mon Jul 29 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.72-1
+- new upstream release.
+
 * Mon Oct 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.60-1
 * Mon Oct 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.60-1
 - new upstream release.
 - new upstream release.
 - built with openssl-3.0.0.
 - built with openssl-3.0.0.

+ 378 - 0
v/valkey/valkey-vl.spec

@@ -0,0 +1,378 @@
+%bcond_with systemd
+
+# Tests fail in mock, not in local build.
+%bcond_without     tests
+
+Name:              valkey
+Summary:           A persistent key-value database
+Version:           7.2.6
+Release:           2%{?_dist_release}%{?with_systemd:.systemd}
+Group:             servers
+Vendor:            Project Vine
+Distribution:      Vine Linux
+# valkey: BSD-3-Clause
+# hiredis: BSD-3-Clause
+# hdrhistogram, jemalloc, lzf, linenoise: BSD-2-Clause
+# lua: MIT
+# fpconv: BSL-1.0
+License:           BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0
+URL:               https://valkey.io
+Source0:           https://github.com/valkey-io/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Source1:           %{name}.logrotate
+Source2:           %{name}-sentinel.service
+Source3:           %{name}.service
+Source4:           %{name}.sysusers
+# could have pulled this out of unpacked sources but
+# our copy has additional options pre-programmed in
+Source5:           %{name}-limit-systemd
+Source8:           macros.%{name}
+Source9:           migrate_redis_to_valkey.sh
+Source100:         %{name}.init
+Source101:         %{name}-sentinel.init
+
+BuildRequires:     make
+BuildRequires:     gcc
+%if %{with tests}
+BuildRequires:     procps
+BuildRequires:     tcl
+%endif
+%if %{with systemd}
+BuildRequires:     pkgconfig(libsystemd)
+BuildRequires:     systemd-devel
+%endif
+BuildRequires:     openssl-devel
+Requires:          logrotate
+# from deps/hiredis/hiredis.h
+Provides:          bundled(hiredis) = 1.0.3
+# from deps/jemalloc/VERSION
+Provides:          bundled(jemalloc) = 5.3.0
+# from deps/lua/src/lua.h
+Provides:          bundled(lua-libs) = 5.1.5
+# from deps/linenoise/linenoise.h
+Provides:          bundled(linenoise) = 1.0
+Provides:          bundled(lzf)
+# from deps/hdr_histogram/README.md
+Provides:          bundled(hdr_histogram) = 0.11.0
+# no version
+Provides:          bundled(fpconv)
+
+%global valkey_modules_abi 1
+%global valkey_modules_dir %{_libdir}/%{name}/modules
+Provides:          valkey(modules_abi)%{?_isa} = %{valkey_modules_abi}
+
+%description
+Valkey is an advanced key-value store. It is often referred to as a data
+structure server since keys can contain strings, hashes, lists, sets and
+sorted sets.
+
+You can run atomic operations on these types, like appending to a string;
+incrementing the value in a hash; pushing to a list; computing set
+intersection, union and difference; or getting the member with highest
+ranking in a sorted set.
+
+In order to achieve its outstanding performance, Valkey works with an
+in-memory dataset. Depending on your use case, you can persist it either
+by dumping the dataset to disk every once in a while, or by appending
+each command to a log.
+
+Valkey also supports trivial-to-setup master-slave replication, with very
+fast non-blocking first synchronization, auto-reconnection on net split
+and so forth.
+
+Other features include Transactions, Pub/Sub, Lua scripting, Keys with a
+limited time-to-live, and configuration settings to make Valkey behave like
+a cache.
+
+You can use Valkey from most programming languages also.
+
+%package           devel
+Summary:           Development header for Valkey module development
+Group:             programming
+# Header-Only Library (https://fedoraproject.org/wiki/Packaging:Guidelines)
+Provides:          %{name}-static = %{version}-%{release}
+
+%description       devel
+Header file required for building loadable Valkey modules.
+
+
+%package           compat-redis
+Summary:           Conversion script and compatibility symlinks for Redis
+Group:             servers
+Requires:          valkey = %{version}-%{release}
+Conflicts:         redis
+%if 0%{?fedora} > 40 || 0%{?rhel} > 9
+Obsoletes:         redis <= 7.2.5
+Provides:          redis = %{version}-%{release}
+%endif
+BuildArch:         noarch
+
+
+%description       compat-redis
+%summary
+
+
+%debug_package
+
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+mv deps/lua/COPYRIGHT             COPYRIGHT-lua
+mv deps/jemalloc/COPYING          COPYING-jemalloc
+mv deps/hiredis/COPYING COPYING-hiredis-BSD-3-Clause
+mv deps/hdr_histogram/LICENSE.txt LICENSE-hdrhistogram
+mv deps/hdr_histogram/COPYING.txt COPYING-hdrhistogram
+mv deps/fpconv/LICENSE.txt        LICENSE-fpconv
+
+# See https://bugzilla.redhat.com/2240293
+# See https://src.fedoraproject.org/rpms/jemalloc/blob/rawhide/f/jemalloc.spec#_34
+%ifarch %ix86 %arm x86_64 s390x
+sed -e 's/--with-lg-quantum/--with-lg-page=12 --with-lg-quantum/' -i deps/Makefile
+%endif
+%ifarch ppc64 ppc64le aarch64
+sed -e 's/--with-lg-quantum/--with-lg-page=16 --with-lg-quantum/' -i deps/Makefile
+%endif
+
+# Module API version safety check
+api=`sed -n -e 's/#define VALKEYMODULE_APIVER_[0-9][0-9]* //p' src/valkeymodule.h`
+if test "$api" != "%{valkey_modules_abi}"; then
+   : Error: Upstream API version is now ${api}, expecting %%{valkey_modules_abi}.
+   : Update the valkey_modules_abi macro, the rpmmacros file, and rebuild.
+   exit 1
+fi
+
+
+sed -i -e 's|^logfile .*$|logfile /var/log/valkey/valkey.log|g' \
+  -e 's|^# unixsocket .*$|unixsocket /run/valkey/valkey.sock|g' \
+  -e 's|^pidfile .*$|pidfile /run/valkey/valkey.pid|g' \
+  valkey.conf
+
+sed -i -e 's|^logfile .*$|logfile /var/log/valkey/sentinel.log|g' \
+  -e 's|^pidfile .*$|pidfile /run/valkey/sentinel.pid|g' \
+  sentinel.conf
+
+%if (%{defined fedora} && 0%{?fedora} < 42) || (%{defined rhel} && 0%{?rhel} < 10)
+# these lines are for conditionals around sysconfig to valkey.conf porting scriptlets to avoid re-runs
+echo '# valkey_rpm_conf' >> valkey.conf
+echo '# valkey-sentinel_rpm_conf' >> sentinel.conf
+%endif
+
+%if %{with systemd}
+%global make_flags DEBUG="" V="echo" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes
+%else
+%global make_flags DEBUG="" V="echo" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=no BUILD_TLS=yes
+%endif
+
+
+%build
+%make_build %{make_flags}
+
+
+%install
+%make_install %{make_flags}
+
+# remove sample confs
+rm -rf %{buildroot}%{_datadir}/%{name}
+
+# System user
+install -p -D -m 0644 %{S:4} %{buildroot}%{_sysusersdir}/%{name}.conf
+
+# Filesystem.
+install -d %{buildroot}%{_sharedstatedir}/%{name}
+install -d %{buildroot}%{_localstatedir}/log/%{name}
+install -d %{buildroot}%{_localstatedir}/run/%{name}
+install -d %{buildroot}%{valkey_modules_dir}
+
+# Install logrotate file.
+install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+# Install configuration files.
+install -pDm640 %{name}.conf  %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+install -pDm640 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}/sentinel.conf
+
+%if %{with systemd}
+# Install systemd unit files.
+mkdir -p %{buildroot}%{_unitdir}
+install -pm644 %{S:3} %{buildroot}%{_unitdir}
+install -pm644 %{S:2} %{buildroot}%{_unitdir}
+
+# Install systemd limit files
+install -p -D -m 644 %{S:5} %{buildroot}%{_unitdir}/%{name}.service.d/limit.conf
+install -p -D -m 644 %{S:5} %{buildroot}%{_unitdir}/%{name}-sentinel.service.d/limit.conf
+%else
+mkdir -p %{buildroot}%{_initdir}
+install -pm755 %{S:100} %{buildroot}%{_initdir}/%{name}
+install -pm755 %{S:101} %{buildroot}%{_initdir}/%{name}-sentinel
+%endif
+
+# Fix non-standard-executable-perm error.
+chmod 755 %{buildroot}%{_bindir}/%{name}-*
+
+# Install valkey module header
+install -pDm644 src/%{name}module.h %{buildroot}%{_includedir}/%{name}module.h
+
+# Install rpm macros for valkey modules
+#mkdir -p %{buildroot}%{_rpmmacrodir}
+install -pDm644 %{S:8} %{buildroot}%{_rpmmacrodir}/macros.%{name}
+
+# compat script
+install -Dpm 755 %{S:9} %{buildroot}%{_libexecdir}/migrate_redis_to_valkey.sh
+
+
+%ifarch x86_64
+%check
+%if %{with tests}
+# https://github.com/redis/redis/issues/1417 (for "taskset -c 1")
+taskset -c 1 ./runtest --skiptest "Active defrag - AOF loading"
+
+# sentinel tests fail in mock, but we want the normal tests above
+#./runtest-sentinel
+%endif
+%endif
+
+
+%post compat-redis
+%{_libexecdir}/migrate_redis_to_valkey.sh
+
+%if %{with systemd}
+%pre
+%sysusers_create_compat %{S:4}
+
+%post
+%systemd_post %{name}.service
+%systemd_post %{name}-sentinel.service
+
+%preun
+%systemd_preun %{name}.service
+%systemd_preun %{name}-sentinel.service
+
+%postun
+%systemd_postun_with_restart %{name}.service
+%systemd_postun_with_restart %{name}-sentinel.service
+
+%else
+%pre
+getent group %{name} &> /dev/null || \
+groupadd -r %{name} &> /dev/null
+getent passwd %{name} &> /dev/null || \
+useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \
+-c 'Valkey Database Server' %{name} &> /dev/null
+exit 0
+
+%post
+if [ $1 -eq 1 ]; then
+    /sbin/chkconfig --add %{name}
+    /sbin/chkconfig --add %{name}-sentinel
+fi
+
+%preun
+if [ $1 -eq 0 -o -x /usr/sbin/systemctl ]; then
+    /sbin/service %{name} stop ||:
+    /sbin/service %{name}-sentinel stop ||:
+    /sbin/chkconfig --del %{name}
+    /sbin/chkconfig --del %{name}-sentinel
+fi
+
+%postun
+if [ $1 -gt 0 ]; then
+    if [ -x /usr/sbin/systemctl ]; then
+        /sbin/service %{name} stop ||:
+        /sbin/service-sentinel %{name} stop ||:
+    else
+        /sbin/service %{name} condrestart ||:
+        /sbin/service %{name}-sentinel condrestart ||:
+    fi
+fi
+
+%endif
+
+
+%files
+%license COPYING
+%license COPYRIGHT-lua
+%license COPYING-jemalloc
+%license LICENSE-hdrhistogram
+%license COPYING-hdrhistogram
+%license LICENSE-fpconv
+%license COPYING-hiredis-BSD-3-Clause
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(0750, valkey, root) %dir %{_sysconfdir}/%{name}
+%attr(0640, valkey, root) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(0640, valkey, root) %config(noreplace) %{_sysconfdir}/%{name}/sentinel.conf
+%dir %{_libdir}/%{name}
+%dir %{valkey_modules_dir}
+%dir %attr(0750, valkey, valkey) %{_sharedstatedir}/%{name}
+%dir %attr(0750, valkey, valkey) %{_localstatedir}/log/%{name}
+%dir %attr(0755, valkey, valkey) %ghost %{_localstatedir}/run/%{name}
+%{_bindir}/%{name}-*
+%if %{with systemd}
+%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}-sentinel.service
+%dir %{_unitdir}/%{name}.service.d
+%{_unitdir}/%{name}.service.d/limit.conf
+%dir %{_unitdir}/%{name}-sentinel.service.d
+%{_unitdir}/%{name}-sentinel.service.d/limit.conf
+%{_sysusersdir}/%{name}.conf
+%else
+%{_initdir}/%{name}
+%{_initdir}/%{name}-sentinel
+%endif
+
+%files devel
+# main package is not required
+%license COPYING
+%{_includedir}/%{name}module.h
+%{_rpmmacrodir}/macros.%{name}
+
+%files compat-redis
+%{_libexecdir}/migrate_redis_to_valkey.sh
+%{_bindir}/redis-*
+
+
+%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.
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jul 15 2024 Jonathan Wright <jonathan@almalinux.org> - 7.2.5-9
+- Fix journal warning rhbz#2297457
+
+* Tue Jul 02 2024 Jonathan Wright <jonathan@almalinux.org> - 7.2.5-8
+- Enable tests by default
+  selectively disable tests that fail in mock for redis
+  disable redis-sentinel tests, they always fail in mock
+
+* Sat Jun 22 2024 Neal Gompa <ngompa@fedoraproject.org> - 7.2.5-7
+- Enable automatic replacement of redis with valkey
+
+* Mon Jun 17 2024 Jonathan Wright <jonathan@almalinux.org> - 7.2.5-6
+- drop /etc/sysconfig/valkey
+
+* Mon Apr 29 2024 Jonathan Wright <jonathan@almalinux.org> - 7.2.5-5
+- improve migration scripts
+- rename compat package
+- fix working dir
+
+* Mon Apr 22 2024 Nathan Scott <nathans@redhat.com> - 7.2.5-3
+- remove version_no_tilde code
+
+* Mon Apr 22 2024 Nathan Scott <nathans@redhat.com> - 7.2.5-2
+- move redis compat symlinks to compat subpackage
+
+* Wed Apr 17 2024 Jonathan Wright <jonathan@almalinux.org> - 7.2.5-1
+- update to 7.2.5 rhbz#2275379
+
+* Fri Apr 12 2024 Jonathan Wright <jonathan@almalinux.org> - 7.2.5~rc1-2
+- add compat subpackage with migration scripts from redis
+
+* Fri Apr 12 2024 Jonathan Wright <jonathan@almalinux.org> - 7.2.5~rc1-1
+- update to 7.2.5-rc1
+
+* Tue Apr 09 2024 Jonathan Wright <jonathan@almalinux.org> - 7.2.4~rc1-1
+- Initial package build, release candidate

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

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

+ 5 - 1
x/xmlsec1/xmlsec1-vl.spec

@@ -1,6 +1,6 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Name: xmlsec1
-Version: 1.3.4
+Version: 1.3.5
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
@@ -45,6 +45,7 @@ Requires: pkgconfig
 Libraries, includes, etc. you can use to develop applications with XML Digital 
 Libraries, includes, etc. you can use to develop applications with XML Digital 
 Signatures and XML Encryption support.
 Signatures and XML Encryption support.
 
 
+
 %package openssl
 %package openssl
 Summary: OpenSSL crypto plugin for XML Security Library
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: system
 Group: system
@@ -238,6 +239,9 @@ rm -fr %{buildroot}
 
 
 
 
 %changelog
 %changelog
+* Fri Jul 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.5-1
+- new upstream release.
+
 * Wed Apr 10 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.4-1
 * Wed Apr 10 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.4-1
 - new upstream release.
 - new upstream release.
 
 

+ 140 - 38
z/zabbix/zabbix-vl.spec

@@ -13,12 +13,13 @@
 %endif
 %endif
 
 
 %bcond_without agent
 %bcond_without agent
+%bcond_without agent2
 
 
 %global php_pkgname php74
 %global php_pkgname php74
 
 
 Summary: The Enterprise-class Monitoring Solution for Everyone
 Summary: The Enterprise-class Monitoring Solution for Everyone
 Name: zabbix
 Name: zabbix
-Version: 6.0.22
+Version: 7.0.2
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
@@ -32,27 +33,36 @@ Source0: https://cdn.zabbix.com/zabbix/sources/stable/%{shortver}/%{name}-%{vers
 Source1: zabbix_server.init
 Source1: zabbix_server.init
 Source2: zabbix_proxy.init
 Source2: zabbix_proxy.init
 Source3: zabbix_agentd.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)
 # systemd units -- Alternatives switches between them (they state their dependencies)
 # https://support.zabbix.com/browse/ZBXNEXT-1593
 # 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 %if %{with server}%{with proxy}
 %if %{with server}%{with proxy}
 BuildRequires: libpq-devel
 BuildRequires: libpq-devel
 BuildRequires: libmariadb-devel
 BuildRequires: libmariadb-devel
 %endif
 %endif
+%if %{with agent2}
+BuildRequires: golang
+%endif
 BuildRequires: libevent-devel
 BuildRequires: libevent-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
 BuildRequires: curl-devel
 BuildRequires: curl-devel
 BuildRequires: net-snmp-devel
 BuildRequires: net-snmp-devel
 BuildRequires: OpenIPMI-devel
 BuildRequires: OpenIPMI-devel
@@ -126,6 +136,24 @@ Zabbix Agent
 %endif
 %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}
 %if %{with proxy}
 %package proxy-common
 %package proxy-common
 Summary: common files for Zabbix Proxy
 Summary: common files for Zabbix Proxy
@@ -202,6 +230,11 @@ Zabbix web frontend with PHP and PostgreSQL.
 
 
 %prep
 %prep
 %setup -q -T -a 0 -c -n zabbix-%{version}
 %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
 mv zabbix-%{version} zabbix_mysql
 
 
 %if %{with server}%{with proxy}
 %if %{with server}%{with proxy}
@@ -209,6 +242,7 @@ mv zabbix-%{version} zabbix_mysql
 mv zabbix-%{version} zabbix_pgsql
 mv zabbix-%{version} zabbix_pgsql
 %endif
 %endif
 
 
+
 for v in mysql pgsql; do
 for v in mysql pgsql; do
 pushd zabbix_$v
 pushd zabbix_$v
 sed -i -e 's/DejaVuSans/VL-Gothic-Regular/g' ./ui/include/defines.inc.php
 sed -i -e 's/DejaVuSans/VL-Gothic-Regular/g' ./ui/include/defines.inc.php
@@ -239,7 +273,6 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
 %configure \
 %configure \
            %{?with_server:--enable-server} \
            %{?with_server:--enable-server} \
            %{?with_proxy:--enable-proxy} \
            %{?with_proxy:--enable-proxy} \
-           %{?with_agent:--enable-agent} \
            --enable-ipv6 \
            --enable-ipv6 \
            --sysconfdir=%{_sysconfdir}/zabbix \
            --sysconfdir=%{_sysconfdir}/zabbix \
            --with-libcurl \
            --with-libcurl \
@@ -248,6 +281,7 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
            --with-unixodbc \
            --with-unixodbc \
            --with-ssh2 \
            --with-ssh2 \
            --with-openssl \
            --with-openssl \
+           --with-libpcre2 \
            $@
            $@
 
 
 %__make
 %__make
@@ -255,7 +289,11 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
 
 
 %if %{with server}%{with proxy}
 %if %{with server}%{with proxy}
 pushd zabbix_mysql
 pushd zabbix_mysql
-Build --with-mysql
+Build \
+	--with-mysql \
+	%{?with_agent:--enable-agent} \
+	%{?with_agent2:--enable-agent2} \
+	%{nil}
 popd
 popd
 
 
 pushd zabbix_pgsql
 pushd zabbix_pgsql
@@ -290,15 +328,23 @@ mv -f %{buildroot}%{_sbindir}/zabbix_proxy %{buildroot}%{_sbindir}/zabbix_proxy.
 %__cp -a database/mysql %{buildroot}%{_datadir}/zabbix/
 %__cp -a database/mysql %{buildroot}%{_datadir}/zabbix/
 %endif
 %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}
 %if %{with systemd}
 # unit files
 # unit files
 %__mkdir_p %{buildroot}%{_unitdir}
 %__mkdir_p %{buildroot}%{_unitdir}
 # Install different systemd units because of the requirements for DBMS daemons
 # 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
 # systemd tmpfiles
 mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
 mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
@@ -316,18 +362,24 @@ install -m 0644 -p %{SOURCE9} %{buildroot}%{_prefix}/lib/tmpfiles.d/zabbix.conf
 %if %{with agent}
 %if %{with agent}
 %__cp %{SOURCE3} %{buildroot}%{_initddir}/zabbix_agentd
 %__cp %{SOURCE3} %{buildroot}%{_initddir}/zabbix_agentd
 %endif
 %endif
+%if %{with agent2}
+%__cp %{SOURCE4} %{buildroot}%{_initddir}/zabbix_agent2
+%endif
 %endif
 %endif
 
 
 # logrotate
 # logrotate
 %__mkdir_p %{buildroot}%{_sysconfdir}/logrotate.d
 %__mkdir_p %{buildroot}%{_sysconfdir}/logrotate.d
 %if %{with server}
 %if %{with server}
-%__cp %{SOURCE4}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_server
+%__cp %{SOURCE5}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_server
 %endif
 %endif
 %if %{with proxy}
 %if %{with proxy}
-%__cp %{SOURCE5}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_proxy
+%__cp %{SOURCE6}  %{buildroot}%{_sysconfdir}/logrotate.d/zabbix_proxy
 %endif
 %endif
 %if %{with agent}
 %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
 %endif
 
 
 %if %{with frontend}
 %if %{with frontend}
@@ -357,10 +409,6 @@ popd
 %endif
 %endif
 
 
 
 
-%clean
-%__rm -rf %{buildroot}
-
-
 %pre
 %pre
 getent group zabbix >/dev/null || groupadd -r zabbix
 getent group zabbix >/dev/null || groupadd -r zabbix
 getent passwd zabbix >/dev/null || \
 getent passwd zabbix >/dev/null || \
@@ -414,7 +462,15 @@ exit 0
 %else
 %else
 /sbin/chkconfig --add zabbix_agentd
 /sbin/chkconfig --add zabbix_agentd
 %endif
 %endif
+%endif
 
 
+%if %{with agent2}
+%post agent2
+%if %{with systemd}
+%systemd_post zabbix-agent2.service
+%else
+/sbin/chkconfig --add zabbix_agent2
+%endif
 %endif
 %endif
 
 
 %if %{with server}
 %if %{with server}
@@ -422,7 +478,7 @@ exit 0
 %if %{with systemd}
 %if %{with systemd}
 %systemd_preun zabbix-server-mysql.service
 %systemd_preun zabbix-server-mysql.service
 %else
 %else
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_server stop >/dev/null 2>&1
         /sbin/service zabbix_server stop >/dev/null 2>&1
         /sbin/chkconfig --del zabbix_server
         /sbin/chkconfig --del zabbix_server
         /sbin/update-alternatives --remove zabbix_server \
         /sbin/update-alternatives --remove zabbix_server \
@@ -434,7 +490,7 @@ fi
 %if %{with systemd}
 %if %{with systemd}
 %systemd_preun zabbix-server-pgysql.service
 %systemd_preun zabbix-server-pgysql.service
 %else
 %else
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_server stop >/dev/null 2>&1
         /sbin/service zabbix_server stop >/dev/null 2>&1
         /sbin/chkconfig --del zabbix_server
         /sbin/chkconfig --del zabbix_server
         /sbin/update-alternatives --remove zabbix_server \
         /sbin/update-alternatives --remove zabbix_server \
@@ -448,7 +504,7 @@ fi
 %if %{with systemd}
 %if %{with systemd}
 %systemd_preun zabbix-proxy-mysql.service
 %systemd_preun zabbix-proxy-mysql.service
 %else
 %else
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_proxy stop >/dev/null 2>&1
         /sbin/service zabbix_proxy stop >/dev/null 2>&1
         /sbin/chkconfig --del zabbix_proxy
         /sbin/chkconfig --del zabbix_proxy
         /sbin/update-alternatives --remove zabbix_proxy \
         /sbin/update-alternatives --remove zabbix_proxy \
@@ -460,7 +516,7 @@ fi
 %if %{with systemd}
 %if %{with systemd}
 %systemd_preun zabbix-proxy-pgsql.service
 %systemd_preun zabbix-proxy-pgsql.service
 %else
 %else
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_proxy stop >/dev/null 2>&1
         /sbin/service zabbix_proxy stop >/dev/null 2>&1
         /sbin/chkconfig --del zabbix_proxy
         /sbin/chkconfig --del zabbix_proxy
         /sbin/update-alternatives --remove zabbix_proxy \
         /sbin/update-alternatives --remove zabbix_proxy \
@@ -474,19 +530,31 @@ fi
 %if %{with systemd}
 %if %{with systemd}
 %systemd_preun zabbix-agent.service
 %systemd_preun zabbix-agent.service
 %else
 %else
-if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
+if [ "$1" -eq 0 -o -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_agentd stop >/dev/null 2>&1
         /sbin/service zabbix_agentd stop >/dev/null 2>&1
         /sbin/chkconfig --del zabbix_agentd
         /sbin/chkconfig --del zabbix_agentd
 fi
 fi
 %endif
 %endif
 %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}
 %if %{with server}
 %postun server-mysql
 %postun server-mysql
 %if %{with systemd}
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-server-mysql.service
 %systemd_postun_with_restart zabbix-server-mysql.service
 %else
 %else
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_server condrestart >/dev/null 2>&1 || :
         /sbin/service zabbix_server condrestart >/dev/null 2>&1 || :
 fi
 fi
 %endif
 %endif
@@ -495,7 +563,7 @@ fi
 %if %{with systemd}
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-server-pgsql.service
 %systemd_postun_with_restart zabbix-server-pgsql.service
 %else
 %else
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_server condrestart >/dev/null 2>&1 || :
         /sbin/service zabbix_server condrestart >/dev/null 2>&1 || :
 fi
 fi
 %endif
 %endif
@@ -506,7 +574,7 @@ fi
 %if %{with systemd}
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-proxy-mysql.service
 %systemd_postun_with_restart zabbix-proxy-mysql.service
 %else
 %else
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
         /sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
 fi
 fi
 %endif
 %endif
@@ -515,20 +583,32 @@ fi
 %if %{with systemd}
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-proxy-pgsql.service
 %systemd_postun_with_restart zabbix-proxy-pgsql.service
 %else
 %else
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
         /sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
 fi
 fi
 %endif
 %endif
+%endif
 
 
+%if %{with agent}
 %postun agent
 %postun agent
 %if %{with systemd}
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-agent.service
 %systemd_postun_with_restart zabbix-agent.service
 %else
 %else
-if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
+if [ "$1" -ge "1" -a ! -x /usr/bin/systemctl ]; then
         /sbin/service zabbix_agentd condrestart >/dev/null 2>&1 || :
         /sbin/service zabbix_agentd condrestart >/dev/null 2>&1 || :
 fi
 fi
 %endif
 %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
 %endif
 
 
 
 
@@ -571,7 +651,6 @@ fi
 %if %{with systemd}
 %if %{with systemd}
 %{_unitdir}/zabbix-server-pgsql.service
 %{_unitdir}/zabbix-server-pgsql.service
 %endif
 %endif
-
 %endif
 %endif
 
 
 %if %{with agent}
 %if %{with agent}
@@ -591,7 +670,24 @@ fi
 %{_mandir}/man1/zabbix_get.1*
 %{_mandir}/man1/zabbix_get.1*
 %{_mandir}/man1/zabbix_sender.1*
 %{_mandir}/man1/zabbix_sender.1*
 %{_mandir}/man8/zabbix_agentd.8*
 %{_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
 %endif
 
 
 %if %{with proxy}
 %if %{with proxy}
@@ -638,6 +734,12 @@ fi
 
 
 
 
 %changelog
 %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.
+
 * Wed Oct 18 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0.22-1
 * Wed Oct 18 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0.22-1
 - new upstream release.
 - new upstream release.