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

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 96 insertions, 6 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/Manifest b/net-wireless/chillispot/Manifest
index 9ffa92d84037..03a6f1b9e7ae 100644
--- a/net-wireless/chillispot/Manifest
+++ b/net-wireless/chillispot/Manifest
@@ -1,9 +1,10 @@
 AUX chillispot 823 RMD160 d23bb68f059450e9cbdbc22f7f9644eaa2766902 SHA1 0c950b465e83f73140e7017e3e87e1c14c1e6773 SHA256 5197468cfbf6205151df3753c6903a0f21a0d5aa384777604e88caebc83841f1
+AUX chillispot-1.1.0-gcc44.patch 2963 RMD160 10ff2f9e9e2dc2c2a01e30b1344208731e76de07 SHA1 e232f08f4b869651615b5991a850d24b318948a2 SHA256 2e80b4c570fcc3b52f1400a0280ea5e3ebd3154b3a67c449c01171408dce60ff
 DIST chillispot-0.99.tar.gz 304559 RMD160 42d2b1ca63cc0702ad20acc85c620af4aa8222f2 SHA1 a558fa3a3e734c5282c4d7104da35fb0c648d130 SHA256 048e1db984b8bcb155d2181617eafe223b0f70ff1bb20b9794f65abbeb31e1c5
 DIST chillispot-1.0.tar.gz 440103 RMD160 752ab3adc4313059c2752b11ec5ba2eee9cebc2a SHA1 5191a840df60070b7fce8da5b0ab098dc13d71ed SHA256 ea00bf63d420f515b9ec034eff6ca04c517459232899b7582f8435b7c097eebf
 DIST chillispot-1.1.0.tar.gz 452749 RMD160 f882609eb1ca1d18d4692435c82ba1261044c9a2 SHA1 8030b3527d7d620d0f0d14d64a94a2111fd90283 SHA256 b505ab963af8423ef8ae844951ef05fe1554630b448f1174074e9881cb474a01
 EBUILD chillispot-0.99.ebuild 933 RMD160 415dbec9bbe5482358db64d38e62c78310c95e28 SHA1 a7aec137a014ce477c26dbd8933a0b89c9ad0190 SHA256 80480052e23af836b4a0d5d66861b4dd59fa68f9b8e561d88456bec70ace41c6
 EBUILD chillispot-1.0.ebuild 882 RMD160 da1552ce9e417835e4a670c9c7e6f989f8ac4e93 SHA1 f95691666b3ad0642a8e3d1d8a3e5b1d7999e188 SHA256 5213a9930e26657c1676715cfb3ffd311ebca3e6314d4e98ab3d1be562dafdb4
-EBUILD chillispot-1.1.0.ebuild 899 RMD160 cb6e0cb625ec765b0686ad68a03fc97862365614 SHA1 5ef70629f5c909dfad6f6d98fb59f316a2090b4a SHA256 a8e92674f9ffd3f1c60c91fbca15152d2ee9f71e4f49c590b82520a24e2a5f2b
-MISC ChangeLog 2922 RMD160 d7fd9f8172cc216726719a610333f98988861c71 SHA1 8571cc51d45717fcd7059503798956225b961588 SHA256 682dbb735b265b63d77707b553910269f984feb86f24fd9ebc97004abf3b94f4
+EBUILD chillispot-1.1.0.ebuild 956 RMD160 cf84314e46869786b35dad76a7c4d9bcea9d9b24 SHA1 3d5bf077af9dab2371e8c8191df805f44dd9e11d SHA256 60d08d88d8e6f710a74ee3ca6ac6abd6b83a1d585ea6a7967bb627ee5db39e46
+MISC ChangeLog 3104 RMD160 69e5f7877c3c3f111a0c849738220d0ac591bf9a SHA1 501dc4e2e92ce6e0797085110adff0d4bd23aadd SHA256 6ee62a67594ebd234a8b3f49919f84031c91408c0cf17c81090c7e127ced609a
 MISC metadata.xml 663 RMD160 1616ad21a72f1dc29bf9dee0a75e77378b88c997 SHA1 693798f2143d67ccb29aecd2e1578c747bdc44af SHA256 ab1d2f078efa313af2dce6e73fcfcf86e7974d7d58fd7d0eee852b0e3707618b
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;