summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Phillips <rphillips@gentoo.org>2005-06-30 22:53:12 +0000
committerRyan Phillips <rphillips@gentoo.org>2005-06-30 22:53:12 +0000
commitcdf9e5508519a295a9d68971efd495ca0fac08aa (patch)
tree60a7e23ea3db5f66bac3387286d2341c0c9ff67a /app-crypt
parentStable on alpha, bug 96776. (diff)
downloadgentoo-2-cdf9e5508519a295a9d68971efd495ca0fac08aa.tar.gz
gentoo-2-cdf9e5508519a295a9d68971efd495ca0fac08aa.tar.bz2
gentoo-2-cdf9e5508519a295a9d68971efd495ca0fac08aa.zip
added Christophe Saout's patch for segfaults within chroots
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/pam_krb5/ChangeLog7
-rw-r--r--app-crypt/pam_krb5/Manifest15
-rw-r--r--app-crypt/pam_krb5/files/pam_krb5-20030601-defaultrealm.patch11
-rw-r--r--app-crypt/pam_krb5/pam_krb5-20030601-r1.ebuild5
4 files changed, 29 insertions, 9 deletions
diff --git a/app-crypt/pam_krb5/ChangeLog b/app-crypt/pam_krb5/ChangeLog
index b376640b5f10..57b7d55ec7c2 100644
--- a/app-crypt/pam_krb5/ChangeLog
+++ b/app-crypt/pam_krb5/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-crypt/pam_krb5
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pam_krb5/ChangeLog,v 1.14 2005/04/21 18:05:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pam_krb5/ChangeLog,v 1.15 2005/06/30 22:53:12 rphillips Exp $
+
+ 30 Jun 2005; <rphillips@gentoo.org>
+ +files/pam_krb5-20030601-defaultrealm.patch, pam_krb5-20030601-r1.ebuild:
+ Added Christophe Saout patch to fix segfaults when the default realm (like
+ chroot environments) cannot be found. #66919
21 Apr 2005; Simon Stelling <blubb@gentoo.org> pam_krb5-1.0-r1.ebuild:
stable on amd64
diff --git a/app-crypt/pam_krb5/Manifest b/app-crypt/pam_krb5/Manifest
index 290582d6acce..0a81f9c90950 100644
--- a/app-crypt/pam_krb5/Manifest
+++ b/app-crypt/pam_krb5/Manifest
@@ -1,12 +1,13 @@
-MD5 faf34a2f3b8c1acea5a3d8211f9b1aec ChangeLog 1839
-MD5 102803b67de61116a1fdc71371020afd metadata.xml 221
-MD5 cc034dd803bfb35c676a8bf3991cb2b9 pam_krb5-1.0-r1.ebuild 868
MD5 699f72ace0bdde43ba1eddd02287d3e5 pam_krb5-1.0.ebuild 761
-MD5 b595c7025516a2b4ff983c88d0831f06 pam_krb5-20030601-r1.ebuild 1385
+MD5 5c9fe49ace55c74f4ad75e178aa3edb4 pam_krb5-20030601-r1.ebuild 1444
+MD5 cc034dd803bfb35c676a8bf3991cb2b9 pam_krb5-1.0-r1.ebuild 868
MD5 a31f7e06a9e257379a69282272d41ac7 pam_krb5-20030601.ebuild 1428
-MD5 d4efdcb4a1be749ff6dde010e9dd9dc4 files/digest-pam_krb5-1.0 63
+MD5 faf34a2f3b8c1acea5a3d8211f9b1aec ChangeLog 1839
+MD5 102803b67de61116a1fdc71371020afd metadata.xml 221
+MD5 9e9b7dfbf4b5e17ef690ed51d576b944 files/pam_krb5-1.0-errno_h.patch 680
+MD5 607c031de2b5895628efb020f8d63b95 files/pam_krb5-20030601-defaultrealm.patch 548
MD5 d4efdcb4a1be749ff6dde010e9dd9dc4 files/digest-pam_krb5-1.0-r1 63
+MD5 d4efdcb4a1be749ff6dde010e9dd9dc4 files/digest-pam_krb5-1.0 63
+MD5 9d71d4c20b07cdd282e489cb8cd045d8 files/pam_krb5-1.0-gentoo.diff 695
MD5 af4b553272c02dec5d66ca2c7da9920c files/digest-pam_krb5-20030601 76
MD5 af4b553272c02dec5d66ca2c7da9920c files/digest-pam_krb5-20030601-r1 76
-MD5 9e9b7dfbf4b5e17ef690ed51d576b944 files/pam_krb5-1.0-errno_h.patch 680
-MD5 9d71d4c20b07cdd282e489cb8cd045d8 files/pam_krb5-1.0-gentoo.diff 695
diff --git a/app-crypt/pam_krb5/files/pam_krb5-20030601-defaultrealm.patch b/app-crypt/pam_krb5/files/pam_krb5-20030601-defaultrealm.patch
new file mode 100644
index 000000000000..ac57c6d19aa4
--- /dev/null
+++ b/app-crypt/pam_krb5/files/pam_krb5-20030601-defaultrealm.patch
@@ -0,0 +1,11 @@
+diff -Nur pam_krb5_snap-2003.06.01.orig/pam_krb5afs.c pam_krb5_snap-2003.06.01/pam_krb5afs.c
+--- pam_krb5_snap-2003.06.01.orig/pam_krb5afs.c 2003-06-01 23:42:45.000000000 +0200
++++ pam_krb5_snap-2003.06.01/pam_krb5afs.c 2004-10-09 22:31:22.134322249 +0200
+@@ -1089,6 +1089,7 @@
+ ret->retain_token, &ret->retain_token);
+
+ /* The default realm we assume users are in unless told otherwise. */
++ ret->realm = "";
+ krb5_get_default_realm(context, &ret->realm);
+ appdefault_string(context, "realm", argc, argv,
+ ret->realm, &ret->realm);
diff --git a/app-crypt/pam_krb5/pam_krb5-20030601-r1.ebuild b/app-crypt/pam_krb5/pam_krb5-20030601-r1.ebuild
index 24e96633b85b..b3ee291c1d5e 100644
--- a/app-crypt/pam_krb5/pam_krb5-20030601-r1.ebuild
+++ b/app-crypt/pam_krb5/pam_krb5-20030601-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pam_krb5/pam_krb5-20030601-r1.ebuild,v 1.1 2005/01/28 20:13:13 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pam_krb5/pam_krb5-20030601-r1.ebuild,v 1.2 2005/06/30 22:53:12 rphillips Exp $
inherit eutils
@@ -25,6 +25,9 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
src_unpack() {
unpack ${A}
+
+ # bug #66919
+ epatch ${FILESDIR}/${P}-defaultrealm.patch
}
src_compile() {