| 1 |
commit: caf163a81c6792973d322b85a9ec822c2a09492d |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 16:52:03 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 8 16:52:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf163a8 |
| 7 |
|
| 8 |
net-misc/openssh: [QA] Fix UnnecessarySlashStrip |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
net-misc/openssh/openssh-7.7_p1-r9.ebuild | 12 ++++++------ |
| 13 |
net-misc/openssh/openssh-7.9_p1-r4.ebuild | 14 +++++++------- |
| 14 |
net-misc/openssh/openssh-8.0_p1-r4.ebuild | 14 +++++++------- |
| 15 |
3 files changed, 20 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild |
| 18 |
index 7851cc3b95e..98bf001c684 100644 |
| 19 |
--- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild |
| 20 |
+++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild |
| 21 |
@@ -98,7 +98,7 @@ pkg_pretend() { |
| 22 |
|
| 23 |
src_prepare() { |
| 24 |
sed -i \ |
| 25 |
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ |
| 26 |
+ -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ |
| 27 |
pathnames.h || die |
| 28 |
|
| 29 |
# don't break .ssh/authorized_keys2 for fun |
| 30 |
@@ -255,13 +255,13 @@ src_configure() { |
| 31 |
--with-ldflags="${LDFLAGS}" |
| 32 |
--disable-strip |
| 33 |
--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run |
| 34 |
- --sysconfdir="${EPREFIX%/}"/etc/ssh |
| 35 |
- --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc |
| 36 |
- --datadir="${EPREFIX%/}"/usr/share/openssh |
| 37 |
- --with-privsep-path="${EPREFIX%/}"/var/empty |
| 38 |
+ --sysconfdir="${EPREFIX}"/etc/ssh |
| 39 |
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc |
| 40 |
+ --datadir="${EPREFIX}"/usr/share/openssh |
| 41 |
+ --with-privsep-path="${EPREFIX}"/var/empty |
| 42 |
--with-privsep-user=sshd |
| 43 |
$(use_with audit audit linux) |
| 44 |
- $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) |
| 45 |
+ $(use_with kerberos kerberos5 "${EPREFIX}"/usr) |
| 46 |
# We apply the sctp patch conditionally, so can't pass --without-sctp |
| 47 |
# unconditionally else we get unknown flag warnings. |
| 48 |
$(use sctp && use_with sctp) |
| 49 |
|
| 50 |
diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild |
| 51 |
index 9064d66d9fb..828c4a17b8e 100644 |
| 52 |
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild |
| 53 |
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild |
| 54 |
@@ -110,7 +110,7 @@ pkg_pretend() { |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
sed -i \ |
| 58 |
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ |
| 59 |
+ -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ |
| 60 |
pathnames.h || die |
| 61 |
|
| 62 |
# don't break .ssh/authorized_keys2 for fun |
| 63 |
@@ -279,17 +279,17 @@ src_configure() { |
| 64 |
--with-ldflags="${LDFLAGS}" |
| 65 |
--disable-strip |
| 66 |
--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run |
| 67 |
- --sysconfdir="${EPREFIX%/}"/etc/ssh |
| 68 |
- --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc |
| 69 |
- --datadir="${EPREFIX%/}"/usr/share/openssh |
| 70 |
- --with-privsep-path="${EPREFIX%/}"/var/empty |
| 71 |
+ --sysconfdir="${EPREFIX}"/etc/ssh |
| 72 |
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc |
| 73 |
+ --datadir="${EPREFIX}"/usr/share/openssh |
| 74 |
+ --with-privsep-path="${EPREFIX}"/var/empty |
| 75 |
--with-privsep-user=sshd |
| 76 |
$(use_with audit audit linux) |
| 77 |
- $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) |
| 78 |
+ $(use_with kerberos kerberos5 "${EPREFIX}"/usr) |
| 79 |
# We apply the sctp patch conditionally, so can't pass --without-sctp |
| 80 |
# unconditionally else we get unknown flag warnings. |
| 81 |
$(use sctp && use_with sctp) |
| 82 |
- $(use_with ldns ldns "${EPREFIX%/}"/usr) |
| 83 |
+ $(use_with ldns ldns "${EPREFIX}"/usr) |
| 84 |
$(use_with libedit) |
| 85 |
$(use_with pam) |
| 86 |
$(use_with pie) |
| 87 |
|
| 88 |
diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild |
| 89 |
index 0b6e431f7e9..1b1d9363437 100644 |
| 90 |
--- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild |
| 91 |
+++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild |
| 92 |
@@ -111,7 +111,7 @@ pkg_pretend() { |
| 93 |
|
| 94 |
src_prepare() { |
| 95 |
sed -i \ |
| 96 |
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ |
| 97 |
+ -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ |
| 98 |
pathnames.h || die |
| 99 |
|
| 100 |
# don't break .ssh/authorized_keys2 for fun |
| 101 |
@@ -281,17 +281,17 @@ src_configure() { |
| 102 |
--with-ldflags="${LDFLAGS}" |
| 103 |
--disable-strip |
| 104 |
--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run |
| 105 |
- --sysconfdir="${EPREFIX%/}"/etc/ssh |
| 106 |
- --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc |
| 107 |
- --datadir="${EPREFIX%/}"/usr/share/openssh |
| 108 |
- --with-privsep-path="${EPREFIX%/}"/var/empty |
| 109 |
+ --sysconfdir="${EPREFIX}"/etc/ssh |
| 110 |
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc |
| 111 |
+ --datadir="${EPREFIX}"/usr/share/openssh |
| 112 |
+ --with-privsep-path="${EPREFIX}"/var/empty |
| 113 |
--with-privsep-user=sshd |
| 114 |
$(use_with audit audit linux) |
| 115 |
- $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) |
| 116 |
+ $(use_with kerberos kerberos5 "${EPREFIX}"/usr) |
| 117 |
# We apply the sctp patch conditionally, so can't pass --without-sctp |
| 118 |
# unconditionally else we get unknown flag warnings. |
| 119 |
$(use sctp && use_with sctp) |
| 120 |
- $(use_with ldns ldns "${EPREFIX%/}"/usr) |
| 121 |
+ $(use_with ldns ldns "${EPREFIX}"/usr) |
| 122 |
$(use_with libedit) |
| 123 |
$(use_with pam) |
| 124 |
$(use_with pie) |
Archives