Accepting request 135253 from server:mail

update to 4.11.0 (forwarded request 135249 from computersalat)

OBS-URL: https://build.opensuse.org/request/show/135253
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/courier-imap?expand=0&rev=37

courier-imap-4.11.0-sbindir.patch

@@ -0,0 +1,43 @@
+Index: imap/imapd.8.in
+===================================================================
+--- imap/imapd.8.in.orig
++++ imap/imapd.8.in
+@@ -24,9 +24,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}
+-.HP \w'\fB@prefix@/bin/imapd\fR\ 'u
+-\fB@prefix@/bin/imapd\fR {\&./Maildir}
++\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@sbindir@/imaplogin} [\fImodules\fR...] {@sbindir@/imapd} {\&./Maildir}
++.HP \w'\fB@sbindir@/imapd\fR\ 'u
++\fB@sbindir@/imapd\fR {\&./Maildir}
+ .SH "DESCRIPTION"
+ .PP
+ 
+Index: imap/imapd-ssl.dist.in
+===================================================================
+--- imap/imapd-ssl.dist.in.orig
++++ imap/imapd-ssl.dist.in
+@@ -102,7 +102,7 @@ IMAP_TLS_REQUIRED=0
+ ##NAME: COURIERTLS:0
+ #
+ 
+-COURIERTLS=@bindir@/couriertls
++COURIERTLS=@sbindir@/couriertls
+ 
+ ##NAME: TLS_PRIORITY:0
+ #
+Index: imap/pop3d-ssl.dist.in
+===================================================================
+--- imap/pop3d-ssl.dist.in.orig
++++ imap/pop3d-ssl.dist.in
+@@ -87,7 +87,7 @@ POP3_TLS_REQUIRED=0
+ # 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.
+ 
+-COURIERTLS=@bindir@/couriertls
++COURIERTLS=@sbindir@/couriertls
+ 
+ ##NAME: TLS_PRIORITY:0
+ #

courier-imap-4.11.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0078a71a5419b454a9aaee17d5d49b6b3b115a34fdafdc6d8b966d6355ae7893
+size 3190857

courier-imap-4.8.0-sbindir.patch

@@ -1,40 +0,0 @@
-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}
--.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}
- .SH "DESCRIPTION"
- .PP
- 
-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
- #
- 
--COURIERTLS=@bindir@/couriertls
-+COURIERTLS=@sbindir@/couriertls
- 
- ##NAME: TLS_PROTOCOL:0
- # 
-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.
- 
--COURIERTLS=@bindir@/couriertls
-+COURIERTLS=@sbindir@/couriertls
- 
- ##NAME: TLS_PROTOCOL:0
- # 

courier-imap-4.9.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27344b624ceaaf22e5f12b9b76253eaacd33723be3108b104aa6d25f4641193e
-size 3049553

courier-imap.changes

@@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Fri Sep 21 09:23:57 UTC 2012 - chris@computersalat.de
+
+- update to 4.11.0
+  * maildir/maildiraclt.c (maildir_acl_delete): Fix double-free on error
+    path of an ENOMEM.
+  * courier.spec.in: Fix the RPM spec to work around /bin symlink
+    breakage in F17.
+  * tcpd/tcpd.c: Update libgnutls API, replace obsoleted functions
+    with current API. Obsoletes most TLS_* variables that set protocol
+    priorities, replaced with Gnutls-specific single TLS_PRIORITY
+    setting (existing TLS_* variables are still used by the OpenSSL
+    alternative). Updated *-ssl configuration files accordingly.
+  * tcpd: Compilation changes for gnutls 3
+  * liblock/mail.c (dotlock_exists): Quell a compiler warning.
+  * Miscellaneous spelling fixes.
+- rebase sbindir patch (4.8.0 -> 4.11.0)
+
+-------------------------------------------------------------------
+Sat Jan  7 19:20:08 UTC 2012 - chris@computersalat.de
+
+- update to 4.10.0
+  * imapd.c (main): Open IMAPDEBUGFILE only if it exists already.
+    (do_expunge): Optionally log deletions. Based on a patch by
+    William Yodlowsky <wyodlows@andromeda.rutgers.edu>.
+  * pop3dserver.c (cleanup): Optionally log deletions. Based on a patch by
+    William Yodlowsky <wyodlows@andromeda.rutgers.edu>.
+  * imapd.dist.in (IMAP_MOVE_EXPUNGE_TO_TRASH): Officially document how
+    IMAPDEBUGFILE works.
+  * imapscanclient.c: Postpone Y2038K for a while, for uid validities.
+  * liblock/mail.c (dotlock_exists): Handle getting here because of a
+    recycled pid.
+  * unicode/unicode.c (init_default_chset): Handle NULL from setlocale().
+  * rfc2045/reformime.c (main2): Fixed segfault on some arches from an
+    initial null given to strtok.
+  * rfc2045/reformime.c (main2): On ia64 and arm, argv is in readonly
+    memory.
+  * pop3dserver.c (openpop3dlist): Try a few times to reopen pop3dsizelist
+    if it fails with ESTALE.
+  * pop3d.dist.in: Add AUTHSERVICE settings. They've been supported
+    all along.
+  * Fix gcc 4.6 warnings
+  * courier-imap.spec.in: switch to systemd. Remove script used when
+    upgrading from ancient pre-sysconftool versions.
+  * Fix autoconf warnings.
+
 -------------------------------------------------------------------
 Wed Sep 21 23:11:38 UTC 2011 - chris@computersalat.de
 

courier-imap.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package courier-imap
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,17 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           courier-imap
 Summary:        An IMAP and POP3 Server for Maildir MTAs
-Version:        4.9.3
-Release:        1
 License:        GPL-3.0
 Group:          Productivity/Networking/Email/Servers
+Version:        4.11.0
+Release:        0
 Url:            http://www.courier-mta.org/imap/
-Source:         %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        pop3.pamd
 Source2:        imap.pamd
 Source4:        courier-imap.init
@@ -34,20 +32,30 @@ Source6:        courier-pop.init
 Source7:        courier-pop-ssl.init
 Source8:        %{name}.firewall
 Source9:        %{name}-ssl.firewall
-Patch0:         %{name}-4.8.0-sbindir.patch
+Patch0:         %{name}-4.11.0-sbindir.patch
 Patch2:         %{name}-ulimit_conf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 910
 BuildRequires:  audit-libs
 %endif
 BuildRequires:  courier-authlib-devel >= 0.62
-BuildRequires:  db-devel fam-devel gcc-c++ gdbm-devel libstdc++-devel
+BuildRequires:  db-devel
-BuildRequires:  ncurses-devel openssl-devel postfix procps zlib-devel
+BuildRequires:  fam-devel
+BuildRequires:  gcc-c++
+BuildRequires:  gdbm-devel
+BuildRequires:  libstdc++-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openssl-devel
+BuildRequires:  postfix
+BuildRequires:  procps
+BuildRequires:  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
+Requires:       fam-server
+Requires:       gdbm
+Requires:       openssl
 
 %description
 Courier-IMAP is a fast, scalable, enterprise IMAP server that uses
@@ -79,7 +87,7 @@ install the entire Courier server.
 
 %prep
 %setup -n %{name}-%{version}
-%patch0 -p1
+%patch0
 %patch2
 
 %build