From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 17 03:50:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2214D106566B for ; Sat, 17 May 2008 03:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0219A8FC15 for ; Sat, 17 May 2008 03:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m4H3o0CG025178 for ; Sat, 17 May 2008 03:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m4H3o0J4025177; Sat, 17 May 2008 03:50:00 GMT (envelope-from gnats) Resent-Date: Sat, 17 May 2008 03:50:00 GMT Resent-Message-Id: <200805170350.m4H3o0J4025177@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, Jui-Nan Lin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7724110656B3 for ; Sat, 17 May 2008 03:48:33 +0000 (UTC) (envelope-from jnlin@tamama.org) Received: from Florence.tamama.org (Florence.tamama.org [59.120.212.55]) by mx1.freebsd.org (Postfix) with ESMTP id E25978FC1E for ; Sat, 17 May 2008 03:48:32 +0000 (UTC) (envelope-from jnlin@tamama.org) Received: by Florence.tamama.org (Postfix, from userid 1000) id 31847A102F; Sat, 17 May 2008 11:48:30 +0800 (CST) Message-Id: <20080517034830.31847A102F@Florence.tamama.org> Date: Sat, 17 May 2008 11:48:30 +0800 (CST) From: Jui-Nan Lin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/123750: [MAINTAINER] ftp/smbftpd: update to 2.0r3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2008 03:50:01 -0000 >Number: 123750 >Category: ports >Synopsis: [MAINTAINER] ftp/smbftpd: update to 2.0r3 >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: Sat May 17 03:50:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Jui-Nan Lin >Release: FreeBSD 7.0-RELEASE-p1 amd64 >Organization: >Environment: System: FreeBSD Florence.tamama.org 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #5: Mon May 5 00:36:32 CST >Description: Please close pr/123470 and commit this one, thanks! - Update to 2.0r3 - USE_RC_SUBR - Added OPTIONS: MySQL, PGSQL, SSL, ICONV - Added sourceforge as master sites Added file(s): - files/patch-Makefile - files/smbftpd.sh.in Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- smbftpd-2.0r3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ftp/smbftpd/Makefile /home/users/jnlin/ports/smbftpd/Makefile --- /usr/ports/ftp/smbftpd/Makefile 2007-12-13 11:11:02.000000000 +0800 +++ /home/users/jnlin/ports/smbftpd/Makefile 2008-05-17 11:47:02.591784507 +0800 @@ -6,17 +6,47 @@ # PORTNAME= smbftpd -PORTVERSION= 0.97 +PORTVERSION= 2.0r3 CATEGORIES= ftp -MASTER_SITES= http://www.twbsd.org/download/download.php?file=smbftpd/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ + http://www.twbsd.org/download/download.php?file=smbftpd/ +MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= smbftpd-2.0rc3 MAINTAINER= jnlin@csie.nctu.edu.tw COMMENT= FTP daemon using Samba-like share management mechanism +OPTIONS= MYSQL "Users database is a MySQL database" off \ + PGSQL "Users database is a PostgreSQL database" off \ + SSL "Enable SSL/TLS support" off \ + ICONV "Enable codepage to unicode conversion for UTF-8 FTP" off + HAS_CONFIGURE= yes -USE_OPENSSL= yes +MAKE_ENV= OSTYPE=FreeBSD +CONFIGURE_ARGS= "--prefix=${PREFIX}" + +.include + USE_PERL5= yes +USE_RC_SUBR= smbftpd.sh -MAKE_ENV= OSTYPE=FreeBSD +.if defined(WITH_MYSQL) +USE_MYSQL= yes +CONFIGURE_ARGS+= "--with-mysql" +.endif + +.if defined(WITH_PGSQL) +USE_PGSQL= yes +CONFIGURE_ARGS+= "--with-pgsql" +.endif + +.if defined(WITH_ICONV) +USE_ICONV= yes +CONFIGURE_ARGS+= "--with-iconv" +.endif + +.if defined(WITH_SSL) +CONFIGURE_ARGS+= "--with-ssl" +.endif -.include +.include diff -ruN --exclude=CVS /usr/ports/ftp/smbftpd/distinfo /home/users/jnlin/ports/smbftpd/distinfo --- /usr/ports/ftp/smbftpd/distinfo 2007-12-13 11:11:02.000000000 +0800 +++ /home/users/jnlin/ports/smbftpd/distinfo 2008-05-17 03:33:52.898786266 +0800 @@ -1,3 +1,3 @@ -MD5 (smbftpd-0.97.tar.gz) = e4c7e4f3b432d79cfd5b3cfafdbff069 -SHA256 (smbftpd-0.97.tar.gz) = 6e4508f885a08e07c744f5861cccdc6d1813e079ce9d6fa9f3eae55cf5635819 -SIZE (smbftpd-0.97.tar.gz) = 123190 +MD5 (smbftpd-2.0rc3.tar.gz) = 5928d4ab77f6cd46bfe5a19d7115201d +SHA256 (smbftpd-2.0rc3.tar.gz) = c64f9de1000c83380cc892aca7b65afd04b17a89e890ddef3ccc79e9d9b9ef8f +SIZE (smbftpd-2.0rc3.tar.gz) = 138172 diff -ruN --exclude=CVS /usr/ports/ftp/smbftpd/files/patch-Makefile /home/users/jnlin/ports/smbftpd/files/patch-Makefile --- /usr/ports/ftp/smbftpd/files/patch-Makefile 1970-01-01 08:00:00.000000000 +0800 +++ /home/users/jnlin/ports/smbftpd/files/patch-Makefile 2008-05-17 11:34:50.697562314 +0800 @@ -0,0 +1,18 @@ +--- Makefile.orig 2008-05-17 11:33:53.160728999 +0800 ++++ Makefile 2008-05-17 11:34:04.012697489 +0800 +@@ -126,15 +126,3 @@ + install -c -m 400 cert/conf/ssl.key/server.key $(CONFIGDIR)/ssl.key/;\ + fi; + +- @if [ "$(OSTYPE)" = "FreeBSD" ]; then \ +- echo "install -c -m 755 os/FreeBSD/smbftpd.sh $(PREFIX)/etc/rc.d/"; \ +- [ -d $(PREFIX)/etc/rc.d ] || install -d $(PREFIX)/etc/rc.d; \ +- install -c -m 755 os/FreeBSD/smbftpd.sh $(PREFIX)/etc/rc.d/; \ +- elif [ "$(OSTYPE)" = "linux" ]; then \ +- if [ ! -f /etc/pam.d/ftpd ]; then \ +- echo "install install -c -m 644 os/linux/ftpd.pam /etc/pam.d/ftpd"; \ +- install -c -m 644 os/linux/ftpd.pam /etc/pam.d/ftpd; \ +- fi; \ +- fi; +- +- diff -ruN --exclude=CVS /usr/ports/ftp/smbftpd/files/smbftpd.sh.in /home/users/jnlin/ports/smbftpd/files/smbftpd.sh.in --- /usr/ports/ftp/smbftpd/files/smbftpd.sh.in 1970-01-01 08:00:00.000000000 +0800 +++ /home/users/jnlin/ports/smbftpd/files/smbftpd.sh.in 2008-05-17 11:41:24.414987343 +0800 @@ -0,0 +1,30 @@ +#!/bin/sh + +# PROVIDE: smbftpd +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable pure-ftpd: +# +# smbftpd_enable="YES" +# + +. %%RC_SUBR%% + +name=smbftpd +rcvar=`set_rcvar` + +load_rc_config $name + +command=%%PREFIX%%/sbin/smbftpd +smbftpd_config=${smbftpd_config:-"%%PREFIX%%/etc/smbftpd/smbftpd.conf"} +required_files=${smbftpd_config} +pidfile=/var/run/smbftpd.pid +procname=smbftpd + +smbftpd_enable=${smbftpd_enable:-"NO"} +command_args="-D -s ${smbftpd_config}" + +run_rc_command "$1" diff -ruN --exclude=CVS /usr/ports/ftp/smbftpd/pkg-plist /home/users/jnlin/ports/smbftpd/pkg-plist --- /usr/ports/ftp/smbftpd/pkg-plist 2006-01-24 03:37:26.000000000 +0800 +++ /home/users/jnlin/ports/smbftpd/pkg-plist 2008-05-17 11:44:22.449884087 +0800 @@ -1,6 +1,9 @@ @comment $FreeBSD: ports/ftp/smbftpd/pkg-plist,v 1.1 2006/01/23 19:37:26 pav Exp $ -etc/rc.d/smbftpd.sh +bin/smbftpd-user +etc/rc.d/smbftpd etc/smbftpd/smbftpd.conf etc/smbftpd/smbftpd_share.conf +etc/smbftpd/smbftpd_mysql.conf +etc/smbftpd/smbftpd_pgsql.conf sbin/smbftpd @dirrmtry etc/smbftpd --- smbftpd-2.0r3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: