CVS commit: pkgsrc/net/filezilla

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Aug 25 20:04:07 UTC 2017

Modified Files:
        pkgsrc/net/filezilla: distinfo
Added Files:
        pkgsrc/net/filezilla/patches: patch-src_engine_uri.cpp
            patch-src_include_uri.h

Log Message:
Don't overlap with libfilezilla.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/filezilla/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/filezilla/patches/patch-src_engine_uri.cpp \
    pkgsrc/net/filezilla/patches/patch-src_include_uri.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/filezilla/distinfo
diff -u pkgsrc/net/filezilla/distinfo:1.35 pkgsrc/net/filezilla/distinfo:1.36
--- pkgsrc/net/filezilla/distinfo:1.35  Mon May 29 12:51:52 2017
+++ pkgsrc/net/filezilla/distinfo       Fri Aug 25 20:04:07 2017
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.35 2017/05/29 12:51:52 wiz Exp $
+$NetBSD: distinfo,v 1.36 2017/08/25 20:04:07 joerg Exp $
 
 SHA1 (FileZilla_3.25.2_src.tar.bz2) = c8da156611e7f8017505f425496afe22456f4c9d
 RMD160 (FileZilla_3.25.2_src.tar.bz2) = b0efa8cba24d950332c2ca845f330913faaec79b
 SHA512 (FileZilla_3.25.2_src.tar.bz2) = 6c6feeec0b1bd15ff2c3fecbec22bca9c79f4263e0d1855c6d27a3df54128cfd837f0a546d1540b87b4645e620b57961b8ac0f01bd52748832f5625139c39764
 Size (FileZilla_3.25.2_src.tar.bz2) = 4712781 bytes
 SHA1 (patch-configure) = 8bf5736d17ed78fe0a1d4f910194bba9f03c854e
+SHA1 (patch-src_engine_uri.cpp) = 9dcd565323a3160682f18267c6ba6803366f6070
+SHA1 (patch-src_include_uri.h) = 86bfbd334007db05ec597bf84276508616b5d232
 SHA1 (patch-src_putty_unix_uxshare.c) = 0c3102c10b742c461fe032f081d1a642c6fd6a59

Added files:

Index: pkgsrc/net/filezilla/patches/patch-src_engine_uri.cpp
diff -u /dev/null pkgsrc/net/filezilla/patches/patch-src_engine_uri.cpp:1.1
--- /dev/null   Fri Aug 25 20:04:07 2017
+++ pkgsrc/net/filezilla/patches/patch-src_engine_uri.cpp       Fri Aug 25 20:04:07 2017
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_engine_uri.cpp,v 1.1 2017/08/25 20:04:07 joerg Exp $
+
+Moved to libfilezilla.
+
+--- src/engine/uri.cpp.orig    2017-02-11 13:27:28.000000000 +0000
++++ src/engine/uri.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include "uri.h"
+ 
++#include <libfilezilla/encode.hpp>
+ #include <libfilezilla/iputils.hpp>
+ 
+ namespace fz {
+@@ -223,6 +224,7 @@ bool uri::empty() const
+       return host_.empty() && path_.empty();
+ }
+ 
++#if 0
+ std::string percent_encode(std::string const& s, bool keep_slashes)
+ {
+       std::string ret;
+@@ -293,5 +295,6 @@ std::string percent_decode(std::string c
+ 
+       return ret;
+ }
++#endif
+ 
+ }
Index: pkgsrc/net/filezilla/patches/patch-src_include_uri.h
diff -u /dev/null pkgsrc/net/filezilla/patches/patch-src_include_uri.h:1.1
--- /dev/null   Fri Aug 25 20:04:07 2017
+++ pkgsrc/net/filezilla/patches/patch-src_include_uri.h        Fri Aug 25 20:04:07 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_include_uri.h,v 1.1 2017/08/25 20:04:07 joerg Exp $
+
+Moved to libfilezilla.
+
+--- src/include/uri.h.orig     2017-08-25 16:23:33.414154308 +0000
++++ src/include/uri.h
+@@ -47,12 +47,6 @@ private:
+       bool parse_authority(std::string && authority);
+ };
+ 
+-std::string percent_encode(std::string const& s, bool keep_slashes = false);
+-std::string percent_encode(std::wstring const& s, bool keep_slashes = false);
+-std::wstring percent_encode_w(std::wstring const& s, bool keep_slashes = false);
+-
+-std::string percent_decode(std::string const& s);
+-
+ }
+ 
+ #endif