do not include /etc/skey/skeykeys in the package, as quickpkg may package personal files. This also fixes the etc-update issue with #64974.

4 files changed, 105 insertions, 18 deletions

diff --git a/app-admin/skey/ChangeLog b/app-admin/skey/ChangeLog
index 7234b885443c..70650f15b44e 100644
--- a/app-admin/skey/ChangeLog
+++ b/app-admin/skey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/skey
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.22 2004/09/19 03:24:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.23 2004/09/23 10:22:21 taviso Exp $
+
+*skey-1.1.5-r4 (23 Sep 2004)
+
+  23 Sep 2004; Tavis Ormandy <taviso@gentoo.org> +skey-1.1.5-r4.ebuild:
+  do not include /etc/skey/skeykeys in the package, as quickpkg may package 
+  personal files. This also fixes the etc-update issue with #64974.
 
   18 Sep 2004; Joshua Kinard <kumba@gentoo.org> skey-1.1.5-r3.ebuild:
   Marked stable on mips.
diff --git a/app-admin/skey/Manifest b/app-admin/skey/Manifest
index 35470557afff..e04a6cdb00b3 100644
--- a/app-admin/skey/Manifest
+++ b/app-admin/skey/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 72f003aca37af78bb9e23c393ceb6645 ChangeLog 2985
-MD5 fb946a077c4e2ae03befc41f3a095b39 metadata.xml 1425
+MD5 f696f2d85a7c6050e461345b9f5130c8 skey-1.1.5-r4.ebuild 2517
 MD5 72cc897e65fb378c9fb62b35c2c3a95a skey-1.1.5-r1.ebuild 2479
+MD5 9eef830d442da8aae38f0242283be14e skey-1.1.5-r3.ebuild 2268
 MD5 f0da1a5ab53e7a824dcdd7ec8c477a17 skey-1.1.5.ebuild 1861
 MD5 d29e6c070ee4387403d3901ceb18f4f8 skey-1.1.5-r2.ebuild 2101
-MD5 9eef830d442da8aae38f0242283be14e skey-1.1.5-r3.ebuild 2268
-MD5 bc72b21ce3e5fcbcb1e728c0cc55702a files/digest-skey-1.1.5 117
-MD5 b643729f459d2fd7dba814e88bab8f92 files/digest-skey-1.1.5-r1 117
-MD5 391bb645d15da426828492d5add5dc9b files/skey-1.1.5-gentoo.diff.gz 37615
-MD5 2bc2fd632a13d33a3832ec3bf2449c1b files/skey-login_name_max.diff 386
+MD5 ad01ef02795ecb5f7a6b1fccb1ac9490 ChangeLog 3234
+MD5 fb946a077c4e2ae03befc41f3a095b39 metadata.xml 1425
 MD5 ab3f803b5ad68dc89dfb5b544342b403 files/skey-1.1.5-fPIC.patch 271
+MD5 391bb645d15da426828492d5add5dc9b files/skey-1.1.5-gentoo.diff.gz 37615
+MD5 b643729f459d2fd7dba814e88bab8f92 files/digest-skey-1.1.5-r1 117
 MD5 c402251257567c1f0321c9c426144ced files/digest-skey-1.1.5-r2 62
 MD5 c402251257567c1f0321c9c426144ced files/digest-skey-1.1.5-r3 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBUkffHTu7gpaalycRAnnFAKCo+yr0AfmCXMydLQ4rbJE9jbXDYACfT5kC
-/qVi5/v5O10Gl2PiFsZHpLQ=
-=lkDn
------END PGP SIGNATURE-----
+MD5 c402251257567c1f0321c9c426144ced files/digest-skey-1.1.5-r4 62
+MD5 bc72b21ce3e5fcbcb1e728c0cc55702a files/digest-skey-1.1.5 117
+MD5 2bc2fd632a13d33a3832ec3bf2449c1b files/skey-login_name_max.diff 386
diff --git a/app-admin/skey/files/digest-skey-1.1.5-r4 b/app-admin/skey/files/digest-skey-1.1.5-r4
new file mode 100644
index 000000000000..2c986e527d5d
--- /dev/null
+++ b/app-admin/skey/files/digest-skey-1.1.5-r4
@@ -0,0 +1 @@
+MD5 af816298e3a0bc722380d0fe480189d9 skey-1.1.5.tar.bz2 61911
diff --git a/app-admin/skey/skey-1.1.5-r4.ebuild b/app-admin/skey/skey-1.1.5-r4.ebuild
new file mode 100644
index 000000000000..0ea949395c42
--- /dev/null
+++ b/app-admin/skey/skey-1.1.5-r4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/skey-1.1.5-r4.ebuild,v 1.1 2004/09/23 10:22:21 taviso Exp $
+
+inherit flag-o-matic ccc eutils
+
+DESCRIPTION="Linux Port of OpenBSD Single-key Password System"
+HOMEPAGE="http://www.sparc.spb.su/solaris/skey/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD X11"
+SLOT="0"
+KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/cracklib
+	sys-apps/shadow
+	dev-lang/perl
+	virtual/libc"
+# XXX: skeyaudit requires mailx.
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	# porting some updates to this skey implementation from the
+	# NetBSD project, some other updates and fixes, and the addition
+	# of some new features like shadow password and cracklib support.
+	# 	(05 Nov 2003) -taviso@gentoo.org
+	epatch ${FILESDIR}/skey-1.1.5-gentoo.diff.gz
+
+	# glibc 2.2.x does not define LOGIN_NAME_MAX #33315
+	# 	(12 Nov 2003) -taviso@gentoo.org
+	epatch ${FILESDIR}/skey-login_name_max.diff
+
+	epatch ${FILESDIR}/${P}-fPIC.patch
+
+	# set the default hash function to md5, #63995
+	# 	(14 Sep 2004) -taviso
+	append-flags -DSKEY_HASH_DEFAULT=1
+
+	# avoid suid related security issues.
+	append-ldflags -Wl,-z,now
+}
+
+src_compile() {
+	# skeyprune wont honour @sysconfdir@
+	sed -i 's#/etc/skeykeys#/etc/skey/skeykeys#g' skeyprune.pl skeyprune.8
+
+	econf --sysconfdir=/etc/skey || die
+	emake || die
+}
+
+src_install() {
+	doman skey.1 skeyaudit.1 skeyinfo.1 skeyinit.1 skeyprune.8
+	dobin skey skeyinit skeyinfo || die
+	newbin skeyprune.pl skeyprune
+	newbin skeyaudit.sh skeyaudit
+	dolib.a libskey.a
+	dolib.so libskey.so.1.1.5 libskey.so.1.1 libskey.so.1 libskey.so
+
+	insinto /usr/include
+	doins skey.h
+
+	dodir /etc/skey
+
+	# only root needs to have access to these files.
+	fperms g-rx,o-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
+
+	dodoc README CHANGES md4.copyright md5.copyright
+
+	prepallman
+}
+
+pkg_postinst() {
+	# do not include /etc/skey/skeykeys in the package, as quickpkg
+	# may package personal files.
+	# This also fixes the etc-update issue with #64974.
+	touch /etc/skey/skeykeys && chmod 0600 /etc/skey/skeykeys || {
+		ewarn "Please verify the permissions of /etc/skey/skeykeys are 0600."
+	}
+
+	einfo "For an instroduction into using s/key authentication, take"
+	einfo "a look at the EXAMPLES section from the skey(1) manpage."
+}