Fix compile failure with perl-5.22.0, bug 553148. Fix issue with missing timelocal.pl in skeyprune script.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 103 insertions, 17 deletions

diff --git a/sys-auth/skey/ChangeLog b/sys-auth/skey/ChangeLog
index b7b044f71dfb..ea96baac03d4 100644
--- a/sys-auth/skey/ChangeLog
+++ b/sys-auth/skey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/skey
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/ChangeLog,v 1.27 2014/01/19 20:08:26 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/ChangeLog,v 1.28 2015/06/25 21:40:09 ulm Exp $
+
+*skey-1.1.5-r9 (25 Jun 2015)
+
+  25 Jun 2015; Ulrich Müller <ulm@gentoo.org> +skey-1.1.5-r9.ebuild:
+  Fix compile failure with perl-5.22.0, bug 553148. Fix issue with missing
+  timelocal.pl in skeyprune script.
 
   19 Jan 2014; Mike Frysinger <vapier@gentoo.org> skey-1.1.5-r8.ebuild:
   Add arm64 love.
diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index 7ece9ce3cc35..50ddc7878c4a 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST skey-1.1.5-patches-2.tar.xz 32836 SHA256 e55ea1250b2608b8f145f6de5bc62aee7ad1d98634a9a72ef8614e286d9f802c SHA512 666e44206864a195d78870365c1ce1854326b47bddbcfdb9cafc776d283a3d40cd5cb60a353f90ffb06466e473c36a4aadfbcc8fc250d8e4a2ec36daef72ee21 WHIRLPOOL 3d938ef3144316ffb793265d51ce3e1af12616c7e81536745318207d43bcef83f36c69ede37a30274cf1fb04abfcf31f0e6098fd761c84bf5ee032f5b5512540
+DIST skey-1.1.5-patches-3.tar.xz 33604 SHA256 adabe7b286f586d2cbe1a4b15f71310b7d8e25fc3187f8a89071359d7975badf SHA512 dcef6837e563ce3f68fe4eed35f16db1636e1798219dba95c86db505b5f67034b44bc6d02e0125faa95db8a5c39e9615bfed2dc3105905e576d96cf32016bc2f WHIRLPOOL bff241ecf0f59dae810db300bd858f76e18153f1958f2154c538f42040cc1040f049442d697767cfa7346996931d81370c2551d752c52810c9b18fe9e351c212
 DIST skey-1.1.5.tar.bz2 61911 SHA256 e21bcb7c618c0bc87a72d8f0f097d7517fffa4e881a0f295ee1ce2a7dccf4aef SHA512 4cbddc7e31134d5e23801a9b07de0d05c8357aaa8dddfb8426fceead3f54e539f77204f78a08b2a93890ef2f4f807a2208080f58f80818afa1b8cd4884b1fb37 WHIRLPOOL abf141fd679deeaee3f3883cd3076620c84e8775ecacc8f87d561c1812beae55299989f37ec331633bac29e25b4b8d145dc590ef119c73a137d8790815bb13f2
 EBUILD skey-1.1.5-r8.ebuild 2011 SHA256 6c1b6bbae66367981bd497ebfdde669cc888c82c77d2a0d1b8e46f77bc7c5365 SHA512 cd080c0e3963165823e6160b851a018bc5a5290013277ecd2fade536a48f224843b8dcc25ce30cb1f2cc0ac4c139e4162bf60e6896089760ebab390fead76f68 WHIRLPOOL c843a573deb45f0d8f5f5e44ec14083a6b3f3ebfff2b69b5c29a4c5225ea7acc0ada524cd2dc5f27c9a563f82ec83450c32d42a56cc0663d173282fcbd753c39
-MISC ChangeLog 10516 SHA256 983131aa1264fc47bc128ff9b2aedf3c791078c8fd426367f3627e2d7c1fe8fe SHA512 1e3ad89af1f5591e472877a8e22ed6a19df7bd121bc51e216c756f54649041d10baf28ae64e4e2fa42e4d407dca2a4328eca5e56dc08a5cbb826bff409e30b7b WHIRLPOOL e45f559962ba8cdc87716ea2717e0a37630606df8757e9e9a8666bddce2208982a92ee452c957c122193513471e6f37f3fcfed3c1260717f7df6ab2bfc85a899
+EBUILD skey-1.1.5-r9.ebuild 2041 SHA256 e0bbc6e7e2d3b11a3b0ec3314ccb8bc590e8497ceac55062ca8399ff164385c4 SHA512 4dd9e5451fab384b4863ac9556b1e79f16f844fb96c3ddff2002bf1fc0a374568b7a225187f6581ce3bf302d8eb3a3ac2ec593c6d40cd03bcd4ce0f1fd5a8894 WHIRLPOOL 09f66c7aec1e060119b788f7525599c199313624aad77692dbadae78e5bb3959c7337cc71b3c83c1bc419a81b1286cfd9a61d94db3a99d4276d0b69fab6abc2a
+MISC ChangeLog 10725 SHA256 d26e0a6954e44752393e25e4a75753951f8249be6e4a5c0a13fb1ad22ef55874 SHA512 3981a329187ebce5285c9abadd635130a0e3ed43d5239505c633986e5159c985b06b626ef99ea72f04ec0c11e38b730cce63f38aef970332cf8ac26c971984b6 WHIRLPOOL 1d8b010c498abbc42bd6c917aaebfdec809b6cc2dbe0c9ac18f21e6a5653a41c96d172fa14810326d6c95a53b434b62bbeb21d0c74a570d09487e9cdf9acd7e8
 MISC metadata.xml 1418 SHA256 786262fdf7d44c395db41d8d273aa75a4aa390abd30348a2fa835e7a8eb64ffc SHA512 e1d9008e9ebf868ecd9d45704c4ae2c907e35550cbbc96ce9a757f90e80f6881bd7a4a26355fdc2fed2ae487dd6557e18c5426654e5373dea1863c379875a2b1 WHIRLPOOL 2783acc5a7b3f0361279dffe3a8fc8ec23afb97af5a2b30208e0ea1642a8cbb00282def5d25f358616f478c04ffcef37393ddecac0cafc8edb9f54606f62b974
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS3DC/AAoJEPGu1DbS6WIAsLwP/jqqzeus5CvTS53uJ8MHybkp
-/ToVrixYmyyq1vpMRVZrAXzEBDVD/L0W1mB74XJP8o2+eisDrrFbdq26flMOc4ka
-ZXOBQZUD0tCDessx1pWgJCvD3MpcaTHXnTpPLfiIwrTle/C6ulQjZRgnhPqa4VJZ
-57R8s9Wbv1yS2lJSxXbirqR6yzchaxLUHgRv47Pp06Dy2hFhQffPCduCWlprEZux
-7DaCAYY8RrPldhglTcASDdLVAaDq22kBjRjQQ75NtdwXTwlx2mdY6OIhAPO3y6Py
-6GYUoNLarl44IDWOgE86uk2MBrVDs8wfDORdNuD1Wc/QiOtzpxa4nGLen2MCjOkW
-Ny1AF3ysz0yoXEBuTZNY5ipDwIiFodpb6k1+k+apu71yE3qDS6ALxlL4p6/3iquh
-WZUigWCdW8dqATnTZmTwutFcXEJ+mvmWohEzhl5m9VzPzWQLv5vxmAfY4KjQvQfz
-LalBf3iMIMeUyhS1B2gx/YMZjkQ6hgQclPo4AgQEfTwJ64c5GvZmIlAnnJjKJrAh
-wAqLFsmpmnvM7Q6WGanRkp1KQTZ+zRcczKJXUP3NotBL3lq8724YFA0M3/v03hbr
-5qJH5d6iyKsvkmHLUu4Miw/ncnUPf+8RGNZRTDOXUCTEF7CoGElvy4L+QGBtDmB6
-ofVUcM5sTbX4tHTTeXLm
-=ANdS
+iQGcBAEBCAAGBQJVjHU6AAoJEJQzkH1pP7W4CrcL/0IB3YEKBicyCzZ2q2FBwTfA
+59EwpeM0hyV+VBrV20wDsL26FJoRFjJV9mL8ljYSmHLeAKDjmGmeHc2zIkdWIRGN
+muZgOQq0hICKL8DVVTj1MVwW2Be6Pdx546eZoP0JdZVNnLu9MdibIP9/or/kp0ru
+3vCpeJIc6/dEHcGWnV8hN3OsgZsLxWs3gHSSPiRxKKdBMvO6VseHY2CqbGhHrh5T
+WuEzezuljTdM1ovm2U7NK8avlAl5V42maP4LIO9eEEekzrcYjPZJrB3RGp7uRggQ
+C94EgzRJYIq+JK8HWfGYw/klwT289NcW8NOtjVjZlmgJvC5LDWSEgWHNfi1gvols
+CafV+/ZCM5ITr/e7TLio7xyr77ivFvEPHNP+CtkJ3JVG3IjvzJoBFgRO97qZ2SU/
+0DVAAGvB9D9LmVwckKSs7z4OzmTIuMkKrHlt+MLl6PTizInBrzsVeM6dBtKu1O46
+bdmwSIouRD5k36pClV0LEfJhtCcVw2PEbaou0mOohw==
+=Kv8w
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/skey/skey-1.1.5-r9.ebuild b/sys-auth/skey/skey-1.1.5-r9.ebuild
new file mode 100644
index 000000000000..ce54287be658
--- /dev/null
+++ b/sys-auth/skey/skey-1.1.5-r9.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 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-r9.ebuild,v 1.1 2015/06/25 21:40:09 ulm Exp $
+
+EAPI=5
+
+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
+	http://dev.gentoo.org/~ulm/distfiles/${P}-patches-3.tar.xz"
+
+LICENSE="BSD MIT RSA BEER-WARE"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="dev-lang/perl
+	app-arch/xz-utils"
+RDEPEND="dev-lang/perl
+	sys-libs/cracklib"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+}
+
+src_configure() {
+	tc-export CC
+	econf --sysconfdir=/etc/skey
+}
+
+src_install() {
+	into /
+	dolib.so libskey.so{.${PV},.${PV%.*},.${PV%%.*},}
+
+	into /usr
+	dobin skey skeyinit skeyinfo
+	newbin skeyaudit.sh skeyaudit
+	newsbin skeyprune.pl skeyprune
+
+	dosym skey /usr/bin/otp-md4
+	dosym skey /usr/bin/otp-md5
+	dosym skey /usr/bin/otp-sha1
+
+	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
+
+	insinto /usr/include
+	doins skey.h
+
+	keepdir /etc/skey
+
+	# only root needs to have access to these files.
+	fperms go-rx /etc/skey
+
+	# skeyinit and skeyinfo must be suid root so users
+	# can generate their passwords.
+	fperms u+s,go-r /usr/bin/skeyinit /usr/bin/skeyinfo
+
+	dodoc README CHANGES
+}
+
+pkg_postinst() {
+	# do not include /etc/skey/skeykeys in the package, as quickpkg
+	# may package sensitive information.
+	# This also fixes the etc-update issue with #64974.
+
+	# skeyinit will not function if this file is not present.
+	touch /etc/skey/skeykeys
+
+	# these permissions are applied by the skey system if missing.
+	chmod 0600 /etc/skey/skeykeys
+
+	elog "For an introduction into using s/key authentication, take"
+	elog "a look at the EXAMPLES section from the skey(1) manpage."
+}