From bc54fdabf0f60d622d9a0bd69269422724575008 Mon Sep 17 00:00:00 2001
From: zbyniu <zbyniu@pld-linux.org>
Date: Fri, 13 Jan 2012 20:21:52 +0000
Subject: [PATCH] - up to 2.4.13

Changed files:
    cyrus-imapd-shared.patch -> 1.21
    cyrus-imapd.spec -> 1.156
    makeopt.patch -> 1.2
---
 cyrus-imapd-shared.patch | 12 +-----------
 cyrus-imapd.spec         |  4 ++--
 makeopt.patch            | 12 +-----------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/cyrus-imapd-shared.patch b/cyrus-imapd-shared.patch
index b80b2a7..054ec57 100644
--- a/cyrus-imapd-shared.patch
+++ b/cyrus-imapd-shared.patch
@@ -151,7 +151,7 @@
  
  ### Built Source Files
  
-@@ -181,185 +181,185 @@
+@@ -181,177 +181,177 @@
  
  ### Services
  idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
@@ -346,16 +346,6 @@
  
  unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
 -	$(CC) $(LDFLAGS) -o $@ $? \
-+	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- 	$(LIBS)
- 
- make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
--	$(CC) $(LDFLAGS) -o $@ $? \
-+	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- 	$(LIBS)
- 
- make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
--	$(CC) $(LDFLAGS) -o $@ $? \
 +	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
  	$(LIBS)
  
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index e319cd8..1b7dfdd 100644
--- 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.11
+Version:	2.4.13
 Release:	1
 License:	BSD-like
 Group:		Networking/Daemons/POP3
 Source0:	ftp://ftp.cyrusimap.org/cyrus-imapd/%{name}-%{version}.tar.gz
-# Source0-md5:	d4a066e979adbe85679a6e239d64ee74
+# Source0-md5:	7d7c8864863df8a56a9dae5f1d846065
 Source1:	cyrus-README
 Source2:	cyrus-procmailrc
 Source3:	cyrus-deliver-wrapper.c
diff --git a/makeopt.patch b/makeopt.patch
index 5ea9c15..f0126e9 100644
--- a/makeopt.patch
+++ b/makeopt.patch
@@ -11,7 +11,7 @@
  TAGS:	et_name.c error_message.c compile_et.c error_table.c \
 --- cyrus-imapd-2.4.4/imap/Makefile.in	2010-11-12 00:15:33.000000000 +0200
 +++ cyrus-imapd-2.4.4-makeopt/imap/Makefile.in	2010-11-27 17:45:48.382799837 +0200
-@@ -181,189 +181,180 @@
+@@ -181,183 +181,172 @@
  
  ### Services
  idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
@@ -266,16 +266,6 @@
 -	$(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
 -	libimap.a $(DEPLIBS) $(LIBS)
 +	$(CC) $(LDFLAGS) -o $@ $? \
-+	$(LIBS)
- 
- make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS)
--	$(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $? \
-+	$(LIBS)
- 
- make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
--	$(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $? \
 +	$(LIBS)
  
  sync_client: sync_client.o sync_support.o \
-- 
2.44.0