From ac0c8ce016d50038c91ede141f4d771ed3b0f62b Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 11 Mar 2019 02:17:25 +0000 Subject: [PATCH 1/3] bump(metadata/glsa): sync with upstream --- .../portage-stable/metadata/glsa/Manifest | 30 +++---- .../metadata/glsa/Manifest.files.gz | Bin 435197 -> 436466 bytes .../metadata/glsa/glsa-201903-01.xml | 55 +++++++++++++ .../metadata/glsa/glsa-201903-02.xml | 62 +++++++++++++++ .../metadata/glsa/glsa-201903-03.xml | 53 +++++++++++++ .../metadata/glsa/glsa-201903-04.xml | 73 ++++++++++++++++++ .../metadata/glsa/glsa-201903-05.xml | 50 ++++++++++++ .../metadata/glsa/glsa-201903-06.xml | 66 ++++++++++++++++ .../metadata/glsa/glsa-201903-07.xml | 52 +++++++++++++ .../metadata/glsa/glsa-201903-08.xml | 48 ++++++++++++ .../metadata/glsa/timestamp.chk | 2 +- .../metadata/glsa/timestamp.commit | 2 +- 12 files changed, 476 insertions(+), 17 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-01.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-02.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-03.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-04.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-05.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-06.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-07.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-08.xml diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest index 670e7c304f..53261d6d0d 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest @@ -1,23 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -MANIFEST Manifest.files.gz 435197 BLAKE2B 5ef1f755677fba588afa252a22622c045d099b3f39fb6b356786170399bb20e8c58212856a5ddc6f59dc6076e3f84a95376a4dc3b4d5154c7d540151a154c88a SHA512 fb541e904c3c6b5ec17c08e76f9ce1dcd0d8f0b31dee092dd3542b9a34a04890e9a1b1e6b0d78d3523fb451deb84b3316ae6b588a29aec6f4741dfb52941ecc9 -TIMESTAMP 2018-12-31T15:38:40Z +MANIFEST Manifest.files.gz 436466 BLAKE2B 1592f1e1bb1660fe56598a716be2722c8f9b14d74fcc7bf4086935ca129dff18da9e9a7deb43b3b3ab5e34487a04b37269914fde19e2c86f3d80a1165fc058e0 SHA512 814ba1ee894cf6c7438051199c5078a6339901cdea60b6848add142bf264fc54ba915b91229a96a1404f81bdbc5177e162144d5b97ce8351358c43ca91c86df7 +TIMESTAMP 2019-03-11T01:38:51Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwqOABfFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlyFvCtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klBxRBAAtUgUnM+koOIrHy98B5Uj8vQ0YUz+hHXxfPZ5I3DjG138tNv+kSSfZtZ1 -VC9QQSG0svtCjDOUG1CZ6b31Kf1ySFALtcelgTgNp8Y8R1CqoC0UIhd6jhxIEzU3 -QThllPuldQOr8pOf/3pxDO0gZ/eeXeBF2rnrDq8nDkkqLNTnPBg998fJZGLFTi+S -yWYh4Dtyq53TbbQ4tjKwFL8MZnIv9tDt5Xol6socrhWdZvScnpoHgg7W5+LemdYb -J/CGgtl9LYn9xvUCCKl5YV/BF3rLH1tJUdZHDrcl1jqSSnmF59uQ17XDOyb47xZH -bPU9gxGNvqdDdizqb8mRKILzQqzzBuSiOshuSO29wX4Xh+GcO76JBamw9U6B8O+O -G+IjxAN9HaDj0nRzzCqQkhkBpN4dNsySt1bYyqzcTXaLUre6EQAerQE943exCQGX -p+UiE4as/EMg6S1EA95K/hshidQHXMbCpqzoK4BCJ9AXgm3WULAJy6JhTEma+4M4 -7cIKiGtl4G61SxVCt/hVjqKKUZVkjUMo/+PMyclJ1Xrhgomxs1Pv+waX6RQ7ldgs -dBALSFUehLiBDCC1HTSUEniPjDmgNNaAclze37jLhjOZUoVaiCDD6wuLHqIFajlC -nLejRPqU6qWCOk6ig6UgA68G48Ttf7WXSZ9i/3d1Tw5B5ASWAMM= -=qJUW +klAPHA/+P/U8xHLyUo0llv8FWLgjEhNDQzpJYEckpNbjTTLXZueHWKItVRvIgY+O +VVLeZp4MgQih16YB1lIzYwDMcsYdt1kk/5oytqjkpNgLeude+G5Z65cLw0C1//Y2 +1+yXTiWs6XpWdVqh3Or7/muHcxpoyxHtVBbbAThx3uv8sgsCEKFxdEC5TTod/i3s ++5syLAHAy/0EAO5H3WUEiuh9PZCEZZ+2j9VKLySNQQa6IoYAweXxBQ7+B+ongJAZ +s5r/34AiXM3bE7OREc/RnbbtRbjY080BHzrUetFPKdFEH1cNYd/L9OwRqz+j9HpN +S9MKO0BMn1Lt/osnAIiPiiRW4/QM9rVSe1yx6gqn4+Z8bubVYEn964Ryo+TRGYOJ +eMpf49JbNFjRfqyhr4F/NZpAyxl6m2d1rnI754hgRvAtq/QFZ6777IBGMKePRoqj +Z8te+9hP8PG8AJsgx5ZSJXRC0qxhLYPSVx6fVsY+eRe/ykLZdpUz7jZP63xSsz7r +sTrA0e10kMp9u9vBzzni8OI8hUratTZLxlTgucNeytXCjCpZh+8XBBTNZD3JwYaG +j/pr8JOXrIJ626TQ3lqfTLXc+fwC38/r6hLm1QWuR2fP57V4aXRmJmn99RROb5cX +tZNVNGO+xhaQzhBq+3P8ycPDtC1I1x4XQEFLtyFJUIFeCkak3Fk= +=J9ze -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest.files.gz b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest.files.gz index b87f67ec613a49a53d46b8f99c095c2246a7940e..3834742efd27c1321e80d3e5dc9a47eaa85a1ce1 100644 GIT binary patch delta 25407 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 delta 24194 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�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 diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-01.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-01.xml new file mode 100644 index 0000000000..beacb00e0b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-01.xml @@ -0,0 +1,55 @@ + + + + Keepalived: Multiple vulnerabilities + Multiple vulnerabilities have been found in Keepalived, the worst + of which could allow an attacker to cause Denial of Service condition. + + keepalived + 2019-03-10 + 2019-03-10 + 670856 + local, remote + + + 2.0.10 + 2.0.10 + + + +

Keepalived is a strong & robust keepalive facility to the Linux + Virtual Server project. +

+ + +

Multiple vulnerabilities have been discovered in keepalived. Please + review the CVE identifiers referenced below for details. +

+ + +

A remote attacker could send a specially crafted request possibly + resulting in a Denial of Service condition. A local attacker could + perform symlink attacks to overwrite arbitrary files with the privileges + of the user running the application. +

+ + +

There is no known workaround at this time.

+ + +

All Keepalived users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=sys-cluster/keepalived-2.0.10" + + + + CVE-2018-19044 + CVE-2018-19045 + CVE-2018-19046 + CVE-2018-19115 + + whissi + pinkbyte + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-02.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-02.xml new file mode 100644 index 0000000000..11ae0246fe --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-02.xml @@ -0,0 +1,62 @@ + + + + Zsh: User-assisted execution of arbitrary code + Input validation errors in Zsh could result in arbitrary code + execution. + + zsh + 2019-03-10 + 2019-03-10 + 665278 + local, remote + + + 5.6 + 5.6 + + + +

A shell designed for interactive use, although it is also a powerful + scripting language. +

+ + +

Two input validation errors have been discovered in how Zsh parses + scripts: +

+ +
    +
  • Parsing a malformed shebang line could cause Zsh to call a program + listed in the second line (CVE-2018-0502) +
    • +
  • Shebang lines longer than 64 characters are truncated + (CVE-2018-13259) +
    • +
+ + +

An attacker could entice a user to execute a specially crafted script + using Zsh, possibly resulting in execution of arbitrary code with the + privileges of the process. +

+ + +

There is no known workaround at this time.

+ + +

All Zsh users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-shells/zsh-5.6" + + + + + CVE-2018-0502 + CVE-2018-13259 + + Zlogene + ackle + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-03.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-03.xml new file mode 100644 index 0000000000..eb2941f015 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-03.xml @@ -0,0 +1,53 @@ + + + + cURL: Multiple vulnerabilities + Multiple vulnerabilities have been found in cURL, the worst of + which could result in a Denial of Service condition. + + curl + 2019-03-10 + 2019-03-10 + 665292 + 670026 + 677346 + remote + + + 7.64.0 + 7.64.0 + + + +

A command line tool and library for transferring data with URLs.

+ + +

Multiple vulnerabilities have been discovered in cURL. Please review the + CVE identifiers referenced below for details. +

+ + +

Remote attackers could cause a Denial of Service condition.

+ + +

There is no known workaround at this time.

+ + +

All cURL users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-misc/curl-7.64.0" + + + + CVE-2018-14618 + CVE-2018-16839 + CVE-2018-16840 + CVE-2018-16842 + CVE-2019-3822 + CVE-2019-3823 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-04.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-04.xml new file mode 100644 index 0000000000..14dee74c7b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-04.xml @@ -0,0 +1,73 @@ + + + + Mozilla Firefox: Multiple vulnerabilities + Multiple vulnerabilities have been found in Mozilla Firefox, the + worst of which may allow execution of arbitrary code. + + firefox + 2019-03-10 + 2019-03-10 + 672956 + 676892 + 677856 + remote + + + 60.5.1 + 60.5.1 + + + 60.5.1 + 60.5.1 + + + +

Mozilla Firefox is a popular open-source web browser from the Mozilla + Project. +

+ + +

Multiple vulnerabilities have been discovered in Mozilla Firefox. Please + review the CVE identifiers referenced below for details. +

+ + +

A remote attacker could entice a user to view a specially crafted web + page possibly resulting in the execution of arbitrary code with the + privileges of the process or cause a Denial of Service condition. +

+ + +

There is no known workaround at this time.

+ + +

All Mozilla FireFox users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=www-client/firefox-60.5.1" + + +

All Mozilla FireFox bin users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=www-client/firefox-bin-60.5.1" + + + + CVE-2018-12405 + CVE-2018-18356 + CVE-2018-18492 + CVE-2018-18493 + CVE-2018-18494 + CVE-2018-18498 + CVE-2018-18500 + CVE-2018-18501 + CVE-2018-18505 + CVE-2019-5785 + + whissi + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-05.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-05.xml new file mode 100644 index 0000000000..106046f3f7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-05.xml @@ -0,0 +1,50 @@ + + + + Tar: Denial of Service + A vulnerability in Tar could led to a Denial of Service condition. + tar + 2019-03-10 + 2019-03-10 + 674210 + local + + + 1.30-r1 + 1.30-r1 + + + +

The Tar program provides the ability to create and manipulate tar + archives. +

+ + +

The sparse_dump_region function in sparse.c file in Tar allows an + infinite loop using the --sparse option. +

+ + +

A local attacker could cause a Denial of Service condition by modifying + a file that is supposed to be archived by a different user’s process + (e.g., a system backup running as root). +

+ + +

There is no known workaround at this time.

+ + +

All Tar users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-arch/tar-1.30-r1" + + + + + CVE-2018-20482 + + Zlogene + Zlogene + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-06.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-06.xml new file mode 100644 index 0000000000..456d057120 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-06.xml @@ -0,0 +1,66 @@ + + + + rdesktop: Multiple vulnerabilities + Multiple vulnerabilities have been discovered in rdesktop, the + worst of which could result in the remote execution of arbitrary code. + + rdesktop + 2019-03-10 + 2019-03-10 + 674558 + remote + + + 1.8.4 + 1.8.4 + + + +

rdesktop is a Remote Desktop Protocol (RDP) Client.

+ + +

Multiple vulnerabilities have been discovered in rdesktop. Please review + the CVE identifiers referenced below for details. +

+ + +

A remote attacker could cause a Denial of Service condition, obtain + sensitive information, or execute arbitrary code. +

+ + +

There is no known workaround at this time.

+ + +

All rdesktop users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-misc/rdesktop-1.8.4" + + + + CVE-2018-20174 + CVE-2018-20175 + CVE-2018-20176 + CVE-2018-20177 + CVE-2018-20178 + CVE-2018-20179 + CVE-2018-20180 + CVE-2018-20181 + CVE-2018-20182 + CVE-2018-8791 + CVE-2018-8792 + CVE-2018-8793 + CVE-2018-8794 + CVE-2018-8795 + CVE-2018-8796 + CVE-2018-8797 + CVE-2018-8798 + CVE-2018-8799 + CVE-2018-8800 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-07.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-07.xml new file mode 100644 index 0000000000..5ef41e69dd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-07.xml @@ -0,0 +1,52 @@ + + + + systemd: Multiple vulnerabilities + Multiple vulnerabilities have been found in systemd, the worst of + which may allow execution of arbitrary code. + + systemd + 2019-03-10 + 2019-03-10 + 674144 + 677944 + remote + + + 239-r4 + 239-r4 + + + +

A system and service manager.

+ + +

Multiple vulnerabilities have been discovered in systemd. Please review + the CVE identifiers referenced below for details. +

+ + +

An attacker could cause a Denial of Service condition or possibly + execute arbitrary code. +

+ + +

There is no known workaround at this time.

+ + +

All systemd users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=sys-apps/systemd-239-r4" + + + + CVE-2018-16864 + CVE-2018-16865 + CVE-2018-16866 + CVE-2019-6454 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-08.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-08.xml new file mode 100644 index 0000000000..3793a2326d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201903-08.xml @@ -0,0 +1,48 @@ + + + + GNU Wget: Password and metadata leak + A vulnerability in GNU Wget which could allow an attacker to obtain + sensitive information. + + wget + 2019-03-10 + 2019-03-10 + 674170 + local + + + 1.20.1 + 1.20.1 + + + +

GNU Wget is a free software package for retrieving files using HTTP, + HTTPS and FTP, the most widely-used Internet protocols. +

+ + +

A vulnerability was discovered in GNU Wget’s file_metadata in xattr.c.

+ + +

A local attacker could obtain sensitive information to include + credentials. +

+ + +

There is no known workaround at this time.

+ + +

All GNU Wget users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-misc/wget-1.20.1" + + + + CVE-2018-20483 + + BlueKnight + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk index 222264473b..457a6ae6b1 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Mon, 31 Dec 2018 15:38:36 +0000 +Mon, 11 Mar 2019 01:38:48 +0000 diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit index 991ee16872..6dea1110d2 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit @@ -1 +1 @@ -baa5a86124960e22df1f11ab63da9f282dd4cdd3 1546204642 2018-12-30T21:17:22+00:00 +579d79ed98752445ffce6122ab66094d1cb0110e 1552251022 2019-03-10T20:50:22+00:00 From a623783aacc91a68e33ea0c8b1df2a161a44fc01 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 11 Mar 2019 02:18:08 +0000 Subject: [PATCH 2/3] bump(app-arch/tar): sync with upstream --- .../portage-stable/app-arch/tar/Manifest | 19 +- .../tar-1.27.1-recursion_norecursion.patch | 25 -- .../files/tar-1.27.1-xattr_build_fix.patch | 196 --------- .../tar/files/tar-1.28-concat-listed.patch | 117 ------ .../app-arch/tar/files/tar-1.28-xattr.patch | 36 -- .../tar-1.29-extract-pathname-bypass.patch | 27 -- ...tar-1.31-remove-erroneous-abort-call.patch | 33 ++ .../app-arch/tar/files/tar.1-1.27 | 388 ------------------ .../app-arch/tar/tar-1.27.1-r2.ebuild | 79 ---- .../app-arch/tar/tar-1.28-r1.ebuild | 76 ---- ...{tar-1.29-r1.ebuild => tar-1.31-r1.ebuild} | 46 +-- .../tar/{tar-1.29.ebuild => tar-1.32.ebuild} | 41 +- .../metadata/md5-cache/app-arch/tar-1.27.1-r2 | 13 - .../metadata/md5-cache/app-arch/tar-1.28-r1 | 13 - .../app-arch/{tar-1.29-r1 => tar-1.31-r1} | 12 +- .../md5-cache/app-arch/{tar-1.29 => tar-1.32} | 12 +- 16 files changed, 93 insertions(+), 1040 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.27.1-recursion_norecursion.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.28-concat-listed.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.28-xattr.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar.1-1.27 delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.27.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.28-r1.ebuild rename sdk_container/src/third_party/portage-stable/app-arch/tar/{tar-1.29-r1.ebuild => tar-1.31-r1.ebuild} (60%) rename sdk_container/src/third_party/portage-stable/app-arch/tar/{tar-1.29.ebuild => tar-1.32.ebuild} (61%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.27.1-r2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.28-r1 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/{tar-1.29-r1 => tar-1.31-r1} (54%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/{tar-1.29 => tar-1.32} (54%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/tar/Manifest index 49696d2142..eeff245a6f 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/Manifest @@ -1,17 +1,2 @@ -AUX rmt 263 SHA256 c0371cb0243a190b6bb43609c86dfb4cd637882d4ff3ff9651ca7ec8d6b59355 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152 WHIRLPOOL 11869239f2ebbb237f8429d1f13f146fd2414e90edc2475d190f16659d052d3ac949d717939dcfc815a30942855fb26e60b6b506104876ccad32747191b04727 -AUX tar-1.27.1-recursion_norecursion.patch 765 SHA256 2232bcf904f9cc0a1a485549baf229b741d13fa89b69f8d112846c5f4f8ee0b0 SHA512 6b9a8c9a9f1d8a6c96137353a86c77c170d8f3bdc348c99a1147c950b43780aa896f0d8e1c0c1c70a044a0169f445f2ee6ca89ea680729062bf4f73f93a99ef1 WHIRLPOOL dfef48b1df29c53ff0aacbf7958c9101faf591d98f0e843b22185cd979e5e5d694b5c02b69f692c47f840f214d5bbffdf8cacb043fe1c901a30bd2df218a1643 -AUX tar-1.27.1-xattr_build_fix.patch 5762 SHA256 a23332692959044ecc281a93de19de2ac7c37c56971d6aa541adf2fd3bc74251 SHA512 d44322734813ec201567d389deffc94f6a08c2f83c93d495f18451666409465a3ad577ca7f4c540d8ca668dd4d3f77d327fdf32669ec8e932d12e8d819f8c5ab WHIRLPOOL 1245479b74b1f11aabbe29f55b90eb7c179f6c8175f77f43f409e58b71b11026dd3f882665c10e777ae3837c1e5fac2ddd0e8f9d241a9a6d694a2ccb20ae38b5 -AUX tar-1.28-concat-listed.patch 3387 SHA256 a77e7d9d2ae7efd68a3f6b6342ebd8a822c32e689ff5bd61f78a39ee6e40b281 SHA512 990c0de7a3d83b149413857d18ac0a654fd68ebe5c0d972e4ea5ebc5c9b17750355959da549c6314213bd47a2befff1c01df21e2378800ca39dd94d2cdf8df36 WHIRLPOOL 47e031b2ba1e22f9536d8db8071201ce0a9384d8df9415db9e73724827ff70a7883be0e01bb75e7e6adc6f5d8a1b34368ee5a38f4c57fa4f2ec914f8b7300a41 -AUX tar-1.28-xattr.patch 902 SHA256 87c09a948b9424a12e1cb862cc07ea8df1ff66b6819ec70c48fdb18ea0ed78f0 SHA512 0a14ff1d33ee87047b3fa109c4f6f8597c8aacc9574225c1ed7cf302dc22d3f2f4341604f51808f438d462e4bb216b6d77689f1cb554fbe5bddd022369de7b84 WHIRLPOOL fb70a9492c247594bdfb06dbfd623074c240523fb777700a5b243353e4b2dc0cd5511e49fef77278dbb946a3c623415bcbfb4a8afd5f85b6901cbec45b7fe0be -AUX tar-1.29-extract-pathname-bypass.patch 723 SHA256 c5aef4c88c46978a51e0b4bd344d9de5d5b6e2c619e1b2e1f8bfd5dda1919455 SHA512 ba06ae53b4effcdd0996be07ae03fae7237c579a82d2606fe25100bed447287a68e37282ba2b017eed0c26cb0f4bf77dcdb4fca2f5175e1bbaed91408b0bd54a WHIRLPOOL 6328a758f1ae1e27bf2b6ad37a95fd1c02878aaf015dc6bef818a2be926a914054a3990b6fff5adf17bade0868f1c7654fc196cdb74260457e3652194319213e -AUX tar.1-1.27 13442 SHA256 fd1410214bad29525c08fc0fe499c8807c4cc648c7d56ba83bf429a2c43fdffd SHA512 4810df7e549713287e74a4de7113f2ba41bd96173829313d123be7ac9d74242d3d39ef17604761fbcc607cdd72ada0bcc26c99de5867cab5c1d0e9410131707b WHIRLPOOL ad8847f9d7f3395d42e9500aed6aa43cef2791e034e54c192a6ecef4953b8ba415dbfe1ddda4b113031c9aeb409e0630bc8b432f17ae28e905afa9b1d2b459a6 -DIST tar-1.27.1.tar.bz2 2573070 SHA256 9b0fb3ce8512059337add0da5f8f0f7d7647f2201f5ece24581d620ea60337c6 SHA512 f14a0a58e574db3aeec0914621aff2f0518b8d8acce81106b8219b36b3fed47349d6cb802c51a836a5e6889529337434d83b3c50cd7fc1801b9b3944eecc695b WHIRLPOOL fd44ee747f44febc9dd4b0e1a532c38a835fcb55967143a1ab29b29dfc27316de76dfa1d23438f1843bb0a7962eb0b59c3ec75041cc0fbe879b02af292ebc6e9 -DIST tar-1.28.tar.bz2 2693989 SHA256 60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562 SHA512 4f66a236a2d9185114e2b358a09f3d38c3c38e984e5fca4bedc4d7eb461bdaace6a7a9fc62aafb70428b1f3dc617fb0d0553558fb29cad33f0cb53ba081521c4 WHIRLPOOL 54ad7b73e973d436cff853fda267d21ab22139f53d18f6870c7a53cf74e53ec8735022b6d3c503504ee416f1b9f9d43ca1af60d2fedb5d852766cb8dd2ac72d0 -DIST tar-1.29.tar.bz2 2715993 SHA256 236b11190c0a3a6885bdb8d61424f2b36a5872869aa3f7f695dea4b4843ae2f2 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b WHIRLPOOL fa5f66a7bb7698c35ad842bc4900a62997da5eb2f3cd6154391b88505a581078a64a8399bb5976d4723d90951d34c084e00d17908d90792bb5139184e8b92a94 -EBUILD tar-1.27.1-r2.ebuild 2341 SHA256 167a13c8427c373952d84082a8f3356edb7134e65b1e4eca8c71ee9e3956bd6d SHA512 cf641fc058c9507cde017ce3a0cfd375a14a780a8c03a74a3e18686c09f4ff909d9beed589b6a88d2739c2cc24cb1c87c92a76ea4573143077be6f01e4ea6912 WHIRLPOOL 79c6f251bdb50ef7a1e7976520d83277addddd17e1f61c0cc15569bfd849b3b3cb5a375955f7c1d5f2f3e25061ba8b38e022747ba5834813507227554e9de319 -EBUILD tar-1.28-r1.ebuild 2244 SHA256 3aba9563f43b186aa362bcaf6c812894dab6b9305ad6e1a3d93d1c276297b71f SHA512 a14ab34881e2fe14a6460d21469e46a19f328bf4c44ef325d385dbaca71cf3a6f90a9d1baf88d9cf0a5f8e6ea03894f7dbef40c66cfe415d4a7f55d6a00ebd13 WHIRLPOOL 2ce02f6eea349a14beb1550c52c5038def20319b398a4ba16e0d34de3a1ace1ac530ff4d0dea0c0c6a8dbb43f2df31269007af2f5649d5b65510e27e262088c6 -EBUILD tar-1.29-r1.ebuild 2237 SHA256 8729e81f6f6c4cf89209d57761a1b5f1aeb009fd5a97b878231f9564da0af574 SHA512 2cb57dba9bd888847348f53f0243f841fd5762d0612bc7aaaafc55168de4b233974c21909b5b9b867088fe73d5e8f8744aa778fb3e0e2232978f99bdb3ea53ea WHIRLPOOL 295e78a1db13a04159acc9b5c9cee28fdd3e08d7387f0997072fcfb93a9e4bf3153b8f47a698e22823092608e108bdc56abc3bd15142b29842ef6a2aaf1cde0f -EBUILD tar-1.29.ebuild 2149 SHA256 c966c35c309f5f565f541053d46dabf3c96d5c0ec5bc20dfd5ff54475ddc26cd SHA512 6fda3fb899655f5c68ee567369b11216aa93953eb1bded34c64f746a3ada1af261d8c6c9f038ddf7543585d3afc77897a627b8dd7806db1022091b4fe76fa613 WHIRLPOOL 593f1292ff4ce338b1dd593bcfc5217b929bc039b3b1c273236a9bbf0a69201f506502262c30c8158e75639084dd5850f139ff3439ef2874b212b463f81f0f46 -MISC ChangeLog 6826 SHA256 4d216216b686a8bf3c1ac2afde5649a1e4faa81ec4935edd7177c50fdb2169be SHA512 7953d186e78e680e7578995393d52670495e6dc792d6bfd10620a06f01f8f20a5cc46c0ee06a386eb6ab90c53f393d53a27051c78318c73fe09fe4f827e8a065 WHIRLPOOL bf4a5a1b471d3d889b0aab88796676d777a8f6fd34fa1238aa194b9035abfd6e407f39e2333a4958ae232bd4fb46e13069ea1185caa97caf5c6b31b088d1c9ac -MISC ChangeLog-2015 31970 SHA256 9e334cc3415e0417fbaed891f6bba1d434ffb07d7ea080688447e0cffec5e462 SHA512 8b8b47dec0e0cd310947ce1b355dec2b9d3173ddb1f7915fb41de337debf35640eafa5b8f6d160fe0e45fc832419f4cf470972ce1bd0e1498879d120a490341b WHIRLPOOL eb05a9e69d7e0efd1a9c0352207e1704b252cf6e9a6fbb8c1154dbea8becfb487b437b3caf83852129d50521bd22d93ab9fdf24dbe5ac59aad852ab1f884d6b0 -MISC metadata.xml 387 SHA256 fae089b1cff94a61ec673decb3bdad5f363260f048d8a6dad027bd141b1d739d SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7 WHIRLPOOL 66a5d269f6023bcef32e4520a189735fc84a1c028a2e9db19fb9fb8ba091fa05fb4cf93ae1c76de16f89e5c4055f45ba345989e81ae1af0b0134914faa28aec3 +DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6 +DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.27.1-recursion_norecursion.patch b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.27.1-recursion_norecursion.patch deleted file mode 100644 index 47973c394b..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.27.1-recursion_norecursion.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2bd9c15391b0bd6ef0bff76aebf09cfb53003199 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Thu, 09 Jan 2014 22:13:15 +0000 -Subject: Fix the use of --no-recursion and --recursion options. - -Each option remains in effect until cancelled by the next ocurrence -of its counterpart, as stated in the documentation. - -* src/names.c (name_next_elt): Restore recursion_option from the -value of matching_flags. ---- -diff --git a/src/names.c b/src/names.c -index fc9841e..7777dc1 100644 ---- a/src/names.c -+++ b/src/names.c -@@ -570,6 +570,7 @@ name_next_elt (int change_dirs) - - case NELT_FMASK: - matching_flags = ep->v.matching_flags; -+ recursion_option = matching_flags & FNM_LEADING_DIR; - name_list_advance (); - continue; - --- -cgit v0.9.0.2 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch deleted file mode 100644 index 14cf90a5f4..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch +++ /dev/null @@ -1,196 +0,0 @@ -http://lists.gnu.org/archive/html/bug-tar/2013-12/msg00023.html -https://bugs.gentoo.org/489170 - ---- tar-1.27.1/configure 2013-11-17 17:18:39.000000000 +0100 -+++ tar-1.27.1/configure 2013-11-17 17:18:39.000000000 +0100 -@@ -33619,19 +33619,20 @@ - fi - - -- for ac_header in attr/xattr.h -+ for ac_header in sys/xattr.h attr/xattr.h - do : -- ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" --if test "x$ac_cv_header_attr_xattr_h" = xyes; then : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_ATTR_XATTR_H 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- if test "$ac_cv_header_attr_xattr_h" = yes; then -+ if test "$ac_cv_header_sys_xattr_h" = yes -o "$ac_cv_header_attr_xattr_h" = yes; then - TAR_COND_XATTR_H_TRUE= - TAR_COND_XATTR_H_FALSE='#' - else -@@ -33639,30 +33640,130 @@ - TAR_COND_XATTR_H_FALSE= - fi - -- if test "$ac_cv_header_attr_xattr_h" = yes; then -- for ac_func in getxattr fgetxattr lgetxattr \ -- setxattr fsetxattr lsetxattr \ -- listxattr flistxattr llistxattr --do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -+ -+ if test "$with_xattrs" != no; then -+ # If doesn't exist and does, -+ # then link against libattr.so and not libc -+ if test "$ac_cv_header_sys_xattr_h" = no -a "$ac_cv_header_attr_xattr_h" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5 -+$as_echo_n "checking for fgetxattr in -lattr... " >&6; } -+if ${ac_cv_lib_attr_fgetxattr+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lattr $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char fgetxattr (); -+int -+main () -+{ -+return fgetxattr (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_attr_fgetxattr=yes -+else -+ ac_cv_lib_attr_fgetxattr=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5 -+$as_echo "$ac_cv_lib_attr_fgetxattr" >&6; } -+if test "x$ac_cv_lib_attr_fgetxattr" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define HAVE_LIBATTR 1 - _ACEOF -- # only when functions are present - --$as_echo "#define HAVE_ATTR_XATTR_H 1" >>confdefs.h -+ LIBS="-lattr $LIBS" - -- if test "$with_xattrs" != no; then -+fi - --$as_echo "#define HAVE_XATTRS /**/" >>confdefs.h -+ fi -+ have_functions=yes -+ for xattr_func in getxattr fgetxattr lgetxattr \ -+ setxattr fsetxattr lsetxattr \ -+ listxattr flistxattr llistxattr; do \ -+ as_ac_Search=`$as_echo "ac_cv_search_$xattr_func" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing $xattr_func" >&5 -+$as_echo_n "checking for library containing $xattr_func... " >&6; } -+if eval \${$as_ac_Search+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $xattr_func (); -+int -+main () -+{ -+return $xattr_func (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' attr; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ eval "$as_ac_Search=\$ac_res" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if eval \${$as_ac_Search+:} false; then : -+ break -+fi -+done -+if eval \${$as_ac_Search+:} false; then : - -- fi -+else -+ eval "$as_ac_Search=no" -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+eval ac_res=\$$as_ac_Search -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+eval ac_res=\$$as_ac_Search -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -+else -+ have_functions=no - fi --done - -+ test $have_functions = no && break -+ done -+ if test $have_functions = yes; then -+ -+$as_echo "#define HAVE_XATTRS 1" >>confdefs.h -+ -+ else -+ test "$with_xattrs" = yes && as_fn_error $? "xattr support requested but not found." "$LINENO" 5 -+ fi - fi - - ---- tar-1.27.1/lib/xattr-at.h 2013-03-14 21:18:10.000000000 +0100 -+++ tar-1.27.1/lib/xattr-at.h 2013-03-14 21:18:10.000000000 +0100 -@@ -20,7 +20,15 @@ - #define XATTRS_AT_H - - #include --#include -+#if defined(HAVE_SYS_XATTR_H) -+# include -+#elif defined(HAVE_ATTR_XATTR_H) -+# include -+#endif -+ -+#ifndef ENOATTR -+# define ENOATTR ENODATA /* No such attribute */ -+#endif - - /* These are the dir-fd-relative variants of the functions without the - "at" suffix. For example, setxattrat (AT_FDCWD, path, name, value, size, diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.28-concat-listed.patch b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.28-concat-listed.patch deleted file mode 100644 index 28dc578241..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.28-concat-listed.patch +++ /dev/null @@ -1,117 +0,0 @@ -https://bugs.gentoo.org/546294 -https://lists.gnu.org/archive/html/bug-tar/2015-04/msg00006.html - -From 15c02c2b9d383446b3ea35dbea5a048e136b020d Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Thu, 16 Apr 2015 13:02:10 +0300 -Subject: [PATCH] Fix extraction from concatenated incremental archives. - -* src/common.h (remove_delayed_set_stat): New proto. -* src/extract.c (free_delayed_set_stat) -(remove_delayed_set_stat): New function. -(apply_nonancestor_delayed_set_stat): Use free_delayed_set_stat. -* src/misc.c (safer_rmdir): Remove delayed_set_stat entry -corresponding to the removed directory. -* tests/incr10.at: New test case. -* tests/Makefile.am: Add new test. -* tests/testsuite.at: Likewise. ---- - src/common.h | 2 ++ - src/extract.c | 38 +++++++++++++++++++++++++++----- - src/misc.c | 7 +++++- - tests/Makefile.am | 1 + - tests/incr10.at | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - tests/testsuite.at | 1 + - 6 files changed, 107 insertions(+), 6 deletions(-) - create mode 100644 tests/incr10.at - -diff --git a/src/common.h b/src/common.h -index 20cbb64..2904183 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -523,6 +523,8 @@ void extract_archive (void); - void extract_finish (void); - bool rename_directory (char *src, char *dst); - -+void remove_delayed_set_stat (const char *fname); -+ - /* Module delete.c. */ - - void delete_archive_members (void); -diff --git a/src/extract.c b/src/extract.c -index ca25603..5aaeb1b 100644 ---- a/src/extract.c -+++ b/src/extract.c -@@ -537,6 +537,38 @@ repair_delayed_set_stat (char const *dir, - quotearg_colon (dir))); - } - -+static void -+free_delayed_set_stat (struct delayed_set_stat *data) -+{ -+ xheader_xattr_free (data->xattr_map, data->xattr_map_size); -+ free (data->cntx_name); -+ free (data->acls_a_ptr); -+ free (data->acls_d_ptr); -+ free (data); -+} -+ -+void -+remove_delayed_set_stat (const char *fname) -+{ -+ struct delayed_set_stat *data, *next, *prev = NULL; -+ for (data = delayed_set_stat_head; data; data = next) -+ { -+ next = data->next; -+ if (chdir_current == data->change_dir -+ && strcmp (data->file_name, fname) == 0) -+ { -+ free_delayed_set_stat (data); -+ if (prev) -+ prev->next = next; -+ else -+ delayed_set_stat_head = next; -+ return; -+ } -+ else -+ prev = data; -+ } -+} -+ - /* After a file/link/directory creation has failed, see if - it's because some required directory was not present, and if so, - create all required directories. Return zero if all the required -@@ -846,11 +878,7 @@ apply_nonancestor_delayed_set_stat (char const *file_name, bool after_links) - } - - delayed_set_stat_head = data->next; -- xheader_xattr_free (data->xattr_map, data->xattr_map_size); -- free (data->cntx_name); -- free (data->acls_a_ptr); -- free (data->acls_d_ptr); -- free (data); -+ free_delayed_set_stat (data); - } - } - -diff --git a/src/misc.c b/src/misc.c -index 8e66643..d263c07 100644 ---- a/src/misc.c -+++ b/src/misc.c -@@ -586,7 +586,12 @@ safer_rmdir (const char *file_name) - return -1; - } - -- return unlinkat (chdir_fd, file_name, AT_REMOVEDIR); -+ if (unlinkat (chdir_fd, file_name, AT_REMOVEDIR) == 0) -+ { -+ remove_delayed_set_stat (file_name); -+ return 0; -+ } -+ return -1; - } - - /* Remove FILE_NAME, returning 1 on success. If FILE_NAME is a directory, --- -2.3.5 - diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.28-xattr.patch b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.28-xattr.patch deleted file mode 100644 index a8f91fd8b2..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.28-xattr.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/548024 - -From 9c2b57232e3bc2e5ba85387560bcdd851849a128 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 5 Jan 2015 20:24:18 -0800 -Subject: [PATCH] tar: port xattr-at.c to Solaris 10 - -* lib/xattr-at.c (setxattrat, lsetxattrat, getxattrat, lgetxattrat) -(listxattrat, llistxattrat): Compile only if HAVE_XATTRS, so that -the code doesn't call functions that are not declared. ---- - lib/xattr-at.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/xattr-at.c b/lib/xattr-at.c -index 443ccae..66427e9 100644 ---- a/lib/xattr-at.c -+++ b/lib/xattr-at.c -@@ -31,6 +31,8 @@ - - #include "openat-priv.h" - -+#ifdef HAVE_XATTRS -+ - /* setxattrat */ - #define AT_FUNC_NAME setxattrat - #define AT_FUNC_F1 setxattr -@@ -108,3 +110,5 @@ - #undef AT_FUNC_RESULT - #undef AT_FUNC_POST_FILE_PARAM_DECLS - #undef AT_FUNC_POST_FILE_ARGS -+ -+#endif /* HAVE_XATTRS */ --- -2.4.0 - diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch deleted file mode 100644 index 6470fe082b..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/lib/paxnames.c 2016-04-06 00:04:47.314860045 +0300 -+++ b/lib/paxnames.c 2016-04-06 02:08:44.962297881 +0300 -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - - /* Hash tables of strings. */ -@@ -114,7 +115,15 @@ - for (p = file_name + prefix_len; *p; ) - { - if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2])) -- prefix_len = p + 2 - file_name; -+ { -+ static char const *const diagnostic[] = -+ { -+ N_("%s: Member name contains '..'"), -+ N_("%s: Hard link target contains '..'") -+ }; -+ ERROR ((0, 0, _(diagnostic[link_target]), -+ quotearg_colon (file_name))); -+ } - - do - { diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch new file mode 100644 index 0000000000..9e255df576 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch @@ -0,0 +1,33 @@ +From 85c005ee1345c342f707f3c55317daf6cb050603 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 10 Jan 2019 18:18:49 +0200 +Subject: Remove erroneous abort() call + +The call was introduced by commit ccef8581. It caused tar to abort +on perfectly normal operations, like untarring archives containing +./ with the -U option, + +See http://lists.gnu.org/archive/html/bug-tar/2019-01/msg00019.html +for details. + +* src/extract.c (maybe_recoverable): Remove misplaced call to abort(). +--- + src/extract.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/extract.c b/src/extract.c +index 090b866..8276f8f 100644 +--- a/src/extract.c ++++ b/src/extract.c +@@ -787,7 +787,7 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made) + case UNLINK_FIRST_OLD_FILES: + break; + } +- abort (); /* notreached */ ++ FALLTHROUGH; + + case ENOENT: + /* Attempt creating missing intermediate directories. */ +-- +cgit v1.0-41-gc330 + diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar.1-1.27 b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar.1-1.27 deleted file mode 100644 index 700b569a57..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar.1-1.27 +++ /dev/null @@ -1,388 +0,0 @@ -.\" generated by script on Mon Oct 21 08:29:21 2013 -.Dd Oct 21, 2013 -.Dt TAR 1 -.Sh NAME -.Nm tar -.Nd The GNU version of the tar archiving utility -.Sh SYNOPSIS -.Nm tar -.Oo Fl Oc Cm A Fl \-catenate \-concatenate Cm \||\| c Fl \-create Cm \||\| d Fl \-diff \-compare Cm \||\| Fl \-delete Cm \||\| r Fl \-append Cm \||\| t Fl \-list Cm \||\| Fl \-test\-label Cm \||\| u Fl \-update Cm \||\| x Fl \-extract \-get -.Op Ar options -.Op Ar pathname ... -.Sh DESCRIPTION -.Nm Tar -stores and extracts files from a tape or disk archive. -.Pp -The first argument to -tar -should be a function; either one of the letters -.Cm Acdrtux , -or one of the long function names. -A function letter need not be prefixed with ``\-'', and may be combined -with other single-letter options. -A long function name must be prefixed with -.Cm \\-\\- . -Some options take a parameter; with the single-letter form -these must be given as separate arguments. -With the long form, they may be given by appending -.Cm = Ns Ar value -to the option. -.Sh FUNCTION LETTERS -Main operation mode: -.Bl -tag -width flag -.It Fl A , Fl \-catenate , Fl \-concatenate -append tar files to an archive -.It Fl c , Fl \-create -create a new archive -.It Fl d , Fl \-diff , Fl \-compare -find differences between archive and file system -.It Fl \-delete -delete from the archive (not on mag tapes!) -.It Fl r , Fl \-append -append files to the end of an archive -.It Fl t , Fl \-list -list the contents of an archive -.It Fl \-test\-label -test the archive volume label and exit -.It Fl u , Fl \-update -only append files newer than copy in archive -.It Fl x , Fl \-extract , Fl \-get -extract files from an archive -.El -.Sh OTHER OPTIONS -Operation modifiers: -.Bl -tag -width flag -.It \-[0\-7][lmh] -specify drive and density -.It Fl a , Fl \-auto\-compress -use archive suffix to determine the compression program -.It Fl \-acls -Enable the POSIX ACLs support -.It Fl \-no\-acls -Disable the POSIX ACLs support -.It Fl \-add\-file Ns \= Ns Ar FILE -add given FILE to the archive (useful if its name starts with a dash) -.It Fl \-anchored -patterns match file name start -.It Fl \-no\-anchored -patterns match after any '/' (default for exclusion) -.It Fl \-atime\-preserve -preserve access times on dumped files, either by restoring the times -.It Fl \-no\-auto\-compress -do not use archive suffix to determine the compression program -.It Fl b , Fl \-blocking\-factor Ar BLOCKS -BLOCKS x 512 bytes per record -.It Fl B , Fl \-read\-full\-records -reblock as we read (for 4.2BSD pipes) -.It Fl \-backup -backup before removal, choose version CONTROL -.It Fl C , Fl \-directory Ar DIR -change to directory DIR -.It Fl \-check\-device -check device numbers when creating incremental archives (default) -.It Fl \-no\-check\-device -do not check device numbers when creating incremental archives -.It Fl \-checkpoint -display progress messages every NUMBERth record (default 10) -.It Fl \-checkpoint\-action Ns \= Ns Ar ACTION -execute ACTION on each checkpoint -.It Fl \-delay\-directory\-restore -delay setting modification times and permissions of extracted -.It Fl \-no\-delay\-directory\-restore -cancel the effect of --delay-directory-restore option -.It Fl \-exclude Ns \= Ns Ar PATTERN -exclude files, given as a PATTERN -.It Fl \-exclude\-backups -exclude backup and lock files -.It Fl \-exclude\-caches -exclude contents of directories containing CACHEDIR.TAG, -.It Fl \-exclude\-caches\-all -exclude directories containing CACHEDIR.TAG -.It Fl \-exclude\-caches\-under -exclude everything under directories containing CACHEDIR.TAG -.It Fl \-exclude\-tag Ns \= Ns Ar FILE -exclude contents of directories containing FILE, except -.It Fl \-exclude\-tag\-all Ns \= Ns Ar FILE -exclude directories containing FILE -.It Fl \-exclude\-tag\-under Ns \= Ns Ar FILE -exclude everything under directories containing FILE -.It Fl \-exclude\-vcs -exclude version control system directories -.It Fl f , Fl \-file Ar ARCHIVE -use archive file or device ARCHIVE -.It Fl F , Fl \-info\-script , Fl \-new\-volume\-script Ar NAME -run script at end of each tape (implies -M) -.It Fl \-force\-local -archive file is local even if it has a colon -.It Fl \-full\-time -print file time to its full resolution -.It Fl g , Fl \-listed\-incremental Ar FILE -handle new GNU-format incremental backup -.It Fl G , Fl \-incremental -handle old GNU-format incremental backup -.It Fl \-group Ns \= Ns Ar NAME -force NAME as group for added files -.It Fl h , Fl \-dereference -follow symlinks; archive and dump the files they point to -.It Fl H , Fl \-format Ar FORMAT -create archive of the given formatFORMAT is one of the following: -.Bl -tag -width flag -.It Fl \-format=gnu -GNU tar 1.13.x format -.It Fl \-format=oldgnu -GNU format as per tar <= 1.12 -.It Fl \-format=pax -POSIX 1003.1-2001 (pax) format -.It Fl \-format=posix -same as pax -.It Fl \-format=ustar -POSIX 1003.1-1988 (ustar) format -.It Fl \-format=v7 -old V7 tar format -.El -.It Fl \-hard\-dereference -follow hard links; archive and dump the files they refer to -.It Fl i , Fl \-ignore\-zeros -ignore zeroed blocks in archive (means EOF) -.It Fl I , Fl \-use\-compress\-program Ar PROG -filter through PROG (must accept -d) -.It Fl \-ignore\-case -ignore case -.It Fl \-no\-ignore\-case -case sensitive matching (default) -.It Fl \-ignore\-command\-error -ignore exit codes of children -.It Fl \-no\-ignore\-command\-error -treat non-zero exit codes of children as error -.It Fl \-ignore\-failed\-read -do not exit with nonzero on unreadable files -.It Fl \-index\-file Ns \= Ns Ar FILE -send verbose output to FILE -.It Fl j , Fl \-bzip2 - -.It Fl J , Fl \-xz - -.It Fl k , Fl \-keep\-old\-files -don't replace existing files when extracting, -.It Fl K , Fl \-starting\-file Ar MEMBER-NAME -begin at member MEMBER-NAME when reading the archive -.It Fl \-keep\-directory\-symlink -preserve existing symlinks to directories when extracting -.It Fl \-keep\-newer\-files -don't replace existing files that are newer than their archive copies -.It Fl l , Fl \-check\-links -print a message if not all links are dumped -.It Fl L , Fl \-tape\-length Ar NUMBER -change tape after writing NUMBER x 1024 bytes -.It Fl \-level Ns \= Ns Ar NUMBER -dump level for created listed-incremental archive -.It Fl \-lzip - -.It Fl \-lzma - -.It Fl \-lzop - -.It Fl m , Fl \-touch -don't extract file modified time -.It Fl M , Fl \-multi\-volume -create/list/extract multi-volume archive -.It Fl \-mode Ns \= Ns Ar CHANGES -force (symbolic) mode CHANGES for added files -.It Fl \-mtime Ns \= Ns Ar DATE-OR-FILE -set mtime for added files from DATE-OR-FILE -.It Fl n , Fl \-seek -archive is seekable -.It Fl N , Fl \-newer , Fl \-after\-date Ar DATE-OR-FILE -only store files newer than DATE-OR-FILE -.It Fl \-newer\-mtime Ns \= Ns Ar DATE -compare date and time when data changed only -.It Fl \-null --T reads null-terminated names, disable -C -.It Fl \-no\-null -disable the effect of the previous --null option -.It Fl \-numeric\-owner -always use numbers for user/group names -.It Fl O , Fl \-to\-stdout -extract files to standard output -.It Fl \-occurrence -process only the NUMBERth occurrence of each file in the archive; -.It Fl \-old\-archive , Fl \-portability -same as --format=v7 -.It Fl \-one\-file\-system -stay in local file system when creating archive -.It Fl \-overwrite -overwrite existing files when extracting -.It Fl \-overwrite\-dir -overwrite metadata of existing directories when extracting (default) -.It Fl \-no\-overwrite\-dir -preserve metadata of existing directories -.It Fl \-owner Ns \= Ns Ar NAME -force NAME as owner for added files -.It Fl p , Fl \-preserve\-permissions , Fl \-same\-permissions -extract information about file permissions (default for superuser) -.It Fl P , Fl \-absolute\-names -don't strip leading '/'s from file names -.It Fl \-pax\-option Ns \= Ns Ar keyword[[:]=value][,keyword[[:]=value]]... -control pax keywords -.It Fl \-posix -same as --format=posix -.It Fl \-preserve -same as both -p and -s -.It Fl \-quote\-chars Ns \= Ns Ar STRING -additionally quote characters from STRING -.It Fl \-no\-quote\-chars Ns \= Ns Ar STRING -disable quoting for characters from STRING -.It Fl \-quoting\-style Ns \= Ns Ar STYLE -set name quoting style; see below for valid STYLE values -.It Fl R , Fl \-block\-number -show block number within archive with each message -.It Fl \-record\-size Ns \= Ns Ar NUMBER -NUMBER of bytes per record, multiple of 512 -.It Fl \-recursion -recurse into directories (default) -.It Fl \-no\-recursion -avoid descending automatically in directories -.It Fl \-recursive\-unlink -empty hierarchies prior to extracting directory -.It Fl \-remove\-files -remove files after adding them to the archive -.It Fl \-restrict -disable use of some potentially harmful options -.It Fl \-rmt\-command Ns \= Ns Ar COMMAND -use given rmt COMMAND instead of rmt -.It Fl \-rsh\-command Ns \= Ns Ar COMMAND -use remote COMMAND instead of rsh -.It Fl s , Fl \-preserve\-order , Fl \-same\-order -member arguments are listed in the same order as the -.It Fl S , Fl \-sparse -handle sparse files efficiently -.It Fl \-same\-owner -try extracting files with the same ownership as exists in the archive (default for superuser) -.It Fl \-no\-same\-owner -extract files as yourself (default for ordinary users) -.It Fl \-no\-same\-permissions -apply the user's umask when extracting permissions from the archive (default for ordinary users) -.It Fl \-no\-seek -archive is not seekable -.It Fl \-selinux -Enable the SELinux context support -.It Fl \-no\-selinux -Disable the SELinux context support -.It Fl \-show\-defaults -show tar defaults -.It Fl \-show\-omitted\-dirs -when listing or extracting, list each directory that does not match search criteria -.It Fl \-show\-snapshot\-field\-ranges -show valid ranges for snapshot-file fields -.It Fl \-show\-transformed\-names , Fl \-show\-stored\-names -show file or archive names after transformation -.It Fl \-skip\-old\-files -don't replace existing files when extracting, silently skip over them -.It Fl \-sparse\-version Ns \= Ns Ar MAJOR[.MINOR] -set version of the sparse format to use (implies --sparse) -.It Fl \-strip\-components Ns \= Ns Ar NUMBER -strip NUMBER leading components from file names on extraction -.It Fl \-suffix Ns \= Ns Ar STRING -backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX) -.It Fl T , Fl \-files\-from Ar FILE -get names to extract or create from FILE -.It Fl \-to\-command Ns \= Ns Ar COMMAND -pipe extracted files to another program -.It Fl \-totals -print total bytes after processing the archive; -.It Fl \-transform , Fl \-xform Ar EXPRESSION -use sed replace EXPRESSION to transform file names -.It Fl U , Fl \-unlink\-first -remove each file prior to extracting over it -.It Fl \-unquote -unquote filenames read with -T (default) -.It Fl \-no\-unquote -do not unquote filenames read with -T -.It Fl \-utc -print file modification times in UTC -.It Fl v , Fl \-verbose -verbosely list files processed -.It Fl V , Fl \-label Ar TEXT -create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name -.It Fl \-volno\-file Ns \= Ns Ar FILE -use/update the volume number in FILE -.It Fl w , Fl \-interactive , Fl \-confirmation -ask for confirmation for every action -.It Fl W , Fl \-verify -attempt to verify the archive after writing it -.It Fl \-warning Ns \= Ns Ar KEYWORD -warning control -.It Fl \-wildcards -use wildcards (default for exclusion) -.It Fl \-wildcards\-match\-slash -wildcards match '/' (default for exclusion) -.It Fl \-no\-wildcards\-match\-slash -wildcards do not match '/' -.It Fl \-no\-wildcards -verbatim string matching -.It Fl X , Fl \-exclude\-from Ar FILE -exclude patterns listed in FILE -.It Fl \-xattrs -Enable extended attributes support -.It Fl \-xattrs\-exclude Ns \= Ns Ar MASK -specify the exclude pattern for xattr keys -.It Fl \-xattrs\-include Ns \= Ns Ar MASK -specify the include pattern for xattr keys -.It Fl \-no\-xattrs -Disable extended attributes support -.It Fl z , Fl \-gzip , Fl \-gunzip Fl \-ungzip - -.It Fl Z , Fl \-compress , Fl \-uncompress - -.El -.Sh ENVIRONMENT -The behavior of tar is controlled by the following environment variables, -among others: -.Bl -tag -width Ds -.It Ev SIMPLE_BACKUP_SUFFIX -Backup prefix to use when extracting, if -.Fl \-suffix -is not specified. -The backup suffix defaults to `~' if neither is specified. -.It Ev TAR_OPTIONS -Options to prepend to those specified on the command line, separated by -whitespace. Embedded backslashes may be used to escape whitespace or -backslashes within an option. -.It Ev TAPE -Device or file to use for the archive if -.Fl \-file -is not specified. -If this environment variable is unset, use stdin or stdout instead. -.El -.Sh EXAMPLES -Create archive.tar from files foo and bar. -.Bd -literal -offset indent -compact -tar \-cf archive.tar foo bar -.Ed -List all files in archive.tar verbosely. -.Bd -literal -offset indent -compact -tar \-tvf archive.tar -.Ed -Extract all files from archive.tar. -.Bd -literal -offset indent -compact -tar \-xf archive.tar -.Ed -.Sh SEE ALSO -.\" libarchive -.Xr tar 5 , -.\" man-pages -.Xr symlink 7 , -.Xr rmt 8 -.Sh HISTORY -The -.Nm tar -command appeared in -.At v7 . -.Sh BUGS -The GNU folks, in general, abhor man pages, and create info documents instead. -Unfortunately, the info document describing tar is licensed under the GFDL with -invariant cover texts, which makes it impossible to include any text -from that document in this man page. -Most of the text in this document was automatically extracted from the usage -text in the source. -It may not completely describe all features of the program. diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.27.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.27.1-r2.ebuild deleted file mode 100644 index 8c01c37606..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.27.1-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit flag-o-matic eutils - -DESCRIPTION="Use this to make tarballs :)" -HOMEPAGE="https://www.gnu.org/software/tar/" -SRC_URI="mirror://gnu/tar/${P}.tar.bz2 - mirror://gnu-alpha/tar/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl minimal nls selinux static userland_GNU xattr" - -RDEPEND="acl? ( virtual/acl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( >=sys-devel/gettext-0.10.35 ) - xattr? ( sys-apps/attr )" - -src_prepare() { - EPATCH_OPTS="-Z" \ - epatch "${FILESDIR}/${P}-xattr_build_fix.patch" - epatch "${FILESDIR}/${P}-recursion_norecursion.patch" - if ! use userland_GNU ; then - sed -i \ - -e 's:/backup\.sh:/gbackup.sh:' \ - scripts/{backup,dump-remind,restore}.in \ - || die "sed non-GNU" - fi -} - -src_configure() { - use static && append-ldflags -static - FORCE_UNSAFE_CONFIGURE=1 \ - econf \ - --enable-backup-scripts \ - --bindir="${EPREFIX}"/bin \ - --libexecdir="${EPREFIX}"/usr/sbin \ - $(usex userland_GNU "" "--program-prefix=g") \ - $(use_with acl posix-acls) \ - $(use_enable nls) \ - $(use_with selinux) \ - $(use_with xattr xattrs) -} - -src_install() { - emake DESTDIR="${D}" install - - local p=$(usex userland_GNU "" "g") - if [[ -z ${p} ]] ; then - # a nasty yet required piece of baggage - exeinto /etc - doexe "${FILESDIR}"/rmt - fi - - # autoconf looks for gtar before tar (in configure scripts), hence - # in Prefix it is important that it is there, otherwise, a gtar from - # the host system (FreeBSD, Solaris, Darwin) will be found instead - # of the Prefix provided (GNU) tar - if use prefix ; then - dosym tar /bin/gtar - fi - - dodoc AUTHORS ChangeLog* NEWS README* THANKS - newman "${FILESDIR}"/tar.1-1.27 ${p}tar.1 - mv "${ED}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED}"/usr/sbin/${p}restore{,-tar} || die - - if use minimal ; then - find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ - -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ - -delete || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.28-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.28-r1.ebuild deleted file mode 100644 index ee145ec87b..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.28-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit flag-o-matic eutils - -DESCRIPTION="Use this to make tarballs :)" -HOMEPAGE="https://www.gnu.org/software/tar/" -SRC_URI="mirror://gnu/tar/${P}.tar.bz2 - mirror://gnu-alpha/tar/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" - -RDEPEND="acl? ( virtual/acl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( >=sys-devel/gettext-0.10.35 ) - xattr? ( elibc_glibc? ( sys-apps/attr ) )" - -src_prepare() { - if ! use userland_GNU ; then - sed -i \ - -e 's:/backup\.sh:/gbackup.sh:' \ - scripts/{backup,dump-remind,restore}.in \ - || die "sed non-GNU" - fi - epatch "${FILESDIR}"/${P}-concat-listed.patch #546294 - epatch "${FILESDIR}"/${P}-xattr.patch #548024 -} - -src_configure() { - use static && append-ldflags -static - FORCE_UNSAFE_CONFIGURE=1 \ - econf \ - --enable-backup-scripts \ - --bindir="${EPREFIX}"/bin \ - --libexecdir="${EPREFIX}"/usr/sbin \ - $(usex userland_GNU "" "--program-prefix=g") \ - $(use_with acl posix-acls) \ - $(use_enable nls) \ - $(use_with selinux) \ - $(use_with xattr xattrs) -} - -src_install() { - default - - local p=$(usex userland_GNU "" "g") - if [[ -z ${p} ]] ; then - # a nasty yet required piece of baggage - exeinto /etc - doexe "${FILESDIR}"/rmt - fi - - # autoconf looks for gtar before tar (in configure scripts), hence - # in Prefix it is important that it is there, otherwise, a gtar from - # the host system (FreeBSD, Solaris, Darwin) will be found instead - # of the Prefix provided (GNU) tar - if use prefix ; then - dosym tar /bin/gtar - fi - - mv "${ED}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED}"/usr/sbin/${p}restore{,-tar} || die - - if use minimal ; then - find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ - -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ - -delete || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.29-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.31-r1.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.29-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.31-r1.ebuild index 5d85b9368a..72de0a507c 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.29-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.31-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 -inherit flag-o-matic eutils +inherit flag-o-matic DESCRIPTION="Use this to make tarballs :)" HOMEPAGE="https://www.gnu.org/software/tar/" @@ -13,22 +12,22 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2 LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" -RDEPEND="acl? ( virtual/acl ) +LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )" + +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) selinux? ( sys-libs/libselinux )" DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.10.35 ) + static? ( ${LIB_DEPEND} ) xattr? ( elibc_glibc? ( sys-apps/attr ) )" -PATCHES=( - "${FILESDIR}/${P}-extract-pathname-bypass.patch" -) +PATCHES=( "${FILESDIR}"/${P}-remove-erroneous-abort-call.patch ) src_prepare() { - epatch "${PATCHES[@]}" - epatch_user + default if ! use userland_GNU ; then sed -i \ @@ -40,16 +39,17 @@ src_prepare() { src_configure() { use static && append-ldflags -static - FORCE_UNSAFE_CONFIGURE=1 \ - econf \ - --enable-backup-scripts \ - --bindir="${EPREFIX}"/bin \ - --libexecdir="${EPREFIX}"/usr/sbin \ - $(usex userland_GNU "" "--program-prefix=g") \ - $(use_with acl posix-acls) \ - $(use_enable nls) \ - $(use_with selinux) \ + local myeconfargs=( + --bindir="${EPREFIX%/}"/bin + --enable-backup-scripts + --libexecdir="${EPREFIX%/}"/usr/sbin + $(usex userland_GNU "" "--program-prefix=g") + $(use_with acl posix-acls) + $(use_enable nls) + $(use_with selinux) $(use_with xattr xattrs) + ) + FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}" } src_install() { @@ -70,11 +70,11 @@ src_install() { dosym tar /bin/gtar fi - mv "${ED}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED}"/usr/sbin/${p}restore{,-tar} || die + mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die + mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die if use minimal ; then - find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ + find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \ -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ -delete || die fi diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.29.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.ebuild similarity index 61% rename from sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.29.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.ebuild index 02f2c7eeb0..bfcea16fbe 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.29.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 -inherit flag-o-matic eutils +inherit flag-o-matic DESCRIPTION="Use this to make tarballs :)" HOMEPAGE="https://www.gnu.org/software/tar/" @@ -13,16 +12,21 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2 LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" -RDEPEND="acl? ( virtual/acl ) +LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )" + +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) selinux? ( sys-libs/libselinux )" DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.10.35 ) + static? ( ${LIB_DEPEND} ) xattr? ( elibc_glibc? ( sys-apps/attr ) )" src_prepare() { + default + if ! use userland_GNU ; then sed -i \ -e 's:/backup\.sh:/gbackup.sh:' \ @@ -33,16 +37,17 @@ src_prepare() { src_configure() { use static && append-ldflags -static - FORCE_UNSAFE_CONFIGURE=1 \ - econf \ - --enable-backup-scripts \ - --bindir="${EPREFIX}"/bin \ - --libexecdir="${EPREFIX}"/usr/sbin \ - $(usex userland_GNU "" "--program-prefix=g") \ - $(use_with acl posix-acls) \ - $(use_enable nls) \ - $(use_with selinux) \ + local myeconfargs=( + --bindir="${EPREFIX%/}"/bin + --enable-backup-scripts + --libexecdir="${EPREFIX%/}"/usr/sbin + $(usex userland_GNU "" "--program-prefix=g") + $(use_with acl posix-acls) + $(use_enable nls) + $(use_with selinux) $(use_with xattr xattrs) + ) + FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}" } src_install() { @@ -63,11 +68,11 @@ src_install() { dosym tar /bin/gtar fi - mv "${ED}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED}"/usr/sbin/${p}restore{,-tar} || die + mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die + mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die if use minimal ; then - find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ + find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \ -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ -delete || die fi diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.27.1-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.27.1-r2 deleted file mode 100644 index cf6f15d140..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.27.1-r2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( sys-apps/attr ) -DESCRIPTION=Use this to make tarballs :) -EAPI=4 -HOMEPAGE=https://www.gnu.org/software/tar/ -IUSE=acl minimal nls selinux static userland_GNU xattr -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-3+ -RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) -SLOT=0 -SRC_URI=mirror://gnu/tar/tar-1.27.1.tar.bz2 mirror://gnu-alpha/tar/tar-1.27.1.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=c7203afb0128d3ef1dd48ac06365ec1f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.28-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.28-r1 deleted file mode 100644 index ee42736b96..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.28-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) ) -DESCRIPTION=Use this to make tarballs :) -EAPI=4 -HOMEPAGE=https://www.gnu.org/software/tar/ -IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr -KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-3+ -RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) -SLOT=0 -SRC_URI=mirror://gnu/tar/tar-1.28.tar.bz2 mirror://gnu-alpha/tar/tar-1.28.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=b46610a7b4556f455ccd62f94b57bc16 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.29-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.31-r1 similarity index 54% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.29-r1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.31-r1 index 06d0faeb34..696ea8fd16 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.29-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.31-r1 @@ -1,13 +1,13 @@ DEFINED_PHASES=configure install prepare -DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) ) +DEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) static? ( acl? ( virtual/acl[static-libs(+)] ) ) xattr? ( elibc_glibc? ( sys-apps/attr ) ) DESCRIPTION=Use this to make tarballs :) -EAPI=5 +EAPI=6 HOMEPAGE=https://www.gnu.org/software/tar/ IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-3+ -RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) +RDEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux ) SLOT=0 -SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2 +SRC_URI=mirror://gnu/tar/tar-1.31.tar.bz2 mirror://gnu-alpha/tar/tar-1.31.tar.bz2 _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=1797eae97feb42042a947790991641ef +_md5_=4b2f59804db1aa2f086ca697e8d595ed diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.29 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.32 similarity index 54% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.29 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.32 index 7d1e16d4e8..ae79787799 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.29 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/tar-1.32 @@ -1,13 +1,13 @@ DEFINED_PHASES=configure install prepare -DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) ) +DEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) static? ( acl? ( virtual/acl[static-libs(+)] ) ) xattr? ( elibc_glibc? ( sys-apps/attr ) ) DESCRIPTION=Use this to make tarballs :) -EAPI=5 +EAPI=6 HOMEPAGE=https://www.gnu.org/software/tar/ IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-3+ -RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) +RDEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux ) SLOT=0 -SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2 +SRC_URI=mirror://gnu/tar/tar-1.32.tar.bz2 mirror://gnu-alpha/tar/tar-1.32.tar.bz2 _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=a1ca5e02b19a072f26002dd6c4e313ba +_md5_=3c52bf7c4c46cc6e8c64126ab34b89de From 756c04232e4c2f4856d1ed97b771e6ff4150ac7a Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 11 Mar 2019 02:21:13 +0000 Subject: [PATCH 3/3] bump(net-misc/wget): sync with upstream --- .../md5-cache/net-misc/wget-1.19.1-r2 | 14 -- .../metadata/md5-cache/net-misc/wget-1.19.4 | 14 -- .../metadata/md5-cache/net-misc/wget-1.19.5 | 14 -- .../metadata/md5-cache/net-misc/wget-1.20.1 | 14 ++ .../portage-stable/net-misc/wget/Manifest | 4 +- .../files/wget-1.19.1-CRLF_injection.patch | 37 ---- .../files/wget-1.19.1-CVE-2017-13089.patch | 34 ---- .../files/wget-1.19.1-CVE-2017-13090.patch | 37 ---- ...et-1.19.1-fix-Perl-warnings-in-tests.patch | 104 ----------- .../wget-1.19.1-fix-Python-test-suite.patch | 172 ------------------ .../net-misc/wget/wget-1.19.1-r2.ebuild | 115 ------------ .../net-misc/wget/wget-1.19.5.ebuild | 117 ------------ ...{wget-1.19.4.ebuild => wget-1.20.1.ebuild} | 13 +- 13 files changed, 22 insertions(+), 667 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.1-r2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.4 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.5 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.20.1 delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.5.ebuild rename sdk_container/src/third_party/portage-stable/net-misc/wget/{wget-1.19.4.ebuild => wget-1.20.1.ebuild} (85%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.1-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.1-r2 deleted file mode 100644 index ff31cf141b..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.1-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install prepare setup -DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) -DESCRIPTION=Network utility to retrieve files from the WWW -EAPI=6 -HOMEPAGE=https://www.gnu.org/software/wget/ -IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-3 -RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) -REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl ) -SLOT=0 -SRC_URI=mirror://gnu/wget/wget-1.19.1.tar.xz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=117a834a7adf7b983f0435a71afb1ae8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.4 deleted file mode 100644 index 0371e646c9..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install prepare setup -DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) -DESCRIPTION=Network utility to retrieve files from the WWW -EAPI=6 -HOMEPAGE=https://www.gnu.org/software/wget/ -IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-3 -RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) -REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl ) -SLOT=0 -SRC_URI=mirror://gnu/wget/wget-1.19.4.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=30afeb88eb89610406c5fc7ea68c0dbc diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.5 deleted file mode 100644 index 1590441499..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.19.5 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install prepare setup -DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) -DESCRIPTION=Network utility to retrieve files from the WWW -EAPI=6 -HOMEPAGE=https://www.gnu.org/software/wget/ -IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib -KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-3 -RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) -REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl ) -SLOT=0 -SRC_URI=mirror://gnu/wget/wget-1.19.5.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=710233b1fca7f205aa762fd58a70d411 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.20.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.20.1 new file mode 100644 index 0000000000..3993b9fe5a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.20.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install prepare setup +DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14:= ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) +DESCRIPTION=Network utility to retrieve files from the WWW +EAPI=6 +HOMEPAGE=https://www.gnu.org/software/wget/ +IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-3 +RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14:= ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) +REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl ) +SLOT=0 +SRC_URI=mirror://gnu/wget/wget-1.20.1.tar.gz +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=4f2e18c9e1d303a0d0bd0c4f1100837a diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/wget/Manifest index 8a22faba26..8660cb751b 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/Manifest @@ -1,3 +1 @@ -DIST wget-1.19.1.tar.xz 2111756 BLAKE2B e5dcaa791f78bb2d7de19a6f689430cd692e1232b7392102936e5f3b4e3592861bcfc78e27df0c4b02a9002ce4c755e765a0a51749670464789fc9f07f8787f7 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 -DIST wget-1.19.4.tar.gz 4310657 BLAKE2B 3f2e5a32e897101761d449f079bf9df38e60b68284230553b03280a6262e60b3d0b5af3bd9fdd334d09cac5ed3417c3a7e8736b1710f3a7402a123b4633b95e4 SHA512 e84b0c40235b160ade69e18f2f139c782eb2387edc97a847c11dbb906c0273daf6d0ef5afe20360ba965c7da8b5e109f5a45e39ea93d20ec945575203235943a -DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b +DIST wget-1.20.1.tar.gz 4392853 BLAKE2B 5740fa70064e24a699ba5fc0b6262b372fc877e86fc74bede07bcfe7dcdf6d4a15db7686fc900d8ec90ad3adce8c4af1c00460601c1845da7907f929d8d48447 SHA512 855c7e3c45f9020a9fdb30e286ee6a0bdcaa780be3d0dda9ffdae73b562ae1012d4550242f66240407a28076a7054328d4f08a469a0da227a9e3410b8d5f46dc diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch deleted file mode 100644 index aa4e978cfd..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Mon, 6 Mar 2017 10:04:22 +0100 -Subject: Fix CRLF injection in Wget host part - -* src/url.c (url_parse): Reject control characters in host part of URL - -Reported-by: Orange Tsai ---- - src/url.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/url.c b/src/url.c -index 8f8ff0b..7d36b27 100644 ---- a/src/url.c -+++ b/src/url.c -@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode) - url_unescape (u->host); - host_modified = true; - -+ /* check for invalid control characters in host name */ -+ for (p = u->host; *p; p++) -+ { -+ if (c_iscntrl(*p)) -+ { -+ url_free(u); -+ error_code = PE_INVALID_HOST_NAME; -+ goto error; -+ } -+ } -+ - /* Apply IDNA regardless of iri->utf8_encode status */ - if (opt.enable_iri && iri) - { --- -cgit v1.0-41-gc330 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch deleted file mode 100644 index f961741aa2..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3dbc2e06ad487862c2fcc64d4891ff8aeb254bad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Fri, 20 Oct 2017 10:59:38 +0200 -Subject: [PATCH 1/2] Fix stack overflow in HTTP protocol handling - (CVE-2017-13089) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* src/http.c (skip_short_body): Return error on negative chunk size - -Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint -Reported-by: Juhani Eronen from Finnish National Cyber Security Centre ---- - src/http.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/http.c b/src/http.c -index 55367688..dc318231 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked) - remaining_chunk_size = strtol (line, &endl, 16); - xfree (line); - -+ if (remaining_chunk_size < 0) -+ return false; -+ - if (remaining_chunk_size == 0) - { - line = fd_read_line (fd); --- -2.15.0.rc1 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch deleted file mode 100644 index 4e600fe784..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 28925c37b72867c0819799c6f35caf9439080f83 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Fri, 20 Oct 2017 15:15:47 +0200 -Subject: [PATCH 2/2] Fix heap overflow in HTTP protocol handling - (CVE-2017-13090) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* src/retr.c (fd_read_body): Stop processing on negative chunk size - -Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint -Reported-by: Juhani Eronen from Finnish National Cyber Security Centre ---- - src/retr.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/retr.c b/src/retr.c -index a27d58af..723ac725 100644 ---- a/src/retr.c -+++ b/src/retr.c -@@ -378,6 +378,12 @@ fd_read_body (const char *downloaded_filename, int fd, FILE *out, wgint toread, - remaining_chunk_size = strtol (line, &endl, 16); - xfree (line); - -+ if (remaining_chunk_size < 0) -+ { -+ ret = -1; -+ break; -+ } -+ - if (remaining_chunk_size == 0) - { - ret = 0; --- -2.15.0.rc1 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch deleted file mode 100644 index 334bcef865..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 7ffe93cabb181f39ad5091c31ab9f61bd940a55f Mon Sep 17 00:00:00 2001 -From: Anton Yuzhaninov -Date: Wed, 5 Apr 2017 19:06:42 +0300 -Subject: [PATCH] Fix perl warnings in tests - -* tests/FTPServer.pm: Escape '{' in RE to fix warnings -* tests/FTPTest.pm: Likewise -* tests/HTTPServer.pm: Likewise -* tests/HTTPTest.pm: Likewise -* tests/Test-proxied-https-auth-keepalive.px: Likewise -* tests/Test-proxied-https-auth.px: Likewise -Escape '{' in RE to fix warnings: -Unescaped left brace in regex is deprecated, passed through in regex; -marked by <-- HERE in m/{{ <-- HERE port}}/ ---- - tests/FTPServer.pm | 2 +- - tests/FTPTest.pm | 2 +- - tests/HTTPServer.pm | 2 +- - tests/HTTPTest.pm | 2 +- - tests/Test-proxied-https-auth-keepalive.px | 2 +- - tests/Test-proxied-https-auth.px | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm -index a5185d66..cac80942 100644 ---- a/tests/FTPServer.pm -+++ b/tests/FTPServer.pm -@@ -589,7 +589,7 @@ sub new - foreach my $file (keys %{$self->{_input}}) - { - my $ref = \$self->{_input}{$file}{content}; -- $$ref =~ s/{{port}}/$self->sockport/eg; -+ $$ref =~ s/\Q{{port}}/$self->sockport/eg; - } - - return $self; -diff --git a/tests/FTPTest.pm b/tests/FTPTest.pm -index 50385ad0..0a1c768c 100644 ---- a/tests/FTPTest.pm -+++ b/tests/FTPTest.pm -@@ -53,7 +53,7 @@ sub _substitute_port - { - my $self = shift; - my $ret = shift; -- $ret =~ s/{{port}}/$self->{_server}->sockport/eg; -+ $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg; - return $ret; - } - -diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm -index dd8ec043..78609f65 100644 ---- a/tests/HTTPServer.pm -+++ b/tests/HTTPServer.pm -@@ -310,7 +310,7 @@ sub _substitute_port - { - my $self = shift; - my $ret = shift; -- $ret =~ s/{{port}}/$self->sockport/eg; -+ $ret =~ s/\Q{{port}}/$self->sockport/eg; - return $ret; - } - -diff --git a/tests/HTTPTest.pm b/tests/HTTPTest.pm -index 00f079f8..6225c7f1 100644 ---- a/tests/HTTPTest.pm -+++ b/tests/HTTPTest.pm -@@ -47,7 +47,7 @@ sub _substitute_port - { - my $self = shift; - my $ret = shift; -- $ret =~ s/{{port}}/$self->{_server}->sockport/eg; -+ $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg; - return $ret; - } - -diff --git a/tests/Test-proxied-https-auth-keepalive.px b/tests/Test-proxied-https-auth-keepalive.px -index 049bebec..2a18ccfd 100755 ---- a/tests/Test-proxied-https-auth-keepalive.px -+++ b/tests/Test-proxied-https-auth-keepalive.px -@@ -153,7 +153,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee" - . " --password=Dodgson -e https_proxy=localhost:{{port}}" - . " --no-check-certificate" - . " https://no.such.domain/needs-auth.txt"; --$cmdline =~ s/{{port}}/$SOCKET->sockport()/e; -+$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e; - - if (defined $srcdir) { - $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl'; -diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px -index ce4e736c..878114e7 100755 ---- a/tests/Test-proxied-https-auth.px -+++ b/tests/Test-proxied-https-auth.px -@@ -152,7 +152,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee" - . " --password=Dodgson -e https_proxy=localhost:{{port}}" - . " --no-check-certificate" - . " https://no.such.domain/needs-auth.txt"; --$cmdline =~ s/{{port}}/$SOCKET->sockport()/e; -+$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e; - - if (defined $srcdir) { - $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl'; --- -2.14.3 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch deleted file mode 100644 index 11736675dc..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch +++ /dev/null @@ -1,172 +0,0 @@ -Fix python test suite for GnuTLS 3.5.12+ - -Backport of f42229b1fdf30ee30c6e13b01eb0c4ebd9ea9169 - ---- a/testenv/Test--rejected-log.py -+++ b/testenv/Test--rejected-log.py -@@ -14,7 +14,7 @@ mainpage = """ - - -

-- Recurse to a second page. -+ Recurse to a second page. -

- - -@@ -27,8 +27,8 @@ secondpage = """ - - -

-- Recurse to a third page. -- Try the blacklisted main page. -+ Recurse to a third page. -+ Try the blacklisted main page. -

- - -@@ -41,7 +41,7 @@ thirdpage = """ - - -

-- Try a hidden dummy file. -+ Try a hidden dummy file. - Try to leave to another domain. -

- -@@ -55,9 +55,9 @@ Disallow: /dummy.txt - - log = """\ - REASON\tU_URL\tU_SCHEME\tU_HOST\tU_PORT\tU_PATH\tU_PARAMS\tU_QUERY\tU_FRAGMENT\tP_URL\tP_SCHEME\tP_HOST\tP_PORT\tP_PATH\tP_PARAMS\tP_QUERY\tP_FRAGMENT --BLACKLIST\thttp%3A//127.0.0.1%3A{{port}}/index.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tindex.html\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/secondpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tsecondpage.html\t\t\t --ROBOTS\thttp%3A//127.0.0.1%3A{{port}}/dummy.txt\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tdummy.txt\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t --SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t -+BLACKLIST\thttp%3A//localhost%3A{{port}}/index.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tindex.html\t\t\t\thttp%3A//localhost%3A{{port}}/secondpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tsecondpage.html\t\t\t -+ROBOTS\thttp%3A//localhost%3A{{port}}/dummy.txt\tSCHEME_HTTP\tlocalhost\t{{port}}\tdummy.txt\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t -+SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t - """ - - dummyfile = "Don't care." ---- a/testenv/Test--spider-r.py -+++ b/testenv/Test--spider-r.py -@@ -14,8 +14,8 @@ mainpage = """ - - -

-- Some text and a link to a second page. -- Also, a broken link. -+ Some text and a link to a second page. -+ Also, a broken link. -

- - -@@ -29,8 +29,8 @@ secondpage = """ - - -

-- Some text and a link to a third page. -- Also, a broken link. -+ Some text and a link to a third page. -+ Also, a broken link. -

- - -@@ -43,8 +43,8 @@ thirdpage = """ - - -

-- Some text and a link to a text file. -- Also, another broken link. -+ Some text and a link to a text file. -+ Also, another broken link. -

- - ---- a/testenv/certs/server-cert.pem -+++ b/testenv/certs/server-cert.pem -@@ -1,21 +1,21 @@ - -----BEGIN CERTIFICATE----- --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 -+e5wnYQIS4MzowvDx8WevTPMRKlN72d8HHuv9 - -----END CERTIFICATE----- ---- a/testenv/certs/server-crl.pem -+++ b/testenv/certs/server-crl.pem -@@ -1,12 +1,12 @@ - -----BEGIN X509 CRL----- --MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN --MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VGA8yMDE0MTExMTE2NDU1NFoYDzk5 --OTkxMjMxMjM1OTU5WjAdMBsCCFRiO986yHnjGA8yMDE0MTExMTE2NDU1NFqgNjA0 --MB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMBEGA1UdFAQKAghUYj1E --KHs9ijANBgkqhkiG9w0BAQsFAAOCAQEAZgwqs1VOFG39dFHHMXvBr4eJfhwiG4bC --cL6IvLhvl9ikcyQMHrpOBtNjkCtgclSbJjjTDdera1+zuCWE0WBOJ4mojYdAIOhR --QvSwp4NwAtibu2F/fjeXoo+LEpcRKtLvAotB30eCZ1OPrijsa/HxFILOLlayjns8 --wM4RmQC4o43y1G/1jqM8hGDg4Wz0j1URVuyP+pU55JpubV5LlExy3gIRwevD2lam --q3hiighenJYFO3HGZkYT2SIoSpXZnQqKPJ4HwRBSg/cjOpc1y1lIIvKhmk+Cut6M --+S5HL4pIk8vGYg57nTfOOkj1goqFkfU0DBqvVAZj02ay/VIDu61T1g== -+MIIB1jCBvwIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN -+MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VFw0xNzA3MDgxNTA3MDRaFw0xODA3 -+MDgxNTA3MDRaMB8wHQIMWWD1GB1UFkEICdQvFw0xNzA3MDgxNTA3MDRaoDowODAf -+BgNVHSMEGDAWgBTzPk44hEqpvsFvx2GjUNpuKYvrVDAVBgNVHRQEDgIMWWD1GB4C -+YfERSnyEMA0GCSqGSIb3DQEBCwUAA4IBAQAAKu+Lum1l/XtcCJ43WveouPK97iOE -+bjUZWaGYx8Ys/iBdhTa1GXG+E+JuyqgyHTW0HrWJi1D+GiYmsjPJXoEgVgtxXEQ7 -+8b3NyIQ8OCsSTTlVCmLECN9R0xlsitzH+HXOaIEs5sbmIxCnxu+brqno9gQocmCv -+LHYvoSxsSsOCkkmodbYtKssl2dBonvQPSijN/z3NhZ259e2U3Yv4V7/MrEoTvOxg -+M0GC0u0Nx86EWbq0sWeiUu270Qk9En5YGNtRhkeq0bXerJswmMAmvrtuKdyfouny -+4WMvtn30xsO3WwWSV2oyrDSN/IQdDbcmul/bg8ewqlnN77cVf2m70c/W - -----END X509 CRL----- ---- a/testenv/certs/server-template.cfg -+++ b/testenv/certs/server-template.cfg -@@ -68,7 +68,6 @@ expiration_days = -1 - # X.509 v3 extensions - - # A dnsname in case of a WWW server. --dns_name = "127.0.0.1" - dns_name = "localhost" - - # A subject alternative name URI ---- a/testenv/test/base_test.py -+++ b/testenv/test/base_test.py -@@ -90,7 +90,7 @@ class BaseTest: - # ports and etc. - # so we should record different domains respect to servers. - domain = self.get_domain_addr(instance.server_address) -- self.domains.append(domain[0]) -+ self.domains.append('localhost') - self.ports.append(domain[1]) - - def exec_wget(self): diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.1-r2.ebuild deleted file mode 100644 index ee66293872..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.1-r2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" - -# Force a newer libidn2 to avoid libunistring deps. #612498 -LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) - pcre? ( dev-libs/libpcre[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - ) - uuid? ( sys-apps/util-linux[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) - nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -PATCHES=( - "${FILESDIR}"/${P}-CRLF_injection.patch - "${FILESDIR}"/${PN}-1.19.1-fix-Perl-warnings-in-tests.patch - "${FILESDIR}"/${PN}-1.19.1-fix-Python-test-suite.patch - "${FILESDIR}"/${PN}-1.19.1-CVE-2017-13089.patch - "${FILESDIR}"/${PN}-1.19.1-CVE-2017-13090.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi -} - -src_configure() { - # fix compilation on Solaris, we need filio.h for FIONBIO as used in - # the included gnutls -- force ioctl.h to include this header - [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - - # There is no flag that controls this. libunistring-prefix only - # controls the search path (which is why we turn it off below). - # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 - ac_cv_libunistring=no \ - econf \ - --disable-assert \ - --disable-rpath \ - --without-included-libunistring \ - --without-libunistring-prefix \ - $(use_enable debug) \ - $(use_enable idn iri) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable ntlm) \ - $(use_enable pcre) \ - $(use_enable ssl digest) \ - $(use_enable ssl opie) \ - $(use_with idn libidn) \ - $(use_with ssl ssl $(usex gnutls gnutls openssl)) \ - $(use_with uuid libuuid) \ - $(use_with zlib) -} - -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED}"/etc/wgetrc \ - "${ED}"/usr/share/man/man1/wget.1 \ - "${ED}"/usr/share/info/wget.info \ - || die -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.5.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.5.ebuild deleted file mode 100644 index b4d33f3b37..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.5.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" - -# Force a newer libidn2 to avoid libunistring deps. #612498 -LIB_DEPEND=" - idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) - pcre? ( dev-libs/libpcre[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - ) - uuid? ( sys-apps/util-linux[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND=" - ${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) - nls? ( sys-devel/gettext ) -" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] \ - || [[ ${CHOST} == *-solaris* ]] \ - || [[ ${CHOST} == *-uclibc* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi -} - -src_configure() { - # fix compilation on Solaris, we need filio.h for FIONBIO as used in - # the included gnutls -- force ioctl.h to include this header - [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - - # There is no flag that controls this. libunistring-prefix only - # controls the search path (which is why we turn it off below). - # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 - local myeconfargs=( - --disable-assert - --disable-rpath - --without-included-libunistring - --without-libunistring-prefix - $(use_enable debug) - $(use_enable idn iri) - $(use_enable ipv6) - $(use_enable nls) - $(use_enable ntlm) - $(use_enable pcre) - $(use_enable ssl digest) - $(use_enable ssl opie) - $(use_with idn libidn) - $(use_with ssl ssl $(usex gnutls gnutls openssl)) - $(use_with uuid libuuid) - $(use_with zlib) - ) - ac_cv_libunistring=no \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED%/}"/etc/wgetrc \ - "${ED%/}"/usr/share/man/man1/wget.1 \ - "${ED%/}"/usr/share/info/wget.info \ - || die -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.4.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.20.1.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.4.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.20.1.ebuild index a4cc423b95..ae23b38c43 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.19.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.20.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{4,5,6,7} ) inherit flag-o-matic python-any-r1 toolchain-funcs @@ -13,14 +13,14 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" # Force a newer libidn2 to avoid libunistring deps. #612498 LIB_DEPEND=" - idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) - pcre? ( dev-libs/libpcre[static-libs(+)] ) + idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) + pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( @@ -85,6 +85,7 @@ src_configure() { # and since we force the latest, we can force off libunistring. #612498 local myeconfargs=( --disable-assert + --disable-pcre --disable-rpath --without-included-libunistring --without-libunistring-prefix @@ -93,7 +94,7 @@ src_configure() { $(use_enable ipv6) $(use_enable nls) $(use_enable ntlm) - $(use_enable pcre) + $(use_enable pcre pcre2) $(use_enable ssl digest) $(use_enable ssl opie) $(use_with idn libidn)