From 6c80c0027659ebd0fd610127dd03e3733d9ebf60 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 3 Dec 2017 21:22:03 -0500 Subject: [PATCH 01/21] Resolves: #1502378 - initial build Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 container-tools.yaml diff --git a/container-tools.yaml b/container-tools.yaml new file mode 100644 index 0000000..701ab6a --- /dev/null +++ b/container-tools.yaml @@ -0,0 +1,81 @@ +--- +document: modulemd +version: 1 +data: + summary: Common tools and dependencies for container runtimes + description: Contains SELinux policies, binaries and other + dependencies for use with container runtimes + license: + module: + - MIT + dependencies: + buildrequires: + golang: 1.9 + platform: f27 + perl: 5.26 + requires: + platform: f27 + references: + community: https://github.com/projectatomic + documentation: https://projectatomic.io + tracker: https://github.com/projectatomic + profiles: + default: + rpms: + - atomic + - buildah + - container-selinux + - container-storage-setup + - oci-register-machine + - oci-systemd-hook + - oci-umount + - python-docker + - runc + - skopeo + api: + rpms: + - atomic + - atomic-registries + - buildah + - container-selinux + - container-storage-setup + - oci-register-machine + - oci-systemd-hook + - oci-umount + - python2-docker + - python3-docker + - runc + - skopeo + - skopeo-containers + components: + rpms: + atomic: + rationale: Primary component of this module + ref: f27 + buildah: + rationale: Primary component of this module + ref: f27 + container-selinux: + rationale: Primary component of this module + ref: f27 + container-storage-setup: + rationale: Primary component of this module + ref: f27 + oci-register-machine: + rationale: Primary component of this module + ref: f27 + oci-systemd-hook: + rationale: Primary component of this module + ref: f27 + oci-umount: + rationale: Primary component of this module + ref: f27 + python-docker: + rationale: Primary component of this module + ref: f27 + runc: + rationale: Primary component of this module + ref: f27 + skopeo: + rationale: Primary component of this module + ref: f27 From 86abc9358245369847e218d325a22c2067a2b335 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 3 Dec 2017 23:41:07 -0500 Subject: [PATCH 02/21] add python[2,3]-ecosystem as deps Needed for python[2,3]-docker Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index 701ab6a..9d29b25 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -13,8 +13,12 @@ data: golang: 1.9 platform: f27 perl: 5.26 + python2-ecosystem: f27 + python3-ecosystem: f27 requires: platform: f27 + python2-ecosystem: f27 + python3-ecosystem: f27 references: community: https://github.com/projectatomic documentation: https://projectatomic.io From 327a8c49c02dffb35ccecae1b52af91990c027dd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Dec 2017 10:18:37 -0500 Subject: [PATCH 03/21] add python[2,3]-pycreds to package list disable tests to reduce python-docker deps Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index 9d29b25..06aece6 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -34,6 +34,7 @@ data: - oci-systemd-hook - oci-umount - python-docker + - python-docker-pycreds - runc - skopeo api: @@ -47,10 +48,16 @@ data: - oci-systemd-hook - oci-umount - python2-docker + - python2-docker-pycreds - python3-docker + - python3-docker-pycreds - runc - skopeo - skopeo-containers + buildopts: + rpms: + macros: | + %_with_ignore_tests 1 components: rpms: atomic: @@ -77,6 +84,9 @@ data: python-docker: rationale: Primary component of this module ref: f27 + python-docker-pycreds: + rationale: Primary component of this module + ref: f27 runc: rationale: Primary component of this module ref: f27 From c9c9bfedfa40d770e7319711aff5e6f3ed052b55 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Dec 2017 10:53:56 -0500 Subject: [PATCH 04/21] add build deps for oci-umount and oci-systemd-hook Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index 06aece6..4d87223 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -10,11 +10,14 @@ data: - MIT dependencies: buildrequires: + autotools: f27 golang: 1.9 + golang-ecosystem: 2017.0 platform: f27 perl: 5.26 python2-ecosystem: f27 python3-ecosystem: f27 + udisks2: 2 requires: platform: f27 python2-ecosystem: f27 From 2714a7a3976f45ded7cc6219e0dde1885219e1a8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Dec 2017 15:44:56 -0500 Subject: [PATCH 05/21] include ostree temporarily Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index 4d87223..98d8425 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -36,6 +36,7 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount + - ostree - python-docker - python-docker-pycreds - runc @@ -50,6 +51,9 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount + - ostree + - ostree-libs + - ostree-devel - python2-docker - python2-docker-pycreds - python3-docker @@ -81,9 +85,15 @@ data: oci-systemd-hook: rationale: Primary component of this module ref: f27 + buildorder: 1 oci-umount: rationale: Primary component of this module ref: f27 + buildorder: 1 + ostree: + rationale: Build dep for some packages (temp) + ref: f27 + buildorder: 0 python-docker: rationale: Primary component of this module ref: f27 From 1232069e65c745c8ebbb32b1368703a41e2c6577 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Dec 2017 18:46:12 -0500 Subject: [PATCH 06/21] Revert "include ostree temporarily" try to build other packages without ostree if possible This reverts commit 2714a7a3976f45ded7cc6219e0dde1885219e1a8. --- container-tools.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 98d8425..4d87223 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -36,7 +36,6 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount - - ostree - python-docker - python-docker-pycreds - runc @@ -51,9 +50,6 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount - - ostree - - ostree-libs - - ostree-devel - python2-docker - python2-docker-pycreds - python3-docker @@ -85,15 +81,9 @@ data: oci-systemd-hook: rationale: Primary component of this module ref: f27 - buildorder: 1 oci-umount: rationale: Primary component of this module ref: f27 - buildorder: 1 - ostree: - rationale: Build dep for some packages (temp) - ref: f27 - buildorder: 0 python-docker: rationale: Primary component of this module ref: f27 From 5b75de4223d38652533eb111e2e27b8dad84b11a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 13 Mar 2018 02:33:58 -0400 Subject: [PATCH 07/21] update modulemd to use latest dep branch names Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 4d87223..965cfe1 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -10,18 +10,11 @@ data: - MIT dependencies: buildrequires: - autotools: f27 - golang: 1.9 - golang-ecosystem: 2017.0 - platform: f27 - perl: 5.26 - python2-ecosystem: f27 - python3-ecosystem: f27 - udisks2: 2 + platform: f28 + golang: "1.10" + golang-ecosystem: "2017.0" requires: - platform: f27 - python2-ecosystem: f27 - python3-ecosystem: f27 + platform: f28 references: community: https://github.com/projectatomic documentation: https://projectatomic.io @@ -65,34 +58,34 @@ data: rpms: atomic: rationale: Primary component of this module - ref: f27 + ref: f28 buildah: rationale: Primary component of this module - ref: f27 + ref: f28 container-selinux: rationale: Primary component of this module - ref: f27 + ref: f28 container-storage-setup: rationale: Primary component of this module - ref: f27 + ref: f28 oci-register-machine: rationale: Primary component of this module - ref: f27 + ref: f28 oci-systemd-hook: rationale: Primary component of this module - ref: f27 + ref: f28 oci-umount: rationale: Primary component of this module - ref: f27 + ref: f28 python-docker: rationale: Primary component of this module - ref: f27 + ref: f28 python-docker-pycreds: rationale: Primary component of this module - ref: f27 + ref: f28 runc: rationale: Primary component of this module - ref: f27 + ref: f28 skopeo: rationale: Primary component of this module - ref: f27 + ref: f28 From fc5acc650b5ee7c91d945e189e51b49de30e09be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Mon, 9 Apr 2018 19:55:43 +0200 Subject: [PATCH 08/21] Updating to modulemd v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- container-tools.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 965cfe1..c5f8a40 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -1,6 +1,6 @@ --- document: modulemd -version: 1 +version: 2 data: summary: Common tools and dependencies for container runtimes description: Contains SELinux policies, binaries and other @@ -9,12 +9,12 @@ data: module: - MIT dependencies: - buildrequires: - platform: f28 - golang: "1.10" - golang-ecosystem: "2017.0" - requires: - platform: f28 + - buildrequires: + platform: [] + golang: [1.10] + golang-ecosystem: [2017.0] + requires: + platform: [] references: community: https://github.com/projectatomic documentation: https://projectatomic.io From 345f9bd48b048acbf110bda799dbf0a7ab18116a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 25 May 2018 15:30:40 -0400 Subject: [PATCH 09/21] include podman Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index c5f8a40..40d4a87 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -29,6 +29,7 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount + - podman - python-docker - python-docker-pycreds - runc @@ -43,10 +44,12 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount + - podman - python2-docker - python2-docker-pycreds - python3-docker - python3-docker-pycreds + - python3-podman - runc - skopeo - skopeo-containers @@ -77,6 +80,9 @@ data: oci-umount: rationale: Primary component of this module ref: f28 + podman: + rationale: Primary component of this module + ref: f28 python-docker: rationale: Primary component of this module ref: f28 From c495a799f64eed63b270b0dc94264d012076e379 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 25 May 2018 15:31:40 -0400 Subject: [PATCH 10/21] update dep on golang-ecosystem Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container-tools.yaml b/container-tools.yaml index 40d4a87..a3db4a5 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -12,7 +12,7 @@ data: - buildrequires: platform: [] golang: [1.10] - golang-ecosystem: [2017.0] + golang-ecosystem: [2018.0] requires: platform: [] references: From c42a199e00a2e8524dbcca101438ef84846a25de Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 29 May 2018 13:37:16 -0400 Subject: [PATCH 11/21] Empty commit to rebuild module Signed-off-by: Lokesh Mandvekar From 337c21f597e7da14e391dad1cdb12d27cda20fc5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Jul 2018 08:54:53 -0400 Subject: [PATCH 12/21] add python3-varlink, containernetworking-cni and set buildorders Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index a3db4a5..6fee12c 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -26,12 +26,14 @@ data: - buildah - container-selinux - container-storage-setup + - containernetworking-cni - oci-register-machine - oci-systemd-hook - oci-umount - podman - python-docker - python-docker-pycreds + - python-varlink - runc - skopeo api: @@ -41,6 +43,7 @@ data: - buildah - container-selinux - container-storage-setup + - containernetworking-cni - oci-register-machine - oci-systemd-hook - oci-umount @@ -50,6 +53,7 @@ data: - python3-docker - python3-docker-pycreds - python3-podman + - python3-varlink - runc - skopeo - skopeo-containers @@ -62,36 +66,54 @@ data: atomic: rationale: Primary component of this module ref: f28 + buildorder: 1 buildah: rationale: Primary component of this module ref: f28 + buildorder: 0 container-selinux: rationale: Primary component of this module ref: f28 + buildorder: 0 container-storage-setup: rationale: Primary component of this module ref: f28 + containernetworking-cni: + rationale: Primary component of this module + ref: f28 + buildorder: 0 oci-register-machine: rationale: Primary component of this module ref: f28 oci-systemd-hook: rationale: Primary component of this module ref: f28 + buildorder: 0 oci-umount: rationale: Primary component of this module ref: f28 + buildorder: 0 podman: rationale: Primary component of this module ref: f28 + buildorder: 1 python-docker: rationale: Primary component of this module ref: f28 + buildorder: 0 python-docker-pycreds: rationale: Primary component of this module ref: f28 + buildorder: 0 + python-varlink: + rationale: Primary component of this module + ref: f28 + buildorder: 0 runc: rationale: Primary component of this module ref: f28 + buildorder: 0 skopeo: rationale: Primary component of this module ref: f28 + buildorder: 0 From f2b5072c2d250e7b19fed64dce616e70d5109168 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Jul 2018 15:12:15 -0400 Subject: [PATCH 13/21] resubmit Signed-off-by: Lokesh Mandvekar From b49fd16d619abe18169489c0bde3fa941a5b1a02 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 23 Jul 2018 09:08:35 -0400 Subject: [PATCH 14/21] resubmit with new oci-systemd-hook Signed-off-by: Lokesh Mandvekar From 31b761077ffd9f584efa534c16a3aed454aef977 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 16 Aug 2018 15:45:20 -0400 Subject: [PATCH 15/21] Rebuild for F30 branch Signed-off-by: Stephen Gallagher From ffe9bb0a92326ab5eb39281b2d7495d93379283c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 Feb 2019 16:28:25 +0530 Subject: [PATCH 16/21] Resolves: #1664908, #1674489 - CVE-2019-5736 Signed-off-by: Lokesh Mandvekar From 13d3a5798a3f26f9ffb986bc2c159dd1c8ab6f5a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 Feb 2019 16:40:08 +0530 Subject: [PATCH 17/21] use f29 branch Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 6fee12c..00f5aa5 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -11,8 +11,6 @@ data: dependencies: - buildrequires: platform: [] - golang: [1.10] - golang-ecosystem: [2018.0] requires: platform: [] references: @@ -56,7 +54,7 @@ data: - python3-varlink - runc - skopeo - - skopeo-containers + - containers-common buildopts: rpms: macros: | @@ -65,55 +63,55 @@ data: rpms: atomic: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 1 buildah: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 container-selinux: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 container-storage-setup: rationale: Primary component of this module - ref: f28 + ref: f29 containernetworking-cni: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 oci-register-machine: rationale: Primary component of this module - ref: f28 + ref: f29 oci-systemd-hook: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 oci-umount: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 podman: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 1 python-docker: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 python-docker-pycreds: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 python-varlink: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 runc: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 skopeo: rationale: Primary component of this module - ref: f28 + ref: f29 buildorder: 0 From 89224a0007299623ce2a5955cc3b668e8ceda1f3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 Feb 2019 17:36:06 +0530 Subject: [PATCH 18/21] use containernetworking-plugins and not -cni Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 00f5aa5..4496b00 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -24,7 +24,7 @@ data: - buildah - container-selinux - container-storage-setup - - containernetworking-cni + - containernetworking-plugins - oci-register-machine - oci-systemd-hook - oci-umount @@ -41,7 +41,7 @@ data: - buildah - container-selinux - container-storage-setup - - containernetworking-cni + - containernetworking-plugins - oci-register-machine - oci-systemd-hook - oci-umount @@ -76,7 +76,7 @@ data: container-storage-setup: rationale: Primary component of this module ref: f29 - containernetworking-cni: + containernetworking-plugins: rationale: Primary component of this module ref: f29 buildorder: 0 From ad62f6da87385e3a88727c905cfc1c6d5f6b45f3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 Feb 2019 17:38:00 +0530 Subject: [PATCH 19/21] remove python2 stuff Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 4496b00..e98b955 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -46,8 +46,6 @@ data: - oci-systemd-hook - oci-umount - podman - - python2-docker - - python2-docker-pycreds - python3-docker - python3-docker-pycreds - python3-podman From 9ab7f4e067738793f5b3629e659bbb6ba489f1c5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 14 Feb 2019 00:12:11 +0530 Subject: [PATCH 20/21] retry for CVE-2019-5736 Signed-off-by: Lokesh Mandvekar From 80877901d3096d775956f927f21293e745d18d09 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 28 Jan 2020 06:48:25 -0500 Subject: [PATCH 21/21] not shipped anymore --- README.md | 3 -- container-tools.yaml | 115 ------------------------------------------- dead.module | 1 + 3 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 README.md delete mode 100644 container-tools.yaml create mode 100644 dead.module diff --git a/README.md b/README.md deleted file mode 100644 index 8d69fae..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# container-tools - -The container-tools package \ No newline at end of file diff --git a/container-tools.yaml b/container-tools.yaml deleted file mode 100644 index e98b955..0000000 --- a/container-tools.yaml +++ /dev/null @@ -1,115 +0,0 @@ ---- -document: modulemd -version: 2 -data: - summary: Common tools and dependencies for container runtimes - description: Contains SELinux policies, binaries and other - dependencies for use with container runtimes - license: - module: - - MIT - dependencies: - - buildrequires: - platform: [] - requires: - platform: [] - references: - community: https://github.com/projectatomic - documentation: https://projectatomic.io - tracker: https://github.com/projectatomic - profiles: - default: - rpms: - - atomic - - buildah - - container-selinux - - container-storage-setup - - containernetworking-plugins - - oci-register-machine - - oci-systemd-hook - - oci-umount - - podman - - python-docker - - python-docker-pycreds - - python-varlink - - runc - - skopeo - api: - rpms: - - atomic - - atomic-registries - - buildah - - container-selinux - - container-storage-setup - - containernetworking-plugins - - oci-register-machine - - oci-systemd-hook - - oci-umount - - podman - - python3-docker - - python3-docker-pycreds - - python3-podman - - python3-varlink - - runc - - skopeo - - containers-common - buildopts: - rpms: - macros: | - %_with_ignore_tests 1 - components: - rpms: - atomic: - rationale: Primary component of this module - ref: f29 - buildorder: 1 - buildah: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - container-selinux: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - container-storage-setup: - rationale: Primary component of this module - ref: f29 - containernetworking-plugins: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - oci-register-machine: - rationale: Primary component of this module - ref: f29 - oci-systemd-hook: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - oci-umount: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - podman: - rationale: Primary component of this module - ref: f29 - buildorder: 1 - python-docker: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - python-docker-pycreds: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - python-varlink: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - runc: - rationale: Primary component of this module - ref: f29 - buildorder: 0 - skopeo: - rationale: Primary component of this module - ref: f29 - buildorder: 0 diff --git a/dead.module b/dead.module new file mode 100644 index 0000000..baabb60 --- /dev/null +++ b/dead.module @@ -0,0 +1 @@ +not shipped anymore