steffen: server/imapd imapd-goodchars.patch, NONE, 1.1 Makefile, 1.21, 1.22 kolab.patch, 1.18, 1.19 imapd-goodchars.diff, 1.1, NONE

cvs at intevation.de cvs at intevation.de
Thu Apr 21 01:09:37 CEST 2005


Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Added Files:
	imapd-goodchars.patch 
Removed Files:
	imapd-goodchars.diff 
Log Message:
"GOODCHAR" patch adapted and integrated

--- NEW FILE: imapd-goodchars.patch ---
diff -upr ../cyrus-imapd-2.2.12.orig/imap/imapd.c ./imap/imapd.c
--- ../cyrus-imapd-2.2.12.orig/imap/imapd.c	2005-02-14 07:39:55.000000000 +0100
+++ ./imap/imapd.c	2005-04-21 00:59:50.865255448 +0200
@@ -3923,10 +3923,12 @@ void cmd_rename(const char *tag, 
 	}
     }
 
+#ifdef notdef
     /* verify that the mailbox doesn't have a wildcard in it */
     for (p = oldmailboxname; !r && *p; p++) {
 	if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
     }
+#endif
 
     /* attempt to rename the base mailbox */
     if (!r) {
Kun i ./imap: imapd.c.orig
diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxlist.c ./imap/mboxlist.c
--- ../cyrus-imapd-2.2.12.orig/imap/mboxlist.c	2004-07-26 20:08:03.000000000 +0200
+++ ./imap/mboxlist.c	2005-04-21 00:59:50.874254080 +0200
@@ -476,10 +476,12 @@ mboxlist_mycreatemailboxcheck(char *name
 		free(acl);
 		return IMAP_PERMISSION_DENIED;
 	    }
+#ifdef notdef
 	    /* disallow wildcards in userids with inboxes. */	     
 	    if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
 		return IMAP_MAILBOX_BADNAME;
 	    }
+#endif
 
 	    /*
 	     * Users by default have all access to their personal mailbox(es),
diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxname.c ./imap/mboxname.c
--- ../cyrus-imapd-2.2.12.orig/imap/mboxname.c	2005-02-14 07:39:57.000000000 +0100
+++ ./imap/mboxname.c	2005-04-21 00:59:50.879253320 +0200
@@ -649,8 +649,13 @@ int mboxname_netnewscheck(char *name)
 /*
  * Apply site policy restrictions on mailbox names.
  * Restrictions are hardwired for now.
- */
+
+ * original definition 
 #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
+ */
+
+#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+
 int mboxname_policycheck(char *name)
 {
     unsigned i;
Kun i ./imap: mboxname.c.orig

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile	4 Mar 2005 10:41:04 -0000	1.21
+++ Makefile	20 Apr 2005 23:09:35 -0000	1.22
@@ -20,9 +20,11 @@
 	cp $(KOLABCVSDIR)/imapd.annotate.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'
+	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'
 
 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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kolab.patch	4 Mar 2005 10:42:21 -0000	1.18
+++ kolab.patch	20 Apr 2005 23:09:35 -0000	1.19
@@ -1,5 +1,5 @@
---- ../imapd.orig/imapd.spec	2004-07-02 17:17:54.000000000 +0200
-+++ imapd.spec	2004-10-09 00:34:37.000000000 +0200
+--- ../imapd.orig/imapd.spec	2005-02-21 18:02:27.000000000 +0100
++++ imapd.spec	2005-04-21 00:51:04.705243928 +0200
 @@ -3,6 +3,9 @@
  ##  Copyright (c) 2000-2005 The OpenPKG Project <http://www.openpkg.org/>
  ##  Copyright (c) 2000-2005 Ralf S. Engelschall <rse at engelschall.com>
@@ -10,7 +10,7 @@
  ##
  ##  Permission to use, copy, modify, and distribute this software for
  ##  any purpose with or without fee is hereby granted, provided that
-@@ -34,13 +37,15 @@ Class:        BASE
+@@ -34,13 +37,16 @@ Class:        BASE
  Group:        Mail
  License:      BSD
  Version:      2.2.12
@@ -28,20 +28,22 @@
 +%option       with_drac     no
 +%option       with_annotate no
 +%option       with_ldap     no
++%option       with_goodchars no
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +55,9 @@ Source3:      imapd.conf
+@@ -50,6 +56,10 @@ Source3:      imapd.conf
  Source4:      fsl.imapd
  Patch0:       imapd.patch
  Patch1:       imapd.patch.group
 +Patch2:       imapd.annotate.patch
 +Patch3:	      kolab-ldap.patch
 +Patch4:	      imapd.group2.patch
++Patch5:       imapd-goodchars.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -62,6 +70,10 @@ PreReq:       sasl, db >= 4.1.24, openss
+@@ -62,6 +72,10 @@ PreReq:       sasl, db >= 4.2.52, openss
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
  %endif
@@ -52,7 +54,7 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -88,6 +100,7 @@ AutoReqProv:  no
+@@ -88,6 +102,7 @@ AutoReqProv:  no
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
@@ -60,7 +62,7 @@
  %endif
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -95,6 +108,13 @@ AutoReqProv:  no
+@@ -95,6 +110,16 @@ AutoReqProv:  no
      sleep 1
      touch configure
  %endif
@@ -69,6 +71,9 @@
 +%endif
 +%if "%{with_ldap}" == "yes"
 +    %patch -p0 -P 3
++%endif
++%if "%{with_goodchars}" == "yes"
++    %patch -p1 -P 5
 +%endif
 +
      %{l_shtool} subst \

--- imapd-goodchars.diff DELETED ---





More information about the commits mailing list