From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 31 12:00:16 2010 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 310C51065698 for ; Tue, 31 Aug 2010 12:00:16 +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 E14AC8FC12 for ; Tue, 31 Aug 2010 12:00:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o7VC0Fwq032511 for ; Tue, 31 Aug 2010 12:00:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o7VC0F1e032508; Tue, 31 Aug 2010 12:00:15 GMT (envelope-from gnats) Resent-Date: Tue, 31 Aug 2010 12:00:15 GMT Resent-Message-Id: <201008311200.o7VC0F1e032508@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, Sergey Zaykov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 341C31065672 for ; Tue, 31 Aug 2010 11:51:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 0AB618FC1B for ; Tue, 31 Aug 2010 11:51:51 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o7VBpoQJ000276 for ; Tue, 31 Aug 2010 11:51:50 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o7VBpocQ000275; Tue, 31 Aug 2010 11:51:50 GMT (envelope-from nobody) Message-Id: <201008311151.o7VBpocQ000275@www.freebsd.org> Date: Tue, 31 Aug 2010 11:51:50 GMT From: Sergey Zaykov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/150145: [patch] ftp/smbftpd port rewrite configuration files on update 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: Tue, 31 Aug 2010 12:00:16 -0000 >Number: 150145 >Category: ports >Synopsis: [patch] ftp/smbftpd port rewrite configuration files on update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 31 12:00:14 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Sergey Zaykov >Release: FreeBSD 8.0-RELEASE-p4 i386 >Organization: >Environment: FreeBSD acc.acc.tula.ru 8.0-RELEASE-p4 FreeBSD 8.0-RELEASE-p4 #3: Tue Jul 13 11:26:05 MSD 2 >Description: >How-To-Repeat: 1. Edit something at config files 2. Make reinstall port 3. Your changes are discarded >Fix: smbftpd.txt patched port's Makefile. patch-Makefile must be placed at "files" subdirectory of port. Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # . # ./patch-Makefile # ./smbftpd.txt # echo c - . mkdir -p . > /dev/null 2>&1 echo x - ./patch-Makefile sed 's/^X//' >./patch-Makefile << '5a51f24cf2b106560c645bdcfd0499f4' X--- Makefile.orig 2008-04-03 22:00:40.000000000 +0400 X+++ Makefile 2010-08-31 15:30:23.000000000 +0400 X@@ -21,7 +21,7 @@ X CFLAGS += -I./include X X CONFIGDIR = $(PREFIX)/etc/smbftpd X-CONFIGS = smbftpd.conf smbftpd_share.conf smbftpd_mysql.conf smbftpd_pgsql.conf X+CONFIGS = smbftpd.conf.sample smbftpd_share.conf.sample smbftpd_mysql.conf.sample smbftpd_pgsql.conf.sample X X YFLAGS = X X@@ -126,15 +126,3 @@ X install -c -m 400 cert/conf/ssl.key/server.key $(CONFIGDIR)/ssl.key/;\ X fi; X X- @if [ "$(OSTYPE)" = "FreeBSD" ]; then \ X- echo "install -c -m 755 os/FreeBSD/smbftpd.sh $(PREFIX)/etc/rc.d/"; \ X- [ -d $(PREFIX)/etc/rc.d ] || install -d $(PREFIX)/etc/rc.d; \ X- install -c -m 755 os/FreeBSD/smbftpd.sh $(PREFIX)/etc/rc.d/; \ X- elif [ "$(OSTYPE)" = "linux" ]; then \ X- if [ ! -f /etc/pam.d/ftpd ]; then \ X- echo "install install -c -m 644 os/linux/ftpd.pam /etc/pam.d/ftpd"; \ X- install -c -m 644 os/linux/ftpd.pam /etc/pam.d/ftpd; \ X- fi; \ X- fi; X- X- 5a51f24cf2b106560c645bdcfd0499f4 echo x - ./smbftpd.txt sed 's/^X//' >./smbftpd.txt << 'cd3c8859eb6aa7476b71403719b1b418' X--- Makefile.orig 2010-08-31 15:18:57.000000000 +0400 X+++ Makefile 2010-08-31 15:35:30.000000000 +0400 X@@ -51,4 +51,10 @@ X BROKEN= fails to build with new utmpx X .endif X X+post-patch: X+ @${MV} ${WRKSRC}/conf/smbftpd.conf ${WRKSRC}/conf/smbftpd.conf.sample X+ @${MV} ${WRKSRC}/conf/smbftpd_mysql.conf ${WRKSRC}/conf/smbftpd_mysql.conf.sample X+ @${MV} ${WRKSRC}/conf/smbftpd_pgsql.conf ${WRKSRC}/conf/smbftpd_pgsql.conf.sample X+ @${MV} ${WRKSRC}/conf/smbftpd_share.conf ${WRKSRC}/conf/smbftpd_share.conf.sample X+ X .include cd3c8859eb6aa7476b71403719b1b418 exit >Release-Note: >Audit-Trail: >Unformatted: