Merge pull request #2667 from flatcar/scripts

app-misc/ca-certificates: Account for certs missing newlines Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
flatcar · Feb 24, 2025 · fca3b02 · fca3b02
2 parents e00ae5a + f817780
commit fca3b02
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/changelog/bugfixes/2025-02-14-update-ca-certificates-missing-newlines-fix.md b/changelog/bugfixes/2025-02-14-update-ca-certificates-missing-newlines-fix.md
@@ -0,0 +1 @@
+- Fix update-ca-certificates behavior when concatenating certificates with missing trailing newlines. ([flatcar/scripts#2667](https://github.com/flatcar/scripts/pull/2667))
diff --git a/...certificates/ca-certificates-3.108.ebuild → ...tificates/ca-certificates-3.108-r1.ebuild b/...certificates/ca-certificates-3.108.ebuild → ...tificates/ca-certificates-3.108-r1.ebuild
diff --git a/...iner/src/third_party/coreos-overlay/app-misc/ca-certificates/files/update-ca-certificates b/...iner/src/third_party/coreos-overlay/app-misc/ca-certificates/files/update-ca-certificates
@@ -32,7 +32,8 @@ if [[ ! -e "${CERTBUNDLE}" || "${CERTSDIR}" -nt "${CERTBUNDLE}" ]]; then
     trap "rm -f '${CERTSDIR}/${TEMPBUNDLE}'" EXIT
 
     # Use .0 instead of .pem to pull in only what c_rehash validated
-    cat "${CERTSDIR}"/*.[0-9] > "${TEMPBUNDLE}"
+    sed --separate '$a\' "${CERTSDIR}"/*.[0-9] >"${TEMPBUNDLE}"
+
     chmod 644 "${TEMPBUNDLE}"
     mv -f "${TEMPBUNDLE}" "${CERTBUNDLE}"
     trap - EXIT
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fix update-ca-certificates behavior when concatenating certificates with missing trailing newlines. ([flatcar/scripts#2667](https://github.com/flatcar/scripts/pull/2667))