From fc0fbb9a1eeb7bac1cb484711ed23d1f8463a156 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 13:49:26 +0300 Subject: [PATCH 01/47] Update Go to 1.21.5 --- specs/golang/golang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/golang/golang.spec b/specs/golang/golang.spec index a821c8389..55f81ccd7 100644 --- a/specs/golang/golang.spec +++ b/specs/golang/golang.spec @@ -31,7 +31,7 @@ Summary: The Go Programming Language Name: golang -Version: 1.21.4 +Version: 1.21.5 Release: 0%{?dist} License: BSD Group: Development/Languages @@ -237,6 +237,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.21.5-0 +- https://github.com/golang/go/issues?q=milestone:Go1.21.5+label:CherryPickApproved + * Wed Nov 08 2023 Anton Novojilov - 1.21.4-0 - https://github.com/golang/go/issues?q=milestone:Go1.21.4+label:CherryPickApproved From 50254c25be1d80b322a79eb45cac747fa6168184 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 15:43:28 +0300 Subject: [PATCH 02/47] Update Adoptium Java to the latest versions + Add Java 21 LTS --- specs/adoptium/jdk11.spec | 10 +++- specs/adoptium/jdk17.spec | 10 +++- specs/adoptium/jdk21.spec | 114 ++++++++++++++++++++++++++++++++++++++ specs/adoptium/jdk8.spec | 10 +++- specs/adoptium/jre11.spec | 10 +++- specs/adoptium/jre17.spec | 10 +++- specs/adoptium/jre21.spec | 114 ++++++++++++++++++++++++++++++++++++++ specs/adoptium/jre8.spec | 10 +++- tests/java/java21.recipe | 31 +++++++++++ 9 files changed, 301 insertions(+), 18 deletions(-) create mode 100644 specs/adoptium/jdk21.spec create mode 100644 specs/adoptium/jre21.spec create mode 100644 tests/java/java21.recipe diff --git a/specs/adoptium/jdk11.spec b/specs/adoptium/jdk11.spec index b06b61774..e0f3d0822 100644 --- a/specs/adoptium/jdk11.spec +++ b/specs/adoptium/jdk11.spec @@ -8,14 +8,14 @@ ################################################################################ -%define jdk_major 11.0.19 -%define jdk_minor 7 +%define jdk_major 11.0.21 +%define jdk_minor 9 %define install_dir %{_prefix}/java/%{name}-%{version} %define jdk_bin_dir %{install_dir}/bin %define jdk_man_dir %{install_dir}/man/man1 -%define alt_priority 1166 +%define alt_priority 1167 ################################################################################ @@ -40,6 +40,7 @@ Conflicts: java-1.7.0-openjdk-headless Conflicts: java-1.8.0-openjdk-headless Conflicts: java-11-openjdk-headless Conflicts: java-17-openjdk-headless +Conflicts: java-21-openjdk-headless AutoProv: no AutoReqProv: no @@ -109,6 +110,9 @@ deps="$deps --slave %{_sysconfdir}/profile.d/java.sh java-profile %{install_dir} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 11.0.21-9 +- https://adoptium.net/en-GB/temurin/release-notes/?version=jdk-11.0.21+9 + * Sat Jul 08 2023 Anton Novojilov - 11.0.19-7 - https://adoptium.net/en-GB/temurin/release-notes/?version=jdk-11.0.19+7 diff --git a/specs/adoptium/jdk17.spec b/specs/adoptium/jdk17.spec index 09b5ad56c..815bda362 100644 --- a/specs/adoptium/jdk17.spec +++ b/specs/adoptium/jdk17.spec @@ -8,14 +8,14 @@ ################################################################################ -%define jdk_major 17.0.7 -%define jdk_minor 7 +%define jdk_major 17.0.9 +%define jdk_minor 9 %define install_dir %{_prefix}/java/%{name}-%{version} %define jdk_bin_dir %{install_dir}/bin %define jdk_man_dir %{install_dir}/man/man1 -%define alt_priority 1754 +%define alt_priority 1755 ################################################################################ @@ -40,6 +40,7 @@ Conflicts: java-1.7.0-openjdk-headless Conflicts: java-1.8.0-openjdk-headless Conflicts: java-11-openjdk-headless Conflicts: java-17-openjdk-headless +Conflicts: java-21-openjdk-headless AutoProv: no AutoReqProv: no @@ -109,6 +110,9 @@ deps="$deps --slave %{_sysconfdir}/profile.d/java.sh java-profile %{install_dir} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 17.0.9-9 +- https://adoptium.net/en-GB/temurin/release-notes/?version=jdk-17.0.9+9 + * Sat Jul 08 2023 Anton Novojilov - 17.0.7-7 - https://adoptium.net/en-GB/temurin/release-notes/?version=jdk-17.0.7+7 diff --git a/specs/adoptium/jdk21.spec b/specs/adoptium/jdk21.spec new file mode 100644 index 000000000..04a7c5fdb --- /dev/null +++ b/specs/adoptium/jdk21.spec @@ -0,0 +1,114 @@ +################################################################################ + +%global crc_check pushd ../SOURCES ; sha512sum -c %{SOURCE100} ; popd + +################################################################################ + +%define __jar_repack %{nil} + +################################################################################ + +%define jdk_major 21.0.1 +%define jdk_minor 12 + +%define install_dir %{_prefix}/java/%{name}-%{version} +%define jdk_bin_dir %{install_dir}/bin +%define jdk_man_dir %{install_dir}/man/man1 + +%define alt_priority 2155 + +################################################################################ + +Summary: OpenJDK Runtime Environment (JDK 21) +Name: jdk21 +Epoch: 1 +Version: %{jdk_major} +Release: %{jdk_minor}%{?dist} +Group: Development/Languages +License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib +URL: https://adoptium.net + +Source0: https://github.com/adoptium/temurin21-binaries/releases/download/jdk-%{jdk_major}+%{jdk_minor}/OpenJDK21U-jdk_x64_linux_hotspot_%{jdk_major}_%{jdk_minor}.tar.gz +Source1: java.sh + +Source100: checksum.sha512 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Conflicts: java-1.6.0-openjdk-headless +Conflicts: java-1.7.0-openjdk-headless +Conflicts: java-1.8.0-openjdk-headless +Conflicts: java-11-openjdk-headless +Conflicts: java-17-openjdk-headless +Conflicts: java-21-openjdk-headless + +AutoProv: no +AutoReqProv: no + +Provides: jdk = 1:21 +Provides: jdk-lts = 1:21 +Provides: java = 1:21 +Provides: jdk-%{jdk_major} = 1:%{version}-%{release} +Provides: jdk-lts-%{jdk_major} = 1:%{version}-%{release} +Provides: java-%{jdk_major} = 1:%{version}-%{release} + +Provides: %{name} = %{version}-%{release} + +################################################################################ + +%description +Java™ is the world's leading programming language and platform. The Adoptium +Working Group promotes and supports high-quality, TCK certified runtimes and +associated technology for use across the Java™ ecosystem. + +################################################################################ + +%prep +%{crc_check} + +%setup -qn jdk-%{jdk_major}+%{jdk_minor} + +%build + +%install +rm -rf %{buildroot} + +rm -rf demo release + +mkdir -p %{buildroot}%{install_dir} +cp -a * %{buildroot}%{install_dir}/ + +install -pm 644 %{SOURCE1} %{buildroot}%{install_dir}/ + +%clean +rm -rf %{buildroot} + +%post +deps="%{_bindir}/java java %{jdk_bin_dir}/java %{alt_priority}" + +for bin in $(ls -1 %{jdk_bin_dir}) ; do + deps="$deps --slave %{_bindir}/$bin $bin %{jdk_bin_dir}/$bin" +done + +for doc in $(ls -1 %{jdk_man_dir}) ; do + deps="$deps --slave %{_mandir}/man1/$doc $doc %{jdk_man_dir}/$doc" +done + +deps="$deps --slave %{_sysconfdir}/profile.d/java.sh java-profile %{install_dir}/java.sh" + +%{_sbindir}/update-alternatives --install $deps + +%preun +%{_sbindir}/update-alternatives --remove java %{jdk_bin_dir}/java + +################################################################################ + +%files +%defattr(-, root, root, -) +%{install_dir} + +################################################################################ + +%changelog +* Wed Dec 06 2023 Anton Novojilov - 21.0.1-12 +- Initial build for kaos repository diff --git a/specs/adoptium/jdk8.spec b/specs/adoptium/jdk8.spec index 2089d8621..d57998495 100644 --- a/specs/adoptium/jdk8.spec +++ b/specs/adoptium/jdk8.spec @@ -8,14 +8,14 @@ ################################################################################ -%define jdk_major 372 -%define jdk_minor b07 +%define jdk_major 392 +%define jdk_minor b08 %define install_dir %{_prefix}/java/%{name}-%{version} %define jdk_bin_dir %{install_dir}/bin %define jdk_man_dir %{install_dir}/man/man1 -%define alt_priority 864 +%define alt_priority 865 ################################################################################ @@ -40,6 +40,7 @@ Conflicts: java-1.7.0-openjdk-headless Conflicts: java-1.8.0-openjdk-headless Conflicts: java-11-openjdk-headless Conflicts: java-17-openjdk-headless +Conflicts: java-21-openjdk-headless AutoProv: no AutoReqProv: no @@ -110,6 +111,9 @@ deps="$deps --slave %{_sysconfdir}/profile.d/java.sh java-profile %{install_dir} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.8.0.392-b08 +- https://adoptium.net/en-GB/temurin/release-notes/?version=jdk8u392-b08 + * Sat Jul 08 2023 Anton Novojilov - 1.8.0.372-b07 - https://adoptium.net/en-GB/temurin/release-notes/?version=jdk8u372-b07 diff --git a/specs/adoptium/jre11.spec b/specs/adoptium/jre11.spec index 05cf9310f..cb74d8457 100644 --- a/specs/adoptium/jre11.spec +++ b/specs/adoptium/jre11.spec @@ -8,14 +8,14 @@ ################################################################################ -%define jdk_major 11.0.19 -%define jdk_minor 7 +%define jdk_major 11.0.21 +%define jdk_minor 9 %define install_dir %{_prefix}/java/%{name}-%{version} %define jdk_bin_dir %{install_dir}/bin %define jdk_man_dir %{install_dir}/man/man1 -%define alt_priority 1116 +%define alt_priority 1117 ################################################################################ @@ -40,6 +40,7 @@ Conflicts: java-1.7.0-openjdk-headless Conflicts: java-1.8.0-openjdk-headless Conflicts: java-11-openjdk-headless Conflicts: java-17-openjdk-headless +Conflicts: java-21-openjdk-headless AutoProv: no AutoReqProv: no @@ -109,6 +110,9 @@ deps="$deps --slave %{_sysconfdir}/profile.d/java.sh java-profile %{install_dir} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 11.0.21-9 +- https://adoptium.net/en-GB/temurin/release-notes/?version=jdk-11.0.21+9 + * Sat Jul 08 2023 Anton Novojilov - 11.0.19-7 - https://adoptium.net/en-GB/temurin/release-notes/?version=jdk-11.0.19+7 diff --git a/specs/adoptium/jre17.spec b/specs/adoptium/jre17.spec index 4aeff82b1..154fc1480 100644 --- a/specs/adoptium/jre17.spec +++ b/specs/adoptium/jre17.spec @@ -8,14 +8,14 @@ ################################################################################ -%define jdk_major 17.0.7 -%define jdk_minor 7 +%define jdk_major 17.0.9 +%define jdk_minor 9 %define install_dir %{_prefix}/java/%{name}-%{version} %define jdk_bin_dir %{install_dir}/bin %define jdk_man_dir %{install_dir}/man/man1 -%define alt_priority 1704 +%define alt_priority 1705 ################################################################################ @@ -40,6 +40,7 @@ Conflicts: java-1.7.0-openjdk-headless Conflicts: java-1.8.0-openjdk-headless Conflicts: java-11-openjdk-headless Conflicts: java-17-openjdk-headless +Conflicts: java-21-openjdk-headless AutoProv: no AutoReqProv: no @@ -109,6 +110,9 @@ deps="$deps --slave %{_sysconfdir}/profile.d/java.sh java-profile %{install_dir} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 17.0.9-9 +- https://adoptium.net/en-GB/temurin/release-notes/?version=jdk-17.0.9+9 + * Sat Jul 08 2023 Anton Novojilov - 17.0.7-7 - https://adoptium.net/en-GB/temurin/release-notes/?version=jdk-17.0.7+7 diff --git a/specs/adoptium/jre21.spec b/specs/adoptium/jre21.spec new file mode 100644 index 000000000..72927b580 --- /dev/null +++ b/specs/adoptium/jre21.spec @@ -0,0 +1,114 @@ +################################################################################ + +%global crc_check pushd ../SOURCES ; sha512sum -c %{SOURCE100} ; popd + +################################################################################ + +%define __jar_repack %{nil} + +################################################################################ + +%define jdk_major 21.0.1 +%define jdk_minor 12 + +%define install_dir %{_prefix}/java/%{name}-%{version} +%define jdk_bin_dir %{install_dir}/bin +%define jdk_man_dir %{install_dir}/man/man1 + +%define alt_priority 2100 + +################################################################################ + +Summary: OpenJDK Runtime Environment (JRE 21) +Name: jre21 +Epoch: 1 +Version: %{jdk_major} +Release: %{jdk_minor}%{?dist} +Group: Development/Languages +License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib +URL: https://adoptium.net + +Source0: https://github.com/adoptium/temurin21-binaries/releases/download/jdk-%{jdk_major}+%{jdk_minor}/OpenJDK21U-jre_x64_linux_hotspot_%{jdk_major}_%{jdk_minor}.tar.gz +Source1: java.sh + +Source100: checksum.sha512 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Conflicts: java-1.6.0-openjdk-headless +Conflicts: java-1.7.0-openjdk-headless +Conflicts: java-1.8.0-openjdk-headless +Conflicts: java-11-openjdk-headless +Conflicts: java-17-openjdk-headless +Conflicts: java-21-openjdk-headless + +AutoProv: no +AutoReqProv: no + +Provides: jre = 1:21 +Provides: jre-lts = 1:21 +Provides: java = 1:21 +Provides: jre-%{jdk_major} = 1:%{version}-%{release} +Provides: jre-lts-%{jdk_major} = 1:%{version}-%{release} +Provides: java-%{jdk_major} = 1:%{version}-%{release} + +Provides: %{name} = %{version}-%{release} + +################################################################################ + +%description +Java™ is the world's leading programming language and platform. The Adoptium +Working Group promotes and supports high-quality, TCK certified runtimes and +associated technology for use across the Java™ ecosystem. + +################################################################################ + +%prep +%{crc_check} + +%setup -qn jdk-%{jdk_major}+%{jdk_minor}-jre + +%build + +%install +rm -rf %{buildroot} + +rm -rf release + +mkdir -p %{buildroot}%{install_dir} +cp -a * %{buildroot}%{install_dir}/ + +install -pm 644 %{SOURCE1} %{buildroot}%{install_dir}/ + +%clean +rm -rf %{buildroot} + +%post +deps="%{_bindir}/java java %{jdk_bin_dir}/java %{alt_priority}" + +for bin in $(ls -1 %{jdk_bin_dir}) ; do + deps="$deps --slave %{_bindir}/$bin $bin %{jdk_bin_dir}/$bin" +done + +for doc in $(ls -1 %{jdk_man_dir}) ; do + deps="$deps --slave %{_mandir}/man1/$doc $doc %{jdk_man_dir}/$doc" +done + +deps="$deps --slave %{_sysconfdir}/profile.d/java.sh java-profile %{install_dir}/java.sh" + +%{_sbindir}/update-alternatives --install $deps + +%preun +%{_sbindir}/update-alternatives --remove java %{jdk_bin_dir}/java + +################################################################################ + +%files +%defattr(-, root, root, -) +%{install_dir} + +################################################################################ + +%changelog +* Wed Dec 06 2023 Anton Novojilov - 21.0.1-12 +- Initial build for kaos repository diff --git a/specs/adoptium/jre8.spec b/specs/adoptium/jre8.spec index 388cd2de6..606c587b2 100644 --- a/specs/adoptium/jre8.spec +++ b/specs/adoptium/jre8.spec @@ -8,14 +8,14 @@ ################################################################################ -%define jdk_major 372 -%define jdk_minor b07 +%define jdk_major 392 +%define jdk_minor b08 %define install_dir %{_prefix}/java/%{name}-%{version} %define jdk_bin_dir %{install_dir}/bin %define jdk_man_dir %{install_dir}/man/man1 -%define alt_priority 814 +%define alt_priority 815 ################################################################################ @@ -40,6 +40,7 @@ Conflicts: java-1.7.0-openjdk-headless Conflicts: java-1.8.0-openjdk-headless Conflicts: java-11-openjdk-headless Conflicts: java-17-openjdk-headless +Conflicts: java-21-openjdk-headless AutoProv: no AutoReqProv: no @@ -110,6 +111,9 @@ deps="$deps --slave %{_sysconfdir}/profile.d/java.sh java-profile %{install_dir} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.8.0.392-b08 +- https://adoptium.net/en-GB/temurin/release-notes/?version=jdk8u392-b08 + * Sat Jul 08 2023 Anton Novojilov - 1.8.0.372-b07 - https://adoptium.net/en-GB/temurin/release-notes/?version=jdk8u372-b07 diff --git a/tests/java/java21.recipe b/tests/java/java21.recipe new file mode 100644 index 000000000..bbb469d53 --- /dev/null +++ b/tests/java/java21.recipe @@ -0,0 +1,31 @@ +# Bibop recipe for JRE21 and JDK21 +# See more: https://kaos.sh/bibop + +pkg jre21 jdk21 + +var java_version 21.0 + +command "-" "Check environment" + app jar + app java + app javac + app keytool + +command "java -version" "Check Java version" + exit 0 + output-contains "{java_version}" + +command "javac -version" "Check Java compiler version" + exit 0 + output-contains "{java_version}" + +command "java Test" "Check precompiled class file" + exit 0 + output-contains "JAVA WORKS" + +command "javac Comp.java" "Test source compilation" + exit 0 + +command "java Comp" "Check compiled result" + exit 0 + output-contains "SUCCESSFULLY COMPILED" From 5480e6b91cc9cea33231a8a79dabb14bde97bcc8 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 15:48:56 +0300 Subject: [PATCH 03/47] Update goaccess 1.8.1 --- specs/goaccess/goaccess.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/goaccess/goaccess.spec b/specs/goaccess/goaccess.spec index 17a177ece..b52d1ef7e 100644 --- a/specs/goaccess/goaccess.spec +++ b/specs/goaccess/goaccess.spec @@ -6,7 +6,7 @@ Summary: Real-time web log analyzer and interactive viewer Name: goaccess -Version: 1.8 +Version: 1.8.1 Release: 0%{?dist} Group: Development/Tools License: GPLv2+ @@ -72,6 +72,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.8.1-0 +- https://goaccess.io/release-notes#release-1.8.1 + * Wed Oct 04 2023 Anton Novojilov - 1.8-0 - https://goaccess.io/release-notes#release-1.8 From 5b2efb4325278e4637c521e83aa0883a125d6017 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 16:08:04 +0300 Subject: [PATCH 04/47] Update HAProxy 2.8 to 2.8.4 --- specs/haproxy/haproxy.spec | 140 ++++++++++++++++++++++++++++++++++- specs/haproxy/haproxy28.spec | 140 ++++++++++++++++++++++++++++++++++- 2 files changed, 276 insertions(+), 4 deletions(-) diff --git a/specs/haproxy/haproxy.spec b/specs/haproxy/haproxy.spec index 3b175e84d..18e03de25 100644 --- a/specs/haproxy/haproxy.spec +++ b/specs/haproxy/haproxy.spec @@ -14,7 +14,7 @@ %define lua_ver 5.4.6 %define pcre_ver 10.42 -%define openssl_ver 3.1.3 +%define openssl_ver 3.1.4 %define ncurses_ver 6.4 %define readline_ver 8.2 @@ -22,7 +22,7 @@ Name: haproxy Summary: TCP/HTTP reverse proxy for high availability environments -Version: 2.8.3 +Version: 2.8.4 Release: 0%{?dist} License: GPLv2+ URL: https://haproxy.1wt.eu @@ -229,6 +229,142 @@ fi ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 2.8.4-0 +- BUILD: bug: make BUG_ON() void to avoid a rare warning +- BUG/MINOR: quic: Leak of frames to send. +- BUG/MINOR: quic: Wrong cluster secret initialization +- MINOR: quic: QUIC openssl wrapper implementation +- MINOR: quic: Include QUIC opensssl wrapper header from TLS stacks + compatibility header +- MINOR: quic: Do not enable O-RTT with USE_QUIC_OPENSSL_COMPAT +- MINOR: quic: Set the QUIC connection as extra data before calling + SSL_set_quic_method() +- MINOR: quic: Do not enable 0RTT with SSL_set_quic_early_data_enabled() +- MINOR: quic: Add a compilation option for the QUIC OpenSSL wrapper +- MINOR: quic: Export some KDF functions (QUIC-TLS) +- MINOR: quic: Initialize TLS contexts for QUIC openssl wrapper +- MINOR: quic: Call the keylog callback for QUIC openssl wrapper from + SSL_CTX_keylog() +- MINOR: quic: Add a quic_openssl_compat struct to quic_conn struct +- MINOR: quic: SSL context initialization with QUIC OpenSSL wrapper. +- MINOR: quic: Add "limited-quic" new tuning setting +- DOC: quic: Add "limited-quic" new tuning setting +- BUG/MINOR: quic+openssl_compat: Non initialized TLS encryption levels +- MINOR: quic: Warning for OpenSSL wrapper QUIC bindings without "limited-quic" +- MINOR: quic+openssl_compat: Do not start without "limited-quic" +- MINOR: quic+openssl_compat: Emit an alert for "allow-0rtt" option +- BUILD: Makefile: add USE_QUIC_OPENSSL_COMPAT to make help +- BUG/MINOR: quic: allow-0rtt warning must only be emitted with quic bind +- BUG/MINOR: quic: ssl_quic_initial_ctx() uses error count not error code +- BUILD: quic: fix build on centos 8 and USE_QUIC_OPENSSL_COMPAT +- MINOR: hlua: add hlua_stream_ctx_prepare helper function +- BUG/MEDIUM: hlua: streams don't support mixing lua-load with + lua-load-per-thread +- Revert "BUG/MEDIUM: quic: missing check of dcid for init pkt including + a token" +- CI: musl: highlight section if there are coredumps +- CI: musl: drop shopt in workflow invocation +- BUG/MEDIUM: hlua: don't pass stale nargs argument to lua_resume() +- BUG/MINOR: hlua/init: coroutine may not resume itself +- BUG/MEDIUM: mux-fcgi: Don't swap trash and dbuf when handling STDERR records +- BUG/MINOR: promex: fix backend_agg_check_status +- BUG/MEDIUM: master/cli: Pin the master CLI on the first thread of the group 1 +- BUG/MINOR: freq_ctr: fix possible negative rate with the scaled API +- BUG/MAJOR: mux-h2: Report a protocol error for any DATA frame before headers +- BUG/MINOR: server: add missing free for server->rdr_pfx +- MINOR: pattern: fix pat_{parse,match}_ip() function comments +- BUG/MEDIUM: server/cli: don't delete a dynamic server that has streams +- BUG/MINOR: mux-quic: remove full demux flag on ncbuf release +- BUG/MEDIUM: actions: always apply a longest match on prefix lookup +- BUG/MEDIUM: quic_conn: let the scheduler kill the task when needed +- BUG/MEDIUM: http-ana: Try to handle response before handling server abort +- MINOR: hlua: Set context's appctx when the lua socket is created +- MINOR: hlua: Don't preform operations on a not connected socket +- MINOR: hlua: Save the lua socket's timeout in its context +- MINOR: hlua: Save the lua socket's server in its context +- MINOR: hlua: Test the hlua struct first when the lua socket is connecting +- BUG/MEDIUM: hlua: Initialize appctx used by a lua socket on connect only +- BUG/MINOR: mux-h1: Handle read0 in rcv_pipe() only when data receipt was tried +- BUG/MINOR: mux-h1: Ignore C-L when sending H1 messages if T-E is also set +- BUG/MEDIUM: h1: Ignore C-L value in the H1 parser if T-E is also set +- BUG/MINOR: hq-interop: simplify parser requirement +- BUG/MEDIUM: stconn: Fix comparison sign in sc_need_room() +- BUG/MINOR: quic: Avoid crashing with unsupported cryptographic algos +- BUG/MINOR: quic: reject packet with no frame +- BUG/MEDIUM: mux-quic: fix RESET_STREAM on send-only stream +- BUG/MINOR: mux-quic: support initial 0 max-stream-data +- BUG/MINOR: h3: strengthen host/authority header parsing +- BUG/MINOR: mux-quic: fix free on qcs-new fail alloc +- BUG/MEDIUM: quic-conn: free unsent frames on retransmit to prevent crash +- BUG/MINOR: mux-h1: Send a 400-bad-request on shutdown before the first request +- BUG/MINOR: mux-h2: make up other blocked streams upon removal from list +- BUG/MEDIUM: mux-h2: Don't report an error on shutr if a shutw is pending +- BUG/MINOR: mux-h2: fix http-request and http-keep-alive timeouts again +- BUG/MINOR: trace: fix trace parser error reporting +- BUG/MEDIUM: peers: Be sure to always refresh recconnect timer in sync task +- BUG/MEDIUM: peers: Fix synchro for huge number of tables +- BUG/MINOR: mux-h2: commit the current stream ID even on reject +- BUG/MINOR: mux-h2: update tracked counters with req cnt/req err +- DOC: internal: filters: fix reference to entities.pdf +- BUG/MINOR: ssl: load correctly @system-ca when ca-base is define +- MINOR: lua: Add flags to configure logging behaviour +- DEBUG: mux-h2/flags: fix list of h2c flags used by the flags decoder +- MINOR: connection: add conn_pr_mode_to_proto_mode() helper func +- BUG/MEDIUM: server: "proto" not working for dynamic servers +- BUG/MINOR: quic: do not consider idle timeout on CLOSING state +- BUG/MINOR: ssl: use a thread-safe sslconns increment +- MINOR: frontend: implement a dedicated actconn increment function +- MEDIUM: quic: count quic_conn instance for maxconn +- MEDIUM: quic: count quic_conn for global sslconns +- BUG/MINOR: ssl: suboptimal certificate selection with TLSv1.3 and dual + ECDSA/RSA +- BUG/MINOR: mux-quic: fix early close if unset client timeout +- BUG/MEDIUM: ssl: segfault when cipher is NULL +- BUG/MINOR: tcpcheck: Report hexstring instead of binary one on check failure +- BUG/MINOR: stktable: missing free in parse_stick_table() +- BUG/MINOR: cfgparse/stktable: fix error message on stktable_init() failure +- BUG/MEDIUM: pattern: don't trim pools under lock in pat_ref_purge_range() +- BUG/MEDIUM: stconn: Don't report rcv/snd expiration date if SC cannot epxire +- BUG/MEDIUM: Don't apply a max value on room_needed in sc_need_room() +- BUG/MINOR: stconn: Sanitize report for read activity +- CLEANUP: htx: Properly indent htx_reserve_max_data() function +- BUG/MEDIUM: quic: fix actconn on quic_conn alloc failure +- BUG/MEDIUM: quic: fix sslconns on quic_conn alloc failure +- BUG/MINOR: stick-table/cli: Check for invalid ipv4 key +- BUG/MINOR: mux-h1: Properly handle http-request and http-keep-alive timeouts +- BUG/MEDIUM: freq-ctr: Don't report overshoot for long inactivity period +- BUG/MEDIUM: pool: fix releasable pool calculation when overloaded +- BUG/MINOR: quic: idle timer task requeued in the past +- BUG/MEDIUM: quic: Avoid trying to send ACK frames from an empty ack ranges + tree +- BUG/MEDIUM: quic: Possible crashes when sending too short Initial packets +- BUG/MEDIUM: quic: Avoid some crashes upon TX packet allocation failures +- BUG/MEDIUM: stconn: Don't update stream expiration date if already expired +- DOC: management: -q is quiet all the time +- BUG/MINOR: quic: fix retry token check inconsistency +- DOC: config: use the word 'backend' instead of 'proxy' in 'track' description +- BUG/MEDIUM: applet: Remove appctx from buffer wait list on release +- BUG/MINOR: sink: don't learn srv port from srv addr +- DOC: quic: Wrong syntax for "quic-cc-algo" keyword. +- BUG/MEDIUM: connection: report connection errors even when no mux is installed +- BUG/MINOR: stconn: Handle abortonclose if backend connection was already + set up +- MINOR: connection: Add a CTL flag to notify mux it should wait for reads again +- MEDIUM: mux-h1: Handle MUX_SUBS_RECV flag in h1_ctl() and susbscribe for reads +- BUG/MEDIUM: stream: Properly handle abortonclose when set on backend only +- REGTESTS: http: Improve script testing abortonclose option +- BUG/MEDIUM: stconn: Report a send activity everytime data were sent +- BUG/MEDIUM: applet: Report a send activity everytime data were sent +- BUG/MEDIUM: mworker: set the master variable earlier +- BUG/MEDIUM: stream: Don't call mux .ctl() callback if not implemented +- BUG/MEDIUM: stconn: Update fsb date on partial sends +- MINOR: htx: Use a macro for overhead induced by HTX +- MINOR: channel: Add functions to get info on buffers and deal with HTX streams +- BUG/MINOR: stconn: Fix streamer detection for HTX streams +- BUG/MINOR: stconn: Use HTX-aware channel's functions to get info on buffer +- BUG/MINOR: stconn/applet: Report send activity only if there was output data +- BUG/MINOR: stconn: Report read activity on non-indep streams for partial sends + * Wed Oct 04 2023 Anton Novojilov - 2.8.3-0 - CI: do not use "groupinstall" for Fedora Rawhide builds - CI: get rid of travis-ci wrapper for Coverity scan diff --git a/specs/haproxy/haproxy28.spec b/specs/haproxy/haproxy28.spec index 339ee7ec6..b62cc4407 100644 --- a/specs/haproxy/haproxy28.spec +++ b/specs/haproxy/haproxy28.spec @@ -18,7 +18,7 @@ %define lua_ver 5.4.6 %define pcre_ver 10.42 -%define openssl_ver 3.1.3 +%define openssl_ver 3.1.4 %define ncurses_ver 6.4 %define readline_ver 8.2 @@ -26,7 +26,7 @@ Name: haproxy%{comp_ver} Summary: TCP/HTTP reverse proxy for high availability environments -Version: 2.8.3 +Version: 2.8.4 Release: 0%{?dist} License: GPLv2+ URL: https://haproxy.1wt.eu @@ -231,6 +231,142 @@ fi ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 2.8.4-0 +- BUILD: bug: make BUG_ON() void to avoid a rare warning +- BUG/MINOR: quic: Leak of frames to send. +- BUG/MINOR: quic: Wrong cluster secret initialization +- MINOR: quic: QUIC openssl wrapper implementation +- MINOR: quic: Include QUIC opensssl wrapper header from TLS stacks + compatibility header +- MINOR: quic: Do not enable O-RTT with USE_QUIC_OPENSSL_COMPAT +- MINOR: quic: Set the QUIC connection as extra data before calling + SSL_set_quic_method() +- MINOR: quic: Do not enable 0RTT with SSL_set_quic_early_data_enabled() +- MINOR: quic: Add a compilation option for the QUIC OpenSSL wrapper +- MINOR: quic: Export some KDF functions (QUIC-TLS) +- MINOR: quic: Initialize TLS contexts for QUIC openssl wrapper +- MINOR: quic: Call the keylog callback for QUIC openssl wrapper from + SSL_CTX_keylog() +- MINOR: quic: Add a quic_openssl_compat struct to quic_conn struct +- MINOR: quic: SSL context initialization with QUIC OpenSSL wrapper. +- MINOR: quic: Add "limited-quic" new tuning setting +- DOC: quic: Add "limited-quic" new tuning setting +- BUG/MINOR: quic+openssl_compat: Non initialized TLS encryption levels +- MINOR: quic: Warning for OpenSSL wrapper QUIC bindings without "limited-quic" +- MINOR: quic+openssl_compat: Do not start without "limited-quic" +- MINOR: quic+openssl_compat: Emit an alert for "allow-0rtt" option +- BUILD: Makefile: add USE_QUIC_OPENSSL_COMPAT to make help +- BUG/MINOR: quic: allow-0rtt warning must only be emitted with quic bind +- BUG/MINOR: quic: ssl_quic_initial_ctx() uses error count not error code +- BUILD: quic: fix build on centos 8 and USE_QUIC_OPENSSL_COMPAT +- MINOR: hlua: add hlua_stream_ctx_prepare helper function +- BUG/MEDIUM: hlua: streams don't support mixing lua-load with + lua-load-per-thread +- Revert "BUG/MEDIUM: quic: missing check of dcid for init pkt including + a token" +- CI: musl: highlight section if there are coredumps +- CI: musl: drop shopt in workflow invocation +- BUG/MEDIUM: hlua: don't pass stale nargs argument to lua_resume() +- BUG/MINOR: hlua/init: coroutine may not resume itself +- BUG/MEDIUM: mux-fcgi: Don't swap trash and dbuf when handling STDERR records +- BUG/MINOR: promex: fix backend_agg_check_status +- BUG/MEDIUM: master/cli: Pin the master CLI on the first thread of the group 1 +- BUG/MINOR: freq_ctr: fix possible negative rate with the scaled API +- BUG/MAJOR: mux-h2: Report a protocol error for any DATA frame before headers +- BUG/MINOR: server: add missing free for server->rdr_pfx +- MINOR: pattern: fix pat_{parse,match}_ip() function comments +- BUG/MEDIUM: server/cli: don't delete a dynamic server that has streams +- BUG/MINOR: mux-quic: remove full demux flag on ncbuf release +- BUG/MEDIUM: actions: always apply a longest match on prefix lookup +- BUG/MEDIUM: quic_conn: let the scheduler kill the task when needed +- BUG/MEDIUM: http-ana: Try to handle response before handling server abort +- MINOR: hlua: Set context's appctx when the lua socket is created +- MINOR: hlua: Don't preform operations on a not connected socket +- MINOR: hlua: Save the lua socket's timeout in its context +- MINOR: hlua: Save the lua socket's server in its context +- MINOR: hlua: Test the hlua struct first when the lua socket is connecting +- BUG/MEDIUM: hlua: Initialize appctx used by a lua socket on connect only +- BUG/MINOR: mux-h1: Handle read0 in rcv_pipe() only when data receipt was tried +- BUG/MINOR: mux-h1: Ignore C-L when sending H1 messages if T-E is also set +- BUG/MEDIUM: h1: Ignore C-L value in the H1 parser if T-E is also set +- BUG/MINOR: hq-interop: simplify parser requirement +- BUG/MEDIUM: stconn: Fix comparison sign in sc_need_room() +- BUG/MINOR: quic: Avoid crashing with unsupported cryptographic algos +- BUG/MINOR: quic: reject packet with no frame +- BUG/MEDIUM: mux-quic: fix RESET_STREAM on send-only stream +- BUG/MINOR: mux-quic: support initial 0 max-stream-data +- BUG/MINOR: h3: strengthen host/authority header parsing +- BUG/MINOR: mux-quic: fix free on qcs-new fail alloc +- BUG/MEDIUM: quic-conn: free unsent frames on retransmit to prevent crash +- BUG/MINOR: mux-h1: Send a 400-bad-request on shutdown before the first request +- BUG/MINOR: mux-h2: make up other blocked streams upon removal from list +- BUG/MEDIUM: mux-h2: Don't report an error on shutr if a shutw is pending +- BUG/MINOR: mux-h2: fix http-request and http-keep-alive timeouts again +- BUG/MINOR: trace: fix trace parser error reporting +- BUG/MEDIUM: peers: Be sure to always refresh recconnect timer in sync task +- BUG/MEDIUM: peers: Fix synchro for huge number of tables +- BUG/MINOR: mux-h2: commit the current stream ID even on reject +- BUG/MINOR: mux-h2: update tracked counters with req cnt/req err +- DOC: internal: filters: fix reference to entities.pdf +- BUG/MINOR: ssl: load correctly @system-ca when ca-base is define +- MINOR: lua: Add flags to configure logging behaviour +- DEBUG: mux-h2/flags: fix list of h2c flags used by the flags decoder +- MINOR: connection: add conn_pr_mode_to_proto_mode() helper func +- BUG/MEDIUM: server: "proto" not working for dynamic servers +- BUG/MINOR: quic: do not consider idle timeout on CLOSING state +- BUG/MINOR: ssl: use a thread-safe sslconns increment +- MINOR: frontend: implement a dedicated actconn increment function +- MEDIUM: quic: count quic_conn instance for maxconn +- MEDIUM: quic: count quic_conn for global sslconns +- BUG/MINOR: ssl: suboptimal certificate selection with TLSv1.3 and dual + ECDSA/RSA +- BUG/MINOR: mux-quic: fix early close if unset client timeout +- BUG/MEDIUM: ssl: segfault when cipher is NULL +- BUG/MINOR: tcpcheck: Report hexstring instead of binary one on check failure +- BUG/MINOR: stktable: missing free in parse_stick_table() +- BUG/MINOR: cfgparse/stktable: fix error message on stktable_init() failure +- BUG/MEDIUM: pattern: don't trim pools under lock in pat_ref_purge_range() +- BUG/MEDIUM: stconn: Don't report rcv/snd expiration date if SC cannot epxire +- BUG/MEDIUM: Don't apply a max value on room_needed in sc_need_room() +- BUG/MINOR: stconn: Sanitize report for read activity +- CLEANUP: htx: Properly indent htx_reserve_max_data() function +- BUG/MEDIUM: quic: fix actconn on quic_conn alloc failure +- BUG/MEDIUM: quic: fix sslconns on quic_conn alloc failure +- BUG/MINOR: stick-table/cli: Check for invalid ipv4 key +- BUG/MINOR: mux-h1: Properly handle http-request and http-keep-alive timeouts +- BUG/MEDIUM: freq-ctr: Don't report overshoot for long inactivity period +- BUG/MEDIUM: pool: fix releasable pool calculation when overloaded +- BUG/MINOR: quic: idle timer task requeued in the past +- BUG/MEDIUM: quic: Avoid trying to send ACK frames from an empty ack ranges + tree +- BUG/MEDIUM: quic: Possible crashes when sending too short Initial packets +- BUG/MEDIUM: quic: Avoid some crashes upon TX packet allocation failures +- BUG/MEDIUM: stconn: Don't update stream expiration date if already expired +- DOC: management: -q is quiet all the time +- BUG/MINOR: quic: fix retry token check inconsistency +- DOC: config: use the word 'backend' instead of 'proxy' in 'track' description +- BUG/MEDIUM: applet: Remove appctx from buffer wait list on release +- BUG/MINOR: sink: don't learn srv port from srv addr +- DOC: quic: Wrong syntax for "quic-cc-algo" keyword. +- BUG/MEDIUM: connection: report connection errors even when no mux is installed +- BUG/MINOR: stconn: Handle abortonclose if backend connection was already + set up +- MINOR: connection: Add a CTL flag to notify mux it should wait for reads again +- MEDIUM: mux-h1: Handle MUX_SUBS_RECV flag in h1_ctl() and susbscribe for reads +- BUG/MEDIUM: stream: Properly handle abortonclose when set on backend only +- REGTESTS: http: Improve script testing abortonclose option +- BUG/MEDIUM: stconn: Report a send activity everytime data were sent +- BUG/MEDIUM: applet: Report a send activity everytime data were sent +- BUG/MEDIUM: mworker: set the master variable earlier +- BUG/MEDIUM: stream: Don't call mux .ctl() callback if not implemented +- BUG/MEDIUM: stconn: Update fsb date on partial sends +- MINOR: htx: Use a macro for overhead induced by HTX +- MINOR: channel: Add functions to get info on buffers and deal with HTX streams +- BUG/MINOR: stconn: Fix streamer detection for HTX streams +- BUG/MINOR: stconn: Use HTX-aware channel's functions to get info on buffer +- BUG/MINOR: stconn/applet: Report send activity only if there was output data +- BUG/MINOR: stconn: Report read activity on non-indep streams for partial sends + * Wed Oct 04 2023 Anton Novojilov - 2.8.3-0 - CI: do not use "groupinstall" for Fedora Rawhide builds - CI: get rid of travis-ci wrapper for Coverity scan From fb246b31497154f64f1dfad89f8c499eff496596 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 16:08:26 +0300 Subject: [PATCH 05/47] Remove libnetfilter --- specs/libnetfilter/SOURCES/rhel6-iptos.diff | 34 ------ specs/libnetfilter/libnetfilter_queue.spec | 127 -------------------- 2 files changed, 161 deletions(-) delete mode 100644 specs/libnetfilter/SOURCES/rhel6-iptos.diff delete mode 100644 specs/libnetfilter/libnetfilter_queue.spec diff --git a/specs/libnetfilter/SOURCES/rhel6-iptos.diff b/specs/libnetfilter/SOURCES/rhel6-iptos.diff deleted file mode 100644 index cfc6f0e68..000000000 --- a/specs/libnetfilter/SOURCES/rhel6-iptos.diff +++ /dev/null @@ -1,34 +0,0 @@ -From: Jan Engelhardt -Date: 2012-10-09 02:46:29.418099680 +0200 -Upstream: never - -glibc before version 2.13 has a bug in netinet/ip.h: - -#define IPTOS_CLASS(class) ((tos) & IPTOS_CLASS_MASK) - -Namely, it does not use "class", but "tos". And þe olde RHEL 6 -even ships that... bleh. - ---- - src/extra/ipv4.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: libnetfilter_queue-1.0.2/src/extra/ipv4.c -=================================================================== ---- libnetfilter_queue-1.0.2.orig/src/extra/ipv4.c -+++ libnetfilter_queue-1.0.2/src/extra/ipv4.c -@@ -133,12 +133,13 @@ int nfq_ip_snprintf(char *buf, size_t si - int ret; - struct in_addr src = { iph->saddr }; - struct in_addr dst = { iph->daddr }; -+ unsigned int tos = iph->tos; - - ret = snprintf(buf, size, "SRC=%s DST=%s LEN=%u TOS=0x%X " - "PREC=0x%X TTL=%u ID=%u PROTO=%u ", - inet_ntoa(src), inet_ntoa(dst), - ntohs(iph->tot_len), IPTOS_TOS(iph->tos), -- IPTOS_PREC(iph->tos), iph->ttl, ntohs(iph->id), -+ IPTOS_PREC(tos), iph->ttl, ntohs(iph->id), - iph->protocol); - - return ret; diff --git a/specs/libnetfilter/libnetfilter_queue.spec b/specs/libnetfilter/libnetfilter_queue.spec deleted file mode 100644 index 85445d6b1..000000000 --- a/specs/libnetfilter/libnetfilter_queue.spec +++ /dev/null @@ -1,127 +0,0 @@ -################################################################################ - -%define _posixroot / -%define _root /root -%define _bin /bin -%define _sbin /sbin -%define _srv /srv -%define _home /home -%define _lib32 %{_posixroot}lib -%define _lib64 %{_posixroot}lib64 -%define _libdir32 %{_prefix}%{_lib32} -%define _libdir64 %{_prefix}%{_lib64} -%define _logdir %{_localstatedir}/log -%define _rundir %{_localstatedir}/run -%define _lockdir %{_localstatedir}/lock/subsys -%define _cachedir %{_localstatedir}/cache -%define _spooldir %{_localstatedir}/spool -%define _crondir %{_sysconfdir}/cron.d -%define _loc_prefix %{_prefix}/local -%define _loc_exec_prefix %{_loc_prefix} -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_libdir %{_loc_exec_prefix}/%{_lib} -%define _loc_libdir32 %{_loc_exec_prefix}/%{_lib32} -%define _loc_libdir64 %{_loc_exec_prefix}/%{_lib64} -%define _loc_libexecdir %{_loc_exec_prefix}/libexec -%define _loc_sbindir %{_loc_exec_prefix}/sbin -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_datarootdir %{_loc_prefix}/share -%define _loc_includedir %{_loc_prefix}/include -%define _loc_mandir %{_loc_datarootdir}/man -%define _rpmstatedir %{_sharedstatedir}/rpm-state -%define _pkgconfigdir %{_libdir}/pkgconfig - -%define __ln %{_bin}/ln -%define __touch %{_bin}/touch -%define __service %{_sbin}/service -%define __chkconfig %{_sbin}/chkconfig -%define __ldconfig %{_sbin}/ldconfig -%define __groupadd %{_sbindir}/groupadd -%define __useradd %{_sbindir}/useradd - -################################################################################ - -Summary: Userspace library for packets that have been queued by the kernel packet filter -Name: libnetfilter_queue -Version: 1.0.3 -Release: 0%{?dist} -License: GPLv2 -Group: System Environment/Libraries -URL: http://netfilter.org - -Source0: http://ftp.netfilter.org/pub/%{name}/%{name}-%{version}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: make gcc libmnl-devel >= 1.0.3 libnfnetlink-devel - -Provides: %{name} = %{version}-%{release} - -################################################################################ - -%description -libnetfilter_queue is a userspace library providing an API to packets -that have been queued by the kernel packet filter. It is is part of a -system that deprecates the old ip_queue / libipq mechanism. - -libnetfilter_queue has been previously known as libnfnetlink_queue. - -################################################################################ - -%package devel -Requires: %{name} = %{version} -Requires: libnfnetlink-devel -Summary: Header files and static libraries for libnetfilter_queue package -Group: Development/Libraries - -%description devel -Header files and static libraries for libnetfilter_queue package. - -################################################################################ - -%prep -%setup -q - -# Update headers for compatibility with libnfnetlink 1.0 -sed -i 's/linux_nfnetlink.h/libnfnetlink.h/' include/libnetfilter_queue/linux_nfnetlink_queue.h -sed -i 's/linux_nfnetlink.h/libnfnetlink.h/' include/linux/netfilter/nfnetlink_queue.h - -%build -%configure --disable-static -%{__make} %{?_smp_mflags} KERNELDIR="ignore" - -%install -rm -rf %{buildroot} - -%{make_install} KERNELDIR="ignore" -rm -f %{buildroot}%{_libdir}/*.la - -%clean -rm -rf %{buildroot} - -%post -%{__ldconfig} - -%postun -%{__ldconfig} - -################################################################################ - -%files -%defattr(-,root,root) -%{_libdir}/%{name}.so.1* - -%files devel -%defattr(-,root,root) -%{_includedir}/* -%{_libdir}/%{name}.so -%{_libdir}/pkgconfig/%{name}.pc - -################################################################################ - -%changelog -* Fri Nov 17 2017 Anton Novojilov - 1.0.3-0 -- Updated to latest release - -* Fri Oct 10 2014 Anton Novojilov - 1.0.2-0 -- Initial build From 2bd29537e797a10e587f35f76dbab876282f61bc Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 16:19:57 +0300 Subject: [PATCH 06/47] Update libuv to 1.47.0 --- specs/libuv/libuv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/libuv/libuv.spec b/specs/libuv/libuv.spec index c1a339375..ce37653ed 100644 --- a/specs/libuv/libuv.spec +++ b/specs/libuv/libuv.spec @@ -6,7 +6,7 @@ Summary: Cross-platform asychronous I/O Name: libuv -Version: 1.46.0 +Version: 1.47.0 Release: 0%{?dist} License: MIT, BSD and ISC Group: Development/Tools @@ -102,6 +102,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.47.0-0 +- https://github.com/libuv/libuv/releases/tag/v1.47.0 + * Sun Jul 09 2023 Anton Novojilov - 1.46.0-0 - https://github.com/libuv/libuv/releases/tag/v1.46.0 From db11e808168e0e7d35d05e8be079698506241798 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 16:25:55 +0300 Subject: [PATCH 07/47] Update maven to 3.9.6 --- specs/maven/maven.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/maven/maven.spec b/specs/maven/maven.spec index a6e63eb50..9b97250eb 100644 --- a/specs/maven/maven.spec +++ b/specs/maven/maven.spec @@ -17,7 +17,7 @@ Summary: Java project management and project comprehension tool Name: maven -Version: 3.9.5 +Version: 3.9.6 Release: 0%{?dist} Group: Development/Tools License: ASL 2.0 and MIT @@ -125,6 +125,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 3.9.6-0 +- https://maven.apache.org/docs/3.9.6/release-notes.html + * Sun Oct 15 2023 Anton Novojilov - 3.9.5-0 - https://maven.apache.org/docs/3.9.5/release-notes.html From 58f88fb26e708f892120e6fea3239bd78b26232d Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 16:37:52 +0300 Subject: [PATCH 08/47] Update multitail to 7.1.2 --- specs/{multitail => }/multitail.spec | 60 +++++++++------- .../multitail/SOURCES/fix-format-strings.diff | 69 ------------------- 2 files changed, 34 insertions(+), 95 deletions(-) rename specs/{multitail => }/multitail.spec (61%) delete mode 100644 specs/multitail/SOURCES/fix-format-strings.diff diff --git a/specs/multitail/multitail.spec b/specs/multitail.spec similarity index 61% rename from specs/multitail/multitail.spec rename to specs/multitail.spec index d9598651f..51f64d3b0 100644 --- a/specs/multitail/multitail.spec +++ b/specs/multitail.spec @@ -8,45 +8,52 @@ ################################################################################ -Summary: View one or multiple files like tail but with multiple windows -Name: multitail -Version: 7.0.0 -Release: 0%{?dist} -License: Apache-2.0 -Group: Applications/Text -URL: https://www.vanheusden.com/multitail/ +Summary: View one or multiple files like tail but with multiple windows +Name: multitail +Version: 7.1.2 +Release: 0%{?dist} +License: Apache-2.0 +Group: Applications/Text +URL: https://www.vanheusden.com/multitail/ -Source0: https://github.com/folkertvanheusden/multitail/archive/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/folkertvanheusden/multitail/archive/%{version}/%{name}-%{version}.tar.gz -Source100: checksum.sha512 +Source100: checksum.sha512 -Patch0: https://sources.debian.org/data/main/m/multitail/6.5.0-5/debian/patches/fix-format-strings.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gcc ncurses-devel +BuildRequires: gcc ncurses-devel %if 0%{?rhel} <= 7 -BuildRequires: cmake3 +BuildRequires: cmake3 %else -BuildRequires: cmake +BuildRequires: cmake %endif -Requires: ncurses +Requires: ncurses -Provides: %{name} = %{version}-%{release} -Provides: %{shortname} = %{version}-%{release} +Provides: %{name} = %{version}-%{release} +Provides: %{shortname} = %{version}-%{release} ################################################################################ %description MultiTail lets you view one or multiple files like the original tail -program. The difference is that it creates multiple windows on your console -(with ncurses). Merging of 2 or even more logfiles is possible. It can also -use colors while displaying the logfiles (through regular expressions), for -faster recognition of what is important and what not. It can also filter -lines (again with regular expressions). It has interactive menus for editing -given regular expressions and deleting and adding windows. +program. The difference is that it creates multiple windows on your +console (with ncurses). It can also monitor wildcards: if another file +matching the wildcard has a more recent modification date, it will +automatically switch to that file. That way you can, for example, +monitor a complete directory of files. Merging of 2 or even more +logfiles is possible. + +It can also use colors while displaying the logfiles (through regular +expressions), for faster recognition of what is important and what not. +Multitail can also filter lines (again with regular expressions) and +has interactive menus for editing given regular expressions and +deleting and adding windows. One can also have windows with the output +of shell scripts and other software. When viewing the output of +external software, MultiTail can mimic the functionality of tools like +'watch' and such. ################################################################################ @@ -54,12 +61,10 @@ given regular expressions and deleting and adding windows. %{crc_check} %setup -q -%patch0 -p1 sed -i "s/6.4.3/%{version}/" CMakeLists.txt sed -i '/multitail.conf.new/d' CMakeLists.txt sed -i '/conversion-scripts/d' CMakeLists.txt -sed -i 's/license.txt/LICENSE/' CMakeLists.txt rm GNUmakefile @@ -95,6 +100,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 7.1.2-0 +- https://github.com/folkertvanheusden/multitail/compare/7.0.0...7.1.2 + * Tue Dec 13 2022 Anton Novojilov - 7.0.0-0 - https://github.com/folkertvanheusden/multitail/compare/6.5...7.0.0 diff --git a/specs/multitail/SOURCES/fix-format-strings.diff b/specs/multitail/SOURCES/fix-format-strings.diff deleted file mode 100644 index 0dad1edc1..000000000 --- a/specs/multitail/SOURCES/fix-format-strings.diff +++ /dev/null @@ -1,69 +0,0 @@ -Description: add needed format strings - ---- -Origin: vendor -Bug-Debian: https://bugs.debian.org/997165 -Last-Update: 2021-10-29 - ---- multitail-6.5.0.orig/mt.c -+++ multitail-6.5.0/mt.c -@@ -1743,7 +1743,7 @@ void create_windows(void) - menu_win = mynewwin(max_y, max_x, 0, 0); - werase(menu_win -> win); - -- wprintw(menu_win -> win, version_str); -+ wprintw(menu_win -> win, "%s", version_str); - wprintw(menu_win -> win, "\n\n"); - - wprintw(menu_win -> win, "%s\n", F1); ---- multitail-6.5.0.orig/stripstring.c -+++ multitail-6.5.0/stripstring.c -@@ -154,7 +154,7 @@ int edit_strippers(void) - memset(linebuf, ' ', sizeof(linebuf) - 1); - linebuf[sizeof(linebuf) - 1] = 0x00; - for(loop=4; loop<22; loop++) -- mvwprintw(mywin -> win, loop, 1, linebuf); -+ mvwprintw(mywin -> win, loop, 1, "%s", linebuf); - - /* display them lines */ - for(loop=0; loop n_strip; loop++) ---- multitail-6.5.0.orig/term.c -+++ multitail-6.5.0/term.c -@@ -159,7 +159,7 @@ char * edit_string(NEWWIN *win, int win_ - string[copy_len] = 0x00; - - str_pos = dummy; -- mvwprintw(win -> win, win_y, win_x, &string[dummy]); -+ mvwprintw(win -> win, win_y, win_x, "%s", &string[dummy]); - x = strlen(string) - dummy; - } - else -@@ -608,7 +608,7 @@ void escape_print(NEWWIN *win, int y, in - void win_header(NEWWIN *win, char *str) - { - wattron(win -> win, A_BOLD); -- mvwprintw(win -> win, 1, 2, str); -+ mvwprintw(win -> win, 1, 2, "%s", str); - wattroff(win -> win, A_BOLD); - } - ---- multitail-6.5.0.orig/ui.c -+++ multitail-6.5.0/ui.c -@@ -1085,7 +1085,7 @@ int toggle_colors(void) - - dummy = mystrdup(cur -> filename); - dummy[min(strlen(dummy), 40)] = 0x00; -- mvwprintw(mywin -> win, 3, 1, dummy); -+ mvwprintw(mywin -> win, 3, 1, "%s", dummy); - - col = ask_colors(mywin, 4, cur -> cdef.colorize, &cur -> cdef.field_nr, &cur -> cdef.field_del, &cur -> cdef.color_schemes, &cur -> cdef.attributes, &cur -> cdef.term_emul); - if (col != (char)-1) -@@ -1164,7 +1164,7 @@ int edit_regexp(void) - char dummy[18]; - strncpy(dummy, (cur -> pre)[loop].cmd, min(17, strlen((cur -> pre)[loop].cmd))); - dummy[17]=0x00; -- mvwprintw(mywin -> win, 4 + loop, 42, dummy); -+ mvwprintw(mywin -> win, 4 + loop, 42, "%s", dummy); - wmove(mywin -> win, 4 + loop, 41); - } - if (loop == cur_re) From 48c8ab70864e2bce280152236114a25f45d1457a Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 16:42:22 +0300 Subject: [PATCH 09/47] Update nghttp2 to 1.58.0 --- specs/nghttp2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/nghttp2.spec b/specs/nghttp2.spec index 60af7e6d2..1c4b4c5aa 100644 --- a/specs/nghttp2.spec +++ b/specs/nghttp2.spec @@ -6,7 +6,7 @@ Summary: Meta-package that only requires libnghttp2 Name: nghttp2 -Version: 1.57.0 +Version: 1.58.0 Release: 0%{?dist} Group: Applications/Internet License: MIT @@ -120,6 +120,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.58.0-0 +- https://github.com/nghttp2/nghttp2/releases/tag/v1.58.0 + * Wed Oct 11 2023 Anton Novojilov - 1.57.0-0 - https://github.com/nghttp2/nghttp2/releases/tag/v1.57.0 From 06e0e98f37bb24bc675633adb14c28e80dffd333 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 17:04:12 +0300 Subject: [PATCH 10/47] Update redis72 to 7.2.3 --- specs/redis/redis72.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/redis/redis72.spec b/specs/redis/redis72.spec index c9e5b9d3a..718032558 100644 --- a/specs/redis/redis72.spec +++ b/specs/redis/redis72.spec @@ -16,7 +16,7 @@ Summary: A persistent key-value database Name: redis%{major_ver}%{minor_ver} -Version: 7.2.2 +Version: 7.2.3 Release: 0%{?dist} License: BSD Group: Applications/Databases @@ -202,6 +202,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 7.2.3-0 +- https://github.com/redis/redis/blob/7.2.3/00-RELEASENOTES + * Thu Oct 19 2023 Anton Novojilov - 7.2.2-0 - https://github.com/redis/redis/blob/7.2.2/00-RELEASENOTES From c6a7faf8edc93c30c00de299b2dd050a17dbc284 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 17:22:57 +0300 Subject: [PATCH 11/47] Update socat to 1.8.0.0 --- specs/socat/socat.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/specs/socat/socat.spec b/specs/socat/socat.spec index 2d86d1b1b..fde464ae5 100644 --- a/specs/socat/socat.spec +++ b/specs/socat/socat.spec @@ -10,7 +10,7 @@ Summary: Bidirectional data relay between two data channels ('netcat++') Name: socat -Version: 1.7.4.4 +Version: 1.8.0.0 Release: 0%{?dist} License: GPLv2 Group: Applications/Internet @@ -104,14 +104,20 @@ rm -rf %{buildroot} %doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING %doc COPYING* README SECURITY %doc %attr(0644,root,root) *.sh +%{_bindir}/socat-*.sh %{_bindir}/socat +%{_bindir}/socat1 %{_bindir}/filan %{_bindir}/procan %{_mandir}/man1/socat.1* +%{_mandir}/man1/socat1.1* ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.8.0.0-0 +- http://www.dest-unreach.org/socat/CHANGES + * Fri Dec 16 2022 Anton Novojilov - 1.7.4.4-0 - Fixed UDP-RECVFROM failures and a couple of other bugs From 1b7c119bbeba3ae55350a7966bc826c722f6f4bb Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 17:41:32 +0300 Subject: [PATCH 12/47] Update bat to 0.24.0 --- specs/bat.spec | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/specs/bat.spec b/specs/bat.spec index 81114b28d..d21da22c7 100644 --- a/specs/bat.spec +++ b/specs/bat.spec @@ -8,23 +8,23 @@ ################################################################################ -Summary: A cat(1) clone with wings -Name: bat -Version: 0.22.1 -Release: 0%{?dist} -Group: Applications/Text -License: MIT and Apache 2.0 -URL: https://github.com/sharkdp/bat +Summary: A cat(1) clone with wings +Name: bat +Version: 0.24.0 +Release: 0%{?dist} +Group: Applications/Text +License: MIT and Apache 2.0 +URL: https://github.com/sharkdp/bat -Source0: https://github.com/sharkdp/%{name}/archive/v%{version}.tar.gz +Source0: https://github.com/sharkdp/%{name}/archive/v%{version}.tar.gz -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cargo +BuildRequires: cargo -Provides: %{name} = %{version}-%{release} +Provides: %{name} = %{version}-%{release} ################################################################################ @@ -86,5 +86,8 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 0.24.0-0 +- https://github.com/sharkdp/bat/releases/tag/v0.24.0 + * Sat Oct 01 2022 Anton Novojilov - 0.22.1-0 - Initial build for kaos repository From 1ce4d23c947e428729335e0d17dc43d48abc843c Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 19:02:35 +0300 Subject: [PATCH 13/47] Update createrepo_c to 1.0.2 --- specs/createrepo_c.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/specs/createrepo_c.spec b/specs/createrepo_c.spec index 4cc16bf36..034a4431d 100644 --- a/specs/createrepo_c.spec +++ b/specs/createrepo_c.spec @@ -21,7 +21,7 @@ Summary: Creates a common metadata repository Name: createrepo_c -Version: 1.0.1 +Version: 1.0.2 Release: 0%{?dist} License: GPLv2 Group: Development/Tools @@ -33,7 +33,7 @@ Source100: checksum.sha512 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gcc cmake doxygen bzip2-devel file-devel xz +BuildRequires: gcc cmake doxygen bzip2-devel xz BuildRequires: glib2-devel >= 2.22.0 libcurl-devel libxml2-devel BuildRequires: openssl-devel sqlite-devel xz-devel zlib-devel drpm-devel BuildRequires: rpm-devel libmodulemd-devel libyaml-devel zchunk-devel @@ -44,7 +44,6 @@ BuildRequires: libasan liblsan libubsan %endif Requires: rpm - Requires: %{name}-libs = %{version}-%{release} Provides: %{name} = %{version}-%{release} @@ -111,13 +110,6 @@ Python bindings for the createrepo_c library. sed -i '/unset(PYTHON_LIBRARY/d' src/python/CMakeLists.txt sed -i '/unset(PYTHON_INCLUDE_DIR/d' src/python/CMakeLists.txt -sed -i 's/3 EXACT/3/g' src/python/CMakeLists.txt - -%if 0%{?rhel} == 9 -# Fix wrong check for GLib 2.70 -# https://github.com/rpm-software-management/createrepo_c/pull/342#issuecomment-1621547652 -sed -i 's/g_pattern_spec_match/g_pattern_match/' src/createrepo_c.c -%endif cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ @@ -194,6 +186,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.0.2-0 +- https://github.com/rpm-software-management/createrepo_c/compare/1.0.1...1.0.2 + * Fri Oct 06 2023 Anton Novojilov - 1.0.1-0 - https://github.com/rpm-software-management/createrepo_c/compare/1.0.0...1.0.1 From 954695bfe920ca8b3730549b53de76244d6afa4e Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 22:43:37 +0300 Subject: [PATCH 14/47] Update curl to 8.5.0 --- specs/curl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/curl.spec b/specs/curl.spec index 918e40eb1..ca6e879fc 100644 --- a/specs/curl.spec +++ b/specs/curl.spec @@ -10,7 +10,7 @@ Summary: Utility for getting files from remote servers Name: curl -Version: 8.4.0 +Version: 8.5.0 Release: 0%{?dist} License: MIT Group: Applications/Internet @@ -164,6 +164,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 8.5.0-0 +- https://curl.se/changes.html#8_5_0 + * Wed Oct 11 2023 Anton Novojilov - 8.4.0-0 - https://curl.se/changes.html#8_4_0 From 78ad9e92f26700e5d18b72beb1109fc37d64647a Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 22:43:58 +0300 Subject: [PATCH 15/47] daemonize spec refactoring --- specs/daemonize.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/specs/daemonize.spec b/specs/daemonize.spec index 067776a0e..f9802d25e 100644 --- a/specs/daemonize.spec +++ b/specs/daemonize.spec @@ -4,21 +4,23 @@ ################################################################################ -Summary: Run a command as a Unix daemon -Name: daemonize -Version: 1.7.8 -Release: 0%{?dist} -Group: Applications/System -License: BSD -URL: https://software.clapper.org/daemonize +Summary: Run a command as a Unix daemon +Name: daemonize +Version: 1.7.8 +Release: 0%{?dist} +Group: Applications/System +License: BSD +URL: https://software.clapper.org/daemonize -Source0: https://github.com/bmc/%{name}/archive/release-%{version}.tar.gz +Source0: https://github.com/bmc/%{name}/archive/release-%{version}.tar.gz -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: make gcc +BuildRequires: make gcc + +Provides: %{name} = %{version}-%{release} ################################################################################ From 6560424d65f63608533fd7b33c4911b0ada70395 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 22:51:05 +0300 Subject: [PATCH 16/47] duf spec refactoring --- specs/duf.spec | 74 +++++++++++++------------------------------------- 1 file changed, 19 insertions(+), 55 deletions(-) diff --git a/specs/duf.spec b/specs/duf.spec index 60fef6391..68da412e4 100644 --- a/specs/duf.spec +++ b/specs/duf.spec @@ -1,7 +1,7 @@ ################################################################################ -# rpmbuilder:gopack github.com/muesli/duf -# rpmbuilder:tag v0.8.1 +# rpmbuilder:gopack github.com/muesli/duf +# rpmbuilder:tag v0.8.1 ################################################################################ @@ -13,57 +13,23 @@ ################################################################################ -%define _posixroot / -%define _root /root -%define _bin /bin -%define _sbin /sbin -%define _srv /srv -%define _home /home -%define _opt /opt -%define _lib32 %{_posixroot}lib -%define _lib64 %{_posixroot}lib64 -%define _libdir32 %{_prefix}%{_lib32} -%define _libdir64 %{_prefix}%{_lib64} -%define _logdir %{_localstatedir}/log -%define _rundir %{_localstatedir}/run -%define _lockdir %{_localstatedir}/lock/subsys -%define _cachedir %{_localstatedir}/cache -%define _spooldir %{_localstatedir}/spool -%define _crondir %{_sysconfdir}/cron.d -%define _loc_prefix %{_prefix}/local -%define _loc_exec_prefix %{_loc_prefix} -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_libdir %{_loc_exec_prefix}/%{_lib} -%define _loc_libdir32 %{_loc_exec_prefix}/%{_lib32} -%define _loc_libdir64 %{_loc_exec_prefix}/%{_lib64} -%define _loc_libexecdir %{_loc_exec_prefix}/libexec -%define _loc_sbindir %{_loc_exec_prefix}/sbin -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_datarootdir %{_loc_prefix}/share -%define _loc_includedir %{_loc_prefix}/include -%define _loc_mandir %{_loc_datarootdir}/man -%define _rpmstatedir %{_sharedstatedir}/rpm-state -%define _pkgconfigdir %{_libdir}/pkgconfig +Summary: Disk usage utility +Name: duf +Version: 0.8.1 +Release: 1%{?dist} +Group: Development/Tools +License: MIT +URL: https://github.com/muesli/duf -################################################################################ - -Summary: Disk usage utility -Name: duf -Version: 0.8.1 -Release: 0%{?dist} -Group: Development/Tools -License: MIT -URL: https://github.com/muesli/duf - -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRequires: golang >= 1.15 +BuildRequires: golang >= 1.20 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Provides: %{name} = %{version}-%{release} +Provides: %{name} = %{version}-%{release} ################################################################################ @@ -84,12 +50,7 @@ Disk Usage/Free Utility with a variety of features: %setup -q %build -export GOPATH=$(pwd) - -# Move all sources to src directory -mkdir -p .src ; mv * .src ; mv .src src - -pushd src/github.com/muesli/%{name} +pushd github.com/muesli/%{name} go build -ldflags="-X 'main.Version=%{version}' -X main.CommitSHA=HEAD" popd @@ -97,7 +58,7 @@ popd rm -rf %{buildroot} install -dm 755 %{buildroot}%{_bindir} -install -pm 755 src/github.com/muesli/%{name}/%{name} \ +install -pm 755 github.com/muesli/%{name}/%{name} \ %{buildroot}%{_bindir}/ %clean @@ -112,6 +73,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 0.8.1-1 +- Rebuilt with the latest version of Go + * Fri Sep 30 2022 Anton Novojilov - 0.8.1-0 - Updated to the latest stable release From 501485fdb40390337612df734b3ffb962c532662 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 22:55:21 +0300 Subject: [PATCH 17/47] pgcenter spec refactoring --- specs/pgcenter.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/specs/pgcenter.spec b/specs/pgcenter.spec index ae592fdf9..d2fa0e7b4 100644 --- a/specs/pgcenter.spec +++ b/specs/pgcenter.spec @@ -1,7 +1,7 @@ ################################################################################ -# rpmbuilder:gopack github.com/lesovsky/pgcenter -# rpmbuilder:tag v0.9.2 +# rpmbuilder:gopack github.com/lesovsky/pgcenter +# rpmbuilder:tag v0.9.2 ################################################################################ @@ -9,10 +9,14 @@ ################################################################################ +%define debug_package %{nil} + +################################################################################ + Summary: Top-like PostgreSQL statistics viewer Name: pgcenter Version: 0.9.2 -Release: 0%{?dist} +Release: 1%{?dist} License: BSD 3-Clause Group: Development/Tools URL: https://github.com/lesovsky/pgcenter @@ -23,7 +27,7 @@ Source100: checksum.sha512 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: make golang >= 1.18 +BuildRequires: golang >= 1.20 Provides: %{name} = %{version}-%{release} @@ -51,8 +55,8 @@ operations, pgcenter can start psql session for this purposes. export TOP_DIR=$(pwd) pushd github.com/lesovsky/pgcenter -CGO_ENABLED=0 go build -o "%{name}" ./cmd -cp COPYRIGHT README.md $TOP_DIR/ + CGO_ENABLED=0 go build -o "%{name}" ./cmd + cp COPYRIGHT README.md $TOP_DIR/ popd %install @@ -75,6 +79,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 0.9.2-1 +- Rebuilt with the latest version of Go + * Thu Dec 15 2022 Anton Novojilov - 0.9.2-0 - https://github.com/lesovsky/pgcenter/releases/tag/v0.9.2 From f4cfcff60323b816cb3b7e70599616c2525a9fbb Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 23:06:21 +0300 Subject: [PATCH 18/47] Update git to 2.43.0 --- specs/git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/specs/git.spec b/specs/git.spec index 4f046bb72..bdd1fbcd9 100644 --- a/specs/git.spec +++ b/specs/git.spec @@ -15,7 +15,7 @@ Summary: Core git tools Name: git -Version: 2.42.0 +Version: 2.43.0 Release: 0%{?dist} License: GPL Group: Development/Tools @@ -282,6 +282,12 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 2.43.0-0 +- https://github.com/git/git/blob/master/Documentation/RelNotes/2.43.0.txt + +* Wed Dec 06 2023 Anton Novojilov - 2.42.1-0 +- https://github.com/git/git/blob/master/Documentation/RelNotes/2.42.1.txt + * Fri Oct 06 2023 Anton Novojilov - 2.42.0-0 - https://github.com/git/git/blob/master/Documentation/RelNotes/2.42.0.txt From a4f9c95676b10c970bcf4cf98090a66b5ebde3a6 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 23:13:34 +0300 Subject: [PATCH 19/47] Update memcached to 1.6.22 --- specs/memcached.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/memcached.spec b/specs/memcached.spec index 2808337ec..16cc03039 100644 --- a/specs/memcached.spec +++ b/specs/memcached.spec @@ -11,7 +11,7 @@ Summary: High Performance, Distributed Memory Object Cache Name: memcached -Version: 1.6.21 +Version: 1.6.22 Release: 0%{?dist} Group: System Environment/Daemons License: BSD @@ -138,6 +138,9 @@ fi ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.6.22-0 +- https://github.com/memcached/memcached/wiki/ReleaseNotes1622 + * Thu Jul 06 2023 Anton Novojilov - 1.6.21-0 - https://github.com/memcached/memcached/wiki/ReleaseNotes1621 From 9844de8f586b0a74d9f740c0247c4f71f2993c2d Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 23:14:40 +0300 Subject: [PATCH 20/47] mtr spec refactoring --- specs/mtr.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/specs/mtr.spec b/specs/mtr.spec index 4c62b7cd9..544a78d1d 100644 --- a/specs/mtr.spec +++ b/specs/mtr.spec @@ -4,24 +4,24 @@ ################################################################################ -Summary: A network diagnostic tool -Name: mtr -Version: 0.95 -Release: 0%{?dist} -Epoch: 10 -License: GPLv2+ -Group: Applications/Internet -URL: https://www.bitwizard.nl/mtr/ +Summary: A network diagnostic tool +Name: mtr +Epoch: 10 +Version: 0.95 +Release: 0%{?dist} +License: GPLv2+ +Group: Applications/Internet +URL: https://www.bitwizard.nl/mtr/ -Source0: https://github.com/traviscross/mtr/archive/v%{version}.tar.gz +Source0: https://github.com/traviscross/mtr/archive/v%{version}.tar.gz -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf automake libtool ncurses-devel +BuildRequires: autoconf automake libtool ncurses-devel -Provides: %{name} = %{version}-%{release} +Provides: %{name} = %{version}-%{release} ################################################################################ From 161ffe8e7784c75a4cb96ffc30f6657b5923ab81 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 23:19:30 +0300 Subject: [PATCH 21/47] Update sshpass to 1.10 --- specs/sshpass.spec | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/specs/sshpass.spec b/specs/sshpass.spec index ab283b8ce..5408e57d2 100644 --- a/specs/sshpass.spec +++ b/specs/sshpass.spec @@ -4,23 +4,23 @@ ################################################################################ -Summary: Non-interactive SSH authentication utility -Name: sshpass -Version: 1.09 -Release: 0%{?dist} -License: GPLv2 -Group: Development/Tools -URL: https://sshpass.sourceforge.net +Summary: Non-interactive SSH authentication utility +Name: sshpass +Version: 1.10 +Release: 0%{?dist} +License: GPLv2 +Group: Development/Tools +URL: https://sshpass.sourceforge.net -Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: make gcc +BuildRequires: make gcc -Provides: %{name} = %{version}-%{release} +Provides: %{name} = %{version}-%{release} ################################################################################ @@ -60,6 +60,13 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 1.10-0 +- Remove sig unsafe functions from signal handler. +- Allow -e to explicitly specify the environment variable to use +- Unset the variable specified with -e before calling subprogram +- Change the logic for setting a controlling TTY. Fixes compatibility + issues with OpenSolaris and MSYS/Cygwin. + * Fri Dec 09 2022 Anton Novojilov - 1.09-0 - Explicitly set the controlling TTY From 0dba5b72eb5719e7678d61a73c4711e7f3cc4782 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 23:20:32 +0300 Subject: [PATCH 22/47] Remove tcpkali --- specs/tcpkali.spec | 130 --------------------------------------------- 1 file changed, 130 deletions(-) delete mode 100644 specs/tcpkali.spec diff --git a/specs/tcpkali.spec b/specs/tcpkali.spec deleted file mode 100644 index 9c2f74b0d..000000000 --- a/specs/tcpkali.spec +++ /dev/null @@ -1,130 +0,0 @@ -################################################################################ - -%global crc_check pushd ../SOURCES ; sha512sum -c %{SOURCE100} ; popd - -################################################################################ - -Summary: High performance TCP and WebSocket load generator and sink -Name: tcpkali -Version: 1.1.1 -Release: 0%{?dist} -License: BSD 2-Clause -Group: Development/Tools -URL: https://github.com/satori-com/tcpkali - -Source0: https://github.com/satori-com/%{name}/archive/v%{version}.tar.gz - -Source100: checksum.sha512 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: make gcc gcc-c++ m4 autoconf automake libtool -BuildRequires: bison flex ncurses-devel - -Provides: %{name} = %{version}-%{release} - -################################################################################ - -%description -High performance TCP and WebSocket load generator and sink - -################################################################################ - -%prep -%{crc_check} - -%setup -qn %{name}-%{version} - -%build -%if 0%{?rhel} == 9 -sed -i 's#sys/sysctl.h#linux/sysctl.h#' src/tcpkali_syslimits.c -%endif - -autoreconf -iv - -%{_configure} --prefix=%{_prefix} - -%{__make} %{?_smp_mflags} - -%install -rm -rf %{buildroot} - -%{make_install} - -%clean -rm -rf %{buildroot} - -################################################################################ - -%files -%defattr(-,root,root,-) -%doc LICENSE README.md TODO.md -%{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* - -################################################################################ - -%changelog -* Sat Jan 21 2017 Anton Novojilov - 1.1.1-0 -- Support rsv1, rsv2, rsv3 reserved flags in in \{ws.* }. -- Fix statsd output for connections.opened. -- Support for \{raw Expression}, which removes ws framing. -- -vvv option does not dump the traffic. Use -d or --dump-* options. -- Added units (ms) to latency percentiles output. -- Add ability to specify host in -l [host:]port. -- \{message.marker} inserts a detectable timestamp to count messages/s. - -* Mon Oct 17 2016 Anton Novojilov - 1.0-0 -- Export --latency-connect and --latency-first-bytes to statsd. -- --latency-percentiles now affect --statsd reporting as well. -- Added -H, --header to add HTTP headers to WebSocket handshake. -- Added --message-stop to quickly die if a given message is seen. - -* Tue Sep 06 2016 Anton Novojilov - 0.9-0 -- Added -r@ form to measure message rate at a given latency. -- Websocket frame types in expressions: \{ws.ping}, \{ws.pong}, etc. -- Websocket frames accept files: \{ws.binary }. -- Websocket frames can be non-final: \{ws.binary ...}. -- Regular expressions as data generators: \{re }. -- Display last received bytes with --verbose 2. - -* Wed Feb 24 2016 Anton Novojilov - 0.8-0 -- Added --latency-connect to measure connect latency. -- Added --latency-first-byte to measure latency to first byte. -- Added --latency-percentiles to control percentile reporting. -- Mean/max latencies for messages are not reported, for UI - consistency. Use --latency-percentiles 50,100 to display. -- Added --dump-{one,all}{,-in,-out} to dump all or one - connections' input/output. -- Added --write-combine=off to emit high packet rates. - -* Tue Dec 29 2015 Anton Novojilov - 0.7-0 -- Added a manual page. man tcpkali after installation. -- Exceed 64k connections limit by using all available IP aliases on network - interfaces. -- --latency-marker-skip to ignore the first occurrences of a marker. -- --listen-mode=active to send data for connections received through -l. -- --source-ip option to restrict or change source IPs. -- "Bandwidth per channel:" output changed to ⇅ to reflect bi-direction. - -* Thu May 14 2015 Anton Novojilov - 0.6-0 -- Parse \{connection.uid} type expressions in --first-message, --message, - --latency-marker parameters, allowing constructing payloads unique per - connection. -- Added "k" multiplier to --connections; allowing for a -c10k - option (inside joke ;) - -* Wed Apr 15 2015 Anton Novojilov - 0.5-0 -- --enable-asan and --enable-tsan flags to enable address/thread sanitizer -- Do not account latencies for --first-message -- Maximum storable latency increased from 10s to 100s -- -e (--unescape-message-args) now affect --latency-marker string as well -- --websocket now awaits response after sending HTTP upgrade headers -- Add WebSocket masking on client->server communication (mandated by RFC) -- Use Boyer-Moore-Horspool to search --latency-marker in the stream -- Add --sndbuf and --rcvbuf command line options to adjust kernel buffers via - setsockopt(SO_*BUF) -- Record latencies even if only a portion of a message has been sent - -* Wed Mar 04 2015 Anton Novojilov - 0.4.2-0 -- Initial build From d910542b581c004e88619fb4ab95cff2fc1b3997 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 23:29:47 +0300 Subject: [PATCH 23/47] tmux spec refactoring --- specs/tmux.spec | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/specs/tmux.spec b/specs/tmux.spec index 92086b794..58457f055 100644 --- a/specs/tmux.spec +++ b/specs/tmux.spec @@ -4,28 +4,24 @@ ################################################################################ -%define _smp_mflags -j1 +Summary: A terminal multiplexer +Name: tmux +Version: 3.3a +Release: 0%{?dist} +License: ISC and BSD +Group: Applications/System +URL: https://github.com/tmux/tmux -################################################################################ - -Summary: A terminal multiplexer -Name: tmux -Version: 3.3a -Release: 0%{?dist} -License: ISC and BSD -Group: Applications/System -URL: https://github.com/tmux/tmux - -Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: make gcc byacc autoconf automake -BuildRequires: ncurses-devel libevent-devel +BuildRequires: make gcc byacc autoconf automake +BuildRequires: ncurses-devel libevent-devel -Provides: %{name} = %{version}-%{release} +Provides: %{name} = %{version}-%{release} ################################################################################ From 9a2625b83c02c30513ef3fd150835ec1ac6cef58 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 Dec 2023 23:30:03 +0300 Subject: [PATCH 24/47] Update upx to 4.2.1 --- specs/upx.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/specs/upx.spec b/specs/upx.spec index 2d9a1cfe1..96f055b99 100644 --- a/specs/upx.spec +++ b/specs/upx.spec @@ -6,7 +6,7 @@ Summary: Ultimate Packer for eXecutables Name: upx -Version: 4.1.0 +Version: 4.2.1 Release: 0%{?dist} License: GPLv2+ and Public Domain Group: Applications/Archiving @@ -73,6 +73,12 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 4.2.1-0 +- https://github.com/upx/upx/blob/v4.2.1/NEWS + +* Wed Dec 06 2023 Anton Novojilov - 4.2.0-0 +- https://github.com/upx/upx/blob/v4.2.0/NEWS + * Wed Sep 20 2023 Anton Novojilov - 4.1.0-0 - ELF: handle shared libraries with more than 2 PT_LOAD segments - bug fixes - see https://github.com/upx/upx/milestone/11 From d888ccebbc721e1cbfa939fdc783e60a173d0bfd Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 13:21:17 +0300 Subject: [PATCH 25/47] Update vips to 8.15.0 --- specs/vips.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/specs/vips.spec b/specs/vips.spec index d50ca7ab7..3e2418067 100644 --- a/specs/vips.spec +++ b/specs/vips.spec @@ -6,7 +6,7 @@ Name: vips Summary: C/C++ library for processing large images -Version: 8.14.5 +Version: 8.15.0 Release: 0%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -18,7 +18,7 @@ Source100: checksum.sha512 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: meson cmake pkgconfig gettext +BuildRequires: meson cmake pkgconfig gettext libarchive BuildRequires: gcc gcc-c++ libjpeg-turbo-devel libtiff-devel zlib-devel BuildRequires: glib2-devel libxml2-devel expat-devel orc-devel libpng-devel BuildRequires: libexif-devel @@ -86,13 +86,14 @@ PDF formats. %build %{meson} \ + -Darchive=disabled \ -Dcfitsio=disabled \ -Dfftw=disabled \ -Dfontconfig=disabled \ - -Dgsf=disabled \ -Dheif=disabled \ + -Dhighway=disabled \ -Dimagequant=disabled \ - -Dintrospection=false \ + -Dintrospection=disabled \ -Djpeg-xl=disabled \ -Dlcms=disabled \ -Dmagick=disabled \ @@ -153,6 +154,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 06 2023 Anton Novojilov - 8.15.0-0 +- https://github.com/libvips/libvips/releases/tag/v8.15.0 + * Fri Oct 06 2023 Anton Novojilov - 8.14.5-0 - https://github.com/libvips/libvips/releases/tag/v8.14.5 From 053f3cb8e8cae74882decfd844fd98f7857bed9a Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 13:24:21 +0300 Subject: [PATCH 26/47] Update zlib to 1.3 --- specs/zlib.spec | 93 +++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 49 deletions(-) diff --git a/specs/zlib.spec b/specs/zlib.spec index 515320199..ecc7d9a55 100644 --- a/specs/zlib.spec +++ b/specs/zlib.spec @@ -1,30 +1,6 @@ ################################################################################ -%define _posixroot / -%define _root /root -%define _bin /bin -%define _sbin /sbin -%define _srv /srv -%define _lib32 %{_posixroot}lib -%define _lib64 %{_posixroot}lib64 -%define _libdir32 %{_prefix}%{_lib32} -%define _libdir64 %{_prefix}%{_lib64} -%define _logdir %{_localstatedir}/log -%define _rundir %{_localstatedir}/run -%define _lockdir %{_localstatedir}/lock -%define _cachedir %{_localstatedir}/cache -%define _loc_prefix %{_prefix}/local -%define _loc_exec_prefix %{_loc_prefix} -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_libdir %{_loc_exec_prefix}/%{_lib} -%define _loc_libdir32 %{_loc_exec_prefix}/%{_lib32} -%define _loc_libdir64 %{_loc_exec_prefix}/%{_lib64} -%define _loc_libexecdir %{_loc_exec_prefix}/libexec -%define _loc_sbindir %{_loc_exec_prefix}/sbin -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_datarootdir %{_loc_prefix}/share -%define _loc_includedir %{_loc_prefix}/include -%define _rpmstatedir %{_sharedstatedir}/rpm-state +%global crc_check pushd ../SOURCES ; sha512sum -c %{SOURCE100} ; popd ################################################################################ @@ -32,21 +8,23 @@ ################################################################################ -Summary: The compression and decompression library -Name: zlib -Version: 1.2.13 -Release: 0%{?dist} -License: zlib and Boost -Group: System Environment/Libraries -URL: https://www.zlib.net +Summary: The compression and decompression library +Name: zlib +Version: 1.3 +Release: 0%{?dist} +License: zlib and Boost +Group: System Environment/Libraries +URL: https://www.zlib.net -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source: https://www.zlib.net/%{name}-%{version}.tar.xz +Source0: https://www.zlib.net/%{name}-%{version}.tar.xz -BuildRequires: make automake autoconf libtool +Source100: checksum.sha512 -Provides: %{name} = %{version}-%{release} +BuildRequires: make automake autoconf libtool + +Provides: %{name} = %{version}-%{release} ################################################################################ @@ -58,9 +36,10 @@ library which is used by many different programs. %package devel -Summary: Header files and libraries for Zlib development -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Header files and libraries for Zlib development +Group: Development/Libraries + +Requires: %{name} = %{version}-%{release} %description devel The zlib-devel package contains the header files and libraries needed @@ -71,9 +50,10 @@ library. %package static -Summary: Static libraries for Zlib development -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} +Summary: Static libraries for Zlib development +Group: Development/Libraries + +Requires: %{name}-devel = %{version}-%{release} %description static The zlib-static package includes static libraries needed @@ -84,9 +64,10 @@ decompression library. %package -n minizip -Summary: Library for manipulation with .zip archives -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Library for manipulation with .zip archives +Group: System Environment/Libraries + +Requires: %{name} = %{version}-%{release} %description -n minizip Minizip is a library for manipulation with files from .zip archives. @@ -95,10 +76,11 @@ Minizip is a library for manipulation with files from .zip archives. %package -n minizip-devel -Summary: Development files for the minizip library -Group: Development/Libraries -Requires: minizip = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} +Summary: Development files for the minizip library +Group: Development/Libraries + +Requires: minizip = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} %description -n minizip-devel This package contains the libraries and header files needed for @@ -107,6 +89,8 @@ developing applications which use minizip. ################################################################################ %prep +%{crc_check} + %setup -q iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp @@ -196,6 +180,17 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 1.3-0 +- Building using K&R (pre-ANSI) function definitions is no longer supported +- Fixed a bug in deflateBound() for level 0 and memLevel 9 +- Fixed a bug when gzungetc() is used immediately after gzopen() +- Fixed a bug when using gzflush() with a very small buffer +- Fixed a crash when gzsetparams() is attempted for a transparent write +- Fixed test/example.c to work with FORCE_STORED +- Fixed minizip to allow it to open an empty zip file +- Fixed reading disk number start on zip64 files in minizip +- Fixed a logic error in minizip argument processing + * Thu Oct 27 2022 Anton Novojilov - 1.2.13-0 - Fix a bug when getting a gzip header extra field with inflateGetHeader(). This remedies CVE-2022-37434. From 49113889346da5224646f9468e24ff2ca34059ae Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 13:27:30 +0300 Subject: [PATCH 27/47] vmtouch spec refactoring --- specs/vmtouch.spec | 52 +++++++++++----------------------------------- 1 file changed, 12 insertions(+), 40 deletions(-) diff --git a/specs/vmtouch.spec b/specs/vmtouch.spec index c233f4cd6..5bc7d183d 100644 --- a/specs/vmtouch.spec +++ b/specs/vmtouch.spec @@ -4,51 +4,23 @@ ################################################################################ -%define _posixroot / -%define _root /root -%define _bin /bin -%define _sbin /sbin -%define _srv /srv -%define _lib32 %{_posixroot}lib -%define _lib64 %{_posixroot}lib64 -%define _libdir32 %{_prefix}%{_lib32} -%define _libdir64 %{_prefix}%{_lib64} -%define _logdir %{_localstatedir}/log -%define _rundir %{_localstatedir}/run -%define _lockdir %{_localstatedir}/lock -%define _cachedir %{_localstatedir}/cache -%define _loc_prefix %{_prefix}/local -%define _loc_exec_prefix %{_loc_prefix} -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_libdir %{_loc_exec_prefix}/%{_lib} -%define _loc_libdir32 %{_loc_exec_prefix}/%{_lib32} -%define _loc_libdir64 %{_loc_exec_prefix}/%{_lib64} -%define _loc_libexecdir %{_loc_exec_prefix}/libexec -%define _loc_sbindir %{_loc_exec_prefix}/sbin -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_datarootdir %{_loc_prefix}/share -%define _loc_includedir %{_loc_prefix}/include -%define _rpmstatedir %{_sharedstatedir}/rpm-state +Summary: Portable file system cache diagnostics and control +Name: vmtouch +Version: 1.3.1 +Release: 0%{?dist} +License: BSD 3-Clause +Group: Development/Tools +URL: https://github.com/hoytech/vmtouch -################################################################################ - -Summary: Portable file system cache diagnostics and control -Name: vmtouch -Version: 1.3.1 -Release: 0%{?dist} -License: BSD 3-Clause -Group: Development/Tools -URL: https://github.com/hoytech/vmtouch - -Source0: https://github.com/hoytech/%{name}/archive/v%{version}.tar.gz +Source0: https://github.com/hoytech/%{name}/archive/v%{version}.tar.gz -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: make gcc +BuildRequires: make gcc -Provides: %{name} = %{version}-%{release} +Provides: %{name} = %{version}-%{release} ################################################################################ From 34f4bb7c1dbe7f945eff837b45f672954213fb0f Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 13:53:35 +0300 Subject: [PATCH 28/47] Update ripgrep to 14.0.3 --- specs/ripgrep.spec | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/specs/ripgrep.spec b/specs/ripgrep.spec index 21349ce63..8f0798b1f 100644 --- a/specs/ripgrep.spec +++ b/specs/ripgrep.spec @@ -10,7 +10,7 @@ Summary: A search tool that combines the usability of ag with the raw speed of grep Name: ripgrep -Version: 13.0.0 +Version: 14.0.3 Release: 0%{?dist} Group: Applications/Text License: MIT or Unlicense @@ -43,6 +43,7 @@ regex pattern. %setup -qn %{name}-%{version} %build +sed -i 's#rust-version = "1.72"#rust-version = "1.71"#' Cargo.toml cargo build --release --verbose %install @@ -52,16 +53,16 @@ install -dm 755 %{buildroot}%{_bindir} install -dm 755 %{buildroot}%{_mandir}/man1 install -dm 755 %{buildroot}%{_datadir}/bash-completion/completions install -dm 755 %{buildroot}%{_datarootdir}/fish/vendor_completions.d +install -dm 755 %{buildroot}%{_datadir}/zsh/site-functions -install -pm 755 target/release/rg %{buildroot}%{_bindir}/ -install -pm 644 $(find target/release -name "rg.1" | head -1) \ - %{buildroot}%{_mandir}/man1/ +pushd target/release + install -pm 755 rg %{buildroot}%{_bindir}/ -install -pm 644 $(find target/release -name "rg.bash" | head -1) \ - %{buildroot}%{_datadir}/bash-completion/completions/rg - -install -pm 644 $(find target/release -name "rg.fish" | head -1) \ - %{buildroot}%{_datarootdir}/fish/vendor_completions.d/rg.fish + ./rg --generate man > %{buildroot}%{_mandir}/man1/rg.1 + ./rg --generate complete-bash > %{buildroot}%{_datadir}/bash-completion/completions/rg + ./rg --generate complete-fish > %{buildroot}%{_datarootdir}/fish/vendor_completions.d/rg.fish + ./rg --generate complete-zsh > %{buildroot}%{_datadir}/zsh/site-functions/_rg +popd %check %if %{?_with_check:1}%{?_without_check:0} @@ -79,34 +80,38 @@ rm -rf %{buildroot} %{_bindir}/rg %{_mandir}/man1/rg.* %{_datadir}/bash-completion/completions/rg +%{_datadir}/zsh/site-functions/_rg %{_datarootdir}/fish/vendor_completions.d/rg.fish ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 14.0.3-0 +- https://github.com/BurntSushi/ripgrep/releases/tag/14.0.3 + * Sat Oct 01 2022 Anton Novojilov - 13.0.0-0 -- Updated to the latest stable release +- https://github.com/BurntSushi/ripgrep/releases/tag/13.0.0 * Tue Jan 28 2020 Anton Novojilov - 11.0.1-0 -- Updated to the latest stable release +- https://github.com/BurntSushi/ripgrep/releases/tag/11.0.1 * Tue Jan 28 2020 Anton Novojilov - 11.0.0-0 -- Updated to the latest stable release +- https://github.com/BurntSushi/ripgrep/releases/tag/11.0.0 * Wed Sep 12 2018 Anton Novojilov - 0.10.0-0 -- Updated to the latest stable release +- https://github.com/BurntSushi/ripgrep/releases/tag/0.10.0 * Mon Mar 26 2018 Anton Novojilov - 0.8.1-0 -- Updated to the latest stable release +- https://github.com/BurntSushi/ripgrep/releases/tag/0.8.1 * Tue Feb 20 2018 Anton Novojilov - 0.8.0-0 -- Updated to the latest stable release +- https://github.com/BurntSushi/ripgrep/releases/tag/0.8.0 * Fri Nov 17 2017 Anton Novojilov - 0.7.1-0 -- Updated to the latest stable release +- https://github.com/BurntSushi/ripgrep/releases/tag/0.7.1 * Mon Sep 18 2017 Anton Novojilov - 0.6.0-0 -- Updated to the latest stable release +- https://github.com/BurntSushi/ripgrep/releases/tag/0.6.0 * Sun Apr 16 2017 Anton Novojilov - 0.5.1-0 - Initial build for kaos repository From ca20df15138ce0707b7cf12a73987389e69c7d6d Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 14:05:42 +0300 Subject: [PATCH 29/47] Update pv to 1.8.5 --- specs/pv.spec | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/specs/pv.spec b/specs/pv.spec index e3bac0458..fe818018b 100644 --- a/specs/pv.spec +++ b/specs/pv.spec @@ -4,23 +4,23 @@ ################################################################################ -Summary: Tool for monitoring the progress of data through a pipeline -Name: pv -Version: 1.6.20 -Release: 0%{?dist} -License: Artistic v2.0 -Group: Applications/System -URL: https://www.ivarch.com/programs/pv.shtml +Summary: Tool for monitoring the progress of data through a pipeline +Name: pv +Version: 1.8.5 +Release: 0%{?dist} +License: Artistic v2.0 +Group: Applications/System +URL: https://www.ivarch.com/programs/pv.shtml -Source0: https://github.com/a-j-wood/pv/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +Source0: https://www.ivarch.com/programs/sources/%{name}-%{version}.tar.gz -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gcc make gettext +BuildRequires: gcc make gettext -Provides: %{name} = %{version}-%{release} +Provides: %{name} = %{version}-%{release} ################################################################################ @@ -51,6 +51,8 @@ install -dm 755 %{buildroot}%{_datarootdir}/locale %{make_install} DESTDIR="%{buildroot}" +rm -rf %{buildroot}%{_docdir}/%{name} + %find_lang %{name} %clean @@ -60,7 +62,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README doc/NEWS doc/TODO doc/COPYING +%doc README.md %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_datarootdir}/locale/* @@ -68,6 +70,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 1.8.5-0 +- https://codeberg.org/a-j-wood/pv/releases/tag/v1.8.5 + * Sat Dec 10 2022 Anton Novojilov - 1.6.20-0 - https://github.com/a-j-wood/pv/releases/tag/v1.6.20 From cdf9d6754297d3caa80772a36c83da8a1c7b8458 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 15:42:59 +0300 Subject: [PATCH 30/47] Update nodejs to 20.10.0 --- specs/nodejs.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/specs/nodejs.spec b/specs/nodejs.spec index 02dc6e9bc..9819b57a9 100644 --- a/specs/nodejs.spec +++ b/specs/nodejs.spec @@ -16,7 +16,7 @@ Summary: Platform for server side programming on JavaScript Name: nodejs -Version: 18.18.2 +Version: 20.10.0 Release: 0%{?dist} License: MIT Group: Development/Tools @@ -95,7 +95,6 @@ rm -rf %{buildroot} %{_bindir}/npx %{_bindir}/corepack %{_libdir32}/%{shortname}_modules -%{_datadir}/systemtap/tapset/%{shortname}.stp %{_docdir}/%{shortname}/gdbinit %{_docdir}/%{shortname}/lldb* %{_mandir}/man1/%{shortname}.1.gz @@ -107,6 +106,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 20.10.0-0 +- https://nodejs.org/en/blog/release/v20.10.0 + * Sat Oct 14 2023 Anton Novojilov - 18.18.2-0 - https://nodejs.org/en/blog/release/v18.18.2 From d6f44dbca010be740357857ebe9eb7d9c9909ea8 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 15:48:57 +0300 Subject: [PATCH 31/47] Update meson to 1.3.0 --- specs/meson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/meson.spec b/specs/meson.spec index 1893d4d4d..6c5290abf 100644 --- a/specs/meson.spec +++ b/specs/meson.spec @@ -26,7 +26,7 @@ Summary: High productivity build system Name: meson -Version: 1.1.1 +Version: 1.3.0 Release: 0%{?dist} License: ASL 2.0 Group: Development/Tools @@ -91,6 +91,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 1.3.0-0 +- https://github.com/mesonbuild/meson/compare/1.1.1...1.3.0 + * Sat Jul 08 2023 Anton Novojilov - 1.1.1-0 - https://github.com/mesonbuild/meson/compare/1.1.0...1.1.1 From 524c97577d0d45983e9ca70e8802b8156179f3d0 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 16:05:09 +0300 Subject: [PATCH 32/47] Remove luajit --- specs/luajit.spec | 236 ---------------------------------------------- 1 file changed, 236 deletions(-) delete mode 100644 specs/luajit.spec diff --git a/specs/luajit.spec b/specs/luajit.spec deleted file mode 100644 index 5bc8893b1..000000000 --- a/specs/luajit.spec +++ /dev/null @@ -1,236 +0,0 @@ -################################################################################ - -%global crc_check pushd ../SOURCES ; sha512sum -c %{SOURCE100} ; popd - -################################################################################ - -%define api_version 5.1 -%define major_version 2 -%define minor_version 0.5 - -################################################################################ - -Name: luajit -Summary: Just-In-Time Compiler for Lua -Version: 2.0.5 -Release: 0%{?dist} -License: MIT -Group: Development/Tools -URL: https://luajit.org - -Source: https://luajit.org/download/LuaJIT-%{version}.tar.gz - -Source100: checksum.sha512 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gcc make - -Provides: %{name} = %{version}-%{release} - -################################################################################ - -%description -LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language. - -################################################################################ - -%package -n libluajit - -Summary: LuaJIT shared library -Group: Development/Libraries - -%description -n libluajit -LuaJIT shared library. - -################################################################################ - -%package -n libluajit-devel - -Summary: Headers and static lib for LuaJIT -Group: Development/Libraries -Requires: libluajit >= %{version} - -%description -n libluajit-devel -Headers and static lib for LuaJIT. - -################################################################################ - -%prep -%{crc_check} - -%setup -qn LuaJIT-%{version} - -%build -export CFLAGS="$CFLAGS -fPIC" - -%{__make} %{?_smp_mflags} - -%install -rm -rf %{buildroot} - -%{make_install} PREFIX=%{_usr} INSTALL_LIB=%{buildroot}%{_libdir} - -ln -sf %{_libdir}/libluajit-%{api_version}.so.%{major_version}.%{minor_version} \ - %{buildroot}%{_libdir}/libluajit-%{api_version}.so - -%post -n libluajit -/sbin/ldconfig - -%postun -n libluajit -/sbin/ldconfig - -%clean -rm -rf %{buildroot} - -################################################################################ - -%files -%defattr(-,root,root) -%doc COPYRIGHT README -%{_bindir}/%{name} -%{_bindir}/%{name}-%{version} -%{_datarootdir}/%{name}-%{version}/* -%{_mandir}/man1/%{name}.1* - -%files -n libluajit -%defattr(-,root,root) -%{_libdir}/*.so.* -%{_libdir}/*.so - -%files -n libluajit-devel -%defattr(-,root,root) -%{_includedir}/%{name}-* -%{_libdir}/*.a -%{_libdir}/pkgconfig/*.pc - -################################################################################ - -%changelog -* Tue May 09 2017 Anton Novojilov - 2.0.5-0 -- Add workaround for MSVC 2015 stdio changes -- Limit mcode alloc probing, depending on the available pool size -- Fix overly restrictive range calculation in mcode allocation -- Fix out-of-scope goto handling in parser -- Remove internal __mode = "K" and replace with safe check -- Add "proto" field to jit.util.funcinfo() -- Fix GC step size calculation -- Initialize uv->immutable for upvalues of loaded chunks -- Fix for cdata vs. non-cdata arithmetics/comparisons -- Drop leftover regs in 'for' iterator assignment, too -- Fix PHI remarking in SINK pass -- Don't try to record outermost pcall() return to lower frame -- Add guard for obscure aliasing between open upvalues and SSA slots -- Remove assumption that lj_math_random_step() doesn't clobber FPRs -- Fix handling of non-numeric strings in arithmetic coercions -- Fix recording of select(n, ...) with off-trace vararg -- Fix install for cross-builds -- Don't allocate unused 2nd result register in JIT compiler backend -- Drop marks from replayed instructions when sinking -- Fix unsinking check -- Properly handle OOM in trace_save() -- Limit number of arguments given to io.lines() and fp:lines() -- Fix narrowing of TOBIT -- OSX: Fix build with recent XCode -- x86/x64: Don't spill an explicit REF_BASE in the IR -- x86/x64: Fix instruction length decoder -- x86/x64: Search for exit jumps with instruction length decoder -- ARM: Fix BLX encoding for Thumb interworking calls -- MIPS: Don't use RID_GP as a scratch register -- MIPS: Fix emitted code for U32 to float conversion -- MIPS: Backport workaround for compact unwind tables -- MIPS: Fix cross-endian jit.bcsave -- MIPS: Fix BC_ISNEXT fallback path -- MIPS: Fix use of ffgccheck delay slots in interpreter -- FFI: Fix FOLD rules for int64_t comparisons -- FFI: Fix SPLIT pass for CONV i64.u64 -- FFI: Fix ipairs() recording -- FFI: Don't propagate qualifiers into subtypes of complex - -* Wed Apr 27 2016 Anton Novojilov - 2.0.4-1 -- Improved build process - -* Fri May 22 2015 Anton Novojilov - 2.0.4-0 -- Fix stack check in narrowing optimization -- Fix Lua/C API typecheck error for special indexes -- Fix string to number conversion -- Fix lexer error for chunks without tokens -- Don't compile IR_RETF after CALLT to ff with-side effects -- Fix BC_UCLO/BC_JMP join optimization in Lua parser -- Fix corner case in string to number conversion -- Gracefully handle lua_error() for a suspended coroutine -- Avoid error messages when building with Clang -- Fix snapshot #0 handling for traces with a stack check on entry -- Fix fused constant loads under high register pressure -- Invalidate backpropagation cache after DCE -- Fix ABC elimination -- Fix debug info for main chunk of stripped bytecode -- Fix FOLD rule for string.sub(s, ...) == k -- Fix FOLD rule for STRREF of SNEW -- Fix frame traversal while searching for error function -- Prevent GC estimate miscalculation due to buffer growth -- Prevent adding side traces for stack checks -- Fix top slot calculation for snapshots with continuations -- Fix check for reuse of SCEV results in FORL -- Add PS Vita port -- Fix compatibility issues with Illumos -- Fix DragonFly build (unsupported) -- OpenBSD/x86: Better executable memory allocation for W^X mode -- x86: Fix argument checks for ipairs() iterator -- x86: lj_math_random_step() clobbers XMM regs on OSX Clang -- x86: Fix code generation for unused result of math.random() -- x64: Allow building with LUAJIT_USE_SYSMALLOC and LUAJIT_USE_VALGRIND -- x86/x64: Fix argument check for bit shifts -- x86/x64: Fix code generation for fused test/arith ops -- ARM: Fix write barrier check in BC_USETS -- PPC: Fix red zone overflow in machine code generation -- PPC: Don't use mcrxr on PPE -- Various archs: Fix excess stack growth in interpreter -- FFI: Fix FOLD rule for TOBIT + CONV num.u32 -- FFI: Prevent DSE across ffi.string() -- FFI: No meta fallback when indexing pointer to incomplete struct -- FFI: Fix initialization of unions of subtypes -- FFI: Fix cdata vs. non-cdata arithmetic and comparisons -- FFI: Fix __index/__newindex metamethod resolution for ctypes -- FFI: Fix compilation of reference field access -- FFI: Fix frame traversal for backtraces with FFI callbacks -- FFI: Fix recording of indexing a struct pointer ctype object itself -- FFI: Allow non-scalar cdata to be compared for equality by address -- FFI: Fix pseudo type conversions for type punning - -* Fri Mar 14 2014 Anton Novojilov - 2.0.3-0 -- Add PS4 port -- Add support for multilib distro builds -- Fix OSX build -- Fix MinGW build -- Fix Xbox 360 build -- Improve ULOAD forwarding for open upvalues -- Fix GC steps threshold handling when called by JIT-compiled code -- Fix argument checks for math.deg() and math.rad() -- Fix jit.flush(func|true) -- Respect jit.off(func) when returning to a function, too -- Fix compilation of string.byte(s, nil, n) -- Fix line number for relocated bytecode after closure fixup -- Fix frame traversal for backtraces -- Fix ABC elimination -- Fix handling of redundant PHIs -- Fix snapshot restore for exit to function header -- Fix type punning alias analysis for constified pointers -- Fix call unroll checks in the presence of metamethod frames -- Fix initial maxslot for down-recursive traces -- Prevent BASE register coalescing if parent uses IR_RETF -- Don't purge modified function from stack slots in BC_RET -- Fix recording of BC_VARG -- Don't access dangling reference to reallocated IR -- Fix frame depth display for bytecode dump in -jdump -- ARM: Fix register allocation when rematerializing FPRs -- x64: Fix store to upvalue for lightuserdata values -- FFI: Add missing GC steps for callback argument conversions -- FFI: Properly unload loaded DLLs -- FFI: Fix argument checks for ffi.string() -- FFI/x64: Fix passing of vector arguments to calls -- FFI: Rehash finalizer table after GC cycle, if needed -- FFI: Fix cts->L for cdata unsinking in snapshot restore - -* Fri Jan 31 2014 Anton Novojilov - 2.0.2-0 -- Initial build From 12bb43d422bf21db945f26949219c90ad9433335 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 16:12:23 +0300 Subject: [PATCH 33/47] Update gradle to 8.5 --- specs/gradle.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specs/gradle.spec b/specs/gradle.spec index 272d952cf..e709bcbe4 100644 --- a/specs/gradle.spec +++ b/specs/gradle.spec @@ -14,7 +14,7 @@ Summary: A powerful build system for the JVM Name: gradle -Version: 7.6 +Version: 8.5 Release: 0%{?dist} License: ASL 2.0 Group: Development/Tools @@ -59,6 +59,7 @@ install -dm 755 %{buildroot}%{_bindir} install -dm 755 %{buildroot}%{_opt}/%{name}/%{version} cp -rp * %{buildroot}%{_opt}/%{name}/%{version}/ +rm -f %{buildroot}%{_opt}/%{name}/bin/*.bat ln -sf %{_opt}/%{name}/%{version} %{buildroot}%{_opt}/%{name}/current ln -sf %{_opt}/%{name}/%{version}/bin/%{name} %{buildroot}%{_bindir}/%{name} @@ -76,6 +77,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 8.5-0 +- https://docs.gradle.org/8.5/release-notes.html + * Fri Dec 16 2022 Anton Novojilov - 7.6-0 - https://docs.gradle.org/7.6/release-notes.html From bdb6b89dab573dec36507c3b2935917e77fcc665 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 17:35:09 +0300 Subject: [PATCH 34/47] Update HDF5 to 1.14.3 --- specs/hdf5/hdf5.spec | 56 +++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/specs/hdf5/hdf5.spec b/specs/hdf5/hdf5.spec index 344591907..3bbf5247d 100644 --- a/specs/hdf5/hdf5.spec +++ b/specs/hdf5/hdf5.spec @@ -4,26 +4,35 @@ ################################################################################ -Summary: A general purpose library and file format for storing scientific data -Name: hdf5 -Version: 1.10.10 -Release: 0%{?dist} -License: BSD -Group: System Environment/Libraries -URL: https://www.hdfgroup.org/HDF5/ +%define major_version 1 +%define minor_version 14 +%define patch_version 3 -Source: https://support.hdfgroup.org/ftp/HDF5/releases/%{name}-1.10/%{name}-%{version}/src/%{name}-%{version}.tar.bz2 -Source1: h5comp +################################################################################ + +Summary: A general purpose library and file format for storing scientific data +Name: hdf5 +Version: %{major_version}.%{minor_version}.%{patch_version} +Release: 0%{?dist} +License: BSD +Group: System Environment/Libraries +URL: https://www.hdfgroup.org/HDF5/ + +Source: https://support.hdfgroup.org/ftp/HDF5/releases/%{name}-%{major_version}.%{minor_version}/%{name}-%{version}/src/%{name}-%{version}.tar.bz2 +Source1: h5comp -Source100: checksum.sha512 +Source100: checksum.sha512 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: make gcc gcc-c++ automake libtool openssh-clients -BuildRequires: krb5-devel openssl-devel zlib-devel gcc-gfortran time -BuildRequires: chrpath +BuildRequires: make gcc gcc-c++ automake libtool openssh-clients +BuildRequires: krb5-devel openssl-devel zlib-devel gcc-gfortran time +BuildRequires: chrpath -Provides: %{name} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +Provides: %{name} = %{version}-%{release} ################################################################################ @@ -66,12 +75,15 @@ HDF5 static libraries. %setup -q +# Remove -Werror flag stripping that breaks the build +sed -i '/s\/-Werror\/\/g/d' configure + %build export CC=gcc export CXX=g++ export F9X=gfortran -export CFLAGS="${RPM_OPT_FLAGS/O2/O0}" +export LDFLAGS="%{__global_ldflags} -fPIC -Wl,-z,now -Wl,--as-needed" mkdir build pushd build @@ -83,7 +95,7 @@ pushd build --enable-hl \ --enable-shared - %{__make} %{?_smp_mflags} + %{make_build} LDFLAGS="%{__global_ldflags} -fPIC -Wl,-z,now -Wl,--as-needed" popd %install @@ -124,10 +136,10 @@ chrpath --delete %{buildroot}%{_libdir}/*.so.* rm -rf %{buildroot} %post -%{_sbindir}/ldconfig +/sbin/ldconfig %postun -%{_sbindir}/ldconfig +/sbin/ldconfig ################################################################################ @@ -138,9 +150,11 @@ rm -rf %{buildroot} %{_bindir}/h5clear %{_bindir}/h5copy %{_bindir}/h5debug +%{_bindir}/h5delete %{_bindir}/h5diff %{_bindir}/h5dump %{_bindir}/h5format_convert +%{_bindir}/h5fuse.sh %{_bindir}/h5import %{_bindir}/h5jam %{_bindir}/h5ls @@ -159,6 +173,7 @@ rm -rf %{buildroot} %{_bindir}/h5cc* %{_bindir}/h5fc* %{_bindir}/h5redeploy +%{_bindir}/h5tools_test_utils %{_includedir}/*.h %{_libdir}/*.so %{_libdir}/*.settings @@ -172,6 +187,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 1.14.3-0 +- https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.3/src/hdf5-1.14.3-RELEASE.txt + * Wed Sep 27 2023 Anton Novojilov - 1.10.10-0 - https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.10/src/hdf5-1.10.10-RELEASE.txt From bb1cdb9caba2cdbf3d279d3e62d9bf32ae2aba17 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 17:53:59 +0300 Subject: [PATCH 35/47] Update cronie to 1.7.0 --- specs/cronie.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/specs/cronie.spec b/specs/cronie.spec index 349481bed..fe5a30986 100644 --- a/specs/cronie.spec +++ b/specs/cronie.spec @@ -17,8 +17,8 @@ Summary: Cron daemon for executing programs at set times Name: cronie -Version: 1.6.1 -Release: 1%{?dist} +Version: 1.7.0 +Release: 0%{?dist} License: MIT and BSD and ISC and GPLv2 Group: System Environment/Base URL: https://github.com/cronie-crond/cronie @@ -109,22 +109,22 @@ extra features. %build %configure \ %if %{with pam} ---with-pam \ + --with-pam \ %endif %if %{with selinux} ---with-selinux \ + --with-selinux \ %endif %if %{with audit} ---with-audit \ + --with-audit \ %endif %if %{with inotify} ---with-inotify \ + --with-inotify \ %endif ---enable-anacron \ ---enable-pie \ ---enable-relro + --enable-anacron \ + --enable-pie \ + --enable-relro -%{__make} %{?_smp_mflags} +%{make_build} V=2 %install rm -rf %{buildroot} @@ -241,6 +241,9 @@ systemctl try-restart %{service_name}.service &>/dev/null || : ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 1.7.0-0 +- https://github.com/cronie-crond/cronie/releases/tag/cronie-1.7.0 + * Mon Oct 09 2023 Anton Novojilov - 1.6.1-0 - Spec refactoring From e182e4a5a39ae2d8c46eafebea3395c170c57b91 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 18:05:56 +0300 Subject: [PATCH 36/47] Update fish to 3.6.4 --- specs/fish.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/fish.spec b/specs/fish.spec index 78deec815..9667b69f0 100644 --- a/specs/fish.spec +++ b/specs/fish.spec @@ -6,7 +6,7 @@ Summary: Friendly interactive shell (FISh) Name: fish -Version: 3.6.1 +Version: 3.6.4 Release: 0%{?dist} License: GPL2 Group: System Environment/Shells @@ -94,6 +94,9 @@ fi ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 3.6.4-0 +- https://github.com/fish-shell/fish-shell/releases/tag/3.6.4 + * Thu Oct 05 2023 Anton Novojilov - 3.6.1-0 - https://github.com/fish-shell/fish-shell/releases/tag/3.6.1 From 000c1e2b6bc2600c992658647248ddaa86886a3b Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 7 Dec 2023 18:11:28 +0300 Subject: [PATCH 37/47] Update etcd to 3.5.11 --- specs/etcd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/specs/etcd.spec b/specs/etcd.spec index 0b95206ba..f7a852eb4 100644 --- a/specs/etcd.spec +++ b/specs/etcd.spec @@ -10,7 +10,7 @@ Summary: Distributed reliable key-value store for the most critical data of a distributed system Name: etcd -Version: 3.5.6 +Version: 3.5.11 Release: 0%{?dist} Group: Applications/Internet License: APLv2 @@ -22,7 +22,7 @@ Source100: checksum.sha512 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: golang >= 1.18 +BuildRequires: git golang >= 1.20 Provides: %{name} = %{version}-%{release} @@ -91,6 +91,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 07 2023 Anton Novojilov - 3.5.11-0 +- https://github.com/etcd-io/etcd/releases/tag/v3.5.11 + * Sun Dec 11 2022 Anton Novojilov - 3.5.6-0 - https://github.com/etcd-io/etcd/releases/tag/v3.5.6 From f40c33341d395f13b61e2ec141911a0530fcb168 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 8 Dec 2023 00:22:33 +0300 Subject: [PATCH 38/47] Improve changelog generation script --- release-info-gen.go | 94 +++++++++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/release-info-gen.go b/release-info-gen.go index 19c2ab387..72bed24f6 100644 --- a/release-info-gen.go +++ b/release-info-gen.go @@ -2,30 +2,30 @@ package main // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2023 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // import ( - "fmt" "os" "os/exec" "sort" "strconv" "strings" - "pkg.re/essentialkaos/ek.v12/fmtc" - "pkg.re/essentialkaos/ek.v12/path" - "pkg.re/essentialkaos/ek.v12/sortutil" - "pkg.re/essentialkaos/ek.v12/strutil" + "github.com/essentialkaos/ek/env" + "github.com/essentialkaos/ek/fmtc" + "github.com/essentialkaos/ek/path" + "github.com/essentialkaos/ek/sortutil" + "github.com/essentialkaos/ek/strutil" ) // ////////////////////////////////////////////////////////////////////////////////// // const ( APP = "ReleaseInfoGen" - VER = "1.0.0" + VER = "2.0.0" DESC = "Go utility for generating release info" ) @@ -59,9 +59,32 @@ func (c Changes) Less(i, j int) bool { // ////////////////////////////////////////////////////////////////////////////////// // func main() { - checkoutLatestChanges() + check() + genChanges() +} + +// check checks required apps +func check() { + if env.Which("git") == "" { + printErrorAndExit("This script requires git") + } +} + +// genChanges generates list of changes +func genChanges() { + err := checkoutLatestChanges() + + if err != nil { + printErrorAndExit(err.Error()) + } + changes := createChangesList() + if len(changes) == 0 { + printWarn("No changes found") + return + } + listAdditions(changes) listModifications(changes) listDeletions(changes) @@ -70,20 +93,22 @@ func main() { // ////////////////////////////////////////////////////////////////////////////////// // // checkoutLatestChanges checkouts the latest changes -func checkoutLatestChanges() { +func checkoutLatestChanges() error { cmd := exec.Command("git", "checkout", "-B", "master", "origin/master") err := cmd.Run() if err != nil { - printErrorAndExit(err.Error()) + return err } cmd = exec.Command("git", "checkout", "develop") err = cmd.Run() if err != nil { - printErrorAndExit(err.Error()) + return err } + + return nil } // createChangesList makes slice with changes between develop and master branch @@ -118,11 +143,10 @@ func listAdditions(changes Changes) { for _, c := range changes { if c.Type == TYPE_ADDED { - pkgName := getSpecValue(c.File, "name") - pkgDesc := getSpecValue(c.File, "summary") + values := getSpecValue(c.File, "name", "summary") - data = append(data, fmt.Sprintf( - "`%s` (_%s_)", pkgName, pkgDesc, + data = append(data, fmtc.Sprintf( + "`%s` (_{&}%s{!}_)", values[0], values[1], )) } @@ -131,11 +155,10 @@ func listAdditions(changes Changes) { srcName := path.Base(c.Source) if fileName != srcName { - pkgName := getSpecValue(c.File, "name") - pkgDesc := getSpecValue(c.File, "summary") + values := getSpecValue(c.File, "name", "summary") - data = append(data, fmt.Sprintf( - "`%s` (_%s_)", pkgName, pkgDesc, + data = append(data, fmtc.Sprintf( + "`%s` (_{&}%s{!}_)", values[0], values[1], )) } } @@ -143,10 +166,10 @@ func listAdditions(changes Changes) { sortutil.StringsNatural(data) - fmt.Println("### New packages\n") + fmtc.Println("{*}### New packages{!}\n") for _, info := range data { - fmt.Printf("- %s\n", info) + fmtc.Printf("{s}-{!} %s\n", info) } fmtc.NewLine() @@ -161,20 +184,19 @@ func listModifications(changes Changes) { continue } - pkgName := getSpecValue(c.File, "name") - pkgVer := getSpecValue(c.File, "version") + values := getSpecValue(c.File, "name", "version") - data = append(data, fmt.Sprintf( - "`%s` updated to %s", pkgName, pkgVer, + data = append(data, fmtc.Sprintf( + "`%s` updated to %s", values[0], values[1], )) } sortutil.StringsNatural(data) - fmt.Println("### Updates\n") + fmtc.Println("{*}### Updates{!}\n") for _, info := range data { - fmt.Printf("- %s\n", info) + fmtc.Printf("{s}-{!} %s\n", info) } fmtc.NewLine() @@ -216,10 +238,10 @@ func listDeletions(changes Changes) { sortutil.StringsNatural(data) - fmt.Println("### Deletions\n") + fmtc.Println("{*}### Deletions{!}\n") for _, pkg := range data { - fmt.Printf("- `%s`\n", pkg) + fmtc.Printf("{s}-{!} `%s`\n", pkg) } fmtc.NewLine() @@ -271,15 +293,21 @@ func filterChanges(changes Changes) Changes { } // getSpecValue reads macro value from spec -func getSpecValue(file, macro string) string { - cmd := exec.Command("rpm", "-q", "--qf", "%{"+macro+"}\n", "--specfile", file) +func getSpecValue(file string, macros ...string) []string { + var macroList string + + for _, macro := range macros { + macroList += "%{" + macro + "}\n" + } + + cmd := exec.Command("rpm", "-q", "--qf", macroList, "--specfile", file) output, err := cmd.Output() if err != nil { - return "" + return make([]string, len(macros)) } - return strings.Split(string(output), "\n")[0] + return strings.Split(string(output), "\n") } // isUniqSpec returns true if spec is unique (only one spec with this name) From 3e8d3cb0e722aafccda14ba8df05e1bb95c84b88 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 8 Dec 2023 17:07:38 +0300 Subject: [PATCH 39/47] Improve pgbouncer tests --- tests/pgbouncer/pgbouncer.recipe | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/pgbouncer/pgbouncer.recipe b/tests/pgbouncer/pgbouncer.recipe index a977d8455..089636f4c 100644 --- a/tests/pgbouncer/pgbouncer.recipe +++ b/tests/pgbouncer/pgbouncer.recipe @@ -19,6 +19,8 @@ var postgres_service postgresql-{postgres_version} var postgres_port 5432 var postgres_data_dir /var/lib/pgsql/{postgres_version} +var pause 5 + ################################################################################ command "-" "Check environment" @@ -59,6 +61,7 @@ command "-" "Configure pgbouncer" command "systemctl start {postgres_service}" "Start PostgreSQL server" wait-service {postgres_service} connect tcp :{postgres_port} + wait {pause} command "postgres:psql -f create_test_db.sql" "Create test database" exit 0 From 9149c08b2d103eed8d7e3eba6dbab34aeca65782 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 8 Dec 2023 17:53:35 +0300 Subject: [PATCH 40/47] Disable sanitizers for createrepo_c due to many leak alerts --- specs/createrepo_c.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/createrepo_c.spec b/specs/createrepo_c.spec index 034a4431d..bbaadf881 100644 --- a/specs/createrepo_c.spec +++ b/specs/createrepo_c.spec @@ -4,7 +4,7 @@ ################################################################################ -%{!?_without_sanitizers: %define _with_sanitizers 1} +%{!?_without_sanitizers: %define _with_sanitizers 0} ################################################################################ From 9b3a099b6352ca9e9f852ad74c49979b369d3d52 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 8 Dec 2023 18:11:54 +0300 Subject: [PATCH 41/47] Disable sanitizers for createrepo_c due to many leak alerts --- specs/createrepo_c.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specs/createrepo_c.spec b/specs/createrepo_c.spec index bbaadf881..ec71c28c9 100644 --- a/specs/createrepo_c.spec +++ b/specs/createrepo_c.spec @@ -4,7 +4,7 @@ ################################################################################ -%{!?_without_sanitizers: %define _with_sanitizers 0} +%define _without_sanitizers 0 ################################################################################ @@ -111,6 +111,8 @@ Python bindings for the createrepo_c library. sed -i '/unset(PYTHON_LIBRARY/d' src/python/CMakeLists.txt sed -i '/unset(PYTHON_INCLUDE_DIR/d' src/python/CMakeLists.txt +echo "" + cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ @@ -188,6 +190,7 @@ rm -rf %{buildroot} %changelog * Wed Dec 06 2023 Anton Novojilov - 1.0.2-0 - https://github.com/rpm-software-management/createrepo_c/compare/1.0.1...1.0.2 +- Build with sanitizers disabled by default due to many leak alerts * Fri Oct 06 2023 Anton Novojilov - 1.0.1-0 - https://github.com/rpm-software-management/createrepo_c/compare/1.0.0...1.0.1 From f8fc8e34ec24e5e3e0f2dc1ad3dc3ec48e6bad37 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sun, 10 Dec 2023 16:41:58 +0300 Subject: [PATCH 42/47] Update PostgreSQL 11-16 --- specs/postgresql-11/postgresql-11.spec | 5 ++++- specs/postgresql-12/postgresql-12.spec | 7 +++++-- specs/postgresql-13/postgresql-13.spec | 7 +++++-- specs/postgresql-14/postgresql-14.spec | 7 +++++-- specs/postgresql-15/postgresql-15.spec | 7 +++++-- specs/postgresql-16/postgresql-16.spec | 7 +++++-- 6 files changed, 29 insertions(+), 11 deletions(-) diff --git a/specs/postgresql-11/postgresql-11.spec b/specs/postgresql-11/postgresql-11.spec index 3ba68f9a5..36706abf4 100644 --- a/specs/postgresql-11/postgresql-11.spec +++ b/specs/postgresql-11/postgresql-11.spec @@ -24,7 +24,7 @@ %define majorver 11 %define minorver 21 -%define rel 1 +%define rel 2 %define fullver %{majorver}.%{minorver} %define pkgver 11 %define realname postgresql @@ -1145,6 +1145,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 09 2023 Anton Novojilov - 11.21-2 +- Rebuilt with the latest version of LLVM + * Sun Oct 29 2023 Anton Novojilov - 11.21-1 - Improved init script compatibility with systemd diff --git a/specs/postgresql-12/postgresql-12.spec b/specs/postgresql-12/postgresql-12.spec index 6040e2d5b..9db52a3e2 100644 --- a/specs/postgresql-12/postgresql-12.spec +++ b/specs/postgresql-12/postgresql-12.spec @@ -23,8 +23,8 @@ %{!?llvm:%global llvm 1} %define majorver 12 -%define minorver 16 -%define rel 1 +%define minorver 17 +%define rel 0 %define fullver %{majorver}.%{minorver} %define pkgver 12 %define realname postgresql @@ -1147,6 +1147,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 09 2023 Anton Novojilov - 12.17-0 +- https://www.postgresql.org/docs/12/release-12-17.html + * Sun Oct 29 2023 Anton Novojilov - 12.16-1 - Improved init script compatibility with systemd diff --git a/specs/postgresql-13/postgresql-13.spec b/specs/postgresql-13/postgresql-13.spec index 501366eb0..5e7db3564 100644 --- a/specs/postgresql-13/postgresql-13.spec +++ b/specs/postgresql-13/postgresql-13.spec @@ -23,8 +23,8 @@ %{!?llvm:%global llvm 1} %define majorver 13 -%define minorver 12 -%define rel 1 +%define minorver 13 +%define rel 0 %define fullver %{majorver}.%{minorver} %define pkgver 13 %define realname postgresql @@ -1150,6 +1150,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 09 2023 Anton Novojilov - 13.13-0 +- https://www.postgresql.org/docs/13/release-13-13.html + * Sun Oct 29 2023 Anton Novojilov - 13.12-1 - Improved init script compatibility with systemd diff --git a/specs/postgresql-14/postgresql-14.spec b/specs/postgresql-14/postgresql-14.spec index 1f7a0efa6..6ea90fe40 100644 --- a/specs/postgresql-14/postgresql-14.spec +++ b/specs/postgresql-14/postgresql-14.spec @@ -23,8 +23,8 @@ %{!?llvm:%global llvm 1} %define majorver 14 -%define minorver 9 -%define rel 1 +%define minorver 10 +%define rel 0 %define fullver %{majorver}.%{minorver} %define pkgver 14 %define realname postgresql @@ -1158,6 +1158,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 09 2023 Anton Novojilov - 14.10-0 +- https://www.postgresql.org/docs/14/release-14-10.html + * Sun Oct 29 2023 Anton Novojilov - 14.9-1 - Improved init script compatibility with systemd diff --git a/specs/postgresql-15/postgresql-15.spec b/specs/postgresql-15/postgresql-15.spec index 6c537ed66..1e0b785ec 100644 --- a/specs/postgresql-15/postgresql-15.spec +++ b/specs/postgresql-15/postgresql-15.spec @@ -24,8 +24,8 @@ %{!?zstd:%global zstd 1} %define majorver 15 -%define minorver 4 -%define rel 1 +%define minorver 5 +%define rel 0 %define fullver %{majorver}.%{minorver} %define pkgver 15 %define realname postgresql @@ -1171,6 +1171,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 09 2023 Anton Novojilov - 15.5-0 +- https://www.postgresql.org/docs/15/release-15-5.html + * Thu Sep 21 2023 Anton Novojilov - 15.4-0 - https://www.postgresql.org/docs/15/release-15-4.html diff --git a/specs/postgresql-16/postgresql-16.spec b/specs/postgresql-16/postgresql-16.spec index 74a26befe..063c04858 100644 --- a/specs/postgresql-16/postgresql-16.spec +++ b/specs/postgresql-16/postgresql-16.spec @@ -24,8 +24,8 @@ %{!?zstd:%global zstd 1} %define majorver 16 -%define minorver 0 -%define rel 1 +%define minorver 1 +%define rel 0 %define fullver %{majorver}.%{minorver} %define pkgver 16 %define realname postgresql @@ -1169,6 +1169,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 09 2023 Anton Novojilov - 16.1-0 +- https://www.postgresql.org/docs/16/release-16-1.html + * Sun Oct 29 2023 Anton Novojilov - 16.0-1 - Improved init script compatibility with systemd From 8832fca139729f6c5ea3f6cf8d7e3f3e79455d33 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sun, 10 Dec 2023 16:42:16 +0300 Subject: [PATCH 43/47] Update GDAL to 3.7.3 --- specs/gdal3.spec | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/specs/gdal3.spec b/specs/gdal3.spec index 7f9b36547..6f0a6c7a1 100644 --- a/specs/gdal3.spec +++ b/specs/gdal3.spec @@ -4,8 +4,9 @@ ################################################################################ -%global sqlite_min_ver %(rpm -q --quiet sqlite-devel && rpm -q --qf '%{VERSION}' sqlite-devel || echo "3") -%global libcurl_min_ver %(rpm -q --quiet libcurl-devel && rpm -q --qf '%{VERSION}' libcurl-devel || echo "7") +%global sqlite_ver %(rpm -q --quiet sqlite-devel && rpm -q --qf '%%{version}' sqlite-devel || echo "3") +%global libcurl_ver %(rpm -q --quiet libcurl-devel && rpm -q --qf '%%{version}' libcurl-devel || echo "8") +%global hdf5_ver %(rpm -q --quiet hdf5-devel && rpm -q --qf '%%{version}' hdf5-devel || echo "1.14") ################################################################################ @@ -25,8 +26,8 @@ Summary: A translator library for raster and vector geospatial data formats Name: %{fullname} -Version: 3.7.2 -Release: 1%{?dist} +Version: 3.7.3 +Release: 0%{?dist} License: MIT Group: Development/Libraries URL: https://www.gdal.org @@ -44,17 +45,19 @@ BuildRequires: cmake swig %endif BuildRequires: gcc-c++ bison expat-devel freexl-devel geos-devel hdf-devel -BuildRequires: hdf5-devel libgeotiff-devel libjpeg-turbo-devel libpng-devel +BuildRequires: libgeotiff-devel libjpeg-turbo-devel libpng-devel BuildRequires: libtiff-devel libzstd-devel libwebp-devel netcdf-devel BuildRequires: openexr-devel openjpeg2-devel proj-devel BuildRequires: xerces-c-devel xz-devel zlib-devel giflib-devel BuildRequires: postgresql%{pg_short_ver}-devel -BuildRequires: sqlite-devel >= %{sqlite_min_ver} -BuildRequires: libcurl-devel >= %{libcurl_min_ver} +BuildRequires: sqlite-devel >= %{sqlite_ver} +BuildRequires: libcurl-devel >= %{libcurl_ver} +BuildRequires: hdf5-devel = %{hdf5_ver} -Requires: libcurl >= %{libcurl_min_ver} -Requires: sqlite-libs >= %{sqlite_min_ver} +Requires: libcurl >= %{libcurl_ver} +Requires: sqlite-libs >= %{sqlite_ver} +Requires: hdf5 >= %{hdf5_ver} Provides: %{name} = %{version}-%{release} @@ -85,8 +88,9 @@ Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: libcurl-devel >= %{libcurl_min_ver} Requires: postgresql%{pg_short_ver}-devel +Requires: libcurl-devel >= %{libcurl_ver} +Requires: hdf5-devel = %{hdf5_ver} %description devel Development Libraries for the GDAL file format library. @@ -151,6 +155,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 09 2023 Anton Novojilov - 3.7.3-0 +- https://github.com/OSGeo/gdal/blob/v3.7.3/NEWS.md + * Tue Oct 10 2023 Anton Novojilov - 3.7.2-1 - Spec refactoring From cf87b9d48d4578046bc87b800a3e326898b92525 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sun, 10 Dec 2023 16:42:49 +0300 Subject: [PATCH 44/47] netcdf spec refactoring --- specs/netcdf.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/specs/netcdf.spec b/specs/netcdf.spec index 80f561e7c..042098d73 100644 --- a/specs/netcdf.spec +++ b/specs/netcdf.spec @@ -4,10 +4,14 @@ ################################################################################ +%global hdf5_ver %(rpm -q --quiet hdf5-devel && rpm -q --qf '%%{version}' hdf5-devel || echo "1.14") + +################################################################################ + Summary: Libraries for the Unidata network Common Data Form Name: netcdf Version: 4.9.2 -Release: 0%{?dist} +Release: 1%{?dist} License: NetCDF Group: Applications/Engineering URL: https://www.unidata.ucar.edu/software/netcdf/ @@ -18,9 +22,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: make gcc chrpath doxygen gawk libxml2-devel BuildRequires: libcurl-devel m4 zlib-devel openssh-clients libtirpc-devel -BuildRequires: hdf-static hdf5-devel >= 1.10 +BuildRequires: hdf-static hdf5-devel -Requires: hdf5 >= 1.10 +Requires: hdf5 = %{hdf5_ver} Provides: %{name} = %{version}-%{release} @@ -43,7 +47,8 @@ Summary: Development files for netcdf Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: pkgconfig hdf5-devel libcurl-devel +Requires: hdf5-devel = %{hdf5_ver} +Requires: pkgconfig libcurl-devel %description devel This package contains the netCDF C header files, shared devel libs, and @@ -140,6 +145,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 09 2023 Anton Novojilov - 4.9.2-1 +- Rebuilt with the latest version of HDF5 + * Wed Sep 27 2023 Anton Novojilov - 4.9.2-0 - https://github.com/Unidata/netcdf-c/releases/tag/v4.9.2 From f30062be939a55949ca9552ef4b42c2b1fc9a319 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 11 Dec 2023 17:26:37 +0300 Subject: [PATCH 45/47] python3-pycurl spec refactoring --- specs/python3-pycurl.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/specs/python3-pycurl.spec b/specs/python3-pycurl.spec index 775f742d2..fa70a7fdc 100644 --- a/specs/python3-pycurl.spec +++ b/specs/python3-pycurl.spec @@ -4,6 +4,10 @@ ################################################################################ +%global libcurl_ver %(rpm -q --quiet libcurl-devel && rpm -q --qf '%%{version}' libcurl-devel || echo "8") + +################################################################################ + %global python_ver %(%{__python3} -c "import sys; print('{0}.{1}'.format(sys.version_info.major,sys.version_info.minor))" 2>/dev/null || echo 0.0) %{!?python3_sitearch: %global python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))" 2>/dev/null)} %{!?python3_sitelib: %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" 2>/dev/null)} @@ -13,16 +17,12 @@ %define package_name pycurl %define pypi_path a8/af/24d3acfa76b867dbd8f1166853c18eefc890fc5da03a48672b38ea77ddae -# Used cURL version fo build -# DO NOT FORGOT TO UPDATE IF NEWER VERSION IS USED! -%define curl_version 7.86.0 - ################################################################################ Summary: A Python 3 interface to libcurl Name: python3-%{package_name} Version: 7.45.2 -Release: 0%{?dist} +Release: 1%{?dist} License: BSD Group: Development/Libraries URL: http://pycurl.io @@ -34,9 +34,9 @@ Source100: checksum.sha512 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: python3-devel python3-setuptools -BuildRequires: gcc openssl-devel curl-devel >= %{curl_version} +BuildRequires: gcc openssl-devel libcurl-devel -Requires: python3 python3-libs libcurl >= %{curl_version} +Requires: python3 python3-libs libcurl >= %{libcurl_ver} Provides: %{name} = %{version}-%{release} @@ -80,6 +80,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Mon Dec 11 2023 Anton Novojilov - 7.45.2-1 +- Spec refactoring + * Thu Feb 09 2023 Anton Novojilov - 7.45.2-0 - https://github.com/pycurl/pycurl/compare/REL_7_43_0_4...REL_7_45_2 From 7a38ee8c4468b4a47bb0f6342d07114e5db1c6b3 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 21 Dec 2023 16:01:56 +0300 Subject: [PATCH 46/47] Update Erlang 24, 25 and 26 to the latest versions --- specs/erlang/erlang24.spec | 13 ++++++++----- specs/erlang/erlang25.spec | 13 ++++++++----- specs/erlang/erlang26.spec | 15 +++++++++------ tests/erlang/erlang24.recipe | 2 +- tests/erlang/erlang25.recipe | 2 +- tests/erlang/erlang26.recipe | 2 +- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/specs/erlang/erlang24.spec b/specs/erlang/erlang24.spec index 407597276..62c82ca17 100644 --- a/specs/erlang/erlang24.spec +++ b/specs/erlang/erlang24.spec @@ -23,12 +23,12 @@ %define eprefix %{_prefix}%{_lib32} %define ver_maj 24 %define ver_min 3 -%define ver_patch 4.14 +%define ver_patch 4.15 %define ver_suffix %{ver_min}.%{ver_patch} %define ver_string %{ver_maj}.%{ver_suffix} %define realname erlang -%define libre_ver 3.8.1 +%define libre_ver 3.8.2 ################################################################################ @@ -41,8 +41,8 @@ License: MPL URL: https://www.erlang.org Source0: https://github.com/erlang/otp/archive/OTP-%{ver_string}.tar.gz -Source1: https://www.erlang.org/download/otp_doc_html_%{ver_maj}.%{ver_min}.tar.gz -Source2: https://www.erlang.org/download/otp_doc_man_%{ver_maj}.%{ver_min}.tar.gz +Source1: https://github.com/erlang/otp/releases/download/OTP-%{ver_string}/otp_doc_html_%{ver_string}.tar.gz +Source2: https://github.com/erlang/otp/releases/download/OTP-%{ver_string}/otp_doc_man_%{ver_string}.tar.gz Source3: epmd.service Source4: epmd.socket Source5: epmd@.service @@ -877,7 +877,6 @@ rm -rf %{buildroot} %{_libdir}/erlang/bin/start_sasl.boot %{_libdir}/erlang/erts-* %{_libdir}/erlang/misc/format_man_pages -%{_libdir}/erlang/misc/makewhatis %{_libdir}/erlang/releases %{_libdir}/erlang/bin/run_erl %{_libdir}/erlang/bin/start @@ -1043,6 +1042,10 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 21 2023 Anton Novojilov - 24.3.4.15-0 +- https://github.com/erlang/otp/releases/tag/OTP-24.3.4.15 +- LibreSSL updated to 3.8.2 + * Sun Oct 15 2023 Anton Novojilov - 24.3.4.14-0 - https://github.com/erlang/otp/releases/tag/OTP-24.3.4.14 diff --git a/specs/erlang/erlang25.spec b/specs/erlang/erlang25.spec index e468d60c7..6cf970988 100644 --- a/specs/erlang/erlang25.spec +++ b/specs/erlang/erlang25.spec @@ -23,12 +23,12 @@ %define eprefix %{_prefix}%{_lib32} %define ver_maj 25 %define ver_min 3 -%define ver_patch 2.7 +%define ver_patch 2.8 %define ver_suffix %{ver_min}.%{ver_patch} %define ver_string %{ver_maj}.%{ver_suffix} %define realname erlang -%define libre_ver 3.8.1 +%define libre_ver 3.8.2 ################################################################################ @@ -41,8 +41,8 @@ License: MPL URL: https://www.erlang.org Source0: https://github.com/erlang/otp/archive/OTP-%{ver_string}.tar.gz -Source1: https://www.erlang.org/download/otp_doc_html_%{ver_maj}.%{ver_min}.tar.gz -Source2: https://www.erlang.org/download/otp_doc_man_%{ver_maj}.%{ver_min}.tar.gz +Source1: https://github.com/erlang/otp/releases/download/OTP-%{ver_string}/otp_doc_html_%{ver_string}.tar.gz +Source2: https://github.com/erlang/otp/releases/download/OTP-%{ver_string}/otp_doc_man_%{ver_string}.tar.gz Source3: epmd.service Source4: epmd.socket Source5: epmd@.service @@ -868,7 +868,6 @@ rm -rf %{buildroot} %{_libdir}/erlang/bin/start_sasl.boot %{_libdir}/erlang/erts-* %{_libdir}/erlang/misc/format_man_pages -%{_libdir}/erlang/misc/makewhatis %{_libdir}/erlang/releases %{_libdir}/erlang/bin/run_erl %{_libdir}/erlang/bin/start @@ -1034,6 +1033,10 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 21 2023 Anton Novojilov - 25.3.2.8-0 +- https://github.com/erlang/otp/releases/tag/OTP-25.3.2.8 +- LibreSSL updated to 3.8.2 + * Sun Oct 15 2023 Anton Novojilov - 25.3.2.7-0 - https://github.com/erlang/otp/releases/tag/OTP-25.3.2.7 diff --git a/specs/erlang/erlang26.spec b/specs/erlang/erlang26.spec index c95cadd51..5887afabd 100644 --- a/specs/erlang/erlang26.spec +++ b/specs/erlang/erlang26.spec @@ -22,13 +22,13 @@ %define elibdir %{_libdir}/erlang/lib %define eprefix %{_prefix}%{_lib32} %define ver_maj 26 -%define ver_min 1 -%define ver_patch 2 +%define ver_min 2 +%define ver_patch 1 %define ver_suffix %{ver_min}.%{ver_patch} %define ver_string %{ver_maj}.%{ver_suffix} %define realname erlang -%define libre_ver 3.8.1 +%define libre_ver 3.8.2 ################################################################################ @@ -41,8 +41,8 @@ License: MPL URL: https://www.erlang.org Source0: https://github.com/erlang/otp/archive/OTP-%{ver_string}.tar.gz -Source1: https://www.erlang.org/download/otp_doc_html_%{ver_maj}.%{ver_min}.tar.gz -Source2: https://www.erlang.org/download/otp_doc_man_%{ver_maj}.%{ver_min}.tar.gz +Source1: https://github.com/erlang/otp/releases/download/OTP-%{ver_string}/otp_doc_html_%{ver_string}.tar.gz +Source2: https://github.com/erlang/otp/releases/download/OTP-%{ver_string}/otp_doc_man_%{ver_string}.tar.gz Source3: epmd.service Source4: epmd.socket Source5: epmd@.service @@ -868,7 +868,6 @@ rm -rf %{buildroot} %{_libdir}/erlang/bin/start_sasl.boot %{_libdir}/erlang/erts-* %{_libdir}/erlang/misc/format_man_pages -%{_libdir}/erlang/misc/makewhatis %{_libdir}/erlang/releases %{_libdir}/erlang/bin/run_erl %{_libdir}/erlang/bin/start @@ -1034,6 +1033,10 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Dec 21 2023 Anton Novojilov - 26.2.1-0 +- https://github.com/erlang/otp/releases/tag/OTP-26.2.1 +- LibreSSL updated to 3.8.2 + * Sun Oct 15 2023 Anton Novojilov - 26.1.2-0 - https://github.com/erlang/otp/releases/tag/OTP-26.1.2 diff --git a/tests/erlang/erlang24.recipe b/tests/erlang/erlang24.recipe index 3f7a640c1..69b5ab5d2 100644 --- a/tests/erlang/erlang24.recipe +++ b/tests/erlang/erlang24.recipe @@ -3,7 +3,7 @@ pkg erlang24 -var libressl_ver 3.8.1 +var libressl_ver 3.8.2 var epmd_service epmd var epmd_port 4369 diff --git a/tests/erlang/erlang25.recipe b/tests/erlang/erlang25.recipe index 970e3746d..a5fc24520 100644 --- a/tests/erlang/erlang25.recipe +++ b/tests/erlang/erlang25.recipe @@ -3,7 +3,7 @@ pkg erlang25 -var libressl_ver 3.8.1 +var libressl_ver 3.8.2 var epmd_service epmd var epmd_port 4369 diff --git a/tests/erlang/erlang26.recipe b/tests/erlang/erlang26.recipe index 257c19ac4..dd582816a 100644 --- a/tests/erlang/erlang26.recipe +++ b/tests/erlang/erlang26.recipe @@ -3,7 +3,7 @@ pkg erlang26 -var libressl_ver 3.8.1 +var libressl_ver 3.8.2 var epmd_service epmd var epmd_port 4369 From 24c784c941e04260a40698ccfccd005da6965259 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 22 Dec 2023 01:03:10 +0300 Subject: [PATCH 47/47] Improve git spec --- specs/git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specs/git.spec b/specs/git.spec index bdd1fbcd9..fdce26bbc 100644 --- a/specs/git.spec +++ b/specs/git.spec @@ -35,8 +35,9 @@ Requires: zlib rsync less openssh-clients expat expat-devel Provides: git-core = %{version}-%{release} -Obsoletes: git-core <= 1.5.4.2 Obsoletes: git-p4 <= 1.5.4.2 +Obsoletes: git-core >= 1 +Obsoletes: git-core-doc >= 1 ################################################################################