From owner-freebsd-ports-bugs Thu Feb 27 7:50:17 2003 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 794FF37B401 for ; Thu, 27 Feb 2003 07:50:14 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B18543F85 for ; Thu, 27 Feb 2003 07:50:13 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h1RFoCNS081638 for ; Thu, 27 Feb 2003 07:50:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h1RFoC1b081637; Thu, 27 Feb 2003 07:50:12 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B3C337B401 for ; Thu, 27 Feb 2003 07:47:51 -0800 (PST) Received: from freebsd.org.ru (sweet.etrust.ru [194.84.67.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37AF443FAF for ; Thu, 27 Feb 2003 07:47:50 -0800 (PST) (envelope-from osa@freebsd.org.ru) Received: by freebsd.org.ru (Postfix, from userid 1000) id 3FA7981; Thu, 27 Feb 2003 18:47:48 +0300 (MSK) Message-Id: <20030227154748.3FA7981@freebsd.org.ru> Date: Thu, 27 Feb 2003 18:47:48 +0300 (MSK) From: "Sergey A.Osokin" Reply-To: "Sergey A.Osokin" To: FreeBSD-gnats-submit@FreeBSD.org Cc: greid@ukug.uk.freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/48751: [PATCH] security/vlock: unbreak build under 5.0 Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 48751 >Category: ports >Synopsis: [PATCH] security/vlock: unbreak build under 5.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Feb 27 07:50:12 PST 2003 >Closed-Date: >Last-Modified: >Originator: Sergey A. Osokin >Release: FreeBSD 4.8-PRERELEASE i386 >Organization: n/a >Environment: System: FreeBSD 4.8-PRERELEASE i386 >Description: security/vlock: unbreak build under 5.0 For more information about __FreeBSD_version please see: http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/param.h.diff?r1=1.113&r2=1.114&only_with_tag=MAIN&f=h and time of Initial revision of OpenPAM: http://www.freebsd.org/cgi/cvsweb.cgi/src/contrib/openpam/INSTALL >How-To-Repeat: >Fix: Index: ports/security/vlock/files/patch-ae =================================================================== RCS file: /home/ncvs/ports/security/vlock/files/patch-ae,v retrieving revision 1.1 diff -u -r1.1 patch-ae --- ports/security/vlock/files/patch-ae 22 Oct 2000 15:36:25 -0000 1.1 +++ ports/security/vlock/files/patch-ae 27 Feb 2003 15:44:18 -0000 @@ -1,6 +1,25 @@ ---- input.c.orig Wed Jan 13 16:19:14 1999 -+++ input.c Sun Oct 22 08:22:42 2000 -@@ -291,7 +291,7 @@ +--- input.c.orig Thu Jan 14 03:19:14 1999 ++++ input.c Thu Feb 27 18:20:22 2003 +@@ -61,10 +61,18 @@ + #endif + + #include ++#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030) ++#include ++#elsif + #include ++#endif + + static struct pam_conv PAM_conversation = { ++#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030) ++ &openpam_ttyconv, ++#elsif + &misc_conv, ++#endif + NULL + }; + +@@ -291,7 +299,7 @@ setuid(getuid()); setgid(getgid()); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message