diff options
author | Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2018-07-08 10:22:20 +0200 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2018-07-08 01:43:11 -0700 |
commit | 52ccb37a1379350dac1b0a00884f46f8ccdb9a7b (patch) | |
tree | fe7757fb794128436b11d9ffa8908a065bcee63e /app-text/calibre | |
parent | dev-util/bcc: version bump to 0.6.0 (diff) | |
download | gentoo-52ccb37a1379350dac1b0a00884f46f8ccdb9a7b.tar.gz gentoo-52ccb37a1379350dac1b0a00884f46f8ccdb9a7b.tar.bz2 gentoo-52ccb37a1379350dac1b0a00884f46f8ccdb9a7b.zip |
app-text/calibre: remove unused patch/files
Closes: https://github.com/gentoo/gentoo/pull/9119
Diffstat (limited to 'app-text/calibre')
-rw-r--r-- | app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch | 37 | ||||
-rw-r--r-- | app-text/calibre/files/calibre-server.conf | 13 | ||||
-rw-r--r-- | app-text/calibre/files/calibre-server.init | 58 |
3 files changed, 0 insertions, 108 deletions
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 <zmedico@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 - 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='<user home directory>/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 $? -} |