summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-07-28 09:59:52 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-07-28 09:59:52 +0000
commitfaa6919717860eb50fb71ff8e3750ef14b5e6f7b (patch)
tree17efa98b7fe2228404dd4b8766e1067b9dec86fc
parentInstall documentation separately. Clean redudant code from ebuild. (diff)
downloadhistorical-faa6919717860eb50fb71ff8e3750ef14b5e6f7b.tar.gz
historical-faa6919717860eb50fb71ff8e3750ef14b5e6f7b.tar.bz2
historical-faa6919717860eb50fb71ff8e3750ef14b5e6f7b.zip
Update sandbox violation patch to shut another one.
Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/Manifest10
-rw-r--r--app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch15
3 files changed, 24 insertions, 7 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 06a0c0a9e5ea..97386d0b1031 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.68 2011/07/27 23:37:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.69 2011/07/28 09:59:52 scarabeus Exp $
+
+ 28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ files/libreoffice-fix-sandbox-install.patch:
+ Update sandbox violation patch to shut another one.
27 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.2.3.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e30b78479129..944bec62774b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,7 +13,7 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6
AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
AUX libreoffice-as-needed-gtk.patch 516 RMD160 f04da0c1bd9c46327655fa309a96e19d4f9cb986 SHA1 f22cebeb6e2674f7c648e0316058d12c49872d2e SHA256 5782d6b174c20b6d2846b2e8a542441305e905399656dac7f87ce78146a39c31
-AUX libreoffice-fix-sandbox-install.patch 1015 RMD160 3d5781b685958e106c745da0c94f33ebc097679c SHA1 2f5c3f9090e375e703cf19ef661e5743f2367075 SHA256 5890c3cbea327a930ede356e07c59096ce73941c4472b3d157b9f6542f3822de
+AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50
AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a
AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
@@ -166,12 +166,12 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
EBUILD libreoffice-3.4.2.3.ebuild 18313 RMD160 6d1d15e093364e7d58cc66f54743d30edf787d88 SHA1 8c2277f026a29575cc8a29b83164d6aaddce346e SHA256 f0ecf05a997eb05e97754ee41afa622c007136f0fe90ac2fa6ddffe8a3e2f843
-MISC ChangeLog 13963 RMD160 b619e4d9941c7d66974f040a0232a4eb7f8e2330 SHA1 3f4d6e670e8b2793e9d545416ca4671aaac76109 SHA256 b9671952b016914e35ffeaca5ce9885f79a0d1cead6d1c1a4eeed8cf3f0cd19b
+MISC ChangeLog 14120 RMD160 02e102ed70ad36bcc214c6a6c02bd909dd44cf62 SHA1 af946dfb0b95d7351cf7a7956f2cf9e5093a14f7 SHA256 428f7253d403360e90f55ce8edda181c87e50807e24e7f700c0b125d11035ac9
MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk4woUwACgkQHB6c3gNBRYdpqQCgmp/yiWRnebD0ughsN0WK1x2C
-qpQAoMcqFA6LUYPlibCnBVgjpWqgpAsq
-=Znjg
+iEYEARECAAYFAk4xMxMACgkQHB6c3gNBRYcZ3ACgxu0V54sCQV/JekAyqNVFmmdz
+5gYAn24Kl0o5CFu2CoYRls8RkH9LRM9R
+=adLY
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch b/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch
index aa5e102284dd..c96e42b4984a 100644
--- a/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch
+++ b/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch
@@ -6,7 +6,7 @@ diff -urN libreoffice-bootstrap-3.4.2.2.old/bin/distro-install-desktop-integrati
# install desktop integration from plain packages
-sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX`
-+sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX`
++sysui_temp=`mktemp --tmpdir -d distro-pack-desktop-integration-XXXXXX`
cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp"
cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
builddir=`pwd`
@@ -17,3 +17,16 @@ diff -urN libreoffice-bootstrap-3.4.2.2.old/bin/distro-install-desktop-integrati
-exit 0
\ Chybí znak konce řádku na konci souboru
+exit 0
+
+--- libreoffice-bootstrap-3.4.2.2.old/sysui/desktop/share/create_tree.sh 2011-07-28 09:36:19.113673572 +0000
++++ libreoffice-bootstrap-3.4.2.2/sysui/desktop/share/create_tree.sh 2011-07-28 09:36:08.795995995 +0000
+@@ -50,7 +50,7 @@
+ ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX}
+
+ cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
+-chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
++chmod 0755 ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
+
+ if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then
+ # compat symlinks
+