OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 16-Jan-2004 21:15:34
Branch: HEAD Handle: 2004011620153102
Modified files:
openpkg-re/vcheck vc.imapd
openpkg-src/imapd imapd.conf imapd.patch imapd.patch.group
imapd.spec
openpkg-web news.txt
Log:
upgrading package: imapd 2.1.16 -> 2.2.3
Summary:
Revision Changes Path
1.16 +1 -1 openpkg-re/vcheck/vc.imapd
1.8 +4 -0 openpkg-src/imapd/imapd.conf
1.5 +2 -2 openpkg-src/imapd/imapd.patch
1.2 +11 -10 openpkg-src/imapd/imapd.patch.group
1.101 +7 -11 openpkg-src/imapd/imapd.spec
1.8111 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.imapd
============================================================================
$ cvs diff -u -r1.15 -r1.16 vc.imapd
--- openpkg-re/vcheck/vc.imapd 20 Nov 2003 19:08:03 -0000 1.15
+++ openpkg-re/vcheck/vc.imapd 16 Jan 2004 20:15:31 -0000 1.16
@@ -2,7 +2,7 @@
}
prog imapd = {
- version = 2.1.16
+ version = 2.2.3
url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
regex = cyrus-imapd-(\d+\.\d+\.\d+)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.conf
============================================================================
$ cvs diff -u -r1.7 -r1.8 imapd.conf
--- openpkg-src/imapd/imapd.conf 17 Apr 2003 14:48:13 -0000 1.7
+++ openpkg-src/imapd/imapd.conf 16 Jan 2004 20:15:33 -0000 1.8
@@ -21,4 +21,8 @@
reject8bit: no
quotawarn: 90
timeout: 30
+defaultdomain: @l_domainname@
+virtdomains: on
+#virtdomains: off
+#virtdomains: userid
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 imapd.patch
--- openpkg-src/imapd/imapd.patch 17 Jun 2003 06:58:54 -0000 1.4
+++ openpkg-src/imapd/imapd.patch 16 Jan 2004 20:15:33 -0000 1.5
@@ -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"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch.group
============================================================================
$ cvs diff -u -r1.1 -r1.2 imapd.patch.group
--- openpkg-src/imapd/imapd.patch.group 14 Oct 2003 20:34:43 -0000 1.1
+++ openpkg-src/imapd/imapd.patch.group 16 Jan 2004 20:15:33 -0000 1.2
@@ -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++) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.100 -r1.101 imapd.spec
--- openpkg-src/imapd/imapd.spec 27 Nov 2003 13:37:58 -0000 1.100
+++ openpkg-src/imapd/imapd.spec 16 Jan 2004 20:15:33 -0000 1.101
@@ -32,12 +32,11 @@
Distribution: OpenPKG [PLUS]
Group: Mail
License: BSD
-Version: 2.1.16
-Release: 20031127
+Version: 2.2.3
+Release: 20040116
# package options
%option with_fsl yes
-%option with_vhost no
%option with_group no
# list of sources
@@ -47,8 +46,7 @@
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 @@
%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 @@
./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 @@
%{l_make} PERL="$perl"
) || exit $?
%{l_prefix}/bin/perl-openpkg install -d perl/sieve/managesieve
- %{l_prefix}/bin/perl-openpkg install -d perl/sieve/acap
%{l_prefix}/bin/perl-openpkg epilog
# 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 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8110 -r1.8111 news.txt
--- openpkg-web/news.txt 16 Jan 2004 17:41:12 -0000 1.8110
+++ openpkg-web/news.txt 16 Jan 2004 20:15:31 -0000 1.8111
@@ -1,3 +1,4 @@
+16-Jan-2004: Upgraded package: P<imapd-2.2.3-20040116>
16-Jan-2004: Upgraded package: P<x11-20040116-20040116>
16-Jan-2004: Upgraded package: P<perl-db-20040116-20040116>
16-Jan-2004: Upgraded package: P<uuid-0.9.3-20040116>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
