Fix boinc-6.2.15 so it actualy works without bindist. Fixes bug 248749.

(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 23 insertions, 9 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 2c72194d9e95..1d1eed8af827 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.42 2008/11/24 19:03:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.43 2008/11/27 19:49:18 scarabeus Exp $
+
+  27 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org> +files/gui_rpc_auth.cfg,
+  boinc-6.2.15.ebuild:
+  Add gui_rpc_auth.cfg and fix cert issues. Bug #248749
 
 *boinc-6.2.15 (24 Nov 2008)
 
diff --git a/sci-misc/boinc/boinc-6.2.15.ebuild b/sci-misc/boinc/boinc-6.2.15.ebuild
index ec4195d0f8dd..8901276a7226 100644
--- a/sci-misc/boinc/boinc-6.2.15.ebuild
+++ b/sci-misc/boinc/boinc-6.2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.2.15.ebuild,v 1.1 2008/11/24 19:03:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.2.15.ebuild,v 1.2 2008/11/27 19:49:18 scarabeus Exp $
 
 EAPI="1"
 
@@ -32,7 +32,8 @@ RDEPEND="sys-libs/zlib
 			>=dev-python/mysql-python-0.9.2
 		)
 	)"
-DEPEND="!bindist? (
+DEPEND="app-misc/ca-certificates
+	!bindist? (
 		>=sys-devel/gcc-3.0.4
 		>=sys-devel/autoconf-2.58
 		>=sys-devel/automake-1.8
@@ -79,6 +80,12 @@ src_unpack() {
 		cd "${WORKDIR}"
 		sh ${P/-/_}_${target}-pc-linux-gnu.sh
 	fi
+	# patch up certificates
+	mkdir "${S}"/curl/
+	ln -s /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
+	sed -i \
+		-e "s:::g" \
+		"${S}"/Makefile
 }
 
 src_compile() {
@@ -102,16 +109,15 @@ src_compile() {
 		sed -i \
 			-e "s:LDFLAGS = :LDFLAGS = -L../lib :g" \
 			*/Makefile || die "sed failed"
-		emake || die "emake failed"
+		emake -j1 || die "emake failed"
 	fi
 }
 
 src_install() {
-	mkdir -p "${D}"/var/lib/${PN}/
+	dodir /var/lib/${PN}
 	newinitd "${FILESDIR}"/${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 	if ! use bindist; then
-		cp "${S}"/ca-bundle.crt "${D}"/var/lib/${PN}
 		make install DESTDIR="${D}" || die "make install failed"
 		# icon
 		newicon "${S}"/sea/${PN}mgr.48x48.png ${PN}.png
@@ -138,7 +144,6 @@ src_install() {
 	else
 		local S_BIN="${WORKDIR}"/BOINC
 		cd "${S_BIN}"
-		cp "${S_BIN}"/ca-bundle.crt "${D}"/var/lib/${PN}
 		# fix ${PN}.conf file for binary package
 		sed -i -e "s:/usr/bin/${PN}_client:/opt/${PN}/${PN}:g" "${D}"/etc/conf.d/${PN}
 		if use X; then
@@ -159,6 +164,7 @@ src_install() {
 		# install binaries
 		exeopts -m0755
 		exeinto /opt/${PN}
+
 		doexe "${S_BIN}"//{${PN},${PN}_cmd,${PN}cmd,${PN}mgr,run_client,run_manager}
 		fowners 0:${PN} /opt/${PN}/{${PN},${PN}_cmd,${PN}cmd,${PN}mgr,run_client,run_manager}
 		# locale
@@ -172,8 +178,12 @@ src_install() {
 		dosym /opt/${PN}/locale /var/lib/${PN}/locale
 		cd "${S}"
 	fi
-	fowners ${PN}:${PN} /var/lib/${PN}/ca-bundle.crt
-	chown ${PN}:${PN} "${D}"/var/lib/${PN}
+	dosym /etc/ssl/certs/ca-certificates.crt /var/lib/${PN}/ca-bundle.crt
+	insopts -m0640
+	insinto /var/lib/${PN}
+	doins "${FILESDIR}"/gui_rpc_auth.cfg
+	fowners ${PN}:${PN} /var/lib/${PN}/gui_rpc_auth.cfg
+	fowners ${PN}:${PN} /var/lib/${PN}/
 }
 
 pkg_preinst() {
diff --git a/sci-misc/boinc/files/gui_rpc_auth.cfg b/sci-misc/boinc/files/gui_rpc_auth.cfg
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sci-misc/boinc/files/gui_rpc_auth.cfg