diff -Nru kodi-vfs-sftp-1.0.5/azure-pipelines.yml kodi-vfs-sftp-1.0.6/azure-pipelines.yml --- kodi-vfs-sftp-1.0.5/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/azure-pipelines.yml 2020-04-08 12:46:14.000000000 +0000 @@ -0,0 +1,65 @@ +variables: + app_id: 'vfs.sftp' + +trigger: + branches: + include: + - Leia + - releases/* + paths: + include: + - '*' + exclude: + - 'debian/*' + +jobs: + - job: Windows + + pool: + vmImage: 'VS2017-Win2016' + + strategy: + matrix: + Win32: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: Win32 + CONFIGURATION: Release + Win64: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: x64 + CONFIGURATION: Release + Win64-UWP: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: x64 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + ARM64-UWP: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: ARM64 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + + workspace: + clean: all + + steps: + + - script: | + cd .. + git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git kodi + cd $(Build.SourcesDirectory) + mkdir build + cd build + mkdir "definition/$(app_id)" + echo $(app_id) . . > definition/$(app_id)/$(app_id).txt + mklink /J "$(Pipeline.Workspace)/$(app_id)" "$(Build.SourcesDirectory)" + + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(WINSTORE) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons' + + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: '--build . --config $(CONFIGURATION) --target $(app_id)' diff -Nru kodi-vfs-sftp-1.0.5/debian/changelog kodi-vfs-sftp-1.0.6/debian/changelog --- kodi-vfs-sftp-1.0.5/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-vfs-sftp (1.0.5-1~bionic) bionic; urgency=low +kodi-vfs-sftp (1.0.6-1~bionic) bionic; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-vfs-sftp-1.0.5/debian/control kodi-vfs-sftp-1.0.6/debian/control --- kodi-vfs-sftp-1.0.5/debian/control 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/debian/control 2013-05-31 22:59:22.000000000 +0000 @@ -1,9 +1,9 @@ Source: kodi-vfs-sftp Priority: extra -Maintainer: Arne Morten Kvarving +Maintainer: Nobody Build-Depends: debhelper (>= 9.0.0), cmake, - kodi-addon-dev, libp8-platform-dev, libssh-dev -Standards-Version: 3.9.4 + kodi-addon-dev, libssh-dev +Standards-Version: 4.1.2 Section: libs Package: kodi-vfs-sftp diff -Nru kodi-vfs-sftp-1.0.5/debian/copyright kodi-vfs-sftp-1.0.6/debian/copyright --- kodi-vfs-sftp-1.0.5/debian/copyright 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/debian/copyright 2013-05-31 22:59:22.000000000 +0000 @@ -1,20 +1,30 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: vfs.sftp -Source: +Source: https://github.com/xbmc/vfs.sftp Files: * -Copyright: - -License: - - +Copyright: 2005-2020 Team Kodi +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. . - + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines Files: debian/* -Copyright: 2013 Arne Morten Kvarving +Copyright: 2020 Team Kodi + 2013 Arne Morten Kvarving License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,6 +41,3 @@ . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff -Nru kodi-vfs-sftp-1.0.5/debian/source/format kodi-vfs-sftp-1.0.6/debian/source/format --- kodi-vfs-sftp-1.0.5/debian/source/format 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/debian/source/format 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff -Nru kodi-vfs-sftp-1.0.5/depends/common/libssh/10-prevent-error-C4996.patch kodi-vfs-sftp-1.0.6/depends/common/libssh/10-prevent-error-C4996.patch --- kodi-vfs-sftp-1.0.5/depends/common/libssh/10-prevent-error-C4996.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/depends/common/libssh/10-prevent-error-C4996.patch 2020-04-08 12:46:14.000000000 +0000 @@ -0,0 +1,28 @@ +From d3ea7a06200023159f122582b60c5d2139be26d9 Mon Sep 17 00:00:00 2001 +From: Alwin Esch +Date: Sat, 28 Mar 2020 22:25:32 +0100 +Subject: [PATCH] prevent error C4996 + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e603c2..7a09f5d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,6 +42,11 @@ macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source buil + # Copy library files to a lib sub-directory + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") + ++# Prevent "error C4996: ..." on windows builds ++if (WIN32) ++ add_compile_options(/wd4996) ++endif() ++ + # search for libraries + if (WITH_ZLIB) + find_package(ZLIB REQUIRED) +-- +2.20.1 + diff -Nru kodi-vfs-sftp-1.0.5/depends/windowsstore/openssl/CMakeLists.txt kodi-vfs-sftp-1.0.6/depends/windowsstore/openssl/CMakeLists.txt --- kodi-vfs-sftp-1.0.5/depends/windowsstore/openssl/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/depends/windowsstore/openssl/CMakeLists.txt 2020-04-08 12:46:14.000000000 +0000 @@ -5,13 +5,16 @@ check_symbol_exists(_X86_ "Windows.h" _X86_) check_symbol_exists(_AMD64_ "Windows.h" _X64_) check_symbol_exists(_ARM_ "Windows.h" _ARM_) +check_symbol_exists(_ARM64_ "Windows.h" _ARM64_) if(_X86_) - set(OPENSSL_ARCHIVE_NAME openssl-1.0.2o-win10-Win32-v141) + set(OPENSSL_ARCHIVE_NAME openssl-1.1.1d-win10-win32-v141-20200105) elseif(_X64_) - set(OPENSSL_ARCHIVE_NAME openssl-1.0.2o-win10-x64-v141) + set(OPENSSL_ARCHIVE_NAME openssl-1.1.1d-win10-x64-v141-20200105) elseif(_ARM_) - set(OPENSSL_ARCHIVE_NAME openssl-1.0.2o-win10-ARM-v141) + set(OPENSSL_ARCHIVE_NAME openssl-1.1.1d-win10-arm-v141-20200105) +elseif(_ARM64_) + set(OPENSSL_ARCHIVE_NAME openssl-1.1.1d-win10-arm64-v141-20200105) else() message(FATAL_ERROR "Unsupported architecture") endif() diff -Nru kodi-vfs-sftp-1.0.5/depends/windowsstore/openssl/deps.txt kodi-vfs-sftp-1.0.6/depends/windowsstore/openssl/deps.txt --- kodi-vfs-sftp-1.0.5/depends/windowsstore/openssl/deps.txt 1970-01-01 00:00:00.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/depends/windowsstore/openssl/deps.txt 2020-04-08 12:46:14.000000000 +0000 @@ -0,0 +1 @@ +zlib diff -Nru kodi-vfs-sftp-1.0.5/.gitignore kodi-vfs-sftp-1.0.6/.gitignore --- kodi-vfs-sftp-1.0.5/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/.gitignore 2020-04-08 12:46:14.000000000 +0000 @@ -0,0 +1,50 @@ +# build artifacts +build/ +vfs.*/addon.xml + +# Debian build files +debian/changelog +debian/files +debian/*.log +debian/*.substvars +debian/.debhelper/ +debian/tmp/ +debian/kodi-vfs-*/ +obj-x86_64-linux-gnu/ + +# commonly used editors +# vim +*.swp + +# Eclipse +*.project +*.cproject +.classpath +*.sublime-* +.settings/ + +# KDevelop 4 +*.kdev4 + +# gedit +*~ + +# CLion +/.idea + +# clion +.idea/ + +# to prevent add after a "git format-patch VALUE" and "git add ." call +/*.patch + +# Visual Studio Code +.vscode + +# to prevent add if project code opened by Visual Studio over CMake file +.vs/ + +# General MacOS +.DS_Store +.AppleDouble +.LSOverride diff -Nru kodi-vfs-sftp-1.0.5/LICENSE.md kodi-vfs-sftp-1.0.6/LICENSE.md --- kodi-vfs-sftp-1.0.5/LICENSE.md 1970-01-01 00:00:00.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/LICENSE.md 2020-04-08 12:46:14.000000000 +0000 @@ -0,0 +1,264 @@ +The GNU General Public License, Version 2, June 1991 (GPLv2) +============================================================ + +> Copyright (C) 1989, 1991 Free Software Foundation, Inc. +> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + + +Preamble +-------- + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to most +of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you can +do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a +fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show them +these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer +you this license which gives you legal permission to copy, distribute and/or +modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced by +others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish +to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's free +use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + +Terms And Conditions For Copying, Distribution And Modification +--------------------------------------------------------------- + +**0.** This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included without +limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is not +restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +**1.** You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the Program +a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at +your option offer warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you also +meet all of these conditions: + +* **a)** You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + +* **b)** You must cause any work that you distribute or publish, that in whole + or in part contains or is derived from the Program or any part thereof, to + be licensed as a whole at no charge to all third parties under the terms of + this License. + +* **c)** If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the entire whole, +and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +**3.** You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and 2 +above provided that you also do one of the following: + +* **a)** Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above on + a medium customarily used for software interchange; or, + +* **b)** Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + +* **c)** Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only for + noncommercial distribution and only if you received the program in object + code or executable form with such an offer, in accord with Subsection b + above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all the +source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source code +from the same place counts as distribution of the source code, even though third +parties are not compelled to copy the source along with the object code. + +**4.** You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +**5.** You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you do +not accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +**6.** Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +**7.** If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution of +the Program by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain +entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and the +section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +**8.** If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +**9.** The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose any +version ever published by the Free Software Foundation. + +**10.** If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + + +No Warranty +----------- + +**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff -Nru kodi-vfs-sftp-1.0.5/README.md kodi-vfs-sftp-1.0.6/README.md --- kodi-vfs-sftp-1.0.5/README.md 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/README.md 2020-04-08 12:46:14.000000000 +0000 @@ -1,14 +1,17 @@ # VFS SFTP addon for Kodi -This is a [Kodi](http://kodi.tv) VFS addon to support SFTP file systems. +This is a [Kodi](https://kodi.tv) VFS addon to support SFTP file systems. -[![Build Status](https://travis-ci.org/xbmc/vfs.sftp.svg?branch=master)](https://travis-ci.org/xbmc/vfs.sftp) -[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/vfs.sftp?svg=true)](https://ci.appveyor.com/project/xbmc/vfs-sftp) +[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) +[![Build Status](https://travis-ci.org/xbmc/vfs.sftp.svg?branch=Leia)](https://travis-ci.org/xbmc/vfs.sftp/branches) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.vfs.sftp?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=54&branchName=Leia) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/vfs.sftp/job/Leia/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fvfs.sftp/branches/) + ## Build instructions -When building the addon you have to use the correct branch depending on which version of Kodi you're building against. -For example, if you're building the `master` branch of Kodi you should checkout the `master` branch of this repository. +When building the addon you have to use the correct branch depending on which version of Kodi you're building against. +If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename. Also make sure you follow this README from the branch in question. ### Linux @@ -16,11 +19,11 @@ The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` -2. `git clone https://github.com/xbmc/vfs.sftp.git` +1. `git clone --branch Leia https://github.com/xbmc/xbmc.git kodi` +2. `git clone --branch Leia https://github.com/xbmc/vfs.sftp.git` 3. `cd vfs.sftp && mkdir build && cd build` -4. `cmake -DADDONS_TO_BUILD=vfs.sftp -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` +4. `cmake -DADDONS_TO_BUILD=vfs.sftp -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../kodi/kodi-build/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons` 5. `make` -The addon files will be placed in `../../xbmc/kodi-build/addons` so if you build Kodi from source and run it directly +The addon files will be placed in `../../kodi/kodi-build/addons` so if you build Kodi from source and run it directly the addon will be available as a system addon. diff -Nru kodi-vfs-sftp-1.0.5/src/SFTPFile.cpp kodi-vfs-sftp-1.0.6/src/SFTPFile.cpp --- kodi-vfs-sftp-1.0.5/src/SFTPFile.cpp 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/src/SFTPFile.cpp 2020-04-08 12:46:14.000000000 +0000 @@ -1,21 +1,9 @@ /* - * Copyright (C) 2005-2019 Team Kodi - * https://kodi.tv - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kodi; see the file COPYING. If not, see - * . + * Copyright (C) 2005-2020 Team Kodi + * https://kodi.tv * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #include "SFTPSession.h" diff -Nru kodi-vfs-sftp-1.0.5/src/SFTPSession.cpp kodi-vfs-sftp-1.0.6/src/SFTPSession.cpp --- kodi-vfs-sftp-1.0.5/src/SFTPSession.cpp 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/src/SFTPSession.cpp 2020-04-08 12:46:14.000000000 +0000 @@ -1,21 +1,9 @@ /* - * Copyright (C) 2005-2019 Team Kodi - * https://kodi.tv - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kodi; see the file COPYING. If not, see - * . + * Copyright (C) 2005-2020 Team Kodi + * https://kodi.tv * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #include "SFTPSession.h" diff -Nru kodi-vfs-sftp-1.0.5/src/SFTPSession.h kodi-vfs-sftp-1.0.6/src/SFTPSession.h --- kodi-vfs-sftp-1.0.5/src/SFTPSession.h 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/src/SFTPSession.h 2020-04-08 12:46:14.000000000 +0000 @@ -1,23 +1,13 @@ /* - * Copyright (C) 2005-2019 Team Kodi - * https://kodi.tv - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kodi; see the file COPYING. If not, see - * . + * Copyright (C) 2005-2020 Team Kodi + * https://kodi.tv * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ +#pragma once + #include #include #include diff -Nru kodi-vfs-sftp-1.0.5/vfs.sftp/addon.xml.in kodi-vfs-sftp-1.0.6/vfs.sftp/addon.xml.in --- kodi-vfs-sftp-1.0.5/vfs.sftp/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 +++ kodi-vfs-sftp-1.0.6/vfs.sftp/addon.xml.in 2020-04-08 12:46:14.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -22,12 +22,15 @@ zeroconf="_sftp-ssh._tcp" library_@PLATFORM@="@LIBRARY_FILENAME@"/> - SSH File Transfer Protocol support - The SSH File Transfer Protocol (also Secure File Transfer Protocol, or SFTP) is a network protocol that provides file access, file transfer, and file management over any reliable data stream. + SSH File Transfer Protocol support + The SSH File Transfer Protocol (also Secure File Transfer Protocol, or SFTP) is a network protocol that provides file access, file transfer, and file management over any reliable data stream. This addon allows file access to data in it. @PLATFORM@ - GPL-2.0 + GPL-2.0-or-later https://github.com/xbmc/vfs.sftp + + icon.png +