Noah Meyerhans <no...@debian.org> writes: > On Fri, Oct 25, 2024 at 04:46:21PM +0200, Simon Josefsson wrote: >> https://tracker.debian.org/pkg/amazon-ecr-credential-helper >> >> What do you think about moving this project into team-maintained under >> the Debian Go team? See: >> >> https://go-team.pages.debian.net/ > > That would be great. Can you import it, or do you need anything from > me? > >> Are you working on an updated version of this package in Debian? > > I'm only minimally maintaining this package at this point. For context, > the original author and I used to be colleagues working on container > runtimes at AWS. Neither of us is at AWS anymore, so our motivation for > maintaining the package is greatly reduced. So I'd be very happy to see > it moved to team maintenance.
Thank you for quick reply! I have uploaded 0.7.1-2 that adds the golang-*-dev package, and some other fixes. I think it will be stuck in NEW for some time. Upgrading it to latest upstream 0.9.0 version can be done later on, that version seems to require some new dependencies and I didn't want to go into chasing them. Cosign is happy with 0.7.1-2, which is my main objective here. I moved packaging here to get Salsa QA pipelines: https://salsa.debian.org/go-team/packages/amazon-ecr-credential-helper/ It seems to build fine: https://salsa.debian.org/jas/amazon-ecr-credential-helper/-/pipelines/752931 Please review debdiff below, and if you are able, test that the resulting binary in the 0.7.1-2 upload works, I don't know how it is intended to be used so cannot really test it. /Simon
diff -Nru amazon-ecr-credential-helper-0.7.1/debian/amazon-ecr-credential-helper.install amazon-ecr-credential-helper-0.7.1/debian/amazon-ecr-credential-helper.install --- amazon-ecr-credential-helper-0.7.1/debian/amazon-ecr-credential-helper.install 2023-11-12 00:27:02.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/amazon-ecr-credential-helper.install 2024-10-26 17:50:04.000000000 +0200 @@ -1 +1 @@ -bin/local/docker-credential-ecr-login usr/bin/ +usr/bin/ diff -Nru amazon-ecr-credential-helper-0.7.1/debian/changelog amazon-ecr-credential-helper-0.7.1/debian/changelog --- amazon-ecr-credential-helper-0.7.1/debian/changelog 2023-11-12 00:44:07.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/changelog 2024-10-26 18:43:57.000000000 +0200 @@ -1,3 +1,19 @@ +amazon-ecr-credential-helper (0.7.1-2) unstable; urgency=medium + + * Team upload. + * Move debianization to Salsa. + * Add golang-github-awslabs-amazon-ecr-credential-helper-dev. + * Run wrap-and-sort -satbk. + * Adopt package to Debian Go team. + * Rules-Requires-Root: no. + * Testsuite: autopkgtest-pkg-go. + * Standards-Version: 4.7.0. + * Use compat 13. + * Fix binary install path. + * Improve d/copyright, mention debian/* authors. + + -- Simon Josefsson <si...@josefsson.org> Sat, 26 Oct 2024 18:43:57 +0200 + amazon-ecr-credential-helper (0.7.1-1) unstable; urgency=medium * New upstream release 0.7.1 diff -Nru amazon-ecr-credential-helper-0.7.1/debian/control amazon-ecr-credential-helper-0.7.1/debian/control --- amazon-ecr-credential-helper-0.7.1/debian/control 2023-11-12 00:27:02.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/control 2024-10-26 18:22:15.000000000 +0200 @@ -1,33 +1,42 @@ Source: amazon-ecr-credential-helper -Section: misc +Section: golang Priority: optional -Maintainer: Noah Meyerhans <no...@debian.org> +Maintainer: Debian Go Packaging Team <team+pkg...@tracker.debian.org> +Uploaders: + Noah Meyerhans <no...@debian.org>, +Rules-Requires-Root: no Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), dh-golang, - golang-go, git, golang-github-aws-aws-sdk-go-v2-dev, golang-github-docker-docker-credential-helpers-dev, golang-github-mitchellh-go-homedir-dev, + golang-github-pkg-errors-dev, golang-github-sirupsen-logrus-dev, golang-github-stretchr-testify-dev, - golang-github-pkg-errors-dev -Standards-Version: 4.5.0 + golang-go, +Testsuite: autopkgtest-pkg-go +Standards-Version: 4.7.0 +Vcs-Browser: https://salsa.debian.org/go-team/packages/amazon-ecr-credential-helper +Vcs-Git: https://salsa.debian.org/go-team/packages/amazon-ecr-credential-helper.git Homepage: https://github.com/awslabs/amazon-ecr-credential-helper -Vcs-Browser: https://github.com/awslabs/amazon-ecr-credential-helper/tree/debian -Vcs-Git: https://github.com/awslabs/amazon-ecr-credential-helper.git -b debian XS-Go-Import-Path: github.com/awslabs/amazon-ecr-credential-helper Package: amazon-ecr-credential-helper +Section: misc Architecture: any Depends: + ca-certificates, ${misc:Depends}, ${shlibs:Depends}, - ca-certificates -Built-Using: ${misc:Built-Using} -Recommends: docker.io | docker-ce -Enhances: docker.io, docker-ce +Built-Using: + ${misc:Built-Using}, +Recommends: + docker.io | docker-ce, +Enhances: + docker-ce, + docker.io, Description: Amazon ECR Credential Helper for Docker A Docker credential helper to automatically manage credentials for Amazon ECR. . @@ -42,3 +51,13 @@ . For more information about Amazon ECR and how to use it, see the documentation at https://docs.aws.amazon.com/AmazonECR/latest/userguide/. + +Package: golang-github-awslabs-amazon-ecr-credential-helper-dev +Architecture: all +Multi-Arch: foreign +Depends: + ${misc:Depends}, +Description: Amazon ECR Credential Helper for Docker (library) + A Docker credential helper to automatically manage credentials for Amazon ECR. + . + This package contains the development Go library. diff -Nru amazon-ecr-credential-helper-0.7.1/debian/copyright amazon-ecr-credential-helper-0.7.1/debian/copyright --- amazon-ecr-credential-helper-0.7.1/debian/copyright 2023-11-12 00:27:02.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/copyright 2024-10-26 18:16:05.000000000 +0200 @@ -1,18 +1,27 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://github.com/awslabs/amazon-ecr-credential-helper Upstream-Name: amazon-ecr-credential-helper Upstream-Contact: Samuel Karp <sk...@amazon.com> -Source: https://github.com/awslabs/amazon-ecr-credential-helper Files: * Copyright: 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. License: Apache-2.0 +Files: debian/* +Copyright: 2018-2021 Samuel Karp <sk...@amazon.com> + 2019-2023 Noah Meyerhans <fr...@morgul.net> + 2019-2020 Debian Janitor <jani...@jelmer.uk> + 2020 Tianon Gravi <tia...@debian.org> + 2024 Simon Josefsson <si...@josefsson.org> +License: Apache-2.0 +Comment: Debian packaging is licensed under the same terms as upstream + 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 + https://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, diff -Nru amazon-ecr-credential-helper-0.7.1/debian/gbp.conf amazon-ecr-credential-helper-0.7.1/debian/gbp.conf --- amazon-ecr-credential-helper-0.7.1/debian/gbp.conf 2023-11-12 00:27:02.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/gbp.conf 2024-10-26 17:20:30.000000000 +0200 @@ -1,6 +1,3 @@ [DEFAULT] -upstream-branch=master -debian-branch=debian - -[buildpackage] -upstream-tag=v%(version)s +debian-branch = debian/sid +dist = DEP14 diff -Nru amazon-ecr-credential-helper-0.7.1/debian/gitlab-ci.yml amazon-ecr-credential-helper-0.7.1/debian/gitlab-ci.yml --- amazon-ecr-credential-helper-0.7.1/debian/gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/gitlab-ci.yml 2024-10-26 17:20:18.000000000 +0200 @@ -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 -Nru amazon-ecr-credential-helper-0.7.1/debian/golang-github-awslabs-amazon-ecr-credential-helper-dev.install amazon-ecr-credential-helper-0.7.1/debian/golang-github-awslabs-amazon-ecr-credential-helper-dev.install --- amazon-ecr-credential-helper-0.7.1/debian/golang-github-awslabs-amazon-ecr-credential-helper-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/golang-github-awslabs-amazon-ecr-credential-helper-dev.install 2024-10-26 17:43:00.000000000 +0200 @@ -0,0 +1 @@ +usr/share diff -Nru amazon-ecr-credential-helper-0.7.1/debian/rules amazon-ecr-credential-helper-0.7.1/debian/rules --- amazon-ecr-credential-helper-0.7.1/debian/rules 2023-11-12 00:27:02.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/rules 2024-10-26 18:01:48.000000000 +0200 @@ -16,11 +16,6 @@ include /usr/share/dpkg/architecture.mk override_dh_auto_build: dh_auto_build -- -ldflags "-X $(package_root)/version.Version=$(VERSION) -X $(package_root)/version.GitCommitSHA=$(GITCOMMIT_SHA)" - mkdir -p bin/local - cp obj-$(DEB_HOST_GNU_TYPE)/bin/docker-credential-ecr-login bin/local - -override_dh_auto_install: - dh_auto_install -- --no-source override_dh_clean: dh_testdir -O--buildsystem=golang diff -Nru amazon-ecr-credential-helper-0.7.1/debian/salsa-ci.yml amazon-ecr-credential-helper-0.7.1/debian/salsa-ci.yml --- amazon-ecr-credential-helper-0.7.1/debian/salsa-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ amazon-ecr-credential-helper-0.7.1/debian/salsa-ci.yml 2024-10-26 17:29:29.000000000 +0200 @@ -0,0 +1,8 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml + - https://salsa.debian.org/debian/licenserecon/raw/main/debian/licenserecon.yml + +variables: + SALSA_CI_ENABLE_WRAP_AND_SORT: 'true' + SALSA_CI_WRAP_AND_SORT_ARGS: '-asbkt' + SALSA_CI_DISABLE_APTLY: 0
signature.asc
Description: PGP signature
