Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use armored keyring for APT repository #772

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Use armored keyring for APT repository #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
687c5b7
Use armored keyring for APT repository
kenhys Jan 8, 2025
4368be2
Drop old distributions
kenhys Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions fluent-apt-source/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class FluentdAptSourcePackageTask < PackageTask
end

def repository_version
"2023.6.29"
"2025.1.8"
end

def repository_name
Expand Down Expand Up @@ -86,11 +86,8 @@ class FluentdAptSourcePackageTask < PackageTask

def apt_targets_default
[
"debian-buster",
"debian-bulleye",
"debian-bookworm",
"ubuntu-xenial",
"ubuntu-bionic",
"ubuntu-focal",
"ubuntu-jammy",
"ubuntu-noble"
Expand Down
7 changes: 7 additions & 0 deletions fluent-apt-source/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
fluent-apt-source (2025.1.8-1) unstable; urgency=medium

* New upstream release.
* Use armored keyring for APT repository to support newer apt.

-- Kentaro Hayashi <[email protected]> Wed, 08 Jan 2025 16:31:51 +0900

fluent-apt-source (2023.6.29-1) unstable; urgency=medium

* New upstream release.
Expand Down
13 changes: 9 additions & 4 deletions fluent-apt-source/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@ override_dh_builddeb:
override_dh_auto_build:
gpg \
--no-default-keyring \
--keyring ./fluent-archive-keyring.gpg \
--keyring ./fluent-archive-keyring.kbx \
--import keys
gpg \
--no-default-keyring \
--keyring ./fluent-archive-keyring.gpg \
--keyring ./fluent-archive-keyring.kbx \
--import fluent-package.pub
gpg \
--no-default-keyring \
--keyring ./fluent-archive-keyring.kbx \
--armor \
--export > ./fluent-archive-keyring.asc

( \
distribution=$$(lsb_release --id --short | tr 'A-Z' 'a-z'); \
Expand All @@ -37,12 +42,12 @@ override_dh_auto_build:
echo "URIs: https://packages.treasuredata.com/5/$${distribution}/$${code_name}/"; \
echo "Suites: $${code_name}"; \
echo "Components: contrib"; \
echo "Signed-By: /usr/share/keyrings/fluent-archive-keyring.gpg"; \
echo "Signed-By: /usr/share/keyrings/fluent-archive-keyring.asc"; \
) > fluent.sources

override_dh_install:
install -d debian/tmp/usr/share/keyrings/
install -m 0644 fluent-archive-keyring.gpg \
install -m 0644 fluent-archive-keyring.asc \
debian/tmp/usr/share/keyrings/

install -d debian/tmp/etc/apt/sources.list.d/
Expand Down
5 changes: 1 addition & 4 deletions fluent-lts-apt-source/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class FluentdAptLtsSourcePackageTask < PackageTask
end

def repository_version
"2023.7.29"
"2025.1.8"
end

def repository_name
Expand Down Expand Up @@ -86,11 +86,8 @@ class FluentdAptLtsSourcePackageTask < PackageTask

def apt_targets_default
[
"debian-buster",
"debian-bulleye",
"debian-bookworm",
"ubuntu-xenial",
"ubuntu-bionic",
"ubuntu-focal",
"ubuntu-jammy",
"ubuntu-noble"
Expand Down
9 changes: 8 additions & 1 deletion fluent-lts-apt-source/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
fluent-lts-apt-source (2025.1.8-1) unstable; urgency=medium

* New upstream release.
* Use armored keyring for APT repository to support newer apt.

-- Kentaro Hayashi <[email protected]> Wed, 08 Jan 2025 16:31:51 +0900

fluent-lts-apt-source (2023.7.29-1) unstable; urgency=medium

* New upstream release.
* Added new Fluent Package Official Signing Key.

-- Kentaro Hayashi <[email protected]> Mon, 24 Jul 2023 17:02:55 +0900
-- Kentaro Hayashi <[email protected]> Wed, 08 Jan 2025 16:31:21 +0900
13 changes: 9 additions & 4 deletions fluent-lts-apt-source/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@ override_dh_builddeb:
override_dh_auto_build:
gpg \
--no-default-keyring \
--keyring ./fluent-lts-archive-keyring.gpg \
--keyring ./fluent-lts-archive-keyring.kbx \
--import keys
gpg \
--no-default-keyring \
--keyring ./fluent-lts-archive-keyring.gpg \
--keyring ./fluent-lts-archive-keyring.kbx \
--import fluent-package.pub
gpg \
--no-default-keyring \
--keyring ./fluent-lts-archive-keyring.kbx \
--armor \
--export > ./fluent-lts-archive-keyring.asc

( \
distribution=$$(lsb_release --id --short | tr 'A-Z' 'a-z'); \
Expand All @@ -37,12 +42,12 @@ override_dh_auto_build:
echo "URIs: https://packages.treasuredata.com/lts/5/$${distribution}/$${code_name}/"; \
echo "Suites: $${code_name}"; \
echo "Components: contrib"; \
echo "Signed-By: /usr/share/keyrings/fluent-lts-archive-keyring.gpg"; \
echo "Signed-By: /usr/share/keyrings/fluent-lts-archive-keyring.asc"; \
) > fluent-lts.sources

override_dh_install:
install -d debian/tmp/usr/share/keyrings/
install -m 0644 fluent-lts-archive-keyring.gpg \
install -m 0644 fluent-lts-archive-keyring.asc \
debian/tmp/usr/share/keyrings/

install -d debian/tmp/etc/apt/sources.list.d/
Expand Down
Loading