From: | "Tomas Chvatal (scarabeus)" <scarabeus@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-fix-sandbox-install.patch |
Date: | Thu, 28 Jul 2011 10:02:33 |
Message-Id: | 20110728095952.74AFE2004B@flycatcher.gentoo.org |
1 | scarabeus 11/07/28 09:59:52 |
2 | |
3 | Modified: libreoffice-fix-sandbox-install.patch |
4 | Log: |
5 | Update sandbox violation patch to shut another one. |
6 | |
7 | (Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.3 app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch?rev=1.3&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch?rev=1.3&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch?r1=1.2&r2=1.3 |
15 | |
16 | Index: libreoffice-fix-sandbox-install.patch |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch,v |
19 | retrieving revision 1.2 |
20 | retrieving revision 1.3 |
21 | diff -u -r1.2 -r1.3 |
22 | --- libreoffice-fix-sandbox-install.patch 26 Jul 2011 17:05:34 -0000 1.2 |
23 | +++ libreoffice-fix-sandbox-install.patch 28 Jul 2011 09:59:52 -0000 1.3 |
24 | @@ -6,7 +6,7 @@ |
25 | |
26 | # install desktop integration from plain packages |
27 | -sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX` |
28 | -+sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX` |
29 | ++sysui_temp=`mktemp --tmpdir -d distro-pack-desktop-integration-XXXXXX` |
30 | cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp" |
31 | cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" |
32 | builddir=`pwd` |
33 | @@ -17,3 +17,16 @@ |
34 | -exit 0 |
35 | \ Chybí znak konce řádku na konci souboru |
36 | +exit 0 |
37 | + |
38 | +--- libreoffice-bootstrap-3.4.2.2.old/sysui/desktop/share/create_tree.sh 2011-07-28 09:36:19.113673572 +0000 |
39 | ++++ libreoffice-bootstrap-3.4.2.2/sysui/desktop/share/create_tree.sh 2011-07-28 09:36:08.795995995 +0000 |
40 | +@@ -50,7 +50,7 @@ |
41 | + ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX} |
42 | + |
43 | + cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin |
44 | +-chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin |
45 | ++chmod 0755 ${DESTDIR}/usr/bin/${PREFIX}-printeradmin |
46 | + |
47 | + if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then |
48 | + # compat symlinks |
49 | + |