upgrading package: imapd 2.1.16 -> 2.2.3

imapd/imapd.conf

@@ -21,4 +21,8 @@ autocreatequota:        10000
 reject8bit:             no
 quotawarn:              90
 timeout:                30
+defaultdomain:          @l_domainname@
+virtdomains:            on
+#virtdomains:            off
+#virtdomains:            userid
 

imapd/imapd.patch

@@ -1,6 +1,6 @@
 --- lib/cyrusdb_skiplist.c.orig	Tue Apr 23 20:25:48 2002
 +++ lib/cyrusdb_skiplist.c	Wed May  8 13:49:23 2002
-@@ -69,6 +69,11 @@
+@@ -71,6 +71,11 @@
  
  #define PROB (0.5)
  
@@ -14,7 +14,7 @@
   * disk format; all numbers in network byte order
 --- et/com_err.c.dist	Tue Jun 17 08:38:32 2003
 +++ et/com_err.c	Tue Jun 17 08:38:46 2003
-@@ -48,7 +48,7 @@
+@@ -50,7 +50,7 @@
  #include <string.h>
  #include "mit-sipb-copyright.h"
  

imapd/imapd.patch.group

@@ -1,6 +1,6 @@
---- lib/auth_unix.c.orig	2003-05-13 17:33:26.000000000 +0200
-+++ lib/auth_unix.c	2003-10-08 10:29:55.000000000 +0200
-@@ -48,12 +48,133 @@
+--- lib/auth_unix.c.orig	Wed Oct 22 20:50:12 2003
++++ lib/auth_unix.c	Fri Jan 16 15:24:05 2004
+@@ -48,6 +48,7 @@
  #include <stdlib.h>
  #include <pwd.h>
  #include <grp.h>
@@ -8,7 +8,8 @@
  #include <ctype.h>
  #include <string.h>
  
- #include "auth.h"
+@@ -55,6 +56,126 @@
+ #include "libcyr_cfg.h"
  #include "xmalloc.h"
  
 +#ifdef __FreeBSD__
@@ -134,7 +135,7 @@
  const char *auth_method_desc = "unix";
  
  struct auth_state {
-@@ -143,6 +264,25 @@
+@@ -144,6 +265,25 @@
      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
  };
  
@@ -160,7 +161,7 @@
  /*
   * Convert 'identifier' into canonical form.
   * Returns a pointer to a static buffer containing the canonical form
-@@ -185,7 +325,7 @@
+@@ -179,7 +319,7 @@
       */
      
      if (!strncmp(retbuf, "group:", 6)) {
@@ -169,7 +170,7 @@
  	if (!grp) return 0;
  	strcpy(retbuf+6, grp->gr_name);
  	return retbuf;
-@@ -228,6 +368,7 @@
+@@ -224,6 +364,7 @@
      struct passwd *pwd;
      struct group *grp;
      char **mem;
@@ -177,10 +178,10 @@
  
      identifier = auth_canonifyid(identifier, 0);
      if (!identifier) return 0;
-@@ -241,20 +382,23 @@
-     newstate->ngroups = 0;
-     newstate->group = (char **) 0;
+@@ -240,20 +381,23 @@
  
+     pwd = getpwnam(identifier);
+ 	
 -    setgrent();
 -    while ((grp = getgrent())) {
 -	for (mem = grp->gr_mem; *mem; mem++) {

imapd/imapd.patch.vhost

@@ -1,35 +0,0 @@
-This little patch allows the Cyrus IMAP LMTP daemon to accept
-"<user>@<domain>" as the username instead of just "<user>" in order
-to allow one to have distinct mailboxes for "foo@domain1" and
-"foo@domain2". This is especially useful with MTAs like Postfix which
-nicely allow delivery to same usernames of different domains.
-
---- imap/lmtpengine.c	Wed Jun 25 05:34:01 2003
-+++ imap/lmtpengine.c	Fri Jul  4 11:42:39 2003
-@@ -536,7 +536,7 @@
- 	if (!*p++) return 0;
-     }
-     else {
--	while (*p && *p != '@' && *p != '>') {
-+	while (*p && /* *p != '@' && */ *p != '>') {
- 	    if (*p == '\\') {
- 		if (!*++p) return 0;
- 	    }
-@@ -557,7 +557,7 @@
- 	    if (*p++ != ']') return 0;
- 	}
- 	else {
--	    while (isalnum((int) *p) || *p == '.' || *p == '-') p++;
-+	    while (isalnum((int) *p) || *p == '.' || *p == '-' || *p == '_') p++;
- 	}
-     }
-     
-@@ -1160,7 +1160,7 @@
- 	}
- 
- 	/* Now finish the remainder of the localpart */
--	while (*addr != '@' && *addr != '>') {
-+	while (/* *addr != '@' && */ *addr != '>') {
- 	    if (*addr == '\\') addr++;
- 	    *dest++ = *addr++;
- 	}

imapd/imapd.spec

@@ -32,12 +32,11 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      BSD
-Version:      2.1.16
-Release:      20040126
+Version:      2.2.3
+Release:      20040129
 
 #   package options
 %option       with_fsl    yes
-%option       with_vhost  no
 %option       with_group  no
 
 #   list of sources
@@ -47,8 +46,7 @@ Source2:      cyrus.conf
 Source3:      imapd.conf
 Source4:      fsl.imapd
 Patch0:       imapd.patch
-Patch1:       imapd.patch.vhost
-Patch2:       imapd.patch.group
+Patch1:       imapd.patch.group
 
 #   build information
 Prefix:       %{l_prefix}
@@ -75,11 +73,8 @@ AutoReqProv:  no
 %prep
     %setup -q -n cyrus-imapd-%{version}
     %patch0 -p0
-%if "%{with_vhost}" == "yes"
-    %patch1 -p0
-%endif
 %if "%{with_group}" == "yes"
-    %patch2 -p0
+    %patch1 -p0
     %{l_shtool} subst \
         -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
         lib/auth_unix.c
@@ -140,6 +135,7 @@ AutoReqProv:  no
     ./configure \
         --cache-file=./cache.config \
         --prefix=%{l_prefix} \
+        --sysconfdir=%{l_prefix}/etc/imapd \
         --with-openssl=%{l_prefix} \
         --with-dbdir=%{l_prefix} \
         --with-sasl=%{l_prefix} \
@@ -176,14 +172,14 @@ AutoReqProv:  no
       %{l_make} PERL="$perl"
     ) || exit $?
     %{l_prefix}/bin/perl-openpkg -d perl/sieve/managesieve configure build install
-    %{l_prefix}/bin/perl-openpkg -d perl/sieve/acap        configure build install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
 
     #   install package
     %{l_make} %{l_mflags} install \
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
-        cyrus_prefix=$RPM_BUILD_ROOT%{l_prefix}
+        cyrus_prefix=$RPM_BUILD_ROOT%{l_prefix} \
+        service_path=$RPM_BUILD_ROOT%{l_prefix}/bin
 
     #   create additional directories
     %{l_shtool} mkdir -f -p -m 755 \
@@ -238,7 +234,7 @@ AutoReqProv:  no
 
     #   determine files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
-        %{l_files_std} `cat perl-openpkg-files` \
+        %{l_files_std} \
         '%not %dir %{l_prefix}/etc/fsl' \
         '%config %{l_prefix}/etc/fsl/fsl.imapd' \
         '%config %{l_prefix}/etc/imapd/imapd.conf' \