Update to 1.2.7

Check http://www.imapproxy.org/downloads/ChangeLog for changes since 1.0

12 files changed, 121 insertions, 117 deletions

diff --git a/mail/imapproxy/MESSAGE b/mail/imapproxy/MESSAGE
new file mode 100644
index 00000000000..2a8c57afa2d
--- /dev/null
+++ b/mail/imapproxy/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2010/03/22 08:10:36 manu Exp $
+
+imapproxy configuration file must be located at ${PREFIX}/etc/imapproxy.conf
+A sample file is provided in ${PREFIX}/share/examples/imapproxy
+
+===========================================================================
diff --git a/mail/imapproxy/Makefile b/mail/imapproxy/Makefile
index 8191f8d242a..622bd63aca4 100644
--- a/mail/imapproxy/Makefile
+++ b/mail/imapproxy/Makefile
@@ -1,26 +1,48 @@
-# $NetBSD: Makefile,v 1.10 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/22 08:10:36 manu Exp $
 #
 
-DISTNAME=	imapproxy-1.0
+DISTNAME=	up-imapproxy-1.2.7
+PKGNAME=	imapproxy-1.2.7
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	http://www.imapproxy.org/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://web.archive.org/web/20030816021412/http://www.kuleuven.net/projects/imapproxy/
-# http://www.imapproxy.org/ ?
+HOMEPAGE=	http://www.imapproxy.org/
 COMMENT=	Simple connection caching IMAP proxy daemon
 
+GNU_CONFIGURE=	YES
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=--exec_prefix=${DESTDIR}${PREFIX}
+BUILD_DEFS+=	VARBASE
+CFLAGS+=	-DDEFAULT_CONFIG_FILE=\"${PREFIX}/etc/imapproxy.conf\"
+CFLAGS+=	-DDEFAULT_PID_FILE=\"${VARBASE}/run/imapproxy.pid\"
+RCD_SCRIPTS=	imapproxy
+
+IMAPPROXY_USER?=	imapproxy
+IMAPPROXY_GROUP?=	imapproxy
+IMAPPROXY_CHROOT?=      ${VARBASE}/chroot/imapproxy
+IMAPPROXY_DOC?=      	share/doc/imapproxy
+IMAPPROXY_EXAMPLES?=   	share/examples/imapproxy
+
+PKG_GROUPS_VARS+=       IMAPPROXY_GROUP
+PKG_USERS_VARS+=        IMAPPROXY_USER
+PKG_GROUPS=             ${IMAPPROXY_GROUP}
+PKG_USERS=              ${IMAPPROXY_USER}:${IMAPPROXY_GROUP}
+PKG_GECOS.${IMAPPROXY_USER}=    IMAP Proxy pseudo-user
+PKG_HOME.${IMAPPROXY_USER}=     ${IMAPPROXY_CHROOT}
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS+=	sbin
+INSTALLATION_DIRS+=	${IMAPPROXY_DOC}
+INSTALLATION_DIRS+=	${IMAPPROXY_EXAMPLES}
+INSTALLATION_DIRS+=	${VARBASE}/chroot/imapproxy
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/imapproxy ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/imapproxy
-.for doc in BUGS COPYING ChangeLog FAQ INSTALL README THANKS TODO
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DESTDIR}${PREFIX}/share/doc/imapproxy
+post-install:
+.for doc in COPYING ChangeLog README README.known_issues README.ssl
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DESTDIR}${PREFIX}/${IMAPPROXY_DOC}
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/scripts/imapproxy.conf \
+			${DESTDIR}${PREFIX}/${IMAPPROXY_EXAMPLES}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imapproxy/PLIST b/mail/imapproxy/PLIST
index 3da29290ea3..9beacdf167c 100644
--- a/mail/imapproxy/PLIST
+++ b/mail/imapproxy/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:35 joerg Exp $
-bin/imapproxy
-share/doc/imapproxy/BUGS
+@comment $NetBSD: PLIST,v 1.3 2010/03/22 08:10:36 manu Exp $
+sbin/in.imapproxyd
+sbin/pimpstat
 share/doc/imapproxy/COPYING
 share/doc/imapproxy/ChangeLog
-share/doc/imapproxy/FAQ
-share/doc/imapproxy/INSTALL
 share/doc/imapproxy/README
-share/doc/imapproxy/THANKS
-share/doc/imapproxy/TODO
+share/doc/imapproxy/README.known_issues
+share/doc/imapproxy/README.ssl
+share/examples/imapproxy/imapproxy.conf
+share/examples/rc.d/imapproxy
diff --git a/mail/imapproxy/distinfo b/mail/imapproxy/distinfo
index 856a418d09c..1e157e7609e 100644
--- a/mail/imapproxy/distinfo
+++ b/mail/imapproxy/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/08/06 18:55:46 schwarz Exp $
+$NetBSD: distinfo,v 1.5 2010/03/22 08:10:36 manu Exp $
 
-SHA1 (imapproxy-1.0.tar.gz) = 844acba24633430d15cb9b3a586164aef5051583
-RMD160 (imapproxy-1.0.tar.gz) = 0e0ab29c476c55a09229a21c0cbdc05e8ef885cd
-Size (imapproxy-1.0.tar.gz) = 75668 bytes
-SHA1 (patch-aa) = 2148477ad9e5e3c50854cba3b042220d469c5ace
-SHA1 (patch-ab) = 745129d5bf2d5e950d6bfb9c8178f1f626b6f4e5
-SHA1 (patch-ac) = 8f005441354b5728988c6a1e8164a3d17c31f81b
-SHA1 (patch-ad) = 502840ba54d72ffacc0418e691b5e2fbd3668f50
+SHA1 (up-imapproxy-1.2.7.tar.gz) = 1e09730c19cbde3590093b5b4c4599ab69bfced7
+RMD160 (up-imapproxy-1.2.7.tar.gz) = 32eddc89fb35c49334eedc3135ede0fc1241e831
+Size (up-imapproxy-1.2.7.tar.gz) = 137843 bytes
+SHA1 (patch-ba) = 8f3d8adbac5a147cc143d7737d56a83401736a9d
+SHA1 (patch-bb) = 348768062f5f9e314223fb7d385f749646ed04be
+SHA1 (patch-bc) = c3daf40715af721a0c4ff1b1071a892c94b59ce5
diff --git a/mail/imapproxy/files/imapproxy.sh b/mail/imapproxy/files/imapproxy.sh
new file mode 100755
index 00000000000..816d77c7240
--- /dev/null
+++ b/mail/imapproxy/files/imapproxy.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $NetBSD: imapproxy.sh,v 1.1 2010/03/22 08:10:36 manu Exp $
+#
+
+# PROVIDE: imapproxy
+# REQUIRE: DAEMON
+# BEFORE:  LOGIN
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="imapproxy"
+rcvar=$name
+command="@PREFIX@/sbin/in.imapproxyd"
+required_files="@PKG_SYSCONFDIR@/imapproxy.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/imapproxy/patches/patch-aa b/mail/imapproxy/patches/patch-aa
deleted file mode 100644
index 36fd5cf2d94..00000000000
--- a/mail/imapproxy/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/09 03:17:20 rh Exp $
-
---- Makefile.in.orig	Wed Aug  7 17:11:00 2002
-+++ Makefile.in
-@@ -33,8 +33,7 @@ OBJS=network.o output.o database.o split
- TARGET=imapproxy
- 
- CC       = @CC@
--CFLAGS   = -O3 -I./include
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -I./include
- LIBS     = @LIBS@
- 
- all: $(OBJS)
diff --git a/mail/imapproxy/patches/patch-ab b/mail/imapproxy/patches/patch-ab
deleted file mode 100644
index ea456f96bc6..00000000000
--- a/mail/imapproxy/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/08 16:00:41 joerg Exp $
-
---- network.c.orig	2006-01-08 15:48:57.000000000 +0000
-+++ network.c
-@@ -19,10 +19,10 @@
-  */
- 
- 
-+#include <sys/types.h>
- #include <stdio.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
--#include <sys/types.h>
- #include <string.h>
- #include <netdb.h>
- #include <unistd.h>
diff --git a/mail/imapproxy/patches/patch-ac b/mail/imapproxy/patches/patch-ac
deleted file mode 100644
index eed62e00ddc..00000000000
--- a/mail/imapproxy/patches/patch-ac
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/08/06 18:55:46 schwarz Exp $
-
---- configfile.c.orig	2006-08-06 19:27:25.000000000 +0200
-+++ configfile.c	2006-08-06 20:41:51.000000000 +0200
-@@ -19,6 +19,7 @@
-  */
- 
- 
-+#include <sys/types.h>
- #include <stdio.h>
- #include <string.h>
- #include <strings.h>
-@@ -95,7 +96,7 @@
- 
- int check_and_set_log_facility(char *var,char *val)
- {
--#ifdef SOLARIS /* Solaris */
-+#if defined(SOLARIS) || defined(__sgi) /* Solaris or IRIX */
-     char *values[] = { 	"LOG_AUTH", "LOG_CRON", "LOG_DAEMON", "LOG_KERN", 
- 			"LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4", 
- 			"LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", "LOG_LPR", "LOG_MAIL", "LOG_NEWS", 
-@@ -113,7 +114,7 @@
- 			LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, 
- 			LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_NEWS, 
- 			LOG_SYSLOG, LOG_USER, LOG_UUCP };
--#endif /* Solaris */
-+#endif /* Solaris or IRIX */
- 
-     int i = 0;
-     
-@@ -482,7 +483,7 @@
- 
- char *log_facility_to_str(int x)
- {
--#ifdef SOLARIS /* Solaris */
-+#if defined(SOLARIS) || defined(__sgi) /* Solaris or IRIX */
-     char *values[] = { 	"LOG_AUTH", "LOG_CRON", "LOG_DAEMON", "LOG_KERN", 
- 			"LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4", 
- 			"LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", "LOG_LPR", "LOG_MAIL", "LOG_NEWS", 
-@@ -500,7 +501,7 @@
- 			LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, 
- 			LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_NEWS, 
- 			LOG_SYSLOG, LOG_USER, LOG_UUCP };
--#endif /* Solaris */
-+#endif /* Solaris or IRIX */
- 
-     int i = 0;
-     
diff --git a/mail/imapproxy/patches/patch-ad b/mail/imapproxy/patches/patch-ad
deleted file mode 100644
index 1cd9247ed86..00000000000
--- a/mail/imapproxy/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/08/06 18:55:46 schwarz Exp $
-
---- database.c.orig	2006-08-06 19:25:38.000000000 +0200
-+++ database.c	2006-08-06 20:42:21.000000000 +0200
-@@ -19,6 +19,7 @@
-  */
- 
- 
-+#include <sys/types.h>
- #include <string.h>
- #include <strings.h>
- #include <stdlib.h>
diff --git a/mail/imapproxy/patches/patch-ba b/mail/imapproxy/patches/patch-ba
new file mode 100644
index 00000000000..03d6dc02f88
--- /dev/null
+++ b/mail/imapproxy/patches/patch-ba
@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.1 2010/03/22 08:10:37 manu Exp $
+--- configure.in.orig	2010-03-21 22:20:57.000000000 +0100
++++ configure.in	2010-03-21 22:21:05.000000000 +0100
+@@ -120,9 +120,9 @@
+ dnl Check for curses
+ save_LIBS="$LIBS"
+ LIB_CURSES=""
+ AC_CHECK_LIB(curses, initscr, LIB_CURSES="-lcurses", [ curses_found=no ])
+-if test "$curses_found" == no; then
++if test "$curses_found" = no; then
+   AC_CHECK_LIB(ncurses, initscr, LIB_CURSES="-lncurses",
+  AC_ERROR([Can't compile without curses!!!]))
+ fi
+ 
diff --git a/mail/imapproxy/patches/patch-bb b/mail/imapproxy/patches/patch-bb
new file mode 100644
index 00000000000..d9b382a1190
--- /dev/null
+++ b/mail/imapproxy/patches/patch-bb
@@ -0,0 +1,14 @@
+$NetBSD: patch-bb,v 1.1 2010/03/22 08:10:37 manu Exp $
+--- configure.orig	2010-03-21 22:20:49.000000000 +0100
++++ configure	2010-03-21 22:21:13.000000000 +0100
+@@ -3418,9 +3418,9 @@
+ else
+    curses_found=no
+ fi
+ 
+-if test "$curses_found" == no; then
++if test "$curses_found" = no; then
+   echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
+ echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
diff --git a/mail/imapproxy/patches/patch-bc b/mail/imapproxy/patches/patch-bc
new file mode 100644
index 00000000000..c4f34690a64
--- /dev/null
+++ b/mail/imapproxy/patches/patch-bc
@@ -0,0 +1,20 @@
+$NetBSD: patch-bc,v 1.1 2010/03/22 08:10:37 manu Exp $
+--- include/imapproxy.h.orig	2010-03-22 07:40:36.000000000 +0100
++++ include/imapproxy.h	2010-03-22 08:46:47.000000000 +0100
+@@ -171,14 +171,14 @@
+  */
+ #define PGM                     "in.imapproxyd"
+ #define IMAP_UNTAGGED_OK        "* OK "           /* untagged OK response    */
+ #define IMAP_TAGGED_OK          "1 OK "           /* tagged OK response      */
+-#define BUFSIZE                 4096              /* default buffer size     */
++#define BUFSIZE                 8192              /* default buffer size     */
+ #define MAX_CONN_BACKLOG        5                 /* tcp connection backlog  */
+ #define MAXTAGLEN               256               /* max IMAP tag length     */
+ #define MAXMAILBOXNAME          512               /* max mailbox name length */
+ #define MAXUSERNAMELEN          64                /* max username length     */
+-#define MAXPASSWDLEN            64                /* max passwd length       */
++#define MAXPASSWDLEN            8192              /* max passwd length       */
+ #define POLL_TIMEOUT_MINUTES    30                /* Poll timeout in minutes */
+ #define POLL_TIMEOUT            (POLL_TIMEOUT_MINUTES * 60000)
+ #define SELECT_BUF_SIZE         BUFSIZE           /* max length of a SELECT  */
+ 						  /* string we can cache     */