From 26ad9005a9e50d3014b958d5af601497977c4674 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 11 Oct 2020 13:33:16 -0400 Subject: [PATCH] openssl: update to version 1.1.1h (#4155) * update openssl to 1.1.1h * update openssl dependents * fix python - add patch to fix openssl path in m2crypto * fix build of haproxy * update spk versions/revisions * fix package builds - update htop to 3.0.2 (older versions are not available) - include htop in synocli-monitor for all DSM versions - remove REQUIRED_DSM in sonarr/Makefile for armv7-1.2 (rely on dependency of mono) - cleanup umurmur/Makefile - fix c-ares/Makefile * fix gh status for skipped sonar (nzbdrone) package * fix slang build - add .NOTPARALLEL target to disable parallel make * incorporate codereview * add unsupported ppc853x-5.2 - libwebsockets fails to build for ppc (except qoriq) since update to openssl 1.1. Co-authored-by: hgy59 --- .github/actions/build_status.sh | 2 +- cross/boxbackup/Makefile | 29 ++++++------ cross/boxbackup/digests | 6 +-- cross/fossil-scm/Makefile | 5 +-- cross/fossil-scm/digests | 6 +-- cross/git/Makefile | 2 +- cross/git/digests | 6 +-- cross/haproxy/Makefile | 45 +++++++++++++------ cross/haproxy/digests | 6 +-- cross/htop/Makefile | 4 +- cross/htop/digests | 6 +-- cross/libevent/Makefile | 8 ++-- cross/libevent/PLIST | 20 ++++----- cross/libevent/digests | 6 +-- cross/libwebsockets/Makefile | 3 ++ cross/links/Makefile | 8 +--- cross/links/digests | 6 +-- cross/lua/Makefile | 17 ++++--- cross/m2crypto/Makefile | 2 +- cross/m2crypto/digests | 6 +-- .../patches/001-fix-openssl-path.patch | 13 ++++++ cross/m2crypto/patches/001-fix-paths.patch | 11 ----- cross/mc/Makefile | 2 +- cross/mc/digests | 6 +-- cross/monit/Makefile | 12 ++++- cross/monit/digests | 6 +-- cross/openssl/Makefile | 43 +++++++++--------- cross/openssl/PLIST | 19 +++----- cross/openssl/digests | 6 +-- cross/openssl/patches/001-ld-rpath.patch | 11 ----- .../patches/002-synology-targets.patch | 26 ----------- cross/slang/Makefile | 11 ++--- cross/slang/PLIST | 1 + cross/slang/patches/001-WCONTINUED-fix.patch | 13 ------ .../patches/001-disable-parallel-make.patch | 37 +++++++++++++++ cross/znc/Makefile | 6 +-- diyspk/htop/Makefile | 6 +-- diyspk/mc/Makefile | 6 +-- spk/borgbackup/Makefile | 5 ++- spk/boxbackup-client/Makefile | 5 ++- spk/deluge/Makefile | 5 ++- spk/domoticz/Makefile | 4 +- spk/fossil-scm/Makefile | 8 ++-- spk/git/Makefile | 6 +-- spk/haproxy/Makefile | 8 ++-- spk/homeassistant/Makefile | 4 +- spk/icecast/Makefile | 4 +- spk/irssi/Makefile | 3 +- spk/itools/Makefile | 4 +- spk/lidarr/Makefile | 2 +- spk/links/Makefile | 6 +-- spk/mosquitto/Makefile | 7 ++- spk/mtproxy/Makefile | 4 +- spk/mutt/Makefile | 4 +- spk/python/Makefile | 4 +- spk/python3/Makefile | 4 +- spk/radarr/Makefile | 2 +- spk/radarr/PLIST | 0 spk/rutorrent/Makefile | 4 +- spk/rutorrent/PLIST | 0 spk/sonarr/Makefile | 3 +- spk/synocli-disk/Makefile | 4 +- spk/synocli-file/Makefile | 6 +-- spk/synocli-monitor/Makefile | 19 ++++---- spk/synocli-net/Makefile | 4 +- spk/transmission/Makefile | 4 +- spk/tvheadend/Makefile | 4 +- spk/umurmur/Makefile | 6 +-- spk/znc/Makefile | 6 +-- 69 files changed, 294 insertions(+), 283 deletions(-) create mode 100644 cross/m2crypto/patches/001-fix-openssl-path.patch delete mode 100644 cross/m2crypto/patches/001-fix-paths.patch delete mode 100644 cross/openssl/patches/001-ld-rpath.patch delete mode 100644 cross/openssl/patches/002-synology-targets.patch delete mode 100644 cross/slang/patches/001-WCONTINUED-fix.patch create mode 100644 cross/slang/patches/001-disable-parallel-make.patch create mode 100644 spk/radarr/PLIST create mode 100644 spk/rutorrent/PLIST diff --git a/.github/actions/build_status.sh b/.github/actions/build_status.sh index 8181d65e1dd..370267debac 100755 --- a/.github/actions/build_status.sh +++ b/.github/actions/build_status.sh @@ -44,7 +44,7 @@ if [ -f "${BUILD_UNSUPPORTED_FILE}" ]; then unsupported_packages=$(cat "${BUILD_UNSUPPORTED_FILE}" | grep -Po "\- \K.*:" | sort -u | tr '\n' '|' | sed -e 's/|$//') # fix for packages with different name if [ "$(echo ${unsupported_packages} | grep -ow nzbdrone)" != "" ]; then - unsupported_packages=$(echo "${unsupported_packages}|sonarr") + unsupported_packages=$(echo "${unsupported_packages}|sonarr:") fi cat "${BUILD_ERROR_FILE}" | grep -Pv "\- (${unsupported_packages}) " > "${BUILD_ERROR_FILE}.tmp" rm -f "${BUILD_ERROR_FILE}" diff --git a/cross/boxbackup/Makefile b/cross/boxbackup/Makefile index 46b84df8813..1ede118dc40 100644 --- a/cross/boxbackup/Makefile +++ b/cross/boxbackup/Makefile @@ -1,30 +1,33 @@ -PKG_NAME = boxbackup -PKG_VERS = 0.11.1 +PKG_NAME = BoxBackup +PKG_VERS = 0.12 +PKG_VERS_DATE = 200326 +PKG_VERS_BRANCH = master +PKG_VERS_COMMIT = 8e8b63c PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_VERS_BRANCH).$(PKG_VERS_DATE).$(PKG_VERS_COMMIT).$(PKG_EXT) PKG_DIST_SITE = https://github.com/boxbackup/boxbackup/archive PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) +PKG_DIR = boxbackup-$(PKG_NAME)-$(PKG_VERS).$(PKG_VERS_BRANCH).$(PKG_VERS_DATE).$(PKG_VERS_COMMIT) -DEPENDS = cross/openssl cross/readline cross/berkeleydb +DEPENDS = cross/openssl cross/berkeleydb -HOMEPAGE = http://www.boxbackup.org/ +HOMEPAGE = https://www.boxbackup.org/ COMMENT = Box Backup is an open source, completely automatic, on-line backup system LICENSE = BSD/GPL GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --with-random=/dev/urandom --enable-gnu-readline box_cv_have_large_file_support=yes +CONFIGURE_ARGS = --with-random=/dev/urandom box_cv_have_large_file_support=yes -PRE_CONFIGURE_TARGET = myPreConfigure -INSTALL_TARGET = myInstall +PRE_CONFIGURE_TARGET = boxbackup_pre_configure +INSTALL_TARGET = boxbackup_install include ../../mk/spksrc.cross-cc.mk -.PHONY: myPreConfigure -myPreConfigure: +.PHONY: boxbackup_pre_configure +boxbackup_pre_configure: $(RUN) ./bootstrap -.PHONY: myInstall -myInstall: +.PHONY: boxbackup_install +boxbackup_install: $(RUN) $(MAKE) install-backup-client DESTDIR=$(INSTALL_DIR) $(RUN) $(MAKE) install-backup-server DESTDIR=$(INSTALL_DIR) diff --git a/cross/boxbackup/digests b/cross/boxbackup/digests index bfa83b036bb..736dd180748 100644 --- a/cross/boxbackup/digests +++ b/cross/boxbackup/digests @@ -1,3 +1,3 @@ -boxbackup-0.11.1.tar.gz SHA1 42cfc692220d97a22cf3cfd8413847122d061fa0 -boxbackup-0.11.1.tar.gz SHA256 135da2be32f89a4dd4ea26569b9d422f938dee891fd2a54e4dfd93cfd81954b9 -boxbackup-0.11.1.tar.gz MD5 358b1b6778b77c78e37774cbf7a9f0bb +BoxBackup-0.12.tar.gz SHA1 5fb67b6b8221d23485c41481968c49515873af77 +BoxBackup-0.12.tar.gz SHA256 93a2e60906b575a8131f0e1fce534a5ed1a5f967cb8975eb472b79dcd777dec2 +BoxBackup-0.12.tar.gz MD5 3b33f8af3333f38316c02f6a453e08b1 diff --git a/cross/fossil-scm/Makefile b/cross/fossil-scm/Makefile index 37e82492da0..b9229ec692e 100644 --- a/cross/fossil-scm/Makefile +++ b/cross/fossil-scm/Makefile @@ -1,5 +1,5 @@ PKG_NAME = fossil-scm -PKG_VERS = 2.10 +PKG_VERS = 2.12.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://www.fossil-scm.org/index.html/tarball/version-$(PKG_VERS) @@ -15,7 +15,7 @@ LICENSE = BSD2 PRE_CONFIGURE_TARGET = fossil-scm_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --static --json +CONFIGURE_ARGS = --json CONFIGURE_ARGS += --disable-fusefs CONFIGURE_ARGS += --with-th1-docs --with-th1-hooks CONFIGURE_ARGS += --with-openssl=auto @@ -25,4 +25,3 @@ include ../../mk/spksrc.cross-cc.mk .PHONY: fossil-scm_pre_configure fossil-scm_pre_configure: sed -i.orig -e "s|^BCCFLAGS.*$$|BCCFLAGS = |" $(WORK_DIR)/$(PKG_DIR)/Makefile.in - diff --git a/cross/fossil-scm/digests b/cross/fossil-scm/digests index f95f2c0aa60..cb641103cf4 100644 --- a/cross/fossil-scm/digests +++ b/cross/fossil-scm/digests @@ -1,3 +1,3 @@ -fossil-scm-v2.10.tar.gz SHA1 56e64cc7e0ff4773a61bc06c17a31bf020a077ff -fossil-scm-v2.10.tar.gz SHA256 c58cb721c4738301801420c0435a0f2dab68a81e381d5f811d6b4143f8cec151 -fossil-scm-v2.10.tar.gz MD5 ada146d97e57d9ec6d7545826b817110 +fossil-scm-v2.12.1.tar.gz SHA1 95fe8c7bceb58c8bc6b1e8a815b1d4fd26c6fa83 +fossil-scm-v2.12.1.tar.gz SHA256 fd65fbb73ceb84601adbdcff6e2e5819ba1f2eea963c9d6e6a36452b3860c55d +fossil-scm-v2.12.1.tar.gz MD5 8040c3101d9aaeaeaf7e4758399356f6 diff --git a/cross/git/Makefile b/cross/git/Makefile index 7cb8e8f64d3..d869cf5933c 100644 --- a/cross/git/Makefile +++ b/cross/git/Makefile @@ -1,5 +1,5 @@ PKG_NAME = git -PKG_VERS = 2.26.2 +PKG_VERS = 2.28.0 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://kernel.org/pub/software/scm/$(PKG_NAME) diff --git a/cross/git/digests b/cross/git/digests index 226185a17ea..4358b442f38 100644 --- a/cross/git/digests +++ b/cross/git/digests @@ -1,3 +1,3 @@ -git-2.26.2.tar.xz SHA1 bdb5eb6c014d7c372be70782a5155d964abe2c08 -git-2.26.2.tar.xz SHA256 6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848 -git-2.26.2.tar.xz MD5 f9a832256032e711973dd7be4981ab4c +git-2.28.0.tar.xz SHA1 29a70cd3e7bccbbc4233e9c948b036e0b7b6d46a +git-2.28.0.tar.xz SHA256 dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d +git-2.28.0.tar.xz MD5 5fde0206768ed70092d1fcc8f447251a diff --git a/cross/haproxy/Makefile b/cross/haproxy/Makefile index bb26aa96e8a..16b2b375c04 100644 --- a/cross/haproxy/Makefile +++ b/cross/haproxy/Makefile @@ -1,27 +1,46 @@ PKG_NAME = haproxy -PKG_VERS = 1.5.14 +PKG_VERS = 1.8.26 +PKG_MAIN_VERS=$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS))) PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = http://www.haproxy.org/download/1.5/src +PKG_DIST_SITE = http://www.haproxy.org/download/$(PKG_MAIN_VERS)/src PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/openssl cross/zlib +DEPENDS = cross/zlib cross/openssl cross/lua cross/pcre MAINTAINER = SynoCommunity -HOMEPAGE = http://www.haproxy.org +HOMEPAGE = https://www.haproxy.org COMMENT = HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. -LICENSE = GNU GPL 2 +LICENSE = GPLv2 CONFIGURE_TARGET = nop -COMPILE_TARGET = myCompile -INSTALL_TARGET = myInstall -OFLAG = -O3 +INSTALL_TARGET = haproxy_install -include ../../mk/spksrc.cross-cc.mk +BUILD_OPTIONS = USE_TPROXY=1 USE_PTHREAD_PSHARED=1 USE_OPENSSL=1 USE_ZLIB=1 +BUILD_OPTIONS += USE_PCRE=1 USE_STATIC_PCRE=1 PCRE_INC=$(INSTALL_DIR)$(INSTALL_PREFIX)/include +BUILD_OPTIONS += USE_LUA=1 LUA_INC=$(INSTALL_DIR)$(INSTALL_PREFIX)/include LUA_LIB=$(INSTALL_DIR)$(INSTALL_PREFIX)/lib + +include ../../mk/spksrc.common.mk + +ARCH_OPTIONS = + +ifeq ($(findstring $(ARCH), $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x),$(ARCH)) +# ARM5_ARCHES and PPC_ARCHES (except QorIQ) have older kernels and need rt library for clock_gettime() +BUILD_OPTIONS += USE_RT=1 +ADDITIONAL_CFLAGS += -DLUA_32BITS +endif +ifeq ($(findstring $(ARCH), qoriq),$(ARCH)) +BUILD_OPTIONS += ADDLIB=-latomic +endif -.PHONY: myCompile -myCompile: - $(RUN) $(MAKE) TARGET=generic CPU=generic ARCH= USE_OPENSSL=1 USE_TPROXY=1 USE_PTHREAD_PSHARED=1 USE_ZLIB=1 SPKSRC_CFLAGS="$(CFLAGS) $(OFLAG)" SPKSRC_LDFLAGS="$(LDFLAGS)" +ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH)) +ARCH_OPTIONS = ARCH=x86_64 +endif + +COMPILE_MAKE_OPTIONS += TARGET=generic $(ARCH_OPTIONS) $(BUILD_OPTIONS) SPKSRC_CFLAGS="$(CFLAGS)" SPKSRC_LDFLAGS="$(LDFLAGS)" + +include ../../mk/spksrc.cross-cc.mk -myInstall: +.PHONY: haproxy_install +haproxy_install: $(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX) diff --git a/cross/haproxy/digests b/cross/haproxy/digests index 4337a7ad361..33da326b665 100644 --- a/cross/haproxy/digests +++ b/cross/haproxy/digests @@ -1,3 +1,3 @@ -haproxy-1.5.14.tar.gz SHA1 159f5beb8fdc6b8059ae51b53dc935d91c0fb51f -haproxy-1.5.14.tar.gz SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99 -haproxy-1.5.14.tar.gz MD5 ad9d7262b96ba85a0f8c6acc6cb9edde +haproxy-1.8.26.tar.gz SHA1 9a512b101d1bc94213528b59d0c67176cba85a46 +haproxy-1.8.26.tar.gz SHA256 e3c2a81b6f26dcb736a34ebb5f134d3251ceccf30386214655fa7ed6d3afa400 +haproxy-1.8.26.tar.gz MD5 67e0c11997c05826996dba80fdceef2c diff --git a/cross/htop/Makefile b/cross/htop/Makefile index 2da419e7ea4..965da6d1b89 100644 --- a/cross/htop/Makefile +++ b/cross/htop/Makefile @@ -1,8 +1,8 @@ PKG_NAME = htop -PKG_VERS = 2.2.0 +PKG_VERS = 3.0.2 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = http://hisham.hm/htop/releases/$(PKG_VERS) +PKG_DIST_SITE = https://bintray.com/htop/source/download_file?file_path= PKG_DIR = $(PKG_NAME)-$(PKG_VERS) UNSUPPORTED_ARCHS = powerpc ppc824x diff --git a/cross/htop/digests b/cross/htop/digests index d510c96e2d4..f8ee416ce8f 100644 --- a/cross/htop/digests +++ b/cross/htop/digests @@ -1,3 +1,3 @@ -htop-2.2.0.tar.gz SHA1 5da790e6addf495edc4d8ed7d69d1f0de085c7ad -htop-2.2.0.tar.gz SHA256 d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57 -htop-2.2.0.tar.gz MD5 0d816b6beed31edc75babcfbf863ffa8 +htop-3.0.2.tar.gz SHA1 e1d37ccd590cb8345c7b518ef56192d4f1cd8cd4 +htop-3.0.2.tar.gz SHA256 6471d9505daca5c64073fc37dbab4d012ca4fc6a7040a925dad4a7553e3349c4 +htop-3.0.2.tar.gz MD5 fb848a1c91871d134c785bccb560ca8d diff --git a/cross/libevent/Makefile b/cross/libevent/Makefile index 0c13fd2801d..8dfff18edbb 100644 --- a/cross/libevent/Makefile +++ b/cross/libevent/Makefile @@ -1,16 +1,16 @@ PKG_NAME = libevent -PKG_VERS_MAJOR = 2.0 -PKG_VERS_MINOR = 22-stable +PKG_VERS_MAJOR = 2.1 +PKG_VERS_MINOR = 12-stable PKG_VERS = $(PKG_VERS_MAJOR).$(PKG_VERS_MINOR) PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://sourceforge.net/projects/levent/files/release-$(PKG_VERS_MAJOR).$(PKG_VERS_MINOR) +PKG_DIST_SITE = https://github.com/libevent/libevent/releases/download/release-$(PKG_VERS) PKG_DIR = $(PKG_NAME)-$(PKG_VERS_MAJOR).$(PKG_VERS_MINOR) DEPENDS = cross/openssl HOMEPAGE = http://libevent.org -COMMENT = An event notification library +COMMENT = Event notification library LICENSE = http://libevent.org/LICENSE.txt GNU_CONFIGURE = 1 diff --git a/cross/libevent/PLIST b/cross/libevent/PLIST index 1f1ef418563..9a5ec74095d 100644 --- a/cross/libevent/PLIST +++ b/cross/libevent/PLIST @@ -1,16 +1,16 @@ rsc:bin/event_rpcgen.py lnk:lib/libevent.so -lnk:lib/libevent-2.0.so.5 -lib:lib/libevent-2.0.so.5.1.9 +lnk:lib/libevent-2.1.so.7 +lib:lib/libevent-2.1.so.7.0.1 lnk:lib/libevent_core.so -lnk:lib/libevent_core-2.0.so.5 -lib:lib/libevent_core-2.0.so.5.1.9 +lnk:lib/libevent_core-2.1.so.7 +lib:lib/libevent_core-2.1.so.7.0.1 lnk:lib/libevent_extra.so -lnk:lib/libevent_extra-2.0.so.5 -lib:lib/libevent_extra-2.0.so.5.1.9 +lnk:lib/libevent_extra-2.1.so.7 +lib:lib/libevent_extra-2.1.so.7.0.1 lnk:lib/libevent_openssl.so -lnk:lib/libevent_openssl-2.0.so.5 -lib:lib/libevent_openssl-2.0.so.5.1.9 +lnk:lib/libevent_openssl-2.1.so.7 +lib:lib/libevent_openssl-2.1.so.7.0.1 lnk:lib/libevent_pthreads.so -lnk:lib/libevent_pthreads-2.0.so.5 -lib:lib/libevent_pthreads-2.0.so.5.1.9 +lnk:lib/libevent_pthreads-2.1.so.7 +lib:lib/libevent_pthreads-2.1.so.7.0.1 diff --git a/cross/libevent/digests b/cross/libevent/digests index cde079005bc..1b3f6ff0dbf 100644 --- a/cross/libevent/digests +++ b/cross/libevent/digests @@ -1,3 +1,3 @@ -libevent-2.0.22-stable.tar.gz SHA1 a586882bc93a208318c70fc7077ed8fca9862864 -libevent-2.0.22-stable.tar.gz SHA256 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3 -libevent-2.0.22-stable.tar.gz MD5 c4c56f986aa985677ca1db89630a2e11 +libevent-2.1.12-stable.tar.gz SHA1 cd55656a9b5bed630b08f05495230affb7996b21 +libevent-2.1.12-stable.tar.gz SHA256 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb +libevent-2.1.12-stable.tar.gz MD5 b5333f021f880fe76490d8a799cd79f4 diff --git a/cross/libwebsockets/Makefile b/cross/libwebsockets/Makefile index 75b2e0be5ff..c2e3981c7cc 100644 --- a/cross/libwebsockets/Makefile +++ b/cross/libwebsockets/Makefile @@ -8,6 +8,9 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/openssl +# ppc except qoriq +UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x + HOMEPAGE = https://libwebsockets.org/ COMMENT = Libwebsockets (LWS) is a flexible, lightweight pure C library for implementing modern network protocols easily with a tiny footprint, using a nonblocking event loop. LICENSE = MIT diff --git a/cross/links/Makefile b/cross/links/Makefile index ad0fd08bfa8..99c4c5450fa 100644 --- a/cross/links/Makefile +++ b/cross/links/Makefile @@ -1,5 +1,5 @@ PKG_NAME = links -PKG_VERS = 2.12 +PKG_VERS = 2.21 PKG_EXT = tar.bz2 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://links.twibright.com/download @@ -14,10 +14,4 @@ LICENSE = GPLv2 GNU_CONFIGURE = 1 CONFIGURE_ARGS = --with-ssl=openssl -INSTALL_TARGET = myInstall - include ../../mk/spksrc.cross-cc.mk - -.PHONY: myInstall -myInstall: - $(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) diff --git a/cross/links/digests b/cross/links/digests index ed2f85522ea..c333f213dae 100644 --- a/cross/links/digests +++ b/cross/links/digests @@ -1,3 +1,3 @@ -links-2.12.tar.bz2 SHA1 952dfecded9496ff1a73184ce538d08dbbb5152b -links-2.12.tar.bz2 SHA256 98411811ded1e8028f5aed708dd7d8ec0ae63ce24c2991a0241a989b7d09d84e -links-2.12.tar.bz2 MD5 5d763ab72dc57bbc310feb95679c9d14 +links-2.21.tar.bz2 SHA1 58b10c61de1c416f9869da491ae70d117b04ba1d +links-2.21.tar.bz2 SHA256 285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63 +links-2.21.tar.bz2 MD5 b88a46733d6932442ed8a6b751aac6b4 diff --git a/cross/lua/Makefile b/cross/lua/Makefile index aa416f90300..14b1d64c5ca 100644 --- a/cross/lua/Makefile +++ b/cross/lua/Makefile @@ -5,20 +5,20 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.lua.org/ftp/ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/ncurses cross/readline +DEPENDS = cross/ncursesw cross/readline HOMEPAGE = https://www.lua.org/ COMMENT = Lua is a powerful, efficient, lightweight, embeddable scripting language. It supports procedural programming, object-oriented programming, functional programming, data-driven programming, and data description. LICENSE = MIT CONFIGURE_TARGET = nop -COMPILE_TARGET = lua_custom_compile -INSTALL_TARGET = lua_custom_install +COMPILE_TARGET = lua_compile +INSTALL_TARGET = lua_install include ../../mk/spksrc.cross-cc.mk -.PHONY: lua_custom_compile -lua_custom_compile: +.PHONY: lua_compile +lua_compile: @$(RUN) $(MAKE) linux \ CC="$(TC_PATH)$(TC_PREFIX)gcc -fPIC \$$(ALLFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/readline" \ CXX="$(TC_PATH)$(TC_PREFIX)g++ \$$(ALLFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/readline" \ @@ -26,9 +26,8 @@ lua_custom_compile: RANLIB="$(TC_PATH)$(TC_PREFIX)ranlib \$$(ALLFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ LDFLAGS="$(LDFLAGS) -Wl,--rpath,$(INSTALL_PREFIX)/lib" \ - MYLIBS="-lncurses" + MYLIBS="-lncursesw" -.PHONY: lua_custom_install -lua_custom_install: +.PHONY: lua_install +lua_install: @$(RUN) $(MAKE) install INSTALL_TOP=$(STAGING_INSTALL_PREFIX) - diff --git a/cross/m2crypto/Makefile b/cross/m2crypto/Makefile index 7111d5705d6..f22554e2f19 100644 --- a/cross/m2crypto/Makefile +++ b/cross/m2crypto/Makefile @@ -1,5 +1,5 @@ PKG_NAME = M2Crypto -PKG_VERS = 0.25.1 +PKG_VERS = 0.36.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/M/$(PKG_NAME) diff --git a/cross/m2crypto/digests b/cross/m2crypto/digests index 1bd74526397..7ffc5e54fc2 100644 --- a/cross/m2crypto/digests +++ b/cross/m2crypto/digests @@ -1,3 +1,3 @@ -M2Crypto-0.25.1.tar.gz SHA1 44a24c03b9f56aad7c6a9278aa9436ac967bc7e9 -M2Crypto-0.25.1.tar.gz SHA256 ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef -M2Crypto-0.25.1.tar.gz MD5 040234289fbef5bed4029f0f7d1dae35 +M2Crypto-0.36.0.tar.gz SHA1 666735839ad0d9b414cc39937ffad2675297bb02 +M2Crypto-0.36.0.tar.gz SHA256 1542c18e3ee5c01db5031d0b594677536963e3f54ecdf5315aeecb3a595b4dc1 +M2Crypto-0.36.0.tar.gz MD5 b8b34c5b83892096a8676b6f2e8f4e7e diff --git a/cross/m2crypto/patches/001-fix-openssl-path.patch b/cross/m2crypto/patches/001-fix-openssl-path.patch new file mode 100644 index 00000000000..b415f08836e --- /dev/null +++ b/cross/m2crypto/patches/001-fix-openssl-path.patch @@ -0,0 +1,13 @@ +# fix the include path for openssl +--- setup.org.py 2020-07-02 15:36:45.000000000 +0000 ++++ setup.py 2020-09-26 14:36:57.276855700 +0000 +@@ -111,7 +111,7 @@ + def initialize_options(self): + """Overload to enable custom openssl settings to be picked up.""" + build.build.initialize_options(self) +- self.openssl = None ++ self.openssl = os.environ.get('STAGING_INSTALL_PREFIX') + self.bundledlls = None + + + diff --git a/cross/m2crypto/patches/001-fix-paths.patch b/cross/m2crypto/patches/001-fix-paths.patch deleted file mode 100644 index a955a391537..00000000000 --- a/cross/m2crypto/patches/001-fix-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig 2016-07-22 14:43:17.000000000 +0200 -+++ setup.py 2016-12-03 11:22:50.358848097 +0100 -@@ -71,7 +71,7 @@ - self.openssl = 'c:\\pkg' - else: - self.libraries = ['ssl', 'crypto'] -- self.openssl = '/usr' -+ self.openssl = os.environ.get('STAGING_INSTALL_PREFIX') - - def finalize_options(self): - '''Overloaded build_ext implementation to append custom openssl diff --git a/cross/mc/Makefile b/cross/mc/Makefile index 766b338b227..51ca3a947da 100644 --- a/cross/mc/Makefile +++ b/cross/mc/Makefile @@ -1,5 +1,5 @@ PKG_NAME = mc -PKG_VERS = 4.8.23 +PKG_VERS = 4.8.25 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://www.midnight-commander.org/downloads diff --git a/cross/mc/digests b/cross/mc/digests index 1080d3ee63a..8596a22ee7d 100644 --- a/cross/mc/digests +++ b/cross/mc/digests @@ -1,3 +1,3 @@ -mc-4.8.23.tar.xz SHA1 021a33828922b45d18daa23189d6c86d17e61e09 -mc-4.8.23.tar.xz SHA256 dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c -mc-4.8.23.tar.xz MD5 466c3135f727f8ac2102d060a080ace3 +mc-4.8.25.tar.xz SHA1 4082ae830f09e919112aa3fc1d7e5333921a6a33 +mc-4.8.25.tar.xz SHA256 ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a +mc-4.8.25.tar.xz MD5 19f14d368001aac454c28a2ddd2e851b diff --git a/cross/monit/Makefile b/cross/monit/Makefile index cff3b925311..5dde1437d3a 100644 --- a/cross/monit/Makefile +++ b/cross/monit/Makefile @@ -1,5 +1,5 @@ PKG_NAME = monit -PKG_VERS = 5.17.1 +PKG_VERS = 5.27.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://mmonit.com/monit/dist @@ -14,4 +14,14 @@ LICENSE = AGPL GNU_CONFIGURE = 1 CONFIGURE_ARGS = --without-pam libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes --with-ssl-incl-dir=$(STAGING_INSTALL_PREFIX)/include + +include ../../mk/spksrc.common.mk + +ifeq ($(findstring $(ARCH),$(PPC_ARCHES)),$(ARCH)) +CONFIGURE_ARGS += ac_cv_c_bigendian=yes +else +CONFIGURE_ARGS += ac_cv_c_bigendian=no +endif + + include ../../mk/spksrc.cross-cc.mk diff --git a/cross/monit/digests b/cross/monit/digests index a01c4a7a310..fa4afddb6b7 100644 --- a/cross/monit/digests +++ b/cross/monit/digests @@ -1,3 +1,3 @@ -monit-5.17.1.tar.gz SHA1 0f93d82004b8684f55ca3c0d71d11408cc682ad1 -monit-5.17.1.tar.gz SHA256 f71a22cfb6bd91ff46496e72e1d1b1021ecd651e7748131ce0f995cc37ff0b42 -monit-5.17.1.tar.gz MD5 6918ed7411a244c9e158f5e54c86be78 +monit-5.27.0.tar.gz SHA1 212f0024e6aeb37f604a6d250aed2e91504e7e7a +monit-5.27.0.tar.gz SHA256 d8c0deef624f193a952502fe9baabfa66e3d8d057df5738da43f9a37792afca4 +monit-5.27.0.tar.gz MD5 6a582b26bcc1be69d565b98b2f183cfb diff --git a/cross/openssl/Makefile b/cross/openssl/Makefile index 5d40ecfeb03..925305453e9 100644 --- a/cross/openssl/Makefile +++ b/cross/openssl/Makefile @@ -1,59 +1,58 @@ PKG_NAME = openssl -OLD_VERSION = 1.0.2 -PATCH_VERS = u -PKG_VERS = $(OLD_VERSION)$(PATCH_VERS) +VERSION = 1.1.1 +PATCH_VERS = h +PKG_VERS = $(VERSION)$(PATCH_VERS) PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://www.openssl.org/source/old/$(OLD_VERSION)/ +PKG_DIST_SITE = https://www.openssl.org/source PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/zlib HOMEPAGE = http://www.openssl.org -COMMENT = Compression Library -LICENSE = http://www.openssl.org/source/license.html +COMMENT = TLS/SSL and crypto library. +LICENSE = Apache-2.0 CONFIGURE_TARGET = openssl_configure - INSTALL_TARGET = openssl_install -STAGING_INSTALL_PREFIX := $(INSTALL_DIR) - include ../../mk/spksrc.cross-cc.mk +# Use CA certificates provided by DSM +# OpenSSL data area, such as openssl.cnf, certificates and keys. +OPENSSL_DATA_DIR=/etc/ssl + +# Map ARCH to arch expected by openssl Configure OPENSSL_ARCH = + ifeq ($(findstring $(ARCH),$(x64_ARCHES)),$(ARCH)) OPENSSL_ARCH = linux-x86_64 endif ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH)) -OPENSSL_ARCH = linux-generic32 +OPENSSL_ARCH = linux-x86 endif ifeq ($(findstring $(ARCH),$(ARM5_ARCHES)),$(ARCH)) -OPENSSL_ARCH = synology-armle +OPENSSL_ARCH = linux-armv4 -march=armv5 endif ifeq ($(findstring $(ARCH),$(ARM7_ARCHES)),$(ARCH)) -OPENSSL_ARCH = linux-generic32 +OPENSSL_ARCH = linux-armv4 endif ifeq ($(findstring $(ARCH),$(ARM8_ARCHES)),$(ARCH)) OPENSSL_ARCH = linux-aarch64 endif -ifeq ($(findstring $(ARCH), powerpc),$(ARCH)) -OPENSSL_ARCH = synology-ppc -endif -# TODO: validate the best OPENSSL_ARCH for the following archs: -ifeq ($(findstring $(ARCH), ppc824x ppc853x ppc854x qoriq),$(ARCH)) -OPENSSL_ARCH = linux-generic32 +ifeq ($(findstring $(ARCH),$(PPC_ARCHES)),$(ARCH)) +OPENSSL_ARCH = linux-ppc endif + ifeq ($(strip $(OPENSSL_ARCH)),) -# unexpected arch. Please add arch to mk/spksrc.common.mk +# Unexpected CPU architecture. Please add arch to mk/spksrc.common.mk $(error Arch $(ARCH) not expected yet) endif - .PHONY: openssl_configure openssl_configure: - $(RUN) ./Configure --openssldir=/etc/ssl --prefix=$(INSTALL_PREFIX) $(OPENSSL_ARCH) zlib-dynamic shared threads + $(RUN) ./Configure --openssldir=$(OPENSSL_DATA_DIR) --prefix=$(INSTALL_PREFIX) $(OPENSSL_ARCH) zlib-dynamic shared threads .PHONY: openssl_install openssl_install: - $(RUN) $(MAKE) install_sw INSTALL_PREFIX=$(INSTALL_DIR) + $(RUN) $(MAKE) install_sw DESTDIR=$(INSTALL_DIR) diff --git a/cross/openssl/PLIST b/cross/openssl/PLIST index 117d70251c5..70684bc7853 100644 --- a/cross/openssl/PLIST +++ b/cross/openssl/PLIST @@ -1,18 +1,9 @@ rsc:bin/c_rehash bin:bin/openssl -lib:lib/engines/lib4758cca.so -lib:lib/engines/libaep.so -lib:lib/engines/libatalla.so -lib:lib/engines/libcapi.so -lib:lib/engines/libchil.so -lib:lib/engines/libcswift.so -lib:lib/engines/libgmp.so -lib:lib/engines/libgost.so -lib:lib/engines/libnuron.so -lib:lib/engines/libpadlock.so -lib:lib/engines/libsureware.so -lib:lib/engines/libubsec.so +lib:lib/engines-1.1/afalg.so +lib:lib/engines-1.1/capi.so +lib:lib/engines-1.1/padlock.so lnk:lib/libcrypto.so -lib:lib/libcrypto.so.1.0.0 +lib:lib/libcrypto.so.1.1 lnk:lib/libssl.so -lib:lib/libssl.so.1.0.0 +lib:lib/libssl.so.1.1 diff --git a/cross/openssl/digests b/cross/openssl/digests index 4722aaef720..3075fa0a221 100644 --- a/cross/openssl/digests +++ b/cross/openssl/digests @@ -1,3 +1,3 @@ -openssl-1.0.2u.tar.gz SHA1 740916d79ab0d209d2775277b1c6c3ec2f6502b2 -openssl-1.0.2u.tar.gz SHA256 ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 -openssl-1.0.2u.tar.gz MD5 cdc2638f789ecc2db2c91488265686c1 +openssl-1.1.1h.tar.gz SHA1 8d0d099e8973ec851368c8c775e05e1eadca1794 +openssl-1.1.1h.tar.gz SHA256 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 +openssl-1.1.1h.tar.gz MD5 53840c70434793127a3574433494e8d3 diff --git a/cross/openssl/patches/001-ld-rpath.patch b/cross/openssl/patches/001-ld-rpath.patch deleted file mode 100644 index 7c1fd96432d..00000000000 --- a/cross/openssl/patches/001-ld-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.shared.orig 2012-03-19 23:14:57.859439418 -0700 -+++ Makefile.shared 2012-03-19 23:17:17.439441634 -0700 -@@ -151,7 +152,7 @@ - SHLIB_SUFFIX=; \ - ALLSYMSFLAGS='-Wl,--whole-archive'; \ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ -- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" -+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-rpath,$(LIBRPATH) -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - - DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" - diff --git a/cross/openssl/patches/002-synology-targets.patch b/cross/openssl/patches/002-synology-targets.patch deleted file mode 100644 index 2ea2a8446d7..00000000000 --- a/cross/openssl/patches/002-synology-targets.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- Configure.orig 2017-01-26 14:22:03.000000000 +0100 -+++ Configure 2017-01-28 17:45:09.258947749 +0100 -@@ -172,6 +172,9 @@ - my $ppc32_asm=$ppc64_asm; - my $no_asm="::::::::::::::::void"; - -+# Synology -+my $syno_ppc32_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o:::::sha1-ppc.o sha256-ppc.o::::::::"; -+ - # As for $BSDthreads. Idea is to maintain "collective" set of flags, - # which would cover all BSD flavors. -pthread applies to them all, - # but is treated differently. OpenBSD expands is as -D_POSIX_THREAD -@@ -683,6 +686,13 @@ - "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - -+##### Synology -+# ppc -+"synology-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${syno_ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ -+# armle -+"synology-armle","gcc:-DL_ENDIAN -DTERMIO -Os -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A diff --git a/cross/slang/Makefile b/cross/slang/Makefile index 83daab29dc0..02d2efb2fb6 100644 --- a/cross/slang/Makefile +++ b/cross/slang/Makefile @@ -3,15 +3,16 @@ PKG_VERS = 2.2.4 PKG_EXT = tar.bz2 PKG_DIR = $(PKG_NAME)-$(PKG_VERS) PKG_DIST_NAME = $(PKG_DIR).$(PKG_EXT) -PKG_DIST_SITE = ftp://space.mit.edu/pub/davis/slang/v2.2 +PKG_DIST_SITE = https://www.jedsoft.org/releases/$(PKG_NAME)/old -DEPENDS = cross/zlib +DEPENDS = cross/zlib cross/pcre -HOMEPAGE = http://www.gnu.org/software/libunistring/ -COMMENT = This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard -LICENSE = LGPLv3 +HOMEPAGE = https://www.jedsoft.org/slang/ +COMMENT = Library for creating multi-platform software. +LICENSE = GPLv2 GNU_CONFIGURE = 1 CONFIGURE_ARGS = --with-z=$(INSTALL_DIR)/$(INSTALL_PREFIX) +CONFIGURE_ARGS += --with-pcre=$(INSTALL_DIR)/$(INSTALL_PREFIX) include ../../mk/spksrc.cross-cc.mk diff --git a/cross/slang/PLIST b/cross/slang/PLIST index 48d4c8fb763..beb7a14eb91 100644 --- a/cross/slang/PLIST +++ b/cross/slang/PLIST @@ -6,6 +6,7 @@ lib:lib/slang/v2/modules/csv-module.so lib:lib/slang/v2/modules/fcntl-module.so lib:lib/slang/v2/modules/fork-module.so lib:lib/slang/v2/modules/iconv-module.so +lib:lib/slang/v2/modules/pcre-module.so lib:lib/slang/v2/modules/rand-module.so lib:lib/slang/v2/modules/select-module.so lib:lib/slang/v2/modules/slsmg-module.so diff --git a/cross/slang/patches/001-WCONTINUED-fix.patch b/cross/slang/patches/001-WCONTINUED-fix.patch deleted file mode 100644 index 996669cd5b8..00000000000 --- a/cross/slang/patches/001-WCONTINUED-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- modules/fork-module.c.orig 2010-12-13 07:18:53.000000000 +0000 -+++ modules/fork-module.c 2011-01-26 10:40:11.000000000 +0000 -@@ -35,6 +35,10 @@ - #include - #include - -+#ifndef WCONTINUED -+#define WCONTINUED 8 -+#endif -+ - SLANG_MODULE(fork); - - static int fork_intrinsic (void) diff --git a/cross/slang/patches/001-disable-parallel-make.patch b/cross/slang/patches/001-disable-parallel-make.patch new file mode 100644 index 00000000000..13354055acd --- /dev/null +++ b/cross/slang/patches/001-disable-parallel-make.patch @@ -0,0 +1,37 @@ +# try to avoid build errors by disabling parallel make +# +--- autoconf/Makefile.in.org 2011-04-11 02:37:07.000000000 +0000 ++++ autoconf/Makefile.in 2020-10-06 19:22:35.175361801 +0000 +@@ -97,3 +97,5 @@ + # + .PHONY: all help static elf install clean check install-elf install-static makefiles install-pkgconfig + # ++.NOTPARALLEL: ++# + +--- src/Makefile.in.org 2011-04-11 02:37:07.000000000 +0000 ++++ src/Makefile.in 2020-10-06 19:28:52.395123281 +0000 +@@ -247,3 +247,5 @@ + #--------------------------------------------------------------------------- + # Object Rules : These are created from the configure script (hopefully) + #--------------------------------------------------------------------------- ++ ++.NOTPARALLEL: + +--- slsh/Makefile.in.org 2020-10-06 19:40:56.828016639 +0000 ++++ slsh/Makefile.in 2020-10-06 19:41:05.660705644 +0000 +@@ -163,3 +163,5 @@ + install_lib_files install_rline_files install_scripts install_help \ + install_docs + ++.NOTPARALLEL: ++ + +--- modules/Makefile.in.org 2011-04-11 02:37:07.000000000 +0000 ++++ modules/Makefile.in 2020-10-06 19:28:36.270244972 +0000 +@@ -169,3 +169,5 @@ + -/bin/rm -f Makefile + + .PHONY: $(MODULES) clean distclean all install ++ ++.NOTPARALLEL: diff --git a/cross/znc/Makefile b/cross/znc/Makefile index 5360cfec8c6..c9fdfc75c56 100644 --- a/cross/znc/Makefile +++ b/cross/znc/Makefile @@ -13,13 +13,13 @@ LICENSE = Apache License 2.0 GNU_CONFIGURE = 1 ifneq ($(wildcard modules/*),) -POST_INSTALL_TARGET = myPostInstall +POST_INSTALL_TARGET = znc_post_install endif include ../../mk/spksrc.cross-cc.mk -.PHONY: myPostInstall -myPostInstall: +.PHONY: znc_post_install +znc_post_install: # The following extra modules are stored in cross/znc/modules and are built via the znc-buildmod command. Adapt as needed. # wget https://raw.githubusercontent.com/colloquy/colloquypush/master/znc/colloquy.cpp # wget -O identd.cpp https://raw.githubusercontent.com/cynix/znc-identd/master/identd.cc diff --git a/diyspk/htop/Makefile b/diyspk/htop/Makefile index b0a90ec1c9d..4f125d668a6 100755 --- a/diyspk/htop/Makefile +++ b/diyspk/htop/Makefile @@ -1,6 +1,6 @@ SPK_NAME = htop -SPK_VERS = 2.2.0 -SPK_REV = 2 +SPK_VERS = 3.0.2 +SPK_REV = 3 SPK_ICON = src/htop.png DEPENDS = cross/$(SPK_NAME) @@ -9,7 +9,7 @@ MAINTAINER = hgy59 DESCRIPTION = Interactive text-mode process viewer for Unix systems. The package is intended for DSM-5.0 or earlier where it\'s not available. DISPLAY_NAME = htop STARTABLE = no -CHANGELOG = "1. Update to version 2.2.0
2. Activate unicode support" +CHANGELOG = "Update to version 3.0.2" HOMEPAGE = http://hisham.hm/htop/ LICENSE = GPLv2 diff --git a/diyspk/mc/Makefile b/diyspk/mc/Makefile index f3af90d3812..ac46fc40d50 100644 --- a/diyspk/mc/Makefile +++ b/diyspk/mc/Makefile @@ -1,6 +1,6 @@ SPK_NAME = mc -SPK_VERS = 4.8.23 -SPK_REV = 7 +SPK_VERS = 4.8.25 +SPK_REV = 8 SPK_ICON = src/mc.png DEPENDS = cross/mc @@ -11,7 +11,7 @@ DESCRIPTION_FRE = Midnight Commander est une application en mode texte. L\'inter RELOAD_UI = no DISPLAY_NAME = Midnight Commander STARTABLE = no -CHANGELOG = "1. Add sftp support
2. Fix subshell for /bin/sh as link to /bin/bash
3. Fix mouse support
4. Fix mcedit, mcview and mcdiff" +CHANGELOG = "1. Update mc 4.8.25.
2. Update openssl to 1.1." HOMEPAGE = http://www.midnight-commander.org LICENSE = GNU GPL diff --git a/spk/borgbackup/Makefile b/spk/borgbackup/Makefile index 0818844d1ff..654f6db03f2 100644 --- a/spk/borgbackup/Makefile +++ b/spk/borgbackup/Makefile @@ -1,6 +1,6 @@ SPK_NAME = borgbackup SPK_VERS = 1.1.13 -SPK_REV = 6 +SPK_REV = 7 SPK_ICON = src/$(SPK_NAME).png BUILD_DEPENDS = cross/python3 cross/setuptools cross/pip cross/wheel @@ -20,7 +20,8 @@ DESCRIPTION = Deduplicating backup program with compression and authenticated en RELOAD_UI = no DISPLAY_NAME = Borg STARTABLE = no -CHANGELOG = Update to 1.1.13 with borgmatic 1.5.9 +CHANGELOG = "Update openssl to 1.1." + HOMEPAGE = https://borgbackup.readthedocs.io LICENSE = BSD-3-Clause diff --git a/spk/boxbackup-client/Makefile b/spk/boxbackup-client/Makefile index d876df62c89..37d4c0af99f 100644 --- a/spk/boxbackup-client/Makefile +++ b/spk/boxbackup-client/Makefile @@ -1,6 +1,6 @@ SPK_NAME = boxbackup-client -SPK_VERS = 0.11.1 -SPK_REV = 1 +SPK_VERS = 0.12 +SPK_REV = 2 SPK_ICON = src/boxbackup.png DEPENDS = cross/boxbackup @@ -9,6 +9,7 @@ SPK_DEPENDS = "Perl" MAINTAINER = SynoCommunity DESCRIPTION = Box Backup is an open source, completely automatic, on-line backup system. This is the client part of Box Backup. DISPLAY_NAME = Box Backup Client +CHANGELOG = "1. Update BoxBackup to 0.12.
2. Update openssl to 1.1." HOMEPAGE = http://www.boxbackup.org/ LICENSE = BSD/GPL diff --git a/spk/deluge/Makefile b/spk/deluge/Makefile index 6e571596d38..b3f42009665 100644 --- a/spk/deluge/Makefile +++ b/spk/deluge/Makefile @@ -1,6 +1,6 @@ SPK_NAME = deluge SPK_VERS = 2.0.3 -SPK_REV = 12 +SPK_REV = 13 SPK_ICON = src/deluge.png BUILD_DEPENDS = cross/python cross/setuptools cross/pip cross/wheel @@ -16,7 +16,8 @@ MAINTAINER = Safihre DESCRIPTION = Deluge is a full-featured BitTorrent client for Linux, OS X, Unix and Windows. It uses libtorrent in its backend and features multiple user-interfaces including: GTK+, web and console. It has been designed using the client server model with a daemon process that handles all the bittorrent activity. The Deluge daemon is able to run on headless machines with the user-interfaces being able to connect remotely from any platform. This package is intended for advanced users. RELOAD_UI = yes STARTABLE = yes -CHANGELOG = Update to version 2.0.3 +CHANGELOG = "Update openssl to 1.1." + DISPLAY_NAME = Deluge HOMEPAGE = http://deluge-torrent.org diff --git a/spk/domoticz/Makefile b/spk/domoticz/Makefile index 1593bbb440b..9916404cb1e 100644 --- a/spk/domoticz/Makefile +++ b/spk/domoticz/Makefile @@ -1,6 +1,6 @@ SPK_NAME = domoticz SPK_VERS = 4.9700 -SPK_REV = 8 +SPK_REV = 9 SPK_ICON = src/domoticz.png DSM_UI_DIR = app @@ -15,7 +15,7 @@ DESCRIPTION_FRE = Domoticz est un système domotique qui vous permet de surveill ADMIN_PORT = 8084 RELOAD_UI = yes DISPLAY_NAME = Domoticz -CHANGELOG = "Update to version 4.9700 \(includes update from python2 to python3 bindings\)" +CHANGELOG = "Update openssl to 1.1." HOMEPAGE = http://www.domoticz.com/ LICENSE = GPLv3 diff --git a/spk/fossil-scm/Makefile b/spk/fossil-scm/Makefile index 88ed1bd40b0..8858a0ae996 100644 --- a/spk/fossil-scm/Makefile +++ b/spk/fossil-scm/Makefile @@ -1,6 +1,6 @@ SPK_NAME = fossil-scm -SPK_VERS = 2.10 -SPK_REV = 1 +SPK_VERS = 2.12.1 +SPK_REV = 2 SPK_ICON = src/fossil-scm.png DEPENDS = cross/fossil-scm @@ -10,11 +10,11 @@ DISPLAY_NAME = Fossil SCM DESCRIPTION = "Fossil is a simple, high-reliability, distributed software configuration management system." STARTABLE = no -CHANGELOG = "Initial version." +CHANGELOG = "1. Update fossil-scm to 2.12.1.
2. Update openssl to 1.1." HOMEPAGE = https://www.fossil-scm.org/ LICENSE = BSD2 -SPK_COMMANDS = bin/fossil +SPK_COMMANDS = bin/fossil include ../../mk/spksrc.spk.mk diff --git a/spk/git/Makefile b/spk/git/Makefile index 7bb9b21e757..83d63e2a133 100644 --- a/spk/git/Makefile +++ b/spk/git/Makefile @@ -1,6 +1,6 @@ SPK_NAME = git -SPK_VERS = 2.26.2 -SPK_REV = 14 +SPK_VERS = 2.28.0 +SPK_REV = 16 SPK_ICON = src/git.png DEPENDS = cross/$(SPK_NAME) @@ -10,7 +10,7 @@ DESCRIPTION = Git is a fast, scalable, distributed revision control system with DESCRIPTION_FRE = Git est un système de gestion de révision rapide, extensible et distribué avec un ensemble de commandes inhabituellement riche qui fournit à la fois des opérations de haut niveau et un accès complet aux structures de bas niveau. STARTABLE = no DISPLAY_NAME = Git -CHANGELOG = "1. Update Git to 2.26.2.
2. Fix configuration of CA certificates \(use DSM ca-certificates that hopefully will be updated by synology\)." +CHANGELOG = "1. Update git to 28.0.
2. Update openssl to 1.1." HOMEPAGE = http://git-scm.com LICENSE = GPLv2 diff --git a/spk/haproxy/Makefile b/spk/haproxy/Makefile index b43c500481e..ac1be4f5748 100644 --- a/spk/haproxy/Makefile +++ b/spk/haproxy/Makefile @@ -1,13 +1,13 @@ SPK_NAME = haproxy -SPK_VERS = 1.5.14 -SPK_REV = 20 +SPK_VERS = 1.8.26 +SPK_REV = 21 SPK_ICON = src/haproxy.png DSM_UI_DIR = app DSM_APP_NAME = SYNOCOMMUNITY.HAProxy.AppInstance DEPENDS = cross/$(SPK_NAME) WHEELS = src/requirements.txt -SPK_DEPENDS = "python>2.7.3-3" +SPK_DEPENDS = "python>2.7.18-25" MAINTAINER = Diaoul DESCRIPTION = HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. @@ -15,7 +15,7 @@ DESCRIPTION_FRE = HAProxy est un produit libre, performant et fiable qui permet ADMIN_PORT = 8280 RELOAD_UI = yes DISPLAY_NAME = HAProxy -CHANGELOG = "1. Fix DSM 6 compatibility" +CHANGELOG = "1. Update haproxy 1.8.26.
2. Update openssl to 1.1." HOMEPAGE = http://haproxy.1wt.eu/ LICENSE = GNU GPL 2 diff --git a/spk/homeassistant/Makefile b/spk/homeassistant/Makefile index a8b9095920d..5e608b9d204 100644 --- a/spk/homeassistant/Makefile +++ b/spk/homeassistant/Makefile @@ -1,6 +1,6 @@ SPK_NAME = homeassistant SPK_VERS = 0.114.2 -SPK_REV = 7 +SPK_REV = 8 SPK_ICON = src/${SPK_NAME}.png BUILD_DEPENDS = cross/python3 cross/setuptools cross/pip cross/wheel cross/bcrypt @@ -13,7 +13,7 @@ SPK_DEPENDS = "python3>=3.7.7" MAINTAINER = ymartin59 DESCRIPTION = Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control. DISPLAY_NAME = Home Assistant -CHANGELOG = "1. Update to 0.87.1
2. Support for DSM 6" +CHANGELOG = "1. Update to 0.114.2.
2. Update openssl to 1.1." RELOAD_UI = yes STARTABLE = yes diff --git a/spk/icecast/Makefile b/spk/icecast/Makefile index e9826686535..fa20cf7c1c7 100644 --- a/spk/icecast/Makefile +++ b/spk/icecast/Makefile @@ -1,6 +1,6 @@ SPK_NAME = icecast SPK_VERS = 2.4.4 -SPK_REV = 4 +SPK_REV = 5 SPK_ICON = src/icecast.png DSM_UI_DIR = app @@ -9,7 +9,7 @@ DEPENDS = cross/busybox cross/$(SPK_NAME) MAINTAINER = SynoCommunity DESCRIPTION = "Icecast is a streaming media server which currently supports Ogg \(Vorbis and Theora\), Opus, WebM and MP3 audio streams. It can be used to create an Internet radio station or a privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for communication and interaction. This package includes Ezstream, a command line source client for Icecast media streaming servers." ADMIN_PORT = 8000 -CHANGELOG = "Add taglib to support ID3 tags." +CHANGELOG = "Update openssl to 1.1." RELOAD_UI = yes STARTABLE = yes diff --git a/spk/irssi/Makefile b/spk/irssi/Makefile index 6ba100ff9cd..0103b802d9f 100644 --- a/spk/irssi/Makefile +++ b/spk/irssi/Makefile @@ -1,6 +1,6 @@ SPK_NAME = irssi SPK_VERS = 0.8.17 -SPK_REV = 1 +SPK_REV = 2 SPK_ICON = src/irssi.png DEPENDS = cross/irssi @@ -9,6 +9,7 @@ MAINTAINER = SynoCommunity DESCRIPTION = Irssi is a terminal based IRC client for UNIX systems. It also supports SILC and ICB protocols via plugins. DISPLAY_NAME = Irssi STARTABLE = no +CHANGELOG = "Update openssl to 1.1." BETA = 1 HOMEPAGE = http://www.irssi.org/ diff --git a/spk/itools/Makefile b/spk/itools/Makefile index 3c37ef7ebf2..8c05f7802b7 100644 --- a/spk/itools/Makefile +++ b/spk/itools/Makefile @@ -1,6 +1,6 @@ SPK_NAME = itools SPK_VERS = 1.2 -SPK_REV = 3 +SPK_REV = 4 SPK_ICON = src/itools.png # A collection of tools from ifuse and usbmuxd projects of libimobiledevice.org # There exists no source code package "itools" and therefore no cross/itools project @@ -14,7 +14,7 @@ DISTRIBUTOR_URL = https://synocommunity.com DESCRIPTION = "This package mounts an iOS® device \(connected by USB\) to a shared folder of your Diskstation. You can access such folders locally or from remote with Synology FileStation. Some command line tools are included to communicate with connected devices." RELOAD_UI = no DISPLAY_NAME = iOS Access -CHANGELOG = "1. Update dependencies \(2019.11\).
2. Fix DSM 6 service user privileges.
3. Use full device name as shared folder \(mount point\)." +CHANGELOG = "Update openssl to 1.1." HOMEPAGE = https://www.libimobiledevice.org LICENSE = LGPL 2.1 diff --git a/spk/lidarr/Makefile b/spk/lidarr/Makefile index d8212cb36c5..66c5aa28f7d 100644 --- a/spk/lidarr/Makefile +++ b/spk/lidarr/Makefile @@ -16,7 +16,7 @@ DESCRIPTION = Lidarr is a music collection manager for Usenet and BitTorrent us RELOAD_UI = yes STARTABLE = yes DISPLAY_NAME = Lidarr -CHANGELOG = "Add workaround for mono bug with armv5/88f6281" +CHANGELOG = "Update openssl to 1.1." HOMEPAGE = http://lidarr.audio/ LICENSE = GPLv3 diff --git a/spk/links/Makefile b/spk/links/Makefile index 3c8a48208b4..bd22bc4e667 100644 --- a/spk/links/Makefile +++ b/spk/links/Makefile @@ -1,6 +1,6 @@ SPK_NAME = links -SPK_VERS = 2.12 -SPK_REV = 1 +SPK_VERS = 2.21 +SPK_REV = 2 SPK_ICON = src/links.png DEPENDS = cross/links @@ -9,7 +9,7 @@ MAINTAINER = SynoCommunity DESCRIPTION = Links is a web browser running in text mode. DISPLAY_NAME = Links STARTABLE = no -BETA = 1 +CHANGELOG = "1. Update links to 2.21.
2. Update openssl to 1.1." HOMEPAGE = http://links.twibright.com/ LICENSE = GPLv2 diff --git a/spk/mosquitto/Makefile b/spk/mosquitto/Makefile index 5f620729c25..741984455e1 100755 --- a/spk/mosquitto/Makefile +++ b/spk/mosquitto/Makefile @@ -1,15 +1,18 @@ SPK_NAME = mosquitto SPK_VERS = 1.6.12 -SPK_REV = 10 +SPK_REV = 11 SPK_ICON = src/mosquitto.png DEPENDS = cross/busybox cross/$(SPK_NAME) +# libwebsockets is not supported for ppc except qoriq +UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x + MAINTAINER = SynoCommunity DESCRIPTION = Mosquitto is an open source message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1. RELOAD_UI = yes DISPLAY_NAME = Mosquitto STARTABLE = yes -CHANGELOG = "Update to 1.6.12" +CHANGELOG = "Update openssl to 1.1." HOMEPAGE = http://www.mosquitto.org/ LICENSE = EPL/EDL licensed diff --git a/spk/mtproxy/Makefile b/spk/mtproxy/Makefile index f4711c15152..ae0370fea85 100644 --- a/spk/mtproxy/Makefile +++ b/spk/mtproxy/Makefile @@ -1,6 +1,6 @@ SPK_NAME = mtproxy SPK_VERS = 1 -SPK_REV = 3 +SPK_REV = 4 SPK_ICON = src/${SPK_NAME}.jpg REQUIRED_DSM = 5.2 @@ -15,7 +15,7 @@ DESCRIPTION_RUS = Простой MT-Proto прокси сервер RELOAD_UI = yes STARTABLE = yes DISPLAY_NAME = MTProxy -CHANGELOG = +CHANGELOG = "1. Update openssl to 1.1." UNSUPPORTED_ARCHS = $(ARM_ARCHES) $(PPC_ARCHES) diff --git a/spk/mutt/Makefile b/spk/mutt/Makefile index afc7e59acf3..d6627b4fa47 100644 --- a/spk/mutt/Makefile +++ b/spk/mutt/Makefile @@ -1,6 +1,6 @@ SPK_NAME = mutt SPK_VERS = 1.13.4 -SPK_REV = 4 +SPK_REV = 5 SPK_ICON = src/mutt.png DEPENDS = cross/mutt @@ -10,7 +10,7 @@ DESCRIPTION = Mutt is a small but very powerful text-based mail client for Unix DISPLAY_NAME = Mutt STARTABLE = no -CHANGELOG = "1. Update to 1.13.4
2. Add SASL support" +CHANGELOG = "Update openssl to 1.1." HOMEPAGE = http://www.mutt.org LICENSE = GPLv2 diff --git a/spk/python/Makefile b/spk/python/Makefile index 70a9fa11d9a..4841a6a42ad 100644 --- a/spk/python/Makefile +++ b/spk/python/Makefile @@ -1,7 +1,7 @@ SPK_NAME = python SPK_SHORT_VERS = 2.7 SPK_VERS = $(SPK_SHORT_VERS).18 -SPK_REV = 24 +SPK_REV = 25 SPK_ICON = src/python.png DEPENDS = cross/busybox cross/$(SPK_NAME) @@ -24,7 +24,7 @@ DESCRIPTION_SPN = Lenguaje de programación Python 2.7. RELOAD_UI = yes STARTABLE = no DISPLAY_NAME = Python -CHANGELOG = "1. Fix SSL CA certicates location" +CHANGELOG = "Update openssl to 1.1" HOMEPAGE = http://www.python.org LICENSE = PSF diff --git a/spk/python3/Makefile b/spk/python3/Makefile index 899847f72b9..e8da692f3ad 100644 --- a/spk/python3/Makefile +++ b/spk/python3/Makefile @@ -1,7 +1,7 @@ SPK_NAME = python3 SPK_SHORT_VERS = 3.7 SPK_VERS = $(SPK_SHORT_VERS).7 -SPK_REV = 14 +SPK_REV = 15 SPK_ICON = src/python3.png DEPENDS = cross/busybox cross/$(SPK_NAME) @@ -21,7 +21,7 @@ DESCRIPTION_SPN = Lenguaje de programación Python. RELOAD_UI = yes STARTABLE = no DISPLAY_NAME = Python3 -CHANGELOG = "1. Fixed curses native module
2. Fix SSL CA certicates location" +CHANGELOG = "Update openssl to 1.1" HOMEPAGE = http://www.python.org LICENSE = PSF diff --git a/spk/radarr/Makefile b/spk/radarr/Makefile index c22bfd6a73e..2b734b58bc8 100644 --- a/spk/radarr/Makefile +++ b/spk/radarr/Makefile @@ -1,6 +1,6 @@ SPK_NAME = radarr SPK_VERS = $(shell date +%Y%m%d) -SPK_REV = 11 +SPK_REV = 12 SPK_ICON = src/radarr.png REQUIRED_DSM = 5.0 diff --git a/spk/radarr/PLIST b/spk/radarr/PLIST new file mode 100644 index 00000000000..e69de29bb2d diff --git a/spk/rutorrent/Makefile b/spk/rutorrent/Makefile index 59da642aba2..439eac8473f 100644 --- a/spk/rutorrent/Makefile +++ b/spk/rutorrent/Makefile @@ -1,6 +1,6 @@ SPK_NAME = rutorrent SPK_VERS = 3.8 -SPK_REV = 2 +SPK_REV = 9 SPK_ICON = src/rutorrent.png DSM_UI_DIR = app @@ -12,7 +12,7 @@ ADMIN_URL = /rutorrent/ RELOAD_UI = yes STARTABLE = yes DISPLAY_NAME = ruTorrent -CHANGELOG ="1. Update rutorrent to 3.8" +CHANGELOG ="1. Update rutorrent to 3.8
2. Update openssl to 1.1." BETA = 1 HOMEPAGE = https://github.com/Novik/ruTorrent diff --git a/spk/rutorrent/PLIST b/spk/rutorrent/PLIST new file mode 100644 index 00000000000..e69de29bb2d diff --git a/spk/sonarr/Makefile b/spk/sonarr/Makefile index 9e2133e7a45..2472b301567 100644 --- a/spk/sonarr/Makefile +++ b/spk/sonarr/Makefile @@ -3,7 +3,6 @@ SPK_VERS = $(shell date +%Y%m%d) SPK_REV = 18 SPK_ICON = src/sonarr.png -REQUIRED_DSM = 5.0 # Mono not supported on ppc platforms. C.f. cross/mono/Makefile and references therein for details. UNSUPPORTED_ARCHS = $(PPC_ARCHES) @@ -18,7 +17,7 @@ DESCRIPTION_SPN = Sonarr es un PVR para los usuarios de grupos de noticias y tor RELOAD_UI = yes DISPLAY_NAME = Sonarr STARTABLE = yes -CHANGELOG = "Add workaround for mono bug with armv5/88f6281" +CHANGELOG = "Update openssl to 1.1." HOMEPAGE = https://sonarr.tv LICENSE = GPLv3 diff --git a/spk/synocli-disk/Makefile b/spk/synocli-disk/Makefile index 605f82069c2..d1b0003dbd6 100644 --- a/spk/synocli-disk/Makefile +++ b/spk/synocli-disk/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synocli-disk SPK_VERS = 3.0 -SPK_REV = 3 +SPK_REV = 4 SPK_ICON = src/synocli-disk.png include ../../mk/spksrc.common.mk @@ -23,7 +23,7 @@ endif DESCRIPTION = "SynoCli Disk Tools provides a set of small command-line utilities: e2fsprogs, fuse, ntfs-3g/ntfsprogs, testdisk, ncdu, davfs2, lsscsi, ddrescure$(OPTIONAL_DESC)." STARTABLE = no -CHANGELOG = "1. Add ddrescue
2. Fix symlinks
3. Add ext, ntfs, ewf and jpeg support to testdisk
4. Add ntfs tools" +CHANGELOG = "1. Update openssl to 1.1 \(davfs2\)." HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliDisk LICENSE = Each tool is licensed under it\'s respective license. diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile index 58f92d3d415..5fc44092168 100644 --- a/spk/synocli-file/Makefile +++ b/spk/synocli-file/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synocli-file -SPK_VERS = 1.1 -SPK_REV = 3 +SPK_VERS = 1.2 +SPK_REV = 4 SPK_ICON = src/synocli-file.png include ../../mk/spksrc.common.mk @@ -28,7 +28,7 @@ endif DESCRIPTION = "SynoCli File Tools provides a set of small command-line utilities: less, tree, ncdu, jdupes, rhash, mc \(midnight commander\), nano, file, detox$(OPTIONAL_DESC)." STARTABLE = no -CHANGELOG = "1. Midnight-Commander: add sftp support; Fix subshell; fix mouse handling; fix mcedit, mcview and mcdiff; fix symlinks.
2. Fix rmlint not executable." +CHANGELOG = "1. Update Midnight Commander to 4.2.25
2. Update openssl to 1.1 \(mc\)." HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliFile LICENSE = Each tool is licensed under it\'s respective license. diff --git a/spk/synocli-monitor/Makefile b/spk/synocli-monitor/Makefile index fb76e45efcb..e5728da7719 100644 --- a/spk/synocli-monitor/Makefile +++ b/spk/synocli-monitor/Makefile @@ -1,32 +1,29 @@ SPK_NAME = synocli-monitor SPK_VERS = 1.0 -SPK_REV = 1 +SPK_REV = 2 SPK_ICON = src/synocli-monitor.png -DEPENDS = cross/nmon cross/iperf2 cross/iperf3 cross/busybox +DEPENDS = cross/nmon cross/iperf2 cross/iperf3 cross/busybox cross/htop OPTIONAL_DEPENDS = cross/htop OPTIONAL_DESC = -# provide htop until DSM 5.0 (later versions already have htop) -ifneq (5.1,$(firstword $(sort $(TCVERSION) 5.1))) -DEPENDS += cross/htop -OPTIONAL_DESC := $(OPTIONAL_DESC)", htop" -endif - BUSYBOX_CONFIG = procutils -# include process utilities not contained in DSM<6 (pstree) +# include process utilities not contained in DSM<6 and DSM>2 (pstree) ifneq (6, $(firstword $(sort $(TCVERSION) 6))) +ifeq (6, $(firstword $(sort $(TCVERSION) 2))) BUSYBOX_CONFIG += procutils.dsm5 +OPTIONAL_DESC := $(OPTIONAL_DESC)", and process utilities \(lsof, iostat, pgrep, pmap, watch\)" +endif endif MAINTAINER = SynoCommunity -DESCRIPTION = SynoCli Monitor Tools provides a set of command-line utilities for system monitoring: nmon, iperf2, iperf3$(OPTIONAL_DESC) and process utilities \(lsof, iostat, pgrep, pmap, watch\). +DESCRIPTION = SynoCli Monitor Tools provides a set of command-line utilities for system monitoring: nmon, iperf2, iperf3, htop$(OPTIONAL_DESC). DISPLAY_NAME = SynoCli Monitor Tools STARTABLE = no -CHANGELOG = "Initial release" +CHANGELOG = "1. Update htop to 3.0.2 and include it in all DSM versions.
2. Update openssl to 1.1. \(iperf3\)" HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliMonitor LICENSE = Each tool is licensed under it\'s respective license. diff --git a/spk/synocli-net/Makefile b/spk/synocli-net/Makefile index 5da1fc04608..265e057d623 100644 --- a/spk/synocli-net/Makefile +++ b/spk/synocli-net/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synocli-net SPK_VERS = 1.4 -SPK_REV = 4 +SPK_REV = 5 SPK_ICON = src/synocli-net.png DEPENDS = cross/screen cross/tmux cross/nmap cross/sshfs cross/mosh cross/socat @@ -29,7 +29,7 @@ MAINTAINER = ymartin59 DESCRIPTION = "SynoCli Network Tools provides a set of small command-line utilities: screen, tmux, mosh, socat, nmap, sshfs, rsync, autossh$(OPTIONAL_DESC). Credits to Sebastian Schmidt \(publicarray\) for icons" DISPLAY_NAME = SynoCli Network Tools STARTABLE = no -CHANGELOG = "1. Add autossh" +CHANGELOG = "1. update openssl to 1.1 for all included packages \(tmux, nmap, mosh, socat, autossh, ser2net\)." HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliNet LICENSE = Each tool is licensed under it\'s respective license. diff --git a/spk/transmission/Makefile b/spk/transmission/Makefile index 2a5d64fef0f..ab526c5f624 100644 --- a/spk/transmission/Makefile +++ b/spk/transmission/Makefile @@ -1,6 +1,6 @@ SPK_NAME = transmission SPK_VERS = 3.00 -SPK_REV = 18 +SPK_REV = 19 SPK_ICON = src/transmission.png DEPENDS = cross/busybox cross/$(SPK_NAME) @@ -12,7 +12,7 @@ DESCRIPTION_SPN = Transmission es un cliente BitTorrent simple y rápido. Puedes RELOAD_UI = yes STARTABLE = yes DISPLAY_NAME = Transmission -CHANGELOG = "1. Update to v3.00.
2. Use DSM ca certificates for https" +CHANGELOG = "Update openssl to 1.1." HOMEPAGE = https://transmissionbt.com LICENSE = GPLv2/GPLv3 diff --git a/spk/tvheadend/Makefile b/spk/tvheadend/Makefile index ab9e603303f..4235db9c6f1 100644 --- a/spk/tvheadend/Makefile +++ b/spk/tvheadend/Makefile @@ -4,7 +4,7 @@ SPK_GIT_HASH = ce09077 SPK_GIT_DATE = 20200713 SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE)~$(SPK_GIT_HASH) TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH) -SPK_REV = 24 +SPK_REV = 25 SPK_ICON = src/tvheadend.png DSM_UI_DIR = app @@ -20,7 +20,7 @@ DESCRIPTION = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD RELOAD_UI = yes DISPLAY_NAME = Tvheadend STARTABLE = yes -CHANGELOG = "1. Update to latest git version ce09077 as of July 13th 2020
2. Enable Intel VAAPI on Intel platforms
3. Disable bintray cache
4. Enable tracing
5. Enable pngquant
6. Enable libtheora
7. Enable fdk-acc
8. Enable re-using FFMPEG media and vaapi shared librairies
9. Update to ffmpeg 4.2.4" +CHANGELOG = "1. Update to latest git version ce09077 as of July 13th 2020
2. Enable Intel VAAPI on Intel platforms
3. Disable bintray cache
4. Enable tracing
5. Enable pngquant
6. Enable libtheora
7. Enable fdk-acc
8. Enable re-using FFMPEG media and vaapi shared librairies
9. Update to ffmpeg 4.2.4
10. Update openssl to 1.1." HOMEPAGE = https://tvheadend.org/ LICENSE = GPL v3 diff --git a/spk/umurmur/Makefile b/spk/umurmur/Makefile index 6e1fc3471d9..8bb9fbedd19 100644 --- a/spk/umurmur/Makefile +++ b/spk/umurmur/Makefile @@ -1,10 +1,10 @@ SPK_NAME = umurmur SPK_VERS = 0.2.17 -SPK_REV = 7 +SPK_REV = 8 SPK_ICON = src/umurmur.png DSM_UI_DIR = app -DEPENDS = cross/openssl cross/$(SPK_NAME) +DEPENDS = cross/$(SPK_NAME) MAINTAINER = Diaoul DESCRIPTION = uMurmur is a minimalistic VoIP server based on the open source software Mumble. It allows simultaneous communications between multiple users. Its low latency makes it especially suitable for communications during online gaming. The Mumble client is available at http://mumble.sourceforge.net/ \(Windows, Mac, Linux and iOS\). @@ -12,7 +12,7 @@ DESCRIPTION_FRE = uMurmur est un serveur minimaliste de voix sur IP basé sur le DESCRIPTION_SPN = uMurmur es un servidor VoIP minimalista basado en el software de codigo abierto Mumble. Permite comunicaciones simultáneas entre múltiples usuarios. Su baja latencia lo hace especialmente adecuado para comunicarse durante un juego en linea. El cliente Mumble está disponible en http://mumble.sourceforge.net/ \(Windows, Mac, Linux and iOS\). RELOAD_UI = yes DISPLAY_NAME = uMurmur -CHANGELOG = "1. Update to 0.2.17 2. Use DSM5+6 generic service" +CHANGELOG = "Update openssl to 1.1." STARTABLE = yes SERVICE_USER = auto diff --git a/spk/znc/Makefile b/spk/znc/Makefile index 1b13cdda13f..866124c0308 100644 --- a/spk/znc/Makefile +++ b/spk/znc/Makefile @@ -1,6 +1,6 @@ SPK_NAME = znc SPK_VERS = 1.7.5 -SPK_REV = 13 +SPK_REV = 14 SPK_ICON = src/znc.png DSM_UI_DIR = app @@ -12,14 +12,14 @@ DESCRIPTION_FRE = Bouncer IRC avancé. Un bouncer IRC n\’est en fait qu\’un DESCRIPTION_SPN = IRC bouncer avanzado. Un IRC bouncer no es más que un proxy para IRC. ZNC estará siempre conectado a tus canales, y hará de puerta de enlace entre tus clientes y tus servidores IRC. Puedes, por ejemplo, consultar mensajes mientras estuviste desconectado o esconder tu identidad. RELOAD_UI = yes DISPLAY_NAME = ZNC -CHANGELOG = "Update to ZNC 1.7.5" +CHANGELOG = "Update openssl to 1.1." STARTABLE = yes HOMEPAGE = http://wiki.znc.in/ LICENSE = Apache License 2.0 # Ensure C++11 compatibility -UNSUPPORTED_ARCHS = $(ARM5_ARCHES) +UNSUPPORTED_ARCHS = $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x WIZARDS_DIR = src/wizard/