From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 2 10:30:05 2004 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 99FC116A4CE for ; Tue, 2 Mar 2004 10:30:05 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 916FF43D45 for ; Tue, 2 Mar 2004 10:30:05 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i22IU5bv014222 for ; Tue, 2 Mar 2004 10:30:05 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i22IU506014216; Tue, 2 Mar 2004 10:30:05 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 2 Mar 2004 10:30:05 -0800 (PST) Resent-Message-Id: <200403021830.i22IU506014216@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, Nick Leuta Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A4CD16A4CE for ; Tue, 2 Mar 2004 10:25:39 -0800 (PST) Received: from falcon.lipetsk.ru (falcon.lipetsk.ru [195.34.224.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 010A643D1D for ; Tue, 2 Mar 2004 10:25:37 -0800 (PST) (envelope-from skynick@stu.lipetsk.ru) Received: from lstu by falcon.lipetsk.ru with UUCP id ; Tue, 2 Mar 2004 21:25:10 +0300 Received: from chuck2.lstu (chuck2.lstu [192.168.15.7])i22IC8Cb077665 for ; Tue, 2 Mar 2004 21:12:09 +0300 (MSK) (envelope-from skynick@chuck2.lstu) Received: by chuck2.lstu (Postfix, from userid 1000) id 9CAA749A67; Tue, 2 Mar 2004 21:14:20 +0300 (MSK) Message-Id: <20040302181420.9CAA749A67@chuck2.lstu> Date: Tue, 2 Mar 2004 21:14:20 +0300 (MSK) From: Nick Leuta To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/63650: [maintainer update] ftp/bsdftpd-ssl from 1.0.0 to 1.0.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Nick Leuta List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2004 18:30:05 -0000 >Number: 63650 >Category: ports >Synopsis: [maintainer update] ftp/bsdftpd-ssl from 1.0.0 to 1.0.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 02 10:30:04 PST 2004 >Closed-Date: >Last-Modified: >Originator: Nick Leuta >Release: FreeBSD 4.8-RC i386 >Organization: Lipetsk State Technical University >Environment: System: FreeBSD chuck2.stu.lipetsk.ru 4.8-RC FreeBSD 4.8-RC #0: Sat Mar 15 19:02:36 MSK 2003 root@chuck2.stu.lipetsk.ru:/usr/src/sys/compile/CHUCK2 i386 >Description: It's an update to the new (1.0.1) version of the software. ChangeLog is available at http://bsdftpd-ssl.sc.ru/events.html >How-To-Repeat: >Fix: diff -urN bsdftpd-ssl.ori/Makefile bsdftpd-ssl/Makefile --- bsdftpd-ssl.ori/Makefile Tue Feb 10 00:54:15 2004 +++ bsdftpd-ssl/Makefile Mon Mar 1 02:20:20 2004 @@ -6,8 +6,8 @@ # PORTNAME= bsdftpd-ssl -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 +PORTREVISION= 0 CATEGORIES= ftp MASTER_SITES= http://bsdftpd-ssl.sc.ru/files/bsdftpd-ssl/archive/1.0/src/ DISTNAME= bsdftpd-ssl-${PORTVERSION} @@ -26,10 +26,11 @@ # Server part .if !defined(CLIENT_ONLY) COMMENT= Secure FTP server with the TLS/SSL support -MAN5= ftpchroot.5 +MAN5= ftpchroot.5 xferlog.5 MAN8= ftpd.8 MLINKS= ftpd.8 ftpd-ssl.8 -PKGMESSAGE= ${FILESDIR}/pkg-message.server +PKGMESSAGE= ${WRKDIR}/pkg-message +SED_ARG= 's|%%PREFIX%%|${PREFIX}|g; s|%%DOCSDIR%%|${DOCSDIR}|g' .endif MANCOMPRESSED= yes @@ -56,6 +57,8 @@ # Server part .if !defined(CLIENT_ONLY) (cd ${WRKSRC}/ftpd && make) || exit + @${SED} ${SED_ARG} ${FILESDIR}/pkg-message.server > \ + ${WRKDIR}/pkg-message .endif do-install: @@ -66,6 +69,7 @@ .if !defined(CLIENT_ONLY) ${INSTALL_PROGRAM} ${WRKSRC}/ftpd/ftpd ${PREFIX}/libexec/ftpd ${INSTALL_MAN} ${WRKSRC}/ftpd/ftpchroot.5.gz ${MANDIR}5/ftpchroot.5.gz + ${INSTALL_MAN} ${WRKSRC}/ftpd/xferlog.5.gz ${MANDIR}5/xferlog.5.gz ${INSTALL_MAN} ${WRKSRC}/ftpd/ftpd.8.gz ${MANDIR}8/ftpd.8.gz .endif @@ -94,6 +98,7 @@ ${INSTALL_SCRIPT} -p ${WRKSRC}/cert/xCA.sh ${DOCDIR}/cert/xCA.sh .endif .if !defined(CLIENT_ONLY) + @${INSTALL_SCRIPT} ${FILESDIR}/bsdftpd-ssl.sh ${PREFIX}/etc/rc.d/bsdftpd-ssl.sh.sample @${ECHO_CMD} "*******************************************************************************" @${CAT} ${PKGMESSAGE} @${ECHO_CMD} "*******************************************************************************" diff -urN bsdftpd-ssl.ori/distinfo bsdftpd-ssl/distinfo --- bsdftpd-ssl.ori/distinfo Tue Feb 10 00:54:15 2004 +++ bsdftpd-ssl/distinfo Mon Mar 1 01:03:44 2004 @@ -1 +1 @@ -MD5 (bsdftpd-ssl-1.0.0.tar.gz) = 745befccb117d08aa0e37ea592dfb48c +MD5 (bsdftpd-ssl-1.0.1.tar.gz) = fe77f5a8631c01aa85f969355fba3b69 diff -urN bsdftpd-ssl.ori/files/bsdftpd-ssl.sh bsdftpd-ssl/files/bsdftpd-ssl.sh --- bsdftpd-ssl.ori/files/bsdftpd-ssl.sh Thu Jan 1 03:00:00 1970 +++ bsdftpd-ssl/files/bsdftpd-ssl.sh Mon Mar 1 02:19:21 2004 @@ -0,0 +1,30 @@ +#!/bin/sh + +if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then + echo "$0: Cannot determine the PREFIX" >&2 + exit 1 +fi + +case "$1" in +start) + if [ -x ${PREFIX}/libexec/ftpd ]; then + ${PREFIX}/libexec/ftpd -D -l -p /var/run/ftpd.pid > /dev/null + echo -n ' BSDftpd-ssl' + fi + ;; +stop) + if [ -r /var/run/ftpd.pid ]; then + kill -TERM `cat /var/run/ftpd.pid` + rm -f /var/run/ftpd.pid + echo -n ' BSDftpd-ssl' + fi + ;; +*) + echo "" + echo "Usage: `basename $0` { start | stop }" + echo "" + exit 1 + ;; +esac + +exit 0 diff -urN bsdftpd-ssl.ori/files/patch-aa bsdftpd-ssl/files/patch-aa --- bsdftpd-ssl.ori/files/patch-aa Mon Jan 12 02:03:43 2004 +++ bsdftpd-ssl/files/patch-aa Thu Jan 1 03:00:00 1970 @@ -1,40 +0,0 @@ ---- ftpd/Makefile.FreeBSD.ORI Wed Oct 8 00:59:49 2003 -+++ ftpd/Makefile.FreeBSD Mon Jan 12 00:33:53 2004 -@@ -44,7 +44,7 @@ - CFLAGS+=-Wall - ## Feature flags - CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING --CFLAGS+=-DUSE_SENDFILE -+#CFLAGS+=-DUSE_SENDFILE - #CFLAGS+=-DINET6 - - YFLAGS= ---- ftpd/ftpd.c.ORI Mon Nov 10 11:42:45 2003 -+++ ftpd/ftpd.c Mon Jan 12 00:36:04 2004 -@@ -2810,6 +2810,17 @@ - goto oldway; - } else - #endif /* USE_SSL */ -+/* workaround for the problem described in -+ * http://bsdftpd-ssl.sc.ru/news/bfa_20040112.txt */ -+#if __FreeBSD__ >= 5 -+# if __FreeBSD_version >= 502000 -+# define USE_SENDFILE = 1 -+# endif -+#else -+# if __FreeBSD_version > 490000 -+# define USE_SENDFILE = 1 -+# endif -+#endif /* __FreeBSD__ */ - #ifdef USE_SENDFILE - while (err != -1 && filesize > 0) { - #ifdef LINUX /* Linux port */ -@@ -2834,7 +2845,7 @@ - - if (err == -1) { - #ifndef LINUX /* BSD source */ -- if (errno == EAGAIN) { -+ if (errno == EAGAIN || errno == EINTR) { - err = 0; - continue; - } diff -urN bsdftpd-ssl.ori/files/pkg-message.server bsdftpd-ssl/files/pkg-message.server --- bsdftpd-ssl.ori/files/pkg-message.server Sun Apr 6 19:06:19 2003 +++ bsdftpd-ssl/files/pkg-message.server Mon Mar 1 02:05:04 2004 @@ -1,2 +1,14 @@ +============================================================================= You will also need to read "Configuration" and "Supplement information" parts -of INSTALL file from package documentation for subsequent configuration issues. +of %%DOCSDIR%%/INSTALL file from the package documentation +for the subsequent configuration steps: + 1. Create the server certificate + 2. Edit PAM configuration + 3. Start the FTP server + +If you want to run the FTP server in the daemon mode, you can copy the sample +start-up script %%PREFIX%%/etc/rc.d/bsdftpd-ssl.sh.sample to +%%PREFIX%%/etc/rc.d/bsdftpd-ssl.sh. + +Please note: the manual page for the FTP server is available as ftpd-ssl(8). +============================================================================= diff -urN bsdftpd-ssl.ori/pkg-plist bsdftpd-ssl/pkg-plist --- bsdftpd-ssl.ori/pkg-plist Tue Feb 10 00:54:15 2004 +++ bsdftpd-ssl/pkg-plist Mon Mar 1 01:32:07 2004 @@ -1,4 +1,5 @@ bin/ftps +etc/rc.d/bsdftpd-ssl.sh.sample libexec/ftpd %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/README >Release-Note: >Audit-Trail: >Unformatted: