Added patch to fix compilation with gcc 4.4, fixes bug 277733

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 93 insertions, 4 deletions

diff --git a/net-wireless/chillispot/ChangeLog b/net-wireless/chillispot/ChangeLog
index 28b52bde5a36..66eee278fca1 100644
--- a/net-wireless/chillispot/ChangeLog
+++ b/net-wireless/chillispot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/chillispot
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/chillispot/ChangeLog,v 1.20 2008/06/17 02:54:36 darkside Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/chillispot/ChangeLog,v 1.21 2009/07/18 21:17:52 vostorga Exp $
+
+  18 Jul 2009; Víctor Ostorga <vostorga@gentoo.org>
+  chillispot-1.1.0.ebuild, +files/chillispot-1.1.0-gcc44.patch:
+  Added patch to fix compilation with gcc 4.4, fixes bug 277733
 
   17 Jun 2008; Jeremy Olexa <darkside@gentoo.org>
   -files/chillispot-0.94-src.patch:
diff --git a/net-wireless/chillispot/chillispot-1.1.0.ebuild b/net-wireless/chillispot/chillispot-1.1.0.ebuild
index ecabba7dbe57..f62eedb9fd4c 100644
--- a/net-wireless/chillispot/chillispot-1.1.0.ebuild
+++ b/net-wireless/chillispot/chillispot-1.1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/chillispot/chillispot-1.1.0.ebuild,v 1.4 2008/02/26 19:16:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/chillispot/chillispot-1.1.0.ebuild,v 1.5 2009/07/18 21:17:52 vostorga Exp $
+
+inherit eutils
 
 DESCRIPTION="open source captive portal or wireless LAN access point controller"
 HOMEPAGE="http://www.chillispot.info/"
@@ -19,6 +21,8 @@ src_unpack() {
 	cd "${S}"
 	chmod 644 doc/*.conf
 	find . -exec chmod go-w '{}' \;
+
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_install() {
diff --git a/net-wireless/chillispot/files/chillispot-1.1.0-gcc44.patch b/net-wireless/chillispot/files/chillispot-1.1.0-gcc44.patch
new file mode 100644
index 000000000000..aa296b8828ac
--- /dev/null
+++ b/net-wireless/chillispot/files/chillispot-1.1.0-gcc44.patch
@@ -0,0 +1,81 @@
+diff -NrU5 chillispot-1.1.0.original/src/tun.c chillispot-1.1.0/src/tun.c
+--- chillispot-1.1.0.original/src/tun.c	2009-07-18 20:50:38.000000000 +0000
++++ chillispot-1.1.0/src/tun.c	2009-07-18 21:06:53.000000000 +0000
+@@ -364,11 +364,11 @@
+   tun_sifflags(this, IFF_UP | IFF_RUNNING); /* TODO */
+   close(fd);
+   this->addrs++;
+   return 0;
+ 
+-#elif defined (__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
++#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
+ 
+   int fd;
+   struct ifaliasreq      areq;
+ 
+   /* TODO: Is this needed on FreeBSD? */
+@@ -443,11 +443,11 @@
+   ifr.ifr_dstaddr.sa_family = AF_INET;
+ 
+ #if defined(__linux__)
+   ifr.ifr_netmask.sa_family = AF_INET;
+ 
+-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
+   ((struct sockaddr_in *) &ifr.ifr_addr)->sin_len = 
+     sizeof (struct sockaddr_in);
+   ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_len = 
+     sizeof (struct sockaddr_in);
+ #endif
+@@ -495,11 +495,11 @@
+     this->netmask.s_addr = netmask->s_addr;
+ #if defined(__linux__)
+     ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = 
+       netmask->s_addr;
+ 
+-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
+     ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = 
+       netmask->s_addr;
+ 
+ #elif defined(__sun__)
+     ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = 
+@@ -583,11 +583,11 @@
+     }
+   }
+   close(fd);
+   return 0;
+   
+-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
+ 
+ struct {
+   struct rt_msghdr rt;
+   struct sockaddr_in dst;
+   struct sockaddr_in gate;
+@@ -672,11 +672,11 @@
+ {
+ 
+ #if defined(__linux__)
+   struct ifreq ifr;
+ 
+-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
+   char devname[IFNAMSIZ+5]; /* "/dev/" + ifname */
+   int devnum;
+   struct ifaliasreq areq;
+   int fd;
+ 
+@@ -720,11 +720,11 @@
+   (*tun)->devname[IFNAMSIZ] = 0;
+   
+   ioctl((*tun)->fd, TUNSETNOCSUM, 1); /* Disable checksums */
+   return 0;
+   
+-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
+ 
+   /* Find suitable device */
+   for (devnum = 0; devnum < 255; devnum++) { /* TODO 255 */ 
+     snprintf(devname, sizeof(devname), "/dev/tun%d", devnum);
+     devname[sizeof(devname)] = 0;