Further tun/tap cleanup

Author: Dan McDonald

build/tuntap/build.sh

@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
+# Copyright 2016 OmniTI Computer Consulting, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Load support functions
@@ -34,6 +34,9 @@ VERHUMAN=$VER
 SUMMARY="TUN/TAP driver for Solaris"
 DESC="TUN/TAP drive for Solaris based on Universal TUN/TAP Driver"
 
+# tuntap needs GNU tar.
+TAR=gtar
+
 init
 download_source $PROG $PROG $VER
 patch_source

build/tuntap/patches/makefile.patch

@@ -1,23 +1,23 @@
---- tuntap-1.3.3/Makefile.in.orig       Fri Dec  9 16:44:10 2016
-+++ tuntap-1.3.3/Makefile.in    Fri Dec  9 16:44:37 2016
+--- Makefile.in.orig	Tue Dec 20 06:36:21 2016
++++ Makefile.in	Tue Dec 20 06:37:26 2016
 @@ -54,13 +54,13 @@
-        $(CC) $(KCFLAGS) -c tun.c -o tap.o -DTUNTAP_TAP
+ 	$(CC) $(KCFLAGS) -c tun.c -o tap.o -DTUNTAP_TAP
 
  install: tun tap
--       $(INSTALL) -d -m 0755 -o root -g bin $(DESTDIR)/usr/include/net
--       $(INSTALL) -d -m 0755 -o root -g sys $(DESTDIR)$(DRV_DIR)
--       $(INSTALL) -m 644 -o root -g root if_tun.h $(DESTDIR)/usr/include/net 
--       $(INSTALL) -m 644 -o root -g root tun $(DESTDIR)$(DRV_DIR)
--       $(INSTALL) -m 644 -o root -g root tap $(DESTDIR)$(DRV_DIR)
--       $(INSTALL) -m 644 -o root -g root tun.conf $(DESTDIR)$(DRV_CONF_DIR)
--       $(INSTALL) -m 644 -o root -g root tap.conf $(DESTDIR)$(DRV_CONF_DIR)
-+       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/include/net
-+       $(INSTALL) -d -m 0755 $(DESTDIR)$(DRV_DIR)
-+       $(INSTALL) -m 644 if_tun.h $(DESTDIR)/usr/include/net 
-+       $(INSTALL) -m 644 tun $(DESTDIR)$(DRV_DIR)
-+       $(INSTALL) -m 644 tap $(DESTDIR)$(DRV_DIR)
-+       $(INSTALL) -m 644 tun.conf $(DESTDIR)$(DRV_CONF_DIR)
-+       $(INSTALL) -m 644 tap.conf $(DESTDIR)$(DRV_CONF_DIR)
-        -[ -z "$(DESTDIR)" ]&& $(REM_DRV) tun >/dev/null 2>&1
-        -[ -z "$(DESTDIR)" ]&& $(REM_DRV) tap >/dev/null 2>&1
-        -[ -z "$(DESTDIR)" ]&& $(ADD_DRV) tun   
+-	$(INSTALL) -d -m 0755 -o root -g bin $(DESTDIR)/usr/include/net
+-	$(INSTALL) -d -m 0755 -o root -g sys $(DESTDIR)$(DRV_DIR)
+-	$(INSTALL) -m 644 -o root -g root if_tun.h $(DESTDIR)/usr/include/net 
+-	$(INSTALL) -m 644 -o root -g root tun $(DESTDIR)$(DRV_DIR)
+-	$(INSTALL) -m 644 -o root -g root tap $(DESTDIR)$(DRV_DIR)
+-	$(INSTALL) -m 644 -o root -g root tun.conf $(DESTDIR)$(DRV_CONF_DIR)
+-	$(INSTALL) -m 644 -o root -g root tap.conf $(DESTDIR)$(DRV_CONF_DIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)/usr/include/net
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(DRV_DIR)
++	$(INSTALL) -m 644 if_tun.h $(DESTDIR)/usr/include/net 
++	$(INSTALL) -m 644 tun $(DESTDIR)$(DRV_DIR)
++	$(INSTALL) -m 644 tap $(DESTDIR)$(DRV_DIR)
++	$(INSTALL) -m 644 tun.conf $(DESTDIR)$(DRV_CONF_DIR)
++	$(INSTALL) -m 644 tap.conf $(DESTDIR)$(DRV_CONF_DIR)
+ 	-[ -z "$(DESTDIR)" ]&& $(REM_DRV) tun >/dev/null 2>&1
+ 	-[ -z "$(DESTDIR)" ]&& $(REM_DRV) tap >/dev/null 2>&1
+ 	-[ -z "$(DESTDIR)" ]&& $(ADD_DRV) tun	

build/tuntap/patches/series

@@ -1 +1 @@
-makefile.patch -p1
+makefile.patch -p0