[gentoo-commits] gentoo-x86 commit in sys-auth/pam_ssh: ChangeLog pam_ssh-1.97-r2.ebuild pam_ssh-1.97.ebuild pam_ssh-1.92.ebuild

[Diego Petteno (flameeyes)]

flameeyes    10/09/29 21:20:13

  Modified:             ChangeLog pam_ssh-1.97-r2.ebuild
  Removed:              pam_ssh-1.97.ebuild pam_ssh-1.92.ebuild
  Log:
  Fix dependencies over OpenSSH (bug #282993; thanks to Csaba Tóth for reporting and Constanze Hausner for the solution). Also cleanup old versions.
  
  (Portage version: 2.2_rc88/cvs/Linux x86_64)

Revision  Changes    Path
1.39                 sys-auth/pam_ssh/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_ssh/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_ssh/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_ssh/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog	7 Aug 2010 12:45:27 -0000	1.38
+++ ChangeLog	29 Sep 2010 21:20:13 -0000	1.39
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/pam_ssh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/ChangeLog,v 1.38 2010/08/07 12:45:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/ChangeLog,v 1.39 2010/09/29 21:20:13 flameeyes Exp $
+
+  29 Sep 2010; Diego E. Pettenò <flameeyes@g.o>
+  -files/pam_ssh-1.91-debian.patch, -files/pam_ssh-1.91-openssl-0.9.8.patch,
+  -files/pam_ssh-1.91-syslog.patch, -pam_ssh-1.92.ebuild,
+  -pam_ssh-1.97.ebuild, pam_ssh-1.97-r2.ebuild, -files/system-auth.example:
+  Fix dependencies over OpenSSH (bug #282993; thanks to Csaba Tóth for
+  reporting and Constanze Hausner for the solution). Also cleanup old
+  versions.
 
   07 Aug 2010; Diego E. Pettenò <flameeyes@g.o>
   pam_ssh-1.97-r2.ebuild:



1.3                  sys-auth/pam_ssh/pam_ssh-1.97-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_ssh/pam_ssh-1.97-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_ssh/pam_ssh-1.97-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/pam_ssh/pam_ssh-1.97-r2.ebuild?r1=1.2&r2=1.3

Index: pam_ssh-1.97-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/pam_ssh-1.97-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_ssh-1.97-r2.ebuild	7 Aug 2010 12:45:27 -0000	1.2
+++ pam_ssh-1.97-r2.ebuild	29 Sep 2010 21:20:13 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/pam_ssh-1.97-r2.ebuild,v 1.2 2010/08/07 12:45:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/pam_ssh-1.97-r2.ebuild,v 1.3 2010/09/29 21:20:13 flameeyes Exp $
 
 EAPI=2
 
@@ -15,12 +15,13 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
-# Doesn't work on OpenPAM.
-DEPEND="sys-libs/pam
-	sys-devel/libtool"
-
+# Doesn't work on OpenPAM; looks for OpenSSH at build time (bug
+# #282993) and won't work with other implementations either
 RDEPEND="sys-libs/pam
-	virtual/ssh"
+	net-misc/openssh"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-doublefree.patch"