summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2022-05-30 17:40:29 +0200
committerSimon L. (Rebase PR Action) <szaimen@e.mail.de>2023-04-17 16:06:17 +0000
commit30b7147a31e33d5b2ecb97b3abf41a0f49601e22 (patch)
tree65aaeb583ce5320a6eb848509edbbe61302f0d27
parent85a879894fc1dabde337f16f73d052b14447e0d0 (diff)
downloadnextcloud-server-30b7147a31e33d5b2ecb97b3abf41a0f49601e22.tar.gz
nextcloud-server-30b7147a31e33d5b2ecb97b3abf41a0f49601e22.zip
update icewind/smb to 3.5.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
-rw-r--r--apps/files_external/3rdparty/composer.json2
-rw-r--r--apps/files_external/3rdparty/composer.lock14
-rw-r--r--apps/files_external/3rdparty/composer/installed.json14
-rw-r--r--apps/files_external/3rdparty/composer/installed.php10
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Wrapped/RawConnection.php3
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Wrapped/Server.php2
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php2
7 files changed, 24 insertions, 23 deletions
diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json
index fb37bd74884..ff102e7c3ec 100644
--- 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
index 992c742ba57..a9b699e2c55 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": "f376ee0d775d5d7f1fbac7730eeaff0e",
+ "content-hash": "5d34e39627716fec1b5b11ab6a667e53",
"packages": [
{
"name": "icewind/smb",
- "version": "v3.5.3",
+ "version": "v3.5.4",
"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": {
@@ -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.3"
+ "source": "https://github.com/icewind1991/SMB/tree/v3.5.4"
},
- "time": "2022-05-27T15:00:33+00:00"
+ "time": "2022-05-30T15:18:19+00:00"
},
{
"name": "icewind/streams",
diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json
index 5e4b45792e0..bc6cdb8e6c9 100644
--- 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
index 05030492f46..1adf5df7db3 100644
--- 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
index 4aec674c3da..3d84528daa2 100644
--- 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 @@ class RawConnection {
'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
index dd8513eafd9..159a51e91a2 100644
--- 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 @@ class Server extends AbstractServer {
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
index eb68d3800b3..2df98c335d6 100644
--- 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 @@ class Share extends AbstractShare {
$this->server = $server;
$this->name = $name;
$this->system = $system;
- $this->parser = new Parser($server->getTimeZone());
+ $this->parser = new Parser('UTC');
}
private function getAuthFileArgument(): string {