diff --git a/dovecot-2.3-pigeonhole-0.5.20.tar.gz b/dovecot-2.3-pigeonhole-0.5.20.tar.gz deleted file mode 100644 index 610382c2d0c229d56758bee3b82771027077ce72..0000000000000000000000000000000000000000 Binary files a/dovecot-2.3-pigeonhole-0.5.20.tar.gz and /dev/null differ diff --git a/dovecot-2.3-pigeonhole-0.5.21.1.tar.gz b/dovecot-2.3-pigeonhole-0.5.21.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..16608b23bca10216231bdaa4f50b74b28ebfa904 Binary files /dev/null and b/dovecot-2.3-pigeonhole-0.5.21.1.tar.gz differ diff --git a/dovecot-2.3.15-fixvalcond.patch b/dovecot-2.3.15-fixvalcond.patch index f20881a097a1fc2d409f2c5980ee0ab54fb71dcc..0f0488025bcd07e0eafdcd3e453a9b0b6486eee3 100644 --- a/dovecot-2.3.15-fixvalcond.patch +++ b/dovecot-2.3.15-fixvalcond.patch @@ -1,6 +1,6 @@ -diff -up dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.19/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.19/src/lib-sieve/storage/dict/sieve-dict-script.c ---- dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.20/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond 2021-11-02 21:51:36.109032050 +0100 -+++ dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.20/src/lib-sieve/storage/dict/sieve-dict-script.c 2021-11-02 21:52:28.409344118 +0100 +diff -up dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.21.1/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c +--- dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.21.1/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond 2021-11-02 21:51:36.109032050 +0100 ++++ dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.21.1/src/lib-sieve/storage/dict/sieve-dict-script.c 2021-11-02 21:52:28.409344118 +0100 @@ -114,7 +114,7 @@ static int sieve_dict_script_get_stream (struct sieve_dict_script *)script; struct sieve_dict_storage *dstorage = diff --git a/dovecot.spec b/dovecot.spec index 9c06a33830dca730aa8617d1183ad024dfdcecc0..6531bc20aaedc121b9d3f5b58a8c50e870f2ea1b 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -6,17 +6,17 @@ Name: dovecot Version: 2.3.21.1 -Release: 1 +Release: 2 Summary: Dovecot Secure imap server -License: MIT and LGPLv2.1 -URL: http://www.dovecot.org/ +License: MIT AND LGPL-2.1-only +URL: https://www.dovecot.org/ Epoch: 1 -Source: http://www.dovecot.org/releases/2.3/%{name}-%{version}.tar.gz +Source: https://www.dovecot.org/releases/2.3/%{name}-%{version}.tar.gz Source1: dovecot.init Source2: dovecot.pam -%global pigeonholever 0.5.20 -Source8: http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz +%global pigeonholever %{lua: print(string.format("0.5.%s",string.sub(rpm.expand("%{version}"), 5)))} +Source8: https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz Source9: dovecot.sysconfig Source10: dovecot.tmpfilesd Source11: prestartscript @@ -68,12 +68,7 @@ Summary: Development files for dovecot %description devel This package provides the development files for dovecot. -%package help -Summary: Help documentation for %{name} - -%description help -Man pages and other related help documents for %{name}. - +%package_help %prep %autosetup -n %{name}-%{version} -a 8 -p1 @@ -84,7 +79,7 @@ echo "testsuite" >dovecot-2.3-pigeonhole-%{pigeonholever}/run-test-valgrind.excl sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in %build -export CFLAGS="%{__global_cflags} -fno-strict-aliasing" LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}" +export CFLAGS="%{__global_cflags} -fno-strict-aliasing" LDFLAGS="%{?__global_ldflags}" %if "%toolchain" == "gcc" CFLAGS="$CFLAGS -fstack-reuse=none" export CFLAGS @@ -126,9 +121,9 @@ mv $RPM_BUILD_ROOT/%{_docdir}/%{name} $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonh install -m 644 AUTHORS ChangeLog COPYING COPYING.LGPL INSTALL NEWS README $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonhole cd - -install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot -install -p -D -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man5/dovecot.conf.5 -install -p -D -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_libexecdir}/dovecot/prestartscript +install -p -D -m 644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot +install -p -D -m 644 %{S:12} $RPM_BUILD_ROOT%{_mandir}/man5/dovecot.conf.5 +install -p -D -m 755 %{S:11} $RPM_BUILD_ROOT%{_libexecdir}/dovecot/prestartscript install -d $RPM_BUILD_ROOT%{ssldir}/certs install -d $RPM_BUILD_ROOT%{ssldir}/private @@ -138,7 +133,7 @@ touch $RPM_BUILD_ROOT%{ssldir}/private/dovecot.pem chmod 600 $RPM_BUILD_ROOT%{ssldir}/private/dovecot.pem -install -p -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_tmpfilesdir}/dovecot.conf +install -p -D -m 644 %{S:10} $RPM_BUILD_ROOT%{_tmpfilesdir}/dovecot.conf install -d $RPM_BUILD_ROOT/var/run/dovecot/{login,empty,token-login} install -d $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d @@ -186,7 +181,6 @@ if [ "$1" = "2" ]; then fi %post -/sbin/ldconfig if [ $1 -eq 1 ]; then %systemd_post dovecot.service fi @@ -205,7 +199,6 @@ if [ $1 = 0 ]; then fi %postun -/sbin/ldconfig /bin/systemctl daemon-reload >/dev/null 2>&1 || : @@ -226,7 +219,8 @@ cd dovecot-2*3-pigeonhole-%{pigeonholever} make check %files -%doc docinstall/* AUTHORS ChangeLog COPYING COPYING.LGPL COPYING.MIT NEWS README +%license COPYING COPYING.LGPL COPYING.MIT +%doc docinstall/* AUTHORS ChangeLog NEWS README %{_sbindir}/dovecot %{_bindir}/{doveadm,doveconf,dsync,dovecot-sysreport} @@ -315,6 +309,9 @@ make check %changelog +* Wed Oct 02 2024 Funda Wang - 1:2.3.21.1-2 +- update pigeonhole to 0.5.21.1 + * Wed Aug 14 2024 Funda Wang - 1:2.3.21.1-1 - update to 2.3.21.1 diff --git a/dovecot.yaml b/dovecot.yaml index 5c00661789ea786b4b7980d5aea4f01aa0c38cd5..82f359ef5b164106d04c59cd8055978f5353c7fa 100644 --- a/dovecot.yaml +++ b/dovecot.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: dovecot/core -tag_prefix: ^ -seperator: . +tag_prefix: +separator: .