Fix bug #364923 with rev bump, thanks to Pinkbyte. Drop old.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

7 files changed, 104 insertions, 123 deletions

diff --git a/net-misc/vtun/ChangeLog b/net-misc/vtun/ChangeLog
index 647c78ad4699..b72da5c7b780 100644
--- a/net-misc/vtun/ChangeLog
+++ b/net-misc/vtun/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vtun
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.46 2012/06/11 17:57:01 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.47 2012/06/12 12:13:18 maksbotan Exp $
+
+*vtun-3.0.2-r2 (12 Jun 2012)
+
+  12 Jun 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/vtun-3.0.2-build-racing-condition-fix.patch,
+  +files/vtun-3.0.2-remove-config-presence-check.patch, +vtun-3.0.2-r2.ebuild,
+  -vtun-2.6-r1.ebuild, -vtun-3.0.2.ebuild:
+  Fix bug #364923 with rev bump, thanks to Pinkbyte. Drop old.
 
   11 Jun 2012; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml:
   Add Sergey Popov <admin@pinkbyte.ru> as maintainer
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index e9673b59ee00..a2607eda0e15 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -3,24 +3,24 @@ Hash: SHA1
 
 AUX vtun-2.6-lzo2.patch 2547 RMD160 be0b6b2e2d1c3a123adf4a4f5f6bdc9926407f18 SHA1 e4b074adc5a26a40abd12521458ced2ef8365023 SHA256 3ed5678005e3b8ed7d9f0174174652b91a43041dbacf86f5cfa7de965d507568
 AUX vtun-2.6-makefile.patch 1919 RMD160 9487239d1ac950173de55f7c3950674d13b7af56 SHA1 03bab4451748b5bf713102c8b25fae9c55e3dea3 SHA256 a26d2dd9e7ecb591a822f01ce2ce2bf7f5e7d9e80b45b05f665e63c12cc17653
+AUX vtun-3.0.2-build-racing-condition-fix.patch 563 RMD160 84cd760b8be139955a0480caeb74bb9647888471 SHA1 3c0803f980ecaafca2bf125aba7a7f4060611bb4 SHA256 0dc70be4d65a3253e8eaecc3b5d0d0dc8ef52e023d9064fb85b488153c9ec92a
 AUX vtun-3.0.2-includes.patch 2020 RMD160 eae6a137693f6376c0d6cb1cfa674a6f26f546ef SHA1 462fdac1eb452eae75e179ab7cfe7881205a55d6 SHA256 8dd0204c480437b0c09488d6af70c36ded639bf61eb1aae37e82e0039f39a915
+AUX vtun-3.0.2-remove-config-presence-check.patch 513 RMD160 1b7998f72b1184f73aaa7eda88a69775908c9d95 SHA1 c3c4834d747ef6b570e16a1bb19dee8c9dbf0bd1 SHA256 12c14f8b556a262e908a0285475fc8fb84b282745332aedf3bff43b9654af91d
 AUX vtun.rc 772 RMD160 77ceb021d39aed235291f1c48c6a1c66354fdace SHA1 29aa4f4f625165783e5f2f531310fd5998c18a01 SHA256 15d61c1ee544a69ee67fa580b3ef43d446ef6ebc0f1e91654449e61bc53ff43e
 AUX vtund-start.conf 1174 RMD160 e27c66bb660df80d6444fd4f86aea910a30aa281 SHA1 3299eb74d03d73ecd7da7e49fdda8ca73587d51e SHA256 fce23e42500ac4b2135dfd4940388e4d05c117bba12446a7e1702c5a3342ab03
-DIST vtun-2.6.tar.gz 95637 RMD160 9f666189740b78a88f6b0e2807add3267551198b SHA1 ba6474a551856a7bb55b4cc21d858b8275a2e610 SHA256 fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
 DIST vtun-3.0.2.tar.gz 125777 RMD160 6592251871f7e6b9a7e12b7e07ab0a700d816f57 SHA1 6e2da196c70475e5d3750903b2dad032a7b1e8ac SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6
-EBUILD vtun-2.6-r1.ebuild 1740 RMD160 0551043dec4807d35e776fb219c27a623ac73b38 SHA1 b6c978cd3afcb6581e3efa3cd696d991449a0ec5 SHA256 4a123f9bc4946f1f7e7ff3a1ef2aaf20fd66cfb2003c158af6f813b8434c8ee1
 EBUILD vtun-3.0.2-r1.ebuild 1411 RMD160 ea8c3e0d6678a751901808cf2540be8d441e5b0b SHA1 b9dd5c2b262ce6c9eb1dd10a702b0d07cfaac54e SHA256 8c12bd06ab12712a64eb78452b963484a0496a2040e77de9346fc7e7cfb5d182
-EBUILD vtun-3.0.2.ebuild 1216 RMD160 4f485fb35b1a3f2757f96b456bc7099e109cebc1 SHA1 0d4b5c6e9ac5bd47179039f25e51cef0304db516 SHA256 25fafb9f4d8327aa470f3a09bc48ae530a9c91ac31266a9468ffe90d5166ece3
-MISC ChangeLog 6010 RMD160 f05cc29e040cb4f585ca80fae0b44126ee5e93fc SHA1 f4304e93dc1feed0cb184e32b4ffa5620d6fd02d SHA256 280db280b31c60d52a75d112efe7b3c8558d9974b3981606c325d1e48dbce955
+EBUILD vtun-3.0.2-r2.ebuild 1430 RMD160 b139a9a6da2f22ef8d756842bd22b0e68118aefd SHA1 40fdd7fe2e1ea1c9ae5ad68615923588f2d7f0f3 SHA256 5d136c1ffd79f9895dec4b4e4dd148500acc952a7c7fce3f8a6aa101872f769c
+MISC ChangeLog 6332 RMD160 8193ccad8c352dc1d825813175c1fe08e50c729b SHA1 9e5ea39ab586b41163b3cfc0ee1b3b1ca01229c2 SHA256 dd1f3736f0ceb004da31acb143e480f35948bbd555f9eb76f002a6b33e8e31f0
 MISC metadata.xml 359 RMD160 36855a2b6f51e74fdf14ae21f62acb2fd47f14c6 SHA1 546a05efdf5021ae7fd4e86328ff455a00883c69 SHA256 4d0647b6a16b9f160f9b2d3ae0d0d56117fd2dea5e8ddbe7829b3b3fd5ae7e30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP1jGEAAoJEAmJmMX429rejqwH/2kUsPeXFxJsCnFEzmFQqicr
-p1VTlj3a4e5y/AJ1U67zrM+9NUiMBDtmzH0ZAm5dMqbi30k9N3PzRSozEQmQ+AsY
-wIC+TlMIq1+7ejiCzrgYiD1ov7Ln2X4kHR4WmRYK4hsMJhuoLAUT7gZxwkb4iXzY
-d9irQH16Jkv706QRacn16BeFV9VVsi0ilqJ2YhOe8ek2tld337u0gbk2A7yLjCaE
-zurWlz4LkKTJhwZPqcDOtVZ1/az1CLDH9Dwa662FWd/aIQHXuc+hnfsGVt59qVsY
-e0l2PGZ9ZdbAHglS8Q4Ye1sc0xf6ete099Wh7HecHNqjQwIRodNAADN0UrVu29k=
-=wJhD
+iQEcBAEBAgAGBQJP1zJ7AAoJEAmJmMX429rewrEH/3XZ4ovRrz8V6NqSEfY96ndm
+boduHvy+3PD5bbune0TA4Lmq5yywk12nHQJnzFd3TdtK/7qPuqHuz03lRajbd8y6
+3jRs9ZejupY1/lQpXg1Codlko33rv+hrcvn4yWwfVuYB8ndrhROds3zSykVm+lib
+J2GUWfCQEli8rHNMPPFpzdVVr0msm7pGxxg/CbrkVFpB3N60dWJimMyBK7Ss7dsQ
+3mekjafuhk4ASCWEt1Da2GUFifUWi9KZnoVWZjIO/4sVoIW6TazTN6Ddw4HjOE3C
+lZXNA/GsPgHz/Y/mNdSQV9HuVdlXwYdUYOpUeNLtwUvc4BB2VA3ObiJXWsdDTJs=
+=jx/u
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch b/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch
new file mode 100644
index 000000000000..6fa765282ec3
--- /dev/null
+++ b/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	2012-06-12 00:20:24.359206241 +0400
++++ Makefile.in	2012-06-12 00:22:46.735301510 +0400
+@@ -60,10 +60,12 @@
+ vtund: $(OBJS)
+ 	$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
+ 
+-cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h
++cfg_file.tab.h:
+ 	$(YACC) $(YACCFLAGS) -b cfg_file cfg_file.y
+ 
+-cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h
++cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h cfg_file.tab.h
++
++cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h cfg_file.tab.h
+ 	$(LEX) $(LEXFLAGS) cfg_file.l > cfg_file.lex.c 
+ 
+ depend:
diff --git a/net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch b/net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
new file mode 100644
index 000000000000..15b3bf273c34
--- /dev/null
+++ b/net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2012-06-11 23:31:11.416075337 +0400
++++ Makefile.in	2012-06-11 23:31:21.247324839 +0400
+@@ -86,9 +86,7 @@
+ 
+ install_config: 
+ 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
+-	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
+-	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
+-	fi
++	$(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
+ 
+ install: vtund install_config install_man
+ 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
diff --git a/net-misc/vtun/vtun-2.6-r1.ebuild b/net-misc/vtun/vtun-2.6-r1.ebuild
deleted file mode 100644
index e2259e15adcb..000000000000
--- a/net-misc/vtun/vtun-2.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6-r1.ebuild,v 1.8 2010/10/28 09:40:53 ssuominen Exp $
-
-inherit eutils
-
-IUSE="ssl"
-
-S=${WORKDIR}/vtun
-DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression"
-SRC_URI="mirror://sourceforge/vtun/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net/"
-KEYWORDS="alpha ~amd64 ~ppc sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-# NOTE: you also need the tun/tap driver compiled into your kernel
-#		to do tun/tap tunneling
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=dev-libs/lzo-2
-	sys-devel/bison
-	ssl? ( >=dev-libs/openssl-0.9.6c )"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-	ssl? ( >=dev-libs/openssl-0.9.6c )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-lzo2.patch
-}
-
-src_compile() {
-	local use_opts
-	use_opts=""
-	if ! use ssl
-	then
-		use_opts="--disable-ssl"
-	fi
-
-	econf ${use_opts} --with-ssl-headers=/usr/include/openssl || die
-
-	make || die
-}
-
-src_install () {
-	make DESTDIR="${D}" prefix=/usr \
-		mandir=/usr/share/man \
-		infodir=/usr/share/info \
-		datadir=/usr/share \
-		sysconfdir=/etc \
-		localstatedir=/var/lib \
-		install || die
-
-	dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
-
-	newinitd "${FILESDIR}"/vtun.rc vtun
-
-	insinto etc
-	doins "${FILESDIR}"/vtund-start.conf
-}
-
-pkg_postinst () {
-	einfo ">>> You will need the Universal TUN/TAP driver compiled into"
-	einfo ">>> your kernel or as a module to use the associated tunnel"
-	einfo ">>> modes in vtun. 2.2 users will need to download and install"
-	einfo ">>> the driver from http://vtun.sourceforge.net/tun"
-}
diff --git a/net-misc/vtun/vtun-3.0.2-r2.ebuild b/net-misc/vtun/vtun-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..2b5b19786a97
--- /dev/null
+++ b/net-misc/vtun/vtun-3.0.2-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r2.ebuild,v 1.1 2012/06/12 12:13:18 maksbotan Exp $
+
+EAPI=4
+
+inherit eutils linux-info
+
+DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://vtun.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="lzo socks5 ssl zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	lzo? ( dev-libs/lzo:2 )
+	zlib? ( sys-libs/zlib )
+	socks5? ( net-proxy/dante )"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+DOCS="ChangeLog Credits FAQ README README.Setup README.Shaper TODO"
+
+CONFIG_CHECK="~TUN"
+
+src_prepare() {
+	sed -i Makefile.in \
+		-e '/^LDFLAGS/s|=|+=|g' \
+		|| die "sed Makefile"
+	epatch "${FILESDIR}"/${P}-includes.patch
+	# remove unneeded checking for /etc/vtund.conf
+	epatch "${FILESDIR}"/${P}-remove-config-presence-check.patch
+	# fix build racing condition with bison and lex files, wrt bug #364923
+	epatch "${FILESDIR}"/${P}-build-racing-condition-fix.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable ssl) \
+		$(use_enable zlib) \
+		$(use_enable lzo) \
+		$(use_enable socks5 socks) \
+		--enable-shaper
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/vtun.rc vtun
+	insinto etc
+	doins "${FILESDIR}"/vtund-start.conf
+}
diff --git a/net-misc/vtun/vtun-3.0.2.ebuild b/net-misc/vtun/vtun-3.0.2.ebuild
deleted file mode 100644
index 65159f2db246..000000000000
--- a/net-misc/vtun/vtun-3.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2.ebuild,v 1.4 2010/05/18 13:39:21 hwoarang Exp $
-
-EAPI=2
-DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="lzo socks5 ssl zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )
-	socks5? ( net-proxy/dante )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-src_configure() {
-	econf $(use_enable ssl) \
-		$(use_enable zlib) \
-		$(use_enable lzo) \
-		$(use_enable socks5 socks) \
-		--enable-shaper
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
-	newinitd "${FILESDIR}"/vtun.rc vtun
-	insinto etc
-	doins "${FILESDIR}"/vtund-start.conf
-}
-
-pkg_postinst() {
-	elog "You will need the Universal TUN/TAP driver compiled into"
-	elog "your kernel or as a module to use the associated tunnel"
-	elog "modes in vtun."
-}