From 87c2258c76d2c7839cca583ac53acb12cfcb4fcc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Thu, 5 Jan 2012 18:47:48 +0000
Subject: [PATCH] New patchset with skeyinfo.c and skey.3 updated from newer
 NetBSD version. Call gen_usr_ldscript only with USE=static-libs.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
---
 sys-auth/skey/ChangeLog            |  6 +++++-
 sys-auth/skey/Manifest             | 32 +++++++++++++++---------------
 sys-auth/skey/skey-1.1.5-r8.ebuild | 21 +++++++++++---------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/sys-auth/skey/ChangeLog b/sys-auth/skey/ChangeLog
index 7028d6588a97..c81a9019b8a3 100644
--- a/sys-auth/skey/ChangeLog
+++ b/sys-auth/skey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/skey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/ChangeLog,v 1.15 2012/01/04 23:12:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/ChangeLog,v 1.16 2012/01/05 18:47:48 ulm Exp $
+
+  05 Jan 2012; Ulrich Mueller <ulm@gentoo.org> skey-1.1.5-r8.ebuild:
+  New patchset with skeyinfo.c and skey.3 updated from newer NetBSD version.
+  Call gen_usr_ldscript only with USE=static-libs.
 
 *skey-1.1.5-r8 (04 Jan 2012)
 
diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index baf73fe150fe..4840d7362308 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -7,26 +7,26 @@ AUX skey-1.1.5-fPIC.patch 271 RMD160 11ba3e2eb2e8407c5e995f0ab102b08765f6b4ba SH
 AUX skey-1.1.5-otp.diff 1437 RMD160 1b8b362e7c31161e3c88730f74b941b83bbba165 SHA1 be2a685faa723662c2df6232eca36547f9463765 SHA256 b8391d0310e5d22ca303ddd13ecdb306b036bc4622e496c516c0c7b54f4540a4
 AUX skey-login_name_max.diff 386 RMD160 44bc80938601c1140658d5ed343bad982e1c6ca4 SHA1 8510f9dcaec2952347da4933f22984d9d816b27b SHA256 d6652f9ba5cc358108ddfaa2f9dd7093e02a1adba4e360a1e6ad1a42a415a0dd
 DIST skey-1.1.5-gentoo.diff.gz 37614 RMD160 997002ac7e2481ec5158db3b2c7280bc80d5c95b SHA1 ea2611abefdd4a13621478a09f5771fc83ab58b6 SHA256 1f4cb9d403c2cd054a451f4d790cbeac68d31f11d0df1588c2bfb769137444a2
-DIST skey-1.1.5-patches-1.tar.xz 33332 RMD160 6ca048bd88317adce32133a14a7ec361426d4922 SHA1 31e9d78cd47c50217ad2fea7a949a4eca967f3cc SHA256 254927db4060c5e7fd0d863777f936f360f921647aeab620dcca675af536f865
+DIST skey-1.1.5-patches-2.tar.xz 32836 RMD160 a3177eecfae3cb7957a1987c12cd84f79b5c286f SHA1 008299287844313f4ce94ae9fc371cc186839393 SHA256 e55ea1250b2608b8f145f6de5bc62aee7ad1d98634a9a72ef8614e286d9f802c
 DIST skey-1.1.5.tar.bz2 61911 RMD160 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d SHA1 d55fb286098900cdf3eb6b174a720a06c722312a SHA256 e21bcb7c618c0bc87a72d8f0f097d7517fffa4e881a0f295ee1ce2a7dccf4aef
 EBUILD skey-1.1.5-r7.ebuild 3450 RMD160 d9be7678c1b210010e083839949b7546f621d2e6 SHA1 08c08b834799a586b81621d7273be33beea09986 SHA256 a70f51ed959b1e922988736d81f85f685d92381c379b9040bdfa5511e11a67d5
-EBUILD skey-1.1.5-r8.ebuild 2026 RMD160 b161c85d105eeb248bb59c19912ddbad7ca2c65b SHA1 c9ac3935c92c527c4ae75e41e9d52fbd61744da9 SHA256 8e47626e721a76da0f1c6af540663bd6dde2476088db1112a1c32198900f0181
-MISC ChangeLog 8971 RMD160 9e3295b7c3c66ad6013ea2d47ca44aad6454ccd8 SHA1 bfec2bf2a79881032f3046230a98630d8da1fb1a SHA256 f7baaa320fc50df64b228a624724bce54ffd9651e8b394fc6ccaf236205f3fdc
+EBUILD skey-1.1.5-r8.ebuild 2031 RMD160 e0a61e01fabbe7f7d17a09dda6e5614c0fcaaafe SHA1 2d40ad179f982f26a32dfd65bb8b39e613aab997 SHA256 234890c7a2a60d597f2bcd0d7b6c664f4630f91468c37a67089633a33d37d93a
+MISC ChangeLog 9169 RMD160 22126a6a511c193a1f0c50891ea53c385db34a02 SHA1 f3b539b8b7b2d176933d98d91104bb370133be85 SHA256 caedef953da64471a81b99045c4a07fd231ffbd0e89c6f325c489820eea140d4
 MISC metadata.xml 1418 RMD160 5605591bbf305bca751eebb06b39d756861d5adf SHA1 4a266d05c47fbbaf1ce76245a15d5ef3b9840e50 SHA256 786262fdf7d44c395db41d8d273aa75a4aa390abd30348a2fa835e7a8eb64ffc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPBN9JAAoJEDxpGckxwJCBbGwQAJ/1juvF6XQRsyyLBJaHNHPf
-5cfrz0HIcC9e6O5QJfUBwyfh2AbM3kVFQWPb+Rb48Id+ejv4QDeMZ87Em1SyNnHX
-tm7udURmwONfaQHCy5eGHwBj3A28XKLk4Z244nNFtE4Ypyx9V9j6dL1c3YIdIGP0
-Iufd9kn/4jpXoecV+gxp7shhxBeTEcosSmqwZUrxLc3kN9IXu1bbohgOmLDlXq1Y
-j/tk2+MgNiessBStTVBilCODLhsAwcbZRWoti9tN9INa0xqtpcXVw23JVXmtZZLV
-dScxTBOWZK5eFPWuC5vC0kOFNTC+ooBlYZo52ttfHr87JnqD0Dm0g7VSZha2oTPr
-xy8FlHqHiajlWDelDjAAf0BnB0j/u6lv4KATLOa+Dx/pa0inv68zsFJYdmIDNkdL
-PSdWetlpKBd/RgZkqGE/g+1omdKE48Go00uvivO5BBZbR2Y/X2rJGUFwaAY2xLSW
-YZDuXiATH86Eo30hYbmTUeITvISnvgFGT8W03f7jojuDexbbuekgPoMi4kdjkvik
-NGLsX3uedWe80VGhEdiw1sISX9PIS4hzK4nFIQcvoc8jJmULfRlxGsvcdmgDQctB
-bX2dy70Kjh3fUeZJ9wM7l32oq2ifMNX+Z0tJHnfV/26ynJGsHgP2HdHlwpyoEpP1
-5uOIGsK34w4cFPRQB7aK
-=Ycym
+iQIcBAEBAgAGBQJPBfBaAAoJEDxpGckxwJCBJBwQAIYwxNjz7p3soi9sxedYpkr3
+4pQABKK3fozomGQZkNQ2JU5yG2jw8rSifMbficWkysoMVsfKGzyYe/QNEBqijJoQ
+UOqVmASKVz4A6iNquhoVnjxFDoS8UT9c9W+PDm8lHTmfQFzMQjMOt8yv/S+mP2NW
+YHIm10zHUKy+l7hF4rSEJ+X29jhyu+d85BHbOU6veQfoG9IhCfU0VrGGK+UVQLn7
+1HJoYE6I71E1aVJ3843hrCB7XpbLf+2bCpB/1kKpNWmDRO9/EIl1iPLAXr5Xah32
+Y6af7mxKHI7U1GbhxULEpPrkLSKwiNUo2o+GCuforHvDdlnB/oCHh+Xlmq9DCLkG
+yXYXHOUjJl0rorwABJwIbMZYi/6503LVupzLTLisJGkWbtMMp2UGrT2OQM/EeUr8
+HjHJDMJti5iZjhTWtKEUP6cHXoQwiIrg6sYhdQQeGymRUgdkz/mx3kYJ7thH/N24
+Ags0fzvAMz6vgBF0l8/VZQQIFxif5t7cBWc6oJS+YP8lj+4Lti2Kf9pCbtbMsmnW
+dv4pjxB0weKVqkzQmJ7ZnibqEdfonnP30ghtHrQAOjSgDKX0cqJP0SkHIT6ShwBt
+xuQyoA957GS0HqXtDhHYzP8kLzPC7TXwXBE+u/KBssyq4/eHuNVjM+2+niq0gIlb
+vd9//QqRImTb3G3i4a5U
+=I9in
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/skey/skey-1.1.5-r8.ebuild b/sys-auth/skey/skey-1.1.5-r8.ebuild
index 974b596dd255..cf86d931a84c 100644
--- a/sys-auth/skey/skey-1.1.5-r8.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r8.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/sys-auth/skey/skey-1.1.5-r8.ebuild,v 1.1 2012/01/04 23:12:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/skey-1.1.5-r8.ebuild,v 1.2 2012/01/05 18:47:48 ulm Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit flag-o-matic eutils toolchain-funcs
 DESCRIPTION="Linux Port of OpenBSD Single-key Password System"
 HOMEPAGE="http://www.openbsd.org/faq/faq8.html#SKey"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/skey-1.1.5-patches-1.tar.xz"
+	mirror://gentoo/skey-1.1.5-patches-2.tar.xz"
 
 LICENSE="BSD MIT RSA-MD4 RSA-MD5 BEER-WARE"
 SLOT="0"
@@ -31,6 +31,10 @@ src_configure() {
 }
 
 src_install() {
+	into /
+	dolib.so libskey.so{.${PV},.${PV%.*},.${PV%%.*},}
+
+	into /usr
 	dobin skey skeyinit skeyinfo
 	newbin skeyaudit.sh skeyaudit
 	newsbin skeyprune.pl skeyprune
@@ -39,25 +43,24 @@ src_install() {
 	dosym skey /usr/bin/otp-md5
 	dosym skey /usr/bin/otp-sha1
 
-	use static-libs && dolib.a libskey.a
+	if use static-libs; then
+		dolib.a libskey.a
+		gen_usr_ldscript libskey.so
+	fi
 
 	doman skey.1 skeyaudit.1 skeyinfo.1 skeyinit.1 skey.3 skeyprune.8
 
-	into /
-	dolib.so libskey.so.1.1.5 libskey.so.1.1 libskey.so.1 libskey.so
-	gen_usr_ldscript libskey.so
-
 	insinto /usr/include
 	doins skey.h
 
 	keepdir /etc/skey
 
 	# only root needs to have access to these files.
-	fperms g-rx,o-rx /etc/skey
+	fperms go-rx /etc/skey
 
 	# skeyinit and skeyinfo must be suid root so users
 	# can generate their passwords.
-	fperms u+s,og-r /usr/bin/skeyinit /usr/bin/skeyinfo
+	fperms u+s,go-r /usr/bin/skeyinit /usr/bin/skeyinfo
 
 	dodoc README CHANGES
 }
-- 
2.26.2