From 848241707e17537192bfc9b3ff24a8835fadd00d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 16 Apr 2024 18:32:52 +0200 Subject: Adding debian version 0.57.4+ds1-2. Signed-off-by: Daniel Baumann --- debian/changelog | 394 +++++++++++++++++++++ debian/control | 122 +++++++ debian/copyright | 127 +++++++ debian/etc/containers/policy.json | 7 + debian/gbp.conf | 3 + debian/gitlab-ci.yml | 6 + debian/golang-github-containers-common-dev.install | 1 + debian/golang-github-containers-common.dirs | 2 + debian/golang-github-containers-common.install | 4 + debian/license-reconcile.yml | 6 + debian/patches/fix-apparmor-parsing.patch | 30 ++ debian/patches/series | 1 + debian/rules | 30 ++ debian/shortnames.conf | 78 ++++ debian/source/format | 1 + debian/upstream/metadata | 6 + debian/watch | 8 + 17 files changed, 826 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/etc/containers/policy.json create mode 100644 debian/gbp.conf create mode 100644 debian/gitlab-ci.yml create mode 100644 debian/golang-github-containers-common-dev.install create mode 100644 debian/golang-github-containers-common.dirs create mode 100644 debian/golang-github-containers-common.install create mode 100644 debian/license-reconcile.yml create mode 100644 debian/patches/fix-apparmor-parsing.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/shortnames.conf create mode 100644 debian/source/format create mode 100644 debian/upstream/metadata create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..9b766fe --- /dev/null +++ b/debian/changelog @@ -0,0 +1,394 @@ +golang-github-containers-common (0.57.4+ds1-2) unstable; urgency=medium + + * Upload to unstable + + -- Reinhard Tartler Wed, 07 Feb 2024 05:46:45 -0500 + +golang-github-containers-common (0.57.4+ds1-1) experimental; urgency=medium + + * New upstream release. + + -- Reinhard Tartler Tue, 06 Feb 2024 07:48:53 -0500 + +golang-github-containers-common (0.57.2+ds1-2) unstable; urgency=medium + + * Upload to unstable + + -- Reinhard Tartler Wed, 24 Jan 2024 21:31:09 -0500 + +golang-github-containers-common (0.57.2+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Tue, 23 Jan 2024 18:54:15 -0500 + +golang-github-containers-common (0.57.0+ds1-2) unstable; urgency=medium + + * Upload to unstable + + -- Reinhard Tartler Sun, 21 Jan 2024 15:14:56 -0500 + +golang-github-containers-common (0.57.0+ds1-1) experimental; urgency=medium + + * New upstream release + * Bump dependency on golang-toml, fixes a unit test case + + -- Reinhard Tartler Thu, 23 Nov 2023 17:04:18 +0000 + +golang-github-containers-common (0.56.0+ds1-4) unstable; urgency=medium + + * backport patch to fix apparmor parsing LP: #2040082 + + -- Reinhard Tartler Wed, 15 Nov 2023 07:00:25 -0500 + +golang-github-containers-common (0.56.0+ds1-3) unstable; urgency=medium + + * Upload to unstable + * Drop patches, no longer needed + + -- Reinhard Tartler Fri, 27 Oct 2023 08:28:07 -0400 + +golang-github-containers-common (0.56.0+ds1-2) experimental; urgency=medium + + * drop disable-sigstore patch + + -- Reinhard Tartler Sat, 23 Sep 2023 19:52:48 -0400 + +golang-github-containers-common (0.56.0+ds1-1) experimental; urgency=medium + + * New upstream version + * Refresh patches + * tighten dependencies on containers/{storage,image} + * tighten depedendency on orchestrated-devices-container-device-interface + + -- Reinhard Tartler Sat, 23 Sep 2023 11:21:44 -0400 + +golang-github-containers-common (0.55.4+ds1-3) unstable; urgency=medium + + * Cleanup generated docs, Closes: #1044572 + + -- Reinhard Tartler Wed, 20 Sep 2023 12:29:05 -0400 + +golang-github-containers-common (0.55.4+ds1-2) unstable; urgency=medium + + * Upload to unstable + + -- Reinhard Tartler Wed, 20 Sep 2023 10:51:31 -0400 + +golang-github-containers-common (0.55.4+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Sat, 16 Sep 2023 18:03:23 -0400 + +golang-github-containers-common (0.52.0+ds1-2) unstable; urgency=medium + + * Upload to unstable + + -- Reinhard Tartler Sat, 09 Sep 2023 16:28:53 -0400 + +golang-github-containers-common (0.52.0+ds1-1) experimental; urgency=medium + + * New upstream relesae + + -- Reinhard Tartler Sat, 29 Jul 2023 11:38:00 -0400 + +golang-github-containers-common (0.51.0+ds1-1) experimental; urgency=medium + + [ Shengjing Zhu ] + * Fix uscan watch file + + [ Reinhard Tartler ] + * Bump to v0.51.0 + * refresh patches + * Add distro patch to avoid sigstore dependencies + + -- Reinhard Tartler Sat, 04 Feb 2023 11:29:46 -0500 + +golang-github-containers-common (0.50.1+ds1-4) unstable; urgency=medium + + * Tighten dependency on containers/image-spec and avoid distro patches + + -- Reinhard Tartler Sun, 05 Feb 2023 09:55:56 -0500 + +golang-github-containers-common (0.50.1+ds1-3) unstable; urgency=medium + + * Team upload + + [ Reinhard Tartler ] + * Tighten build depends + + [ Debian Janitor ] + * Bump debhelper from old 12 to 13. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse. + * Update standards version to 4.6.2, no changes needed. + * Set upstream metadata fields: Repository, Security-Contact. + + [ Shengjing Zhu ] + * Update section to golang + * Replace transitional package in Build-Depends and Depends + + golang-logrus-dev -> golang-github-sirupsen-logrus-dev + + golang-toml-dev -> golang-github-burntsushi-toml-dev + And format with wrap-and-sort + * Update dependencies according to go.mod + * Add Multi-Arch hint + + -- Shengjing Zhu Mon, 30 Jan 2023 18:34:42 +0800 + +golang-github-containers-common (0.50.1+ds1-2) unstable; urgency=medium + + * upload to unstable + + -- Reinhard Tartler Thu, 24 Nov 2022 09:17:47 -0500 + +golang-github-containers-common (0.50.1+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Fri, 11 Nov 2022 20:23:54 -0500 + +golang-github-containers-common (0.49.1+ds1-1) experimental; urgency=medium + + * New upstream release + * Tighten dependencies on containers/{storage,image} + * disable tests for pkg/cgroups + + -- Reinhard Tartler Wed, 17 Aug 2022 10:02:15 +0200 + +golang-github-containers-common (0.48.0+ds1-2) experimental; urgency=medium + + * Recommend container-network-stack, prefer netavark + + -- Reinhard Tartler Fri, 05 Aug 2022 14:54:07 +0200 + +golang-github-containers-common (0.48.0+ds1-1) experimental; urgency=medium + + * New upstream release + * refresh patches + * tighten dependencies + * Revert "libimage: import should not ignore configured variant if any" + * exclude tests that require ginkgo/v2 + + -- Reinhard Tartler Sun, 15 May 2022 17:44:07 -0400 + +golang-github-containers-common (0.47.2+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Tue, 08 Feb 2022 20:36:15 -0500 + +golang-github-containers-common (0.46.0+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Tue, 11 Jan 2022 20:10:43 -0500 + +golang-github-containers-common (0.44.5+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Reinhard Tartler Wed, 13 Apr 2022 21:16:46 -0400 + +golang-github-containers-common (0.44.4+ds1-1) unstable; urgency=medium + + [ Arnaud Rebillout ] + * Sync debian/shortnames.conf with upstream + + [ Reinhard Tartler ] + * Explicitly build-depend on golang-github-coreos-go-systemd-dev + + -- Reinhard Tartler Wed, 22 Dec 2021 22:21:19 -0500 + +golang-github-containers-common (0.44.3+ds1-2) unstable; urgency=medium + + * Upload to unstable + + -- Reinhard Tartler Mon, 25 Oct 2021 19:53:44 -0400 + +golang-github-containers-common (0.44.3+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Fri, 08 Oct 2021 16:55:47 -0400 + +golang-github-containers-common (0.44.0+ds1-1) experimental; urgency=medium + + * New upstream release + * Drop manpage.patch, merged upstream + * Tighten dependencies + + -- Reinhard Tartler Wed, 06 Oct 2021 18:04:20 -0400 + +golang-github-containers-common (0.42.1+ds1-2) unstable; urgency=medium + + * debian/control: + - Tighten dependency on containers/image + - Bump standards version + * debian/watch: fix github url pattern + * Fix section in the generated manpage + + -- Reinhard Tartler Sat, 04 Sep 2021 09:56:21 +0200 + +golang-github-containers-common (0.42.1+ds1-1) unstable; urgency=medium + + * New upstream release + * Use distro copy of golang-github-jinzhu-copier-dev + * Add gpg for tests + * disable the passdriver tests + * Bump dependency on runc + + -- Reinhard Tartler Sun, 29 Aug 2021 08:33:45 +0200 + +golang-github-containers-common (0.38.16+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Tue, 20 Jul 2021 08:22:16 -0400 + +golang-github-containers-common (0.38.12+ds1-2) experimental; urgency=medium + + * golang-github-containers-common-dev: depend on disiqueria/gotree + + -- Reinhard Tartler Mon, 28 Jun 2021 22:09:10 -0400 + +golang-github-containers-common (0.38.12+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Mon, 28 Jun 2021 08:22:16 -0400 + +golang-github-containers-common (0.38.9+ds1-1) experimental; urgency=medium + + * New upstream release + * Disable LTO + + -- Reinhard Tartler Thu, 10 Jun 2021 19:33:26 -0400 + +golang-github-containers-common (0.38.5+ds2-1) experimental; urgency=medium + + * New upstream release, temporarily vendored libraries: + - github.com/jinzhu/copier + - github.com/disiqueira/gotree + + -- Reinhard Tartler Sat, 05 Jun 2021 21:59:53 -0400 + +golang-github-containers-common (0.36.0+ds1-1) experimental; urgency=medium + + * New upstream release + * Install /usr/share/containers/seccomp.json, + thanks to Laurent Bigonville (Closes: #988443). + + -- Reinhard Tartler Fri, 28 May 2021 13:21:37 -0400 + +golang-github-containers-common (0.35.4+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Reinhard Tartler Fri, 02 Apr 2021 17:53:25 -0400 + +golang-github-containers-common (0.33.4+ds1-1) unstable; urgency=medium + + * New upstream point release, only focused changes for podman 3.0 + + -- Reinhard Tartler Fri, 12 Feb 2021 08:56:18 -0500 + +golang-github-containers-common (0.34.2+ds1-1) experimental; urgency=medium + + * New upstream release + * Tighten dependencies on golang-github-containers-storage + + -- Reinhard Tartler Tue, 09 Feb 2021 10:32:03 -0500 + +golang-github-containers-common (0.33.1+ds1-3) unstable; urgency=medium + + * Upload to unstable + + -- Reinhard Tartler Tue, 02 Feb 2021 14:49:53 -0500 + +golang-github-containers-common (0.33.1+ds1-2) experimental; urgency=medium + + * Force compilation against golang-go + * Provide etc/containers/policy.json, formerly in the buildah package + + -- Reinhard Tartler Sat, 30 Jan 2021 15:42:22 -0500 + +golang-github-containers-common (0.33.1+ds1-1) experimental; urgency=medium + + * New upstream release + * Tighten dependencies on containers/storage, containers/image, runc and + opencontainers/selinux + + -- Reinhard Tartler Sun, 24 Jan 2021 09:13:51 -0500 + +golang-github-containers-common (0.28.1+ds1-1) experimental; urgency=medium + + * New upstream release + * Backport upstream patch to fixup makefile generation + + -- Reinhard Tartler Mon, 14 Dec 2020 12:05:45 -0500 + +golang-github-containers-common (0.26.3+ds1-3) unstable; urgency=medium + + * Provide etc/containers/policy.json, formerly in the buildah package + + -- Reinhard Tartler Sat, 30 Jan 2021 10:30:10 -0500 + +golang-github-containers-common (0.26.3+ds1-2) unstable; urgency=medium + + * Install containers.conf(5) + * Install shortnames.conf + * Install registries.conf + * Declare depends on golang-github-containers-image + + -- Reinhard Tartler Wed, 02 Dec 2020 16:56:21 -0500 + +golang-github-containers-common (0.26.3+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Reinhard Tartler Mon, 23 Nov 2020 17:41:23 -0500 + +golang-github-containers-common (0.22.0+ds1-1) unstable; urgency=medium + + * New upstream release + * debian/copyright: update using 'cme update dpkg-copyright' + + -- Reinhard Tartler Sun, 22 Nov 2020 13:32:58 -0500 + +golang-github-containers-common (0.14.10+ds1-1) unstable; urgency=medium + + * New upstream version 0.14.10+ds1 + + -- Reinhard Tartler Mon, 14 Sep 2020 13:25:26 -0400 + +golang-github-containers-common (0.14.6+ds1-1) unstable; urgency=medium + + * New upstream version + + -- Reinhard Tartler Sun, 26 Jul 2020 10:56:06 -0400 + +golang-github-containers-common (0.14.4+ds1-2) unstable; urgency=medium + + * upload to unstable + + -- Reinhard Tartler Mon, 20 Jul 2020 07:18:27 -0400 + +golang-github-containers-common (0.14.4+ds1-1) experimental; urgency=medium + + * New upstream release. + * Add build depend on golang-github-containers-imgae-dev + * Exclude cgroup tests + + -- Reinhard Tartler Sun, 12 Jul 2020 21:37:05 -0400 + +golang-github-containers-common (0.8.1+ds1-2) experimental; urgency=medium + + * Tighten build-dependencies on containers-storage + + -- Reinhard Tartler Sun, 12 Jul 2020 21:21:03 -0400 + +golang-github-containers-common (0.8.1+ds1-1) experimental; urgency=medium + + * Initial release (Closes: #958426) + + -- Reinhard Tartler Tue, 21 Apr 2020 17:00:29 -0400 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..8f639ee --- /dev/null +++ b/debian/control @@ -0,0 +1,122 @@ +Source: golang-github-containers-common +Maintainer: Debian Go Packaging Team +Uploaders: Reinhard Tartler +Section: golang +Testsuite: autopkgtest-pkg-go +Priority: optional +Build-Depends: debhelper-compat (= 13), + dh-golang, + go-md2man, + golang-github-appc-cni-dev (>> 1.0~~), + golang-github-burntsushi-toml-dev (>> 1.3), + golang-github-container-orchestrated-devices-container-device-interface-dev (>> 0.6.2), + golang-github-containerd-containerd-dev, + golang-github-containernetworking-plugins-dev, + golang-github-containers-image-dev (>> 5.29.2~~), + golang-github-containers-ocicrypt-dev, + golang-github-containers-storage-dev (>> 1.51~~), + golang-github-coreos-bbolt-dev, + golang-github-coreos-go-systemd-dev, + golang-github-cyphar-filepath-securejoin-dev, + golang-github-davecgh-go-spew-dev, + golang-github-disiqueira-gotree-dev, + golang-github-docker-distribution-dev, + golang-github-docker-docker-dev, + golang-github-docker-go-units-dev, + golang-github-fsnotify-fsnotify-dev, + golang-github-ghodss-yaml-dev, + golang-github-godbus-dbus-dev, + golang-github-hashicorp-go-multierror-dev, + golang-github-jinzhu-copier-dev, + golang-github-json-iterator-go-dev, + golang-github-onsi-ginkgo-dev, + golang-github-opencontainers-go-digest-dev, + golang-github-opencontainers-image-spec-dev (>> 1.1.0~~), + golang-github-opencontainers-runc-dev (>> 1.0.1~~), + golang-github-opencontainers-runtime-tools-dev, + golang-github-opencontainers-selinux-dev (>> 1.8.0), + golang-github-opencontainers-specs-dev, + golang-github-pkg-sftp-dev, + golang-github-pmezard-go-difflib-dev, + golang-github-seccomp-libseccomp-golang-dev, + golang-github-sirupsen-logrus-dev, + golang-github-spf13-cobra-dev, + golang-github-spf13-pflag-dev, + golang-github-stretchr-testify-dev, + golang-github-vishvananda-netlink-dev, + golang-go (>> 2:1.14), + golang-gocapability-dev, + golang-golang-x-crypto-dev, + golang-golang-x-sync-dev, + golang-golang-x-sys-dev, + golang-golang-x-term-dev, + golang-gomega-dev, + gpg +Standards-Version: 4.6.2 +Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-github-containers-common +Vcs-Git: https://salsa.debian.org/go-team/packages/golang-github-containers-common.git +Homepage: https://github.com/containers/common +Rules-Requires-Root: no +XS-Go-Import-Path: github.com/containers/common + +Package: golang-github-containers-common +Architecture: all +Depends: container-network-stack, + golang-github-containers-image, + ${misc:Depends} +Recommends: netavark +Breaks: buildah (<< 1.19.2+dfsg1-2~~) +Description: Common files for github.com/containers repositories + This package contains common configuration files for use by + other container projects. + +Package: golang-github-containers-common-dev +Architecture: all +Multi-Arch: foreign +Depends: golang-github-appc-cni-dev (>> 1.0~~), + golang-github-burntsushi-toml-dev (>> 1.3), + golang-github-container-orchestrated-devices-container-device-interface-dev (>> 0.6.2), + golang-github-containerd-containerd-dev, + golang-github-containernetworking-plugins-dev, + golang-github-containers-image-dev (>> 5.29.2~~), + golang-github-containers-ocicrypt-dev, + golang-github-containers-storage-dev (>> 1.51~~), + golang-github-coreos-bbolt-dev, + golang-github-coreos-go-systemd-dev, + golang-github-cyphar-filepath-securejoin-dev, + golang-github-davecgh-go-spew-dev, + golang-github-disiqueira-gotree-dev, + golang-github-docker-distribution-dev, + golang-github-docker-docker-dev, + golang-github-docker-go-units-dev, + golang-github-fsnotify-fsnotify-dev, + golang-github-ghodss-yaml-dev, + golang-github-godbus-dbus-dev, + golang-github-hashicorp-go-multierror-dev, + golang-github-jinzhu-copier-dev, + golang-github-json-iterator-go-dev, + golang-github-onsi-ginkgo-dev, + golang-github-opencontainers-go-digest-dev, + golang-github-opencontainers-image-spec-dev (>> 1.1.0~~), + golang-github-opencontainers-runc-dev (>> 1.0.1~~), + golang-github-opencontainers-runtime-tools-dev, + golang-github-opencontainers-selinux-dev (>> 1.8.0), + golang-github-opencontainers-specs-dev, + golang-github-pkg-sftp-dev, + golang-github-pmezard-go-difflib-dev, + golang-github-seccomp-libseccomp-golang-dev, + golang-github-sirupsen-logrus-dev, + golang-github-spf13-cobra-dev, + golang-github-spf13-pflag-dev, + golang-github-stretchr-testify-dev, + golang-github-vishvananda-netlink-dev, + golang-gocapability-dev, + golang-golang-x-crypto-dev, + golang-golang-x-sync-dev, + golang-golang-x-sys-dev, + golang-golang-x-term-dev, + golang-gomega-dev, + ${misc:Depends} +Description: Common files for github.com/containers repositories (library) + This package contains shared common files and common go code + to manage those files in github.com/containers repos. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..af34f2f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,127 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: common +Source: https://github.com/containers/common +Files-Excluded: + vendor + +Files: * +Copyright: 2018, github.com/containers/common authors +License: Apache-2.0 + +Files: CONTRIBUTING.md +Copyright: 2004, 2006, The Linux Foundation and its contributors. +License: Apache-2.0 + +Files: debian/* +Copyright: 2020, Reinhard Tartler +License: Apache-2.0 +Comment: Debian packaging is licensed under the same terms as upstream + +Files: libnetwork/cni/cni_exec.go +Copyright: 2021, Podman authors + 2016, CNI authors +License: Apache-2.0 + +Files: libnetwork/util/ip_calc.go +Copyright: 2015, 2018, CNI authors +License: Apache-2.0 + +Files: pkg/apparmor/apparmor_linux.go + pkg/apparmor/apparmor_linux_test.go +Copyright: 2009-2012, Canonical Ltd. + 1999-2008, Novell Inc. +License: Apache-2.0 + +Files: pkg/capabilities/capabilities.go +Copyright: 2013-2021, Docker, Inc. +License: Apache-2.0 + +Files: pkg/cgroups/systemd.go + pkg/cgroups/systemd_linux.go +Copyright: The containerd Authors. +License: Apache-2.0 + +Files: pkg/netns/* +Copyright: 2015, 2018, CNI authors +License: Apache-2.0 + +Files: pkg/report/camelcase/* +Copyright: 2018, github.com/containers/common authors + 2015, Fatih Arslan +License: Apache-2.0 or Expat + +Files: pkg/report/camelcase/README.md + pkg/report/camelcase/camelcase.go +Copyright: 2018, github.com/containers/common authors +License: Apache-2.0 + +Files: pkg/resize/* +Copyright: 2015, The Kubernetes Authors. +License: Apache-2.0 + +Files: pkg/seccomp/default_linux.go + pkg/seccomp/seccomp_linux.go + pkg/seccomp/seccomp_test.go + pkg/seccomp/seccomp_unsupported.go + pkg/seccomp/types.go +Copyright: 2013-2018, Docker, Inc. +License: Apache-2.0 + +Files: pkg/seccomp/generate.go +Copyright: 2013-2021, Docker, Inc. +License: Apache-2.0 + +Files: pkg/signal/signal_linux.go + pkg/signal/signal_linux_mipsx.go +Copyright: 2013-2021, Docker, Inc. +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". + +License: Expat + This software is Copyright (c) 2020 by X. Ample. + . + This is free software, licensed under: + . + The MIT (X11) License + . + The MIT License + . + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the Software + without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to + whom the Software is furnished to do so, subject to the + following conditions: + . + The above copyright notice and this permission notice shall + be included in all copies or substantial portions of the + Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT + WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE AND NONINFRINGEMENT. IN NO EVENT + SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/etc/containers/policy.json b/debian/etc/containers/policy.json new file mode 100644 index 0000000..bb26e57 --- /dev/null +++ b/debian/etc/containers/policy.json @@ -0,0 +1,7 @@ +{ + "default": [ + { + "type": "insecureAcceptAnything" + } + ] +} diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..ed54530 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +debian-branch = debian/experimental +dist = DEP14 diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml new file mode 100644 index 0000000..594e14e --- /dev/null +++ b/debian/gitlab-ci.yml @@ -0,0 +1,6 @@ +# auto-generated, DO NOT MODIFY. +# The authoritative copy of this file lives at: +# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go +--- +include: + - https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml diff --git a/debian/golang-github-containers-common-dev.install b/debian/golang-github-containers-common-dev.install new file mode 100644 index 0000000..a3da66d --- /dev/null +++ b/debian/golang-github-containers-common-dev.install @@ -0,0 +1 @@ +usr/share/gocode diff --git a/debian/golang-github-containers-common.dirs b/debian/golang-github-containers-common.dirs new file mode 100644 index 0000000..e05eee0 --- /dev/null +++ b/debian/golang-github-containers-common.dirs @@ -0,0 +1,2 @@ +etc/containers/registries.conf.d +usr/share diff --git a/debian/golang-github-containers-common.install b/debian/golang-github-containers-common.install new file mode 100644 index 0000000..c3bed85 --- /dev/null +++ b/debian/golang-github-containers-common.install @@ -0,0 +1,4 @@ +debian/etc/containers/policy.json /etc/containers/ +debian/shortnames.conf /etc/containers/registries.conf.d +pkg/config/containers.conf /usr/share/containers +pkg/seccomp/seccomp.json /usr/share/containers diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml new file mode 100644 index 0000000..f86288e --- /dev/null +++ b/debian/license-reconcile.yml @@ -0,0 +1,6 @@ +Rules: + rules: + - + Glob: debian/* + License: Apache-2.0 + Copyright: Reinhard Tartler diff --git a/debian/patches/fix-apparmor-parsing.patch b/debian/patches/fix-apparmor-parsing.patch new file mode 100644 index 0000000..0abe9b3 --- /dev/null +++ b/debian/patches/fix-apparmor-parsing.patch @@ -0,0 +1,30 @@ +From 5c81adc3d2e24ac13a98f1eed35ad239eb948b1d Mon Sep 17 00:00:00 2001 +From: Valentin Rothberg +Date: Fri, 6 Oct 2023 11:40:49 +0200 +Subject: [PATCH] apparmor: fix parsing beta/alpha version + +Copied from github.com/moby/moby who already has a fix for it. +Tested manually on a Ubuntu 23.10 (beta) VM. + +Fixes: #containers/podman/issues/20278 +Signed-off-by: Valentin Rothberg +--- + pkg/apparmor/apparmor_linux.go | 5 +++++ + 1 file changed, 5 insertions(+) + +Index: golang-github-containers-common/pkg/apparmor/apparmor_linux.go +=================================================================== +--- golang-github-containers-common.orig/pkg/apparmor/apparmor_linux.go ++++ golang-github-containers-common/pkg/apparmor/apparmor_linux.go +@@ -217,6 +217,11 @@ func parseAAParserVersion(output string) + // also trim "~..." suffix used historically (https://gitlab.com/apparmor/apparmor/-/commit/bca67d3d27d219d11ce8c9cc70612bd637f88c10) + version = strings.SplitN(version, "~", 2)[0] + ++ // trim "-beta1" suffix from version="3.0.0-beta1" if exists ++ version = strings.SplitN(version, "-", 2)[0] ++ // also trim "~..." suffix used historically (https://gitlab.com/apparmor/apparmor/-/commit/bca67d3d27d219d11ce8c9cc70612bd637f88c10) ++ version = strings.SplitN(version, "~", 2)[0] ++ + // split by major minor version + v := strings.Split(version, ".") + if len(v) == 0 || len(v) > 3 { diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4a8c2a8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-apparmor-parsing.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..7c2ec01 --- /dev/null +++ b/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +# get './pkg/config/containers.conf' installed +export DH_GOLANG_INSTALL_ALL := 1 + +# disable LTO, cf. https://wiki.debian.org/ToolChain/LTO +export DEB_BUILD_MAINT_OPTIONS := optimize=-lto + +# avoid installing test utilities +export DH_GOLANG_EXCLUDES := netavark/testplugin + +BUILDTAGS := containers_image_openpgp,systemd + +%: + dh $@ --builddirectory=_build --buildsystem=golang --with=golang + +override_dh_auto_build: + dh_auto_build -v --builddirectory=_build -- -tags "$(BUILDTAGS)" + +override_dh_auto_install: + dh_auto_install --builddirectory=_build --buildsystem=golang + make -C docs docs GOMD2MAN=go-md2man + make -C docs install install DESTDIR=$(CURDIR)/debian/golang-github-containers-common PREFIX=/usr + +override_dh_auto_test: + DH_GOLANG_EXCLUDES="pkg/auth pkg/ssh pkg/cgroupv2 pkg/machine pkg/config pkg/cgroups libimage pkg/secrets/passdriver libnetwork/cni libnetwork/netavark" \ + dh_auto_test + +execute_after_dh_clean: + make -C docs clean diff --git a/debian/shortnames.conf b/debian/shortnames.conf new file mode 100644 index 0000000..80df6f0 --- /dev/null +++ b/debian/shortnames.conf @@ -0,0 +1,78 @@ +[aliases] + # almalinux + "almalinux" = "docker.io/library/almalinux" + "almalinux-minimal" = "docker.io/library/almalinux-minimal" + # centos + "centos" = "quay.io/centos/centos" + # containers + "skopeo" = "quay.io/skopeo/stable" + "buildah" = "quay.io/buildah/stable" + "podman" = "quay.io/podman/stable" + # docker + "alpine" = "docker.io/library/alpine" + "docker" = "docker.io/library/docker" + "registry" = "docker.io/library/registry" + "hello-world" = "docker.io/library/hello-world" + "swarm" = "docker.io/library/swarm" + # Fedora + "fedora-minimal" = "registry.fedoraproject.org/fedora-minimal" + "fedora" = "registry.fedoraproject.org/fedora" + # openSUSE + "opensuse/tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed" + "opensuse/tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf" + "opensuse/tumbleweed-microdnf" = "registry.opensuse.org/opensuse/tumbleweed-microdnf" + "opensuse/leap" = "registry.opensuse.org/opensuse/leap" + "opensuse/busybox" = "registry.opensuse.org/opensuse/busybox" + "tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed" + "tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf" + "tumbleweed-microdnf" = "registry.opensuse.org/opensuse/tumbleweed-microdnf" + "leap" = "registry.opensuse.org/opensuse/leap" + "leap-dnf" = "registry.opensuse.org/opensuse/leap-dnf" + "leap-microdnf" = "registry.opensuse.org/opensuse/leap-microdnf" + "tw-busybox" = "registry.opensuse.org/opensuse/busybox" + # SUSE + "suse/sle15" = "registry.suse.com/suse/sle15" + "suse/sles12sp5" = "registry.suse.com/suse/sles12sp5" + "suse/sles12sp4" = "registry.suse.com/suse/sles12sp4" + "suse/sles12sp3" = "registry.suse.com/suse/sles12sp3" + "sle15" = "registry.suse.com/suse/sle15" + "sles12sp5" = "registry.suse.com/suse/sles12sp5" + "sles12sp4" = "registry.suse.com/suse/sles12sp4" + "sles12sp3" = "registry.suse.com/suse/sles12sp3" + # Red Hat Enterprise Linux + "rhel" = "registry.access.redhat.com/rhel" + "rhel6" = "registry.access.redhat.com/rhel6" + "rhel7" = "registry.access.redhat.com/rhel7" + "ubi7" = "registry.access.redhat.com/ubi7" + "ubi7-init" = "registry.access.redhat.com/ubi7-init" + "ubi7-minimal" = "registry.access.redhat.com/ubi7-minimal" + "ubi8" = "registry.access.redhat.com/ubi8" + "ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal" + "ubi8-init" = "registry.access.redhat.com/ubi8-init" + "ubi8-micro" = "registry.access.redhat.com/ubi8-micro" + "ubi8/ubi" = "registry.access.redhat.com/ubi8/ubi" + "ubi8/ubi-minimal" = "registry.access.redhat.com/ubi8-minimal" + "ubi8/ubi-init" = "registry.access.redhat.com/ubi8-init" + "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro" + # Rocky Linux + "rockylinux" = "docker.io/library/rockylinux" + # Debian + "debian" = "docker.io/library/debian" + # Kali Linux + "kali-bleeding-edge" = "docker.io/kalilinux/kali-bleeding-edge" + "kali-dev" = "docker.io/kalilinux/kali-dev" + "kali-experimental" = "docker.io/kalilinux/kali-experimental" + "kali-last-release" = "docker.io/kalilinux/kali-last-release" + "kali-rolling" = "docker.io/kalilinux/kali-rolling" + # Ubuntu + "ubuntu" = "docker.io/library/ubuntu" + # Oracle Linux + "oraclelinux" = "container-registry.oracle.com/os/oraclelinux" + # busybox + "busybox" = "docker.io/library/busybox" + # php + "php" = "docker.io/library/php" + # python + "python" = "docker.io/library/python" + # node + "node" = "docker.io/library/node" diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..74d80a9 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +--- +Bug-Database: https://github.com/containers/common/issues +Bug-Submit: https://github.com/containers/common/issues/new +Repository: https://github.com/containers/common.git +Repository-Browse: https://github.com/containers/common +Security-Contact: https://github.com/containers/common/tree/HEAD/SECURITY.md diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..789d6a4 --- /dev/null +++ b/debian/watch @@ -0,0 +1,8 @@ +version=4 + +opts="\ +pgpmode=none,\ +repack,compression=xz,repacksuffix=+ds1,\ +dversionmangle=auto,\ +" https://github.com/containers/common/tags \ + .*/v?@ANY_VERSION@\.tar\.gz -- cgit v1.2.3