commit: ad7760cb092e53a642eae2952ad277b01ddaab66 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Apr 23 23:58:11 2017 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Apr 24 00:05:13 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7760cb
app-text/calibre: version bump to 2.83.0 Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-text/calibre/Manifest | 1 + app-text/calibre/calibre-2.83.0.ebuild | 251 +++++++++++++++++++++ ...libre-2.83.0-lzxd-bounds-error-bug-540596.patch | 37 +++ 3 files changed, 289 insertions(+) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index cc4db3db000..9d0294abe41 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,2 +1,3 @@ DIST calibre-2.78.0.tar.xz 38739404 SHA256 d2b0b0c5451d3ac05ce9de0b801ddf8de7664fee45f273d7ee8445a1ec2f898b SHA512 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca WHIRLPOOL 325fc344445078ef0df0a29b4cd8e32445a881ede89e3db87606166ff0c8b7db10b7cc34432e63c2bb49382537a5107686339b987f1be807d59a1786ddfd4a75 DIST calibre-2.80.0.tar.xz 38781996 SHA256 33a6dbc578c7a2f3d1c97253769506a1afc10f688c062f027d64d7081618f2b1 SHA512 9dc874cd7bfcc883514e354a494a83c63d19b88980df8f28fc03b57d3ebaafb45dad36f0d61e8ef08d363ed18a7bd953e8d624c69f0c3d7f7d66308fceac8982 WHIRLPOOL b40701e810d9a9fab333f420bb1f14a89ac55dd7397407d4f31837efc97d323f74b94181436b8038004e404aff6e9c5696deee89daf1cd949e5659dbe43207c4 +DIST calibre-2.83.0.tar.xz 38875672 SHA256 96166e8c74047cfbae9289c38ab5e2f661168048e568cd187f908242d98426ab SHA512 a28aa52379bc317e648087b28859a8e2c50dd4e2ccb3352e135f896ad95ab9c85c1fba162fe3acd5056be80e7c4e9481ea1396cb638661cfdb27795051124821 WHIRLPOOL bcce15cbfdcf78a56a24f931ae4eed688c7409af0455e9f1ca7aaf00751fa0b4a55e570501bc1b10d02a8e8397df979a18a999b4ddbbb645a7a376cded76cbec diff --git a/app-text/calibre/calibre-2.83.0.ebuild b/app-text/calibre/calibre-2.83.0.ebuild new file mode 100644 index 00000000000..edd2bf35f9d --- /dev/null +++ b/app-text/calibre/calibre-2.83.0.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1 + +DESCRIPTION="Ebook management application" +HOMEPAGE="http://calibre-ebook.com/"; +SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"; + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 + unRAR +" +KEYWORDS="~amd64 ~arm ~x86" +SLOT="0" +IUSE="+udisks" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/podofo-0.8.2:= + >=app-text/poppler-0.26.5[qt5] + >=dev-libs/chmlib-0.40:= + dev-libs/glib:2 + >=dev-libs/icu-4.4:= + >=dev-python/apsw-3.7.17[${PYTHON_USEDEP}] + >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}] + >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] + >=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}] + >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}] + >=dev-python/lxml-3.2.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}] + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}] + >=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}] + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + media-fonts/liberation-fonts + >=media-gfx/imagemagick-6.5.9[jpeg,png] + media-libs/fontconfig + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.5:= + >=media-libs/libwmf-0.2.8 + sys-libs/zlib + virtual/libusb:1= + virtual/python-dnspython[${PYTHON_USEDEP}] + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + >=x11-misc/xdg-utils-1.0.2-r2 + udisks? ( virtual/libudev )" +RDEPEND="${COMMON_DEPEND} + udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" +DEPEND="${COMMON_DEPEND} + >=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}] + >=virtual/podofo-build-0.8.2 + virtual/pkgconfig" + +src_prepare() { + # no_updates: do not annoy user with "new version is availible all the time + # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface + eapply \ + "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ + "${FILESDIR}/${PN}-disable_plugins.patch" \ + "${FILESDIR}/${PN}-2.83.0-lzxd-bounds-error-bug-540596.patch" + + eapply_user + + # Fix outdated version constant. + #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ + # -i src/calibre/constants.py || \ + # die "sed failed to patch constants.py" + + # Avoid sandbox violation in /usr/share/gnome/apps when linux.py + # calls xdg-* (bug #258938). + sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \ + -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ + -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \ + -e "s|, PreserveMIMEDefaults():|:|" \ + -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \ + -e "s|cmd\[2\]|cmd[4]|" \ + -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ + -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \ + -i src/calibre/linux.py || die "sed failed to patch linux.py" + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + sed -e "/^ self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\ +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ +'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ +'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ +'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ +'-i', 'Makefile'])" \ + -i setup/build.py || die "sed failed to patch build.py" + + # use system beautifulsoup, instead of bundled + rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \ + || die "could not remove bundled beautifulsoup" + find "${S}" -type f -name \*.py -exec \ + sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \ + || die "could not sed bundled beautifulsoup out of the source tree" + + # avoid failure of xdg tools to recognize vendor prefix + sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \ + -e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \ + -e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \ + -i "${S}"/src/calibre/linux.py || die 'sed failed' + + # don't create/install uninstaller + sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die +} + +src_install() { + # Bypass kbuildsycoca and update-mime-database in order to + # avoid sandbox violations if xdg-mime tries to call them. + cat - > "${T}/kbuildsycoca" <<-EOF + #!${BASH} + echo $0 : $@ + exit 0 + EOF + + cp "${T}"/{kbuildsycoca,update-mime-database} || die + chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die + + export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake" + + # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox + # violation with kbuildsycoca as in bug #287067, comment #13. + export -n DISPLAY + + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANGUAGE + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export XDG_CONFIG_HOME="${HOME}/.config" + export XDG_DATA_HOME="${HOME}/.local/share" + export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre" + mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die + + tc-export CC CXX + # Bug #334243 - respect LDFLAGS when building extensions + export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" + local libdir=$(get_libdir) + [[ -n $libdir ]] || die "get_libdir returned an empty string" + + # Bug #472690 - Avoid sandbox violation for /dev/dri/card0. + local x + for x in /dev/dri/card[0-9] ; do + [[ -e ${x} ]] && addpredict ${x} + done + + #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py + #dodir $(python_get_sitedir) + PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ + "${PYTHON}" setup.py install \ + --root="${D}" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/${libdir}" \ + --staging-root="${ED}usr" \ + --staging-libdir="${ED}usr/${libdir}" || die + + # The menu entries end up here due to '--mode user' being added to + # xdg-* options in src_prepare. + dodir /usr/share/mime/packages + chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local + mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ || + die "failed to register mime types" + dodir /usr/share/icons + mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ || + die "failed to install icon files" + + domenu "${HOME}"/.local/share/applications/*.desktop || + die "failed to install .desktop menu files" + + find "${ED}"usr/share -type d -empty -delete + + cd "${ED}"/usr/share/calibre/fonts/liberation || die + local x + for x in * ; do + [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue + ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die + done + + einfo "Converting python shebangs" + python_fix_shebang "${ED}" + + einfo "Compiling python modules" + python_optimize "${ED}"usr/lib/calibre + + newinitd "${FILESDIR}"/calibre-server.init calibre-server + newconfd "${FILESDIR}"/calibre-server.conf calibre-server + + bashcomp_alias calibre \ + lrfviewer \ + calibre-debug \ + ebook-meta \ + calibre-server \ + ebook-viewer \ + ebook-polish \ + fetch-ebook-metadata \ + lrf2lrs \ + ebook-convert \ + ebook-edit \ + calibre-smtp \ + ebook-device + +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch b/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch new file mode 100644 index 00000000000..5f7d5a4682f --- /dev/null +++ b/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch @@ -0,0 +1,37 @@ +From f335c8719b224d3ca7a967b6e91cebd5b26684fe Mon Sep 17 00:00:00 2001 +From: Zac Medico <zmed...@gentoo.org> +Date: Sun, 23 Apr 2017 16:13:00 -0700 +Subject: [PATCH] Fix bounds error in lzxd_static_init + +https://bugs.gentoo.org/show_bug.cgi?id=540596 +https://github.com/kovidgoyal/calibre/pull/650 + +This includes the changes from the following upstream commits: + +https://github.com/kyz/libmspack/commit/6a42ddd1d472afeaf0f7da91e16b60ab2063fb92 +https://github.com/kyz/libmspack/commit/ce3cc03aa500dd9c0b6b820f9519f6b6b9dede05 +--- + src/calibre/utils/lzx/lzxd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/calibre/utils/lzx/lzxd.c b/src/calibre/utils/lzx/lzxd.c +index e683a9e..c531aaa 100644 +--- a/src/calibre/utils/lzx/lzxd.c ++++ b/src/calibre/utils/lzx/lzxd.c +@@ -357,11 +357,12 @@ static unsigned char extra_bits[51]; + static void lzxd_static_init(void) { + int i, j; + +- for (i = 0, j = 0; i < 51; i += 2) { ++ for (i = 0, j = 0; i < 50; i += 2) { + extra_bits[i] = j; /* 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7... */ + extra_bits[i+1] = j; + if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */ + } ++ extra_bits[50] = 17; + + for (i = 0, j = 0; i < 51; i++) { + position_base[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */ +-- +2.10.2 +
