From f3928986bb90dce6d2cae85d425020e0f0885e76 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 1 Mar 2023 17:50:51 +0100
Subject: [PATCH] - updated to 1.2.2

---
 courier-certs.patch | 15 +++++++--------
 courier.spec        | 12 ++++++------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/courier-certs.patch b/courier-certs.patch
index 883f541..8c40fac 100644
--- a/courier-certs.patch
+++ b/courier-certs.patch
@@ -72,19 +72,18 @@ diff -urNp -x '*.orig' courier-1.0.9.org/courier/pop3d-ssl.in courier-1.0.9/cour
  	if test "$TLS_CACHEFILE" != ""
  	then
  		rm -f "$TLS_CACHEFILE"
-diff -urNp -x '*.orig' courier-1.0.9.org/courier.sysvinit.in courier-1.0.9/courier.sysvinit.in
---- courier-1.0.9.org/courier.sysvinit.in	2021-05-07 22:54:46.201129431 +0200
-+++ courier-1.0.9/courier.sysvinit.in	2021-05-07 22:54:47.567803074 +0200
+--- courier-1.2.2.org/courier.sysvinit.in	2021-05-07 22:54:46.201129431 +0200
++++ courier-1.2.2/courier.sysvinit.in	2021-05-07 22:54:47.567803074 +0200
 @@ -18,7 +18,7 @@ sysconfdir="@sysconfdir@"
  sbindir="@sbindir@"
  bindir="@bindir@"
  libexecdir="@libexecdir@"
 -datadir="@datadir@"
 +certsdir="@certsdir@"
+ localstatedir="@localstatedir@"
+ webadmin="${libexecdir}/courier/webmail/webadmin"
  
- if test ! -f ${sysconfdir}/esmtpd
- then
-@@ -92,7 +92,7 @@ start)
+@@ -102,7 +102,7 @@ start)
  	then
  # If we do not have a certificate, make one up.
  
@@ -93,7 +92,7 @@ diff -urNp -x '*.orig' courier-1.0.9.org/courier.sysvinit.in courier-1.0.9/couri
  		then
  			if test -x $COURIERTLS
  			then
-@@ -159,7 +159,7 @@ start)
+@@ -169,7 +169,7 @@ start)
  			then
  # If we do not have a certificate, make one up.
  
@@ -102,7 +101,7 @@ diff -urNp -x '*.orig' courier-1.0.9.org/courier.sysvinit.in courier-1.0.9/couri
  				then
  					echo -n " generating-POP3-SSL-certificate..."
  
-@@ -189,7 +189,7 @@ start)
+@@ -199,7 +199,7 @@ start)
  			then
  # If we do not have a certificate, make one up.
  
diff --git a/courier.spec b/courier.spec
index 8f06843..63b9962 100644
--- a/courier.spec
+++ b/courier.spec
@@ -12,12 +12,12 @@
 Summary:	Courier mail server
 Summary(pl.UTF-8):	Serwer poczty Courier
 Name:		courier
-Version:	1.1.8
-Release:	2
+Version:	1.2.2
+Release:	1
 License:	GPL v3 with OpenSSL exception
 Group:		Networking/Daemons
 Source0:	https://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5:	13de4bf23524c64f270161d22e59a593
+# Source0-md5:	4f27683022efc180a8a46cdbca99d3b9
 Patch1:		%{name}-withoutfam.patch
 Patch2:		%{name}-maildir.patch
 Patch3:		%{name}-sendmail_dir.patch
@@ -39,9 +39,9 @@ BuildRequires:	gnupg
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 3.0}
 %{?with_gnutls:BuildRequires:	libgcrypt-devel}
 %{?with_gnutls:BuildRequires:	libgpg-error-devel}
-BuildRequires:	libidn-devel >= 0.0.0
+BuildRequires:	libidn2-devel >= 0.0.0
 BuildRequires:	libstdc++-devel >= 6:4.7
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	libtool >= 2:2
 BuildRequires:	mailcap
 BuildRequires:	openldap-devel >= 2.3.0
 %{!?with_gnutls:BuildRequires:	openssl-devel >= 0.9.7d}
@@ -654,7 +654,6 @@ fi
 %{_docdir}/courier/couriertls.html
 %{_docdir}/courier/deliverquota.html
 %{_docdir}/courier/documentation.html
-%{_docdir}/courier/download.html
 %{_docdir}/courier/index.html
 %{_docdir}/courier/install.html
 %{_docdir}/courier/layout.html
@@ -930,6 +929,7 @@ fi
 %attr(700,daemon,daemon) %dir %{_sysconfdir}/webadmin/added
 %attr(700,daemon,daemon) %dir %{_sysconfdir}/webadmin/removed
 %attr(400,daemon,daemon) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webadmin/password
+%attr(400,daemon,daemon) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webadmin/restartauthcmd
 %attr(644,daemon,daemon) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webadmin/unsecureok
 %attr(755,root,root) %{_datadir}/courier/courierwebadmin/admin-main.pl
 %attr(755,root,root) %{_datadir}/courier/courierwebadmin/admin-save.pl
-- 
2.44.0