[patch] patch against gx86 version

openssh-6.6_p1-r1-prefix.diff (text/plain), 1.16 KB, created by Michael Haubenwallner (RETIRED) on 2014-09-02 14:03:20 UTC

--- openssh-6.6_p1-r1.ebuild
+++ openssh-6.6_p1-r1.ebuild
@@ -141,6 +141,12 @@
 	)
 	sed -i "${sed_args[@]}" configure{.ac,} || die
 
+	# setting setuid bit may fail as non-priviledged user (prefix, userpriv?)
+	# during build, retry in pkg_preinst
+	if [[ $(id -u) != 0 ]]; then
+		sed -i -e 's/-m 4711/-m 0711/' "${S}"/Makefile.in || die
+	fi
+
 	epatch_user #473004
 
 	# Now we can build a sane merged version.h
@@ -193,7 +199,7 @@
 		--with-md5-passwords \
 		--with-ssl-engine \
 		$(static_use_with pam) \
-		$(static_use_with kerberos kerberos5 /usr) \
+		$(static_use_with kerberos kerberos5 "${EPREFIX}"/usr) \
 		${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
 		$(use_with ldns) \
 		$(use_with libedit) \
@@ -261,6 +267,7 @@
 }
 
 src_test() {
+	use prefix && return # horse drug, see #335343
 	local t tests skipped failed passed shell
 	tests="interop-tests compat-tests"
 	skipped=""
@@ -297,6 +304,8 @@
 pkg_preinst() {
 	enewgroup sshd 22
 	enewuser sshd 22 -1 /var/empty sshd
+	# retry setting setuid bit, may fail as non-priviledged user (prefix).
+	$(usex prefix 'nonfatal' '') fperms 4711 /usr/$(get_libdir)/misc/ssh-keysign*
 }
 
 pkg_postinst() {