steffen: server/imapd Makefile, 1.17, 1.18 kolab-ldap.patch, 1.2, 1.3 kolab.patch, 1.13, 1.14

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Makefile kolab-ldap.patch kolab.patch 
Log Message:
Switched to OpenPKG-2.2!

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	8 Oct 2004 23:36:19 -0000	1.17
+++ Makefile	22 Nov 2004 23:26:26 -0000	1.18
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.1/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -8,8 +8,8 @@
   KOLABCVSDIR = $(CURDIR)
 endif
 
-VERSION=2.2.6
-RELEASE=2.1.0
+VERSION=2.2.8
+RELEASE=2.2.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab-ldap.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab-ldap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab-ldap.patch	17 Aug 2004 22:29:15 -0000	1.2
+++ kolab-ldap.patch	22 Nov 2004 23:26:26 -0000	1.3
@@ -116,11 +116,11 @@
 diff -urp ../cyrus-imapd-2.2.6.orig/lib/imapopts.h ./lib/imapopts.h
 --- ../cyrus-imapd-2.2.6.orig/lib/imapopts.h	2004-06-17 20:55:50.000000000 +0200
 +++ ./lib/imapopts.h	2004-08-18 00:08:52.000000000 +0200
-@@ -185,6 +185,7 @@ enum enum_value {
+@@ -188,6 +188,7 @@ enum enum_value {
  
-   IMAP_ENUM_VIRTDOMAINS_OFF = 0,
+   IMAP_ENUM_VIRTDOMAINS_ON,
    IMAP_ENUM_VIRTDOMAINS_USERID,
 +  IMAP_ENUM_VIRTDOMAINS_LDAP,
-   IMAP_ENUM_VIRTDOMAINS_ON,
+   IMAP_ENUM_VIRTDOMAINS_OFF = 0
  
  };

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolab.patch	8 Oct 2004 23:36:19 -0000	1.13
+++ kolab.patch	22 Nov 2004 23:26:26 -0000	1.14
@@ -13,9 +13,9 @@
 @@ -34,13 +37,15 @@ Class:        BASE
  Group:        Mail
  License:      BSD
- Version:      2.2.6
--Release:      2.1.0
-+Release:      2.1.0_kolab
+ Version:      2.2.8
+-Release:      2.2.0
++Release:      2.2.0_kolab
  
  #   package options
 -%option       with_fsl    yes