From 62f82c107c3904ac6917ece47301d2999c7dd90e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:17:25 +0100 Subject: gentoo resync : 14.07.2018 --- app-text/calibre/Manifest | 3 -- ...libre-2.83.0-lzxd-bounds-error-bug-540596.patch | 37 -------------- app-text/calibre/files/calibre-server.conf | 13 ----- app-text/calibre/files/calibre-server.init | 58 ---------------------- 4 files changed, 111 deletions(-) delete mode 100644 app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch delete mode 100644 app-text/calibre/files/calibre-server.conf delete mode 100644 app-text/calibre/files/calibre-server.init (limited to 'app-text/calibre') diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 86ba33194ca5..0596c4a9b93e 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,10 +1,7 @@ -AUX calibre-2.83.0-lzxd-bounds-error-bug-540596.patch 1296 BLAKE2B a600a8777868b7f73c95d62de9097382cb1d3e076ea756b589811f5e33aa86f1724f93177d82247132a85779ff82960f178cc325b497f8b7f1391ff113729c69 SHA512 fba16c95a69b38113d4331faceae4a81f2319ae1631a03662bd3483ad6f1b687d16db28f9df019990a3bc6918c75f4a4492ca7ef772168a575cb06ff0761bddf AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a -AUX calibre-server.conf 523 BLAKE2B a9fb65a327656f9b2f54eab27dcaf2cdfbcbe5f0d637204ea39f891c515ae899da156098609bc99398354337524843afbf45409bbb1098605f293661bb8381e7 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 -AUX calibre-server.init 1811 BLAKE2B fe22257128896d4299c5d5edab6ac63cdcf79da483f4afc49b0d1649b17599389dd4b9f88c35a964e289cbe6d961136f1e5760a2244137c404e573510899bd60 SHA512 760aa7a8f51b23b116ba07749855737869ff2313f0528d67e5a46bc362e5c0a04a7e1f46c32dd6e82add4fa5dc41d397db32dbd1a09c912008e0890d1a133eeb DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5 EBUILD calibre-3.15.0.ebuild 9288 BLAKE2B cf28b1c8127288117bfaf3454a61a3485c1636cec5c2ab8dd07df47a9b5d3665e0c5a86768e6752ee57d88d24d7eb6cc2c1f78fb46ab53a71db695aec4cfd4da SHA512 fc2c83770465ad21f358b5592da05838527956b9e491ad3f1adead3a575936e5bba5fe1e1153200171ad9aaa3c10e313bd3f5c678614d6e6784651c2d9af33c1 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 deleted file mode 100644 index 5f7d5a4682f9..000000000000 --- a/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f335c8719b224d3ca7a967b6e91cebd5b26684fe Mon Sep 17 00:00:00 2001 -From: Zac Medico -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 - diff --git a/app-text/calibre/files/calibre-server.conf b/app-text/calibre/files/calibre-server.conf deleted file mode 100644 index c1bed84289cc..000000000000 --- a/app-text/calibre/files/calibre-server.conf +++ /dev/null @@ -1,13 +0,0 @@ -# /etc/conf.d/calibre-server -# Change this to the user you want to run calibre-server as. -# You may specify a group too, after a colon -# NOTE: This must be set and not to root! -CALIBRE_USER= - -# Set the path of the library to serve. -# Defaults to the default location for CALIBRE_USER. -#CALIBRE_LIBRARY='/Calibre Library' - -# Extra options to pass to calibre-server. -# See the calibre-server man page for more options. -#CALIBRE_OPTS="--username calibre --password password --thread-pool 10 --port 8080" diff --git a/app-text/calibre/files/calibre-server.init b/app-text/calibre/files/calibre-server.init deleted file mode 100644 index 2f905424cfa7..000000000000 --- a/app-text/calibre/files/calibre-server.init +++ /dev/null @@ -1,58 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -depend() { - need net - need localmount - after bootmisc -} - -checkconfig() { - if [ "${CALIBRE_USER}" = "" -o "${CALIBRE_USER}" = "root" ] ; then - eerror "Please edit /etc/conf.d/calibre-server" - eerror "You have to specify a user to run calibre-server as, as we will not run it as root!" - eerror "Modify CALIBRE_USER to your needs (you can also add a group, after a colon)" - return 1 - fi - if ! getent passwd "${CALIBRE_USER%:*}" >/dev/null ; then - eerror "Please edit /etc/conf.d/calibre-server" - eerror "Your user has to exist!" - return 1 - fi - if [ "${CALIBRE_USER%:*}" != "${CALIBRE_USER}" ] ; then - if ! getent group "${CALIBRE_USER#*:}" >/dev/null ; then - eerror "Please edit /etc/conf.d/calibre-server" - eerror "Your group has to exist too!" - return 1 - fi - fi - if [ "${CALIBRE_LIBRARY}" = "" ] ; then - CALIBRE_USER_HOME=$(getent passwd "${CALIBRE_USER%:*}" | cut -d ':' -f 6) - CALIBRE_LIBRARY="${CALIBRE_USER_HOME}/Calibre Library" - fi - if [ ! -d "${CALIBRE_LIBRARY}" ] ; then - eerror "Please edit /etc/conf.d/calibre-server" - eerror "The Calibre library, '${CALIBRE_LIBRARY},' does not exist." - eerror "Please modify CALIBRE_LIBRARY to point to a valid library." - return 1 - fi - return 0 -} - -start() { - checkconfig || return $? - local pidfile=/var/run/calibre-server.pid - ebegin "Starting calibre-server" - start-stop-daemon --user "${CALIBRE_USER}" \ - --pidfile "${pidfile}" --make-pidfile --background --exec /usr/bin/calibre-server \ - -- --with-library "${CALIBRE_LIBRARY}" ${CALIBRE_OPTS} - eend $? -} - -stop() { - ebegin "Stopping calibre-server" - start-stop-daemon --stop --user "${CALIBRE_USER}" \ - --pidfile /var/run/calibre-server.pid - eend $? -} -- cgit v1.2.3