Skip to content

[stable23] update icewind/smb to 3.5.4 #37792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
backportbot-nextcloud wants to merge 2 commits into from
Closed

[stable23] update icewind/smb to 3.5.4 #37792

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e4c607
update icewind/smb to 3.5.3
icewind1991 May 27, 2022
6181dc4
update icewind/smb to 3.5.4
icewind1991 May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update icewind/smb to 3.5.4 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot-nextcloud
icewind1991 authored and backportbot-nextcloud[bot] committed Apr 18, 2023
commit 6181dc4901c65c3a41d63bc7373f4c5cf3e1542b
2 changes: 1 addition & 1 deletion apps/files_external/3rdparty/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
},
"require": {
"icewind/streams": "0.7.4",
"icewind/smb": "3.5.3"
"icewind/smb": "3.5.4"
}
}
14 changes: 7 additions & 7 deletions apps/files_external/3rdparty/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions apps/files_external/3rdparty/composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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"
},
Expand Down
10 changes: 5 additions & 5 deletions apps/files_external/3rdparty/composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
'reference' => '15d43dcc6226b92c0d51d643ef8c5ab1339cae48',
'name' => 'files_external/3rdparty',
'dev' => true,
),
Expand All @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion apps/files_external/3rdparty/icewind/smb/src/Wrapped/RawConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/3rdparty/icewind/smb/src/Wrapped/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])) {
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down