From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 1 04:10:13 2003 Return-Path: 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 2287B37B404 for ; Tue, 1 Apr 2003 04:10:13 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB34843FA3 for ; Tue, 1 Apr 2003 04:10:11 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h31CABUp086950 for ; Tue, 1 Apr 2003 04:10:11 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h31CABYQ086949; Tue, 1 Apr 2003 04:10:11 -0800 (PST) Resent-Date: Tue, 1 Apr 2003 04:10:11 -0800 (PST) Resent-Message-Id: <200304011210.h31CABYQ086949@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 A.Osokin" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A93ED37B401; Tue, 1 Apr 2003 04:01:28 -0800 (PST) Received: from freebsd.org.ru (sweet.etrust.ru [194.84.67.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 243E243FDF; Tue, 1 Apr 2003 04:01:25 -0800 (PST) (envelope-from osa@freebsd.org.ru) Received: by freebsd.org.ru (Postfix, from userid 1000) id 381CFBE; Tue, 1 Apr 2003 16:01:23 +0400 (MSD) Message-Id: <20030401120123.381CFBE@freebsd.org.ru> Date: Tue, 1 Apr 2003 16:01:23 +0400 (MSD) From: "Sergey A.Osokin" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: dwcjr@FreeBSD.org Subject: ports/50519: [PATCH] net/samba: fix building with Winbind under 5.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Sergey A.Osokin" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2003 12:10:13 -0000 >Number: 50519 >Category: ports >Synopsis: [PATCH] net/samba: fix building with Winbind 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: Tue Apr 01 04:10:11 PST 2003 >Closed-Date: >Last-Modified: >Originator: Sergey A. Osokin >Release: FreeBSD 5.0-CURRENT i386 >Organization: n/a >Environment: System: FreeBSD 5.0-CURRENT i386 >Description: [PATCH] net/samba: fix building with Winbind under 5.0 The problem arose due to OpenPAM import. Bump PORTREVISION Spotted by Oleg Muhutdinov >How-To-Repeat: under FreeBSD 5.0: $ cd ports/net/samba $ make >Fix: Index: ports/net/samba/Makefile =================================================================== RCS file: /home/ncvs/ports/net/samba/Makefile,v retrieving revision 1.118 diff -u -r1.118 Makefile --- ports/net/samba/Makefile 25 Mar 2003 14:52:42 -0000 1.118 +++ ports/net/samba/Makefile 1 Apr 2003 11:42:48 -0000 @@ -7,6 +7,7 @@ PORTNAME= samba PORTVERSION= 2.2.8 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://us3.samba.org/samba/ftp/%SUBDIR%/ \ http://us4.samba.org/samba/ftp/%SUBDIR%/ \ --- /dev/null Tue Apr 1 14:30:34 2003 +++ ports/net/samba/files/patch-source::nsswitch::pam_winbind.h Tue Apr 1 12:58:33 2003 @@ -0,0 +1,19 @@ +--- source/nsswitch/pam_winbind.h.orig Tue Apr 1 12:57:33 2003 ++++ source/nsswitch/pam_winbind.h Tue Apr 1 12:57:41 2003 +@@ -25,7 +25,15 @@ + #define PAM_SM_ACCOUNT + #define PAM_SM_PASSWORD + +-#if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) ++#if (__FreeBSD__ == 0) /* 1.0 did not define __FreeBSD__ */ ++#define __FreeBSD_version 199401 ++#elsif __FreeBSD__ == 1 /* 1.1 defined it to be 1 */ ++#define __FreeBSD_version 199405 ++#else /* 2.0 and higher define it to be 2 */ ++#include /* and this works */ ++#endif ++ ++#if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) || (defined (__FreeBSD_version) && (__FreeBSD_version > 500030)) + + /* Solaris always uses dynamic pam modules */ + #define PAM_EXTERN extern >Release-Note: >Audit-Trail: >Unformatted: