From 1f60caf48aefbf45eeb312874549faa952e572e4 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 2 May 2022 14:02:05 +0900 Subject: [PATCH 1/6] apt: use default package compression to xz Aptly 1.4.0 can't handle zstd compression yet, (supported in master, but not shipped), as a workaround, specify compression algorithm explicitly. Signed-off-by: Kentaro Hayashi --- td-agent-apt-source/debian/rules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/td-agent-apt-source/debian/rules b/td-agent-apt-source/debian/rules index 7ca48ecf6..a83834618 100755 --- a/td-agent-apt-source/debian/rules +++ b/td-agent-apt-source/debian/rules @@ -9,6 +9,12 @@ export DH_OPTIONS %: dh $@ +# As aptly doesn't support zstd yet, so as a workaround, force default +# package compression to xz +override_dh_builddeb: + dh_builddeb -- -Zxz + + override_dh_auto_build: gpg \ --no-default-keyring \ From 6301b90a7758a48f47193bc718f8887926a26c43 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 2 May 2022 14:02:46 +0900 Subject: [PATCH 2/6] apt: use https:// Signed-off-by: Kentaro Hayashi --- td-agent-apt-source/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/td-agent-apt-source/Rakefile b/td-agent-apt-source/Rakefile index 93589fd71..37d11339a 100644 --- a/td-agent-apt-source/Rakefile +++ b/td-agent-apt-source/Rakefile @@ -50,7 +50,7 @@ class TdAgentAptSourcePackageTask < PackageTask end def repository_url - "http://packages.treasuredata.com" + "https://packages.treasuredata.com" end def repository_gpg_key_ids From 010d183ac084233a72591e0dd22fb0598f8f1a36 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 2 May 2022 14:04:07 +0900 Subject: [PATCH 3/6] apt: rename to fluentd-apt-source Use more appropriate package name. Signed-off-by: Kentaro Hayashi --- {td-agent-apt-source => fluentd-apt-source}/Rakefile | 0 .../apt/debian-bullseye/Dockerfile | 0 .../apt/debian-buster/Dockerfile | 0 .../apt/ubuntu-bionic/Dockerfile | 0 .../apt/ubuntu-focal/Dockerfile | 0 .../apt/ubuntu-xenial/Dockerfile | 0 .../debian/changelog | 0 {td-agent-apt-source => fluentd-apt-source}/debian/compat | 0 {td-agent-apt-source => fluentd-apt-source}/debian/control | 0 .../debian/copyright | 0 .../debian/fluentd-apt-source.install | 0 .../debian/fluentd-apt-source.lintian-overrides | 1 + .../debian/lintian/fluentd-apt-source}/debian.profile | 0 .../debian/lintian/fluentd-apt-source}/ubuntu.profile | 0 {td-agent-apt-source => fluentd-apt-source}/debian/rules | 0 .../debian/source/format | 0 .../debian/source/lintian-overrides | 0 .../debian/td-agent-apt-source.lintian-overrides | 1 - td-agent/apt/install-test.sh | 6 +++--- 19 files changed, 4 insertions(+), 4 deletions(-) rename {td-agent-apt-source => fluentd-apt-source}/Rakefile (100%) rename {td-agent-apt-source => fluentd-apt-source}/apt/debian-bullseye/Dockerfile (100%) rename {td-agent-apt-source => fluentd-apt-source}/apt/debian-buster/Dockerfile (100%) rename {td-agent-apt-source => fluentd-apt-source}/apt/ubuntu-bionic/Dockerfile (100%) rename {td-agent-apt-source => fluentd-apt-source}/apt/ubuntu-focal/Dockerfile (100%) rename {td-agent-apt-source => fluentd-apt-source}/apt/ubuntu-xenial/Dockerfile (100%) rename {td-agent-apt-source => fluentd-apt-source}/debian/changelog (100%) rename {td-agent-apt-source => fluentd-apt-source}/debian/compat (100%) rename {td-agent-apt-source => fluentd-apt-source}/debian/control (100%) rename {td-agent-apt-source => fluentd-apt-source}/debian/copyright (100%) rename td-agent-apt-source/debian/td-agent-apt-source.install => fluentd-apt-source/debian/fluentd-apt-source.install (100%) create mode 100644 fluentd-apt-source/debian/fluentd-apt-source.lintian-overrides rename {td-agent-apt-source/debian/lintian/td-agent-apt-source => fluentd-apt-source/debian/lintian/fluentd-apt-source}/debian.profile (100%) rename {td-agent-apt-source/debian/lintian/td-agent-apt-source => fluentd-apt-source/debian/lintian/fluentd-apt-source}/ubuntu.profile (100%) rename {td-agent-apt-source => fluentd-apt-source}/debian/rules (100%) rename {td-agent-apt-source => fluentd-apt-source}/debian/source/format (100%) rename {td-agent-apt-source => fluentd-apt-source}/debian/source/lintian-overrides (100%) delete mode 100644 td-agent-apt-source/debian/td-agent-apt-source.lintian-overrides diff --git a/td-agent-apt-source/Rakefile b/fluentd-apt-source/Rakefile similarity index 100% rename from td-agent-apt-source/Rakefile rename to fluentd-apt-source/Rakefile diff --git a/td-agent-apt-source/apt/debian-bullseye/Dockerfile b/fluentd-apt-source/apt/debian-bullseye/Dockerfile similarity index 100% rename from td-agent-apt-source/apt/debian-bullseye/Dockerfile rename to fluentd-apt-source/apt/debian-bullseye/Dockerfile diff --git a/td-agent-apt-source/apt/debian-buster/Dockerfile b/fluentd-apt-source/apt/debian-buster/Dockerfile similarity index 100% rename from td-agent-apt-source/apt/debian-buster/Dockerfile rename to fluentd-apt-source/apt/debian-buster/Dockerfile diff --git a/td-agent-apt-source/apt/ubuntu-bionic/Dockerfile b/fluentd-apt-source/apt/ubuntu-bionic/Dockerfile similarity index 100% rename from td-agent-apt-source/apt/ubuntu-bionic/Dockerfile rename to fluentd-apt-source/apt/ubuntu-bionic/Dockerfile diff --git a/td-agent-apt-source/apt/ubuntu-focal/Dockerfile b/fluentd-apt-source/apt/ubuntu-focal/Dockerfile similarity index 100% rename from td-agent-apt-source/apt/ubuntu-focal/Dockerfile rename to fluentd-apt-source/apt/ubuntu-focal/Dockerfile diff --git a/td-agent-apt-source/apt/ubuntu-xenial/Dockerfile b/fluentd-apt-source/apt/ubuntu-xenial/Dockerfile similarity index 100% rename from td-agent-apt-source/apt/ubuntu-xenial/Dockerfile rename to fluentd-apt-source/apt/ubuntu-xenial/Dockerfile diff --git a/td-agent-apt-source/debian/changelog b/fluentd-apt-source/debian/changelog similarity index 100% rename from td-agent-apt-source/debian/changelog rename to fluentd-apt-source/debian/changelog diff --git a/td-agent-apt-source/debian/compat b/fluentd-apt-source/debian/compat similarity index 100% rename from td-agent-apt-source/debian/compat rename to fluentd-apt-source/debian/compat diff --git a/td-agent-apt-source/debian/control b/fluentd-apt-source/debian/control similarity index 100% rename from td-agent-apt-source/debian/control rename to fluentd-apt-source/debian/control diff --git a/td-agent-apt-source/debian/copyright b/fluentd-apt-source/debian/copyright similarity index 100% rename from td-agent-apt-source/debian/copyright rename to fluentd-apt-source/debian/copyright diff --git a/td-agent-apt-source/debian/td-agent-apt-source.install b/fluentd-apt-source/debian/fluentd-apt-source.install similarity index 100% rename from td-agent-apt-source/debian/td-agent-apt-source.install rename to fluentd-apt-source/debian/fluentd-apt-source.install diff --git a/fluentd-apt-source/debian/fluentd-apt-source.lintian-overrides b/fluentd-apt-source/debian/fluentd-apt-source.lintian-overrides new file mode 100644 index 000000000..9b04ccdd4 --- /dev/null +++ b/fluentd-apt-source/debian/fluentd-apt-source.lintian-overrides @@ -0,0 +1 @@ +fluentd-apt-source: new-package-should-close-itp-bug diff --git a/td-agent-apt-source/debian/lintian/td-agent-apt-source/debian.profile b/fluentd-apt-source/debian/lintian/fluentd-apt-source/debian.profile similarity index 100% rename from td-agent-apt-source/debian/lintian/td-agent-apt-source/debian.profile rename to fluentd-apt-source/debian/lintian/fluentd-apt-source/debian.profile diff --git a/td-agent-apt-source/debian/lintian/td-agent-apt-source/ubuntu.profile b/fluentd-apt-source/debian/lintian/fluentd-apt-source/ubuntu.profile similarity index 100% rename from td-agent-apt-source/debian/lintian/td-agent-apt-source/ubuntu.profile rename to fluentd-apt-source/debian/lintian/fluentd-apt-source/ubuntu.profile diff --git a/td-agent-apt-source/debian/rules b/fluentd-apt-source/debian/rules similarity index 100% rename from td-agent-apt-source/debian/rules rename to fluentd-apt-source/debian/rules diff --git a/td-agent-apt-source/debian/source/format b/fluentd-apt-source/debian/source/format similarity index 100% rename from td-agent-apt-source/debian/source/format rename to fluentd-apt-source/debian/source/format diff --git a/td-agent-apt-source/debian/source/lintian-overrides b/fluentd-apt-source/debian/source/lintian-overrides similarity index 100% rename from td-agent-apt-source/debian/source/lintian-overrides rename to fluentd-apt-source/debian/source/lintian-overrides diff --git a/td-agent-apt-source/debian/td-agent-apt-source.lintian-overrides b/td-agent-apt-source/debian/td-agent-apt-source.lintian-overrides deleted file mode 100644 index 4853c9075..000000000 --- a/td-agent-apt-source/debian/td-agent-apt-source.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -td-agent-apt-source: new-package-should-close-itp-bug diff --git a/td-agent/apt/install-test.sh b/td-agent/apt/install-test.sh index 49dc883b9..3e995e611 100755 --- a/td-agent/apt/install-test.sh +++ b/td-agent/apt/install-test.sh @@ -24,8 +24,8 @@ if [ ! -s $conf_path ]; then exit 1 fi -echo "td-agent-apt-source test" -apt_source_repositories_dir=/fluentd/td-agent-apt-source/apt/repositories +echo "fluentd-apt-source test" +apt_source_repositories_dir=/fluentd/fluentd-apt-source/apt/repositories apt purge -y td-agent conf_path=/etc/td-agent/td-agent.conf @@ -40,7 +40,7 @@ if [ ${code_name} = "jammy" ]; then exit 0 fi apt clean all -apt_source_package=${apt_source_repositories_dir}/${distribution}/pool/${code_name}/${channel}/*/*/td-agent-apt-source*_all.deb +apt_source_package=${apt_source_repositories_dir}/${distribution}/pool/${code_name}/${channel}/*/*/fluentd-apt-source*_all.deb apt install -V -y ${apt_source_package} apt update apt install -V -y td-agent From 4e42fc1a3280c1fc7ec50767f54988cca013fb89 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 2 May 2022 14:10:07 +0900 Subject: [PATCH 4/6] apt: follow changed name Signed-off-by: Kentaro Hayashi --- .gitignore | 8 ++++---- Rakefile | 6 +++--- fluentd-apt-source/Rakefile | 8 ++++---- fluentd-apt-source/debian/changelog | 2 +- fluentd-apt-source/debian/control | 4 ++-- fluentd-apt-source/debian/rules | 12 ++++++------ 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index a3b640a86..df13828b2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,10 +23,10 @@ /td-agent/dmg/td-agent.rsrc /td-agent/dmg/resources/pkg/scripts/postinstall /td-agent/dmg/resources/dmg/td-agent.osascript -/td-agent-apt-source/apt/build.sh -/td-agent-apt-source/apt/env.sh -/td-agent-apt-source/apt/repositories/ -/td-agent-apt-source/apt/tmp/ +/fluentd-apt-source/apt/build.sh +/fluentd-apt-source/apt/env.sh +/fluentd-apt-source/apt/repositories/ +/fluentd-apt-source/apt/tmp/ *.wixobj *.wixpdb *.msi diff --git a/Rakefile b/Rakefile index 55a48b1bf..aa4908f9e 100755 --- a/Rakefile +++ b/Rakefile @@ -20,12 +20,12 @@ PACKAGES = [ ] APT_SOURCE_PACKAGES = [ - "td-agent-apt-source" + "fluentd-apt-source" ] ALL_PACKAGE = [ "td-agent", - "td-agent-apt-source", + "fluentd-apt-source", ] def define_bulked_task(name, description, packages = PACKAGES) @@ -57,7 +57,7 @@ end end [ - ["apt:build", "Build td-agent-apt-source deb packages", APT_SOURCE_PACKAGES], + ["apt:build", "Build fluentd-apt-source deb packages", APT_SOURCE_PACKAGES], ].each do |params| define_bulked_task(*params) end diff --git a/fluentd-apt-source/Rakefile b/fluentd-apt-source/Rakefile index 37d11339a..97fc954cc 100644 --- a/fluentd-apt-source/Rakefile +++ b/fluentd-apt-source/Rakefile @@ -11,9 +11,9 @@ CLEAN.include("apt/env.sh") CLEAN.include("debian/tmp") CLOBBER.include("apt/repositories") -class TdAgentAptSourcePackageTask < PackageTask +class FluentdAptSourcePackageTask < PackageTask def initialize - super("td-agent-apt-source", + super("fluentd-apt-source", repository_version, latest_commit_time(File.join(__dir__, ".."))) CLEAN.include(@archive_name) @@ -38,7 +38,7 @@ class TdAgentAptSourcePackageTask < PackageTask end def repository_name - "td-agent" + "fluentd" end def repository_label @@ -139,5 +139,5 @@ class TdAgentAptSourcePackageTask < PackageTask end end -task = TdAgentAptSourcePackageTask.new +task = FluentdAptSourcePackageTask.new task.define diff --git a/fluentd-apt-source/debian/changelog b/fluentd-apt-source/debian/changelog index f4d1179b9..caff97128 100644 --- a/fluentd-apt-source/debian/changelog +++ b/fluentd-apt-source/debian/changelog @@ -1,4 +1,4 @@ -td-agent-apt-source (2020.8.25-1) unstable; urgency=low +fluentd-apt-source (2020.8.25-1) unstable; urgency=low * New upstream release. diff --git a/fluentd-apt-source/debian/control b/fluentd-apt-source/debian/control index 9b983ea94..62232303d 100644 --- a/fluentd-apt-source/debian/control +++ b/fluentd-apt-source/debian/control @@ -1,4 +1,4 @@ -Source: td-agent-apt-source +Source: fluentd-apt-source Section: misc Priority: important Maintainer: Fluentd developers @@ -9,7 +9,7 @@ Build-Depends: Standards-Version: 3.9.8 Homepage: https://www.fluentd.org/ -Package: td-agent-apt-source +Package: fluentd-apt-source Section: misc Architecture: all Depends: diff --git a/fluentd-apt-source/debian/rules b/fluentd-apt-source/debian/rules index a83834618..c789fcca2 100755 --- a/fluentd-apt-source/debian/rules +++ b/fluentd-apt-source/debian/rules @@ -18,7 +18,7 @@ override_dh_builddeb: override_dh_auto_build: gpg \ --no-default-keyring \ - --keyring ./td-agent-archive-keyring.gpg \ + --keyring ./fluentd-archive-keyring.gpg \ --import keys ( \ @@ -30,19 +30,19 @@ override_dh_auto_build: component=main; \ fi; \ echo "Types: deb"; \ - echo "URIs: http://packages.treasuredata.com/4/$${distribution}/$${code_name}/"; \ + echo "URIs: https://packages.treasuredata.com/4/$${distribution}/$${code_name}/"; \ echo "Suites: $${code_name}"; \ echo "Components: contrib"; \ - echo "Signed-By: /usr/share/keyrings/td-agent-archive-keyring.gpg"; \ - ) > td-agent.sources + echo "Signed-By: /usr/share/keyrings/fluentd-archive-keyring.gpg"; \ + ) > fluentd.sources override_dh_install: install -d debian/tmp/usr/share/keyrings/ - install -m 0644 td-agent-archive-keyring.gpg \ + install -m 0644 fluentd-archive-keyring.gpg \ debian/tmp/usr/share/keyrings/ install -d debian/tmp/etc/apt/sources.list.d/ - install -m 0644 td-agent.sources \ + install -m 0644 fluentd.sources \ debian/tmp/etc/apt/sources.list.d/ dh_install From f2e1a3061d7418dbf5f5c44e98b4fa9136860a0a Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 2 May 2022 14:17:28 +0900 Subject: [PATCH 5/6] apt: add Ubuntu 22.04 Signed-off-by: Kentaro Hayashi --- fluentd-apt-source/apt/ubuntu-jammy/Dockerfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 fluentd-apt-source/apt/ubuntu-jammy/Dockerfile diff --git a/fluentd-apt-source/apt/ubuntu-jammy/Dockerfile b/fluentd-apt-source/apt/ubuntu-jammy/Dockerfile new file mode 100644 index 000000000..f1a6316c2 --- /dev/null +++ b/fluentd-apt-source/apt/ubuntu-jammy/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:jammy + +RUN \ + echo "debconf debconf/frontend select Noninteractive" | \ + debconf-set-selections + +ARG DEBUG + +RUN \ + quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \ + apt update ${quiet} && \ + apt install -y -V ${quiet} \ + debhelper \ + devscripts \ + gnupg && \ + apt clean && \ + rm -rf /var/lib/apt/lists/* From 2209c13cc92897c98e65c7653e70084b2eb8146f Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 9 May 2022 10:49:46 +0900 Subject: [PATCH 6/6] apt: install missing ca-certificates Signed-off-by: Kentaro Hayashi --- td-agent/apt/install-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/td-agent/apt/install-test.sh b/td-agent/apt/install-test.sh index 3e995e611..bc6997317 100755 --- a/td-agent/apt/install-test.sh +++ b/td-agent/apt/install-test.sh @@ -41,6 +41,6 @@ if [ ${code_name} = "jammy" ]; then fi apt clean all apt_source_package=${apt_source_repositories_dir}/${distribution}/pool/${code_name}/${channel}/*/*/fluentd-apt-source*_all.deb -apt install -V -y ${apt_source_package} +apt install -V -y ${apt_source_package} ca-certificates apt update apt install -V -y td-agent