Skip to content

Commit 34f230f

Browse files
committed
DRAFT mosh dedicated package, updates synocli-net
sshfs/fuse now builds with meson/ninja fuse requires udev to build Updates - fuse 3.8.0 - glib 2.62.2 - libevent 2.1.11-stable - libffi 3.3 - socat 1.7.3.3 - sshfs 3.6.0 - tmux 3.0a
1 parent e94549f commit 34f230f

34 files changed

+154
-175
lines changed

Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
4141
libunistring-dev \
4242
lzip \
4343
mercurial \
44+
meson \
4445
ncurses-dev \
46+
ninja-build \
4547
php \
4648
pkg-config \
4749
python3 \

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ A virtual machine based on an 64-bit version of Debian 10 stable OS is recommend
2626
* Install the requirements (in sync with Dockerfile)::
2727

2828
sudo dpkg --add-architecture i386 && sudo apt-get update
29-
sudo apt install autogen automake bc bison build-essential check cmake curl cython debootstrap expect flex g++-multilib gettext git gperf imagemagick intltool libbz2-dev libc6-i386 libcppunit-dev libffi-dev libgc-dev libgmp3-dev libltdl-dev libmount-dev libncurses-dev libpcre3-dev libssl-dev libtool libunistring-dev lzip mercurial ncurses-dev php pkg-config python3 python3-distutils scons subversion swig unzip xmlto zlib1g-dev
29+
sudo apt install autogen automake bc bison build-essential check cmake curl cython debootstrap expect flex g++-multilib gettext git gperf imagemagick intltool libbz2-dev libc6-i386 libcppunit-dev libffi-dev libgc-dev libgmp3-dev libltdl-dev libmount-dev libncurses-dev libpcre3-dev libssl-dev libtool libunistring-dev lzip mercurial meson ncurses-dev ninja-build php pkg-config python3 python3-distutils scons subversion swig unzip xmlto zlib1g-dev
3030
sudo pip install -U setuptools pip wheel httpie
3131

3232
* You may need to install some packages from testing like autoconf. Read about Apt-Pinning to know how to do that.

cross/fuse/Makefile

+18-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
PKG_NAME = fuse
2-
PKG_VERS = 2.9.9
3-
PKG_EXT = tar.gz
2+
PKG_VERS = 3.8.0
3+
PKG_EXT = tar.xz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
5-
PKG_DIST_SITE = https://github.com/libfuse/libfuse/archive/
6-
PKG_DIR = libfuse-$(PKG_NAME)-$(PKG_VERS)
5+
PKG_DIST_SITE = https://github.com/libfuse/libfuse/releases/download/$(PKG_NAME)-$(PKG_VERS)
6+
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77

88
DEPENDS =
99

1010
HOMEPAGE = https://github.com/libfuse/libfuse
1111
COMMENT = The reference implementation of the Linux FUSE (Filesystem in Userspace) interface
1212
LICENSE = GPLv2, LGPLv2.1 (libfuse.so, libulockmgr.so)
1313

14-
GNU_CONFIGURE = 1
15-
CONFIGURE_ARGS += enable_example=no
16-
PRE_CONFIGURE_TARGET = run_makeconf
17-
18-
ENV += MOUNT_FUSE_PATH=/$(INSTALL_PREFIX)/sbin
14+
CONFIGURE_TARGET = fuse_custom_configure
15+
COMPILE_TARGET = fuse_custom_compile
16+
INSTALL_TARGET = fuse_custom_install
1917

2018
include ../../mk/spksrc.cross-cc.mk
2119

22-
.PHONY: run_makeconf
23-
run_makeconf:
24-
$(RUN) ./makeconf.sh
20+
.PHONY: fuse_custom_configure fuse_custom_compile fuse_custom_install
21+
22+
fuse_custom_configure:
23+
$(RUN) mkdir -p build
24+
$(RUN) meson --prefix=$(INSTALL_PREFIX) -Dexamples=false build
25+
26+
fuse_custom_compile:
27+
$(RUN) ninja
28+
29+
fuse_custom_install:
30+
$(RUN) ninja install

cross/fuse/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
fuse-2.9.9.tar.gz SHA1 4bad8cd2c4d669a7b4f3ad57e4465350b972c94f
2-
fuse-2.9.9.tar.gz SHA256 e57a24721177c3b3dd71cb9239ca46b4dee283db9388d48f7ccd256184982194
3-
fuse-2.9.9.tar.gz MD5 23009734faca2f62d337e3a59be4c280
1+
fuse-3.8.0.tar.xz SHA1 3619b07b9982d4e45546699291bbfb2273ee7af1
2+
fuse-3.8.0.tar.xz SHA256 4a464f6df782a1dca1f7e85bf64ff6ece9547b389557aae4160371cb1c898d61
3+
fuse-3.8.0.tar.xz MD5 f184004cd3724f579cd602fa5232681b

cross/fuse/patches/002-fix-for-aarch64.patch

-17
This file was deleted.

cross/glib/Makefile

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
PKG_NAME = glib
2-
PKG_SHORT_VERS = 2.55
2+
PKG_SHORT_VERS = 2.62
33
PKG_VERS = $(PKG_SHORT_VERS).2
4-
PKG_EXT = tar.xz
4+
PKG_EXT = tar.gz
55
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
6-
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
7-
PKG_DIST_SITE = http://ftp.gnome.org/pub/GNOME/sources/$(PKG_NAME)/$(PKG_SHORT_VERS)
6+
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
7+
PKG_DIST_SITE = https://github.com/GNOME/glib/archive/
8+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
9+
810

911
DEPENDS = native/glib cross/libffi cross/pcre cross/zlib
1012

cross/glib/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
glib-2.55.2.tar.xz SHA1 e50d1195b2a2ac8fb9896af76ab91c97a655f264
2-
glib-2.55.2.tar.xz SHA256 5a26bfa83bb412d181504a0773101093c9e538c3d0e09d30f5178885d78e72f6
3-
glib-2.55.2.tar.xz MD5 e293986b9b76b125a10ed838e92987bb
1+
glib-2.62.2.tar.gz SHA1 4ba26d28e71a1cab10e39dc65dcfe79f18c39e26
2+
glib-2.62.2.tar.gz SHA256 91129ba4d3b68c3c4b975f8b2f36b0bf1223adddb3b5da8e8eaccfed53753e7f
3+
glib-2.62.2.tar.gz MD5 6a00062e7e89d66cbad21a4211ce2121

cross/libevent/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
PKG_NAME = libevent
2-
PKG_VERS_MAJOR = 2.0
3-
PKG_VERS_MINOR = 22-stable
2+
PKG_VERS_MAJOR = 2.1
3+
PKG_VERS_MINOR = 11-stable
44
PKG_VERS = $(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
55
PKG_EXT = tar.gz
66
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
7-
PKG_DIST_SITE = https://sourceforge.net/projects/levent/files/release-$(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
8-
PKG_DIR = $(PKG_NAME)-$(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
7+
PKG_DIST_SITE = https://github.com/libevent/libevent/releases/download/release-$(PKG_VERS)/
8+
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
99

1010
DEPENDS = cross/openssl
1111

cross/libevent/PLIST

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
bin:bin/event_rpcgen.py
22
lnk:lib/libevent.so
3-
lnk:lib/libevent-2.0.so.5
4-
lib:lib/libevent-2.0.so.5.1.9
3+
lnk:lib/libevent-2.1.so.7
4+
lib:lib/libevent-2.1.so.7.0.0
55
lnk:lib/libevent_core.so
6-
lnk:lib/libevent_core-2.0.so.5
7-
lib:lib/libevent_core-2.0.so.5.1.9
6+
lnk:lib/libevent_core-2.1.so.7
7+
lib:lib/libevent_core-2.1.so.7.0.0
88
lnk:lib/libevent_extra.so
9-
lnk:lib/libevent_extra-2.0.so.5
10-
lib:lib/libevent_extra-2.0.so.5.1.9
9+
lnk:lib/libevent_extra-2.1.so.7
10+
lib:lib/libevent_extra-2.1.so.7.0.0
1111
lnk:lib/libevent_openssl.so
12-
lnk:lib/libevent_openssl-2.0.so.5
13-
lib:lib/libevent_openssl-2.0.so.5.1.9
12+
lnk:lib/libevent_openssl-2.1.so.7
13+
lib:lib/libevent_openssl-2.1.so.7.0.0
1414
lnk:lib/libevent_pthreads.so
15-
lnk:lib/libevent_pthreads-2.0.so.5
16-
lib:lib/libevent_pthreads-2.0.so.5.1.9
15+
lnk:lib/libevent_pthreads-2.1.so.7
16+
lib:lib/libevent_pthreads-2.1.so.7.0.0

cross/libevent/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
libevent-2.0.22-stable.tar.gz SHA1 a586882bc93a208318c70fc7077ed8fca9862864
2-
libevent-2.0.22-stable.tar.gz SHA256 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3
3-
libevent-2.0.22-stable.tar.gz MD5 c4c56f986aa985677ca1db89630a2e11
1+
libevent-2.1.11-stable.tar.gz SHA1 a76bba0a281da9384d4be5b40f3907c07e21428c
2+
libevent-2.1.11-stable.tar.gz SHA256 a65bac6202ea8c5609fd5c7e480e6d25de467ea1917c08290c521752f147283d
3+
libevent-2.1.11-stable.tar.gz MD5 7f35cfe69b82d879111ec0d7b7b1c531

cross/libffi/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = libffi
2-
PKG_VERS = 3.2.1
2+
PKG_VERS = 3.3
33
PKG_EXT = tar.gz
44
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
55
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)

cross/libffi/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
libffi-3.2.1.tar.gz SHA1 280c265b789e041c02e5c97815793dfc283fb1e6
2-
libffi-3.2.1.tar.gz SHA256 d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37
3-
libffi-3.2.1.tar.gz MD5 83b89587607e3eb65c70d361f13bab43
1+
libffi-3.3.tar.gz SHA1 8df6cb570c8d6596a67d1c0773bf00650154f7aa
2+
libffi-3.3.tar.gz SHA256 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
3+
libffi-3.3.tar.gz MD5 6313289e32f1d38a9df4770b014a2ca7

cross/socat/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = socat
2-
PKG_VERS = 1.7.3.2
2+
PKG_VERS = 1.7.3.3
33
PKG_EXT = tar.bz2
44
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
55
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)

cross/socat/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
socat-1.7.3.2.tar.bz2 SHA1 94e0003607fc1bf3af534f70831cf70bb944ab5d
2-
socat-1.7.3.2.tar.bz2 SHA256 e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251
3-
socat-1.7.3.2.tar.bz2 MD5 607a24c15bd2cb54e9328bfbbd3a1ae9
1+
socat-1.7.3.3.tar.bz2 SHA1 504afb0f2ae5d3582448cfc6e2b676370b0b9f81
2+
socat-1.7.3.3.tar.bz2 SHA256 0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a
3+
socat-1.7.3.3.tar.bz2 MD5 b2a032a47b8b89a18485697fa975154f

cross/sshfs/Makefile

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PKG_NAME = sshfs
2-
PKG_VERS = 2.10
3-
PKG_EXT = tar.gz
2+
PKG_VERS = 3.6.0
3+
PKG_EXT = tar.xz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs-$(PKG_VERS)
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
@@ -11,7 +11,20 @@ HOMEPAGE = https://github.com/libfuse/sshfs
1111
COMMENT = sshfs is a network filesystem client to connect to SSH servers
1212
LICENSE = GPLv2
1313

14-
GNU_CONFIGURE = 1
14+
CONFIGURE_TARGET = sshfs_custom_configure
15+
COMPILE_TARGET = sshfs_custom_compile
16+
INSTALL_TARGET = sshfs_custom_install
1517

1618
include ../../mk/spksrc.cross-cc.mk
1719

20+
.PHONY: sshfs_custom_configure sshfs_custom_compile sshfs_custom_install
21+
22+
sshfs_custom_configure:
23+
$(RUN) mkdir -p build
24+
$(RUN) meson --prefix=$(INSTALL_PREFIX) . build
25+
26+
sshfs_custom_compile:
27+
$(RUN) ninja
28+
29+
sshfs_custom_install:
30+
$(RUN) ninja install

cross/sshfs/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
sshfs-2.10.tar.gz SHA1 4e53110ab9317f768e4f885a054cc68dce200e45
2-
sshfs-2.10.tar.gz SHA256 70845dde2d70606aa207db5edfe878e266f9c193f1956dd10ba1b7e9a3c8d101
3-
sshfs-2.10.tar.gz MD5 c99a1bcf3934d45e4a6342113669df4b
1+
sshfs-3.6.0.tar.xz SHA1 b32093d782b85519b671163fb83c3b5ecf127ef9
2+
sshfs-3.6.0.tar.xz SHA256 1679b5543a6db2e93e06dbcdc9247b35df64c3148e2c30f80764f4813bd6c270
3+
sshfs-3.6.0.tar.xz MD5 7f7685ebefdea10c5fc44a54e9500e36

cross/tmux/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = tmux
2-
PKG_VERS = 2.9a
2+
PKG_VERS = 3.0a
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/$(PKG_VERS)

cross/tmux/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tmux-2.9a.tar.gz SHA1 33cba73e64c62f46bd244d4472c59371fb747f56
2-
tmux-2.9a.tar.gz SHA256 839d167a4517a6bffa6b6074e89a9a8630547b2dea2086f1fad15af12ab23b25
3-
tmux-2.9a.tar.gz MD5 f0564dbf4cf6b301c4845219d27ed3ad
1+
tmux-3.0a.tar.gz SHA1 0cc951b9ff545b429c101eb562e0be9c5aba5ed4
2+
tmux-3.0a.tar.gz SHA256 4ad1df28b4afa969e59c08061b45082fdc49ff512f30fc8e43217d7b0e5f8db9
3+
tmux-3.0a.tar.gz MD5 ee3ccee391a25d4f2c645c94cde2c144
+4-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = sshfs
2-
SPK_VERS = 2.10
3-
SPK_REV = 2
2+
SPK_VERS = 3.6.0
3+
SPK_REV = 3
44
SPK_ICON = src/sshfs.png
55

66
DEPENDS = cross/$(SPK_NAME)
@@ -9,16 +9,13 @@ MAINTAINER = SynoCommunity
99
DESCRIPTION = sshfs is a filesystem client based on the SSH File Transfer Protocol
1010
DISPLAY_NAME = sshfs
1111
STARTABLE = no
12-
CHANGELOG = "Update to version 2.10"
12+
CHANGELOG = "Update to version 3.6.0"
1313
BETA = 1
1414

1515
HOMEPAGE = https://github.com/libfuse/sshfs
1616
LICENSE = GPLv2, LGPLv2.1 (libfuse.so, libulockmgr.so)
1717

18-
INSTALLER_SCRIPT = src/installer.sh
19-
SSS_SCRIPT = src/dsm-control.sh
20-
21-
INSTALL_PREFIX = /usr/local/$(SPK_NAME)
18+
SERVICE_SETUP = src/service-setup.sh
2219

2320
include ../../mk/spksrc.spk.mk
2421

spk/sshfs/PLIST diyspk/sshfs/PLIST

File renamed without changes.

diyspk/sshfs/src/service-setup.sh

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
service_postinst ()
3+
{
4+
ln -s ${SYNOPKG_PKGDEST}/bin/sshfs /usr/local/bin/sshfs
5+
ln -s ${SYNOPKG_PKGDEST}/bin/fusermount /usr/local/bin/fusermount
6+
}
7+
8+
service_postuninst ()
9+
{
10+
rm /usr/local/bin/sshfs
11+
rm /usr/local/bin/fusermount
12+
}
File renamed without changes.

spk/tmux/Makefile diyspk/tmux/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = tmux
2-
SPK_VERS = 2.9a
3-
SPK_REV = 5
2+
SPK_VERS = 3.0a
3+
SPK_REV = 6
44
SPK_ICON = src/tmux.png
55

66
DEPENDS = cross/$(SPK_NAME)
@@ -10,7 +10,7 @@ DESCRIPTION = tmux is a terminal multiplexer, it enables a number of terminals o
1010
RELOAD_UI = no
1111
DISPLAY_NAME = Tmux
1212
STARTABLE = no
13-
CHANGELOG = Updated tmux to version 2.9a
13+
CHANGELOG = Updated tmux to version 3.0a
1414

1515
HOMEPAGE = http://tmux.github.io
1616
LICENSE = BSD License

spk/tmux/PLIST diyspk/tmux/PLIST

File renamed without changes.
File renamed without changes.
File renamed without changes.

native/glib/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PKG_NAME = glib
2-
PKG_SHORT_VERS = 2.55
2+
PKG_SHORT_VERS = 2.62
33
PKG_VERS = $(PKG_SHORT_VERS).2
4-
PKG_EXT = tar.xz
4+
PKG_EXT = tar.gz
55
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
66
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
7-
PKG_DIST_SITE = http://ftp.gnome.org/pub/GNOME/sources/$(PKG_NAME)/$(PKG_SHORT_VERS)
7+
PKG_DIST_SITE = https://github.com/GNOME/glib/archive/
88

99
DEPENDS =
1010

native/glib/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
glib-2.55.2.tar.xz SHA1 e50d1195b2a2ac8fb9896af76ab91c97a655f264
2-
glib-2.55.2.tar.xz SHA256 5a26bfa83bb412d181504a0773101093c9e538c3d0e09d30f5178885d78e72f6
3-
glib-2.55.2.tar.xz MD5 e293986b9b76b125a10ed838e92987bb
1+
glib-2.62.2.tar.gz SHA1 4ba26d28e71a1cab10e39dc65dcfe79f18c39e26
2+
glib-2.62.2.tar.gz SHA256 91129ba4d3b68c3c4b975f8b2f36b0bf1223adddb3b5da8e8eaccfed53753e7f
3+
glib-2.62.2.tar.gz MD5 6a00062e7e89d66cbad21a4211ce2121

spk/mosh/Makefile

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
SPK_NAME = mosh
2+
SPK_VERS = 1.3.2
3+
SPK_REV = 1
4+
5+
DEPENDS = cross/$(SPK_NAME)
6+
7+
MAINTAINER = fredrike
8+
DESCRIPTION = Mosh is a remote terminal application that supports intermittent connectivity, allows roaming, and provides speculative local echo and line editing of user keystrokes.
9+
RELOAD_UI = no
10+
DISPLAY_NAME = Mosh
11+
STARTABLE = no
12+
13+
HOMEPAGE = https://mosh.org
14+
LICENSE = GPLv3+
15+
16+
REQUIRED_DSM = 5.0
17+
SPK_DEPENDS = "Perl>=5.14"
18+
19+
SERVICE_SETUP = src/service-setup.sh
20+
21+
include ../../mk/spksrc.spk.mk

spk/mosh/PLIST

Whitespace-only changes.

spk/mosh/src/service-setup.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
COMMANDS="mosh mosh-client mosh-server"
3+
4+
service_postinst ()
5+
{
6+
for cmd in $COMMANDS
7+
do
8+
if [ -e "${SYNOPKG_PKGDEST}/bin/$cmd" ]; then
9+
ln -s "${SYNOPKG_PKGDEST}/bin/$cmd" "/usr/local/bin/$cmd"
10+
fi
11+
done
12+
}
13+
14+
service_postuninst ()
15+
{
16+
for cmd in $COMMANDS
17+
do
18+
if [ -L "/usr/local/bin/$cmd" ]; then
19+
rm -f "/usr/local/bin/$cmd"
20+
fi
21+
done
22+
}

spk/sshfs/src/dsm-control.sh

-25
This file was deleted.

0 commit comments

Comments
 (0)