- obsoleted in 3.0.2

Changed files:
    vtun-ac.patch -> 1.3
    vtun-expect.patch -> 1.2
    vtun-getpt.patch -> 1.4
    vtun-lzo2.patch -> 1.2
    vtun-makefile.patch -> 1.5

diff --git a/vtun-ac.patch b/vtun-ac.patch
deleted file mode 100644 (file)
index d0fe99f..0000000
--- a/vtun-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vtun/configure.in.orig     Fri Dec 20 18:13:03 2002
-+++ vtun/configure.in  Mon Feb 23 17:13:49 2004
-@@ -134,7 +134,7 @@
-    AC_MSG_RESULT()
-    AC_CHECKING( for md5 Library and Header files ... )
- AC_SEARCH_HEADERS(md5.h,
--    $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include, /usr/include/sys, 
-+    $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys, 
-     ,
-     AC_MSG_ERROR( SSL headers not found. )
-    )

diff --git a/vtun-expect.patch b/vtun-expect.patch
deleted file mode 100644 (file)
index ce853c4..0000000
--- a/vtun-expect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vtun-2.5/cfg_file.y        Sun Feb 17 22:03:05 2002
-+++ vtun-2.5-expect/cfg_file.y Sun Feb 17 22:03:17 2002
-@@ -68,7 +68,7 @@
-    int  num;
-    struct { int num1; int num2; } dnum;
- }
--%expect 18
-+%expect 20
- 
- %token K_OPTIONS K_DEFAULT K_PORT K_PERSIST K_TIMEOUT
- %token K_PASSWD K_PROG K_PPP K_SPEED K_IFCFG K_FWALL K_ROUTE K_DEVICE 

diff --git a/vtun-getpt.patch b/vtun-getpt.patch
deleted file mode 100644 (file)
index b0e8510..0000000
--- a/vtun-getpt.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- vtun-2.5b1/configure.in    Thu Nov  8 10:04:44 2001
-+++ vtun-2.5b1-p/configure.in  Thu Nov  8 13:04:35 2001
-@@ -166,6 +166,8 @@
- 
- AC_MSG_RESULT()
- 
-+AC_CHECK_FUNCS([getpt grantpt unlockpt ptsname])
-+
- OS_REL=`uname -r | tr -d '[A-Za-z\-\_\.]'`
- case $host_os in
-       *linux*)
---- vtun-2.5b1/generic/pty_dev.c       Mon Nov 20 08:57:33 2000
-+++ vtun-2.5b1-p/generic/pty_dev.c     Thu Nov  8 10:11:44 2001
-@@ -38,11 +38,27 @@
-  */  
- int pty_open(char *sl_name)
- {
-+    int  mr_fd;
-+#ifdef HAVE_GETPT && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_PTSNAME
-+    char *ptyname;
-+
-+    if((mr_fd=getpt()) < 0)
-+      return -1;
-+    if(grantpt(mr_fd) != 0)
-+      return -1;
-+    if(unlockpt(mr_fd) != 0)
-+      return -1;
-+    if ((ptyname = (char*)ptsname(mr_fd)) == NULL)
-+      return -1;
-+    strcpy(sl_name, ptyname);
-+    return mr_fd;
-+
-+#else
-+
-     char ptyname[] = "/dev/ptyXY";
-     char ch[] = "pqrstuvwxyz";
-     char digit[] = "0123456789abcdefghijklmnopqrstuv";
-     int  l, m;
--    int  mr_fd;
- 
-     /* This algorithm should work for almost all standard Unices */   
-     for(l=0; ch[l]; l++ ) {
-@@ -64,6 +80,7 @@
-           }
-       }
-       return -1;
-+#endif
- }
- 
- /* Write frames to PTY device */

diff --git a/vtun-lzo2.patch b/vtun-lzo2.patch
deleted file mode 100644 (file)
index 15b1402..0000000
--- a/vtun-lzo2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur vtun_/configure.in vtun/configure.in
---- vtun_/configure.in 2005-07-18 22:54:46.064184856 +0200
-+++ vtun/configure.in  2005-07-18 22:55:07.060992856 +0200
-@@ -119,9 +119,9 @@
-    AC_CHECKING( for LZO Library and Header files ... )
-    AC_SEARCH_HEADERS(lzo1x.h, 
-       $LZO_HDR_DIR /usr/include/lzo "" /usr/local/include,
--        AC_CHECK_LIB(lzo, lzo1x_decompress,
-+        AC_CHECK_LIB(lzo2, lzo1x_decompress,
-           [
--             LIBS="$LIBS -llzo"
-+             LIBS="$LIBS -llzo2"
-              AC_DEFINE(HAVE_LZO)
-           ],
-           AC_MSG_ERROR( LZO library not found. )
-diff -Nur vtun_/lfd_lzo.c vtun/lfd_lzo.c
---- vtun_/lfd_lzo.c    2002-04-25 11:19:50.000000000 +0200
-+++ vtun/lfd_lzo.c     2005-07-18 22:51:20.000000000 +0200
-@@ -36,6 +36,7 @@
- #ifdef HAVE_LZO
- 
- #include "lzo1x.h"
-+#include "lzoutil.h"
- 
- static lzo_byte *zbuf;
- static lzo_voidp wmem;

diff --git a/vtun-makefile.patch b/vtun-makefile.patch
deleted file mode 100644 (file)
index 1a162eb..0000000
--- a/vtun-makefile.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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 = -t 
- 
-+DESTDIR =
-+
- INSTALL = @INSTALL@
--INSTALL_OWNER = -o root -g 0
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-@@ -79,24 +80,20 @@
-       rm -f `cat vtun.drivers`        
- 
- install_man: 
--      $(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 -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 $(INSTALL_OWNER) $(ETC_DIR)
--      if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
--        $(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: vtund install_config install_man
--      $(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)
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR)
-+      $(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR)
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
---- vtun-2.4/configure.in      Thu Dec 28 06:35:10 2000
-+++ vtun-2.4/configure.in-p    Tue Feb 13 20:52:44 2001
-@@ -100,6 +100,22 @@
- dnl Check for setproctitle in libutil
- AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE(HAVE_SETPROC_TITLE) )
- 
-+if test "$SSL" = "yes"; then
-+   AC_MSG_RESULT()
-+   AC_CHECKING( for SSL Library and Header files ... )
-+   AC_SEARCH_HEADERS(md5.h blowfish.h,
-+      $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include,
-+      AC_CHECK_LIB(crypto, BF_set_key,
-+          [
-+             LIBS="$LIBS -lcrypto"
-+             AC_DEFINE(HAVE_SSL)
-+          ],
-+          AC_MSG_ERROR( SSL library not found. )
-+      ),
-+      AC_MSG_ERROR( SSL headers not found. )
-+   )
-+fi
-+
- if test "$SHAPER" = "yes"; then
-    AC_DEFINE(HAVE_SHAPER)
- fi
-@@ -127,22 +143,6 @@
-           AC_MSG_ERROR( LZO library not found. )
-       ),
-         AC_MSG_ERROR( LZO headers not found. )
--   )
--fi
--
--if test "$SSL" = "yes"; then
--   AC_MSG_RESULT()
--   AC_CHECKING( for SSL Library and Header files ... )
--   AC_SEARCH_HEADERS(md5.h blowfish.h,
--      $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include,
--      AC_CHECK_LIB(crypto, BF_set_key,
--          [
--             LIBS="$LIBS -lcrypto"
--             AC_DEFINE(HAVE_SSL)
--          ],
--          AC_MSG_ERROR( SSL library not found. )
--      ),
--      AC_MSG_ERROR( SSL headers not found. )
-    )
- fi
-