summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-10-12 19:09:11 +0000
committerMike Frysinger <vapier@gentoo.org>2012-10-12 19:09:11 +0000
commit9fb15f0806094d0d27906f3310f2c20b350101a7 (patch)
treeb9ac5cb8d324049bd3f459d6b69cde8dd8f6d70a /net-misc/openssh
parentStable for amd64, wrt bug #437364 (diff)
downloadgentoo-2-9fb15f0806094d0d27906f3310f2c20b350101a7.tar.gz
gentoo-2-9fb15f0806094d0d27906f3310f2c20b350101a7.tar.bz2
gentoo-2-9fb15f0806094d0d27906f3310f2c20b350101a7.zip
Always specify pid-dir to avoid configure script falling back to /etc/ssh on broken systems #435668 by Piotr Karbowski.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/openssh-6.1_p1.ebuild3
2 files changed, 7 insertions, 2 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index e7a6b9d96c6a..342b4996d48d 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.452 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.453 2012/10/12 19:09:11 vapier Exp $
+
+ 12 Oct 2012; Mike Frysinger <vapier@gentoo.org> openssh-6.1_p1.ebuild:
+ Always specify pid-dir to avoid configure script falling back to /etc/ssh on
+ broken systems #435668 by Piotr Karbowski.
25 Sep 2012; Ulrich Müller <ulm@gentoo.org> openssh-5.5_p1-r2.ebuild,
openssh-5.6_p1-r2.ebuild, openssh-5.7_p1-r1.ebuild, openssh-5.8_p1-r1.ebuild,
diff --git a/net-misc/openssh/openssh-6.1_p1.ebuild b/net-misc/openssh/openssh-6.1_p1.ebuild
index 691a8a1b1ef5..4e5ac9b05cb9 100644
--- a/net-misc/openssh/openssh-6.1_p1.ebuild
+++ b/net-misc/openssh/openssh-6.1_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.2 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.3 2012/10/12 19:09:11 vapier Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -159,6 +159,7 @@ src_configure() {
econf \
--with-ldflags="${LDFLAGS}" \
--disable-strip \
+ --with-pid-dir=/var/run \
--sysconfdir=/etc/ssh \
--libexecdir=/usr/$(get_libdir)/misc \
--datadir=/usr/share/openssh \