From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 22 04:20:12 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 BC72D16A4CF for ; Sun, 22 Feb 2004 04:20:12 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4D3D43D2D for ; Sun, 22 Feb 2004 04:20:12 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i1MCKCbv043595 for ; Sun, 22 Feb 2004 04:20:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i1MCKChs043594; Sun, 22 Feb 2004 04:20:12 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 22 Feb 2004 04:20:12 -0800 (PST) Resent-Message-Id: <200402221220.i1MCKChs043594@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, Roman Bogorodskiy Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F41016A4CF for ; Sun, 22 Feb 2004 04:16:12 -0800 (PST) Received: from mx13.mail.ru (mx13.mail.ru [194.67.23.56]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D6F943D1D for ; Sun, 22 Feb 2004 04:16:11 -0800 (PST) (envelope-from bogorodskiy@inbox.ru) Received: from [194.186.150.179] (port=49439 helo=localhost) by mx13.mail.ru with esmtp id 1AusWl-000F3I-00 for FreeBSD-gnats-submit@freebsd.org; Sun, 22 Feb 2004 15:16:08 +0300 Message-Id: Date: Sun, 22 Feb 2004 15:16:08 +0300 From: Roman Bogorodskiy To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/63214: [maintainer-update] ftp/wzdftpd update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Roman Bogorodskiy List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2004 12:20:13 -0000 >Number: 63214 >Category: ports >Synopsis: [maintainer-update] ftp/wzdftpd update >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Feb 22 04:20:12 PST 2004 >Closed-Date: >Last-Modified: >Originator: Roman Bogorodskiy >Release: FreeBSD 5.2-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD lame.novel.ru 5.2-RELEASE-p2 FreeBSD 5.2-RELEASE-p2 #10: Fri Feb 6 20:05:26 MSK 2004 root@lame.novel.ru:/usr/obj/usr/src/sys/MIRRORBOX i386 >Description: wzdftpd 0.2.3 was released >How-To-Repeat: >Fix: diff -ruN wzdftpd.bak/Makefile wzdftpd/Makefile --- wzdftpd.bak/Makefile Wed Feb 4 08:20:15 2004 +++ wzdftpd/Makefile Sun Feb 22 14:51:45 2004 @@ -6,7 +6,7 @@ # PORTNAME= wzdftpd -PORTVERSION= 0.1 +PORTVERSION= 0.2.3 PORTREVISION= 1 CATEGORIES= ftp ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,12 +29,15 @@ .endif DOCS= AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst \ - src/CHANGELOG src/DOCS_XFERLOG_FORMAT src/KNOWN_BUGS src/TODO + ChangeLog src/DOCS_XFERLOG_FORMAT src/KNOWN_BUGS src/TODO -.if !defined(NOPORTDOCS) post-install: + ${MV} ${PREFIX}/etc/wzd.cfg ${PREFIX}/etc/wzd.cfg.sample + ${MV} ${DATADIR}/users ${DATADIR}/users.sample +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif + ${CAT} ${PKGMESSAGE} .include diff -ruN wzdftpd.bak/distinfo wzdftpd/distinfo --- wzdftpd.bak/distinfo Fri Oct 24 14:37:31 2003 +++ wzdftpd/distinfo Sun Feb 22 14:52:03 2004 @@ -1 +1,2 @@ -MD5 (wzdftpd-0.1.tar.gz) = ec3ada2fbea5384d5e92eb23bb102e88 +MD5 (wzdftpd-0.2.3.tar.gz) = f7c6a6fc7b80e17e2c8816895b3fa516 +SIZE (wzdftpd-0.2.3.tar.gz) = 566465 diff -ruN wzdftpd.bak/files/patch-aa wzdftpd/files/patch-aa --- wzdftpd.bak/files/patch-aa Tue Nov 4 15:57:30 2003 +++ wzdftpd/files/patch-aa Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Tue Nov 4 15:49:52 2003 -+++ src/Makefile.in Tue Nov 4 15:50:55 2003 -@@ -259,7 +259,7 @@ - - - #sysconfdir = ${prefix}/etc/wzdftpd --dist_sysconf_DATA = wzd.cfg wzd.pem -+dist_sysconf_DATA = wzd.cfg - - # them while "make clean", use CLEANFILES - CLEANFILES = wzd_init_lex.c wzd_cookie_lex. diff -ruN wzdftpd.bak/files/patch-ab wzdftpd/files/patch-ab --- wzdftpd.bak/files/patch-ab Tue Nov 4 15:58:03 2003 +++ wzdftpd/files/patch-ab Thu Jan 1 03:00:00 1970 @@ -1,12 +0,0 @@ ---- src/Makefile.am.orig Tue Nov 4 15:49:35 2003 -+++ src/Makefile.am Tue Nov 4 15:51:07 2003 -@@ -93,7 +93,7 @@ - - #sysconfdir = ${prefix}/etc/wzdftpd - --dist_sysconf_DATA = wzd.cfg wzd.pem -+dist_sysconf_DATA = wzd.cfg - - install-data-hook: - ${INSTALL_PROGRAM} -m 775 -d @datadir@/wzdftpd/logs || true - diff -ruN wzdftpd.bak/files/patch-configure wzdftpd/files/patch-configure --- wzdftpd.bak/files/patch-configure Thu Dec 18 19:31:09 2003 +++ wzdftpd/files/patch-configure Thu Jan 1 03:00:00 1970 @@ -1,20 +0,0 @@ ---- configure.orig Fri Oct 24 13:24:16 2003 -+++ configure Thu Dec 18 18:30:49 2003 -@@ -4359,7 +4359,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Double quotes because CPP needs to be expanded -- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/usr/bin/cpp" - do - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes -@@ -5376,7 +5376,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Double quotes because CXXCPP needs to be expanded -- for CXXCPP in "$CXX -E" "/lib/cpp" -+ for CXXCPP in "$CXX -E" "/usr/bin/cpp" - do - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes diff -ruN wzdftpd.bak/files/patch-src::Makefile.in wzdftpd/files/patch-src::Makefile.in --- wzdftpd.bak/files/patch-src::Makefile.in Thu Dec 18 19:31:09 2003 +++ wzdftpd/files/patch-src::Makefile.in Thu Jan 1 03:00:00 1970 @@ -1,35 +0,0 @@ ---- src/Makefile.in.orig Fri Oct 24 13:24:15 2003 -+++ src/Makefile.in Thu Dec 18 18:44:27 2003 -@@ -253,13 +253,12 @@ - dist_pkgdata_DATA = file_ginfo.txt file_help.txt file_swho.txt \ - file_user.txt file_group.txt file_rules.txt \ - file_users.txt file_who.txt file_groups.txt \ -- file_vfs.txt \ -- users -+ file_vfs.txt - - - - #sysconfdir = ${prefix}/etc/wzdftpd --dist_sysconf_DATA = wzd.cfg wzd.pem -+dist_sysconf_DATA = wzd.cfg - - # them while "make clean", use CLEANFILES - CLEANFILES = wzd_init_lex.c wzd_cookie_lex.c -@@ -504,6 +503,7 @@ - echo " $(dist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ - $(dist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ - done -+ $(dist_pkgdataDATA_INSTALL) $(srcdir)/users $(DESTDIR)$(pkgdatadir)/users.sample - - uninstall-dist_pkgdataDATA: - @$(NORMAL_UNINSTALL) -@@ -520,7 +520,7 @@ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \ -- $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \ -+ $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.sample; \ - done - - uninstall-dist_sysconfDATA: diff -ruN wzdftpd.bak/patch-Makefile.am wzdftpd/patch-Makefile.am --- wzdftpd.bak/patch-Makefile.am Thu Dec 18 19:31:09 2003 +++ wzdftpd/patch-Makefile.am Thu Jan 1 03:00:00 1970 @@ -1,12 +0,0 @@ ---- src/Makefile.am.orig Tue Nov 4 15:49:35 2003 -+++ src/Makefile.am Tue Nov 4 15:51:07 2003 -@@ -93,7 +93,7 @@ - - #sysconfdir = ${prefix}/etc/wzdftpd - --dist_sysconf_DATA = wzd.cfg wzd.pem -+dist_sysconf_DATA = wzd.cfg - - install-data-hook: - ${INSTALL_PROGRAM} -m 775 -d @datadir@/wzdftpd/logs || true - diff -ruN wzdftpd.bak/pkg-message wzdftpd/pkg-message --- wzdftpd.bak/pkg-message Wed Nov 19 14:57:04 2003 +++ wzdftpd/pkg-message Wed Feb 11 16:42:29 2004 @@ -1 +1,2 @@ -Sample file can be found at PREFIX/wzd.cfg.sample +Sample config file can be found at PREFIX/etc/wzd.cfg.sample +Sample users file can be found at PREFIX/share/wzdftpd/users.sample diff -ruN wzdftpd.bak/pkg-plist wzdftpd/pkg-plist --- wzdftpd.bak/pkg-plist Thu Dec 18 19:31:09 2003 +++ wzdftpd/pkg-plist Wed Feb 11 15:45:30 2004 @@ -12,7 +12,7 @@ %%PORTDOCS%%%%DOCSDIR%%/Permissions.ReadMeFirst %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TLS.ReadMeFirst -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/DOCS_XFERLOG_FORMAT %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS %%PORTDOCS%%%%DOCSDIR%%/TODO >Release-Note: >Audit-Trail: >Unformatted: