Included patch for configure script that fixes a problem with include search path under gcc 3.1

4 files changed, 104 insertions, 0 deletions

diff --git a/net-misc/vtun/ChangeLog b/net-misc/vtun/ChangeLog
index 7f6d120c92de..294ef4619acf 100644
--- a/net-misc/vtun/ChangeLog
+++ b/net-misc/vtun/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
 # /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
 
+
+*vtun-2.5-r2 (28 April 2002)
+
+  06 June 2002; Mike Jones <ashmodai@gentoo.org> vtun-2.5-r2.ebuild
+
+  Added a patch for the configure script which prevents errors under gcc 3.1 when
+  /usr/include is manually appended to the include search path.
+
 *vtun-2.5-r1 (28 April 2002)
 
   28 May 2002; Preston A. Elder <prez@gentoo.org> vtun-2.5-r1.ebuild
diff --git a/net-misc/vtun/files/digest-vtun-2.5-r2 b/net-misc/vtun/files/digest-vtun-2.5-r2
new file mode 100644
index 000000000000..abf8dfbce137
--- /dev/null
+++ b/net-misc/vtun/files/digest-vtun-2.5-r2
@@ -0,0 +1 @@
+MD5 b29bffeb07e66567e247641919c45b23 vtun-2.5.tar.gz 92510
diff --git a/net-misc/vtun/files/vtun-2.5-r2-gentoo-gcc3.1.patch b/net-misc/vtun/files/vtun-2.5-r2-gentoo-gcc3.1.patch
new file mode 100644
index 000000000000..6158949c7315
--- /dev/null
+++ b/net-misc/vtun/files/vtun-2.5-r2-gentoo-gcc3.1.patch
@@ -0,0 +1,22 @@
+--- vtun/configure	2000-12-28 00:35:10.000000000 -0500
++++ vtun-gentoo/configure	2002-06-06 12:03:43.000000000 -0400
+@@ -1992,7 +1992,9 @@
+ 
+     done 
+     if test "$ac_hdr_found" = "yes" ; then
++	if test "$p" != "/usr/include" ; then
+ 	CPPFLAGS="$CPPFLAGS -I$p"
++	fi
+         echo "$ac_t""($p) yes " 1>&6 
+ 	echo $ac_n "checking for lzo1x_decompress in -llzo""... $ac_c" 1>&6
+ echo "configure:1999: checking for lzo1x_decompress in -llzo" >&5
+@@ -2080,7 +2082,9 @@
+ 
+     done 
+     if test "$ac_hdr_found" = "yes" ; then
++	if test "$p" != "/usr/include" ; then
+ 	CPPFLAGS="$CPPFLAGS -I$p"
++	fi
+         echo "$ac_t""($p) yes " 1>&6 
+ 	echo $ac_n "checking for BF_set_key in -lcrypto""... $ac_c" 1>&6
+ echo "configure:2087: checking for BF_set_key in -lcrypto" >&5
diff --git a/net-misc/vtun/vtun-2.5-r2.ebuild b/net-misc/vtun/vtun-2.5-r2.ebuild
new file mode 100644
index 000000000000..0ef0bdf75e60
--- /dev/null
+++ b/net-misc/vtun/vtun-2.5-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5-r2.ebuild,v 1.1 2002/06/06 16:19:09 ashmodai Exp $
+
+DESCRIPTION="Tunneling software to use the universal tunnel"
+HOMEPAGE="http://vtun.sourceforge.net"
+LICENSE="GPL-2"
+DEPEND=">=sys-libs/zlib-1.1.4
+	>=dev-libs/lzo-1.07
+	ssl? ( >=dev-libs/openssl-0.9.6c-r1 )
+	>=sys-kernel/linux-headers-2.4.18"
+#RDEPEND=""
+SRC_URI="mirror://sourceforge/vtun/${P}.tar.gz"
+S=${WORKDIR}/vtun
+
+src_compile() {
+	if [ -z "`use ssl`" ]
+	then
+		use_opts="--disable-ssl"
+	fi
+	
+	cat ${FILESDIR}/vtun-2.5-r2-gentoo-gcc3.1.patch | patch -p1 || die "couldn't patch for gcc3.1";
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$use_opts || die "./configure failed"
+	mv config.h config.h.orig
+	mv cfg_file.y cfg_file.y.orig
+	sed "s,/* #undef HAVE_LINUX_IF_TUN_H */,#define HAVE_LINUX_IF_TUN_H 1," \
+		config.h.orig >config.h
+	sed "s,expect 18,expect 20," \
+		cfg_file.y.orig >cfg_file.y
+
+	# Rename this, because its from cyrus, we want the openssl one.
+	if [ -f /usr/include/md5.h ]; then
+	    mv /usr/include/md5.h /usr/include/md5.h.vtun_compile
+	fi
+
+	# If this doesnt work, we only remember that we failed, so
+	# we always rename the /etc/include/md5.h file back.
+	emake \
+		ETC_DIR=/etc \
+		VAR_DIR=/var || FAILED=1
+
+	# OK, we're done, rename the cyrus one back to what it was.
+	if [ -f /usr/include/md5.h.vtun_compile -a 
+		! -f /usr/include/md5.h ]; then
+	    mv /usr/include/md5.h.vtun_compile /usr/include/md5.h
+	fi
+	if [ 0$FAILED -ne 0 ]; then
+	    die
+	fi
+}
+
+src_install () {
+	make \
+		prefix=${D}/usr \
+		ETC_DIR=${D}/etc \
+		VAR_DIR=${D}/var \
+		INFO_DIR=${D}/usr/share/info \
+		MAN_DIR=${D}/usr/share/man install || die
+
+	dodoc ChangeLog Credits FAQ README* TODO vtund.conf
+
+	exeinto etc/init.d;
+	newexe ${FILESDIR}/vtun.rc vtun
+
+	insinto etc
+	doins ${FILESDIR}/vtund-start.conf
+}