From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 10 05:30:03 2005 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 14AE116A4CE for ; Thu, 10 Mar 2005 05:30:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71B1943D2D for ; Thu, 10 Mar 2005 05:30:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2A5U2ZM054372 for ; Thu, 10 Mar 2005 05:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2A5U23a054371; Thu, 10 Mar 2005 05:30:02 GMT (envelope-from gnats) Resent-Date: Thu, 10 Mar 2005 05:30:02 GMT Resent-Message-Id: <200503100530.j2A5U23a054371@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, Boris Kovalenko Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7B3116A4CE for ; Thu, 10 Mar 2005 05:27:05 +0000 (GMT) Received: from mail.ntmk.ru (mail.ntmk.ru [217.114.241.6]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF20443D3F for ; Thu, 10 Mar 2005 05:27:03 +0000 (GMT) (envelope-from boris@ntmk.ru) Received: from boris.nikom.ru ([10.1.16.195]) by mail.ntmk.ru with esmtp (Exim 4.44) id 1D9GCM-0000XC-AJ; Thu, 10 Mar 2005 10:27:02 +0500 Received: from root by boris.nikom.ru with local (Exim 4.50 (FreeBSD)) id 1D9GCM-0002jP-85; Thu, 10 Mar 2005 10:27:02 +0500 Message-Id: Date: Thu, 10 Mar 2005 10:27:02 +0500 From: Boris Kovalenko To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: chris@shagged.org Subject: ports/78659: [NON MAINTAINER UPDATE] mail/tpop3d: [SUMMARIZE CHANGES] 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: Thu, 10 Mar 2005 05:30:03 -0000 >Number: 78659 >Category: ports >Synopsis: [NON MAINTAINER UPDATE] mail/tpop3d: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 10 05:30:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Boris Kovalenko >Release: FreeBSD 5.3-STABLE i386 >Organization: JSC "Tagnet" >Environment: System: FreeBSD boris.nikom.ru 5.3-STABLE FreeBSD 5.3-STABLE #3: Wed Feb 9 09:45:12 YEKT >Description: [DESCRIBE CHANGES] The only changes - use user-interactive OPTIONS, rcNG and USE_RC_SUBR for automaticaly script installation. Also, if nobody resists - I may take ownership of this port. Added file(s): - files/tpop3d.sh.in Removed file(s): - files/tpop3d.sh.sample Port maintainer (chris@shagged.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- tpop3d-1.5.3_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/Makefile /usr/ports/mail/tpop3d.new/Makefile --- /usr/ports/mail/tpop3d/Makefile Wed Dec 22 08:07:58 2004 +++ /usr/ports/mail/tpop3d.new/Makefile Thu Mar 10 09:47:47 2005 @@ -12,7 +12,7 @@ MASTER_SITES= http://www.ex-parrot.com/~chris/tpop3d/ MAINTAINER= chris@shagged.org -COMMENT= Virtual-domain capable POP3 server supporting MySQL auth +COMMENT= Virtual-domain capable POP3 server supporting MySQL,PgSQL etc auth USE_OPENSSL= yes USE_REINPLACE= yes @@ -23,37 +23,63 @@ --with-mailspool-directory=/var/mail CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +OPTIONS= MYSQL "Use MySQL authentication" off \ + PGSQL "Use PgSQL authentication" off \ + LDAP "Use LDAP authentication" off \ + PERLAUTH "Use Perl authentication" off \ + FLATAUTH "Enable /etc/passwd-style authentication" off \ + OTHERAUTH "Enable external authentication modules" off \ + MAILDIR "Compile Maildir support" on + # MySQL authentication -.if !defined(WITHOUT_MYSQL) +.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL) USE_MYSQL= yes +DEFAULT_MYSQL_VER= 41 CONFIGURE_ARGS+= --enable-auth-mysql \ --with-mysql-lib-dir=${LOCALBASE}/lib/mysql \ --with-mysql-include-dir=${LOCALBASE}/include/mysql .endif -.if defined(WITH_LDAP) +.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL) +USE_PGSQL= yes +DEFAULT_PGSQL_VER= 80 +CONFIGURE_ARGS+= --enable-auth-pgsql \ + --with-pgsql-lib-dir=${LOCALBASE}/lib \ + --with-pgsql-include-dir=${LOCALBASE}/include +.endif + +.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP) LIB_DEPENDS+= ldap-2.2:${PORTSDIR}/net/openldap22-client CONFIGURE_ARGS+= --enable-auth-ldap --with-openldap-root=${LOCALBASE} .endif # Perl authentication -.if defined(WITH_PERLAUTH) +.if defined(WITH_PERLAUTH) && !defined(WITHOUT_PERLAUTH) USE_PERL5= yes CONFIGURE_ARGS+= --enable-auth-perl .endif +.if defined(WITH_FLATAUTH) && !defined(WITHOUT_FLATAUTH) +CONFIGURE_ARGS+= --enable-auth-flatfile +.endif + +.if defined(WITH_OTHERAUTH) && !defined(WITHOUT_OTHERAUTH) +CONFIGURE_ARGS+= --enable-auth-other +.endif + .if !defined(WITHOUT_MAILDIR) CONFIGURE_ARGS+= --enable-mbox-maildir .endif -SAMPLE_RCD= tpop3d.sh.sample -STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${SAMPLE_RCD} +USE_RC_SUBR= tpop3d.sh DEFAULT_CONFIG= ${PREFIX}/etc/tpop3d.conf.dist MAN5= tpop3d.conf.5 MAN8= tpop3d.8 -DOCS= CHANGES CREDITS FAQ HACKING INSTALL PORTABILITY \ +.if !defined(NOPORTDOCS) +PORTDOCS= CHANGES CREDITS FAQ HACKING INSTALL PORTABILITY \ README README.POP-before-SMTP README.auth_mysql TODO +.endif post-patch: @${REINPLACE_CMD} 's,^CFLAGS =, CFLAGS = \@CFLAGS\@,' \ @@ -63,17 +89,13 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/tpop3d.conf.dist ${DEFAULT_CONFIG} - @if [ ! -f ${STARTUP_SCRIPT} ]; then \ - ${INSTALL_SCRIPT} ${FILESDIR}/${SAMPLE_RCD} \ - ${STARTUP_SCRIPT} ; \ - fi @if [ ! -f ${PREFIX}/etc/tpop3d.conf ]; then \ ${INSTALL_SCRIPT} ${FILESDIR}/tpop3d.conf.dist \ ${PREFIX}/etc/tpop3d.conf ; \ fi .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif .include diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/files/tpop3d.sh.in /usr/ports/mail/tpop3d.new/files/tpop3d.sh.in --- /usr/ports/mail/tpop3d/files/tpop3d.sh.in Thu Jan 1 05:00:00 1970 +++ /usr/ports/mail/tpop3d.new/files/tpop3d.sh.in Wed Mar 9 14:52:13 2005 @@ -0,0 +1,41 @@ +#!/bin/sh +# + +# PROVIDE: tpop3d +# BEFORE: LOGIN +# KEYWORD: FreeBSD + +# +# Add the following line to /etc/rc.conf to enable tpop3d: +#tpop3d_enable="YES" +# +# You may also wish to use the following variables to fine-tune startup: +#tpop3d_flags="..." +# + +. %%RC_SUBR%% + +name="tpop3d" +rcvar=`set_rcvar` + + +stop_postcmd=stop_postcmd + +stop_postcmd() +{ + rm -f $pidfile +} + +# set defaults + +tpop3d_enable=${tpop3d_enable:-"NO"} +tpop3d_flags=${tpop3d_flags:-""} +load_rc_config $name + +command=%%PREFIX%%/sbin/tpop3d +required_files=%%PREFIX%%/tpop3d.conf +pidfile=/var/run/tpop3d.pid + +tpop3d_flags="${tpop3d_flags} -f ${required_files} -p ${pidfile}" + +run_rc_command "$1" diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/files/tpop3d.sh.sample /usr/ports/mail/tpop3d.new/files/tpop3d.sh.sample --- /usr/ports/mail/tpop3d/files/tpop3d.sh.sample Fri Aug 31 11:43:57 2001 +++ /usr/ports/mail/tpop3d.new/files/tpop3d.sh.sample Thu Jan 1 05:00:00 1970 @@ -1,45 +0,0 @@ -#!/bin/sh -# -# tpop3d: -# Init script for starting/stopping tpop3d. -# -# Copyright (c) 2001 Chris Lightfoot. All rights reserved. -# Portability enhanced by Chris Elsworth, July 2001 -# -# $FreeBSD: ports/mail/tpop3d/files/tpop3d.sh.sample,v 1.1 2001/08/31 05:43:57 petef Exp $ -# - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -DAEMON=$PREFIX/sbin/tpop3d - -[ -f $DAEMON ] || exit 0 - -# See how we were called. -case "$1" in - start) - # Start daemons. - $DAEMON -f $PREFIX/etc/tpop3d.conf -p /var/run/tpop3d.pid \ - && echo -n " tpop3d" - ;; - stop) - # Stop daemons. - [ -r /var/run/tpop3d.pid ] && kill `cat /var/run/tpop3d.pid` \ - && echo -n " tpop3d" - ;; - restart) - $0 stop - $0 start - ;; - reload) - [ -r /var/run/tpop3d.pid ] && kill -HUP `cat /var/run/tpop3d.pid` - ;; - *) - echo "Usage: `basename $0` {start|stop|restart|reload}" - exit 1 -esac - -exit 0 diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/pkg-plist /usr/ports/mail/tpop3d.new/pkg-plist --- /usr/ports/mail/tpop3d/pkg-plist Mon Sep 13 03:33:03 2004 +++ /usr/ports/mail/tpop3d.new/pkg-plist Thu Mar 10 09:53:39 2005 @@ -1,17 +1,5 @@ @comment $FreeBSD: ports/mail/tpop3d/pkg-plist,v 1.2 2003/12/04 13:16:47 sergei Exp $ sbin/tpop3d -etc/rc.d/tpop3d.sh.sample @unexec if cmp -s %D/etc/tpop3d.conf.dist %D/etc/tpop3d.conf; then rm -f %D/etc/tpop3d.conf; fi etc/tpop3d.conf.dist @exec if [ ! -f %D/etc/tpop3d.conf ]; then cp %D/etc/%f %D/etc/tpop3d.conf; fi -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/HACKING -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/PORTABILITY -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.POP-before-SMTP -%%PORTDOCS%%%%DOCSDIR%%/README.auth_mysql -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%DOCSDIR%% --- tpop3d-1.5.3_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: