Browse Source

updated 9 packages

c-ares-1.32.3-1

curl-8.9.1-1

cyrus-sasl-2.1.28-3

kernel-6.6.43-1

logwatch-7.11-1

rspamd-3.9.1-1

rust-1.80.0-1

stunnel-5.72-1

zabbix-7.0.1-1
Tomohiro "Tomo-p" KATO 3 months ago
parent
commit
ff7ceb9020

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

@@ -2,7 +2,7 @@
 
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
-Version: 1.32.2
+Version: 1.32.3
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -115,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 - updated to 1.32.2.
 

+ 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(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
-Version: 8.8.0
+Version: 8.9.1
 Release: 1%{?_dist_release}
 Group: internet
 Vendor: Project Vine
@@ -45,7 +45,7 @@ authentication, FTP upload, HTTP post, and file transfer resume.
 Summary: Files needed for building applications with libcurl.
 Group: programming
 Requires: %{name} = %{version}-%{release}
-Requires: openssl-devel libidn2-devel zlib-devel
+Requires: openssl-devel libidn2-devel pkgconfig(zlib) libnghttp2-devel
 
 %description devel
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -189,6 +189,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %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
 - 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}
 
 %global username    saslauth
-%if %{with systemd}
 %global homedir     /run/saslauthd
-%else
-%global homedir     /var/run/saslauthd
-%endif
 
 %define _plugindir2 %{_libdir}/sasl2
 
@@ -15,7 +11,7 @@ Summary: The Cyrus SASL library.
 Summary(ja): Cyrus SASL ライブラリ
 Name: cyrus-sasl
 Version: 2.1.28
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Release: 3%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 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
 Patch501: cyrus-sasl-2.1.27-cumulative-digestmd5.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
 BuildRequires: autoconf, automake, libtool
@@ -61,8 +60,8 @@ BuildRequires: pam-devel
 BuildRequires: libmariadb-devel
 BuildRequires: libpq-devel
 BuildRequires: openldap-devel
-BuildRequires: zlib-devel
 BuildRequires: pkgconfig
+BuildRequires: pkgconfig(zlib)
 BuildRequires: krb5-devel
 BuildRequires: groff
 BuildRequires: libxcrypt-devel
@@ -298,24 +297,7 @@ the GS2 authentication scheme.
 %setup -q
 chmod -x doc/legacy/*.html
 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
@@ -601,6 +583,10 @@ exit 0
 
 
 %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
 - rebuilt with openldap-2.6.3.
 

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

@@ -44,7 +44,7 @@
 #
 %define majorver 6
 %define sublevel 6
-%define patchlevel 41
+%define patchlevel 43
 %define kversion %{majorver}.%{sublevel}
 %define rpmversion %{majorver}.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -1192,6 +1192,12 @@ fi
 
 
 %changelog
+* 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.
 

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

@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Summary(ja): ログファイル分析プログラム
 Name: logwatch
-Version: 7.10
+Version: 7.11
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -10,6 +10,7 @@ Distribution: Vine Linux
 License: MIT
 URL: https://sourceforge.net/projects/logwatch/
 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
 BuildArch: noarch
@@ -31,6 +32,7 @@ Logwatch はカスタマイズやプラグイン拡張ができるログ監視
 
 %prep
 %setup -q
+%autopatch -p1
 
 
 %build
@@ -159,6 +161,10 @@ rm -rf %{buildroot}
 
 
 %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
 - new upstream release.
 

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

@@ -13,7 +13,7 @@
 
 Summary:        Rapid spam filtering system
 Name:           rspamd
-Version:        3.9.0
+Version:        3.9.1
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Vendor:         Project Vine
@@ -267,6 +267,9 @@ fi
 
 
 %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
 - new upstream release.
 

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

@@ -9,7 +9,7 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.79.0
+%global rustc_version 1.80.0
 %global cargo_version %{rustc_version}
 %global rustfmt_version %{rustc_version}
 %global rls_version %{rustc_version}
@@ -25,8 +25,8 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.txt
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_rust 1.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}
 
 # 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
+* 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
 - new upstream release.
 

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

@@ -3,7 +3,7 @@
 
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 5.60
+Version: 5.72
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: internet
 Vendor: Project Vine
@@ -23,14 +23,11 @@ Source7: stunnel@.service
 Source100: stunnel.init
 
 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
 
-Patch100: stunnel-5.60-compile.patch
-
 BuildRoot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel
@@ -44,11 +41,7 @@ Requires(preun): chkconfig /sbin/service
 Requires(postun): /sbin/service
 %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
 %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}
 %patch3 -p1
 %endif
-%patch4 -p1
 %patch5 -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
 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
 if pkg-config openssl ; then
 	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
 %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"
 
 
@@ -126,8 +117,18 @@ EOF
 %clean
 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
+if [ -e /etc/stunnel/stunnel.conf ]; then
+  sed -i -e 's|/var/run/|/run/stunnel/|' /etc/stunnel/stunnel.conf
+fi
 %if %{with systemd}
 %systemd_post %{name}.service
 %else
@@ -138,20 +139,22 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with systemd}
 %systemd_preun %{name}.service
 %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/chkconfig --del stunnel
 fi
 %endif
 
-%postun
 %if %{with systemd}
+%postun
 %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
 %endif
 
@@ -181,9 +184,15 @@ fi
 %{_initdir}/stunnel
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %endif
+%dir %{_datadir}/bash-completion/completions
+%dir %{_datadir}/bash-completion
+%{_datadir}/bash-completion/completions/*
 
 
 %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
 - new upstream release.
 - built with openssl-3.0.0.

+ 21 - 12
z/zabbix/zabbix-vl.spec

@@ -13,12 +13,13 @@
 %endif
 
 %bcond_without agent
+%bcond_with agent2
 
 %global php_pkgname php74
 
 Summary: The Enterprise-class Monitoring Solution for Everyone
 Name: zabbix
-Version: 6.0.22
+Version: 7.0.1
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
@@ -51,8 +52,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libpq-devel
 BuildRequires: libmariadb-devel
 %endif
+%if %{with agent2}
+BuildRequires: golang
+%endif
 BuildRequires: libevent-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
 BuildRequires: curl-devel
 BuildRequires: net-snmp-devel
 BuildRequires: OpenIPMI-devel
@@ -240,6 +244,7 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
            %{?with_server:--enable-server} \
            %{?with_proxy:--enable-proxy} \
            %{?with_agent:--enable-agent} \
+           %{?with_agent2:--enable-agent2} \
            --enable-ipv6 \
            --sysconfdir=%{_sysconfdir}/zabbix \
            --with-libcurl \
@@ -248,6 +253,7 @@ perl -pi -e 's|/usr/bin/traceroute|/bin/traceroute|' \
            --with-unixodbc \
            --with-ssh2 \
            --with-openssl \
+           --with-libpcre2 \
            $@
 
 %__make
@@ -422,7 +428,7 @@ exit 0
 %if %{with systemd}
 %systemd_preun zabbix-server-mysql.service
 %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/chkconfig --del zabbix_server
         /sbin/update-alternatives --remove zabbix_server \
@@ -434,7 +440,7 @@ fi
 %if %{with systemd}
 %systemd_preun zabbix-server-pgysql.service
 %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/chkconfig --del zabbix_server
         /sbin/update-alternatives --remove zabbix_server \
@@ -448,7 +454,7 @@ fi
 %if %{with systemd}
 %systemd_preun zabbix-proxy-mysql.service
 %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/chkconfig --del zabbix_proxy
         /sbin/update-alternatives --remove zabbix_proxy \
@@ -460,7 +466,7 @@ fi
 %if %{with systemd}
 %systemd_preun zabbix-proxy-pgsql.service
 %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/chkconfig --del zabbix_proxy
         /sbin/update-alternatives --remove zabbix_proxy \
@@ -474,7 +480,7 @@ fi
 %if %{with systemd}
 %systemd_preun zabbix-agent.service
 %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/chkconfig --del zabbix_agentd
 fi
@@ -486,7 +492,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-server-mysql.service
 %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 || :
 fi
 %endif
@@ -495,7 +501,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-server-pgsql.service
 %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 || :
 fi
 %endif
@@ -506,7 +512,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-proxy-mysql.service
 %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 || :
 fi
 %endif
@@ -515,7 +521,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-proxy-pgsql.service
 %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 || :
 fi
 %endif
@@ -524,7 +530,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-agent.service
 %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 || :
 fi
 %endif
@@ -638,6 +644,9 @@ fi
 
 
 %changelog
+* 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
 - new upstream release.