- updated

Changed files:
    vtun-makefile.patch -> 1.3

diff --git a/vtun-makefile.patch b/vtun-makefile.patch
index 46d54a0e21da1dd3f95aba244af87cf7e4a7df11..e37a6441acd06c112bf9e59daf958e594404ae8b 100644 (file)
--- a/vtun-makefile.patch
+++ b/vtun-makefile.patch
@@ -1,40 +1,46 @@
-diff -ruN vtun-2.1b3.orig/Makefile.in vtun-2.1b3/Makefile.in
---- vtun-2.1b3.orig/Makefile.in        Thu Mar  9 01:40:45 2000
-+++ vtun-2.1b3/Makefile.in     Sat Mar 18 01:21:17 2000
-@@ -27,6 +27,8 @@
+diff -ruN vtun-2.3.orig/Makefile.in vtun-2.3/Makefile.in
+--- vtun-2.3.orig/Makefile.in  Mon May 29 15:35:11 2000
++++ vtun-2.3/Makefile.in       Sat Sep 23 14:17:28 2000
+@@ -27,8 +27,9 @@
  LEX = @LEX@
- LEXFLAGS = 
+ LEXFLAGS = -t 
  
 +DESTDIR =
 +
  INSTALL = @INSTALL@
+-INSTALL_OWNER = -o root -g 0
  
  prefix = @prefix@
-@@ -78,22 +80,18 @@
-       ./config.drivers unlink
+ exec_prefix = @exec_prefix@
+@@ -79,24 +80,20 @@
+       rm -f `cat vtun.drivers`        
  
  install_man: 
--      $(INSTALL) -d -m 644 -o root -g 0 $(MAN_DIR)/man8
--      $(INSTALL) -m 644 -o root -g 0 vtund.8 $(MAN_DIR)/man8
+-      $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(MAN_DIR)/man8
+-      $(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(MAN_DIR)/man8
+-      $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(MAN_DIR)/man5
+-      $(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(MAN_DIR)/man5
 -      rm -f $(MAN_DIR)/man8/vtun.8 
 -      ln -s vtund.8 $(MAN_DIR)/man8/vtun.8 
-+      $(INSTALL) -d $(DESTDIR)$(MAN_DIR)/man8
++      $(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man8
 +      $(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8
++      $(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5
++      $(INSTALL) -m 644 vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
  
  install_config: 
--      $(INSTALL) -d -m 755 -o root -g 0 $(ETC_DIR)
+-      $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(ETC_DIR)
 -      if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
--        $(INSTALL) -m 600 -o root -g 0 vtund.conf $(ETC_DIR); \
+-        $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(ETC_DIR); \
 -      fi
 +      $(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR)
-+      $(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR); \
++      $(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR);
  
  install: vtund install_config install_man
--      $(INSTALL) -d -m 755 -o root -g 0 $(VAR_DIR)/run
--      $(INSTALL) -d -m 755 -o root -g 0 $(STAT_DIR)
--      $(INSTALL) -d -m 755 -o root -g 0 $(LOCK_DIR)
--      $(INSTALL) -d -m 755 -o root -g 0 $(SBIN_DIR)
--      $(INSTALL) -m 755 -o root -g 0 vtund $(SBIN_DIR)
+-      $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(VAR_DIR)/run
+-      $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(STAT_DIR)
+-      $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(LOCK_DIR)
+-      $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(SBIN_DIR)
+-      $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(SBIN_DIR)
 +      $(INSTALL) -d -m 755 $(DESTDIR)$(VAR_DIR)/run
 +      $(INSTALL) -d -m 755 $(DESTDIR)$(STAT_DIR)
 +      $(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR)