From lars@0x20.net  Mon Dec 23 14:34:19 2013
Return-Path: <lars@0x20.net>
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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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" <lars@0x20.net>
Reply-To: <lme@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] ndisgen: respect iconv in base
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         185135
>Category:       bin
>Synopsis:       [PATCH] ndisgen: respect iconv in base
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glebius
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 23 14:40:00 UTC 2013
>Closed-Date:    Wed Jan 22 10:35:40 UTC 2014
>Last-Modified:  Wed Jan 22 10:40:05 UTC 2014
>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:
State-Changed-From-To: open->patched 
State-Changed-By: glebius 
State-Changed-When: Wed Dec 25 01:20:21 UTC 2013 
State-Changed-Why:  
Committed, thanks. 


Responsible-Changed-From-To: freebsd-bugs->glebius 
Responsible-Changed-By: glebius 
Responsible-Changed-When: Wed Dec 25 01:20:21 UTC 2013 
Responsible-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185135 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/185135: commit references a PR
Date: Wed, 25 Dec 2013 01:20:22 +0000 (UTC)

 Author: glebius
 Date: Wed Dec 25 01:20:14 2013
 New Revision: 259855
 URL: http://svnweb.freebsd.org/changeset/base/259855
 
 Log:
   We have in base iconv.
   
   PR:		185135
   Submitted by:	Lars Engels <lars 0x20.net>
 
 Modified:
   head/usr.sbin/ndiscvt/ndisgen.sh
 
 Modified: head/usr.sbin/ndiscvt/ndisgen.sh
 ==============================================================================
 --- head/usr.sbin/ndiscvt/ndisgen.sh	Wed Dec 25 01:03:14 2013	(r259854)
 +++ head/usr.sbin/ndiscvt/ndisgen.sh	Wed Dec 25 01:20:14 2013	(r259855)
 @@ -493,7 +493,7 @@ convert_driver () {
  	return
  }
  
 -ICONVPATH=/usr/local/bin/iconv
 +ICONVPATH=/usr/bin/iconv
  NDISCVT=/usr/sbin/ndiscvt
  STUBPATH=/usr/share/misc
  STUBFILE=windrv_stub.c
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: glebius 
State-Changed-When: Wed Jan 22 10:34:48 UTC 2014 
State-Changed-Why:  
Merged to stable/10. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185135 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/185135: commit references a PR
Date: Wed, 22 Jan 2014 10:35:38 +0000 (UTC)

 Author: glebius
 Date: Wed Jan 22 10:35:30 2014
 New Revision: 261021
 URL: http://svnweb.freebsd.org/changeset/base/261021
 
 Log:
   Merge r259855:  We have in base iconv.
   
   PR:		185135
 
 Modified:
   stable/10/usr.sbin/ndiscvt/ndisgen.sh
 Directory Properties:
   stable/10/   (props changed)
 
 Modified: stable/10/usr.sbin/ndiscvt/ndisgen.sh
 ==============================================================================
 --- stable/10/usr.sbin/ndiscvt/ndisgen.sh	Wed Jan 22 10:31:56 2014	(r261020)
 +++ stable/10/usr.sbin/ndiscvt/ndisgen.sh	Wed Jan 22 10:35:30 2014	(r261021)
 @@ -493,7 +493,7 @@ convert_driver () {
  	return
  }
  
 -ICONVPATH=/usr/local/bin/iconv
 +ICONVPATH=/usr/bin/iconv
  NDISCVT=/usr/sbin/ndiscvt
  STUBPATH=/usr/share/misc
  STUBFILE=windrv_stub.c
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
