From d588471f2fa4ed70c4093ad3ab719505fd6c42b8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 22 Jul 2020 14:25:33 +0200 Subject: [PATCH] update icewind/smb to 3.2.6 Signed-off-by: Robin Appelman --- apps/files_external/3rdparty/composer.json | 2 +- apps/files_external/3rdparty/composer.lock | 15 +++++++-------- .../3rdparty/composer/autoload_psr4.php | 1 - .../3rdparty/composer/autoload_static.php | 5 ----- .../3rdparty/composer/installed.json | 15 +++++++-------- .../3rdparty/icewind/smb/composer.json | 6 +++++- .../icewind/smb/src/Native/NativeFileInfo.php | 17 +++++++++++------ 7 files changed, 31 insertions(+), 30 deletions(-) diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json index 3d6e65fdfe..e6cd5a9eeb 100644 --- a/apps/files_external/3rdparty/composer.json +++ b/apps/files_external/3rdparty/composer.json @@ -9,6 +9,6 @@ }, "require": { "icewind/streams": "0.7.1", - "icewind/smb": "3.2.5" + "icewind/smb": "3.2.6" } } diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock index e689bc391e..1ece93dccf 100644 --- a/apps/files_external/3rdparty/composer.lock +++ b/apps/files_external/3rdparty/composer.lock @@ -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": "71341c5501f2d0c68ca2bfa4e92f4eec", + "content-hash": "3b3638566fc1597d1a48c43e2a0da72a", "packages": [ { "name": "icewind/smb", - "version": "v3.2.5", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2" + "reference": "507b186800ac6c3b287604a4ff9b138cf430da79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2", - "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/507b186800ac6c3b287604a4ff9b138cf430da79", + "reference": "507b186800ac6c3b287604a4ff9b138cf430da79", "shasum": "" }, "require": { @@ -31,8 +31,7 @@ "type": "library", "autoload": { "psr-4": { - "Icewind\\SMB\\": "src/", - "Icewind\\SMB\\Test\\": "tests/" + "Icewind\\SMB\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -46,7 +45,7 @@ } ], "description": "php wrapper for smbclient and libsmbclient-php", - "time": "2020-05-27T13:56:04+00:00" + "time": "2020-07-20T14:12:51+00:00" }, { "name": "icewind/streams", diff --git a/apps/files_external/3rdparty/composer/autoload_psr4.php b/apps/files_external/3rdparty/composer/autoload_psr4.php index 7cfe0f1c46..82614b5016 100644 --- a/apps/files_external/3rdparty/composer/autoload_psr4.php +++ b/apps/files_external/3rdparty/composer/autoload_psr4.php @@ -8,6 +8,5 @@ $baseDir = $vendorDir; return array( 'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'), 'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'), - 'Icewind\\SMB\\Test\\' => array($vendorDir . '/icewind/smb/tests'), 'Icewind\\SMB\\' => array($vendorDir . '/icewind/smb/src'), ); diff --git a/apps/files_external/3rdparty/composer/autoload_static.php b/apps/files_external/3rdparty/composer/autoload_static.php index fc6e68f8be..7ae9c4fff7 100644 --- a/apps/files_external/3rdparty/composer/autoload_static.php +++ b/apps/files_external/3rdparty/composer/autoload_static.php @@ -11,7 +11,6 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3 array ( 'Icewind\\Streams\\Tests\\' => 22, 'Icewind\\Streams\\' => 16, - 'Icewind\\SMB\\Test\\' => 17, 'Icewind\\SMB\\' => 12, ), ); @@ -25,10 +24,6 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3 array ( 0 => __DIR__ . '/..' . '/icewind/streams/src', ), - 'Icewind\\SMB\\Test\\' => - array ( - 0 => __DIR__ . '/..' . '/icewind/smb/tests', - ), 'Icewind\\SMB\\' => array ( 0 => __DIR__ . '/..' . '/icewind/smb/src', diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json index 35023ec730..b96750e163 100644 --- a/apps/files_external/3rdparty/composer/installed.json +++ b/apps/files_external/3rdparty/composer/installed.json @@ -1,17 +1,17 @@ [ { "name": "icewind/smb", - "version": "v3.2.5", - "version_normalized": "3.2.5.0", + "version": "v3.2.6", + "version_normalized": "3.2.6.0", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2" + "reference": "507b186800ac6c3b287604a4ff9b138cf430da79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2", - "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/507b186800ac6c3b287604a4ff9b138cf430da79", + "reference": "507b186800ac6c3b287604a4ff9b138cf430da79", "shasum": "" }, "require": { @@ -22,13 +22,12 @@ "friendsofphp/php-cs-fixer": "^2.13", "phpunit/phpunit": "^7.0" }, - "time": "2020-05-27T13:56:04+00:00", + "time": "2020-07-20T14:12:51+00:00", "type": "library", "installation-source": "dist", "autoload": { "psr-4": { - "Icewind\\SMB\\": "src/", - "Icewind\\SMB\\Test\\": "tests/" + "Icewind\\SMB\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", diff --git a/apps/files_external/3rdparty/icewind/smb/composer.json b/apps/files_external/3rdparty/icewind/smb/composer.json index 8ec551c734..02cd629565 100644 --- a/apps/files_external/3rdparty/icewind/smb/composer.json +++ b/apps/files_external/3rdparty/icewind/smb/composer.json @@ -18,7 +18,11 @@ }, "autoload" : { "psr-4": { - "Icewind\\SMB\\": "src/", + "Icewind\\SMB\\": "src/" + } + }, + "autoload-dev" : { + "psr-4": { "Icewind\\SMB\\Test\\": "tests/" } } diff --git a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php index 5b987253ad..6a0270ef8f 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php @@ -108,6 +108,11 @@ class NativeFileInfo implements IFileInfo { * @return int */ protected function getMode() { + $mode = $this->stat()['mode']; + + // Let us ignore the ATTR_NOT_CONTENT_INDEXED for now + $mode &= ~0x00002000; + return $this->stat()['mode']; } @@ -116,8 +121,8 @@ class NativeFileInfo implements IFileInfo { */ public function isDirectory() { $mode = $this->getMode(); - if ($mode > 0x80) { - return (bool)($mode & 0x4000); // 0x80: unix directory flag + if ($mode > 0x1000) { + return (bool)($mode & 0x4000); // 0x4000: unix directory flag } else { return (bool)($mode & IFileInfo::MODE_DIRECTORY); } @@ -128,7 +133,7 @@ class NativeFileInfo implements IFileInfo { */ public function isReadOnly() { $mode = $this->getMode(); - if ($mode > 0x80) { + if ($mode > 0x1000) { return !(bool)($mode & 0x80); // 0x80: owner write permissions } else { return (bool)($mode & IFileInfo::MODE_READONLY); @@ -140,7 +145,7 @@ class NativeFileInfo implements IFileInfo { */ public function isHidden() { $mode = $this->getMode(); - if ($mode > 0x80) { + if ($mode > 0x1000) { return strlen($this->name) > 0 && $this->name[0] === '.'; } else { return (bool)($mode & IFileInfo::MODE_HIDDEN); @@ -152,7 +157,7 @@ class NativeFileInfo implements IFileInfo { */ public function isSystem() { $mode = $this->getMode(); - if ($mode > 0x80) { + if ($mode > 0x1000) { return false; } else { return (bool)($mode & IFileInfo::MODE_SYSTEM); @@ -164,7 +169,7 @@ class NativeFileInfo implements IFileInfo { */ public function isArchived() { $mode = $this->getMode(); - if ($mode > 0x80) { + if ($mode > 0x1000) { return false; } else { return (bool)($mode & IFileInfo::MODE_ARCHIVE);