From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 17 17:10:16 2011 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 71E151065679 for ; Tue, 17 May 2011 17:10: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 50F488FC1C for ; Tue, 17 May 2011 17:10:16 +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 p4HHAG38055072 for ; Tue, 17 May 2011 17:10:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4HHAGpe055071; Tue, 17 May 2011 17:10:16 GMT (envelope-from gnats) Resent-Date: Tue, 17 May 2011 17:10:16 GMT Resent-Message-Id: <201105171710.p4HHAGpe055071@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, "Andrey V. Elsukov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4885106566C for ; Tue, 17 May 2011 17:08:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id B56D28FC13 for ; Tue, 17 May 2011 17:08:41 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p4HH8f8a055619 for ; Tue, 17 May 2011 17:08:41 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p4HH8fqg055618; Tue, 17 May 2011 17:08:41 GMT (envelope-from nobody) Message-Id: <201105171708.p4HH8fqg055618@red.freebsd.org> Date: Tue, 17 May 2011 17:08:41 GMT From: "Andrey V. Elsukov" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157124: [patch] fix vsftpd build for 9.0-CURRENT 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, 17 May 2011 17:10:16 -0000 >Number: 157124 >Category: ports >Synopsis: [patch] fix vsftpd build for 9.0-CURRENT >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 May 17 17:10:16 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Andrey V. Elsukov >Release: 9.0 >Organization: >Environment: FreeBSD btr 9.0-CURRENT FreeBSD 9.0-CURRENT #46 r221812M: Mon May 16 19:37:31 MSD 2011 butcher@btr:/usr/obj/usr/src/sys/BTR amd6 >Description: ftp/vsftpd port is marked as ignored for build on 9.0-CURRENT. >How-To-Repeat: >Fix: patch attached. Patch attached with submission follows: --- vsftpd/Makefile 2011-05-02 03:14:18.000000000 +0400 +++ vsftpd/Makefile 2011-05-17 20:53:44.027030532 +0400 @@ -31,10 +31,6 @@ OPTIONS= RC_NG "install RC_NG script" .include -.if ${OSVERSION} >= 900000 -BROKEN= does not compile on FreeBSD 9.X -.endif - .if defined(WITH_RC_NG) USE_RC_SUBR= vsftpd.sh .endif --- vsftpd/files/patch-sysdeputil.c 2010-01-27 00:31:51.000000000 +0300 +++ vsftpd/files/patch-sysdeputil.c 2011-05-17 20:52:42.652039577 +0400 @@ -1,6 +1,15 @@ ---- sysdeputil.c.orig 2009-11-12 04:16:15.000000000 +0100 -+++ sysdeputil.c 2010-01-26 22:30:10.000000000 +0100 -@@ -1213,7 +1213,9 @@ +--- sysdeputil.c.orig 2010-03-26 06:25:33.000000000 +0300 ++++ sysdeputil.c 2011-05-17 20:51:35.350022421 +0400 +@@ -57,7 +57,7 @@ + #endif + #define VSF_SYSDEP_HAVE_SHADOW + #define VSF_SYSDEP_HAVE_USERSHELL +-#define VSF_SYSDEP_HAVE_LIBCAP ++#undef VSF_SYSDEP_HAVE_LIBCAP + #define VSF_SYSDEP_HAVE_UTMPX + + #define __USE_GNU +@@ -1213,7 +1213,9 @@ vsf_insert_uwtmp(const struct mystr* p_u setutxent(); (void) pututxline(&s_utent); endutxent(); @@ -10,7 +19,7 @@ } void -@@ -1232,7 +1234,9 @@ +@@ -1232,7 +1234,9 @@ vsf_remove_uwtmp(void) (void) pututxline(&s_utent); endutxent(); s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec(); >Release-Note: >Audit-Trail: >Unformatted: