From d96a4f3bde46ba91001bdb5c1611f314f2ff7e736fd2481504aa0dd2013c73fb Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Wed, 21 Jul 2010 08:07:09 +0000 Subject: [PATCH] Accepting request 43579 from home:computersalat:devel:mail Copy from home:computersalat:devel:mail/courier-imap via accept of submit request 43579 revision 7. Request was accepted with message: self accept OBS-URL: https://build.opensuse.org/request/show/43579 OBS-URL: https://build.opensuse.org/package/show/server:mail/courier-imap?expand=0&rev=44 --- ....patch => courier-imap-4.8.0-sbindir.patch | 30 ++++++++--------- courier-imap-4.8.0.tar.bz2 | 3 ++ courier-imap.changes | 33 +++++++++++++++++++ courier-imap.spec | 9 +++-- 4 files changed, 56 insertions(+), 19 deletions(-) rename courier-imap-4.5.0-sbindir.patch => courier-imap-4.8.0-sbindir.patch (51%) create mode 100644 courier-imap-4.8.0.tar.bz2 diff --git a/courier-imap-4.5.0-sbindir.patch b/courier-imap-4.8.0-sbindir.patch similarity index 51% rename from courier-imap-4.5.0-sbindir.patch rename to courier-imap-4.8.0-sbindir.patch index 7a8b003..4374df0 100644 --- a/courier-imap-4.5.0-sbindir.patch +++ b/courier-imap-4.8.0-sbindir.patch @@ -1,24 +1,22 @@ -diff -ruN courier-imap-4.5.0-orig/imap/imapd.8.in courier-imap-4.5.0/imap/imapd.8.in ---- courier-imap-4.5.0-orig/imap/imapd.8.in 2009-05-10 14:49:43.000000000 +0000 -+++ courier-imap-4.5.0/imap/imapd.8.in 2009-05-23 23:29:28.286737791 +0000 -@@ -174,11 +174,11 @@ - .SH "Synopsis" - .fam C +diff -ruN courier-imap-4.8.0-orig/imap/imapd.8.in courier-imap-4.8.0/imap/imapd.8.in +--- courier-imap-4.8.0-orig/imap/imapd.8.in 2010-02-20 05:12:44.000000000 +0100 ++++ courier-imap-4.8.0/imap/imapd.8.in 2010-07-05 17:18:31.000000000 +0200 +@@ -25,9 +25,9 @@ + imapd \- The Courier IMAP server + .SH "SYNOPSIS" .HP \w'\fB@libexecdir@/couriertcpd\fR\ 'u -\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/bin/imapd} {\&./Maildir} -+\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/sbin/imapd} {\&./Maildir} - .fam - .fam C -.HP \w'\fB@prefix@/bin/imapd\fR\ 'u -\fB@prefix@/bin/imapd\fR {\&./Maildir} ++\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/sbin/imapd} {\&./Maildir} +.HP \w'\fB@prefix@/sbin/imapd\fR\ 'u +\fB@prefix@/sbin/imapd\fR {\&./Maildir} - .fam .SH "DESCRIPTION" .PP -diff -ruN courier-imap-4.5.0-orig/imap/imapd-ssl.dist.in courier-imap-4.5.0/imap/imapd-ssl.dist.in ---- courier-imap-4.5.0-orig/imap/imapd-ssl.dist.in 2008-07-12 20:17:24.000000000 +0000 -+++ courier-imap-4.5.0/imap/imapd-ssl.dist.in 2009-05-23 23:29:50.251725614 +0000 + +diff -ruN courier-imap-4.8.0-orig/imap/imapd-ssl.dist.in courier-imap-4.8.0/imap/imapd-ssl.dist.in +--- courier-imap-4.8.0-orig/imap/imapd-ssl.dist.in 2009-08-13 05:06:42.000000000 +0200 ++++ courier-imap-4.8.0/imap/imapd-ssl.dist.in 2010-07-05 17:19:04.000000000 +0200 @@ -102,7 +102,7 @@ ##NAME: COURIERTLS:0 # @@ -28,9 +26,9 @@ diff -ruN courier-imap-4.5.0-orig/imap/imapd-ssl.dist.in courier-imap-4.5.0/imap ##NAME: TLS_PROTOCOL:0 # -diff -ruN courier-imap-4.5.0-orig/imap/pop3d-ssl.dist.in courier-imap-4.5.0/imap/pop3d-ssl.dist.in ---- courier-imap-4.5.0-orig/imap/pop3d-ssl.dist.in 2008-07-12 20:17:25.000000000 +0000 -+++ courier-imap-4.5.0/imap/pop3d-ssl.dist.in 2009-05-23 23:30:09.800604775 +0000 +diff -ruN courier-imap-4.8.0-orig/imap/pop3d-ssl.dist.in courier-imap-4.8.0/imap/pop3d-ssl.dist.in +--- courier-imap-4.8.0-orig/imap/pop3d-ssl.dist.in 2009-08-13 05:06:42.000000000 +0200 ++++ courier-imap-4.8.0/imap/pop3d-ssl.dist.in 2010-07-05 17:19:30.000000000 +0200 @@ -87,7 +87,7 @@ # at your own risk. Only the basic SSL/TLS functionality is known to be # working. Keep this in mind as you play with the following variables. diff --git a/courier-imap-4.8.0.tar.bz2 b/courier-imap-4.8.0.tar.bz2 new file mode 100644 index 0000000..34b14e2 --- /dev/null +++ b/courier-imap-4.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec7511a4398920a04f3bb60cf1208e29a9a5432baeff4d356a4ec142113bfbf2 +size 3362734 diff --git a/courier-imap.changes b/courier-imap.changes index ec58d71..ee88545 100644 --- a/courier-imap.changes +++ b/courier-imap.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Jul 5 15:21:53 UTC 2010 - chris@computersalat.de + +- update to 4.8.0 + * tcpd/configure.in: Check if explicit linking with libgpg-error is + required. +- 2010-03-20 "Stefan Hornburg (Racke)" + * imapd.c (main): Fix typo in alert message. +- 2010-03-18 Hugo Monteiro + * Big quota patch (with some changes). +- 2010-03-12 Sam Varshavchik + * imapd.c (main): Dummy FAM/Gamin initialization, report an error + during login, upon a failure. +- 2010-03-10 Sam Varshavchik + * imapd.c (imapenhancedidle): Make FAM error more meaningful. +- 2010-02-25 Bernard Quatermass + * pop3dserver.c (main): "disableinsecurepop3" account option disables + non-SSL logins. + * imapd.c (chkdisabled): "disableinsecureimap" account option disables + non-SSL logins. +- reworked sbindir patch + +------------------------------------------------------------------- +Sat Jul 3 12:36:09 CEST 2010 - meissner@suse.de + +- buildrequire openssl so configure finds /usr/bin/openssl bnc#619665 + +------------------------------------------------------------------- +Mon May 17 14:39:54 UTC 2010 - chris@computersalat.de + +- fix path to TLS_TRUSTCERTS (imap-ssl,pop3d-ssl) + o added --with-certdb=%{_sysconfdir}/ssl/certs + ------------------------------------------------------------------- Wed Feb 24 22:52:23 UTC 2010 - chris@computersalat.de diff --git a/courier-imap.spec b/courier-imap.spec index b6e7d3e..16ad5e8 100644 --- a/courier-imap.spec +++ b/courier-imap.spec @@ -1,5 +1,5 @@ # -# spec file for package courier-imap (Version 4.7.0) +# spec file for package courier-imap (Version 4.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: courier-imap Summary: An IMAP and POP3 Server for Maildir MTAs -Version: 4.7.0 +Version: 4.8.0 Release: 1 License: GPLv2+ Group: Productivity/Networking/Email/Servers @@ -34,7 +34,7 @@ Source6: courier-pop.init Source7: courier-pop-ssl.init Source8: %{name}.firewall Source9: %{name}-ssl.firewall -Patch0: %{name}-4.5.0-sbindir.patch +Patch0: %{name}-4.8.0-sbindir.patch Patch1: %{name}-4.7.0-LDFLAGS.patch Patch2: %{name}-ulimit_conf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,6 +44,8 @@ BuildRequires: audit-libs BuildRequires: courier-authlib-devel >= 0.62 BuildRequires: db-devel fam-devel gcc-c++ gdbm-devel libstdc++-devel BuildRequires: ncurses-devel openssl-devel postfix procps zlib-devel +# openssl itself for /usr/bin/openssl configure check +BuildRequires: openssl Conflicts: imap qpopper cyrus-imapd Requires: courier-authlib >= 0.61 Requires: fam-server gdbm openssl @@ -92,6 +94,7 @@ install the entire Courier server. --disable-root-check \ --enable-unicode \ --with-authdaemonvar=%{_localstatedir}/run/authdaemon.%{name} \ + --with-certdb=%{_sysconfdir}/ssl/certs \ --enable-workarounds-for-imap-client-bugs %{__make} %{?jobs:-j%jobs}