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

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

4 files changed, 26 insertions, 11 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/Manifest b/sci-misc/boinc/Manifest
index 69782e227191..30cbe7deb2d2 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -6,6 +6,7 @@ AUX boinc-6.2.15-mute-warnings.patch 1155 RMD160 a3673a3eed683bc30911e9a803e2b0a
 AUX boinc-6.2.15-project-list-size.patch 508 RMD160 b63342aece3a93e519ee1c97c3eae1db4988856e SHA1 4290cdb78f47321503c7a0310ded0aab90cd5c21 SHA256 9bfa67c54901af934dbc321d23af3f63790d6aa9f70355061a251efc2c362357
 AUX boinc.conf 440 RMD160 eb56e84e0bb56d033fb1b8ff692343eb22fd6877 SHA1 7560db67952b01152f69f3caa5511d267533cc33 SHA256 bf989320e14597fc24d54a24881dafec8a141075a7da71138ca32771d66c6713
 AUX boinc.init 1823 RMD160 946cd1f150fc0878dd3523142085147955709416 SHA1 60fad8a5cddec744f170be49d7254fff1f30ee2b SHA256 2eeb0a668dbe62905097e7a93acae854520ae0d939061543013a663c3ddf812a
+AUX gui_rpc_auth.cfg 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 DIST boinc-5.10.28.tar.bz2 17176403 RMD160 9165a68836384f13e29f82c120fb43eaafd5825e SHA1 b96c0be56c608f7db0ddba14f9f6b35b6575636a SHA256 7a9c1d02b7216e7c031e88bf4feec4fc399909cfb965be2de170489b232ace42
 DIST boinc-5.10.45.tar.bz2 18151280 RMD160 63ece8c4179869418f4457e6efca27e8cb4b4f71 SHA1 e7a2c431b8660cb0f1d6f0d8b65b26bf1386b636 SHA256 8f81f5c95b6f566ccdf9f67dc9453dd661c44b8a415ad174a080ce7942a33118
 DIST boinc-5.2.14-patches.tar.bz2 8906 RMD160 9cf31b1cb2f9744aaf931fd718349b8e9d2c9434 SHA1 0f454f394d94227d30fdce32ee9510e1ee3ce5f0 SHA256 b70fbb66d24226f59c0f97456bc5d264a22cd20295c320b0f5f33a712ef4aee6
@@ -24,6 +25,6 @@ EBUILD boinc-5.2.14.ebuild 2865 RMD160 5c487bd33698548f7b7bcce640ed6aff19af2d19
 EBUILD boinc-5.4.11.ebuild 2852 RMD160 352a4461cb1eecab7fd58075487e605bd25e020b SHA1 ce232ac48c604fd2b0507c8f4c3c251b6f540d82 SHA256 40ca209c770d950614226a34041d9fe10d7c5c37f772a51f5012072c013ed281
 EBUILD boinc-5.5.6.ebuild 3084 RMD160 2a012f47be92b9de7504f576d7397cd2c770b66c SHA1 64cbfcf31c3b441c311d31090cc658d35083cad6 SHA256 8971eaf9a31c3265b8c61f49fd42f1fb79130891fd72af19956b60fd6b472643
 EBUILD boinc-5.8.15.ebuild 3260 RMD160 882057492e1ed36a3d89cafd0d1edf45a8efa18e SHA1 c7761c2e45d5ac503033a2b8fa56c9bcdbc8a9df SHA256 1224a7110ccbec86801b69a02d2aeff7655ee4efe3a0d99ab0908c6615524bea
-EBUILD boinc-6.2.15.ebuild 6593 RMD160 485e29024f4ddd7ad52b9b0129fa4b7086b0b48f SHA1 0189ef095df281bd634e8e34728ed431994de948 SHA256 35c97606798b58481353056160b52370e267af7d357eff3fd0ce30b0ae087e52
-MISC ChangeLog 8534 RMD160 221f2bc7244e06efa4d1ae43468d9e868b3faa2d SHA1 ddf745bcd66467944c25e87a911b408ea977b2c4 SHA256 7d60a2107301a907bc92cda888a060909be5033207970e031e8d6eab19a00b51
+EBUILD boinc-6.2.15.ebuild 6821 RMD160 d52f914705f458c652120cd65aaabbcf220dd7d4 SHA1 145a52ab88455ac8d1e88fa91fbc565e74c5ace2 SHA256 07017cc6c0a5fbfa6d9f8143587128374dce73bbd6f7080f358405c9a65d5847
+MISC ChangeLog 8691 RMD160 6fb4e7cf860fe2712c376831f21c5969ef9cf19d SHA1 531e0435671fe2fe1bd8e730388f0091cd21dd01 SHA256 3bd7d363de5ba5b6bf28a545515cd43a97d1266581e26c1a9c18fbe76714cff0
 MISC metadata.xml 475 RMD160 2af23090b07df03f6c9606c9abf20f6eaf75c857 SHA1 cc12576d9321ca75174d9d183093c526807e835c SHA256 be29254b1f37bd801bc54757cc3b77af0baad45f349de6bf3e2f03076f7bf494
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