Fix for gcc-4.3, tidy up ebuild. Bug #232521. Thanks to Shvetsov Alexey <alexxyum@gmail.com>

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

5 files changed, 51 insertions, 30 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 1e011c9d8cea..c83b6b5ef212 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/trousers
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.17 2008/06/07 20:54:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.18 2008/07/23 09:52:37 loki_val Exp $
+
+  23 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  files/trousers-0.2.3-nouseradd.patch, +files/trousers-0.3.1-gcc43.patch,
+  trousers-0.3.1.ebuild:
+  Fix for gcc-4.3, tidy up ebuild. Bug #232521. Thanks to Shvetsov Alexey
+  <alexxyum@gmail.com>
 
   07 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> trousers-0.3.1.ebuild:
   Remove unused inherits that were used to patch and re-autotools before.
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 1749c57d3802..7dc5596a2e8a 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tcsd.confd 372 RMD160 d265222136e80a0fe0cdb535abba0e07078f08c2 SHA1 05a81dc90a2df80b3c0ea7a8cefc3c59098aadd8 SHA256 5a1f9150ce0d8cc3e9e80971e073ee0b1db018ec3af6809087a7c626b9ffa327
 AUX tcsd.initd 958 RMD160 f90e6d4ec4d2dd0bd8218b3b2ef28328461d50b6 SHA1 34ab9b7cbf60e58b1f7b732891d30e053f2039a1 SHA256 388cef25be74c6263b9cb0e5de3bd08fbc0613e1a9fef958b006c571e4b691c8
-AUX trousers-0.2.3-nouseradd.patch 988 RMD160 58d429fc0cd5880127b19727e571edb9dd5e1d3a SHA1 f819f24fa52f0681180c6bc81978351e5254cdbe SHA256 dd27e8ff34b13a94b7b810154536d638a375907db76353f8b77267b229c7fb35
+AUX trousers-0.2.3-nouseradd.patch 1008 RMD160 dc1d81d6ceaf18d8464c5d7418b6733fae5fb6ab SHA1 404467a26d2e736ac3853969678d47a881579aec SHA256 5fa359ba96ac0c3e6130af1c9269f26fb28551ac6c0b76a4796aa0dfb1ce6dc2
+AUX trousers-0.3.1-gcc43.patch 852 RMD160 9392a7ef5f24dfeb0a7af78e83a7e738891b44cd SHA1 0c65705193adc4153f0e57b91ab98b3c73ca44fe SHA256 fe937a9dd111f60614c53308937a037c57ec22a96a9bdcf2c65c996cffad09ed
 AUX trousers-0.3.1-qa.patch 568 RMD160 918120a32124e3bf1b9a677698da1a6fb6a9e38f SHA1 27e7f1d1d3cbd23d63800e0e0f0a086fbeb83137 SHA256 518f14dc01c225b02f009cbfa34ff07f9fee91a9ad510f751acc929a13afdb6c
 DIST trousers-0.3.1.tar.gz 1306672 RMD160 1dc088249b4fc4aaf354caa216ffe25c8cecc9aa SHA1 0598efbb2282556a5edf0ce8c074175a33573951 SHA256 79d190a214584ceedd3900b4bc7484244d6e0d74289de5a38adcc7415cde3500
-EBUILD trousers-0.3.1.ebuild 2662 RMD160 3d533dfc670f4f1114775304c3511196b3cea1ce SHA1 f51f1134ca69a04c3bc39b81f60444aff35617c4 SHA256 56ae71f9c4b7418c0bc3e6f1491955ad5ffd6b07954151935521566d86f7eda1
-MISC ChangeLog 3498 RMD160 b93586612274e0a58ac7f00c296da6f2c9fe6024 SHA1 1bf82df7421996ab3dabb140783ee98aad189dba SHA256 ff49e5fa2b3a6b4778df6af46e7b89ab0aec2837df80e22f505a64cb3c636b22
+EBUILD trousers-0.3.1.ebuild 2450 RMD160 d7dea521e6185c8fe4c885876531f3e30b8e60e5 SHA1 29b37112fed05c77a8e473d04f7db2b0f2e2ec25 SHA256 83f8b623966af6b4f02a46eb68876257b6b2b82a02115a3c8c2ea347bb554d1c
+MISC ChangeLog 3748 RMD160 822e23092e22f695faa476172855d5e8e6a22966 SHA1 6935994eb67b5235f8749cae22b85a26af9af4e7 SHA256 401da4102a19ab31ce26e61526ca0df63c0f8eb58a0ae3652532f4f9fde35e5a
 MISC metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f SHA1 563aa19984b291a6cade6d6487dbf4a2a17e6874 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhK9XUACgkQAiZjviIA2XhXsgCg7onj3dn4UCMbNoJ2TAIg/n31
-XE0AnAkFdfohMKWJciqBPaloMKH1rXVy
-=NIXw
------END PGP SIGNATURE-----
diff --git a/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch b/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch
index 27d71151e074..3b44ed320111 100644
--- a/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch
+++ b/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch
@@ -1,5 +1,5 @@
---- Makefile.am.orig	2005-07-30 19:33:46.000000000 +1000
-+++ Makefile.am	2005-07-30 19:34:09.000000000 +1000
+--- dist/Makefile.am.orig	2005-07-30 19:33:46.000000000 +1000
++++ dist/Makefile.am	2005-07-30 19:34:09.000000000 +1000
 @@ -9,8 +9,6 @@
  	/bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
  
@@ -9,8 +9,8 @@
  	/bin/chown tss:tss ${DESTDIR}/@sbindir@/tcsd
  	/bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
  	/bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm
---- Makefile.in.orig	2005-07-30 19:33:52.000000000 +1000
-+++ Makefile.in	2005-07-30 19:34:22.000000000 +1000
+--- dist/Makefile.in.orig	2005-07-30 19:33:52.000000000 +1000
++++ dist/Makefile.in	2005-07-30 19:34:22.000000000 +1000
 @@ -369,8 +369,6 @@
  	/bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
  
diff --git a/app-crypt/trousers/files/trousers-0.3.1-gcc43.patch b/app-crypt/trousers/files/trousers-0.3.1-gcc43.patch
new file mode 100644
index 000000000000..db0f48e5f8b9
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.1-gcc43.patch
@@ -0,0 +1,30 @@
+--- src/trspi/crypto/openssl/symmetric.c.orig	2008-07-21 02:14:44.000000000 +0400
++++ src/trspi/crypto/openssl/symmetric.c	2008-07-21 02:15:06.000000000 +0400
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <string.h>
++#include <limits.h>
+ 
+ #include <openssl/evp.h>
+ #include <openssl/err.h>
+--- src/tspi/tsp_ps.c.orig	2008-07-21 02:27:14.000000000 +0400
++++ src/tspi/tsp_ps.c	2008-07-21 02:27:40.000000000 +0400
+@@ -15,6 +15,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <limits.h>
+ 
+ #include "trousers/tss.h"
+ #include "trousers/trousers.h"
+--- src/tspi/tspi_aik.c.orig	2008-07-21 02:31:35.000000000 +0400
++++ src/tspi/tspi_aik.c	2008-07-21 02:32:04.000000000 +0400
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <inttypes.h>
++#include <limits.h>
+ 
+ #include "trousers/tss.h"
+ #include "trousers/trousers.h"
diff --git a/app-crypt/trousers/trousers-0.3.1.ebuild b/app-crypt/trousers/trousers-0.3.1.ebuild
index 446a8903dc14..b14e33cf208c 100644
--- a/app-crypt/trousers/trousers-0.3.1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 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.3 2008/06/07 20:54:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.1.ebuild,v 1.4 2008/07/23 09:52:37 loki_val Exp $
 
-inherit eutils linux-info
+inherit base eutils linux-info
 
 DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
 HOMEPAGE="http://trousers.sf.net"
@@ -19,6 +19,10 @@ RDEPEND=">=dev-libs/glib-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+PATCHES=(	"${FILESDIR}/${PN}-0.2.3-nouseradd.patch"
+		"${FILESDIR}/${P}-qa.patch"
+		"${FILESDIR}/${P}-gcc43.patch"	)
+
 pkg_setup() {
 	# Check for driver (not sure it can be an rdep, because ot depends on the
 	# version of virtual/linux-sources... Is that supported by portage?)
@@ -58,16 +62,6 @@ pkg_setup() {
 	enewuser tss -1 -1 /var/lib/tpm tss
 }
 
-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() {
 	keepdir /var/lib/tpm
 	make DESTDIR="${D}" install || die