64bit fixes; bug 164782; thanks to Jose Quinteiro for the patch

Package-Manager: portage-2.1.2-r9

diff --git a/net-misc/portfwd/ChangeLog b/net-misc/portfwd/ChangeLog
index a4e9e151a16005c42fce705c56406909ce2ca6a2..1fda89787acd5ff0abcc0b54240831a775dd692b 100644 (file)
--- a/net-misc/portfwd/ChangeLog
+++ b/net-misc/portfwd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/portfwd
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/ChangeLog,v 1.18 2006/10/26 09:49:43 pva Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/ChangeLog,v 1.19 2007/02/20 13:32:00 blubb Exp $
+
+  20 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  +files/portfwd-0.28-64bit.patch, portfwd-0.28.ebuild:
+  64bit fixes; bug 164782; thanks to Jose Quinteiro for the patch
 
   26 Oct 2006; Peter Volkov <pva@gentoo.org> -portfwd-0.26_rc6.ebuild,
   -portfwd-0.26_rc6-r1.ebuild, -portfwd-0.26.ebuild:

diff --git a/net-misc/portfwd/Manifest b/net-misc/portfwd/Manifest
index 059d41972eb967b90d6c4885bc21fcb93fafe7ba..bc7d9330c64ea64e84ad5344c29f7c4a26170673 100644 (file)
--- a/net-misc/portfwd/Manifest
+++ b/net-misc/portfwd/Manifest
@@ -1,3 +1,7 @@
+AUX portfwd-0.28-64bit.patch 816 RMD160 3336e89ba4927c29b3b67bddf65f76c44f53cc92 SHA1 2a73064149365dffe1ea78da31836d0aff803b90 SHA256 77f2141f9bb4305f13770ef44e3de41a4d30efc4865ea8845877612fed16d624
+MD5 19e452250ca472786bd36adcbb0db37a files/portfwd-0.28-64bit.patch 816
+RMD160 3336e89ba4927c29b3b67bddf65f76c44f53cc92 files/portfwd-0.28-64bit.patch 816
+SHA256 77f2141f9bb4305f13770ef44e3de41a4d30efc4865ea8845877612fed16d624 files/portfwd-0.28-64bit.patch 816
 AUX portfwd.confd 55 RMD160 2bf30aa2f25b2c731a53ca79447acecb17a44d3b SHA1 f25fbbe3b9271f94e13797eabde323918daba944 SHA256 3a76b31f281da7c6489cf1523ae91d7f3ce0020c05f65ac8b1e958441f0d67e7
 MD5 2e5d079e07d2511ef3695aa36140dc2f files/portfwd.confd 55
 RMD160 2bf30aa2f25b2c731a53ca79447acecb17a44d3b files/portfwd.confd 55
@@ -7,14 +11,14 @@ MD5 ffc48b45008b806173e4a719e023b7c4 files/portfwd.init 887
 RMD160 c541c275b6e580666a6f72f8f6645e848c5389f7 files/portfwd.init 887
 SHA256 b8d7e92f8e5a8321845d43098fa0a1a5f5bcdaecaf3879e38279204f8a3770e7 files/portfwd.init 887
 DIST portfwd-0.28.tar.gz 173202 RMD160 06a33ad1ee19eb5f8a497155724ca1010dc15fc5 SHA1 5cbb241deb47821f681b9a970349468fd8c2e882 SHA256 fc5b00ef1b30ce7b5a25cb1dce9c5d2036f4d12c1d926763e6e130e5358b2bed
-EBUILD portfwd-0.28.ebuild 1616 RMD160 074188f4a394409b1712d12c934ebb21cc4c055a SHA1 91cdd0fd9b8df54c9875274cb305757391cb7b28 SHA256 3af24b13278af21470f5c8c06a183c31ee79ff97a4c6457f70df6ac37d8ef862
-MD5 3e447178d758a32e23a757b29476c1d8 portfwd-0.28.ebuild 1616
-RMD160 074188f4a394409b1712d12c934ebb21cc4c055a portfwd-0.28.ebuild 1616
-SHA256 3af24b13278af21470f5c8c06a183c31ee79ff97a4c6457f70df6ac37d8ef862 portfwd-0.28.ebuild 1616
-MISC ChangeLog 2382 RMD160 9f0c8e5bdfb6a0f73a4451350315573b9773370a SHA1 f3eb376c1cfaea57b307be68e06cdf88d68c67d3 SHA256 91b64b7efb6022f110473ae1edbb58aa2cffe83d4b7f3f72a81a292c97520d07
-MD5 86a2c13befdce7590abf4dc52505efe7 ChangeLog 2382
-RMD160 9f0c8e5bdfb6a0f73a4451350315573b9773370a ChangeLog 2382
-SHA256 91b64b7efb6022f110473ae1edbb58aa2cffe83d4b7f3f72a81a292c97520d07 ChangeLog 2382
+EBUILD portfwd-0.28.ebuild 1665 RMD160 51ed6001f892edda096db72db2749ba3788ba682 SHA1 be4cb106ba36b6baf71f89e147eec030abca6aeb SHA256 7220fd160064ebe0499d007453bf457f37ce4e908f0bdadfbde6987f1fea88c2
+MD5 7289a9b8a8314568e1b7d151b66c0c1f portfwd-0.28.ebuild 1665
+RMD160 51ed6001f892edda096db72db2749ba3788ba682 portfwd-0.28.ebuild 1665
+SHA256 7220fd160064ebe0499d007453bf457f37ce4e908f0bdadfbde6987f1fea88c2 portfwd-0.28.ebuild 1665
+MISC ChangeLog 2556 RMD160 1ea5028390cf8643414997a5377777f9a4a30e41 SHA1 37dfa1e31dccc2a0c5ce21c1796fe54857aed0cc SHA256 e242e0a377e7532d1595cca8174da19f394f78775ddb996ed6638fb7ca06461a
+MD5 464d83021b80aac2d9dc0b80273379fa ChangeLog 2556
+RMD160 1ea5028390cf8643414997a5377777f9a4a30e41 ChangeLog 2556
+SHA256 e242e0a377e7532d1595cca8174da19f394f78775ddb996ed6638fb7ca06461a ChangeLog 2556
 MISC metadata.xml 350 RMD160 6412f6ba53296f60661bcd456fa4a5a95794f5d9 SHA1 72436418be386935ca840824a7fa71844baa7782 SHA256 45fa9ad36766d7f9440e5fee69f53c4053bedba9ed75f6c408095445638549d3
 MD5 9374ccd6dc124124ef21c7e46ec8603a metadata.xml 350
 RMD160 6412f6ba53296f60661bcd456fa4a5a95794f5d9 metadata.xml 350

diff --git a/net-misc/portfwd/files/portfwd-0.28-64bit.patch b/net-misc/portfwd/files/portfwd-0.28-64bit.patch
new file mode 100644 (file)
index 0000000..8bd1494
--- /dev/null
+++ b/net-misc/portfwd/files/portfwd-0.28-64bit.patch
@@ -0,0 +1,30 @@
+--- src/proto_map.cc        28 Jan 2004 19:14:10 -0000      1.4
++++ src/proto_map.cc        1 Feb 2007 06:21:03 -0000
+@@ -16,11 +16,11 @@
+   map_list   = map_l;
+   fragile    = 0; /* false */
+ 
+-  ftp_actv   = (int) actv;
++  ftp_actv   =  actv != NULL;
+   if (ftp_actv)
+     actv_ip = *actv;
+ 
+-  ftp_pasv   = (int) pasv;
++  ftp_pasv   =  pasv != NULL;
+   if (ftp_pasv)
+     pasv_ip = *pasv;
+ 
+--- src/proto_map.hpp       28 Jan 2004 19:14:10 -0000      1.3
++++ src/proto_map.hpp       1 Feb 2007 06:21:03 -0000
+@@ -16,8 +16,8 @@
+ private:
+   vector<int>       *port_list;
+   vector<host_map*> *map_list;
+-  int               ftp_actv;
+-  int               ftp_pasv;
++  bool              ftp_actv;
++  bool              ftp_pasv;
+   struct ip_addr    actv_ip;
+   struct ip_addr    pasv_ip;
+   int               uid;
+

diff --git a/net-misc/portfwd/portfwd-0.28.ebuild b/net-misc/portfwd/portfwd-0.28.ebuild
index 6ded52e6143cd4ed321ef082b0729dc97059b692..c183cd61341e97390c872ea62ddba32025f493eb 100644 (file)
--- a/net-misc/portfwd/portfwd-0.28.ebuild
+++ b/net-misc/portfwd/portfwd-0.28.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/portfwd-0.28.ebuild,v 1.5 2006/10/26 09:39:00 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/portfwd-0.28.ebuild,v 1.6 2007/02/20 13:32:00 blubb Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.4"
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="Port Forwarding Daemon"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
@@ -22,6 +22,8 @@ src_unpack() {
        unpack ${A}
        cd ${WORKDIR}/${P/_/}
 
+       epatch "${FILESDIR}"/${P}-64bit.patch
+
        cd src
        sed -iorig \
                -e "s:^CFLAGS   =.*:CFLAGS   = @CFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \