From a11627db576b98dbc61212ebbf9e0f85034cdfc4 Mon Sep 17 00:00:00 2001 From: Martin Osvald Date: Wed, 5 Jun 2024 17:04:45 +0200 Subject: [PATCH] Fix CVE-2024-34055 - Fix wrong symlinks to imtest utilities - Convert to %autorelease and %autochangelog Resolves: RHEL-40084 Resolves: RHEL-38700 --- .gitignore | 2 ++ cyrus-imapd.spec | 6 +++++- sources | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1a32802..ef9e8db 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /cyrus-imapd-3.8.1.tar.gz.sig /cyrus-imapd-3.8.2.tar.gz /cyrus-imapd-3.8.2.tar.gz.sig +/cyrus-imapd-3.8.3.tar.gz +/cyrus-imapd-3.8.3.tar.gz.sig diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 3ebc8d4..c128463 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -1,5 +1,5 @@ Name: cyrus-imapd -Version: 3.8.2 +Version: 3.8.3 Release: %autorelease Summary: A high-performance email, contacts and calendar server License: BSD-Attribution-HPND-disclaimer @@ -448,6 +448,10 @@ mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/httpd.8cyrus # Fix conflict with imtest from python-fslpy mv %buildroot/%_bindir/imtest %buildroot/%_bindir/cyr_imtest mv %buildroot/%_mandir/man1/imtest.1 %buildroot/%_mandir/man1/cyr_imtest.1 +# Change individual symlinks to point to cyr_imtest instead of imtest +for i in httptest lmtptest mupdatetest nntptest pop3test sivtest smtptest synctest; do + ln -sfr %buildroot/%_bindir/cyr_imtest %buildroot/%_bindir/$i +done # Old cyrus packages used to keep the deliver executable in # /usr/lib/cyrus-imapd, and MTA configurations might rely on this. diff --git a/sources b/sources index bac79d7..e33c6fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cyrus-imapd-3.8.2.tar.gz) = 16319110ad4ad10700a4e08273a7411534b4b8fa5700eca09704d2079ef95a702520083b87ac47c71a9cb223372956465d14804fbdfc78b999bf519261827501 -SHA512 (cyrus-imapd-3.8.2.tar.gz.sig) = ef7cd4e85929e4b920aa322a1a28f1fd898635a0cb188dfbf5d7f7bcef13adc138877c48b1e86dbe8dd69e604732a749082e10e41b6d54283350892b063a2b3b +SHA512 (cyrus-imapd-3.8.3.tar.gz) = 6af60863ae2b8491bc36c74a760c080c94fa163851877976c33c43793409723660293ad469d1547e779d39b35a36c7c2d7ae7352260a9e8af18cb9f3fa566a1a +SHA512 (cyrus-imapd-3.8.3.tar.gz.sig) = f8bc7172b9f9f70bb3533efcd9f556c6b0c9a9c0e568b0585a0d8ba790ad57a732e918f12b5711c165d3ad806bd55d1ab52e396a91255f43a7da188be1a11c43