From owner-freebsd-ports Sun Nov 10 14:30:11 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9142337B404 for ; Sun, 10 Nov 2002 14:30:04 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 074CB43E42 for ; Sun, 10 Nov 2002 14:30:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gAAMU2x3060619 for ; Sun, 10 Nov 2002 14:30:02 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gAAMU2nU060618; Sun, 10 Nov 2002 14:30:02 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9687A37B401; Sun, 10 Nov 2002 14:22:17 -0800 (PST) Received: from mail.dt.e-technik.uni-dortmund.de (krusty.dt.E-Technik.Uni-Dortmund.DE [129.217.163.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 810A143E3B; Sun, 10 Nov 2002 14:22:16 -0800 (PST) (envelope-from matthias.andree@web.de) Received: from m2a2.yi.org (krusty.dt.e-technik.uni-dortmund.de [129.217.163.1]) by mail.dt.e-technik.uni-dortmund.de (Postfix) with ESMTP id 6CAD1A3831; Sun, 10 Nov 2002 23:22:14 +0100 (CET) Received: from libertas.emma.line.org (libertas.emma.line.org [192.168.0.2]) by merlin.emma.line.org (Postfix) with ESMTP id 4A9425BE3B; Sun, 10 Nov 2002 23:22:10 +0100 (CET) Received: from libertas.emma.line.org (localhost [127.0.0.1]) by libertas.emma.line.org (8.12.6/8.12.6) with ESMTP id gAAMMHlS014467; Sun, 10 Nov 2002 23:22:17 +0100 (CET) (envelope-from emma@libertas.emma.line.org) Received: (from emma@localhost) by libertas.emma.line.org (8.12.6/8.12.6/Submit) id gAAMMGKJ014466; Sun, 10 Nov 2002 23:22:16 +0100 (CET) Message-Id: <200211102222.gAAMMGKJ014466@libertas.emma.line.org> Date: Sun, 10 Nov 2002 23:22:16 +0100 (CET) From: Matthias Andree Reply-To: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/45199: update port: ftp/vsftpd -> 1.1.3 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 45199 >Category: ports >Synopsis: update port: ftp/vsftpd -> 1.1.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Nov 10 14:30:02 PST 2002 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD libertas.emma.line.org 4.7-STABLE FreeBSD 4.7-STABLE #3: Sun Nov 3 18:49:35 CET 2002 toor@libertas.emma.line.org:/usr/src/sys/compile/LIBERTAS i386 >Description: This PR updates the ftp/vsftpd port to 1.1.3. vsftpd now supports tcp_wrappers in standalone mode. The Makefile is changed to use REINPLACE_CMD for some edits and to avoid the "quiet" flag. The vsftpd documentation is defined unless NOPORTDOCS is set. >How-To-Repeat: >Fix: diff -Nur /usr/ports/ftp/vsftpd/Makefile /root/vsftpd/Makefile --- /usr/ports/ftp/vsftpd/Makefile Sun Nov 3 06:47:22 2002 +++ /root/vsftpd/Makefile Sun Nov 10 23:15:33 2002 @@ -6,13 +6,14 @@ # PORTNAME= vsftpd -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.3 CATEGORIES= ftp MASTER_SITES= ftp://vsftpd.beasts.org/users/cevans/ MAINTAINER= dinoex@FreeBSD.org USE_PERL5= yes +USE_REINPLACE= yes ALL_TARGET= vsftpd MAN5= vsftpd.conf.5 @@ -22,30 +23,44 @@ .include post-patch: - @${MV} ${WRKSRC}/defs.h ${WRKSRC}/defs.h.sed - ${SED} -e "s=/etc/vsftpd.conf=${PREFIX}/etc/vsftpd.conf=" \ - ${WRKSRC}/defs.h.sed > ${WRKSRC}/defs.h - @${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.sed - ${SED} -e "s/^CFLAGS =/CFLAGS +=/" \ - ${WRKSRC}/Makefile.sed > ${WRKSRC}/Makefile - @${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \ + ${REINPLACE_CMD} -e "s=/etc/vsftpd.conf=${PREFIX}/etc/vsftpd.conf=" \ + ${WRKSRC}/defs.h + ${REINPLACE_CMD} -e "s/^CFLAGS =/CFLAGS +=/" \ + ${WRKSRC}/Makefile + ${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \ ${WRKSRC}/vsftpd.conf + ${REINPLACE_CMD} -e 's/#undef VSF_BUILD_TCPWRAPPERS/#define VSF_BUILD_TCPWRAPPERS 1/' \ + ${WRKSRC}/builddefs.h do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/ - @${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist - @${INSTALL} -d ${PREFIX}/share/vsftpd/empty + ${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/ + ${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist + ${INSTALL} -d ${PREFIX}/share/vsftpd/empty @if [ ! -e ${PREFIX}/etc/vsftpd.conf ]; then \ ${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/ ; \ fi - @${MKDIR} ${PREFIX}/share/vsftpd/empty + ${MKDIR} ${PREFIX}/share/vsftpd/empty @for i in ${MAN8} ; do \ ${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man8/ ; \ done @for i in ${MAN5} ; do \ ${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man5/ ; \ done - @${PERL5} ${PKGINSTALL} - @${MKDIR} /var/ftp + ${PERL5} ${PKGINSTALL} + ${MKDIR} /var/ftp +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for i in AUDIT Changelog LICENSE README TODO \ + BENCHMARKS README.security TUNING \ + BUGS FAQ README.solaris SIZE \ + COPYING INSTALL REWARD SPEED + ${INSTALL_MAN} -m 644 ${WRKSRC}/${i} ${DOCSDIR} +.endfor +.for i in EXAMPLE SECURITY + ${MKDIR} ${DOCSDIR}/${i} + ${CP} -p -R -L ${WRKSRC}/${i}/./ ${DOCSDIR}/${i}/ + ${CHMOD} -R -L a+rX,go-w ${DOCSDIR}/${i}/ +.endfor +.endif .include diff -Nur /usr/ports/ftp/vsftpd/distinfo /root/vsftpd/distinfo --- /usr/ports/ftp/vsftpd/distinfo Mon Oct 28 21:40:04 2002 +++ /root/vsftpd/distinfo Sun Nov 10 22:12:19 2002 @@ -1 +1 @@ -MD5 (vsftpd-1.1.2.tar.gz) = cd52f4bdc4db706432cb9c92b83c6824 +MD5 (vsftpd-1.1.3.tar.gz) = 3f5f59be09a6f89e516a75ad0d1e3802 diff -Nur /usr/ports/ftp/vsftpd/pkg-plist /root/vsftpd/pkg-plist --- /usr/ports/ftp/vsftpd/pkg-plist Tue Dec 18 05:38:53 2001 +++ /root/vsftpd/pkg-plist Sun Nov 10 23:04:57 2002 @@ -7,3 +7,46 @@ @unexec rmdir /var/ftp 2>/dev/null || true @dirrm share/vsftpd/empty @dirrm share/vsftpd +%%PORTDOCS%%share/doc/vsftpd/AUDIT +%%PORTDOCS%%share/doc/vsftpd/BENCHMARKS +%%PORTDOCS%%share/doc/vsftpd/BUGS +%%PORTDOCS%%share/doc/vsftpd/COPYING +%%PORTDOCS%%share/doc/vsftpd/Changelog +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.conf +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd +%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/INTERNET_SITE +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/README +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf +%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/README +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/hosts.allow +%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/README +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS/README +%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/README +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/logins.txt +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.conf +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.pam +%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS +%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2/README +%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2 +%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE +%%PORTDOCS%%share/doc/vsftpd/FAQ +%%PORTDOCS%%share/doc/vsftpd/INSTALL +%%PORTDOCS%%share/doc/vsftpd/LICENSE +%%PORTDOCS%%share/doc/vsftpd/README +%%PORTDOCS%%share/doc/vsftpd/README.security +%%PORTDOCS%%share/doc/vsftpd/README.solaris +%%PORTDOCS%%share/doc/vsftpd/REWARD +%%PORTDOCS%%share/doc/vsftpd/SECURITY/DESIGN +%%PORTDOCS%%share/doc/vsftpd/SECURITY/IMPLEMENTATION +%%PORTDOCS%%share/doc/vsftpd/SECURITY/OVERVIEW +%%PORTDOCS%%share/doc/vsftpd/SECURITY/TRUST +%%PORTDOCS%%@dirrm share/doc/vsftpd/SECURITY +%%PORTDOCS%%share/doc/vsftpd/SIZE +%%PORTDOCS%%share/doc/vsftpd/SPEED +%%PORTDOCS%%share/doc/vsftpd/TODO +%%PORTDOCS%%share/doc/vsftpd/TUNING +%%PORTDOCS%%@dirrm share/doc/vsftpd >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message