Skip to content

Commit 12b4769

Browse files
icewind1991PVince81
authored andcommitted
update icewind/smb to 3.5.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
1 parent cd8aa12 commit 12b4769

7 files changed

Lines changed: 24 additions & 23 deletions

File tree

apps/files_external/3rdparty/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
},
1010
"require": {
1111
"icewind/streams": "0.7.4",
12-
"icewind/smb": "3.5.3"
12+
"icewind/smb": "3.5.4"
1313
}
1414
}

apps/files_external/3rdparty/composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_external/3rdparty/composer/installed.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"packages": [
33
{
44
"name": "icewind/smb",
5-
"version": "v3.5.3",
6-
"version_normalized": "3.5.3.0",
5+
"version": "v3.5.4",
6+
"version_normalized": "3.5.4.0",
77
"source": {
88
"type": "git",
99
"url": "https://github.com/icewind1991/SMB.git",
10-
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43"
10+
"reference": "76995aa11c14e39bccd0f2370ed63b2f8f623a6d"
1111
},
1212
"dist": {
1313
"type": "zip",
14-
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/3e25d3116111064ec45a0e1b351fc4baf396ca43",
15-
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43",
14+
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/76995aa11c14e39bccd0f2370ed63b2f8f623a6d",
15+
"reference": "76995aa11c14e39bccd0f2370ed63b2f8f623a6d",
1616
"shasum": ""
1717
},
1818
"require": {
@@ -25,7 +25,7 @@
2525
"phpunit/phpunit": "^8.5|^9.3.8",
2626
"psalm/phar": "^4.3"
2727
},
28-
"time": "2022-05-27T15:00:33+00:00",
28+
"time": "2022-05-30T15:18:19+00:00",
2929
"type": "library",
3030
"installation-source": "dist",
3131
"autoload": {
@@ -46,7 +46,7 @@
4646
"description": "php wrapper for smbclient and libsmbclient-php",
4747
"support": {
4848
"issues": "https://github.com/icewind1991/SMB/issues",
49-
"source": "https://github.com/icewind1991/SMB/tree/v3.5.3"
49+
"source": "https://github.com/icewind1991/SMB/tree/v3.5.4"
5050
},
5151
"install-path": "../icewind/smb"
5252
},

apps/files_external/3rdparty/composer/installed.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'type' => 'library',
66
'install_path' => __DIR__ . '/../',
77
'aliases' => array(),
8-
'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
8+
'reference' => '15d43dcc6226b92c0d51d643ef8c5ab1339cae48',
99
'name' => 'files_external/3rdparty',
1010
'dev' => true,
1111
),
@@ -16,16 +16,16 @@
1616
'type' => 'library',
1717
'install_path' => __DIR__ . '/../',
1818
'aliases' => array(),
19-
'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
19+
'reference' => '15d43dcc6226b92c0d51d643ef8c5ab1339cae48',
2020
'dev_requirement' => false,
2121
),
2222
'icewind/smb' => array(
23-
'pretty_version' => 'v3.5.3',
24-
'version' => '3.5.3.0',
23+
'pretty_version' => 'v3.5.4',
24+
'version' => '3.5.4.0',
2525
'type' => 'library',
2626
'install_path' => __DIR__ . '/../icewind/smb',
2727
'aliases' => array(),
28-
'reference' => '3e25d3116111064ec45a0e1b351fc4baf396ca43',
28+
'reference' => '76995aa11c14e39bccd0f2370ed63b2f8f623a6d',
2929
'dev_requirement' => false,
3030
),
3131
'icewind/streams' => array(

apps/files_external/3rdparty/icewind/smb/src/Wrapped/RawConnection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public function connect(): void {
7575
'CLI_NO_READLINE' => 1, // Not all distros build smbclient with readline, disable it to get consistent behaviour
7676
'LC_ALL' => Server::LOCALE,
7777
'LANG' => Server::LOCALE,
78-
'COLUMNS' => 8192 // prevent smbclient from line-wrapping it's output
78+
'COLUMNS' => 8192, // prevent smbclient from line-wrapping it's output
79+
'TZ' => 'UTC',
7980
]);
8081
$this->process = proc_open($this->command, $descriptorSpec, $this->pipes, '/', $env);
8182
if (!$this->isValid()) {

apps/files_external/3rdparty/icewind/smb/src/Wrapped/Server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function listShares(): array {
6666
throw new ConnectionException((string)$connection->readLine());
6767
}
6868

69-
$parser = new Parser($this->timezoneProvider->get($this->host));
69+
$parser = new Parser('UTC');
7070

7171
$output = $connection->readAll();
7272
if (isset($output[0])) {

apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function __construct(IServer $server, string $name, ISystem $system) {
7373
$this->server = $server;
7474
$this->name = $name;
7575
$this->system = $system;
76-
$this->parser = new Parser($server->getTimeZone());
76+
$this->parser = new Parser('UTC');
7777
}
7878

7979
private function getAuthFileArgument(): string {

0 commit comments

Comments
 (0)