Fix for bug #316691 and fix against possible sandbox violation.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 38 insertions, 15 deletions

diff --git a/net-im/silc-client/ChangeLog b/net-im/silc-client/ChangeLog
index 1d36c413ce19..a6e431ae1884 100644
--- a/net-im/silc-client/ChangeLog
+++ b/net-im/silc-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/silc-client
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.58 2010/04/22 12:12:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.59 2010/04/22 23:00:39 polynomial-c Exp $
+
+  22 Apr 2010; Lars Wendler <polynomial-c@gentoo.org>
+  silc-client-1.1.8.ebuild,
+  +files/silc-client-1.1.8-sandbox-errors-fix.patch:
+  non-maintainer commit: 
+  Added a patch to work around a sandbox violation. 
+  Also added >=net-im/silc-toolkit to DEPEND to fix bug #316691 which got
+  caught by flameeyes during his usual tinderbox runs.
 
   22 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
   silc-client-1.1.8.ebuild:
diff --git a/net-im/silc-client/Manifest b/net-im/silc-client/Manifest
index 45c8680bbe34..f6da0061577b 100644
--- a/net-im/silc-client/Manifest
+++ b/net-im/silc-client/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX silc-client-1.1-docdir.patch 1913 RMD160 b3efd82ab5d5cf4ad8d128f99a03ef31837ac72d SHA1 4676b64a74c144f20b31b1338a2e73376e33e227 SHA256 8d90646881289606e2ef65c28d320226bd170968e081d099d1251ba3bf11e1b2
 AUX silc-client-1.1.8-docdir.patch 1792 RMD160 bb32ea6265ba68f29ad1481d4435d3fa5116151d SHA1 96bbdbbc5958af1084a14c2727cf108120155c18 SHA256 149f2dbe89c7c38b3802ae779cf1242bcfd0b06090f2f8b874ff1fb99030bf00
+AUX silc-client-1.1.8-sandbox-errors-fix.patch 932 RMD160 8047b1c700ec6a2e81c9d2f6407f3554be276567 SHA1 9197a0a2f9af4fe8b681377a5c88c62693b1607f SHA256 4279b77f226d029e8d64a91da3dd4f89b24d2dc6700f5df4394867cf3632b3c7
 DIST silc-client-1.1.4.tar.bz2 1624696 RMD160 519ba59912da4bb514330ca8e87979844f957ad0 SHA1 043fd02ffc0bb420d411c4ca14ad307b48beaa06 SHA256 87deb7d8db4eed91768ff6f198d763fee60036024df214264dab9bf3e4012c08
 DIST silc-client-1.1.6.tar.bz2 1529970 RMD160 ce5a026c37c30ac489310562436f3cfa9a8d9df6 SHA1 a88fa84883adf094e8857d89fbd7b76a4d67ecd7 SHA256 2a991b05df223f16b85ca24275e944b4a4aafc220b1200984d1dc82de3b7c576
 DIST silc-client-1.1.8.tar.bz2 1532816 RMD160 a010384b5e498a62cc6cd69e97602f3118b64d2f SHA1 5936ab682e746ae413f938ce9c9b72215d6524c0 SHA256 623fec16aef312cc98a8a97c640b9451d3ea81d7690abc86bece2e8d5e19d3e2
 EBUILD silc-client-1.1.4.ebuild 2181 RMD160 a16fdff842705a31903ba91cbd24833693939243 SHA1 5babe06e5ca7a6b27cf61761bb98dd548daac3a7 SHA256 3e990b34bd5047a9172b46ef5faafeb08beb012edcdfda450bbebdae1fb176ff
 EBUILD silc-client-1.1.6.ebuild 2188 RMD160 840b11fe1b84366fa0ce8cc3c2032fc2e3e724cd SHA1 dc97c8056e34c3e4272c9caafe2aafc4d81e2910 SHA256 8a0533a5f4eceffa2e5924a6d24b411e756d8c5e0a187ec5a763d031e428f6c6
-EBUILD silc-client-1.1.8.ebuild 2035 RMD160 9ca58e3373c96aed54db2ffda7ee548a95d6fdaa SHA1 33cdc16f4e8900dd1708931740b1cd5aced395c6 SHA256 9a3475e495b0978be75ec46d1f9b5f40332efcf77961a0aa3694aaf2610abdef
-MISC ChangeLog 8645 RMD160 d486406b50440acc3ef20a65922df199b26db9e0 SHA1 ec3d1242f5715303df895d60d51b2413ff65f31c SHA256 4845875f5806951e83430fadd477ba26379618f87a408c72f2f7de4262acc18b
+EBUILD silc-client-1.1.8.ebuild 2124 RMD160 54d9a0f4fab7d9f581ecf58c4a9f7f772dd5727c SHA1 bae0fa7d00644e23ecf10f58d52ca1c2a631299a SHA256 a7cadf4a35ecc4ce19d9e1bb778ff5eac4e733bb1c3bb49e4f504993fd719d2a
+MISC ChangeLog 8996 RMD160 33e7403891759c6c238b5ce25c0462d6da9c2cd1 SHA1 f15af7589331cd6b990f0ffd8684b640ab9f1cd1 SHA256 8f74b21c9dabad3b8f1c041334a08ecb3e397e1f9bfd07c62f14e39cd50effd7
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvQPTQACgkQNQqtfCuFnePPxACfQ3gfjq1MxoRAnDrZRBs7+fHU
-Cl0AnjlGtB6ikhEjLFtC50c+OBs17WlU
-=7Bwd
------END PGP SIGNATURE-----
diff --git a/net-im/silc-client/files/silc-client-1.1.8-sandbox-errors-fix.patch b/net-im/silc-client/files/silc-client-1.1.8-sandbox-errors-fix.patch
new file mode 100644
index 000000000000..0998c16c31b6
--- /dev/null
+++ b/net-im/silc-client/files/silc-client-1.1.8-sandbox-errors-fix.patch
@@ -0,0 +1,22 @@
+--- silc-client-1.1.8/lib/Makefile.am
++++ silc-client-1.1.8/lib/Makefile.am
+@@ -75,7 +75,7 @@
+ 
+ install-exec-hook:
+ if SILC_ENABLE_SHARED
+-	-mkdir -p $(libdir)
++	-mkdir -p $(DESTDIR)$(libdir)
+ 	-$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+ 	-$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+ 	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
+--- silc-client-1.1.8/lib/Makefile.in
++++ silc-client-1.1.8/lib/Makefile.in
+@@ -640,7 +640,7 @@
+ 	$(MAKE) remove $(SILCLIB) $(SILCSERVERLIB) $(SILCCLIENTLIB)
+ 
+ install-exec-hook:
+-@SILC_ENABLE_SHARED_TRUE@	-mkdir -p $(libdir)
++@SILC_ENABLE_SHARED_TRUE@	-mkdir -p $(DESTDIR)$(libdir)
+ @SILC_ENABLE_SHARED_TRUE@	-$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+ @SILC_ENABLE_SHARED_TRUE@	-$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+ @SILC_ENABLE_SHARED_TRUE@	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
diff --git a/net-im/silc-client/silc-client-1.1.8.ebuild b/net-im/silc-client/silc-client-1.1.8.ebuild
index 23fdebee2c6a..95a59a88441d 100644
--- a/net-im/silc-client/silc-client-1.1.8.ebuild
+++ b/net-im/silc-client/silc-client-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.1.8.ebuild,v 1.3 2010/04/22 12:12:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.1.8.ebuild,v 1.4 2010/04/22 23:00:39 polynomial-c Exp $
 
 EAPI=2
 
@@ -21,7 +21,8 @@ COMMONDEPEND="perl? ( dev-lang/perl )
 	!<=net-im/silc-toolkit-0.9.12-r1"
 
 DEPEND="${COMMONDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	>=net-im/silc-toolkit-1.1.10"
 
 RDEPEND="${COMMONDEPEND}
 	perl? (
@@ -33,6 +34,7 @@ src_prepare() {
 	sed -i -e "s:-g -O2:${CFLAGS}:g" configure
 	use amd64 && sed -i -e 's:felf\([^6]\):felf64\1:g' configure
 	epatch "${FILESDIR}/${PN}-1.1.8-docdir.patch"
+	epatch "${FILESDIR}/${P}-sandbox-errors-fix.patch"
 }
 
 src_configure() {