From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 24 07:50:29 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 DB64516A55A for ; Wed, 24 May 2006 07:50:29 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C92E443D6A for ; Wed, 24 May 2006 07:50:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4O7oD3E024752 for ; Wed, 24 May 2006 07:50:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4O7oDnq024746; Wed, 24 May 2006 07:50:13 GMT (envelope-from gnats) Resent-Date: Wed, 24 May 2006 07:50:13 GMT Resent-Message-Id: <200605240750.k4O7oDnq024746@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, Tsurutani Naoki Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 159F316A539 for ; Wed, 24 May 2006 07:41:21 +0000 (UTC) (envelope-from turutani@polymer3.scphys.kyoto-u.ac.jp) Received: from polymer3.scphys.kyoto-u.ac.jp (polymer3.scphys.kyoto-u.ac.jp [130.54.55.55]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4A6143D7C for ; Wed, 24 May 2006 07:41:12 +0000 (GMT) (envelope-from turutani@polymer3.scphys.kyoto-u.ac.jp) Received: from polymer3.scphys.kyoto-u.ac.jp (localhost [127.0.0.1]) by polymer3.scphys.kyoto-u.ac.jp (8.13.4/8.13.4/20060227-1) with ESMTP id k4O7f7lX020746; Wed, 24 May 2006 16:41:07 +0900 (JST) (envelope-from turutani@polymer3.scphys.kyoto-u.ac.jp) Received: (from turutani@localhost) by polymer3.scphys.kyoto-u.ac.jp (8.13.4/8.13.4/Submit) id k4O7f628020745; Wed, 24 May 2006 16:41:06 +0900 (JST) (envelope-from turutani) Message-Id: <200605240741.k4O7f628020745@polymer3.scphys.kyoto-u.ac.jp> Date: Wed, 24 May 2006 16:41:06 +0900 (JST) From: Tsurutani Naoki To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/97774: [patch] ftp/wu-ftpd with pam X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Tsurutani Naoki List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 07:50:30 -0000 >Number: 97774 >Category: ports >Synopsis: [patch] ftp/wu-ftpd with pam >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 24 07:50:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Tsurutani Naoki >Release: FreeBSD 5.5-PRERELEASE i386 >Organization: >Environment: System: FreeBSD polymer3.scphys.kyoto-u.ac.jp 5.5-PRERELEASE FreeBSD 5.5-PRERELEASE #19: Thu Mar 23 12:05:35 JST 2006 turutani@polymer3.scphys.kyoto-u.ac.jp:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386 >Description: A patch using ftp/wu-ftpd with PAM. Now, opie is enabled by default. Using PAM is exclusive with opie, but opie is able to be used through PAM. If you want to use PAM, build with "WITH_PAM=1". Otherwise, conventional way of using opie is used. Note: this patch is not tested well, but as known as I know, it works well with/without PAM, and with PAM, opie can also be used. >How-To-Repeat: >Fix: for ftp/wu-ftpd: --- Makefile.orig Fri Dec 2 04:30:41 2005 +++ Makefile Wed May 24 16:23:16 2006 @@ -21,9 +21,16 @@ CONFLICTS= wu-ftpd+ipv6-[0-9]* heimdal-[0-9]* USE_AUTOTOOLS= autoconf:213 -CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip --enable-opie \ +CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip \ --enable-noop --disable-numericuid --enable-nlst-dirs \ --prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc + +.if !defined(WITH_PAM) +CONFIGURE_ARGS+= --enable-opie +.else +CONFIGURE_ARGS+= --enable-pam +EXTRA_PATCHES+= ${FILESDIR}/ftpd.c-pam +.endif MAKE_ENV+= WARNINGS=-DSPT_TYPE=SPT_BUILTIN --- /dev/null Wed May 24 16:30:16 2006 +++ files/ftpd.c-pam Wed May 24 16:25:06 2006 @@ -0,0 +1,10 @@ +--- src/ftpd.c.orig Fri Nov 30 01:56:11 2001 ++++ src/ftpd.c Wed May 24 16:21:21 2006 +@@ -6926,6 +6926,7 @@ + */ + + #include ++#define PAM_ESTABLISH_CRED 0x1 + /* Static variables used to communicate between the conversation function + * and the server_login function + */ for ftp/wu-ftpd+ipv6: --- Makefile.orig Wed May 24 15:44:57 2006 +++ Makefile Wed May 24 16:05:11 2006 @@ -24,10 +24,17 @@ CONFLICTS= wu-ftpd-[0-9]* heimdal-[0-9]* USE_AUTOTOOLS= autoconf:213 -CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip --enable-opie \ +CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip \ --enable-noop --disable-numericuid --enable-nlst-dirs \ --enable-ipv6 \ --prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc + +.if !defined(WITH_PAM) +CONFIGURE_ARGS+= --enable-opie +.else +CONFIGURE_ARGS+= --enable-pam +EXTRA_PATCHES+= ${FILESDIR}/ftpd.c-pam +.endif MAKE_ENV+= WARNINGS=-DSPT_TYPE=SPT_BUILTIN --- /dev/null Wed May 24 16:30:16 2006 +++ files/ftpd.c-pam Wed May 24 16:29:30 2006 @@ -0,0 +1,10 @@ +--- src/ftpd.c.orig Wed May 24 16:28:10 2006 ++++ src/ftpd.c Wed May 24 16:28:10 2006 +@@ -7633,6 +7633,7 @@ + */ + + #include ++#define PAM_ESTABLISH_CRED 0x1 + /* Static variables used to communicate between the conversation function + * and the server_login function + */ >Release-Note: >Audit-Trail: >Unformatted: