Add patch to fix building on OpenSSL 0.9.8, thanks to Meethune Bhowmick in bug #146271.

Package-Manager: portage-2.1.1

6 files changed, 31 insertions, 121 deletions

diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index aebd5a03f5ff..68439a8b69ce 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -1,52 +1,49 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e741170b50a0d0e1919f42415eb0e792 ChangeLog 1677
-RMD160 a20687b98e3738dc300e1e334752ebc814b792e1 ChangeLog 1677
-SHA256 2a41d2e8160c9c6be524640d9a670ca2efeea5b363178c2530c17ebf988004d7 ChangeLog 1677
-MD5 5cd5460fb7b7377b0e576eac476bc830 files/1.9-standard-prompt.patch 378
-RMD160 f2687cfccf3d8d636dd36fb32b7d181c7116845a files/1.9-standard-prompt.patch 378
-SHA256 525c87beab1dd329cee9f3036e33e18c7278d90b63f14a893864cb74344ef990 files/1.9-standard-prompt.patch 378
-MD5 2da9f0064c9caa03f6d298f3f3f6a169 files/digest-pam_ssh-1.9 64
-RMD160 b9abcd680a094c19b856999cacaa1169ea2bebd0 files/digest-pam_ssh-1.9 64
-SHA256 6244ff0d5072ea191a36560328cd6253e668c45292b98250fa85205aa160f828 files/digest-pam_ssh-1.9 64
-MD5 d42a0e20bf5fa8783aa3a7c6de9a935e files/digest-pam_ssh-1.91 65
-RMD160 584e864a0d687e007990d5898f0f2bd0826d8832 files/digest-pam_ssh-1.91 65
-SHA256 68ea650542431df8243ce2a5524719dbbb42c2a52eec13e6cf87b02e6672bba2 files/digest-pam_ssh-1.91 65
-MD5 d42a0e20bf5fa8783aa3a7c6de9a935e files/digest-pam_ssh-1.91-r1 65
-RMD160 584e864a0d687e007990d5898f0f2bd0826d8832 files/digest-pam_ssh-1.91-r1 65
-SHA256 68ea650542431df8243ce2a5524719dbbb42c2a52eec13e6cf87b02e6672bba2 files/digest-pam_ssh-1.91-r1 65
-MD5 70cacb21c3e0f6b4340ad071c3c35d44 files/digest-pam_ssh-1.91-r2 241
-RMD160 8e452c34304c53c30b23af6794d078a4f3d1a9fd files/digest-pam_ssh-1.91-r2 241
-SHA256 23b39e3fd624a55dff632be9852ac954561213c4bcf5289283a4551611ff52ac files/digest-pam_ssh-1.91-r2 241
+AUX pam_ssh-1.91-debian.patch 13855 RMD160 35cea4b64425351e94f8e5ec4689f17cb97332e7 SHA1 28bbab2ba09356520b571990fc03b0c182bf135e SHA256 a64647467fb05b71a08fe718d371e62356ad8bbf7b7f5a7bc4827b08ca5c91cf
 MD5 837bc88d6356de6f0bcc6d8a1033f47f files/pam_ssh-1.91-debian.patch 13855
 RMD160 35cea4b64425351e94f8e5ec4689f17cb97332e7 files/pam_ssh-1.91-debian.patch 13855
 SHA256 a64647467fb05b71a08fe718d371e62356ad8bbf7b7f5a7bc4827b08ca5c91cf files/pam_ssh-1.91-debian.patch 13855
+AUX pam_ssh-1.91-openssl-0.9.8.patch 291 RMD160 f8cbc5831b4286f688f336ece32b7003a937cf4b SHA1 def422cb326165107ad9a4e347724284ae1abe30 SHA256 0e4b3bbd14b874bd9999f92cc2b4358f95e458654e0cc3bcc755790cbcdfea1d
+MD5 3b62e139f583b7e6bac89626fa5a95be files/pam_ssh-1.91-openssl-0.9.8.patch 291
+RMD160 f8cbc5831b4286f688f336ece32b7003a937cf4b files/pam_ssh-1.91-openssl-0.9.8.patch 291
+SHA256 0e4b3bbd14b874bd9999f92cc2b4358f95e458654e0cc3bcc755790cbcdfea1d files/pam_ssh-1.91-openssl-0.9.8.patch 291
+AUX pam_ssh-1.91-syslog.patch 308 RMD160 f06a704155b76052bdd536e8b27a579cf9d0a4bb SHA1 2f80221a9a804e8da777179dc0768dbc73a7fb65 SHA256 b581d3422f93a8de7cd8b7dbc23c58da133eb63127059e6ff0b1f3e93e63a802
 MD5 4e13ec4ec8aa59c856cda00ee17765a9 files/pam_ssh-1.91-syslog.patch 308
 RMD160 f06a704155b76052bdd536e8b27a579cf9d0a4bb files/pam_ssh-1.91-syslog.patch 308
 SHA256 b581d3422f93a8de7cd8b7dbc23c58da133eb63127059e6ff0b1f3e93e63a802 files/pam_ssh-1.91-syslog.patch 308
+AUX system-auth.example 612 RMD160 ffbcbc7535cd654c5a9e8ce2d3584b841aea6e53 SHA1 f90c19c81821789fe16a200320792887b8680c44 SHA256 3699db4595de56f31448c85a83c34277d1bebb5c805871b1c449446a49fb1989
 MD5 4d93b0a0bbf019434f9c7a6da68c5e9f files/system-auth.example 612
 RMD160 ffbcbc7535cd654c5a9e8ce2d3584b841aea6e53 files/system-auth.example 612
 SHA256 3699db4595de56f31448c85a83c34277d1bebb5c805871b1c449446a49fb1989 files/system-auth.example 612
-MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
-RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
-SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c metadata.xml 218
-MD5 e0412d38c87c68a94db0f947b09dd260 pam_ssh-1.9.ebuild 854
-RMD160 8ffc9574d17deacadfed706ce6fc6e0d763411a4 pam_ssh-1.9.ebuild 854
-SHA256 a85f03646f82c21bba8cabb8dd9cdd9b1e184bb8784ee3a41cfd6e683a424cc6 pam_ssh-1.9.ebuild 854
-MD5 c6a80814e16dbf637777dae90dca00c7 pam_ssh-1.91-r1.ebuild 971
-RMD160 fb55fc91e78a10b6d6044f20acb21b5bd17f1d24 pam_ssh-1.91-r1.ebuild 971
-SHA256 533f76e403c5d3fc46baf8815b98c717c5468e3a7721cd7ba423f232ad342156 pam_ssh-1.91-r1.ebuild 971
-MD5 ac7abe9ad619a9a5ba807af4af8d2579 pam_ssh-1.91-r2.ebuild 1133
-RMD160 f609627056c6706858207c16dacb904cb2a7c8ad pam_ssh-1.91-r2.ebuild 1133
-SHA256 8179256c35cb9623b822d59678626ad25b7cad46c022e180d3901f9affdc5dcc pam_ssh-1.91-r2.ebuild 1133
+DIST pam_ssh-1.91.tar.bz2 193705 RMD160 59be70cd4ef4f33ae9d78593e331e5eb3ed84669 SHA1 98fdeea9d356778ea725533b75371097dd049a14 SHA256 dde623585c2942fc079657e061ca47f3380850da5ac2dca708e98f8dd1ea18d0
+EBUILD pam_ssh-1.91-r2.ebuild 1180 RMD160 33dd279e01ed4310a37965cdf6733855a489ea40 SHA1 a4291d66d8cea94612ef09dc7f95e07e94f8da22 SHA256 745854063376bb72c26c7495a53a2edb9a2100af1d22cdedc78ce1f6f87e8f4e
+MD5 cec450d3f6555af6e4ff6d09440a6cd3 pam_ssh-1.91-r2.ebuild 1180
+RMD160 33dd279e01ed4310a37965cdf6733855a489ea40 pam_ssh-1.91-r2.ebuild 1180
+SHA256 745854063376bb72c26c7495a53a2edb9a2100af1d22cdedc78ce1f6f87e8f4e pam_ssh-1.91-r2.ebuild 1180
+EBUILD pam_ssh-1.91.ebuild 825 RMD160 df21bd8e04b1f30c43deff87f3db6933ea9c654d SHA1 286354954c5f01bb741617e133f86c1becd70d56 SHA256 4b4b221104b6ae2fca442b7edbf31698ca5d02b62e4cbb0f9b2204f30db1a51d
 MD5 62f8e13a5948e373d0046ffa544e339a pam_ssh-1.91.ebuild 825
 RMD160 df21bd8e04b1f30c43deff87f3db6933ea9c654d pam_ssh-1.91.ebuild 825
 SHA256 4b4b221104b6ae2fca442b7edbf31698ca5d02b62e4cbb0f9b2204f30db1a51d pam_ssh-1.91.ebuild 825
+MISC ChangeLog 1972 RMD160 987b9a7d89d41c8a97e34af63c5b2c6ba03eb6f7 SHA1 e5b22e2526855fe623ec253e705b20acc31a7908 SHA256 f130ecff1d9ba1531ff97b940dc899ea2fd15c22ba4325a88ffb31dc4152ff18
+MD5 6642c8527ddb980b01731f3fdbf10d46 ChangeLog 1972
+RMD160 987b9a7d89d41c8a97e34af63c5b2c6ba03eb6f7 ChangeLog 1972
+SHA256 f130ecff1d9ba1531ff97b940dc899ea2fd15c22ba4325a88ffb31dc4152ff18 ChangeLog 1972
+MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
+MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
+RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
+SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c metadata.xml 218
+MD5 70cacb21c3e0f6b4340ad071c3c35d44 files/digest-pam_ssh-1.91 241
+RMD160 8e452c34304c53c30b23af6794d078a4f3d1a9fd files/digest-pam_ssh-1.91 241
+SHA256 23b39e3fd624a55dff632be9852ac954561213c4bcf5289283a4551611ff52ac files/digest-pam_ssh-1.91 241
+MD5 70cacb21c3e0f6b4340ad071c3c35d44 files/digest-pam_ssh-1.91-r2 241
+RMD160 8e452c34304c53c30b23af6794d078a4f3d1a9fd files/digest-pam_ssh-1.91-r2 241
+SHA256 23b39e3fd624a55dff632be9852ac954561213c4bcf5289283a4551611ff52ac files/digest-pam_ssh-1.91-r2 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFESMQzAiZjviIA2XgRAjtSAJ41jwPRwhqlKjXLg4jDgy86sUWR2gCfcjuw
-lNoTm6dwsmPM34lmP21YAS4=
-=Xd5E
+iD8DBQFFBfiPAiZjviIA2XgRAuxwAJ9U7BXk5iAbH2xGvSzkuE6bqlRl5gCfZcag
+ClP0iq0XUDiGQPQ/fEk2Phg=
+=PSBR
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_ssh/files/1.9-standard-prompt.patch b/sys-auth/pam_ssh/files/1.9-standard-prompt.patch
deleted file mode 100644
index 2554d3887f43..000000000000
--- a/sys-auth/pam_ssh/files/1.9-standard-prompt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pam_ssh.c.orig	2004-02-22 20:15:28.256672768 -0500
-+++ pam_ssh.c	2004-02-22 20:15:40.279844968 -0500
-@@ -101,7 +101,7 @@
- #endif
- 
- #define	MODULE_NAME		"pam_ssh"
--#define	NEED_PASSPHRASE		"SSH passphrase: "
-+#define	NEED_PASSPHRASE		"Password: "
- #define DEF_KEYFILES		 "id_dsa,id_rsa,identity"
- #define ENV_PID_SUFFIX		"_AGENT_PID"
- #define ENV_SOCKET_SUFFIX	"_AUTH_SOCK"
diff --git a/sys-auth/pam_ssh/files/digest-pam_ssh-1.9 b/sys-auth/pam_ssh/files/digest-pam_ssh-1.9
deleted file mode 100644
index 84fb4878c022..000000000000
--- a/sys-auth/pam_ssh/files/digest-pam_ssh-1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a53e076b1cba5859e68e837d4c52cc03 pam_ssh-1.9.tar.bz2 193236
diff --git a/sys-auth/pam_ssh/files/digest-pam_ssh-1.91-r1 b/sys-auth/pam_ssh/files/digest-pam_ssh-1.91-r1
deleted file mode 100644
index 87d38542272a..000000000000
--- a/sys-auth/pam_ssh/files/digest-pam_ssh-1.91-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57a3aa476394efa219a8a99f527d4e4b pam_ssh-1.91.tar.bz2 193705
diff --git a/sys-auth/pam_ssh/pam_ssh-1.9.ebuild b/sys-auth/pam_ssh/pam_ssh-1.9.ebuild
deleted file mode 100644
index 496cfe948397..000000000000
--- a/sys-auth/pam_ssh/pam_ssh-1.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 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.9.ebuild,v 1.1 2005/07/02 14:12:59 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="Uses ssh-agent to provide single sign-on"
-HOMEPAGE="http://pam-ssh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.bz2"
-
-LICENSE="BSD as-is"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="sys-libs/pam"
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-standard-prompt.patch
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO ${FILESDIR}/system-auth.example
-}
-
-pkg_postinst() {
-	einfo "You can find an example system-auth file that uses this"
-	einfo "library in /usr/share/doc/${PF}"
-}
diff --git a/sys-auth/pam_ssh/pam_ssh-1.91-r1.ebuild b/sys-auth/pam_ssh/pam_ssh-1.91-r1.ebuild
deleted file mode 100644
index d4bd589f2a8c..000000000000
--- a/sys-auth/pam_ssh/pam_ssh-1.91-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 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.91-r1.ebuild,v 1.1 2005/07/02 14:12:59 flameeyes Exp $
-
-inherit pam
-
-DESCRIPTION="Uses ssh-agent to provide single sign-on"
-HOMEPAGE="http://pam-ssh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-LICENSE="BSD as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-# Doesn't work on OpenPAM.
-DEPEND="sys-libs/pam
-	sys-devel/libtool"
-
-RDEPEND="sys-libs/pam
-	virtual/ssh"
-
-src_compile() {
-	econf \
-		"--with-pam-dir=$(getpam_mod_dir)" \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO ${FILESDIR}/system-auth.example
-}
-
-pkg_postinst() {
-	einfo "You can find an example system-auth file that uses this"
-	einfo "library in /usr/share/doc/${PF}"
-}