rpms/filezilla/devel filezilla-3.2.7-bp_check_ipaddress.patch, NONE, 1.1 filezilla.spec, 1.48, 1.49
Nicolas Chauvet
kwizart at fedoraproject.org
Thu Aug 20 13:27:48 UTC 2009
- Previous message: rpms/dvb-apps/devel .cvsignore, 1.12, 1.13 dvb-apps.spec, 1.20, 1.21 sources, 1.12, 1.13
- Next message: rpms/kernel/devel patch-2.6.31-rc6-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1112, 1.1113 drm-r600-kms.patch, 1.2, 1.3 kernel.spec, 1.1728, 1.1729 sources, 1.1070, 1.1071 upstream, 1.984, 1.985 fix-perf-make-man-failure.patch, 1.1, NONE patch-2.6.31-rc6-git5.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kwizart
Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7957
Modified Files:
filezilla.spec
Added Files:
filezilla-3.2.7-bp_check_ipaddress.patch
Log Message:
Fix make check
filezilla-3.2.7-bp_check_ipaddress.patch:
ipaddress.cpp | 107 ++++++++++++++++++++++++++++------------------------------
1 file changed, 52 insertions(+), 55 deletions(-)
--- NEW FILE filezilla-3.2.7-bp_check_ipaddress.patch ---
--- FileZilla3/trunk/tests/ipaddress.cpp 2009/08/16 20:28:41 3326
+++ FileZilla3/trunk/tests/ipaddress.cpp 2009/08/20 13:17:54 3327
@@ -2,9 +2,6 @@
#include "directorylistingparser.h"
#include <cppunit/extensions/HelperMacros.h>
#include <list>
-#ifndef __WXMSW__
-#include <sys/socket.h>
-#endif
/*
* This testsuite asserts the correctness of the
@@ -73,84 +70,84 @@
void CIPAddressTest::testIsRoutableAddress4()
{
// 127.0.0.0/8
- CPPUNIT_ASSERT(IsRoutableAddress(_T("126.255.255.255"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.0.0.0"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.255.255.255"), AF_INET));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("128.0.0.0"), AF_INET));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("126.255.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.0.0.0"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.255.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("128.0.0.0"), CSocket::ipv4));
// 10.0.0.0/8
- CPPUNIT_ASSERT(IsRoutableAddress(_T("9.255.255.255"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.0.0.0"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.255.255.255"), AF_INET));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("11.0.0.0"), AF_INET));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("9.255.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.0.0.0"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.255.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("11.0.0.0"), CSocket::ipv4));
// 169.254.0.0/16
- CPPUNIT_ASSERT(IsRoutableAddress(_T("169.253.255.255"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.0.0"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.255.255"), AF_INET));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("169.255.0.0"), AF_INET));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("169.253.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.0.0"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("169.255.0.0"), CSocket::ipv4));
// 192.168.0.0/16
- CPPUNIT_ASSERT(IsRoutableAddress(_T("192.167.255.255"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.0.0"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.255.255"), AF_INET));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("102.169.0.0"), AF_INET));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("192.167.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.0.0"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("102.169.0.0"), CSocket::ipv4));
// 172.16.0.0/20
- CPPUNIT_ASSERT(IsRoutableAddress(_T("172.15.255.255"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.16.0.0"), AF_INET));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.31.255.255"), AF_INET));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("172.32.0.0"), AF_INET));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("172.15.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.16.0.0"), CSocket::ipv4));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.31.255.255"), CSocket::ipv4));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("172.32.0.0"), CSocket::ipv4));
}
void CIPAddressTest::testIsRoutableAddress6()
{
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::1"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::0"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::2"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("1234:ABCD::1234:ef01"), AF_INET6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::1"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::0"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::2"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("1234:ABCD::1234:ef01"), CSocket::ipv6));
// fe80::/10 (link local)
- CPPUNIT_ASSERT(IsRoutableAddress(_T("fe7f:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("fe80:0000:0000:0000:0000:0000:0000:0000"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("fec0:0000:0000:0000:0000:0000:0000:0000"), AF_INET6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("fe7f:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("fe80:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("fec0:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6));
// fc00::/7 (site local)
- CPPUNIT_ASSERT(IsRoutableAddress(_T("fbff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("fc00:0000:0000:0000:0000:0000:0000:0000"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("fe00:0000:0000:0000:0000:0000:0000:0000"), AF_INET6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("fbff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("fc00:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("fe00:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6));
// IPv4 mapped
// 127.0.0.0/8
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:7eff:ffff"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7f00:0000"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7fff:ffff"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:8000:0000"), AF_INET6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:7eff:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7f00:0000"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7fff:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:8000:0000"), CSocket::ipv6));
// 10.0.0.0/8
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:9ff:ffff"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0a00:0000"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0aff:ffff"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:0b00:0000"), AF_INET6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:9ff:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0a00:0000"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0aff:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:0b00:0000"), CSocket::ipv6));
// 169.254.0.0/16
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9fd:ffff"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:0000"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:ffff"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9ff:0000"), AF_INET6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9fd:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:0000"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9ff:0000"), CSocket::ipv6));
// 192.168.0.0/16
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a7:ffff"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:0000"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:ffff"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a9:0000"), AF_INET6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a7:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:0000"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a9:0000"), CSocket::ipv6));
// 172.16.0.0/20
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac0f:ffff"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac10:0000"), AF_INET6));
- CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac1f:ffff"), AF_INET6));
- CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac20:0000"), AF_INET6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac0f:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac10:0000"), CSocket::ipv6));
+ CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac1f:ffff"), CSocket::ipv6));
+ CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac20:0000"), CSocket::ipv6));
}
Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- filezilla.spec 20 Aug 2009 12:42:59 -0000 1.48
+++ filezilla.spec 20 Aug 2009 13:27:47 -0000 1.49
@@ -2,13 +2,14 @@
Name: filezilla
Version: 3.2.7
-Release: 1%{?fz_rc:_%{?fz_rc}}%{?dist}
+Release: 2%{?fz_rc:_%{?fz_rc}}%{?dist}
Summary: FileZilla FTP, FTPS and SFTP client
Group: Applications/Internet
License: GPLv2+
URL: http://filezilla-project.org/
Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}%{?fz_rc:-%{?fz_rc}}_src.tar.bz2
+Patch0: filezilla-3.2.7-bp_check_ipaddress.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## Needed if autogen.sh is invoked
@@ -43,6 +44,7 @@ FileZilla is a FTP, FTPS and SFTP client
%prep
%setup -q -n %{name}-%{version}%{?fz_rc:-%{?fz_rc}}
+%patch0 -p2 -b bp
# Run autotools if needed
# sh autoconf
@@ -119,8 +121,9 @@ fi || :
%changelog
-* Thu Aug 20 2009 kwizart < kwizart at gmail.com > - 3.2.7-1
+* Thu Aug 20 2009 kwizart < kwizart at gmail.com > - 3.2.7-2
- Update to 3.2.7
+- Backport Fix for ipaddress.cpp at make check
* Mon Aug 3 2009 kwizart < kwizart at gmail.com > - 3.2.7-0.1_rc1
- Update to 3.2.7-rc1
- Previous message: rpms/dvb-apps/devel .cvsignore, 1.12, 1.13 dvb-apps.spec, 1.20, 1.21 sources, 1.12, 1.13
- Next message: rpms/kernel/devel patch-2.6.31-rc6-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1112, 1.1113 drm-r600-kms.patch, 1.2, 1.3 kernel.spec, 1.1728, 1.1729 sources, 1.1070, 1.1071 upstream, 1.984, 1.985 fix-perf-make-man-failure.patch, 1.1, NONE patch-2.6.31-rc6-git5.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list