From d56e91b60a965b8cfc16f2a329580183ca58c948 Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tjanouse@fedoraproject.org>
Date: Aug 14 2007 16:24:45 +0000
Subject: fixed getgrouplist patch, dropped groupcache


---

diff --git a/cyrus-imapd-2.3.8-getgrouplist.patch b/cyrus-imapd-2.3.8-getgrouplist.patch
index 2f41f52..c597bb6 100644
--- a/cyrus-imapd-2.3.8-getgrouplist.patch
+++ b/cyrus-imapd-2.3.8-getgrouplist.patch
@@ -81,4 +81,4 @@ diff -Naur cyrus-imapd-2.3.8.orig/lib/auth_unix.c cyrus-imapd-2.3.8/lib/auth_uni
 +
      return newstate;
  }
- 
\ No newline at end of file
+ 
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 3b592a0..4fb557b 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -26,8 +26,6 @@ Release: 4.rc1%{?dist}
 %{!?FORCESYNCEXT3: %define FORCESYNCEXT3 0}
 # include autocreate feature
 %{!?AUTOCREATE: %define AUTOCREATE 1}
-# include groupcache feature
-%{!?GROUPCACHE: %define GROUPCACHE 1}
 # don't check for RFC compliant line termination (bare newlines)
 %{!?NO_BARE_NL: %define NO_BARE_NL 0}
 # used syslog facility for logging
@@ -128,8 +126,6 @@ Source27: cyrus-imapd-procmail+cyrus.mc
 Source28: cyrus-imapd.rpm_set_permissions
 Source29: cyrus-imapd-sendmail-8.12.9-cyrusv2.m4
 Source30: cyrus-imapd-README.contrib
-Source31: cyrus-imapd-README.groupcache
-Source32: cyrus-imapd.upd_groupcache
 Source33: cyrus-imapd-README.skiplist_recovery
 Patch0: cyrus-imapd-2.2.12-no_transfig.patch
 #Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.8/cyrus-imapd-2.3.8-autocreate-0.10-0.diff
@@ -140,7 +136,6 @@ Patch4: http://servercc.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.
 Patch5: cyrus-imapd-2.2.12-munge8bit.patch
 Patch6: cyrus-imapd-2.1.16-getrlimit.patch
 Patch7: cyrus-imapd-2.3.7-nobarenewlinescheck.patch
-Patch8: cyrus-imapd-2.2.10-groupcache.patch
 Patch9: cyrus-imapd-2.3.1-config_defaults.patch
 Patch10: cyrus-imapd-acceptinvalidfrom.patch
 Patch11: cyrus-imapd-2.2.12-dam_invalid_id-christos.patch
@@ -250,9 +245,6 @@ one running the server.
 %if %{NO_BARE_NL}
 %patch7 -p1 -b .nobarenewlinescheck
 %endif
-%if %{GROUPCACHE}
-%patch8 -p1 -b .groupcache
-%endif
 #%patch9 -p1 -b .config_defaults
 %patch10 -p1 -b .acceptinvalidfrom
 # fixed upstream already
@@ -360,9 +352,6 @@ find doc -name "*.html.*" -type f | xargs -r %{__rm} -f
 
 %{__install} -m 644 %{SOURCE23}	doc/README.RPM
 %{__install} -m 644 %{SOURCE24}	doc/README.HOWTO-recover-mailboxes.db
-%if %{GROUPCACHE}
-%{__install} -m 644 %{SOURCE31}	doc/README.groupcache
-%endif
 %{__install} -m 644 %{SOURCE33} doc/README.skiplist_recovery
 %if %{AUTOCREATE}
 %{__install} -m 644 %{SOURCE8}  doc/README.autocreate
@@ -431,9 +420,6 @@ done
 
 # Install additional files
 %{__install} -m 755 %{SOURCE13}   %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
-%if %{GROUPCACHE}
-%{__install} -m 755 %{SOURCE32}   %{buildroot}%{_cyrexecdir}/upd_groupcache
-%endif
 %{__install} -m 755 %{SOURCE28}   %{buildroot}%{_cyrexecdir}/rpm_set_permissions
 %{__install} -m 644 %{SOURCE14}   %{buildroot}%{_datadir}/%{name}/rpm/magic
 %{__install} -m 644 %{SOURCE10}   %{_contribdir}/
@@ -741,9 +727,6 @@ fi
 %attr(0755,root,root) %{_cyrexecdir}/unexpunge
 %attr(0755,root,root) %{_cyrexecdir}/upgradesieve
 %attr(0755,root,root) %{_cyrexecdir}/cvt_cyrusdb_all
-%if %{GROUPCACHE}
-%attr(0755,root,root) %{_cyrexecdir}/upd_groupcache
-%endif
 %attr(0755,root,root) %{_cyrexecdir}/rpm_set_permissions
 %if %{IDLED}
 %attr(0755,root,root) %{_cyrexecdir}/idled
@@ -820,7 +803,7 @@ fi
 - update to latest upstream beta
 - temporarily dropped the rmquota+deletemailbox patch (doesn't apply)
 - fixed to compile with newer glibc
-- added the getgrouplist patch from RHEL-4
+- added the getgrouplist patch from RHEL-4, dropped groupcache patch
 - dropped the allow_auth_plain patch
 - buildrequire perl-devel