Merge branch 'dsm6' of https://github.com/jvega1976/spksrc into dsm6

* 'dsm6' of https://github.com/jvega1976/spksrc: (83 commits)
  [DSM6] Add support for apollolake and denverton toolchains (6.1) (SynoCommunity#2942)
  [DSM 6] Add support for rtd1296 (SynoCommunity#2890)
  Update 6.1 toolchains digests
  Add dockerx64 DSM 6.1 toolchain
  DSM 6.1 toolchains (SynoCommunity#2727)
  Fix DSM 6.0.2 toolchains digests. SynoCommunity#2733 (SynoCommunity#2737)
  Radarr DSM6 Compatibility: var->.config + version checking fix (SynoCommunity#2746)
  Update Sonarr for DSM6 Compatibility: var->.config + version checking fix/improvement (SynoCommunity#2745)
  Borgbackup (SynoCommunity#2694)
  Determine correct user for web-based packages via BUILDNUMBER - Remove duplicate entries
  znc
  umurmur
  tvheadend
  tt-rss
  transmission
  syncthing
  subliminal
  squidguard
  sonarr
  sickrage
  ...

cross/acl/Makefile

@@ -0,0 +1,21 @@
+PKG_NAME = acl
+PKG_VERS = 2.2.52
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).src.$(PKG_EXT)
+PKG_DIST_SITE = http://download.savannah.gnu.org/releases/acl
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/attr
+
+HOMEPAGE = http://kernel.org/
+COMMENT  = 
+LICENSE  = 
+
+GNU_CONFIGURE = 1
+INSTALL_TARGET = myInstall
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: myInstall
+myInstall:
+	$(RUN) $(MAKE) DIST_ROOT=$(INSTALL_DIR) install install-lib install-dev

cross/acl/PLIST

@@ -0,0 +1,7 @@
+bin:bin/chacl
+bin:bin/getfacl
+bin:bin/setfacl
+lnk::libexec/libacl.so
+lnk:lib/libacl .so
+lnk:lib/libacl.so.1
+lib:lib/libacl.so.1.1.0

cross/acl/digests

@@ -0,0 +1,3 @@
+acl-2.2.52.src.tar.gz SHA1 537dddc0ee7b6aa67960a3de2d36f1e2ff2059d9
+acl-2.2.52.src.tar.gz SHA256 179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23
+acl-2.2.52.src.tar.gz MD5 a61415312426e9c2212bd7dc7929abda

cross/acl/patches/shell.patch

@@ -0,0 +1,11 @@
+--- m4/libtool.m4.old	2011-04-19 19:55:48.000000000 +0200
++++ m4/libtool.m4	2013-02-21 23:10:02.000000000 +0100
+@@ -94,7 +94,7 @@
+ LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='/bin/bash $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+
+ _LT_SETUP

cross/borgbackup/Makefile

@@ -0,0 +1,17 @@
+PKG_NAME = borgbackup
+PKG_VERS = 1.0.10
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/b/$(PKG_NAME)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/acl cross/lz4 cross/openssl
+
+HOMEPAGE = https://borgbackup.readthedocs.io/
+COMMENT  = Deduplicating backup program with compression and authenticated encryption
+LICENSE  = Borg
+
+ENV += BORG_LZ4_PREFIX="$(STAGING_INSTALL_PREFIX)" BORG_OPENSSL_PREFIX="$(STAGING_INSTALL_PREFIX)"
+
+include ../../mk/spksrc.python-wheel.mk
+

cross/borgbackup/digests

@@ -0,0 +1,3 @@
+borgbackup-1.0.10.tar.gz SHA1 d7c021f6595770e6d79fc9741d6505d6cf16d0a6
+borgbackup-1.0.10.tar.gz SHA256 978f28f144924005219da989b1b436a32b2735a34c6d0dc15bb0a1ccffad59e9
+borgbackup-1.0.10.tar.gz MD5 210cebe28da0cdce23a49a4f2102d9be

cross/lz4/Makefile

@@ -0,0 +1,22 @@
+PKG_NAME = lz4
+PKG_VERS = 1.7.5
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/lz4/lz4/archive/
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+HOMEPAGE = https://github.com/lz4/lz4
+COMMENT  = LZ4 is lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU.
+LICENSE  = BSD
+
+CONFIGURE_TARGET = nop
+INSTALL_TARGET = myInstall
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: myInstall
+myInstall:
+	$(RUN) $(MAKE) install PREFIX=$(STAGING_INSTALL_PREFIX)
+

cross/lz4/PLIST

@@ -0,0 +1,3 @@
+lnk:lib/liblz4.so
+lnk:lib/liblz4.so.1
+lib:lib/liblz4.so.1.7.5

cross/lz4/digests

@@ -0,0 +1,3 @@
+v1.7.5.tar.gz SHA1 a710a7d45beb0951806d2b98f0c1739107e97c14
+v1.7.5.tar.gz SHA256 0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e
+v1.7.5.tar.gz MD5 c9610c5ce97eb431dddddf0073d919b9

cross/nzbget-testing/Makefile

@@ -1,6 +1,6 @@
 PKG_NAME = nzbget
-PKG_VERS = 16.0
-PKG_REV = 1439
+PKG_VERS = 18.0
+PKG_REV = 1858
 PKG_EXT = tar.gz
 PKG_DIST_SITE = https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/v$(PKG_VERS)-r$(PKG_REV)
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-testing-r$(PKG_REV)-src.$(PKG_EXT)

cross/nzbget-testing/digests

@@ -1,3 +1,3 @@
-nzbget-16.0-testing-r1439-src.tar.gz SHA1 f8a49a2156904079c450457bfb79df88bbf501ad
-nzbget-16.0-testing-r1439-src.tar.gz SHA256 7505a948e43e495f77d45bddd3df39860356f1010cab38b3ce97f403627bc639
-nzbget-16.0-testing-r1439-src.tar.gz MD5 06ef73ddeb9e75e201095d467dec3870
+nzbget-18.0-testing-r1858-src.tar.gz SHA1 906848c342481953464072ae1029bf55eb8628d9
+nzbget-18.0-testing-r1858-src.tar.gz SHA256 70c99ab23b2aac48ee976dd116f2697fcb378ad403e2700a4243e557062cff23
+nzbget-18.0-testing-r1858-src.tar.gz MD5 035f6a5d884cf9ce82f33b31b534cd18

cross/radarr/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = Radarr
-PKG_VERS = 0.2.0.267
+PKG_VERS = 0.2.0.596
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME).develop.$(PKG_VERS).linux.$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/Radarr/Radarr/releases/download/v$(PKG_VERS)

cross/radarr/digests

@@ -1,3 +1,3 @@
-Radarr.develop.0.2.0.267.linux.tar.gz SHA1 ca9ba6d6dbb29ef6a5302586c3543321d36892cb
-Radarr.develop.0.2.0.267.linux.tar.gz SHA256 711ef19f3160dfe0aecbff4cf01464f77f92e1b19ac69be5efca96321c38f6df
-Radarr.develop.0.2.0.267.linux.tar.gz MD5 a22124abf09a4d26c4647a26e1f62c28
+Radarr.develop.0.2.0.596.linux.tar.gz SHA1 a4cfd6a159474b98c6000cdbd071d7c4ac785fc2
+Radarr.develop.0.2.0.596.linux.tar.gz SHA256 c0f7a3980b03bc5b543fa8ca2dc482ad5cc5b24fb6bb09a40810244d03699b5d
+Radarr.develop.0.2.0.596.linux.tar.gz MD5 2894076a68905283bd5ab164b59fe9a3

cross/sonarr/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = NzbDrone
-PKG_VERS = 2.0.0.4472
+PKG_VERS = 2.0.0.4689
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME).master.$(PKG_VERS).mono.$(PKG_EXT)
 PKG_DIST_SITE = http://download.sonarr.tv/v2/master/mono

cross/sonarr/digests

@@ -1,3 +1,3 @@
-NzbDrone.master.2.0.0.4427.mono.tar.gz SHA1 3651a21cb4927c57881c1a2327515886dbde11dc
-NzbDrone.master.2.0.0.4427.mono.tar.gz SHA256 8229b2a9cffdd230ef978e08f171e407491d842ae20b90ec63b9c353fe86d218
-NzbDrone.master.2.0.0.4427.mono.tar.gz MD5 64ef2140f2209410bd8e2f435c43a4b4
+NzbDrone.master.2.0.0.4689.mono.tar.gz SHA1 d87cac0fe5e98b2898bb3df575296ea75f1d9284
+NzbDrone.master.2.0.0.4689.mono.tar.gz SHA256 93afe3a5e7bd4c285aacb6d3c94fb4251c0de845761b82e37cc6fa85926dd614
+NzbDrone.master.2.0.0.4689.mono.tar.gz MD5 9a6ff66d6e1e3e1a7ac68dba3cdf0f5c

mk/spksrc.common.mk

@@ -30,15 +30,16 @@ LEGACY_ARCHS = $(sort $(filter-out $(SUPPORTED_ARCHS), $(AVAILABLE_ARCHS)))
 
 # Use x64 when kernels are not needed
 ARCHS_NO_KRNLSUPP = $(filter-out x64%, $(SUPPORTED_ARCHS))
-ARCHS_DUPES = $(filter-out x86% braswell% bromolow% cedarview% avoton%, $(SUPPORTED_ARCHS))
+ARCHS_DUPES = $(filter-out avoton% braswell% broadwell% bromolow% cedarview% grantley% x86%, $(SUPPORTED_ARCHS))
 
 # Available Arches
 ARM5_ARCHES = 88f5281 88f6281
 ARM7_ARCHES = alpine armada370 armada375 armada38x armadaxp comcerto2k monaco
-ARM_ARCHES = $(ARM5_ARCHES) $(ARM7_ARCHES)
+ARM8_ARCHES = rtd1296
+ARM_ARCHES = $(ARM5_ARCHES) $(ARM7_ARCHES) $(ARM8_ARCHES)
 PPC_ARCHES = powerpc ppc824x ppc853x ppc854x qoriq
 x86_ARCHES = evansport
-x64_ARCHES = avoton braswell broadwell bromolow cedarview dockerx64 grantley kvm64 x86 x64 x86_64
+x64_ARCHES = apollolake avoton braswell broadwell bromolow cedarview denverton dockerx64 grantley kvm64 x86 x64 x86_64
 
 # Load local configuration
 LOCAL_CONFIG_MK = ../../local.mk

spk/adminer/src/installer.sh

@@ -9,9 +9,10 @@ PACKAGE_NAME="com.synocommunity.packages.${SHORTNAME}"
 # Others
 INSTALL_DIR="/usr/local/${PACKAGE}"
 WEB_DIR="/var/services/web"
-USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)"
 TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp"
+BUILDNUMBER="$(/bin/get_key_value /etc.defaults/VERSION buildnumber)"
 
+USER="$([ "${BUILDNUMBER}" -ge "4418" ] && echo -n http || echo -n nobody)"
 
 preinst ()
 {

spk/bicbucstriim/src/installer.sh

@@ -9,8 +9,10 @@ PACKAGE_NAME="com.synocommunity.packages.${SHORTNAME}"
 # Others
 INSTALL_DIR="/usr/local/${PACKAGE}"
 WEB_DIR="/var/services/web"
-USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)"
 TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp"
+BUILDNUMBER="$(/bin/get_key_value /etc.defaults/VERSION buildnumber)"
+
+USER="$([ "${BUILDNUMBER}" -ge "4418" ] && echo -n http || echo -n nobody)"
 
 
 preinst ()

spk/bitlbee/Makefile

@@ -14,11 +14,11 @@ CHANGELOG = Update to 3.4.2
 HOMEPAGE = http://www.bitlbee.org/
 LICENSE  = GPLv2
 
-WIZARDS_DIR = src/wizard/
-
 INSTALLER_SCRIPT = src/installer.sh
 SSS_SCRIPT       = src/dsm-control.sh
 FWPORTS          = src/${SPK_NAME}.sc
+CONF_DIR         = src/conf/
+
 
 INSTALL_PREFIX = /usr/local/$(SPK_NAME)
 

spk/bitlbee/src/conf/privilege

@@ -0,0 +1,31 @@
+{
+	"defaults":{
+		"run-as": "package"
+	},
+	"username": "sc-bitlbee",
+	"ctrl-script": [{
+		"action": "preinst",
+		"run-as": "root"
+	}, {
+		"action": "postinst",
+		"run-as": "root"
+	}, {
+		"action": "preuninst",
+		"run-as": "root"
+	}, {
+		"action": "postuninst",
+		"run-as": "root"
+	}, {
+		"action": "preupgrade",
+		"run-as": "root"
+	}, {
+		"action": "postupgrade",
+		"run-as": "root"
+	}, {
+		"action": "start",
+		"run-as": "root"
+	}, {
+		"action": "stop",
+		"run-as": "root"
+	}]
+}

spk/bitlbee/src/dsm-control.sh

@@ -7,15 +7,19 @@ DNAME="BitlBee"
 # Others
 INSTALL_DIR="/usr/local/${PACKAGE}"
 PATH="${INSTALL_DIR}/bin:${INSTALL_DIR}/sbin:/usr/local/bin:/bin:/usr/bin:/usr/syno/bin"
-USER="bitlbee"
+BUILDNUMBER="$(/bin/get_key_value /etc.defaults/VERSION buildnumber)"
 BITLBEE="${INSTALL_DIR}/sbin/bitlbee"
 CFG_FILE="${INSTALL_DIR}/var/bitlbee.conf"
 PID_FILE="${INSTALL_DIR}/var/bitlbee.pid"
 
+SC_USER="sc-bitlbee"
+LEGACY_USER="bitlbee"
+USER="$([ "${BUILDNUMBER}" -ge "7321" ] && echo -n ${SC_USER} || echo -n ${LEGACY_USER})"
+
 
 start_daemon ()
 {
-    su - ${USER} -c "LD_LIBRARY_PATH=${INSTALL_DIR}/lib ${BITLBEE} -c ${CFG_FILE}"
+    su ${USER} -s /bin/sh -c "LD_LIBRARY_PATH=${INSTALL_DIR}/lib ${BITLBEE} -c ${CFG_FILE}"
 }
 
 stop_daemon ()

spk/bitlbee/src/installer.sh

@@ -7,16 +7,21 @@ DNAME="BitlBee"
 # Others
 INSTALL_DIR="/usr/local/${PACKAGE}"
 SSS="/var/packages/${PACKAGE}/scripts/start-stop-status"
-PATH="${INSTALL_DIR}/bin:${INSTALL_DIR}/sbin:/usr/local/bin:/bin:/usr/bin:/usr/syno/bin"
-USER="bitlbee"
-GROUP="nobody"
+PATH="${INSTALL_DIR}/bin:${INSTALL_DIR}/sbin:${PATH}"
 BITLBEE="${INSTALL_DIR}/sbin/bitlbee"
 CFG_FILE="${INSTALL_DIR}/var/bitlbee.conf"
 TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp"
-
 SERVICETOOL="/usr/syno/bin/servicetool"
+BUILDNUMBER="$(/bin/get_key_value /etc.defaults/VERSION buildnumber)"
 FWPORTS="/var/packages/${PACKAGE}/scripts/${PACKAGE}.sc"
 
+DSM6_UPGRADE="${INSTALL_DIR}/var/.dsm6_upgrade"
+SC_USER="sc-bitlbee"
+LEGACY_USER="bitlbee"
+LEGACY_GROUP="nobody"
+USER="$([ "${BUILDNUMBER}" -ge "7321" ] && echo -n ${SC_USER} || echo -n ${LEGACY_USER})"
+
+
 preinst ()
 {
     exit 0
@@ -30,8 +35,10 @@ postinst ()
     # Install busybox stuff
     ${INSTALL_DIR}/bin/busybox --install ${INSTALL_DIR}/bin
 
-    # Create user
-    adduser -h ${INSTALL_DIR}/var -g "${DNAME} User" -G ${GROUP} -s /bin/sh -S -D ${USER}
+    # Create legacy user
+    if [ "${BUILDNUMBER}" -lt "7321" ]; then
+        adduser -h ${INSTALL_DIR}/var -g "${DNAME} User" -G ${LEGACY_GROUP} -s /bin/sh -S -D ${LEGACY_USER}
+    fi
 
     # Edit the configuration according to the wizard
     sed -i -e "s|@auth_password@|`LD_LIBRARY_PATH=${INSTALL_DIR}/lib ${BITLBEE} -x hash ${wizard_auth_password:=admin}`|g" ${CFG_FILE}
@@ -51,14 +58,12 @@ preuninst ()
     # Stop the package
     ${SSS} stop > /dev/null
 
-    # Remove the user (if not upgrading)
     if [ "${SYNOPKG_PKG_STATUS}" != "UPGRADE" ]; then
-        delgroup ${USER} ${GROUP}
+        # Remove the user (if not upgrading)
+        delgroup ${LEGACY_USER} ${LEGACY_GROUP}
         deluser ${USER}
-    fi
 
-    # Remove firewall config
-    if [ "${SYNOPKG_PKG_STATUS}" == "UNINSTALL" ]; then
+        # Remove firewall configuration
         ${SERVICETOOL} --remove-configure-file --package ${PACKAGE}.sc >> /dev/null
     fi
 
@@ -78,6 +83,13 @@ preupgrade ()
     # Stop the package
     ${SSS} stop > /dev/null
 
+    # DSM6 Upgrade handling
+    if [ "${BUILDNUMBER}" -ge "7321" ] && [ ! -f ${DSM6_UPGRADE} ]; then
+        echo "Deleting legacy user" > ${DSM6_UPGRADE}
+        delgroup ${LEGACY_USER} ${LEGACY_GROUP}
+        deluser ${LEGACY_USER}
+    fi
+
     # Save some stuff
     rm -fr ${TMP_DIR}/${PACKAGE}
     mkdir -p ${TMP_DIR}/${PACKAGE}

spk/borgbackup/Makefile

@@ -0,0 +1,27 @@
+SPK_NAME = borgbackup
+SPK_VERS = 1.0.10
+SPK_REV = 2
+SPK_ICON = src/$(SPK_NAME).png
+
+BUILD_DEPENDS = cross/python3 cross/setuptools cross/pip cross/wheel
+BUILD_DEPENDS += cross/$(SPK_NAME)
+DEPENDS = cross/bash
+WHEELS = src/requirements.txt
+SPK_DEPENDS = "python3>=3.5.2-6"
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = Deduplicating backup program with compression and authenticated encryption.
+STARTABLE = no
+DISPLAY_NAME = Borg
+CHANGELOG = "1. First release<br>2. Add borgmatic"
+BETA = 1
+
+HOMEPAGE = https://borgbackup.readthedocs.io
+LICENSE  = Borg
+
+INSTALLER_SCRIPT = src/installer.sh
+SSS_SCRIPT       = src/dsm-control.sh
+
+INSTALL_PREFIX = /usr/local/$(SPK_NAME)
+
+include ../../mk/spksrc.spk.mk

spk/borgbackup/PLIST

@@ -0,0 +1 @@
+rsc:share/wheelhouse

spk/borgbackup/src/dsm-control.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Package
+PACKAGE="borgbackup"
+DNAME="Borg"
+
+# Others
+INSTALL_DIR="/usr/local/${PACKAGE}"
+
+
+case $1 in
+    start)
+        exit 0
+        ;;
+    stop)
+        exit 0
+        ;;
+    status)
+        exit 0
+        ;;
+    log)
+        exit 1
+        ;;
+    *)
+        exit 1
+        ;;
+esac