Revise apt-source package

.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

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

td-agent-apt-source/Rakefile → 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
@@ -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
@@ -139,5 +139,5 @@ class TdAgentAptSourcePackageTask < PackageTask
   end
 end
 
-task = TdAgentAptSourcePackageTask.new
+task = FluentdAptSourcePackageTask.new
 task.define

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/*

td-agent-apt-source/debian/changelog → 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.
 

td-agent-apt-source/debian/control → 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 <fluentd@googlegroups.com>
@@ -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:

fluentd-apt-source/debian/fluentd-apt-source.lintian-overrides

@@ -0,0 +1 @@
+fluentd-apt-source: new-package-should-close-itp-bug

td-agent-apt-source/debian/rules → fluentd-apt-source/debian/rules

@@ -9,10 +9,16 @@ 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 \
-	  --keyring ./td-agent-archive-keyring.gpg \
+	  --keyring ./fluentd-archive-keyring.gpg \
 	  --import keys
 
 	( \
@@ -24,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

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 install -V -y ${apt_source_package}
+apt_source_package=${apt_source_repositories_dir}/${distribution}/pool/${code_name}/${channel}/*/*/fluentd-apt-source*_all.deb
+apt install -V -y ${apt_source_package} ca-certificates
 apt update
 apt install -V -y td-agent