From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 3 08:10:14 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3406B37B404 for ; Tue, 3 Jun 2003 08:10:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7169B43FB1 for ; Tue, 3 Jun 2003 08:10:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h53FACUp032071 for ; Tue, 3 Jun 2003 08:10:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h53FACdg032070; Tue, 3 Jun 2003 08:10:12 -0700 (PDT) Resent-Date: Tue, 3 Jun 2003 08:10:12 -0700 (PDT) Resent-Message-Id: <200306031510.h53FACdg032070@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sergei Kolobov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C1C537B404 for ; Tue, 3 Jun 2003 08:09:23 -0700 (PDT) Received: from outpost.globcon.net (outpost.globcon.net [62.141.88.161]) by mx1.FreeBSD.org (Postfix) with SMTP id C4F4843FBD for ; Tue, 3 Jun 2003 08:09:21 -0700 (PDT) (envelope-from sgk@outpost.globcon.net) Received: (qmail 84715 invoked by uid 911); 3 Jun 2003 15:08:37 -0000 Message-Id: <20030603150837.84714.qmail@outpost.globcon.net> Date: 3 Jun 2003 15:08:37 -0000 From: Sergei Kolobov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/52904: [MAINTAINER] Update mail/bincimap to 1.1.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 15:10:15 -0000 >Number: 52904 >Category: ports >Synopsis: [MAINTAINER] Update mail/bincimap to 1.1.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jun 03 08:10:12 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Sergei Kolobov >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Thu Jan 2 03:13:48 MSK >Description: - Update to 1.1.8 - Update MASTER_SITES to include official mirrors - Introduce two compile-time knobs: - WITH_XINETD Use xinetd instead of the default daemontools/ucspi-tcp - WITHOUT_OPENSSL Disable OpenSSL support (enabled by default) - Install all sample configs into ${PREFIX}/etc/bincimap instead of ${EXAMPLESDIR} Added file: - files/patch-Makefile.in Removed file: - files/patch-src::util::convert.h - no longer needed >How-To-Repeat: >Fix: --- bincimap-1.1.8.patch begins here --- diff -ruN --exclude=CVS bincimap/Makefile bincimap.new/Makefile --- bincimap/Makefile Sun Apr 27 05:34:29 2003 +++ bincimap.new/Makefile Tue Jun 3 18:52:03 2003 @@ -5,51 +5,76 @@ # $FreeBSD: ports/mail/bincimap/Makefile,v 1.1 2003/04/27 01:34:29 vanilla Exp $ # +# The following compile-time options are available: +# +# WITH_XINETD Use xinetd instead of the default daemontools/ucspi-tcp +# WITHOUT_OPENSSL Disable OpenSSL support (enabled by default) +# + PORTNAME= bincimap -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.8 CATEGORIES= mail -MASTER_SITES= http://www.bincimap.org/dl/tarballs/ +MASTER_SITES= http://www.bincimap.org/dl/tarballs/ \ + http://www.bincimap.andreas.hanssen.name/dl/tarballs/ \ + http://bincimap.argonsoft.de/www.bincimap.org/dl/tarballs/ MAINTAINER= sergei@kolobov.com COMMENT= Light-weight IMAP server for Maildir +.if defined(WITH_XINETD) +RUN_DEPENDS= xinetd:${PORTSDIR}/security/xinetd +PLIST_SUB+= XINETD="" DJB="@comment " +.else +RUN_DEPENDS= supervise:${PORTSDIR}/sysutils/daemontools \ + tcpserver:${PORTSDIR}/sysutils/ucspi-tcp +PLIST_SUB+= XINETD="@comment " DJB="" +.endif + USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GETOPT_LONG= yes - -CONFDIR?= ${PREFIX}/etc/${PORTNAME} -PLIST_SUB+= CONFDIR="${CONFDIR:S,^${PREFIX}/,,}" +CONFDIR= ${PREFIX}/etc/${PORTNAME} CONFIGURE_ARGS+= --sysconfdir=${CONFDIR} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .if defined(WITHOUT_OPENSSL) CONFIGURE_ARGS+= --without-ssl +PLIST_SUB+= SSL="@comment " .else CONFIGURE_ARGS+= --with-ssl -USE_OPENSSL= yes +USE_OPENSSL= yes +PLIST_SUB+= SSL="" .endif MAN1= bincimap-up.1 bincimapd.1 MAN5= bincimap.conf.5 -DOCS= AUTHORS ChangeLog README doc/bincimap* +DOCS= AUTHORS ChangeLog README doc/bincimap* \ + doc/manual/bincimap-manual.ps +EXAMPLES= contrib/README contrib/authenticators/bincimap-auth-teapop.sh post-install: @${MKDIR} ${CONFDIR} ${INSTALL_DATA} ${WRKSRC}/conf/bincimap.conf \ ${CONFDIR}/bincimap.conf.sample +.if defined(WITH_XINETD) + ${INSTALL_DATA} ${WRKSRC}/conf/xinetd-bincimap ${CONFDIR}/imap.sample +.if !defined(WITHOUT_OPENSSL) + ${INSTALL_DATA} ${WRKSRC}/conf/xinetd-bincimaps ${CONFDIR}/imaps.sample +.endif +.else + @${MKDIR} ${CONFDIR}/imap.sample + ${INSTALL_SCRIPT} ${WRKSRC}/service/run ${CONFDIR}/imap.sample + @${MKDIR} ${CONFDIR}/imap.sample/log + ${INSTALL_SCRIPT} ${WRKSRC}/service/log/run ${CONFDIR}/imap.sample/log +.if !defined(WITHOUT_OPENSSL) + @${MKDIR} ${CONFDIR}/imaps.sample + ${INSTALL_SCRIPT} ${WRKSRC}/service/run-ssl ${CONFDIR}/imaps.sample/run + @${MKDIR} ${CONFDIR}/imaps.sample/log + ${INSTALL_SCRIPT} ${WRKSRC}/service/log/run ${CONFDIR}/imaps.sample/log +.endif +.endif @${MKDIR} ${EXAMPLESDIR} -.for dir in xinetd supervise/imap/log supervise/imaps/log - @${MKDIR} ${EXAMPLESDIR}/${dir} -.endfor - @cd ${WRKSRC}/conf && \ - ${INSTALL_DATA} xinetd-bincimap ${EXAMPLESDIR}/xinetd/imap && \ - ${INSTALL_DATA} xinetd-bincimaps ${EXAMPLESDIR}/xinetd/imaps - @cd ${WRKSRC}/service && \ - ${INSTALL_DATA} run ${EXAMPLESDIR}/supervise/imap && \ - ${INSTALL_DATA} log/run ${EXAMPLESDIR}/supervise/imap/log && \ - ${INSTALL_DATA} run-ssl ${EXAMPLESDIR}/supervise/imaps/run && \ - ${INSTALL_DATA} log/run ${EXAMPLESDIR}/supervise/imaps/log + cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1 cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5 .if !defined(NOPORTDOCS) diff -ruN --exclude=CVS bincimap/distinfo bincimap.new/distinfo --- bincimap/distinfo Sun Apr 27 05:34:29 2003 +++ bincimap.new/distinfo Tue Jun 3 18:52:03 2003 @@ -1 +1 @@ -MD5 (bincimap-1.1.5.tar.bz2) = 0e38137c96b0143390df9992a7ded054 +MD5 (bincimap-1.1.8.tar.bz2) = 5182a966c19101594e93014d9e4e9b96 diff -ruN --exclude=CVS bincimap/files/patch-Makefile.in bincimap.new/files/patch-Makefile.in --- bincimap/files/patch-Makefile.in Thu Jan 1 03:00:00 1970 +++ bincimap.new/files/patch-Makefile.in Tue Jun 3 18:52:03 2003 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue May 20 21:45:16 2003 ++++ Makefile.in Wed May 21 03:03:40 2003 +@@ -96,7 +96,7 @@ + install_sh = @install_sh@ + + #-------------------------------------------------------------------------- +-SUBDIRS = conf contrib doc man service src ++SUBDIRS = man src + + #-------------------------------------------------------------------------- + EXTRA_DIST = bincimap.spec config.h COPYING.OpenSSL config.h.in diff -ruN --exclude=CVS bincimap/files/patch-src::util::convert.h bincimap.new/files/patch-src::util::convert.h --- bincimap/files/patch-src::util::convert.h Tue May 6 13:07:48 2003 +++ bincimap.new/files/patch-src::util::convert.h Thu Jan 1 03:00:00 1970 @@ -1,39 +0,0 @@ -replace switch statement in inline function with if/then/else; fixes compiler -failure on alpha: ``relocation truncated to fit: GPREL32 *UND*'' - -diff -u -r1.4 convert.h ---- src/util/convert.h 8 Apr 2003 16:46:28 -0000 1.4 -+++ src/util/convert.h 9 Apr 2003 08:02:54 -0000 -@@ -269,6 +269,7 @@ - { - std::string regex = "^"; - for (std::string::const_iterator i = s_in.begin(); i != s_in.end(); ++i) { -+ /* - switch (*i) { - case '.': - case '[': case ']': -@@ -291,6 +292,24 @@ - default: - regex += *i; - break; -+ } -+ */ -+ if (*i == '.' || *i == '[' || *i == ']' || *i == '{' || *i == '}' || -+ *i == '(' || *i == ')' || *i == '^' || *i == '$' || *i == '?' || -+ *i == '+' || *i == '\\') { -+ regex += "\\"; -+ regex += *i; -+ } -+ else if (*i == '*') { -+ regex += ".*?"; -+ } -+ else if (*i == '%') { -+ regex += "[^\\"; -+ regex += delimiter; -+ regex += "]*?"; -+ } -+ else { -+ regex += *i; - } - } - diff -ruN --exclude=CVS bincimap/pkg-plist bincimap.new/pkg-plist --- bincimap/pkg-plist Sun Apr 27 05:34:29 2003 +++ bincimap.new/pkg-plist Tue Jun 3 18:52:03 2003 @@ -1,26 +1,27 @@ bin/bincimapd bin/bincimap-up -%%CONFDIR%%/bincimap.conf.sample -@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true +etc/bincimap/bincimap.conf.sample +%%XINETD%%etc/bincimap/imap.sample +%%XINETD%%%%SSL%%etc/bincimap/imaps.sample +%%DJB%%etc/bincimap/imap.sample/run +%%DJB%%etc/bincimap/imap.sample/log/run +%%DJB%%@dirrm etc/bincimap/imap.sample/log +%%DJB%%@dirrm etc/bincimap/imap.sample +%%DJB%%%%SSL%%etc/bincimap/imaps.sample/run +%%DJB%%%%SSL%%etc/bincimap/imaps.sample/log/run +%%DJB%%%%SSL%%@dirrm etc/bincimap/imaps.sample/log +%%DJB%%%%SSL%%@dirrm etc/bincimap/imaps.sample +@unexec %D/etc/bincimap 2>/dev/null || true %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/bincimap-faq.html %%PORTDOCS%%%%DOCSDIR%%/bincimap-goals.html %%PORTDOCS%%%%DOCSDIR%%/bincimap-imapdir.html +%%PORTDOCS%%%%DOCSDIR%%/bincimap-manual.ps %%PORTDOCS%%%%DOCSDIR%%/bincimap-tech.html %%PORTDOCS%%%%DOCSDIR%%/bincimap.css %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%EXAMPLESDIR%%/xinetd/imap -%%EXAMPLESDIR%%/xinetd/imaps -@dirrm %%EXAMPLESDIR%%/xinetd -%%EXAMPLESDIR%%/supervise/imap/run -%%EXAMPLESDIR%%/supervise/imap/log/run -@dirrm %%EXAMPLESDIR%%/supervise/imap/log -@dirrm %%EXAMPLESDIR%%/supervise/imap -%%EXAMPLESDIR%%/supervise/imaps/run -%%EXAMPLESDIR%%/supervise/imaps/log/run -@dirrm %%EXAMPLESDIR%%/supervise/imaps/log -@dirrm %%EXAMPLESDIR%%/supervise/imaps -@dirrm %%EXAMPLESDIR%%/supervise +%%EXAMPLESDIR%%/README +%%EXAMPLESDIR%%/bincimap-auth-teapop.sh @dirrm %%EXAMPLESDIR%% --- bincimap-1.1.8.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: