Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jackett: update to v0.8.490 #3032

Closed
wants to merge 3 commits into from
Closed

jackett: update to v0.8.490 #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d49f00
jackett: update to v0.8.490
Dec 5, 2017
248f8fd
Update Makefile
kaso17 Dec 5, 2017
35797fa
Merge branch 'master' into master
kaso17 Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cross/jackett/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = Jackett
PKG_VERS = 0.7.1483
PKG_VERS = 0.8.490
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME).Binaries.Mono.$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
Expand Down
6 changes: 3 additions & 3 deletions cross/jackett/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Jackett-0.7.1483.tar.gz SHA1 06f2fade443f025b48be6c432608f90926fb4307
Jackett-0.7.1483.tar.gz SHA256 8d0df0060da892d2fa14364779e2c657c7590e97f76ed93fe996138042e77b9f
Jackett-0.7.1483.tar.gz MD5 ad34a3328a109b78c1c63fc3e3f268d7
Jackett-0.8.490.tar.gz SHA1 e4ab2dee30120f2a715c1fa4464e2c2d16e72f71
Jackett-0.8.490.tar.gz SHA256 9407739aff654a82a4c7580ca0865a54a55570608d3b3510f61498b6b7f44dd5
Jackett-0.8.490.tar.gz MD5 6f65a309cc3bd965cab4293d0a11e865
10 changes: 6 additions & 4 deletions spk/jackett/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
SPK_NAME = jackett
SPK_VERS = 0.7.1483
SPK_REV = 4
SPK_VERS = 0.8.490
SPK_REV = 5
SPK_ICON = src/jackett.png
DSM_UI_DIR = app

DEPENDS = cross/busybox cross/curl cross/$(SPK_NAME)
SPK_DEPENDS = "mono>=4.2.1.102-6"
# depend on mono 5.4 for BTLS HttpWebClient support
SPK_DEPENDS = "mono>=5.4"

MAINTAINER = SynoCommunity
DESCRIPTION = "Jackett works as a proxy server: it translates queries from apps into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps."
ADMIN_PORT = 9117
RELOAD_UI = yes
DISPLAY_NAME = Jackett
BETA = 1
CHANGELOG = Updated to version 0.7.1483
CHANGELOG = Updated to version 0.8.490

HOMEPAGE = https://github.com/Jackett/Jackett
LICENSE = GPLv2
Expand All @@ -28,6 +29,7 @@ INSTALL_PREFIX = /usr/local/$(SPK_NAME)
POST_STRIP_TARGET = jackett_extra_install

REQUIRED_DSM = 5.0
# no PPC support for mono
UNSUPPORTED_ARCHS = $(PPC_ARCHES)

BUSYBOX_CONFIG = usrmng daemon
Expand Down
35 changes: 24 additions & 11 deletions spk/jackett/src/dsm-control.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@
PACKAGE="jackett"
DNAME="Jackett"

#BUILDNUMBER="$(/bin/get_key_value /etc.defaults/VERSION buildnumber)"
SC_USER="sc-jackett"
LEGACY_USER="jackett"
#USER="$([ "${BUILDNUMBER}" -ge "7321" ] && echo -n ${SC_USER} || echo -n ${LEGACY_USER})"
# always use legacy user for now
USER=${LEGACY_USER}

# Others
INSTALL_DIR="/usr/local/${PACKAGE}"
PATH="${INSTALL_DIR}/bin:${PATH}"
BUILDNUMBER="$(/bin/get_key_value /etc.defaults/VERSION buildnumber)"
USER_HOME="$(eval echo ~$USER)"
MONO_PATH="/usr/local/mono/bin"
PATH="${INSTALL_DIR}/bin:${MONO_PATH}:${PATH}"
MONO="${MONO_PATH}/mono"
JACKETT="${INSTALL_DIR}/share/${PACKAGE}/JackettConsole.exe"
COMMAND="env PATH=${MONO_PATH}:${PATH} LD_LIBRARY_PATH=${INSTALL_DIR}/lib ${MONO} -- --debug ${JACKETT}"
HOME_DIR="${INSTALL_DIR}/var"
PID_FILE="${USER_HOME}/jackett.pid"
LOG_FILE="${USER_HOME}/.config/Jackett/log.txt"
LOG_FILE_JACKETT="${HOME_DIR}/.config/Jackett/log.txt"
LOG_FILE_STDERR="${HOME_DIR}/${PACKAGE}-stderr.log"
PID_FILE="${HOME_DIR}/${PACKAGE}.pid"
COMMAND="env HOME=${HOME_DIR} PATH=${PATH} LD_LIBRARY_PATH=${INSTALL_DIR}/lib ${MONO} --debug ${JACKETT} --PIDFile ${PID_FILE}"

SC_USER="sc-jackett"
LEGACY_USER="jackett"
Expand All @@ -24,8 +30,8 @@ USER="$([ "${BUILDNUMBER}" -ge "7321" ] && echo -n ${SC_USER} || echo -n ${LEGAC

start_daemon ()
{
export HOME=${USER_HOME} && start-stop-daemon -c ${USER} -Sqbmp ${PID_FILE} -x ${COMMAND} > /dev/null
sleep 2
start-stop-daemon -S -u ${USER} -c ${USER} -b -p ${PID_FILE} -a /bin/sh -- -c "${COMMAND} 2>${LOG_FILE_STDERR} | logger --id ${PACKAGE}"
sleep 2 # give jackett some time to write the pid file
}

stop_daemon ()
Expand All @@ -36,7 +42,13 @@ stop_daemon ()

daemon_status ()
{
start-stop-daemon -Kqtu ${USER} -p ${PID_FILE}
if [ -n "${PID_FILE}" -a -r "${PID_FILE}" ]; then
if kill -0 $(cat "${PID_FILE}") > /dev/null 2>&1; then
return
fi
rm -f "${PID_FILE}" > /dev/null
fi
return 1
}

wait_for_status ()
Expand Down Expand Up @@ -69,7 +81,7 @@ case $1 in
fi
;;
status)
if daemon_status; then
if daemon_status; then
echo ${DNAME} is running
exit 0
else
Expand All @@ -78,10 +90,11 @@ case $1 in
fi
;;
log)
echo "${LOG_FILE}"
echo "${LOG_FILE_JACKETT}"
exit 0
;;
*)
exit 1
;;
esac