summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2004-09-23 11:16:28 +0000
committerTavis Ormandy <taviso@gentoo.org>2004-09-23 11:16:28 +0000
commit15a2879f58b459b510eac838d72dfa10b7f89844 (patch)
tree979deefa48fca0651024a4e8868c3b11897984c2 /app-admin/skey
parentdo not include /etc/skey/skeykeys in the package, as quickpkg may package per... (diff)
downloadhistorical-15a2879f58b459b510eac838d72dfa10b7f89844.tar.gz
historical-15a2879f58b459b510eac838d72dfa10b7f89844.tar.bz2
historical-15a2879f58b459b510eac838d72dfa10b7f89844.zip
skeyprune regex for matching zeroed entries was case sensitive, meaning it missed legitimate entries. fixed. #64971, skeyinit man page claims md4 is the default hash algorithm, this is no longer the case. fixed.
Diffstat (limited to 'app-admin/skey')
-rw-r--r--app-admin/skey/ChangeLog8
-rw-r--r--app-admin/skey/Manifest4
-rw-r--r--app-admin/skey/skey-1.1.5-r4.ebuild9
3 files changed, 17 insertions, 4 deletions
diff --git a/app-admin/skey/ChangeLog b/app-admin/skey/ChangeLog
index 70650f15b44e..3ea4ff9a2431 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.23 2004/09/23 10:22:21 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.24 2004/09/23 11:16:28 taviso Exp $
+
+ 23 Sep 2004; Tavis Ormandy <taviso@gentoo.org> skey-1.1.5-r4.ebuild:
+ skeyprune regex for matching zeroed entries was case sensitive, meaning it
+ missed legitimate entries. fixed. #64971, skeyinit man page claims md4 is the
+ default hash algorithm, this is no longer the case. fixed.
+ Thanks to Ulrich Mueller for his help with the skey package.
*skey-1.1.5-r4 (23 Sep 2004)
diff --git a/app-admin/skey/Manifest b/app-admin/skey/Manifest
index e04a6cdb00b3..7a07a3e7488c 100644
--- a/app-admin/skey/Manifest
+++ b/app-admin/skey/Manifest
@@ -1,9 +1,9 @@
-MD5 f696f2d85a7c6050e461345b9f5130c8 skey-1.1.5-r4.ebuild 2517
+MD5 1690c5239d625330b3da6d8f2a7aecf0 skey-1.1.5-r4.ebuild 2824
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 ad01ef02795ecb5f7a6b1fccb1ac9490 ChangeLog 3234
+MD5 05f938b7c7984a965ef4361f872794bd ChangeLog 3587
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
diff --git a/app-admin/skey/skey-1.1.5-r4.ebuild b/app-admin/skey/skey-1.1.5-r4.ebuild
index 0ea949395c42..54e584223028 100644
--- a/app-admin/skey/skey-1.1.5-r4.ebuild
+++ b/app-admin/skey/skey-1.1.5-r4.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/skey-1.1.5-r4.ebuild,v 1.2 2004/09/23 11:16:28 taviso Exp $
inherit flag-o-matic ccc eutils
@@ -46,6 +46,13 @@ src_compile() {
# skeyprune wont honour @sysconfdir@
sed -i 's#/etc/skeykeys#/etc/skey/skeykeys#g' skeyprune.pl skeyprune.8
+ # skeyprune uses a case sensitive regex to check for zeroed entries
+ sed -i 's#\(if ( ! /.*/\)#\1i#g' skeyprune.pl
+
+ # skeyinit(1) describes md4 as the default hash algorithm, which
+ # is no longer the case. #64971
+ sed -i 's#\(md4\) \((the default)\), \(md5\) or \(sha1.\)#\1, \3 \2 or \4#g' skeyinit.1
+
econf --sysconfdir=/etc/skey || die
emake || die
}