From c927a7aeef90f5c88355b112d137658c48996f69 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 30 Nov 2023 11:29:09 +0100 Subject: [PATCH] net-misc/openssh: fix duplicate slash Signed-off-by: Mathieu Tortuyaux --- .../{openssh-9.5_p1.ebuild => openssh-9.5_p1-r1.ebuild} | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/net-misc/openssh/{openssh-9.5_p1.ebuild => openssh-9.5_p1-r1.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.5_p1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.5_p1-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.5_p1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.5_p1-r1.ebuild index c4c68abbcc..fddfbe6e64 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.5_p1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.5_p1-r1.ebuild @@ -232,6 +232,10 @@ insert_include() { local src_config="${1}" options="${2}" includedir="${3}" local name copy regexp_options regexp lineno comment_options + if [[ ! "${includedir}" =~ ^/.* ]]; then + die "includir must be an absolute path (i.e, starting with /). Got: ${includedir}" + fi + name=${src_config##*/} copy="${T}/${name}" cp -a "${src_config}" "${copy}" || die @@ -251,7 +255,7 @@ insert_include() { head -n "${lineno}" "${copy}" || die cat <<-EOF || die # Make sure that all ${comment_options} options are below this Include! - Include "${EPREFIX}/${includedir}/*.conf" + Include "${EPREFIX}${includedir}/*.conf" EOF tail -n "+${lineno}" "${copy}" || die