diff options
author | Randall Wald <rdwald@gmail.com> | 2012-10-11 10:30:14 -0400 |
---|---|---|
committer | Randall Wald <rdwald@gmail.com> | 2012-10-11 10:30:14 -0400 |
commit | 615241c2367ff02dd06bf87aabaf28e7483e5c42 (patch) | |
tree | 6e0b9e81fc311ee341775098ebc6ce7c3974696b | |
parent | Note for future self: update ChangeLog, *then* update Manifest (diff) | |
download | rwald-615241c2367ff02dd06bf87aabaf28e7483e5c42.tar.gz rwald-615241c2367ff02dd06bf87aabaf28e7483e5c42.tar.bz2 rwald-615241c2367ff02dd06bf87aabaf28e7483e5c42.zip |
Added spideroak-bin ebuild to apply patch from bug #400979
6 files changed, 226 insertions, 0 deletions
diff --git a/app-backup/spideroak-bin/ChangeLog b/app-backup/spideroak-bin/ChangeLog new file mode 100644 index 0000000..15fc88f --- /dev/null +++ b/app-backup/spideroak-bin/ChangeLog @@ -0,0 +1,13 @@ +# ChangeLog for app-backup/spideroak-bin +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*spideroak-bin-4.7.9948-r1 (11 Oct 2012) + + 11 Oct 2012; Randall Wald <rwald@gentoo.org> + +spideroak-bin-4.7.9948-r1.ebuild, + +files/spideroak-bin-4.7.9948-headless.patch, + +files/spideroak-bin-4.7.9948-opt-path.patch, + +files/spideroak-bin-4.7.9948-patchelf.patch: + Ebuild applies patch from bug #400979 + diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest new file mode 100644 index 0000000..817e160 --- /dev/null +++ b/app-backup/spideroak-bin/Manifest @@ -0,0 +1,7 @@ +AUX spideroak-bin-4.7.9948-headless.patch 353 SHA256 b9db5b3ebdba8e2b3e36c78b133a3ce3d17d5784bbbcf906b8e61b383a19886d SHA512 aab0d738d567504fa4b65dc8e17d24cac8dc92f4a805924c50bb2fc68531d372e3061df080598ab09a8b6dbdc337764f927333b958af8fa8e00a6d34b4be32f4 WHIRLPOOL 59c4884cb3a3c5f5983dbf1fc4591e0f69f7f106b9721dbff9eb552249155a436f7742bcc12d9dc7b9845f54042ce1276d41e7eda757ef8dd72d72b325aff57c +AUX spideroak-bin-4.7.9948-opt-path.patch 489 SHA256 f1e15bd47107d3f40004140b0e0e67d7936fcb86dea55e91e0c7651842aa4eaf SHA512 71912bdc30a735c50ea7204bdee2f94585260f752ba68677c74295c47ca01236be3cf7ec1910d0dbcc892ee2d41e2a53dea611379b78b9d791efd7af662c4df6 WHIRLPOOL 815a1825cb4a74fb93202907b3579efdb66f8d8f55753042d848c69cce964e615f535c919a40de520752247acd3b847603bbc486ab689ecd92b90ea4eef97ade +AUX spideroak-bin-4.7.9948-patchelf.patch 786 SHA256 fec778bea9da99aa9e55179a0a878c887c9e1096df2cb0a57db815af8fc26924 SHA512 3fea8601a6fd5df000a0c9e18b9eb6d33f7f89d2c09e9045ec35c5e0c9ca1edbd9be5fa04b27fa5a6148453c3845e3ee4955a789a804f36f5583256728c54a63 WHIRLPOOL 4aa12f92f9244ace441a8f16ac5c132ae3ef7d33a77879c15857acfdc64bb54062f0d9f1ae3df1bd2320f2f81e9372930d07693a4d76126f7870223c6b6b8fc0 +DIST spideroak-bin-4.7.9948_amd64.deb 22739294 SHA256 643fe98a02635f37b2a4122eb81679954291a53e67af959e6d24c26aa737536b SHA512 5a6de79066087adccd3d89af17cc40254809e9cd5f12ccb1daada340e7b357d33d7e25179a54f700f8100abc91fc4e16a729726d549ca624fdad0a42183314f8 WHIRLPOOL e9376610a9811c68ad3230597d66578864e095e9fde9cf77eee6808a3409e0cff6e2f0548e625cd158a37cbd256dddb54520b4354de27008003c361ecd87465b +DIST spideroak-bin-4.7.9948_x86.deb 22132538 SHA256 a7b6d44d0197e46334646db9a2015d2987cd4c9a8b77423284044092265bfa8d SHA512 45f93a40bfc2227573aabb4ae9d820fe832726dce512435e9ef34d2d82a234a729313bfb83f340a00de3955e7c08f851915626eed2d02c767dc6949e9c8f74ed WHIRLPOOL 6b4220b1c790e65e5b0ce96acd8aa459848a0c14fa9e216816ecce12fe3576601feb3e10afe036d4f537cc62c96f069043ab61a07b9e7abd5ab9568483ad975a +EBUILD spideroak-bin-4.7.9948-r1.ebuild 4453 SHA256 9ec71bc222b93ba2df64b065221604b99dc82f8c88310f71dcb12b7c647852a4 SHA512 77962fb82c60082033ceda4ca9b33a28b7507a10e8b02488f20d916948a709e95dac8f260b727273e68b5a51fabf52c2ff815898f41dc20ec4f6aa049fd0a178 WHIRLPOOL dfa22d9bb4c76e285ea833bf849b3aead9d4dd93411aeda3a52b4839b44dc0dc474d69ea56f2ec4e9c8d390aa91d64470cf8545215e3d9891c7d1a4132e3db17 +MISC ChangeLog 436 SHA256 cf7d34fb6945f9f350626fc856c34264c1100a3e3e25b79968bfe3e3e05679ca SHA512 6c1a692618f01fcbc62dc4baff47eaae43d9f6a2176f30f64c33d998b6921b193a394de62ad4812c985ef42142f4806f9d7c970c33ed38d71887fb5c28b904f3 WHIRLPOOL 17a077907e60cdb2f393f560a8a520d76d6953243e81f5b13882d8699ec5f4da58a2d45ecfaeedb4af6716e762d8dc644d4613ef0a251bf4b49dbf38dcf867a7 diff --git a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-headless.patch b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-headless.patch new file mode 100644 index 0000000..1ba7c08 --- /dev/null +++ b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-headless.patch @@ -0,0 +1,8 @@ +--- usr/bin/SpiderOak.orig 2012-08-26 08:10:42.387011624 +0200 ++++ usr/bin/SpiderOak 2012-08-26 08:10:48.899956298 +0200 +@@ -5,4 +5,4 @@ + QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH + SpiderOak_EXEC_SCRIPT=$(cd `dirname $0` ; pwd)/SpiderOak + export SpiderOak_EXEC_SCRIPT +-exec "/opt/SpiderOak/SpiderOak" "$@" ++exec "/opt/SpiderOak/SpiderOak" --headless "$@" diff --git a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-opt-path.patch b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-opt-path.patch new file mode 100644 index 0000000..afdbc33 --- /dev/null +++ b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-opt-path.patch @@ -0,0 +1,13 @@ +--- usr/bin/SpiderOak.orig 2012-08-15 17:03:09.697548990 +0200 ++++ usr/bin/SpiderOak 2012-08-15 17:03:54.637356071 +0200 +@@ -1,8 +1,8 @@ + #!/bin/sh + +-LD_LIBRARY_PATH="/usr/lib/SpiderOak:$LD_LIBRARY_PATH" ++LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH + QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH + SpiderOak_EXEC_SCRIPT=$(cd `dirname $0` ; pwd)/SpiderOak + export SpiderOak_EXEC_SCRIPT +-exec "/usr/lib/SpiderOak/SpiderOak" "$@" ++exec "/opt/SpiderOak/SpiderOak" "$@" diff --git a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-patchelf.patch b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-patchelf.patch new file mode 100644 index 0000000..8d406b1 --- /dev/null +++ b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-patchelf.patch @@ -0,0 +1,28 @@ +--- spideroak-bin-4.7.9948.ebuild.orig 2012-08-30 18:08:49.333150726 -0700 ++++ spideroak-bin-4.7.9948.ebuild 2012-10-11 07:15:24.798099441 -0700 +@@ -22,7 +22,7 @@ + + SSL_SLOT="0.9.8" + +-DEPEND="" ++DEPEND="dev-util/patchelf" + RDEPEND=" + dbus? ( sys-apps/dbus ) + !headless? ( +@@ -113,6 +113,16 @@ + # Remove bundled python interpreter => dev-lang/python:2.7 + rm usr/lib/SpiderOak/py || die "rm py failed" + fi ++ ++ # Set RPATH for preserve-libs handling (bug #400979). ++ cd "${S}/usr/lib/SpiderOak" || die ++ local x ++ for x in * ; do ++ # Use \x7fELF header to separate ELF executables and libraries ++ [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue ++ patchelf --set-rpath '$ORIGIN' "${x}" || \ ++ die "patchelf failed on ${x}" ++ done + } + + src_install() { diff --git a/app-backup/spideroak-bin/spideroak-bin-4.7.9948-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.7.9948-r1.ebuild new file mode 100644 index 0000000..8bb53e4 --- /dev/null +++ b/app-backup/spideroak-bin/spideroak-bin-4.7.9948-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.2 2012/08/27 01:46:36 blueness Exp $ + +EAPI="4" + +inherit eutils versionator + +REV=$(get_version_component_range 3) +SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid" + +DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system." +HOMEPAGE="https://spideroak.com" +SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb ) + amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )" +RESTRICT="mirror strip" + +LICENSE="spideroak" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus headless system-libs" + +SSL_SLOT="0.9.8" + +DEPEND="" +RDEPEND=" + dbus? ( sys-apps/dbus ) + !headless? ( + media-libs/fontconfig + media-libs/freetype:2 + dev-libs/glib:2 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXt + ) + system-libs? ( + dev-libs/openssl:$SSL_SLOT + net-misc/curl + >=sys-devel/gcc-4 + dev-libs/glib:2 + dev-libs/libpcre + media-libs/libpng:1.2 + x11-libs/qt-core:4 + x11-libs/qt-gui:4 + dev-db/sqlite:3 + net-libs/libssh2 + sys-libs/zlib + dev-lang/python:2.7 + dev-python/pycurl + ) +" + +S=${WORKDIR} + +QA_PREBUILT="*" + +src_unpack() { + unpack ${A} + unpack ./data.tar.gz + rm -f control.tar.gz data.tar.gz debian-binary + rm -f usr/share/doc/spideroak/copyright +} + +src_prepare() { + epatch "${FILESDIR}"/${PF}-opt-path.patch + use headless && epatch "${FILESDIR}"/${PF}-headless.patch + epatch "${FILESDIR}"/${PF}-patchelf.patch + + # Remove bundled libraries/plugins/python interpreter. Please keep this + # mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the + # list of deleted files below + # + # libcrypto.so.0.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT + # libssl.so.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT + # libcurl.so* => net-misc/curl + # libexpat.so* => dev-libs/expat + # libgcc_s.so => >=sys-devel/gcc-4 + # libstdc++.so* => >=sys-devel/gcc-4 + # libpcre.so* => dev-libs/libpcre + # libpng12* => media-libs/libpng:1.2 + # libQt*.so* => x11-libs/qt-core x11-libs/qt-gui + # libsqlite3.so* => dev-db/sqlite:3 + # libssh2.so* => net-libs/libssh2 + # libz.so* => sys-libs/zlib + # + # pycurl.so => dev-python/pycurl + # + # usr/lib/SpiderOak/py pyexpat.so => dev-lang/python:2.7 + # + if use system-libs; then + for lib in \ + libcrypto.so.$SSL_SLOT \ + libssl.so.$SSL_SLOT \ + libcurl.so* \ + libexpat.so* \ + libgcc_s.so* \ + libpcre.so* \ + libpng12* \ + libQt*.so* \ + libsqlite3.so* \ + libssh2.so* \ + libstdc++.so* \ + libz.so* \ + pycurl.so \ + pyexpat.so + do + rm usr/lib/SpiderOak/$lib || die "rm $lib failed" + done + + # Remove bundled python interpreter => dev-lang/python:2.7 + rm usr/lib/SpiderOak/py || die "rm py failed" + fi +} + +src_install() { + #install the executable script + exeinto /usr/bin + doexe usr/bin/SpiderOak + + #install the prebundled libraries + dodir /opt + cp -pPR usr/lib/SpiderOak "${ED}"/opt/ + + #install the config files + rm -rf etc/apt + use dbus || rm -rf etc/dbus-1 + insinto / + doins -r etc + + #install the changelog + insinto /usr/share/doc/${P} + doins usr/share/doc/spideroak/changelog.gz + + if ! use headless ; then + domenu usr/share/applications/spideroak.desktop + doicon usr/share/pixmaps/spideroak.png + fi +} + +pkg_postinst() { + if use headless; then + einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:" + einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/" + einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/" + fi + if use system-libs; then + einfo "You have chosen to use your system libraries rather than the precompiled libraries that" + einfo "SpiderOak bundles with their software. While upstream discourages this (see bug #398313)," + einfo "there are advantages to using the system libraries, like reducing the size of the package" + einfo "on your hard drive. For more reasons why bundled librars are not a good idea, see" + einfo " https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries" + fi +} |