Add patch to build with GCC 4.3, thanks to Bert Karwatzki in bug #250713.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r5 x86_64

4 files changed, 70 insertions, 6 deletions

diff --git a/app-shells/localshell/ChangeLog b/app-shells/localshell/ChangeLog
index 1b1243997354..bb420fa009b6 100644
--- a/app-shells/localshell/ChangeLog
+++ b/app-shells/localshell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/localshell
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/localshell/ChangeLog,v 1.7 2007/04/22 13:56:38 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/localshell/ChangeLog,v 1.8 2008/12/13 23:58:49 flameeyes Exp $
+
+  13 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/localshell-1.2+gcc-4.3.patch, localshell-1.2.ebuild:
+  Add patch to build with GCC 4.3, thanks to Bert Karwatzki in bug #250713.
 
   22 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   localshell-1.2.ebuild:
diff --git a/app-shells/localshell/Manifest b/app-shells/localshell/Manifest
index 723edfd1994e..e79621a2bbbc 100644
--- a/app-shells/localshell/Manifest
+++ b/app-shells/localshell/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX localshell-1.2+gcc-4.3.patch 1616 RMD160 a6b598ffac4f405e525c29c9c0c6b7c8b80e91cc SHA1 9066ec6957f5455219c55b53409820eed1029b30 SHA256 0183919e226abf5ba12a467826c6ec84514bd306a30f556f43470427064f28c4
 DIST localshell-1.1.tar.bz2 96494 RMD160 3c8322c5d2aa6c98452187134e983c9e9761a6fc SHA1 7b1decc6bb86a74bdc6fbb7d1a620cb9c704d63b SHA256 9b81327a0831ac3be94c23f2b4be4a38674ace69f202f8f093c34a2b589b7fc3
 DIST localshell-1.2.tar.bz2 96626 RMD160 2a11a462ccfa88858730fcf9ca855dc3c7cbecb8 SHA1 74adb13f2b9a04583a064e5840a5045d48682d0f SHA256 0be22511c4ec6934b30e99cbc5ce9dff27f4e09c527b6046f0569d870c38e746
 EBUILD localshell-1.1.ebuild 887 RMD160 3e7aaa6c820b1cda1509074587a0ec031b7f8f44 SHA1 34ad03957f11918fdeaeb8158aee7bc01005c84c SHA256 c6c25c0718504eb5745643a0dffed95b9e343de5309166dca63acfb439ae3b28
-EBUILD localshell-1.2.ebuild 895 RMD160 caee855e134a6eed7d9f178af2068061af75511f SHA1 5dfc960519ae8b56890545f578fe8de30fa17b4a SHA256 4caf19f12d82ff824f6739a3f4a7d5bf4b7b6b0661a64dee8710896f0f9a9336
-MISC ChangeLog 1093 RMD160 86c217463a2ba03a414f8b69a37c18501f447860 SHA1 61926d229b7350c05bb45025d3df951c9f850423 SHA256 9b7d3308f7671ddc211a7f6e88c93e199a6e66eb14edec9c1518c0f5abf51c71
+EBUILD localshell-1.2.ebuild 954 RMD160 dbbb389ca66009abacf29ca8dda5925df519eaf3 SHA1 01e1be2bb3a59e5bc84a61da6491a96aa2120394 SHA256 1065c3b9b3289fee36ca8c3597ec573368308be0fcccd38fcd3df63283795bc7
+MISC ChangeLog 1287 RMD160 7cc041d73a477c534d65f311f7c024223e9c9aad SHA1 b6a98f57e8ca670599f49de4293860da9d91cb28 SHA256 3f089b551a2677649d315cbef632c14ea37a979baa712c0cae47a8cb34471350
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklETD4ACgkQAiZjviIA2XhiQACfWojozesxAtC6zruOhlAOg/Pa
+gzMAn1FXrsOl6ffoZM0rC65akWLEDWba
+=cvMB
+-----END PGP SIGNATURE-----
diff --git a/app-shells/localshell/files/localshell-1.2+gcc-4.3.patch b/app-shells/localshell/files/localshell-1.2+gcc-4.3.patch
new file mode 100644
index 000000000000..9bd2aeecd70c
--- /dev/null
+++ b/app-shells/localshell/files/localshell-1.2+gcc-4.3.patch
@@ -0,0 +1,45 @@
+diff -aur localshell-1.2.old/src/common.cxx localshell-1.2/src/common.cxx
+--- localshell-1.2.old/src/common.cxx	2008-12-12 20:03:48.000000000 +0100
++++ localshell-1.2/src/common.cxx	2008-12-12 20:15:31.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include "structures.hh"
+ #include "common.hh"
+ #include <fstream>
++#include <cstring>
+ using namespace std;
+ 
+ bool match_user(uid_t uid, gid_t gid) {
+diff -aur localshell-1.2.old/src/config.cxx localshell-1.2/src/config.cxx
+--- localshell-1.2.old/src/config.cxx	2008-12-12 20:03:48.000000000 +0100
++++ localshell-1.2/src/config.cxx	2008-12-12 20:15:07.000000000 +0100
+@@ -10,6 +10,8 @@
+ #include <fstream>
+ #include <map>
+ #include <vector>
++#include <cstring>
++#include <cstdlib>
+ using namespace std;
+ 
+ int load_config( const char *cfg_filename, configuration &conf) {
+diff -aur localshell-1.2.old/src/config.hh localshell-1.2/src/config.hh
+--- localshell-1.2.old/src/config.hh	2008-12-12 20:03:48.000000000 +0100
++++ localshell-1.2/src/config.hh	2008-12-12 20:14:00.000000000 +0100
+@@ -2,6 +2,7 @@
+ #ifndef _CONFIG_HH_
+ #define _CONFIG_HH_
+ #include "structures.hh"
++#include <fstream>
+ 
+ int load_config( const char *cfg_filename, configuration &conf);
+ int parse_config(fstream &fs, configuration &conf);
+diff -aur localshell-1.2.old/src/localshell.cxx localshell-1.2/src/localshell.cxx
+--- localshell-1.2.old/src/localshell.cxx	2008-12-12 20:03:48.000000000 +0100
++++ localshell-1.2/src/localshell.cxx	2008-12-12 20:04:14.000000000 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include <map>
+ #include <vector>
++#include <cstring>
+ using namespace std;
+ 
+ int main(int argc, char** argv) {
diff --git a/app-shells/localshell/localshell-1.2.ebuild b/app-shells/localshell/localshell-1.2.ebuild
index 49fcf93cfad0..5249334ab018 100644
--- a/app-shells/localshell/localshell-1.2.ebuild
+++ b/app-shells/localshell/localshell-1.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/localshell/localshell-1.2.ebuild,v 1.5 2007/04/22 13:56:38 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/localshell/localshell-1.2.ebuild,v 1.6 2008/12/13 23:58:49 flameeyes Exp $
+
+inherit base
 
 DESCRIPTION="Localshell allows per-user/group local control of shell execution."
 HOMEPAGE="http://research.iat.sfu.ca/custom-software/localshell/"
@@ -12,6 +14,8 @@ IUSE=""
 DEPEND="virtual/libc"
 #RDEPEND=""
 
+PATCHES=( "${FILESDIR}/${P}+gcc-4.3.patch" )
+
 src_compile() {
 	# this is a shell, it needs to be in /bin
 	econf --bindir=/bin --sysconfdir=/etc || die "econf failed"