diff --git a/composer.json b/composer.json
index e363d44da..8b9321e99 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
"ext-soap": "*",
"combodo/tcpdf": "6.3.5",
"nikic/php-parser": "^3.1",
- "pear/archive_tar": "1.4.9",
+ "pear/archive_tar": "1.4.10",
"pelago/emogrifier": "2.1.0",
"scssphp/scssphp": "1.0.6",
"swiftmailer/swiftmailer": "5.4.12",
diff --git a/composer.lock b/composer.lock
index 82f6bcf10..2aef21e81 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "ad359769d05acd25a9fc31d69acbe43a",
+ "content-hash": "27af144ea2acf2c138f587052a4ceddc",
"packages": [
{
"name": "combodo/tcpdf",
@@ -168,16 +168,16 @@
},
{
"name": "pear/archive_tar",
- "version": "1.4.9",
+ "version": "1.4.10",
"source": {
"type": "git",
"url": "https://github.com/pear/Archive_Tar.git",
- "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"
+ "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",
- "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",
+ "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
+ "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
"shasum": ""
},
"require": {
@@ -230,7 +230,7 @@
"archive",
"tar"
],
- "time": "2019-12-04T10:17:28+00:00"
+ "time": "2020-09-15T14:13:23+00:00"
},
{
"name": "pear/console_getopt",
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index d201d4b99..508b402a5 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -167,17 +167,17 @@
},
{
"name": "pear/archive_tar",
- "version": "1.4.9",
- "version_normalized": "1.4.9.0",
+ "version": "1.4.10",
+ "version_normalized": "1.4.10.0",
"source": {
"type": "git",
"url": "https://github.com/pear/Archive_Tar.git",
- "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"
+ "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",
- "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",
+ "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
+ "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
"shasum": ""
},
"require": {
@@ -192,7 +192,7 @@
"ext-xz": "Lzma2 compression support.",
"ext-zlib": "Gzip compression support."
},
- "time": "2019-12-04T10:17:28+00:00",
+ "time": "2020-09-15T14:13:23+00:00",
"type": "library",
"extra": {
"branch-alias": {
diff --git a/lib/pear/archive_tar/.gitignore b/lib/pear/archive_tar/.gitignore
index c32ccd7cc..c703991e8 100644
--- a/lib/pear/archive_tar/.gitignore
+++ b/lib/pear/archive_tar/.gitignore
@@ -8,3 +8,8 @@ vendor
.buildpath
.project
.settings
+# pear
+.tarballs
+*.tgz
+# phpunit
+build
diff --git a/lib/pear/archive_tar/.travis.yml b/lib/pear/archive_tar/.travis.yml
index b841f4efc..f103381b1 100644
--- a/lib/pear/archive_tar/.travis.yml
+++ b/lib/pear/archive_tar/.travis.yml
@@ -1,6 +1,9 @@
sudo: false
language: php
matrix:
+ fast_finish: true
+ allow_failures:
+ - php: nightly
include:
- php: 5.2
dist: precise
@@ -11,23 +14,12 @@ matrix:
- php: 5.5
dist: trusty
- php: 5.6
- dist: trusty
- php: 7.0
- dist: trusty
- php: 7.1
- dist: trusty
- php: 7.2
- dist: trusty
- php: 7.3
- dist: trusty
- - php: 7.4snapshot
- - php: master
-
-jobs:
- allow_failures:
- - php: 7.4snapshot
- - php: master
-
+ - php: 7.4
+ - php: nightly
install:
# - pear upgrade --force --alldeps pear/pear
- pear install -f package.xml
diff --git a/lib/pear/archive_tar/Archive/Tar.php b/lib/pear/archive_tar/Archive/Tar.php
index 2f328c227..5a52ce818 100644
--- a/lib/pear/archive_tar/Archive/Tar.php
+++ b/lib/pear/archive_tar/Archive/Tar.php
@@ -731,7 +731,7 @@ class Archive_Tar extends PEAR
*/
public function setIgnoreList($list)
{
- $regexp = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
+ $list = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
$regexp = '#/' . join('$|/', $list) . '#';
$this->setIgnoreRegexp($regexp);
}
@@ -1273,7 +1273,7 @@ class Archive_Tar extends PEAR
while (($v_buffer = fread($v_file, $this->buffer_length)) != '') {
$buffer_length = strlen("$v_buffer");
if ($buffer_length != $this->buffer_length) {
- $pack_size = ((int)($buffer_length / 512) + 1) * 512;
+ $pack_size = ((int)($buffer_length / 512) + ($buffer_length % 512 !== 0 ? 1 : 0)) * 512;
$pack_format = sprintf('a%d', $pack_size);
} else {
$pack_format = sprintf('a%d', $this->buffer_length);
@@ -1515,8 +1515,13 @@ class Archive_Tar extends PEAR
$userinfo = posix_getpwuid($p_uid);
$groupinfo = posix_getgrgid($p_gid);
- $v_uname = $userinfo['name'];
- $v_gname = $groupinfo['name'];
+ if ($userinfo === false || $groupinfo === false) {
+ $v_uname = '';
+ $v_gname = '';
+ } else {
+ $v_uname = $userinfo['name'];
+ $v_gname = $groupinfo['name'];
+ }
} else {
$v_uname = '';
$v_gname = '';
diff --git a/lib/pear/archive_tar/package.xml b/lib/pear/archive_tar/package.xml
index 683493951..f1f8040b2 100644
--- a/lib/pear/archive_tar/package.xml
+++ b/lib/pear/archive_tar/package.xml
@@ -32,10 +32,10 @@ Also Lzma2 compressed archives are supported with xz extension.
stig@php.net
no
- 2019-12-04
-
+ 2020-09-15
+
- 1.4.9
+ 1.4.10
1.4.0
@@ -44,7 +44,8 @@ Also Lzma2 compressed archives are supported with xz extension.
New BSD License
-* Implement Feature #23861: Add option to disallow symlinks [mrook]
+* Fix block padding when the file buffer length is a multiple of 512 and smaller than Archive_Tar buffer length
+* Don't try to copy username/groupname in chroot jail
@@ -74,6 +75,21 @@ Also Lzma2 compressed archives are supported with xz extension.
+
+
+ 1.4.9
+ 1.4.0
+
+
+ stable
+ stable
+
+ 2019-12-04
+ New BSD License
+
+* Implement Feature #23861: Add option to disallow symlinks [mrook]
+
+
1.4.8