Force disable tunemu, fix bug #409749

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

4 files changed, 37 insertions, 28 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index cf594b30e807..f35c20ea5128 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.32 2012/03/26 01:44:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.33 2012/03/26 12:40:17 blueness Exp $
+
+  26 Mar 2012; Anthony G. Basile <blueness@gentoo.org> tinc-1.0.18.ebuild,
+  files/fix-ac-arg-enable.patch:
+  Force disable tunemu, fix bug #409749
 
 *tinc-1.0.18 (26 Mar 2012)
 
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 191d63830b63..06ccf8ce70a8 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX fix-ac-arg-enable.patch 2375 RMD160 b7493c76f64b7a8c5826716ca7d7bb60f4af1e4c SHA1 f7add917e0d9e34f5d2bf1fbbaea665c6ed1f2f6 SHA256 d2a1da0071a3e7bf2a13ca29f9dbf6e10dcf6a91da44d3a55a2ed701fe7869c7
+AUX fix-ac-arg-enable.patch 2817 RMD160 db4c7d2956bb78f38640fc6a90818c080cf5bbfc SHA1 df00a50baa730977459c43a1925639f194ffff5e SHA256 ee10420d0d11cdde2baad52ea038724ce598e53eef15f5ad7e582c4d8c826486
 AUX fix-compile-vde-uml.patch 1321 RMD160 e75a27f2420f416bba858a6ff64f1f1d455b29f1 SHA1 6a2bd7ccb7780e61c7f791dc4c76951e50811c95 SHA256 bd31ba111affbabb7c947ce08cf13c15e78620788e50515594cf2ab48a13f09f
 AUX fix-missing-vde.patch 3667 RMD160 a433b5ddb8c3b9a6b22b2471852054efeedddf50 SHA1 071c5b0c40c9f9a7b1676683a9147fe4a4ffd4cf SHA256 47eb44c5c4ed3eefae69c1b5a59f94b9afc31eff62f281ca9211cea422664e61
 AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
@@ -19,13 +19,13 @@ EBUILD tinc-1.0.13.ebuild 1049 RMD160 5d7498f943b260e89662ef2aca40d93d9dc5b4cb S
 EBUILD tinc-1.0.16-r4.ebuild 1911 RMD160 c95042935b31f2efdb9eaa3cdf12a0687ca678e0 SHA1 4343cb7406c309581fb7e5ca4270703820c11403 SHA256 0777921b42dfb2202fbb1725311b88f910234be25c45440b8e04d18b18aa27f6
 EBUILD tinc-1.0.16.ebuild 1070 RMD160 c62b38596f6ad8fc0affb80fa7f0bdfe09775d6b SHA1 09a6d6b8af92be06eeb8e9a361022509f4495256 SHA256 6934f068171dcc6ca6105168e5dbfc9d6e1a9f9515c744a52d3ca80c58ce96d9
 EBUILD tinc-1.0.17.ebuild 1272 RMD160 59dba5ca338b0cfe7bc415a09578227dc5950827 SHA1 4ca73aace2b4c6ade3282e34290756249ee2a7c4 SHA256 d6b8ca9bab09ce250f47d8eb61be9d5f5b30c0d90bd4ce10737d5d7d0a1068e8
-EBUILD tinc-1.0.18.ebuild 1532 RMD160 dd4ffba2031a89fe33804b0860392aad447db75b SHA1 deccf2a79dbd1225a3434d87a54b7f3e2dabc2d0 SHA256 a448916ce17a069155535230c7c9d3067569299cee020b09bd43f8f870d93797
-MISC ChangeLog 5531 RMD160 217007bac703cd48eb9d4d854d6ae867ef96a302 SHA1 d91712e1d545d251995d73075d1f05f9de61943f SHA256 21d354365ebfe12c964a8c8b98aed23416540d046b3ad25035c5c790113591a1
+EBUILD tinc-1.0.18.ebuild 1314 RMD160 b2a8a270964f0ac207d31db3f96b0cc137c52638 SHA1 5126a46d005812461ed2fec0514d61a26e9ffdb8 SHA256 7b23f8de18073d7b638147541ae5d86a37b22e4a52858bdb33afd220478199fb
+MISC ChangeLog 5680 RMD160 c5f0ab0087ed0b027d6a7ce1dca84dd93379ebc4 SHA1 912c69690d9d0068d6a03c390f841ea1a4856861 SHA256 699f5cc7933758895b41c560aa9d4e5ebce37d292e9cfa139437c1080b529233
 MISC metadata.xml 552 RMD160 5c5409d1828ecc369ae2de83f0c37561650ac554 SHA1 5269ecc96eb0fd5ecc66b26570f34ceb90d490df SHA256 7ce6544bd535e945c4c3da2c159fc5c1f4a3cc9f36fd14375fa301b592506fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk9vyfEACgkQl5yvQNBFVTW0bwCfd6WMdbdAgcMvATdGhfhDO/S7
-zi8AoJmjhIqKHb+kthc0Q5AZNrhTr0LQ
-=htFE
+iEYEAREIAAYFAk9wY7sACgkQl5yvQNBFVTU1CQCeLcuReEUF2qk8WNnCasSaVmVm
+iuYAoIyvd/yYM/OjcggqEMy/WeGeTw1n
+=0OhB
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/fix-ac-arg-enable.patch b/net-misc/tinc/files/fix-ac-arg-enable.patch
index fef695211551..ce693a2bb06c 100644
--- a/net-misc/tinc/files/fix-ac-arg-enable.patch
+++ b/net-misc/tinc/files/fix-ac-arg-enable.patch
@@ -1,28 +1,32 @@
-diff -Naur tinc-1.0.18.orig//configure.in tinc-1.0.18/configure.in
---- tinc-1.0.18.orig//configure.in	2012-03-25 09:46:02.000000000 -0400
-+++ tinc-1.0.18/configure.in	2012-03-25 21:24:55.000000000 -0400
-@@ -74,29 +74,43 @@
+diff --git a/configure.in b/configure.in
+index 2ea69f6..7eaeca6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -73,30 +73,44 @@ case $host_os in
+ esac
  
  AC_ARG_ENABLE(uml,
-   AS_HELP_STRING([--enable-uml], [enable support for User Mode Linux]),
+-  AS_HELP_STRING([--enable-uml], [enable support for User Mode Linux]),
 -  [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
 -    uml=true
 -  ]
++  AS_HELP_STRING([--disable-uml], [enable support for User Mode Linux]),
 +  [ AS_IF([test "x$enable_uml" = "xyes"],
 +      [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
 +        uml=true
 +      ],
 +      [uml=false])
 +  ],
-+  [uml=true]
++  [uml=false]
  )
  
  AC_ARG_ENABLE(vde,
-   AS_HELP_STRING([--enable-vde], [enable support for Virtual Distributed Ethernet]),
+-  AS_HELP_STRING([--enable-vde], [enable support for Virtual Distributed Ethernet]),
 -  [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
 -    AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
 -    vde=true
 -  ]
++  AS_HELP_STRING([--disable-vde], [enable support for Virtual Distributed Ethernet]),
 +  [ AS_IF([test "x$enable_vde" = "xyes"],
 +      [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
 +        AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
@@ -30,37 +34,41 @@ diff -Naur tinc-1.0.18.orig//configure.in tinc-1.0.18/configure.in
 +      ],
 +      [vde=false])
 +  ],
-+  [vde=true]
++  [vde=false]
  )
  
  AC_ARG_ENABLE(tunemu,
-   AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]),
+-  AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]),
 -  [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
 -    tunemu=true
 -  ]
++  AS_HELP_STRING([--disable-tunemu], [enable support for the tunemu driver]),
 +  [ AS_IF([test "x$enable_tunemu" = "xyes"],
 +      [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
 +        tunemu=true
 +      ],
 +      [tunemu=false])
 +  ],
-+  [tunemu=true]
++  [tunemu=false]
  )
  
  AC_ARG_WITH(windows2000,
-   AS_HELP_STRING([--with-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
+-  AS_HELP_STRING([--with-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
 -  [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])]
++  AS_HELP_STRING([--without-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
 +  [ AS_IF([test "x$with_windows2000" = "xyes"],
 +      [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])])
 +  ]
  )
  
  AM_CONDITIONAL(UML, test "$uml" = true)
-@@ -177,7 +191,9 @@
+@@ -176,8 +190,10 @@ tinc_OPENSSL
+ 
  dnl Check if support for jumbograms is requested 
  AC_ARG_ENABLE(jumbograms,
-   AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
+-  AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
 -  [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ]
++  AS_HELP_STRING([--disable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
 +  [ AS_IF([test "x$enable_jumbograms" = "xyes"],
 +      [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ])
 +  ]
diff --git a/net-misc/tinc/tinc-1.0.18.ebuild b/net-misc/tinc/tinc-1.0.18.ebuild
index 19c9d5947403..89a519ca37e9 100644
--- a/net-misc/tinc/tinc-1.0.18.ebuild
+++ b/net-misc/tinc/tinc-1.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.18.ebuild,v 1.1 2012/03/26 01:44:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.18.ebuild,v 1.2 2012/03/26 12:40:17 blueness Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo vde +zlib"
+IUSE="+lzo uml vde +zlib"
 
 DEPEND=">=dev-libs/openssl-0.9.7
 	lzo? ( dev-libs/lzo:2 )
@@ -27,15 +27,12 @@ src_prepare() {
 }
 
 src_configure() {
-	# The new DeviceType option can now be used to select UML or VDE
-	# devices without having to recompile.  So we'll set UML by default
-	# since it doesn't pull in any deps, but VDE needs net-misc/vde,
-	# so we'll keep that contingent on a USE flag.
 	econf \
 		--enable-jumbograms \
-		--enable-uml \
-		$(use_enable vde) \
+		--disable-tunemu  \
 		$(use_enable lzo) \
+		$(use_enable uml) \
+		$(use_enable vde) \
 		$(use_enable zlib)
 }