From e0e1897b62c678c6292939168e8f5245102fe511 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 23 Oct 2021 00:14:21 +0200 Subject: [PATCH] - rediff patch, merge triggers for rpm4, rel 2 --- courier-imap-dirs.patch | 12 +++++++----- courier-imap.spec | 7 ++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/courier-imap-dirs.patch b/courier-imap-dirs.patch index f20bc9c..f81fe9b 100644 --- a/courier-imap-dirs.patch +++ b/courier-imap-dirs.patch @@ -1,9 +1,11 @@ ---- old/configure.ac 2004-06-12 01:38:04.000000000 +0000 -+++ new/configure.ac 2004-07-08 14:53:47.000000000 +0000 -@@ -234,5 +234,6 @@ - pop3d.rc pop3d-ssl.rc - courier-imap.sysvinit courier-imap.spec index.html +diff -urNp -x '*.orig' courier-imap-5.0.7.org/configure.ac courier-imap-5.0.7/configure.ac +--- courier-imap-5.0.7.org/configure.ac 2019-03-27 22:34:04.000000000 +0100 ++++ courier-imap-5.0.7/configure.ac 2021-10-23 00:10:21.114488946 +0200 +@@ -325,6 +325,7 @@ AC_CONFIG_FILES(Makefile dbobj.h dbobj.c + authconfig + courier-imap.spec INSTALL.html + courier-imap courier-imap-ssl courier-pop3 courier-pop3-ssl packaging/suse/courier-imap.init packaging/systemd/courier-imap.sysvinit + packaging/systemd/courier-imap.service) diff --git a/courier-imap.spec b/courier-imap.spec index 56b489b..c9f3b59 100644 --- a/courier-imap.spec +++ b/courier-imap.spec @@ -16,7 +16,7 @@ Summary: Courier-IMAP server Summary(pl.UTF-8): Serwer Courier-IMAP Name: courier-imap Version: 5.0.7 -Release: 1 +Release: 2 License: GPL v3 with OpenSSL exception Group: Networking/Daemons Source0: http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2 @@ -330,7 +330,8 @@ if [ "$1" = "0" ]; then /sbin/chkconfig --del courier-pop3-ssl fi -%triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.5 +%triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.6 +# 3.0.5 if [ -f /var/lib/openssl/certs/pop3d.pem ]; then echo echo pop3d.pem has been moved automatically to %{_certsdir} @@ -354,7 +355,7 @@ if [ -f /etc/sysconfig/courier-pop3 ]; then fi %service courier-pop3 restart -%triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.6 +# 3.0.6 . %{_sysconfdir}/pop3d-ssl if [ $TLS_CACHEFILE = "/var/couriersslcache" ]; then sed -i s/^TLS_CACHEFILE=.*/"TLS_CACHEFILE=\/var\/spool\/courier-imap\/couriersslcache"/ %{_sysconfdir}/pop3d-ssl -- 2.44.0