pkgs/raven
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pkgs:deff4bffbd7e59493837a5309117fea78dd1a772
Branches Tags
pkgs:master
..
compare: pkgs:d9a8215a9644a51ba83c680209d0ac69c6d0c71a
Branches Tags
pkgs:master

No commits in common. "deff4bffbd7e59493837a5309117fea78dd1a772" and "d9a8215a9644a51ba83c680209d0ac69c6d0c71a" have entirely different histories.
deff4bffbd ... d9a8215a96

21 changed files with 137 additions and 1480 deletions
Show Stats Expand all files Collapse all files

5
base/arqiver/arqiver.spec
View File

@ -3,7 +3,7 @@
Name: arqiver Name: arqiver
Version: 0.12.0 Version: 0.12.0
Release: 3%{dist} Release: 1
Summary: A simple Qt archive manager Summary: A simple Qt archive manager
Group: Archiving/Other Group: Archiving/Other
License: GPLv3 License: GPLv3
@ -66,9 +66,6 @@ export CXX=clang++
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%changelog %changelog
* Fri May 17 2024 Raven <raven@sysadmins.ws> - 0.12.0-2
- rebuilt for new qt6
* Wed Dec 20 2023 Raven <raven@sysadmins.ws> - 0.12.0-1 * Wed Dec 20 2023 Raven <raven@sysadmins.ws> - 0.12.0-1
- update to 0.12.0 - update to 0.12.0

10
base/feathernotes/feathernotes.spec
View File

@ -5,8 +5,8 @@
Name: feathernotes Name: feathernotes
Version: 1.3.0 Version: 1.1.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Lightweight Qt hierarchical notes-manager for Linux Summary: Lightweight Qt hierarchical notes-manager for Linux
License: GPLv3+ License: GPLv3+
@ -75,12 +75,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog %changelog
* Mon Jun 24 2024 Raven <raven@sysadmins.ws> - 1.3.0-1
- version update
* Mon May 20 2024 Raven <raven@sysadmins.ws> - 1.2.0-1
- version update
* Wed Dec 20 2023 Raven <raven@sysadmins.ws> - 1.1.1-2 * Wed Dec 20 2023 Raven <raven@sysadmins.ws> - 1.1.1-2
- Qt6 build is default now - Qt6 build is default now

8
base/featherpad/featherpad.spec
View File

@ -10,7 +10,7 @@
Name: featherpad Name: featherpad
Version: 1.5.1 Version: 1.4.1
Release: 2%{?dist} Release: 2%{?dist}
Summary: Lightweight %{_qt} Plain-Text Editor Summary: Lightweight %{_qt} Plain-Text Editor
@ -97,12 +97,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%{_datadir}/metainfo/featherpad.metainfo.xml %{_datadir}/metainfo/featherpad.metainfo.xml
%changelog %changelog
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 1.5.1-2
- rebuild for qt6 (el8)
* Mon May 20 2024 Raven <raven@sysadmins.ws> - 1.5.1-1
- update to 1.5.1
* Wed Dec 20 2023 Raven <raven@sysadmins.ws> - 1.4.1-2 * Wed Dec 20 2023 Raven <raven@sysadmins.ws> - 1.4.1-2
- Qt6 build is default now - Qt6 build is default now

9
base/nano/nano.spec
View File

@ -1,11 +1,11 @@
%define nanorc_ver master %define nanorc_ver master
Summary: A small text editor Summary: A small text editor
Name: nano Name: nano
Version: 8.0 Version: 7.2
Release: 1%{?dist} Release: 3%{?dist}
License: GPLv3+ MIT License: GPLv3+ MIT
URL: https://www.nano-editor.org URL: https://www.nano-editor.org
Source: https://www.nano-editor.org/dist/v8/%{name}-%{version}.tar.xz Source: https://www.nano-editor.org/dist/v3/%{name}-%{version}.tar.xz
Source2: nanorc Source2: nanorc
# https://github.com/davidhcefx/nanorc/archive/refs/heads/master.tar.gz#/nanorc-master.tar.gz # https://github.com/davidhcefx/nanorc/archive/refs/heads/master.tar.gz#/nanorc-master.tar.gz
Source3: nanorc-%{nanorc_ver}.tar.gz Source3: nanorc-%{nanorc_ver}.tar.gz
@ -121,9 +121,6 @@ exit 0
%{_datadir}/nano-syntax-highlighting %{_datadir}/nano-syntax-highlighting
%changelog %changelog
* Thu May 2 2024 Raven <raven@sysadmins.ws> - 8.0-1
- update to 8.0
* Thu Feb 8 2024 Raven <raven@sysadmins.ws> - 7.2-3 * Thu Feb 8 2024 Raven <raven@sysadmins.ws> - 7.2-3
- use default html highlighing for twig and j2 files - use default html highlighing for twig and j2 files

31
base/nomacs/nomacs-3.16.224-desktop.diff Normal file
View File

@ -0,0 +1,31 @@
--- ImageLounge/xgd-data/CMakeLists.txt.orig 2020-07-17 10:05:29.000000000 +0300
+++ ImageLounge/xgd-data/CMakeLists.txt 2020-07-23 14:53:16.095891902 +0300
@@ -3,11 +3,12 @@
org.nomacs.ImageLounge.appdata.xml)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.nomacs.ImageLounge.appdata.xml
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
+ RENAME nomacs.appdata.xml)
install(FILES org.nomacs.ImageLounge.desktop
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
+ RENAME nomacs.desktop)
install(FILES ../nomacs.svg
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps
- RENAME org.nomacs.ImageLounge.svg)
\ В конце файла нет новой строки
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
--- ImageLounge/xgd-data/org.nomacs.ImageLounge.desktop.orig 2020-07-17 10:05:29.000000000 +0300
+++ ImageLounge/xgd-data/org.nomacs.ImageLounge.desktop 2020-07-23 14:53:16.096891913 +0300
@@ -4,7 +4,7 @@
Comment=nomacs is a free, open source image viewer.
Exec=nomacs %F
Terminal=false
-Icon=org.nomacs.ImageLounge
+Icon=nomacs
Type=Application
Categories=Graphics;RasterGraphics;Viewer;2DGraphics;
MimeType=image/gif;image/jpeg;image/png;image/bmp;image/tiff;image/x-eps;image/x-ico;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;

19
base/nomacs/nomacs-3.16.224-pluginspath.diff Normal file
View File

@ -0,0 +1,19 @@
--- ImageLounge/src/DkCore/DkPluginManager.cpp.orig 2020-07-17 10:05:29.000000000 +0300
+++ ImageLounge/src/DkCore/DkPluginManager.cpp 2020-07-23 17:11:39.917568015 +0300
@@ -62,6 +62,7 @@
#include <QAction>
#include <QMenu>
#include <QJsonValue>
+#include <QLibraryInfo>
#pragma warning(pop) // no warnings from includes - end
#ifdef QT_NO_DEBUG_OUTPUT
@@ -1309,7 +1310,7 @@
#ifdef Q_OS_WIN
QDir pluginsDir = QCoreApplication::applicationDirPath() + "/plugins";
#else
- QDir pluginsDir = QCoreApplication::applicationDirPath() + "/../lib/nomacs-plugins/";
+ QDir pluginsDir = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + "/nomacs-plugins/";
#endif // Q_OS_WIN
if (!pluginsDir.exists())

4
base/nomacs/nomacs-plugins-3.16-instpath.diff
View File

@ -1,5 +1,5 @@
--- a/ImageLounge/plugins/cmake/Utils.cmake 2020-07-23 15:59:47.628622696 +0300 --- ImageLounge/plugins/cmake/Utils.cmake.orig 2020-07-23 15:59:47.628622696 +0300
+++ b/ImageLounge/plugins/cmake/Utils.cmake 2020-07-23 16:03:52.361236635 +0300 +++ ImageLounge/plugins/cmake/Utils.cmake 2020-07-23 16:03:52.361236635 +0300
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
elseif(UNIX) elseif(UNIX)

50
base/nomacs/nomacs.spec
View File

@ -4,14 +4,18 @@
Name: nomacs Name: nomacs
Summary: Lightweight image viewer Summary: Lightweight image viewer
Version: 3.17.2295 Version: 3.16
Release: 1%{?dist} Release: 6%{?dist}
License: GPLv3+ and CC-BY License: GPLv3+ and CC-BY
Url: http://nomacs.org Url: http://nomacs.org
Source0: https://github.com/%{github_owner}/%{name}/releases/tag/%{name}-%{version}.tar.gz Source0: https://github.com/%{github_owner}/%{name}/archive/%{version}.%{build}.tar.gz/%{name}-%{version}.%{git_build}.tar.gz
Source1: https://github.com/%{github_owner}/%{name}-plugins/archive/refs/tags/%{name}-plugins-3.16.tar.gz Source1: https://github.com/%{github_owner}/%{name}-plugins/archive/%{version}.tar.gz/%{name}-plugins-%{version}.tar.gz
# desktop entries rename (https://github.com/nomacs/nomacs/issues/528)
Patch0: %{name}-%{version}.%{git_build}-desktop.diff
# plugins search path (https://github.com/nomacs/nomacs/issues/531)
Patch1: %{name}-%{version}.%{git_build}-pluginspath.diff
# plugins install path (https://github.com/nomacs/nomacs-plugins/issues/34) # plugins install path (https://github.com/nomacs/nomacs-plugins/issues/34)
Patch0: nomacs-plugins-3.16-instpath.diff Patch2: %{name}-plugins-%{version}-instpath.diff
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -32,11 +36,8 @@ BuildRequires: pkgconfig(libwebp)
# quazip-qt5-devel >= 0.7 # quazip-qt5-devel >= 0.7
BuildRequires: quazip-qt5-devel BuildRequires: quazip-qt5-devel
# libheif-devel (rpmfusion-free) # libheif-devel (rpmfusion-free)
BuildRequires: pkgconfig(libheif) # BuildRequires: pkgconfig(libheif)
BuildRequires: pkgconfig(libavif)
BuildRequires: lcov BuildRequires: lcov
Recommends: qt5-qtimageformats
%description %description
nomacs is image viewer based on Qt5 library. nomacs is image viewer based on Qt5 library.
@ -60,25 +61,27 @@ Some usefull plugins for nomacs:
%prep %prep
%setup %setup -n %{name}-%{version}.%{git_build}
%setup -T -D -a 1 -n %{name}-%{version} %patch0
%patch1
%setup -T -D -a 1 -n %{name}-%{version}.%{git_build}
# plug them in # plug them in
mv nomacs-plugins-3.16/* ImageLounge/plugins/ mv nomacs-plugins-%{version}/* ImageLounge/plugins/
%patch2
%patch0 -p1
# Be sure # Be sure
rmdir {3rd-party/*,3rd-party} rmdir {3rd-party/*,3rd-party}
# wrong lang code (https://github.com/nomacs/nomacs/issues/529)
rm -fv ImageLounge/translations/nomacs_als.ts
%build %build
%cmake -S ImageLounge \ %cmake ImageLounge \
-DCMAKE_BUILD_TYPE=Release\ -DCMAKE_BUILD_TYPE=Release\
-DENABLE_RAW=1 \ -DENABLE_RAW=1 \
-DUSE_SYSTEM_WEBP=ON \ -DUSE_SYSTEM_WEBP=ON \
-DUSE_SYSTEM_QUAZIP=ON \ -DUSE_SYSTEM_QUAZIP=ON \
-DENABLE_TRANSLATIONS=ON \ -DENABLE_TRANSLATIONS=ON
-DENABLE_AVIF=1 \ # -DENABLE_HEIF=1
-DENABLE_HEIF=1
%{cmake_build} %{cmake_build}
@ -90,7 +93,7 @@ sed -i -e 's|Image Lounge|Image?Lounge|g' %{name}.lang
%check %check
desktop-file-validate %{buildroot}%{_datadir}/applications/org.nomacs.ImageLounge.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%files -f %{name}.lang %files -f %{name}.lang
@ -102,9 +105,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.nomacs.ImageLoung
%{_datadir}/%{name}/Image?Lounge/themes/ %{_datadir}/%{name}/Image?Lounge/themes/
%dir %{_datadir}/%{name}/Image?Lounge/ %dir %{_datadir}/%{name}/Image?Lounge/
%dir %{_datadir}/%{name}/Image?Lounge/translations/ %dir %{_datadir}/%{name}/Image?Lounge/translations/
%{_metainfodir}/*.appdata.xml %{_metainfodir}/%{name}.appdata.xml
%{_datadir}/applications/*.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_mandir}/man1/%{name}.* %{_mandir}/man1/%{name}.*
%files plugins %files plugins
@ -113,9 +116,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.nomacs.ImageLoung
%changelog %changelog
* Mon May 20 2024 Raven <raven@sysadmins.ws> - 3.17.2295-1
- Version bump
* Thu Apr 28 2022 Raven <raven@sysadmins.ws> - 3.16-6 * Thu Apr 28 2022 Raven <raven@sysadmins.ws> - 3.16-6
- Rebuild for quazip - Rebuild for quazip

5
base/openssl3/0051-Support-different-R_BITS-lengths-for-KBKDF.patch
View File

@ -275,17 +275,16 @@ diff --git a/test/evp_test.c b/test/evp_test.c
index 70996195f0cb..6ae862b04403 100644 index 70996195f0cb..6ae862b04403 100644
--- a/test/evp_test.c --- a/test/evp_test.c
+++ b/test/evp_test.c +++ b/test/evp_test.c
@@ -2800,6 +2800,13 @@ static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx, @@ -2639,6 +2639,12 @@ static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx,
TEST_info("skipping, '%s' is disabled", p);
t->skip = 1; t->skip = 1;
} }
+ if (p != NULL + if (p != NULL
+ && (strcmp(name, "mac") == 0) + && (strcmp(name, "mac") == 0)
+ && is_mac_disabled(p)) { + && is_mac_disabled(p)) {
+ TEST_info("skipping, '%s' is disabled", p); + TEST_info("skipping, '%s' is disabled", p);
+ t->skip = 1; + t->skip = 1;
+ } + }
+
OPENSSL_free(name); OPENSSL_free(name);
return 1; return 1;
} }

11
base/openssl3/0060-FIPS-KAT-signature-tests.patch
View File

@ -56,7 +56,7 @@ diff -up openssl-3.0.1/crypto/ec/ecdsa_ossl.c.fips_kat_signature openssl-3.0.1/c
#define MIN_ECDSA_SIGN_ORDERBITS 64 #define MIN_ECDSA_SIGN_ORDERBITS 64
/* /*
* It is highly unlikely that a retry will happen, * It is highly unlikely that a retry will happen,
@@ -142,6 +146,12 @@ @@ -137,6 +141,12 @@
goto err; goto err;
do { do {
@ -69,17 +69,16 @@ diff -up openssl-3.0.1/crypto/ec/ecdsa_ossl.c.fips_kat_signature openssl-3.0.1/c
/* get random k */ /* get random k */
do { do {
if (dgst != NULL) { if (dgst != NULL) {
@@ -158,6 +168,10 @@ @@ -152,6 +162,9 @@
} }
} while (ossl_bn_is_word_fixed_top(k, 0)); }
} while (BN_is_zero(k));
+#ifdef FIPS_MODULE +#ifdef FIPS_MODULE
+ } + }
+#endif +#endif
+
/* compute r the x-coordinate of generator * k */ /* compute r the x-coordinate of generator * k */
if (!EC_POINT_mul(group, tmp_point, k, NULL, NULL, ctx)) { if (!EC_POINT_mul(group, tmp_point, k, NULL, NULL, ctx)) {
ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
diff -up openssl-3.0.1/crypto/ec/ec_key.c.fips_kat_signature openssl-3.0.1/crypto/ec/ec_key.c diff -up openssl-3.0.1/crypto/ec/ec_key.c.fips_kat_signature openssl-3.0.1/crypto/ec/ec_key.c
--- openssl-3.0.1/crypto/ec/ec_key.c.fips_kat_signature 2022-04-04 13:48:52.231172299 +0200 --- openssl-3.0.1/crypto/ec/ec_key.c.fips_kat_signature 2022-04-04 13:48:52.231172299 +0200
+++ openssl-3.0.1/crypto/ec/ec_key.c 2022-04-04 14:00:35.077368605 +0200 +++ openssl-3.0.1/crypto/ec/ec_key.c 2022-04-04 14:00:35.077368605 +0200

10
base/openssl3/0078-Add-FIPS-indicator-parameter-to-HKDF.patch
View File

@ -47,9 +47,9 @@ diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/k
index afdb7138e1..9d28d292d8 100644 index afdb7138e1..9d28d292d8 100644
--- a/providers/implementations/kdfs/hkdf.c --- a/providers/implementations/kdfs/hkdf.c
+++ b/providers/implementations/kdfs/hkdf.c +++ b/providers/implementations/kdfs/hkdf.c
@@ -347,6 +347,56 @@ @@ -298,6 +298,56 @@ static int kdf_hkdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
} return 0;
return OSSL_PARAM_set_octet_string(p, ctx->info, ctx->info_len); return OSSL_PARAM_set_size_t(p, sz);
} }
+ +
+#ifdef FIPS_MODULE +#ifdef FIPS_MODULE
@ -104,10 +104,10 @@ index afdb7138e1..9d28d292d8 100644
return -2; return -2;
} }
@@ -356,6 +406,9 @@ @@ -306,6 +356,9 @@ static const OSSL_PARAM *kdf_hkdf_gettable_ctx_params(ossl_unused void *ctx,
{
static const OSSL_PARAM known_gettable_ctx_params[] = { static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0),
+#ifdef FIPS_MODULE +#ifdef FIPS_MODULE
+ OSSL_PARAM_int(OSSL_KDF_PARAM_HKDF_REDHAT_FIPS_INDICATOR, NULL), + OSSL_PARAM_int(OSSL_KDF_PARAM_HKDF_REDHAT_FIPS_INDICATOR, NULL),
+#endif /* defined(FIPS_MODULE) */ +#endif /* defined(FIPS_MODULE) */

5
base/openssl3/openssl3.spec
View File

@ -20,7 +20,7 @@
Summary: Utilities from the general purpose cryptography library with TLS implementation Summary: Utilities from the general purpose cryptography library with TLS implementation
Name: openssl3 Name: openssl3
Version: 3.0.14 Version: 3.0.13
Release: 1%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
@ -541,9 +541,6 @@ rm -f %{buildroot}%{_bindir}/{make,renew}-dummy-cert
%ldconfig_scriptlets libs %ldconfig_scriptlets libs
%changelog %changelog
* Fri Jun 7 2024 Raven <raven@sysadmins.ws> - 1:3.0.14-1
- update to 3.0.14
* Tue Feb 6 2024 Raven <raven@sysadmins.ws> - 1:3.0.13-1 * Tue Feb 6 2024 Raven <raven@sysadmins.ws> - 1:3.0.13-1
- update to 3.0.13 - update to 3.0.13

20
base/qbittorrent/qbittorrent.spec
View File

@ -14,7 +14,7 @@
Name: qbittorrent Name: qbittorrent
Summary: A Bittorrent Client Summary: A Bittorrent Client
Epoch: 1 Epoch: 1
Version: 4.6.6 Version: 4.6.4
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://www.qbittorrent.org URL: https://www.qbittorrent.org
@ -48,7 +48,7 @@ BuildRequires: qt5-linguist
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
BuildRequires: rb_libtorrent-devel >= 1.2.12 BuildRequires: rb_libtorrent-devel >= 1.2.12
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: boost1.81-devel BuildRequires: boost-devel >= 1.60
BuildRequires: libappstream-glib BuildRequires: libappstream-glib
Requires: python3 Requires: python3
@ -123,13 +123,13 @@ desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications/ \ --dir=%{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/org.qbittorrent.qBittorrent.desktop %{buildroot}%{_datadir}/applications/org.qbittorrent.qBittorrent.desktop
#appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.qbittorrent.qBittorrent.metainfo.xml appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.qbittorrent.qBittorrent.appdata.xml
%files %files
%license COPYING %license COPYING
%doc README.md AUTHORS Changelog %doc README.md AUTHORS Changelog
%{_bindir}/qbittorrent %{_bindir}/qbittorrent
%{_metainfodir}/org.qbittorrent.qBittorrent.metainfo.xml %{_metainfodir}/org.qbittorrent.qBittorrent.appdata.xml
%{_datadir}/applications/org.qbittorrent.qBittorrent.desktop %{_datadir}/applications/org.qbittorrent.qBittorrent.desktop
%{_datadir}/icons/hicolor/*/apps/qbittorrent.* %{_datadir}/icons/hicolor/*/apps/qbittorrent.*
%{_datadir}/icons/hicolor/*/status/qbittorrent-tray* %{_datadir}/icons/hicolor/*/status/qbittorrent-tray*
@ -143,18 +143,6 @@ desktop-file-install \
%{_mandir}/man1/qbittorrent-nox.1* %{_mandir}/man1/qbittorrent-nox.1*
%changelog %changelog
* Wed Aug 21 2024 Raven <raven@sysadmins.ws> - 1:4.6.6-1
- Update to 4.6.6
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 1:4.6.5-2
- rebuilt for qt6 (el8)
* Tue May 28 2024 Raven <raven@sysadmins.ws> - 1:4.6.5-1
- Update to 4.6.5
* Fri May 17 2024 Raven <raven@sysadmins.ws> - 1:4.6.4-2
- rebuilt for new qt6 (el8)
* Mon Mar 25 2024 Raven <raven@sysadmins.ws> - 1:4.6.4-1 * Mon Mar 25 2024 Raven <raven@sysadmins.ws> - 1:4.6.4-1
- Update to 4.6.4 - Update to 4.6.4
- use the same compiler - use the same compiler

12
base/rspamd/fix-fasttext-model-path.patch
View File

@ -1,12 +0,0 @@
diff -Naur a/conf/lang_detection.inc b/conf/lang_detection.inc
--- a/conf/lang_detection.inc 2024-07-23 16:37:27.000000000 +0600
+++ b/conf/lang_detection.inc 2024-08-19 09:35:00.113184366 +0600
@@ -21,7 +21,7 @@
# languages_disable = ["fr", "es"]
# Use the following fasttext model for language detection (if Fasttext support is compiled in)
-# fasttext_model = "${SHAREDIR}/languages/fasttext_model.ftz"
+# fasttext_model = "${SHAREDIR}/fasttext_model.ftz"
# Prefer fasttext over all other methods
# prefer_fasttext = true;

BIN
base/rspamd/lid.176.ftz
View File

Binary file not shown.

28
base/rspamd/rspamd.spec
View File

@ -21,18 +21,18 @@
%undefine __cmake_in_source_build %undefine __cmake_in_source_build
%endif %endif
Name: rspamd Name: rspamd
Conflicts: rspamd-asan Conflicts: rspamd-asan
Provides: rspamd Provides: rspamd
Version: 3.9.1 Version: 3.8.4
Release: 1%{?dist} Release: 1%{?dist}
Summary: Rapid spam filtering system Summary: Rapid spam filtering system
Group: System Environment/Daemons Group: System Environment/Daemons
License: Apache-2.0 License: Apache-2.0
URL: https://rspamd.com URL: https://rspamd.com
Source0: https://github.com/rspamd/rspamd/archive/%{version}/rspamd-%{version}.tar.gz
Source0: https://github.com/rspamd/rspamd/archive/refs/tags/%{version}.tar.gz#/rspamd-%{version}.tar.gz
Source1: %{name}.logrotate Source1: %{name}.logrotate
Source2: 80-rspamd.preset Source2: 80-rspamd.preset
Source3: %{name}.init Source3: %{name}.init
@ -41,7 +41,6 @@ Source4: LuaJIT-2.1.ROLLING.tar.gz
%endif %endif
# https://github.com/rspamd/fastText.git # https://github.com/rspamd/fastText.git
Source5: fasttext.tar.gz Source5: fasttext.tar.gz
Source6: lid.176.ftz
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
# revert usage of g_abort() back to abort() # revert usage of g_abort() back to abort()
@ -50,9 +49,6 @@ Patch0: rspamd-get-rid-of-g_abort.patch
Patch1: rspamd-define-static_assert.patch Patch1: rspamd-define-static_assert.patch
%endif %endif
%if %{with fasttext}
Patch2: fix-fasttext-model-path.patch
%endif
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
BuildRequires: cmake3 >= 3.12 BuildRequires: cmake3 >= 3.12
@ -72,7 +68,6 @@ BuildRequires: file-devel
BuildRequires: lapack-devel BuildRequires: lapack-devel
BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libsodium) BuildRequires: pkgconfig(libsodium)
BuildRequires: pkgconfig(libarchive) >= 3.0
%ifarch x86_64 %ifarch x86_64
@ -222,20 +217,19 @@ export LDFLAGS="$LDFLAGS -Wl,-rpath=%{_libdir}/rspamd/fasttext"
%if %{with fasttext} %if %{with fasttext}
mkdir -p %{buildroot}%{_libdir}/rspamd/fasttext mkdir -p %{buildroot}%{_libdir}/rspamd/fasttext
cp %{_builddir}/fasttext-bin/lib/libfasttext.so.0 %{buildroot}%{_libdir}/rspamd/fasttext/ cp %{_builddir}/fasttext-bin/lib/libfasttext.so.0 %{buildroot}%{_libdir}/rspamd/fasttext/
install -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/%{name}/fasttext_model.ftz
%endif %endif
install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/rspamd %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/rspamd
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_presetdir}/80-rspamd.preset %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_presetdir}/80-rspamd.preset
%endif %endif
install -d -p -m 0755 %{buildroot}%{_localstatedir}/log/rspamd %{__install} -d -p -m 0755 %{buildroot}%{_localstatedir}/log/rspamd
install -d -p -m 0755 %{buildroot}%{_localstatedir}/lib/rspamd %{__install} -d -p -m 0755 %{buildroot}%{_localstatedir}/lib/rspamd
install -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/rspamd/local.d/ %{__install} -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/rspamd/local.d/
install -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/rspamd/override.d/ %{__install} -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/rspamd/override.d/
%if 0%{?rhel} < 7 %if 0%{?rhel} < 7
install -p -D -m 0755 %{SOURCE3} %{buildroot}%{_initrddir}/%{name} %{__install} -p -D -m 0755 %{SOURCE3} %{buildroot}%{_initrddir}/%{name}
install -d -p -m 0755 %{buildroot}%{_localstatedir}/run/rspamd %{__install} -d -p -m 0755 %{buildroot}%{_localstatedir}/run/rspamd
%endif %endif
%clean %clean

89
modular/nginx-cp/nginx-cp.spec
View File

@ -18,7 +18,6 @@
%bcond_without brotli %bcond_without brotli
%bcond_without fancyindex %bcond_without fancyindex
%bcond_without vts %bcond_without vts
%bcond_without echo
%bcond_with http3 %bcond_with http3
%if 0%{?rhel} >= 8 %if 0%{?rhel} >= 8
@ -30,27 +29,21 @@
%endif %endif
%endif %endif
%global _suffix -cp
%if %{with http3}
%global _suffix -h3
%endif
# specific package versions # specific package versions
%if %{with lua} %if %{with lua}
%global luamod_ver 0.10.26 %define luamod_ver 0.10.26
%global ndk_ver 0.3.1 %define ndk_ver 0.3.1
%endif %endif
%global openssl_ver 3.0 %define openssl_ver 3.0
%global fi_ver 0.5.2 %define fi_ver 0.5.2
%global hm_ver 0.34 %define hm_ver 0.34
%global geoip2_ver 3.4 %define geoip2_ver 3.4
%global vts_ver 0.2.2 %define vts_ver 0.2.2
%global echo_ver 0.63
Name: nginx%{_suffix} Name: nginx-cp
Epoch: 1 Epoch: 1
Version: 1.26.2 Version: 1.26.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: A high performance web server and reverse proxy server Summary: A high performance web server and reverse proxy server
@ -95,11 +88,7 @@ Source321: ngx_brotli-master.zip
%endif %endif
%if %{with vts} %if %{with vts}
Source322: https://github.com/vozlt/nginx-module-vts/archive/refs/tags/v%{vts_ver}.tar.gz#/nginx-module-vts-%{vts_ver}.tar.gz Source322: https://github.com/vozlt/nginx-module-vts/archive/refs/tags/v0.2.2.tar.gz#/nginx-module-vts-%{vts_ver}.tar.gz
%endif
%if %{with echo}
Source323: https://github.com/openresty/echo-nginx-module/archive/refs/tags/v%{echo_ver}.tar.gz
%endif %endif
# removes -Werror in upstream build scripts. -Werror conflicts with # removes -Werror in upstream build scripts. -Werror conflicts with
@ -200,16 +189,7 @@ Provides: webserver
Modularitylabel: %{name}:stable:%{version}:latest Modularitylabel: %{name}:stable:%{version}:latest
%endif %endif
Provides: nginx Provides: nginx
Provides: nginx%{_isa} = %{epoch}:%{version}-%{release}
Provides: nginx(abi) = %{epoch}:%{version}-%{release}
Provides: config(nginx) = %{epoch}:%{version}-%{release}
Obsoletes: nginx <= %{epoch}:%{version}-%{release} Obsoletes: nginx <= %{epoch}:%{version}-%{release}
%if %{with http3}
Conflicts: nginx-cp
%else
Conflicts: nginx-h3
%endif
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
BuildRequires: systemd BuildRequires: systemd
@ -273,27 +253,14 @@ for the Nginx server including the correct permissions for the
directories. directories.
%endif %endif
%if %{with echo}
%package -n nginx-module-echo
Summary: Brings "echo", "sleep", "time", "exec" and more shell-style goodies to Nginx config file.
Requires: nginx(abi) = %{epoch}:%{version}-%{release}
Obsoletes: nginx-cp-modile-echo <= %{epoch}:%{version}-%{release}
Obsoletes: nginx-h3-modile-echo <= %{epoch}:%{version}-%{release}
%description -n nginx-module-echo
%{summary}.
%endif
%if %{with vts} %if %{with vts}
%package -n nginx-module-vts %package module-vts
Summary: Nginx virtual host traffic status module Summary: Nginx virtual host traffic status module
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{version}-%{release}
Provides: ngx_http_vhost_traffic_status_module == %{vts_ver} Provides: ngx_http_vhost_traffic_status_module == %{vts_ver}
Requires: nginx(abi) = %{epoch}:%{version}-%{release} Conflicts: %{real_name}-module-vts
Obsoletes: nginx-cp-modile-vts <= %{epoch}:%{version}-%{release}
Obsoletes: nginx-h3-modile-vts <= %{epoch}:%{version}-%{release}
%description -n nginx-module-vts %description module-vts
This is an Nginx module that provides access to virtual host status This is an Nginx module that provides access to virtual host status
information. It contains the current status such as servers, upstreams, information. It contains the current status such as servers, upstreams,
caches. caches.
@ -335,10 +302,6 @@ unzip -qq %{SOURCE321}
tar -xf %{SOURCE322} tar -xf %{SOURCE322}
%endif %endif
%if %{with echo}
tar -xf %{SOURCE323}
%endif
%if 0%{?rhel} < 8 %if 0%{?rhel} < 8
sed -i -e 's#KillMode=.*#KillMode=process#g' %{SOURCE10} sed -i -e 's#KillMode=.*#KillMode=process#g' %{SOURCE10}
sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' %{SOURCE12} sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' %{SOURCE12}
@ -457,9 +420,6 @@ export DESTDIR=%{buildroot}
%endif %endif
%if %{with brotli} %if %{with brotli}
--add-dynamic-module=ngx_brotli-master \ --add-dynamic-module=ngx_brotli-master \
%endif
%if %{with echo}
--add-dynamic-module=echo-nginx-module-%{echo_ver} \
%endif %endif
--with-ld-opt="$ngx_ldflags" \ --with-ld-opt="$ngx_ldflags" \
--with-cc-opt="$ngx_cflags" --with-cc-opt="$ngx_cflags"
@ -572,10 +532,6 @@ echo -e 'load_module "%{_libdir}/nginx/modules/ngx_http_vhost_traffic_status_mod
> %{buildroot}%{_datadir}/nginx/modules/mod-http-vhost-traffic-status.conf > %{buildroot}%{_datadir}/nginx/modules/mod-http-vhost-traffic-status.conf
%endif %endif
%if %{with echo}
echo -e 'load_module "%{_libdir}/nginx/modules/ngx_http_echo_module.so";' \
> %{buildroot}%{_datadir}/nginx/modules/mod-http-echo.conf
%endif
mv -f %{buildroot}%{_sysconfdir}/nginx/*.default %{buildroot}%{_sysconfdir}/nginx/default.d/ mv -f %{buildroot}%{_sysconfdir}/nginx/*.default %{buildroot}%{_sysconfdir}/nginx/default.d/
@ -707,28 +663,13 @@ fi
%dir %{_sysconfdir}/nginx/users %dir %{_sysconfdir}/nginx/users
%dir %{_sysconfdir}/nginx/ssl %dir %{_sysconfdir}/nginx/ssl
%if %{with echo}
%files -n nginx-module-echo
%{_libdir}/nginx/modules/ngx_http_echo_module.so
%{_datadir}/nginx/modules/mod-http-echo.conf
%endif
%if %{with vts} %if %{with vts}
%files -n nginx-module-vts %files module-vts
%{_libdir}/nginx/modules/ngx_http_vhost_traffic_status_module.so %{_libdir}/nginx/modules/ngx_http_vhost_traffic_status_module.so
%{_datadir}/nginx/modules/mod-http-vhost-traffic-status.conf %{_datadir}/nginx/modules/mod-http-vhost-traffic-status.conf
%endif %endif
%changelog %changelog
* Thu Aug 15 2024 Raven <raven@sysadmins.ws> - 1.26.2-1
- new stable version
* Sat Jun 1 2024 Raven <raven@sysadmins.ws> - 1.26.1-1
- new stable version
* Tue May 14 2024 Raven <raven@sysadmins.ws> - 1.26.0-2
- add conditional build of echo module
* Wed Apr 24 2024 Raven <raven@sysadmins.ws> - 1.26.0-1 * Wed Apr 24 2024 Raven <raven@sysadmins.ws> - 1.26.0-1
- new stable version - new stable version
- get rid of http2 HPACK - get rid of http2 HPACK

8
modular/varnish/varnish-7.3.spec
View File

@ -33,7 +33,7 @@
Summary: High-performance HTTP accelerator Summary: High-performance HTTP accelerator
Name: varnish Name: varnish
Version: 7.3.2 Version: 7.3.1
Release: 1%{?dist} Release: 1%{?dist}
License: BSD License: BSD
URL: https://www.varnish-cache.org/ URL: https://www.varnish-cache.org/
@ -58,7 +58,7 @@ Provides: vmod(vtc)%{_isa} = %{version}-%{release}
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
BuildRequires: python36 python36-sphinx python36-docutils BuildRequires: python34 python34-sphinx python34-docutils
%else %else
BuildRequires: python3, python3-sphinx, python3-docutils BuildRequires: python3, python3-sphinx, python3-docutils
%endif %endif
@ -278,7 +278,6 @@ chmod 644 lib/libvmod_*/*.h
%pre %pre
echo "WARNING!!! Varnish 7.3 is discontinued. Consider upgrading to a newer version"
getent group varnish >/dev/null || groupadd -r varnish getent group varnish >/dev/null || groupadd -r varnish
getent passwd varnish >/dev/null || \ getent passwd varnish >/dev/null || \
useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \ useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
@ -301,9 +300,6 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc
%changelog %changelog
* Fri May 31 2024 Raven <raven@sysadmins.ws> - 7.3.2-1
- New upstream release
* Thu Jan 4 2024 Raven <raven@sysadmins.ws> - 7.3.1-1 * Thu Jan 4 2024 Raven <raven@sysadmins.ws> - 7.3.1-1
- New upstream release - New upstream release

1239
modular/varnish/varnish-7.4.spec
View File

File diff suppressed because it is too large Load Diff

31
modular/varnish/varnish.spec
View File

@ -12,8 +12,8 @@
%global __provides_exclude_from ^%{_libdir}/varnish/vmods %global __provides_exclude_from ^%{_libdir}/varnish/vmods
%global abi eef25264e5ca5f96a77129308edb83ccf84cb1b1 %global abi 84d79120b6d17b11819a663a93160743f293e63f
%global vrt 19.0 %global vrt 17.0
# Package scripts are now external # Package scripts are now external
# https://github.com/varnishcache/pkg-varnish-cache # https://github.com/varnishcache/pkg-varnish-cache
@ -37,7 +37,7 @@
Summary: High-performance HTTP accelerator Summary: High-performance HTTP accelerator
Name: varnish Name: varnish
Version: 7.5.0 Version: 7.4.2
Release: 1%{?dist} Release: 1%{?dist}
License: BSD License: BSD
URL: https://www.varnish-cache.org/ URL: https://www.varnish-cache.org/
@ -79,10 +79,6 @@ BuildRequires: make
BuildRequires: ncurses-devel >= 5.9 BuildRequires: ncurses-devel >= 5.9
BuildRequires: pcre2-devel BuildRequires: pcre2-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if 0%{?epel} == 6
# epel6 requires newer libunwind than system one
BuildRequires: llvm-libunwind-devel
%endif
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
BuildRequires: systemd-units BuildRequires: systemd-units
%endif %endif
@ -186,9 +182,6 @@ export CFLAGS="$CFLAGS -ffloat-store -fexcess-precision=standard"
export CFLAGS="$CFLAGS -Wno-error=free-nonheap-object" export CFLAGS="$CFLAGS -Wno-error=free-nonheap-object"
%endif %endif
%if 0%{?epel} == 6
export CFLAGS="-I /usr/include/llvm-libunwind $CFLAGS"
%endif
# What gcc version is this? # What gcc version is this?
gcc --version gcc --version
@ -290,11 +283,7 @@ chmod 644 lib/libvmod_*/*.h
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%{_mandir}/man7/*.7* %{_mandir}/man7/*.7*
%if 0%{?rhel} >= 7
%license LICENSE %license LICENSE
%else
%doc LICENSE
%endif
%doc README.rst ChangeLog %doc README.rst ChangeLog
%doc etc/builtin.vcl etc/example.vcl %doc etc/builtin.vcl etc/example.vcl
%dir %{_sysconfdir}/varnish/ %dir %{_sysconfdir}/varnish/
@ -312,11 +301,7 @@ chmod 644 lib/libvmod_*/*.h
%endif %endif
%files devel %files devel
%if 0%{?rhel} >= 7
%license LICENSE %license LICENSE
%else
%doc LICENSE
%endif
%doc README.rst %doc README.rst
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_includedir}/%{name} %{_includedir}/%{name}
@ -325,11 +310,7 @@ chmod 644 lib/libvmod_*/*.h
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%files docs %files docs
%if 0%{?rhel} >= 7
%license LICENSE %license LICENSE
%else
%doc LICENSE
%endif
%doc doc/html %doc doc/html
%doc doc/changes*.html %doc doc/changes*.html
@ -374,12 +355,6 @@ fi
%changelog %changelog
* Fri May 31 2024 Raven <raven@sysadmins.ws> - 7.5.0-1
- New upstream release
* Fri May 31 2024 Raven <raven@sysadmins.ws> - 7.4.3-1
- New upstream release
* Thu Jan 4 2024 Raven <raven@sysadmins.ws> - 7.4.2-1 * Thu Jan 4 2024 Raven <raven@sysadmins.ws> - 7.4.2-1
- New upstream release - New upstream release
- Revert an ability to build for el6 - Revert an ability to build for el6

19
multimedia/qmmp/qmmp.spec
View File

@ -1,6 +1,6 @@
Name: qmmp Name: qmmp
Version: 2.1.7 Version: 2.1.5
Release: 3%{?dist} Release: 2%{?dist}
Summary: Qt-based multimedia player Summary: Qt-based multimedia player
License: GPLv2+ and CC-BY-SAv4+ License: GPLv2+ and CC-BY-SAv4+
@ -32,7 +32,7 @@ BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: libxmp-devel BuildRequires: libxmp-devel
BuildRequires: mpg123-devel BuildRequires: mpg123-devel
BuildRequires: pkgconfig(openssl) BuildRequires: openssl-devel
BuildRequires: opusfile-devel BuildRequires: opusfile-devel
BuildRequires: pipewire-devel BuildRequires: pipewire-devel
BuildRequires: qt6-qtmultimedia-devel BuildRequires: qt6-qtmultimedia-devel
@ -43,11 +43,7 @@ BuildRequires: wavpack-devel
BuildRequires: wildmidi-devel BuildRequires: wildmidi-devel
# /usr/share/solid/actions owner # /usr/share/solid/actions owner
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
Requires: kde-filesystem
%elif %{undefined flatpak}
Requires: kf5-filesystem Requires: kf5-filesystem
%endif
Recommends: qmmp-plugin-pack Recommends: qmmp-plugin-pack
# some external tools listed in # some external tools listed in
@ -151,15 +147,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-enqueue.desk
%{_libdir}/libqmmp*.so %{_libdir}/libqmmp*.so
%changelog %changelog
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 2.1.7-3
- Rebuild for qt 6.7.2
* Wed May 29 2024 Raven <raven@sysadmins.ws> - 2.1.7-2
- Rebuild for qt 6.7
* Mon May 20 2024 Raven <raven@sysadmins.ws> - 2.1.7-1
- new version 2.1.7
* Thu Aug 31 2023 Karel Volný <kvolny@redhat.com> 2.1.5-1 * Thu Aug 31 2023 Karel Volný <kvolny@redhat.com> 2.1.5-1
- new version 2.1.5 (rhbz#2235874) - new version 2.1.5 (rhbz#2235874)
- enabled MMS support (rhbz#2235608) - enabled MMS support (rhbz#2235608)