From a315d2f278b56eb3c7a786e4c0e336d95c6dddbb Mon Sep 17 00:00:00 2001
From: Markos Chandras <hwoarang@gentoo.org>
Date: Sun, 11 Jul 2010 10:01:26 +0000
Subject: [PATCH] =?utf8?q?Revbump.=20Fixes=20multiple=20issues.=20Bug=20#2?=
 =?utf8?q?61745.=20Thanks=20to=20Ren=C3=A9=20Kjellerup=20<rk.katana.steel@?=
 =?utf8?q?gmail.com>=20Package-Manager:=20portage-2.2=5Frc67/cvs/Linux=20x?=
 =?utf8?q?86=5F64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 net-misc/hamachi/ChangeLog                    | 12 +++++-
 net-misc/hamachi/Manifest                     | 15 ++-----
 .../hamachi/files/tuncfg-forcebuild.patch     | 23 ++++++++++
 ...4.ebuild => hamachi-0.9.9.9_p20-r5.ebuild} | 43 ++++++++++++-------
 4 files changed, 63 insertions(+), 30 deletions(-)
 create mode 100644 net-misc/hamachi/files/tuncfg-forcebuild.patch
 rename net-misc/hamachi/{hamachi-0.9.9.9_p20-r4.ebuild => hamachi-0.9.9.9_p20-r5.ebuild} (60%)

diff --git a/net-misc/hamachi/ChangeLog b/net-misc/hamachi/ChangeLog
index c162a9f59a4c..b87ea26582a4 100644
--- a/net-misc/hamachi/ChangeLog
+++ b/net-misc/hamachi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/hamachi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/ChangeLog,v 1.15 2009/09/08 17:11:21 ikelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/ChangeLog,v 1.16 2010/07/11 10:01:26 hwoarang Exp $
+
+*hamachi-0.9.9.9_p20-r5 (11 Jul 2010)
+
+  11 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  -hamachi-0.9.9.9_p20-r4.ebuild, +hamachi-0.9.9.9_p20-r5.ebuild,
+  +files/tuncfg-forcebuild.patch:
+  Revbump. Fixes multiple issues. Bug #261745. Thanks to René Kjellerup
+  <rk.katana.steel@gmail.com> for the patches and all the ebuild QA fixes
 
   08 Sep 2009; Mike Auty <ikelos@gentoo.org> hamachi-0.9.9.9_p20-r4.ebuild:
   Making CONFIG_CHECK non-fatal for userland ebuilds, see bug 283320.
diff --git a/net-misc/hamachi/Manifest b/net-misc/hamachi/Manifest
index af738c194e5e..822481e6492f 100644
--- a/net-misc/hamachi/Manifest
+++ b/net-misc/hamachi/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hamachi.confd 485 RMD160 23abf2e0a1c11a88acdf99e179379fc499c48bf2 SHA1 cc3d3c4ec0e84622eb1cefeb6c40c2e4c9de224f SHA256 f2ef14119acc285f7c945b316890cc5a3219b7e71232bb8aa6ad508407839b22
 AUX hamachi.initd.2 1331 RMD160 2b219fea4682d5b95d4f910c6865a4eda47b36b2 SHA1 b47f0cb2a7ecd044e63a1c9e520b0bc3a9d647a5 SHA256 6b864ffe8acb60490df28d1cb7df2b59f1aae7400a99cd0f90bec73753d01d60
+AUX tuncfg-forcebuild.patch 660 RMD160 bf3502c6e679fd3c7e6b2ed7917f50280d5c0cd9 SHA1 03dd8c22172c5847f57dc6d4fbe5fb8e6c5afb87 SHA256 252011a2f9272d7546f766345e43961780ff904a71345067a7a6ede057e83500
 AUX tuncfg.initd 370 RMD160 5d5c884a8a8745af4db7c1f1f0ee6230e7c42d1c SHA1 fd023110044bdf568de05749a9de85947566114a SHA256 b885dbf0af46284764644ede1fefe08817e8e15b0cc49eb5ec5965822f4139b2
 DIST hamachi-0.9.9.9-20-lnx-pentium.tar.gz 111300 RMD160 7aac53fa9bf678cc1dac6a4b0f33a9b1d93159c1 SHA1 898fe754e5a95eeeaf26996b9e773d4ee1c7f76d SHA256 9377947eed6b8518911a7ee1a0047630ba4ed123e41bff79998e813875cc63dd
 DIST hamachi-0.9.9.9-20-lnx.tar.gz 344866 RMD160 b3af2549fe19aca352200c5fb101e8cd1822fc5d SHA1 c3dfb636ec6abbd8438dc8737fea957e3a854d14 SHA256 9e4b733558377d0c971ee2a19e04c0f5956e069033e8d13865f7c4dcb6d7f31b
-EBUILD hamachi-0.9.9.9_p20-r4.ebuild 1971 RMD160 6ac48f01b60ee02a47c2397385e0eaff252572bd SHA1 c8efba1703c49e65626f5c1bad7601824786940e SHA256 3e4be58b462b80562f0da4e75ee1690c3c3c7b8ceff5d7d9af46e6018a02e1f9
-MISC ChangeLog 2314 RMD160 9f1db89fe66f6c6f28d2e5c1db1bba65b37dceb7 SHA1 bb20039057a79e2f0c41123e7057a865736f3418 SHA256 362ba78b12db80253ec94d922db4464cfd815ad815b371965ee011e40e7adf31
+EBUILD hamachi-0.9.9.9_p20-r5.ebuild 2465 RMD160 608560a146d55d260da1a0393c0784f24943620e SHA1 3fc961b5ccd962d5c51a208027142576450b44d2 SHA256 8e01d4c29eeeb100553567c7b8ef33afc3f971946a53f3e6dffb3c4eadb92854
+MISC ChangeLog 2656 RMD160 363b5b3c8bf82d0c07b958077a9a4080e0a5daef SHA1 30949050b0dbe9c96f28e1cedb4e79efff3b03df SHA256 24ccc9fa017ff4c862cd02d470311d9ec931cbf723ec1fabb12096572cf81e9d
 MISC metadata.xml 372 RMD160 0a8482bdc91be5999645844bc1e92be291573a2d SHA1 3da77a94e0fceb13f38cd3458833a93a588dbef5 SHA256 d000074801ecda0f31e2ca8dbe60562a3c4e7b66fae7b3ab05ac3c3b2a34a397
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqmkEAACgkQu7rWomwgFXpNHQCfW5JwcR2zEnpQgHpR4zZJDNZF
-O5AAn1OCa4rlnVbBJNDAySy2WH1aNGAE
-=dpPH
------END PGP SIGNATURE-----
diff --git a/net-misc/hamachi/files/tuncfg-forcebuild.patch b/net-misc/hamachi/files/tuncfg-forcebuild.patch
new file mode 100644
index 000000000000..992885e1bac6
--- /dev/null
+++ b/net-misc/hamachi/files/tuncfg-forcebuild.patch
@@ -0,0 +1,23 @@
+diff -u --unidirectional-new-file tuncfg-old/Makefile tuncfg/Makefile
+--- tuncfg-old/Makefile	2006-06-20 21:47:28.000000000 +0200
++++ tuncfg/Makefile	2010-06-19 17:03:25.000000000 +0200
+@@ -1,5 +1,5 @@
+ tuncfg:
+-
++	${CC} ${CFLAGS} -O0 -o tuncfg tuncfg.c
+ clean:
+ 	rm -f tuncfg
+ 
+Only in tuncfg-old/: tuncfg
+diff -u --unidirectional-new-file tuncfg-old/tuncfg.c tuncfg/tuncfg.c
+--- tuncfg-old/tuncfg.c	2006-06-20 21:47:28.000000000 +0200
++++ tuncfg/tuncfg.c	2010-06-19 17:03:25.000000000 +0200
+@@ -272,7 +272,7 @@
+ skip:
+ 		for (i=0; i<ctx_n; i++)
+ 		{
+-			unsigned long v[2];
++			unsigned int v[2];
+ 			char cmd[256];
+ 			
+ 			if (! FD_ISSET(ctx[i].fd, &fdr))
diff --git a/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild b/net-misc/hamachi/hamachi-0.9.9.9_p20-r5.ebuild
similarity index 60%
rename from net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild
rename to net-misc/hamachi/hamachi-0.9.9.9_p20-r5.ebuild
index c43080469b10..f686dee3dfb8 100644
--- a/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild
+++ b/net-misc/hamachi/hamachi-0.9.9.9_p20-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild,v 1.3 2009/09/08 17:11:21 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r5.ebuild,v 1.1 2010/07/11 10:01:26 hwoarang Exp $
 
 inherit eutils linux-info
 
@@ -17,14 +17,9 @@ SRC_URI="sse? ( http://files.hamachi.cc/linux/${MY_P}.tar.gz )
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="sse"
-RESTRICT="strip mirror"
+RESTRICT="mirror"
+QA_PRESTRIPPED="/opt/${PN}/bin/hamachi"
 
-# Set workdir for both hamachi versions
-if use sse; then
-	S=${WORKDIR}/${MY_P}
-else
-	S=${WORKDIR}/${MY_P}-pentium
-fi
 
 pkg_preinst() {
 	# Add group "hamachi" & user "hamachi"
@@ -36,26 +31,38 @@ pkg_setup() {
 	einfo "Checking your kernel configuration for TUN/TAP support."
 	CONFIG_CHECK="~TUN"
 	check_extra_config
+# Set workdir for both hamachi versions
+	if use sse; then
+		S=${WORKDIR}/${MY_P}
+	else
+		S=${WORKDIR}/${MY_P}-pentium
+	fi
 }
 
 src_compile() {
+	# Patching Makefile and tuncfg source code
+	epatch ${FILESDIR}/tuncfg-forcebuild.patch
+	# forcing compile of tuncfg
+	rm -f ${S}/tuncfg/tuncfg
 	# Compile Tuncfg
-	make -sC "${S}"/tuncfg || die "Compiling of tunecfg failed"
+	emake -sC ${S}/tuncfg || die "Compiling of tunecfg failed"
 }
 
 src_install() {
 	# Hamachi
 	einfo "Installing Hamachi"
-	insinto /usr/bin
+	dodir /opt/${PN}/bin
+	insinto /opt/${PN}/bin
 	insopts -m0755
-	doins hamachi
-	dosym /usr/bin/hamachi /usr/bin/hamachi-init
+	doins hamachi || die "Couldn't Install hamachi"
+	dosym /opt/${PN}/bin/hamachi /usr/bin/hamachi || die "Couldn't create hamachi symlinks"
+	dosym /opt/${PN}/bin/hamachi /usr/bin/hamachi-init || die "Couldn't create hamachi symlinks"
 
 	# Tuncfg
 	einfo "Installing Tuncfg"
-	insinto /usr/sbin
 	insopts -m0700
 	doins tuncfg/tuncfg
+	dosym /opt/${PN}/bin/tuncfg /usr/sbin/tuncfg
 
 	# Create log directory
 	dodir /var/log/${PN}
@@ -67,7 +74,11 @@ src_install() {
 	newinitd "${FILESDIR}"/hamachi.initd.2 hamachi
 
 	# Docs
-	dodoc CHANGES README LICENSE LICENSE.openssh LICENSE.openssl LICENSE.tuncfg
+	dodir /opt/${PN}/licenses
+	insinto /opt/${PN}/licenses
+	insopts -m0644
+	doins LICENSE LICENSE.openssh LICENSE.openssl LICENSE.tuncfg
+	dodoc CHANGES README
 
 }
 
@@ -79,5 +90,5 @@ pkg_postinst() {
 	einfo "If the 'hamachi' command shows no output, use the following command"
 	einfo "to extract the hamachi executable either with app-arch/upx or"
 	einfo "app-arch/upx-ucl:"
-	einfo "/opt/bin/upx -d /usr/bin/hamachi"
+	einfo "/opt/bin/upx -d /opt/${PN}/bin/hamachi"
 }
-- 
2.26.2