summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2007-11-24 22:38:11 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2007-11-24 22:38:11 +0000
commit4069c741f00470164486c99f19237e3aa1aff5da (patch)
treef2d7849e10b5f0d990a75de1b89012e2022da249 /app-crypt/trousers
parentMarking gail-1.20.1 ppc stable for bug 199740 (diff)
downloadgentoo-2-4069c741f00470164486c99f19237e3aa1aff5da.tar.gz
gentoo-2-4069c741f00470164486c99f19237e3aa1aff5da.tar.bz2
gentoo-2-4069c741f00470164486c99f19237e3aa1aff5da.zip
Fix 64bit issue, bug#200218, thanks to dev-zero
(Portage version: 2.1.3.19)
Diffstat (limited to 'app-crypt/trousers')
-rw-r--r--app-crypt/trousers/ChangeLog6
-rw-r--r--app-crypt/trousers/files/trousers-0.3.1-qa.patch12
-rw-r--r--app-crypt/trousers/trousers-0.3.1.ebuild5
3 files changed, 21 insertions, 2 deletions
diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 221c720d5aac..f4393a3e203c 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/trousers
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.15 2007/11/10 12:59:17 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.16 2007/11/24 22:38:10 alonbl Exp $
+
+ 24 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+ +files/trousers-0.3.1-qa.patch, trousers-0.3.1.ebuild:
+ Fix 64bit issue, bug#200218, thanks to dev-zero
*trousers-0.3.1 (10 Nov 2007)
diff --git a/app-crypt/trousers/files/trousers-0.3.1-qa.patch b/app-crypt/trousers/files/trousers-0.3.1-qa.patch
new file mode 100644
index 000000000000..5de41eefda4d
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.1-qa.patch
@@ -0,0 +1,12 @@
+diff -urNp trousers-0.3.1.org/src/tspi/tspi_nv.c trousers-0.3.1/src/tspi/tspi_nv.c
+--- trousers-0.3.1.org/src/tspi/tspi_nv.c 2007-09-25 20:57:58.000000000 +0200
++++ trousers-0.3.1/src/tspi/tspi_nv.c 2007-11-24 21:12:16.000000000 +0200
+@@ -217,7 +217,7 @@ Tspi_NV_ReleaseSpace(TSS_HNVSTORE hNvsto
+
+ nv_data_public.tag = TPM_TAG_NV_DATA_PUBLIC;
+
+- if ((result = obj_nvstore_create_pcrshortinfo(hNvstore, (TSS_HPCRS)NULL, &pPCR_len, &pPCR)))
++ if ((result = obj_nvstore_create_pcrshortinfo(hNvstore, 0, &pPCR_len, &pPCR)))
+ return result;
+
+ NVPublic_DataSize = 0;
diff --git a/app-crypt/trousers/trousers-0.3.1.ebuild b/app-crypt/trousers/trousers-0.3.1.ebuild
index e62c3805b1f8..1a9f8b530f57 100644
--- a/app-crypt/trousers/trousers-0.3.1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.1.ebuild,v 1.1 2007/11/10 12:59:17 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.1.ebuild,v 1.2 2007/11/24 22:38:10 alonbl Exp $
inherit eutils linux-info autotools
@@ -61,8 +61,11 @@ pkg_setup() {
src_unpack() {
unpack ${A}
cd "${S}/dist"
+ #http://sourceforge.net/tracker/index.php?func=detail&aid=1829497&group_id=126012&atid=704361
epatch "${FILESDIR}/${PN}-0.2.3-nouseradd.patch"
cd "${S}"
+ #http://sourceforge.net/tracker/index.php?func=detail&aid=1794686&group_id=126012&atid=704358
+ epatch "${FILESDIR}/${P}-qa.patch"
}
src_install() {