>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 
[email protected]:/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:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "[email protected]"

Reply via email to