steffen: server/imapd Makefile, 1.22.2.2, 1.22.2.3 kolab.patch, 1.22.2.4, 1.22.2.5

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv17778

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
Backport of morelogging patches from Issue928

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -d -r1.22.2.2 -r1.22.2.3
--- Makefile	29 Aug 2005 07:14:06 -0000	1.22.2.2
+++ Makefile	17 Sep 2005 22:21:38 -0000	1.22.2.3
@@ -19,13 +19,14 @@
 
 	cp $(KOLABCVSDIR)/cyradm.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
 	cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(KOLABCVSDIR)/imapd.morelogging.patch $(KOLABRPMSRC)/$(PACKAGE)/
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for imapd.spec
 	cp $(KOLABCVSDIR)/imapd.group2.patch $(KOLABRPMSRC)/$(PACKAGE)/    # Patch for case insensitive group match
 	cp $(KOLABCVSDIR)/imapd-goodchars.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for allowing special chars in mailbox names
 	cp $(KOLABCVSDIR)/kolab-ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/      
 	
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_group yes' --define 'with_atvdom yes' --define 'with_annotate yes' --define 'with_ldap yes' --define 'with_goodchars yes'
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_group yes' --define 'with_atvdom yes' --define 'with_annotate yes' --define 'with_ldap yes' --define 'with_goodchars yes' --define 'with_morelogging yes'
 
 imapd-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/imapd-$(VERSION)-$(RELEASE).src.rpm

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -u -d -r1.22.2.4 -r1.22.2.5
--- kolab.patch	31 Aug 2005 01:55:34 -0000	1.22.2.4
+++ kolab.patch	17 Sep 2005 22:21:38 -0000	1.22.2.5
@@ -1,5 +1,5 @@
 --- ../imapd.orig/imapd.spec	2005-06-15 20:55:40.000000000 +0200
-+++ imapd.spec	2005-08-30 20:36:16.000000000 +0200
++++ imapd.spec	2005-09-17 14:00:18.000000000 +0200
 @@ -2,6 +2,9 @@
  ##  imapd.spec -- OpenPKG RPM Package Specification
  ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
@@ -10,12 +10,12 @@
  ##
  ##  Permission to use, copy, modify, and distribute this software for
  ##  any purpose with or without fee is hereby granted, provided that
-@@ -33,13 +36,16 @@ Class:        BASE
+@@ -33,13 +36,17 @@ Class:        BASE
  Group:        Mail
  License:      BSD
  Version:      2.2.12
 -Release:      2.4.0
-+Release:      2.4.0_kolab2
++Release:      2.4.0_kolab3
  
  #   package options
 -%option       with_fsl    yes
@@ -29,10 +29,11 @@
 +%option       with_annotate no
 +%option       with_ldap     no
 +%option       with_goodchars no
++%option       with_morelogging no
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -49,6 +55,11 @@ Source3:      imapd.conf
+@@ -49,6 +56,12 @@ Source3:      imapd.conf
  Source4:      fsl.imapd
  Patch0:       imapd.patch
  Patch1:       imapd.patch.group
@@ -41,10 +42,11 @@
 +Patch4:       imapd.group2.patch
 +Patch5:       imapd-goodchars.patch
 +Patch6:       cyradm.annotate.patch
++Patch7:	      imapd.morelogging.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -61,6 +72,10 @@ PreReq:       sasl, db >= 4.2.52, openss
+@@ -61,6 +74,10 @@ PreReq:       sasl, db >= 4.2.52, openss
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
  %endif
@@ -55,7 +57,7 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -87,6 +102,7 @@ AutoReqProv:  no
+@@ -87,6 +104,7 @@ AutoReqProv:  no
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
@@ -63,7 +65,7 @@
  %endif
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -94,10 +110,21 @@ AutoReqProv:  no
+@@ -94,10 +112,24 @@ AutoReqProv:  no
      sleep 1
      touch configure
  %endif
@@ -77,6 +79,9 @@
 +    %patch -p1 -P 5
 +%endif
 +    %patch -p0 -P 6
++%if "%{with_morelogging}" == "yes"
++    %patch -p1 -P 7
++%endif
      %{l_shtool} subst \
          -e 's;-L/usr/local/lib;;g' \
          -e 's;-I/usr/local/include;;g' \
@@ -86,7 +91,7 @@
          configure
  
      #   ensure local et/com_err can be found
-@@ -158,6 +185,11 @@ AutoReqProv:  no
+@@ -158,6 +190,11 @@ AutoReqProv:  no
          -e '/config_init/s;"deliver";"cyrdeliver";' \
          imap/deliver.c