update icewind/smb to 3.5.4

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Aug 15, 2022 · a409372 · a409372
1 parent 4ef9f6d
commit a409372
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 23 deletions.
diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json
@@ -9,6 +9,6 @@
 	},
 	"require": {
 		"icewind/streams": "0.7.4",
-		"icewind/smb": "3.5.3"
+		"icewind/smb": "3.5.4"
 	}
 }
diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock
diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json
@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "icewind/smb",
-            "version": "v3.5.3",
-            "version_normalized": "3.5.3.0",
+            "version": "v3.5.4",
+            "version_normalized": "3.5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/icewind1991/SMB.git",
-                "reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43"
+                "reference": "76995aa11c14e39bccd0f2370ed63b2f8f623a6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/icewind1991/SMB/zipball/3e25d3116111064ec45a0e1b351fc4baf396ca43",
-                "reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43",
+                "url": "https://api.github.com/repos/icewind1991/SMB/zipball/76995aa11c14e39bccd0f2370ed63b2f8f623a6d",
+                "reference": "76995aa11c14e39bccd0f2370ed63b2f8f623a6d",
                 "shasum": ""
             },
             "require": {
@@ -25,7 +25,7 @@
                 "phpunit/phpunit": "^8.5|^9.3.8",
                 "psalm/phar": "^4.3"
             },
-            "time": "2022-05-27T15:00:33+00:00",
+            "time": "2022-05-30T15:18:19+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.3"
+                "source": "https://github.com/icewind1991/SMB/tree/v3.5.4"
             },
             "install-path": "../icewind/smb"
         },

diff --git a/apps/files_external/3rdparty/composer/installed.php b/apps/files_external/3rdparty/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
-        'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
+        'reference' => '15d43dcc6226b92c0d51d643ef8c5ab1339cae48',
         'name' => 'files_external/3rdparty',
         'dev' => true,
     ),
@@ -16,16 +16,16 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
-            'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
+            'reference' => '15d43dcc6226b92c0d51d643ef8c5ab1339cae48',
             'dev_requirement' => false,
         ),
         'icewind/smb' => array(
-            'pretty_version' => 'v3.5.3',
-            'version' => '3.5.3.0',
+            'pretty_version' => 'v3.5.4',
+            'version' => '3.5.4.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../icewind/smb',
             'aliases' => array(),
-            'reference' => '3e25d3116111064ec45a0e1b351fc4baf396ca43',
+            'reference' => '76995aa11c14e39bccd0f2370ed63b2f8f623a6d',
             'dev_requirement' => false,
         ),
         'icewind/streams' => array(

diff --git a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/RawConnection.php b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/RawConnection.php
@@ -75,7 +75,8 @@ public function connect(): void {
 			'CLI_NO_READLINE'       => 1,   // Not all distros build smbclient with readline, disable it to get consistent behaviour
 			'LC_ALL'                => Server::LOCALE,
 			'LANG'                  => Server::LOCALE,
-			'COLUMNS'               => 8192 // prevent smbclient from line-wrapping it's output
+			'COLUMNS'               => 8192, // prevent smbclient from line-wrapping it's output
+			'TZ'                    => 'UTC',
 		]);
 		$this->process = proc_open($this->command, $descriptorSpec, $this->pipes, '/', $env);
 		if (!$this->isValid()) {

diff --git a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Server.php b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Server.php
@@ -66,7 +66,7 @@ public function listShares(): array {
 			throw new ConnectionException((string)$connection->readLine());
 		}
 
-		$parser = new Parser($this->timezoneProvider->get($this->host));
+		$parser = new Parser('UTC');
 
 		$output = $connection->readAll();
 		if (isset($output[0])) {

diff --git a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php
@@ -73,7 +73,7 @@ public function __construct(IServer $server, string $name, ISystem $system) {
 		$this->server = $server;
 		$this->name = $name;
 		$this->system = $system;
-		$this->parser = new Parser($server->getTimeZone());
+		$this->parser = new Parser('UTC');
 	}
 
 	private function getAuthFileArgument(): string {