open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update icewind/smb to 3.5.3

Browse Source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/32632/head
Robin Appelman 3 years ago committed by Simon L. (Rebase PR Action)
parent b952066140
commit 85a879894f
13 changed files with 45 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      apps/files_external/3rdparty/autoload.php
  2. 2
      apps/files_external/3rdparty/composer.json
  3. 16
      apps/files_external/3rdparty/composer.lock
  4. 2
      apps/files_external/3rdparty/composer/InstalledVersions.php
  5. 2
      apps/files_external/3rdparty/composer/autoload_classmap.php
  6. 2
      apps/files_external/3rdparty/composer/autoload_namespaces.php
  7. 2
      apps/files_external/3rdparty/composer/autoload_psr4.php
  8. 15
      apps/files_external/3rdparty/composer/autoload_real.php
  9. 14
      apps/files_external/3rdparty/composer/installed.json
  10. 10
      apps/files_external/3rdparty/composer/installed.php
  11. 9
      apps/files_external/3rdparty/icewind/smb/src/System.php
  12. 2
      apps/files_external/3rdparty/icewind/smb/src/Wrapped/Connection.php
  13. 4
      apps/files_external/3rdparty/icewind/smb/src/Wrapped/Parser.php

5
apps/files_external/3rdparty/autoload.php vendored
Unescape View File

@ -2,6 +2,11 @@
// autoload.php @generated by Composer
if (PHP_VERSION_ID < 50600) {
echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
exit(1);
}
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit98fe9b281934250b3a93f69a5ce843b3::getLoader();

2
apps/files_external/3rdparty/composer.json vendored
Unescape View File

@ -9,6 +9,6 @@
},
"require": {
"icewind/streams": "0.7.4",
"icewind/smb": "3.5.2"
"icewind/smb": "3.5.3"
}
}

16
apps/files_external/3rdparty/composer.lock generated vendored
Unescape View File

@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "524c99fd87297e01d004eb5a4e53b04c",
"content-hash": "f376ee0d775d5d7f1fbac7730eeaff0e",
"packages": [
{
"name": "icewind/smb",
"version": "v3.5.2",
"version": "v3.5.3",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/SMB.git",
"reference": "0a425bd21acf7ae112b135dca34640e1b1a825c3"
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/0a425bd21acf7ae112b135dca34640e1b1a825c3",
"reference": "0a425bd21acf7ae112b135dca34640e1b1a825c3",
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/3e25d3116111064ec45a0e1b351fc4baf396ca43",
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43",
"shasum": ""
},
"require": {
@ -49,9 +49,9 @@
"description": "php wrapper for smbclient and libsmbclient-php",
"support": {
"issues": "https://github.com/icewind1991/SMB/issues",
"source": "https://github.com/icewind1991/SMB/tree/v3.5.2"
"source": "https://github.com/icewind1991/SMB/tree/v3.5.3"
},
"time": "2022-01-20T14:51:51+00:00"
"time": "2022-05-27T15:00:33+00:00"
},
{
"name": "icewind/streams",
@ -107,5 +107,5 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "2.2.0"
"plugin-api-version": "2.3.0"
}

2
apps/files_external/3rdparty/composer/InstalledVersions.php vendored
Unescape View File

@ -21,6 +21,8 @@ use Composer\Semver\VersionParser;
* See also https://getcomposer.org/doc/07-runtime.md#installed-versions
*
* To require its presence, you can require `composer-runtime-api ^2.0`
*
* @final
*/
class InstalledVersions
{

2
apps/files_external/3rdparty/composer/autoload_classmap.php vendored
Unescape View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = $vendorDir;
return array(

2
apps/files_external/3rdparty/composer/autoload_namespaces.php vendored
Unescape View File

@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = $vendorDir;
return array(

2
apps/files_external/3rdparty/composer/autoload_psr4.php vendored
Unescape View File

@ -2,7 +2,7 @@
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = $vendorDir;
return array(

15
apps/files_external/3rdparty/composer/autoload_real.php vendored
Unescape View File

@ -25,20 +25,11 @@ class ComposerAutoloaderInit98fe9b281934250b3a93f69a5ce843b3
require __DIR__ . '/platform_check.php';
spl_autoload_register(array('ComposerAutoloaderInit98fe9b281934250b3a93f69a5ce843b3', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit98fe9b281934250b3a93f69a5ce843b3', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
}
}
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);

14
apps/files_external/3rdparty/composer/installed.json vendored
Unescape View File

@ -2,17 +2,17 @@
"packages": [
{
"name": "icewind/smb",
"version": "v3.5.2",
"version_normalized": "3.5.2.0",
"version": "v3.5.3",
"version_normalized": "3.5.3.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/SMB.git",
"reference": "0a425bd21acf7ae112b135dca34640e1b1a825c3"
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/0a425bd21acf7ae112b135dca34640e1b1a825c3",
"reference": "0a425bd21acf7ae112b135dca34640e1b1a825c3",
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/3e25d3116111064ec45a0e1b351fc4baf396ca43",
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43",
"shasum": ""
},
"require": {
@ -25,7 +25,7 @@
"phpunit/phpunit": "^8.5|^9.3.8",
"psalm/phar": "^4.3"
},
"time": "2022-01-20T14:51:51+00:00",
"time": "2022-05-27T15:00:33+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -46,7 +46,7 @@
"description": "php wrapper for smbclient and libsmbclient-php",
"support": {
"issues": "https://github.com/icewind1991/SMB/issues",
"source": "https://github.com/icewind1991/SMB/tree/v3.5.2"
"source": "https://github.com/icewind1991/SMB/tree/v3.5.3"
},
"install-path": "../icewind/smb"
},

10
apps/files_external/3rdparty/composer/installed.php vendored
Unescape View File

@ -5,7 +5,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => '0bed61f949bc7a8c69cd154919e78b704e28c99e',
'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
'name' => 'files_external/3rdparty',
'dev' => true,
),
@ -16,16 +16,16 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => '0bed61f949bc7a8c69cd154919e78b704e28c99e',
'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
'dev_requirement' => false,
),
'icewind/smb' => array(
'pretty_version' => 'v3.5.2',
'version' => '3.5.2.0',
'pretty_version' => 'v3.5.3',
'version' => '3.5.3.0',
'type' => 'library',
'install_path' => __DIR__ . '/../icewind/smb',
'aliases' => array(),
'reference' => '0a425bd21acf7ae112b135dca34640e1b1a825c3',
'reference' => '3e25d3116111064ec45a0e1b351fc4baf396ca43',
'dev_requirement' => false,
),
'icewind/streams' => array(

9
apps/files_external/3rdparty/icewind/smb/src/System.php vendored
Unescape View File

@ -62,7 +62,14 @@ class System implements ISystem {
$result = null;
$output = [];
exec("which $binary 2>&1", $output, $result);
$this->paths[$binary] = $result === 0 && isset($output[0]) ? (string)$output[0] : null;
if ($result === 0 && isset($output[0])) {
$this->paths[$binary] = (string)$output[0];
} else if (is_executable("/usr/bin/$binary")) {
$this->paths[$binary] = "/usr/bin/$binary";
} else {
$this->paths[$binary] = null;
}
}
return $this->paths[$binary];
}

2
apps/files_external/3rdparty/icewind/smb/src/Wrapped/Connection.php vendored
Unescape View File

@ -99,7 +99,7 @@ class Connection extends RawConnection {
} else {
$error = $this->readError(); // maybe something on stderr
if ($error) {
throw new ConnectException('Unknown error (' . $error . ')');
throw new ConnectException('Unknown error (stderr: ' . $error . ')');
} else {
throw new ConnectException('Unknown error');
}

4
apps/files_external/3rdparty/icewind/smb/src/Wrapped/Parser.php vendored
Unescape View File

@ -172,14 +172,14 @@ class Parser {
public function parseDir(array $output, string $basePath, callable $aclCallback): array {
//last line is used space
array_pop($output);
$regex = '/^\s*(.*?)\s\s\s\s+(?:([NDHARS]*)\s+)?([0-9]+)\s+(.*)$/';
$regex = '/^\s*(.*?)\s\s\s\s+(?:([NDHARSCndharsc]*)\s+)?([0-9]+)\s+(.*)$/';
//2 spaces, filename, optional type, size, date
$content = [];
foreach ($output as $line) {
if (preg_match($regex, $line, $matches)) {
list(, $name, $mode, $size, $time) = $matches;
if ($name !== '.' and $name !== '..') {
$mode = $this->parseMode($mode);
$mode = $this->parseMode(strtoupper($mode));
$time = strtotime($time . ' ' . $this->timeZone);
$path = $basePath . '/' . $name;
$content[] = new FileInfo($path, $name, (int)$size, $time, $mode, function () use ($aclCallback, $path): array {

Write Preview
Loading…
Cancel
Save