From owner-freebsd-current Sat Mar 16 1:32: 8 2002 Delivered-To: freebsd-current@freebsd.org Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by hub.freebsd.org (Postfix) with ESMTP id 19C9037B402 for ; Sat, 16 Mar 2002 01:32:05 -0800 (PST) Received: by elvis.mu.org (Postfix, from userid 1920) id 98F06AE2C1; Sat, 16 Mar 2002 01:32:04 -0800 (PST) Date: Sat, 16 Mar 2002 01:32:04 -0800 From: Maxime Henrion To: freebsd-current@freebsd.org Subject: Patch to fix the build of the smbfs.ko kernel module Message-ID: <20020316093204.GF17902@elvis.mu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="HcAYCG3uE/tztfnV" Content-Disposition: inline User-Agent: Mutt/1.3.27i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --HcAYCG3uE/tztfnV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, Since the addition of optimized 3DES encryption for x86, the build of the smbfs kernel module has been broken (on all platforms). This is because new files are now needed (des_enc.S for x86, des_enc.c for other archs). The attached patch fixes this problem. Reviews would be appreciated. Maxime --HcAYCG3uE/tztfnV Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="smbfs.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/src/sys/modules/smbfs/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 11 Jan 2002 15:48:57 -0000 1.4 +++ Makefile 16 Mar 2002 02:52:31 -0000 @@ -1,6 +1,7 @@ # $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.4 2002/01/11 15:48:57 ru Exp $ .PATH: ${.CURDIR}/../../crypto/des \ + ${.CURDIR}/../../crypto/des/arch/i386 \ ${.CURDIR}/../../kern \ ${.CURDIR}/../../libkern \ ${.CURDIR}/../../netsmb \ @@ -22,6 +23,11 @@ .if defined(NETSMBCRYPTO) SRCS+= des_ecb.c des_setkey.c +.if ${MACHINE_ARCH} == "i386" +SRCS+= des_enc.S +.else +SRCS+= des_enc.c +.endif .endif # Build with IPX support (1|0) --HcAYCG3uE/tztfnV-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message