up to 2.4.18 (2015-07-06)

diff --git a/cyrus-imapd-et.patch b/cyrus-imapd-et.patch
index 01c0938c8fc2c4b0341bf2584a797cc0fc9a6ede..09e671db409da13a6b9ba0a620fbb5745768cec2 100644 (file)
--- a/cyrus-imapd-et.patch
+++ b/cyrus-imapd-et.patch
@@ -1,11 +1,11 @@
---- cyrus-imapd-2.1.14/configure.in.wiget      Thu Jun 21 20:46:04 2001
-+++ cyrus-imapd-2.1.14/configure.in    Thu Jun 21 23:40:18 2001
-@@ -668,7 +668,8 @@
+--- cyrus-imapd-2.4.18/configure.in~   2015-07-06 06:38:29.000000000 +0300
++++ cyrus-imapd-2.4.18/configure.in    2016-07-28 13:23:41.093544787 +0300
+@@ -1108,7 +1108,8 @@
+       COM_ERR_CPPFLAGS=""
        ;;
    *) # use whatever they told us, or whatever we found
-      COMPILE_ET="${with_com_err}/bin/compile_et"
 -     COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
-+     COM_ERR_LDFLAGS="-L${with_com_err}/lib"
++     COM_ERR_LDFLAGS=""
 +     COM_ERR_LIBS="-lcom_err"
       COM_ERR_CPPFLAGS="-I${with_com_err}/include"
       # Ever get the feeling people hide this stuff on purpose?

diff --git a/cyrus-imapd-shared.patch b/cyrus-imapd-shared.patch
index 054ec5799106ad97bf86da8298555fff34edb54a..b927cf2fb4925963072b2f7170e5dd1964dfb6d1 100644 (file)
--- a/cyrus-imapd-shared.patch
+++ b/cyrus-imapd-shared.patch
@@ -985,17 +985,6 @@
        $<
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
---- cyrus-imapd-2.4.10/configure.in~   2011-07-30 22:17:55.000000000 +0200
-+++ cyrus-imapd-2.4.10/configure.in    2011-07-30 22:21:57.705797231 +0200
-@@ -1078,7 +1078,7 @@
-       ;;
-   *) # use whatever they told us, or whatever we found
-      COMPILE_ET="${with_com_err}/bin/compile_et"
--     COM_ERR_LDFLAGS="-L${with_com_err}/lib"
-+     COM_ERR_LDFLAGS=""
-      COM_ERR_LIBS="-lcom_err"
-      COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-      # Ever get the feeling people hide this stuff on purpose?
 --- cyrus-imapd-2.4.10/perl/sieve/managesieve/Makefile.PL.wiget        2011-07-04 17:05:01.000000000 +0200
 +++ cyrus-imapd-2.4.10/perl/sieve/managesieve/Makefile.PL      2011-07-31 19:33:33.426399853 +0200
 @@ -61,8 +61,8 @@ WriteMakefile(

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 567ab1399002e9f2152a76a5913ea33e17363852..4abe2a9788f3e91f71f2bc8f7eb5c406152e3dc4 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -8,12 +8,12 @@ Summary:      High-performance mail store with IMAP and POP3
 Summary(pl.UTF-8):     Wysoko wydajny serwer IMAP i POP3
 Summary(pt_BR.UTF-8):  Um servidor de mail de alto desempenho que suporta IMAP e POP3
 Name:          cyrus-imapd
-Version:       2.4.13
-Release:       8
+Version:       2.4.18
+Release:       1
 License:       BSD-like
 Group:         Networking/Daemons/POP3
 Source0:       ftp://ftp.cyrusimap.org/cyrus-imapd/%{name}-%{version}.tar.gz
-# Source0-md5: 7d7c8864863df8a56a9dae5f1d846065
+# Source0-md5: 6b5151fbb1619cf1a133f65f55cda619
 Source1:       cyrus-README
 Source2:       cyrus-procmailrc
 Source3:       cyrus-deliver-wrapper.c