Fix building with newer glibc #248100 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 75 insertions, 22 deletions

diff --git a/net-misc/htun/ChangeLog b/net-misc/htun/ChangeLog
index 775dd544d592..1dabf3e9ec5e 100644
--- a/net-misc/htun/ChangeLog
+++ b/net-misc/htun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/htun
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/ChangeLog,v 1.7 2008/04/21 17:58:57 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/ChangeLog,v 1.8 2009/01/14 03:47:53 vapier Exp $
+
+  14 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/htun-0.9.5-glibc.patch, htun-0.9.5.ebuild:
+  Fix building with newer glibc #248100 by Diego E. Pettenò.
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/net-misc/htun/Manifest b/net-misc/htun/Manifest
index b31906d0d3b5..13771a15aa84 100644
--- a/net-misc/htun/Manifest
+++ b/net-misc/htun/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX htun-0.9.5-glibc.patch 1137 RMD160 632d0e7fe86153ee53492f57f58a256f06a99a28 SHA1 faa1e1ed3948d2b65a4f6a0ed1bf3a94c34d5b00 SHA256 b5004bca39c1449d0d69386dccc41cca248389d063d41cb0dc56ba72df5de279
 DIST htun-0.9.5.tar.gz 63683 RMD160 24076d183d25370aa2584541b9c2419f3e0c28a9 SHA1 3549fcff01bb059c4500356cd48fcf44e81e6937 SHA256 1f8259a3a8ae583170816f5028329f3a7157f87f927da9c0a911a5fb9be263a1
-EBUILD htun-0.9.5.ebuild 1115 RMD160 c5b426f0037043de1964544d3078ae142b24f81a SHA1 c61b18f18656037e19f076d8c1593d08661b0bc4 SHA256 651d5b10d3381bc1194da67d47b4b9154b80e202ff3a9f45f6df80454e8d0553
-MISC ChangeLog 1053 RMD160 7823f199bb1f8c8069a0c2d42de0fcb1966b6de6 SHA1 5cf1966074e63746bb8d09042904cad4bbc720fb SHA256 5f3c2da56fb92d1d57c008e315d52db5951cd65c942de696c8e8d0c80334f268
+EBUILD htun-0.9.5.ebuild 1313 RMD160 1ef2facd72f1a6ca07ec754e9b56fc3008df9063 SHA1 0750668f9b8674775075aa361a698f9cda1ed9c7 SHA256 e6e1cef867c161bb46927697b385ac47c882919b7457b1e1cbc16caba3d09a5b
+MISC ChangeLog 1218 RMD160 e3daed893035c6525bbb67ead53f2ed393af8099 SHA1 da0d61f7746a946737bc65c7fe688db768d810fd SHA256 e7dd1ac1db73d86f9ba9c38318ed13d1b7b826e0d3c73d9d96f6fcebd4b2597f
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIDNXmyuNVb5qfaOYRAn25AKCKQIw5HTlNL75CV6Oi2QKtQBTeQgCfW7mI
-8RkYDM96Thd+dLIM0US4Rh0=
-=9eQ2
+iEYEARECAAYFAkltYGwACgkQn/5bYzqsSmG6hwCfYEyByKGe5VcEMC6OwMniTbxL
+MIEAn0fXt1YwGNkMLoLZuzPKyUG9rDPO
+=aTgj
 -----END PGP SIGNATURE-----
diff --git a/net-misc/htun/files/htun-0.9.5-glibc.patch b/net-misc/htun/files/htun-0.9.5-glibc.patch
new file mode 100644
index 000000000000..e568e443586c
--- /dev/null
+++ b/net-misc/htun/files/htun-0.9.5-glibc.patch
@@ -0,0 +1,40 @@
+get things building with glibc-2.8
+
+http://bugs.gentoo.org/248100
+
+--- include/common.h
++++ include/common.h
+@@ -23,6 +23,7 @@
+ #ifndef __COMMON_H
+ #define __COMMON_H
+ 
++#include <limits.h>
+ #include <netinet/in.h>
+ #include <time.h>
+ #include "queue.h"
+--- src/queue.c
++++ src/queue.c
+@@ -34,8 +34,8 @@
+ #define q_lock(q, cnt) do { int _old; \
+     pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED,&_old); \
+     pthread_cleanup_push(q_sempost,q); \
+-    pthread_cleanup_push(q_release,q) \
+-    pthread_cleanup_push(q_decrement, cnt) \
++    pthread_cleanup_push(q_release,q); \
++    pthread_cleanup_push(q_decrement, cnt); \
+     pthread_mutex_lock(&((q)->mutex)); \
+     (*(cnt))++; \
+     pthread_testcancel()
+@@ -43,9 +43,9 @@
+ /* q_unlock() is called when intentionally exiting critical section */
+ #define q_unlock(cond) \
+     pthread_testcancel(); \
+-    pthread_cleanup_pop(1) \
+-    pthread_cleanup_pop(1) \
+-    pthread_cleanup_pop(1) \
++    pthread_cleanup_pop(1); \
++    pthread_cleanup_pop(1); \
++    pthread_cleanup_pop(1); \
+     if(cond) pthread_cond_broadcast(cond); \
+     pthread_setcanceltype(_old,NULL); } while(0)
+ 
diff --git a/net-misc/htun/htun-0.9.5.ebuild b/net-misc/htun/htun-0.9.5.ebuild
index 0e8b6016f86f..161a37e86ade 100644
--- a/net-misc/htun/htun-0.9.5.ebuild
+++ b/net-misc/htun/htun-0.9.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/htun-0.9.5.ebuild,v 1.7 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/htun-0.9.5.ebuild,v 1.8 2009/01/14 03:47:53 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Project to tunnel IP traffic over HTTP"
 HOMEPAGE="http://htun.runslinux.net/"
@@ -9,27 +11,34 @@ SRC_URI="http://htun.runslinux.net/dist/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-
 IUSE=""
 
-DEPEND="virtual/libc
-	dev-util/yacc"
+DEPEND="dev-util/yacc"
 RDEPEND=""
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc.patch #248100
+	sed -i \
+		-e '/^CFLAGS/s:=\(.*\)-O :+=\1 $(CPPFLAGS) :' \
+		-e '/LDFLAGS/s:=:+=:' \
+		src/Makefile || die
+}
 
-	cd ${S}/src
-	make all || die
+src_compile() {
+	cd src
+	emake all || die
 }
 
 src_install() {
-	dosbin ${S}/src/htund
-
+	dosbin src/htund || die
 	insinto /etc
-	doins ${S}/doc/htund.conf
-	dodoc doc/*
+	doins doc/htund.conf
+	dodoc doc/* README
+}
 
-	einfo
+pkg_postinst() {
 	einfo "NOTE: HTun requires the Universal TUN/TAP module"
 	einfo "available in the Linux kernel.  Make sure you have"
 	einfo "compiled the tun.o driver as a module!"
@@ -41,5 +50,4 @@ src_install() {
 	einfo "  # mknod /dev/net/tun c 10 200"
 	einfo "  # echo \"alias char-major-10-200 tun\" >> /etc/modules.conf"
 	einfo "  # depmod -e"
-	einfo
 }