commit 6d61614bdece2aafd7f923385128078ba88370b7
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 24 09:10:54 2018 +0100
- updated to 1.0.3 (now uses unicode maildir naming scheme, needs upgrade
synchronization with other courier components)
courier-certs.patch | 42 ++++++++++++++++++++++--------------------
courier.spec | 8 +++++---
2 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/courier.spec b/courier.spec
index 1371429..13f08e3 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: 0.78.3
+Version: 1.0.3
Release: 1
License: GPL v3 with OpenSSL exception
Group: Networking/Daemons
Source0:
http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: d321cead3aae2da45a8a8f9a6bf0b3d3
+# Source0-md5: 54c3ce292169f3de3b0f285f64362dbd
Patch1: %{name}-withoutfam.patch
Patch2: %{name}-maildir.patch
Patch3: %{name}-sendmail_dir.patch
@@ -29,7 +29,7 @@ BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: courier-authlib-devel >= 0.61
%{?with_socks:BuildRequires: courier-sox-devel}
-BuildRequires: courier-unicode-devel >= 2.0
+BuildRequires: courier-unicode-devel >= 2.1
BuildRequires: db-devel
BuildRequires: expect
%{?with_fam:BuildRequires: fam-devel}
@@ -59,6 +59,7 @@ Requires: /usr/bin/certtool
Requires: rc-scripts
Provides: smtpdaemon
Obsoletes: smtpdaemon
+Conflicts: cone < 1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _localstatedir /var/spool/courier
@@ -352,6 +353,7 @@ done
--with-mailgroup=daemon \
--with-mailuid=2 \
--with-mailuser=daemon \
+ --with-notice=unicode \
%{!?with_socks:--without-socks}
%{__make} -j1
diff --git a/courier-certs.patch b/courier-certs.patch
index 10b8409..271c33e 100644
--- a/courier-certs.patch
+++ b/courier-certs.patch
@@ -13,20 +13,21 @@
MAILDROP="$bindir/maildrop"
AC_SUBST(MAILDROP)
---- courier-0.78.2.orig/courier/imapd-ssl.rc.in 2010-05-08
23:30:54.599915374 +0200
-+++ courier-0.78.2/courier/imapd-ssl.rc.in 2010-05-08 23:31:10.355976183
+0200
-@@ -28,6 +28,11 @@
+--- courier-1.0.3/courier/imapd-ssl.rc.in.orig 2018-11-24 08:32:30.698359598
+0100
++++ courier-1.0.3/courier/imapd-ssl.rc.in 2018-11-24 08:46:40.145016565
+0100
+@@ -27,6 +27,12 @@
case $1 in
start)
-+ # If we do not have a certificate, make one up.
-+ if [ ! -f @certsdir@/imapd.pem ]; then
-+ @sbindir@/mkimapdcert
-+ fi
++ # If we do not have a certificate, make one up.
++ if test ! -f @certsdir@/imapd.pem
++ then
++ @sbindir@/mkimapdcert
++ fi
+
- umask $IMAP_UMASK
- @ULIMIT@ $IMAP_ULIMITD
- @SETENV@ -i @SHELL@ -c " set -a ;
+ if test "$TLS_CACHEFILE" != ""
+ then
+ rm -f "$TLS_CACHEFILE"
--- courier-0.78.2.orig/courier/module.esmtp/configure.ac 2008-07-12
22:17:24.000000000 +0200
+++ courier-0.78.2/courier/module.esmtp/configure.ac 2010-05-08
23:31:10.355976183 +0200
@@ -287,6 +287,11 @@
@@ -105,20 +106,21 @@
else
if test "$BITS" = ""
then
---- courier-0.78.2.orig/courier/pop3d-ssl.in 2010-05-08 23:30:54.612778263
+0200
-+++ courier-0.78.2/courier/pop3d-ssl.in 2010-05-08 23:31:10.355976183
+0200
-@@ -29,6 +29,11 @@
+--- courier-1.0.3/courier/pop3d-ssl.in.orig 2018-11-24 08:32:30.701692932
+0100
++++ courier-1.0.3/courier/pop3d-ssl.in 2018-11-24 08:47:26.655016034 +0100
+@@ -28,6 +28,12 @@
case $1 in
start)
-+ # If we do not have a certificate, make one up.
-+ if [ ! -f @certsdir@/pop3d.pem ]; then
-+ @sbindir@/mkpop3dcert
-+ fi
++ # If we do not have a certificate, make one up.
++ if test ! -f @certsdir@/pop3d.pem
++ then
++ @sbindir@/mkpop3dcert
++ fi
+
- exec @SETENV@ -i PATH="$PATH" SHELL="$SHELL" \
- @SHELL@ -c " set -a ; \
- prefix=@prefix@ ; \
+ if test "$TLS_CACHEFILE" != ""
+ then
+ rm -f "$TLS_CACHEFILE"
--- courier-0.78.2.orig/courier.sysvinit.in 2010-05-08 23:30:54.612778263
+0200
+++ courier-0.78.2/courier.sysvinit.in 2010-05-08 23:31:10.355976183 +0200
@@ -18,7 +18,7 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/courier.git/commitdiff/6d61614bdece2aafd7f923385128078ba88370b7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
