From f15168edb18a61a743c46dc8c4944e94e066500d Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Mon, 28 Nov 2005 22:07:46 +0000 Subject: [PATCH] Fix to init script to append log output, bug 103250. Also added GCC 4 fix, thanks to Dario Birtic , closes bug 112133. Package-Manager: portage-2.0.53_rc7 --- sci-misc/boinc/ChangeLog | 10 +++++++++- sci-misc/boinc/Manifest | 17 +++++++++-------- ...-r2.ebuild => boinc-4.72.20050813-r3.ebuild} | 5 ++++- .../files/boinc-4.72.20050813-gcc4-fix.patch | 11 +++++++++++ sci-misc/boinc/files/boinc.init | 2 +- ...0050813-r2 => digest-boinc-4.72.20050813-r3} | 0 6 files changed, 34 insertions(+), 11 deletions(-) rename sci-misc/boinc/{boinc-4.72.20050813-r2.ebuild => boinc-4.72.20050813-r3.ebuild} (94%) create mode 100644 sci-misc/boinc/files/boinc-4.72.20050813-gcc4-fix.patch rename sci-misc/boinc/files/{digest-boinc-4.72.20050813-r2 => digest-boinc-4.72.20050813-r3} (100%) diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog index bf303230b17a..6b8fed3ba27b 100644 --- a/sci-misc/boinc/ChangeLog +++ b/sci-misc/boinc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-misc/boinc # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.14 2005/10/29 22:49:29 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.15 2005/11/28 22:07:45 cryos Exp $ + +*boinc-4.72.20050813-r3 (28 Nov 2005) + + 28 Nov 2005; Marcus D. Hanwell + +files/boinc-4.72.20050813-gcc4-fix.patch, files/boinc.init, + -boinc-4.72.20050813-r2.ebuild, +boinc-4.72.20050813-r3.ebuild: + Fix to init script to append log output, bug 103250. Also added GCC 4 fix, + thanks to Dario Birtic , closes bug 112133. *boinc-4.72.20050813-r2 (29 Oct 2005) diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest index 89c6e5a62dab..28aed1b811e3 100644 --- a/sci-misc/boinc/Manifest +++ b/sci-misc/boinc/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 e3321983c30510a03c71d40a70e02ddf ChangeLog 3249 -MD5 8bced0625f85d6d134660ae998e9653f boinc-4.72.20050813-r2.ebuild 2254 +MD5 b21fd4f2428430014b25560516dc969d ChangeLog 3614 +MD5 2e4104084577e624961e3622335525e5 boinc-4.72.20050813-r3.ebuild 2323 +MD5 603e1bde6bb2873a014b6b8984e21564 files/boinc-4.72.20050813-gcc4-fix.patch 315 MD5 5418cddcce4923a19fdf0c6bafea11bf files/boinc.conf 440 -MD5 608dcbb56aaca223e6744d16d223bb50 files/boinc.init 1731 -MD5 54ee39e6bbb50b705cb5fac638568d8b files/digest-boinc-4.72.20050813-r2 80 +MD5 2e064f401619e4905a21342edec0f4e7 files/boinc.init 1732 +MD5 54ee39e6bbb50b705cb5fac638568d8b files/digest-boinc-4.72.20050813-r3 80 MD5 4b2e94b92c84896e0204d9e7710f9c6a metadata.xml 420 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDY/yEntT9W3vfTuoRAu0DAJ9EKubd1r1BPk/inYV/Js0G8gJ1dACgmZsd -99lnOT8VEmFSY7IL5leFkLM= -=+VVi +iD8DBQFDi3/DntT9W3vfTuoRAiEUAJ9l7bsdiyYa1RROw1J7N0hbs7aFgwCcDizX +CtkXaMyXP30gyNm9XaF/uIY= +=Fm5K -----END PGP SIGNATURE----- diff --git a/sci-misc/boinc/boinc-4.72.20050813-r2.ebuild b/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild similarity index 94% rename from sci-misc/boinc/boinc-4.72.20050813-r2.ebuild rename to sci-misc/boinc/boinc-4.72.20050813-r3.ebuild index 1d40b0f8a831..9a008ad777b1 100644 --- a/sci-misc/boinc/boinc-4.72.20050813-r2.ebuild +++ b/sci-misc/boinc/boinc-4.72.20050813-r3.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/sci-misc/boinc/boinc-4.72.20050813-r2.ebuild,v 1.1 2005/10/29 22:49:29 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild,v 1.1 2005/11/28 22:07:45 cryos Exp $ inherit eutils @@ -42,6 +42,9 @@ src_unpack() { unpack ${A} cd ${S} + # GCC 4 patch, bug 112133. + epatch ${FILESDIR}/${P}-gcc4-fix.patch + # point to a proper mouse device sed -e "s:/dev/mouse:/dev/input/mice:g" -i client/hostinfo_unix.C || die } diff --git a/sci-misc/boinc/files/boinc-4.72.20050813-gcc4-fix.patch b/sci-misc/boinc/files/boinc-4.72.20050813-gcc4-fix.patch new file mode 100644 index 000000000000..a0624b3e05a2 --- /dev/null +++ b/sci-misc/boinc/files/boinc-4.72.20050813-gcc4-fix.patch @@ -0,0 +1,11 @@ +--- boinc_public/lib/shmem.C.orig 2005-11-11 02:46:07.000000000 +0100 ++++ boinc_public/lib/shmem.C 2005-11-11 02:46:20.000000000 +0100 +@@ -128,7 +128,7 @@ + return ERR_SHMGET; + } + p = shmat(id, 0, 0); +- if ((int)p == -1) { ++ if ((long)p == -1) { + return ERR_SHMAT; + } + *pp = p; diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init index 9445aab3b945..2245e29b63ea 100644 --- a/sci-misc/boinc/files/boinc.init +++ b/sci-misc/boinc/files/boinc.init @@ -39,7 +39,7 @@ start() { setsid start-stop-daemon --quiet --start --chdir ${RUNTIMEDIR} \ --exec ${BOINCBIN} --chuid ${USER}:${GROUP} \ - --nicelevel ${NICELEVEL} -- ${ARGS} > ${LOGFILE} 2>&1 & + --nicelevel ${NICELEVEL} -- ${ARGS} >> ${LOGFILE} 2>&1 & eend $? } diff --git a/sci-misc/boinc/files/digest-boinc-4.72.20050813-r2 b/sci-misc/boinc/files/digest-boinc-4.72.20050813-r3 similarity index 100% rename from sci-misc/boinc/files/digest-boinc-4.72.20050813-r2 rename to sci-misc/boinc/files/digest-boinc-4.72.20050813-r3 -- 2.26.2