head	1.5;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE:1.3.0.2;
locks; strict;
comment	@# @;


1.5
date	2008.03.13.18.21.12;	author rse;	state Exp;
branches;
next	1.4;
commitid	2M1AOZMNzUtPEZUs;

1.4
date	2007.05.03.10.15.31;	author cs;	state Exp;
branches;
next	1.3;
commitid	ucGYxZyKl9EY5tgs;

1.3
date	2006.10.24.09.21.18;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	mtntQYWZyum1WURr;

1.2
date	2006.10.07.09.52.42;	author rse;	state dead;
branches;
next	1.1;
commitid	xS1zz0qYmFvFEJPr;

1.1
date	2006.10.07.09.30.09;	author rse;	state Exp;
branches;
next	;
commitid	V5IfqzfJDwIVwJPr;

1.3.2.1
date	2006.10.24.09.21.18;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	ed4C3G2Qpf0CWURr;

1.3.2.2
date	2006.10.24.09.23.02;	author rse;	state Exp;
branches;
next	;
commitid	ed4C3G2Qpf0CWURr;


desc
@@


1.5
log
@upgrading package: imap 2006k -> 2007a
@
text
@Index: Makefile
--- Makefile.orig	2007-12-20 23:11:10 +0100
+++ Makefile	2008-03-13 19:12:09 +0100
@@@@ -326,7 +326,6 @@@@
 bsf:	an
 	$(TOUCH) ip6
 	$(BUILD) BUILDTYPE=$@@ IP=$(IP6) \
-	PASSWDTYPE=pam \
 	SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/etc/ssl/certs SSLKEYS=/etc/ssl/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMLDFLAGS=-lpam"
 
 # I assume that Theo did the right thing for IPv6.  OpenBSD does not have PAM.
@


1.4
log
@upgrading package: imap 2006g -> 2006h
@
text
@d2 3
a4 3
--- Makefile.orig	2007-04-19 00:08:43 +0200
+++ Makefile	2007-05-03 12:11:52 +0200
@@@@ -324,7 +324,6 @@@@
d9 1
a9 1
 	SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/etc/ssl/certs SSLKEYS=/etc/ssl/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib LOCKPGM=/usr/sbin/mlock PAMLDFLAGS=-lpam"
d11 1
a11 1
 # I assume that Theo did the right thing.
@


1.3
log
@do not enable PAM automatically for BSD
@
text
@d2 6
a7 6
--- Makefile.orig	2006-09-15 20:10:32 +0200
+++ Makefile	2006-10-24 11:16:57 +0200
@@@@ -320,7 +320,6 @@@@
 
 bsf bso:	an
 	$(BUILD) BUILDTYPE=$@@ \
d11 1
a11 1
 cyg:	an
@


1.3.2.1
log
@file imap.patch was added on branch OPENPKG_2_STABLE on 2006-10-24 09:23:02 +0000
@
text
@d1 11
@


1.3.2.2
log
@MFC: do not enable PAM automatically for BSD
@
text
@a0 11
Index: Makefile
--- Makefile.orig	2006-09-15 20:10:32 +0200
+++ Makefile	2006-10-24 11:16:57 +0200
@@@@ -320,7 +320,6 @@@@
 
 bsf bso:	an
 	$(BUILD) BUILDTYPE=$@@ \
-	PASSWDTYPE=pam \
 	SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/etc/ssl/certs SSLKEYS=/etc/ssl/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib LOCKPGM=/usr/sbin/mlock PAMLDFLAGS=-lpam"
 
 cyg:	an
@


1.2
log
@the new version has fixes the alphasort issues, so remove our patch again to get it building under Solaris again
@
text
@d1 4
a4 10
Index: src/osdep/unix/os_soln.h
--- src/osdep/unix/os_soln.h.orig	2006-09-15 16:38:24.000000000 +0000
+++ src/osdep/unix/os_soln.h	2006-10-03 18:14:33.819454648 +0000
@@@@ -72,9 +72,6 @@@@
 long gethostid (void);
 typedef int (*select_t) (struct direct *name);
 typedef int (*compar_t) (const void *d1,const void *d2);
-int scandir (char *dirname,struct direct ***namelist,select_t select,
-	     compar_t compar);
-int alphasort (void *d1,void *d2);
d6 4
d11 1
a11 14
 #include "env_unix.h"
Index: src/osdep/unix/os_solo.h
--- src/osdep/unix/os_solo.h.orig	2006-09-15 16:38:42.000000000 +0000
+++ src/osdep/unix/os_solo.h	2006-10-03 18:15:13.928608943 +0000
@@@@ -69,9 +69,6 @@@@
 long gethostid (void);
 typedef int (*select_t) (struct direct *name);
 typedef int (*compar_t) (const void *d1,const void *d2);
-int scandir (char *dirname,struct direct ***namelist,select_t select,
-	     compar_t compar);
-int alphasort (void *d1,void *d2);
 
 
 #include "env_unix.h"
@


1.1
log
@upgrading package: imap 2006a -> 2006b
@
text
@@