Remove sys-auth/pam_keyring, its been merged into gnome-base/gnome-keyring

7 files changed, 6 insertions, 152 deletions

diff --git a/sys-auth/pam_keyring/ChangeLog b/sys-auth/pam_keyring/ChangeLog
deleted file mode 100644
index d73fb19402b7..000000000000
--- a/sys-auth/pam_keyring/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-# ChangeLog for sys-auth/pam_keyring
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_keyring/ChangeLog,v 1.4 2006/11/11 19:38:16 tester Exp $
-
-  11 Nov 2006; Olivier Crête <tester@gentoo.org> pam_keyring-0.0.8.ebuild:
-  Stable on amd64
-
-  23 Oct 2006; Andrej Kacian <ticho@gentoo.org> pam_keyring-0.0.8.ebuild:
-  Added ~x86 keyword per request of Christian Schlotter <again at gmx.de>, bug
-  #152402.
-
-*pam_keyring-0.0.8 (02 Oct 2006)
-
-  02 Oct 2006; Olivier Crête <tester@gentoo.org>
-  +files/pam_keyring-0.0.8-fixes.patch, +files/gdm.example, +metadata.xml,
-  +pam_keyring-0.0.8.ebuild:
-  Initial commit
-
diff --git a/sys-auth/pam_keyring/Manifest b/sys-auth/pam_keyring/Manifest
deleted file mode 100644
index 5b157fa1c6fd..000000000000
--- a/sys-auth/pam_keyring/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gdm.example 554 RMD160 79fa3d552e3d848002dc300bd40281404bf91eba SHA1 dc5b63bd5053f62e590220a6ab227fcbc67b918c SHA256 aa910ec8d79faf54d23d7a5a6d240ee8bc8a9b042c88bee296f52abb89577b81
-AUX pam_keyring-0.0.8-fixes.patch 1883 RMD160 c70c70df4d39fcaf3d128742f89b00e9f37f6dfc SHA1 326dd8ace3fb871b05959a7cceeeb6ab5d3f00b6 SHA256 40ccb080edc39087b795bbac7d2e5345f53ab7717c733af84d1dd51eb01b469a
-DIST pam_keyring-0.0.8.tar.gz 627561 RMD160 0d930cb7a84d43b9d44d32a0b73c92a51c15676f SHA1 4f571cde22f5968bdb6aa470ffe5f3121d9f24e5 SHA256 057fc17dd923d060ea239e1468685dae565731c3f98a34ec15226f2ccdcd4560
-EBUILD pam_keyring-0.0.8.ebuild 1067 RMD160 6a545b05f8ce13578f567d932590ee50c070cb53 SHA1 5d5425de1f09e1d25ed6576538d4158903e36cfe SHA256 3215c623b2615c59f0ce10bac94b22fb221d633c9bf867a50221ec2071eaf11a
-MISC ChangeLog 679 RMD160 b2d29b358e0f08519311248ce37158d94ea8f8e7 SHA1 09cfd065f0ffe94ddcf7d37a8d1f92205e287cdf SHA256 16d531d77df960d9deff451f529650637abe4208e1efe806e3c9fcd7b39682f7
-MISC metadata.xml 248 RMD160 74a3dfaa7d6d0f639f4af31011309c9faeb1ed0a SHA1 5da8dde1ba4922e4f52e24806cd6b731a6019a18 SHA256 71e4384e0f8bcee0ab591308de6ba216776123042aab63deed3bc36bea38c0f4
diff --git a/sys-auth/pam_keyring/files/gdm.example b/sys-auth/pam_keyring/files/gdm.example
deleted file mode 100644
index 27ab523d187c..000000000000
--- a/sys-auth/pam_keyring/files/gdm.example
+++ /dev/null
@@ -1,14 +0,0 @@
-#%PAM-1.0
-auth       optional		pam_env.so
-auth       optional             pam_keyring.so try_first_pass
-# Uncomment if you want pam_ssh to work too
-# You obviously have to have the same password for both
-#auth       sufficient           pam_ssh.so try_first_pass
-auth       include		system-auth
-auth       required		pam_nologin.so
-account    include		system-auth
-password   include		system-auth
-session    include		system-auth
-session    optional             pam_keyring.so
-# Uncomment this one to for pam_ssh
-#session    optional             pam_ssh.so
diff --git a/sys-auth/pam_keyring/files/pam_keyring-0.0.8-fixes.patch b/sys-auth/pam_keyring/files/pam_keyring-0.0.8-fixes.patch
deleted file mode 100644
index 9822e0008cd5..000000000000
--- a/sys-auth/pam_keyring/files/pam_keyring-0.0.8-fixes.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ru pam_keyring-0.0.8.orig/src/compat.c pam_keyring-0.0.8/src/compat.c
---- pam_keyring-0.0.8.orig/src/compat.c	2006-06-02 13:04:37.000000000 -0400
-+++ pam_keyring-0.0.8/src/compat.c	2006-10-02 00:03:20.000000000 -0400
-@@ -37,15 +37,15 @@
-         if (!msgbuf) {
-                 syslog (LOG_AUTHPRIV|LOG_CRIT, "%s: vasprintf: %m",
-                     "pam_keyring");
--                closelog();
--                return;
--        }
--
--        syslog (LOG_AUTHPRIV|priority, "%s: %s: %s",
-+        } else {
-+	  syslog (LOG_AUTHPRIV|priority, "%s: %s: %s",
-             "pam_keyring", service, msgbuf);
-+	  free(msgbuf);
- //	_pam_overwrite(msgbuf);
-+	}
- 
-         closelog();
-+
- }
- 
- /*
-@@ -53,7 +53,7 @@
-  * response.
-  */
- int
--pam_prompt(pam_handle_t *pamh, int style, const char *prompt, char **user_msg)
-+pam_prompt(pam_handle_t *pamh, int style, char **user_msg, const char *prompt)
- {
- 	int retval;
- 	const void *item;
-diff -ru pam_keyring-0.0.8.orig/src/compat.h pam_keyring-0.0.8/src/compat.h
---- pam_keyring-0.0.8.orig/src/compat.h	2006-06-01 13:15:38.000000000 -0400
-+++ pam_keyring-0.0.8/src/compat.h	2006-10-01 23:56:46.000000000 -0400
-@@ -6,6 +6,6 @@
- 
- extern int PAM_FORMAT((printf, 4, 5)) PAM_NONNULL((1,4))
- pam_prompt (pam_handle_t *pamh, int style, char **response,
--            const char *fmt, ...);
-+            const char *prompt);
- 
- #endif
-diff -ru pam_keyring-0.0.8.orig/src/pam_keyring.c pam_keyring-0.0.8/src/pam_keyring.c
---- pam_keyring-0.0.8.orig/src/pam_keyring.c	2006-06-05 11:36:17.000000000 -0400
-+++ pam_keyring-0.0.8/src/pam_keyring.c	2006-10-02 00:38:17.000000000 -0400
-@@ -285,7 +285,7 @@
- 		g_error_free(err);
- 		goto _return;
- 	}
--	if (WIFEXITED(status) == 0 && standard_out != NULL) {
-+	if (WIFEXITED(status) && standard_out != NULL) {
- 		lines = g_strsplit(standard_out, "\n", 3);
- 		if (lines[0] != NULL &&
- 		    lines[1] != NULL &&
diff --git a/sys-auth/pam_keyring/metadata.xml b/sys-auth/pam_keyring/metadata.xml
deleted file mode 100644
index 0d7a58beec50..000000000000
--- a/sys-auth/pam_keyring/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pam</herd>
-<maintainer>
-  <email>tester@gentoo.org</email>
-  <name>Olivier Crête</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-auth/pam_keyring/pam_keyring-0.0.8.ebuild b/sys-auth/pam_keyring/pam_keyring-0.0.8.ebuild
deleted file mode 100644
index 386932959f80..000000000000
--- a/sys-auth/pam_keyring/pam_keyring-0.0.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_keyring/pam_keyring-0.0.8.ebuild,v 1.4 2006/11/11 19:38:16 tester Exp $
-
-inherit multilib eutils
-
-DESCRIPTION="Unlock GNOME keyring with login password"
-HOMEPAGE="http://www.hekanetworks.com/pam_keyring/"
-SRC_URI="http://www.hekanetworks.com/opensource/pam_keyring/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/pam
-	>=gnome-base/gnome-session-2.10
-	>=gnome-base/gnome-keyring-0.4.8"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-fixes.patch
-}
-
-src_compile() {
-	econf --libdir=/$(get_libdir) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "install failed"
-	rm -f ${D}/$(get_libdir)/security/*.{a,la}
-	dodoc AUTHORS ChangeLog README TODO
-	dodoc ${FILESDIR}/gdm.example
-}
-
-pkg_postinst() {
-	elog "There is a example of a /etc/pam.d/gdm with pam_keyring"
-	elog "at /usr/share/doc/${PF}/gdm.example.gz"
-}
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 8cf2e5c81e91..b749de4d28bb 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST pambase-20080219.1.tar.bz2 2160 RMD160 d111552f1cea10ed01cb001028071f90075aafd2 SHA1 6307681316a443f3e3faab4c78d27196b4358b2f SHA256 59c7e1ebccd9048b63a30ce97bf40b90385cf4ca3d48face6d0bfdf87d48319f
-EBUILD pambase-20080219.1.ebuild 1724 RMD160 df2fcb4fa2d5a631fcd6f131ad3c7c910753278c SHA1 0645673429765a14c5d33915cb1f82509776c8fa SHA256 92bce5360d6d7f43f0aae8d615646bd51d462f64ee7cf3ce0f1e29b138161a3a
-MISC ChangeLog 957 RMD160 da61c89a64cbc157d76856a15954799823af7888 SHA1 f867f3405a098b04041973a15b93d96b0f1ebc48 SHA256 4dcc7c032bf8506d0f6010bd31f9ac1de9548f286c746785cf1b0844abc168ec
+DIST pambase-20080221.tar.bz2 2244 RMD160 f0ae715e13bd7f8328363f739b0472a54a25cf5c SHA1 0269d2c08bad578cbe3be7c17715621944ede904 SHA256 5b031bf516bc09e555cce4d4c9ae2142d261bb15ad6b275605aea231251ad243
+EBUILD pambase-20080221.ebuild 2444 RMD160 bcfe6bb0cb9a0fcc2f476a80cf53d61b0507c7c2 SHA1 0ae4aa95e26dcdf058f401768326fe03c104245a SHA256 dce13ad8ef682ceaf2c376a2eae29be1329ca22317bd5fc6817fae565a4612a7
+MISC ChangeLog 1265 RMD160 4092bdd52037dab7d15e2e824c68de68a9c57211 SHA1 8492f6243ccbe1cc78542a8b46fe6c400c479789 SHA256 5123a794ac6d4d4abc13da929938b1b6858bfe48efaaf77ddf905780fc3cad69
 MISC metadata.xml 742 RMD160 569d0ba75cf556ac52d148ed651dea4251394d34 SHA1 aaf3382c617402b6369e889549d872d6bb15fc55 SHA256 60340b3104244aeb1f08d75284b5312d0c4b70d7851f70aafeb04464fba76581
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHu272AiZjviIA2XgRAug5AKDDNjU9eFsnWg2kBlNUEusQ5h4KaQCgoU9Y
-bqzUJWswecI8wmc9a/rv3P0=
-=Ce3w
+iD8DBQFHveB7AiZjviIA2XgRArZlAKDA5ytFy1idD9/Sk+WnYdVGZcL2twCgjUAd
+jhlKfrV0ynsDjwSqN5s+02M=
+=bUWV
 -----END PGP SIGNATURE-----