From owner-freebsd-bugs@FreeBSD.ORG Mon Dec 23 14:40:00 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2C03239 for ; Mon, 23 Dec 2013 14:40:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A5A26120B for ; Mon, 23 Dec 2013 14:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNEe0Sf079405 for ; Mon, 23 Dec 2013 14:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBNEe0wK079404; Mon, 23 Dec 2013 14:40:00 GMT (envelope-from gnats) Resent-Date: Mon, 23 Dec 2013 14:40:00 GMT Resent-Message-Id: <201312231440.rBNEe0wK079404@freefall.freebsd.org> Message-Id: <201312231440.rBNEe0wK079404@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1FB85101 for ; Mon, 23 Dec 2013 14:34:19 +0000 (UTC) Received: from mail.0x20.net (mail.0x20.net [IPv6:2001:aa8:fffb:1::3]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DBDC111D7 for ; Mon, 23 Dec 2013 14:34:18 +0000 (UTC) Received: from milhouse.bsd-geek.de (ip-109-44-0-48.web.vodafone.de [109.44.0.48]) (Authenticated sender: lala) by mail.0x20.net (Postfix) with ESMTPA id C9E846A651B for ; Mon, 23 Dec 2013 15:34:13 +0100 (CET) Received: by milhouse.bsd-geek.de (sSMTP sendmail emulation); Mon, 23 Dec 2013 15:34:11 +0100 Date: Mon, 23 Dec 2013 15:34:11 +0100 From: "Lars Engels" To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: bin/185135: [PATCH] ndisgen: respect iconv in base X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: lme@FreeBSD.org List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Dec 2013 14:40:00 -0000 >Number: 185135 >Category: bin >Synopsis: [PATCH] ndisgen: respect iconv in base >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Dec 23 14:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: >Release: FreeBSD 11.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD milhouse.bsd-geek.de 11.0-CURRENT FreeBSD 11.0-CURRENT #9 r259667: Sat Dec 21 01:42:09 CET 2013 root@milhouse.bsd-geek.de:/usr/obj/usr/src/sys/MILHOUSE2 amd64 >Description: /usr/sbin/ndisgen expects iconv(8) to be in /usr/local while since FreeBSD 10.x iconv is in base. The attached patch respects both. >How-To-Repeat: >Fix: --- ndisgen.sh.patch begins here --- Index: ndisgen.sh =================================================================== --- ndisgen.sh (revision 259709) +++ ndisgen.sh (working copy) @@ -493,7 +493,12 @@ return } -ICONVPATH=/usr/local/bin/iconv +if [ -f /usr/local/bin/iconv ]; then + ICONVPATH=/usr/local/bin/iconv +else + ICONVPATH=/usr/bin/iconv +fi + NDISCVT=/usr/sbin/ndiscvt STUBPATH=/usr/share/misc STUBFILE=windrv_stub.c --- ndisgen.sh.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: