diff options
| author |   David Seifert <soap@gentoo.org> | 2020-02-08 17:52:03 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2020-02-08 17:52:03 +0100 |
| commit | caf163a81c6792973d322b85a9ec822c2a09492d (patch) | |
| tree | 0cf3f7213811680bac9c68a91bf369dca4866483 /net-misc/openssh | |
| parent | net-misc/lksctp-tools: [QA] Fix UnnecessarySlashStrip (diff) | |
| download | gentoo-caf163a81c6792973d322b85a9ec822c2a09492d.tar.gz gentoo-caf163a81c6792973d322b85a9ec822c2a09492d.tar.bz2 gentoo-caf163a81c6792973d322b85a9ec822c2a09492d.zip | |
net-misc/openssh: [QA] Fix UnnecessarySlashStrip
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/openssh-7.7_p1-r9.ebuild | 12 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-7.9_p1-r4.ebuild | 14 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-8.0_p1-r4.ebuild | 14 |
3 files changed, 20 insertions, 20 deletions
diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild index 7851cc3b95e1..98bf001c684e 100644 --- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild +++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild @@ -98,7 +98,7 @@ pkg_pretend() { src_prepare() { sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ pathnames.h || die # don't break .ssh/authorized_keys2 for fun @@ -255,13 +255,13 @@ src_configure() { --with-ldflags="${LDFLAGS}" --disable-strip --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX%/}"/etc/ssh - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX%/}"/usr/share/openssh - --with-privsep-path="${EPREFIX%/}"/var/empty + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) # We apply the sctp patch conditionally, so can't pass --without-sctp # unconditionally else we get unknown flag warnings. $(use sctp && use_with sctp) diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild index 9064d66d9fbd..828c4a17b8ef 100644 --- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild +++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild @@ -110,7 +110,7 @@ pkg_pretend() { src_prepare() { sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ pathnames.h || die # don't break .ssh/authorized_keys2 for fun @@ -279,17 +279,17 @@ src_configure() { --with-ldflags="${LDFLAGS}" --disable-strip --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX%/}"/etc/ssh - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX%/}"/usr/share/openssh - --with-privsep-path="${EPREFIX%/}"/var/empty + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) # We apply the sctp patch conditionally, so can't pass --without-sctp # unconditionally else we get unknown flag warnings. $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX%/}"/usr) + $(use_with ldns ldns "${EPREFIX}"/usr) $(use_with libedit) $(use_with pam) $(use_with pie) diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild index 0b6e431f7e96..1b1d9363437b 100644 --- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild +++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild @@ -111,7 +111,7 @@ pkg_pretend() { src_prepare() { sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ pathnames.h || die # don't break .ssh/authorized_keys2 for fun @@ -281,17 +281,17 @@ src_configure() { --with-ldflags="${LDFLAGS}" --disable-strip --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX%/}"/etc/ssh - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX%/}"/usr/share/openssh - --with-privsep-path="${EPREFIX%/}"/var/empty + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) # We apply the sctp patch conditionally, so can't pass --without-sctp # unconditionally else we get unknown flag warnings. $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX%/}"/usr) + $(use_with ldns ldns "${EPREFIX}"/usr) $(use_with libedit) $(use_with pam) $(use_with pie) |