Skip to content

Commit

Permalink
synocli Disk: update tools and add s3backer (#5032)
Browse files Browse the repository at this point in the history
* synocli-disk: add s3backer
- add s3backer
- add s3backer diyspk
- add patch for older compilers

* update s3backer to v2.1.1
- update s3backer
- update dependency to cross/openssl3

* update tools:
- update dar to v2.7.14
- update ddcrescue to v1.28
- update dua to v2.29.0
- update ncdu to v1.19

* cross/attr: remove obsolete comments
  • Loading branch information
hgy59 committed Apr 2, 2024
1 parent 0b10301 commit fe143a0
Show file tree
Hide file tree
Showing 28 changed files with 201 additions and 330 deletions.
22 changes: 22 additions & 0 deletions cross/argon2/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
PKG_NAME = phc-winner-argon2
PKG_VERS = 20190702
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/P-H-C/phc-winner-argon2/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://github.com/P-H-C/phc-winner-argon2/
COMMENT = The password hash Argon2, winner of PHC.
LICENSE = Apache 2.0

CONFIGURE_TARGET = nop

ENV += DESTDIR=$(INSTALL_DIR)
ENV += PREFIX=$(INSTALL_PREFIX)
# avoid host machine specific library path:
ENV += LIBRARY_REL=lib

include ../../mk/spksrc.cross-cc.mk
2 changes: 2 additions & 0 deletions cross/argon2/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lnk:lib/libargon2.so
lib:lib/libargon2.so.1
3 changes: 3 additions & 0 deletions cross/argon2/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
phc-winner-argon2-20190702.tar.gz SHA1 4b1de90ec1ccfb6e91001e849f2cbe0222cc8b4c
phc-winner-argon2-20190702.tar.gz SHA256 daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c
phc-winner-argon2-20190702.tar.gz MD5 0f234cc21ac6cebfe373da6afa70bb1d
9 changes: 3 additions & 6 deletions cross/attr/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
PKG_NAME = attr
# newer versions are missing include/xattr.h (required by cross/dar to enable extended attr support)
PKG_VERS = 2.4.47
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).src.$(PKG_EXT)
PKG_VERS = 2.5.2
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://download.savannah.gnu.org/releases/attr
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

Expand All @@ -15,6 +14,4 @@ LICENSE = GPLv2+
GNU_CONFIGURE = 1
CONFIGURE_ARGS = --disable-static

INSTALL_MAKE_OPTIONS = install-lib install-dev DIST_ROOT=$(INSTALL_DIR)

include ../../mk/spksrc.cross-cc.mk
2 changes: 1 addition & 1 deletion cross/attr/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ bin:bin/getfattr
bin:bin/setfattr
lnk:lib/libattr.so
lnk:lib/libattr.so.1
lib:lib/libattr.so.1.1.0
lib:lib/libattr.so.1.1.2502
6 changes: 3 additions & 3 deletions cross/attr/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
attr-2.4.47.src.tar.gz SHA1 5060f0062baee6439f41a433325b8b3671f8d2d8
attr-2.4.47.src.tar.gz SHA256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
attr-2.4.47.src.tar.gz MD5 84f58dec00b60f2dc8fd1c9709291cc7
attr-2.5.2.tar.xz SHA1 dfced877779583861401389eea82dfeb88cb5d3a
attr-2.5.2.tar.xz SHA256 f2e97b0ab7ce293681ab701915766190d607a1dba7fae8a718138150b700a70b
attr-2.5.2.tar.xz MD5 4da9c1d25394946434e5913f49d778b6
36 changes: 18 additions & 18 deletions cross/dar/Makefile
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
PKG_NAME = dar
PKG_VERS = 2.5.22
PKG_VERS = 2.7.14
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://sourceforge.net/projects/dar/files/dar/$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

OPTIONAL_DEPENDS = cross/libthreadar

# archs without C++11 support are not supported:
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
# error: C++ compiler lack support for c++14 standard
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS)

DEPENDS = cross/attr
DEPENDS += cross/libgcrypt cross/gpgme
DEPENDS += cross/zlib cross/bzip2 cross/lzo cross/xz
DEPENDS += cross/argon2
DEPENDS += cross/libgcrypt
DEPENDS += cross/gpgme
DEPENDS += cross/zlib
DEPENDS += cross/bzip2
DEPENDS += cross/lzo
DEPENDS += cross/lz4
DEPENDS += cross/xz
DEPENDS += cross/zstd
DEPENDS += cross/e2fsprogs
DEPENDS += cross/librsync
DEPENDS += cross/curl
DEPENDS += cross/libthreadar

HOMEPAGE = http://dar.linux.free.fr/
COMMENT = Disk ARchive - dar is a shell command that backs up from a single file to a whole filesystems, taking care of hard links, Extended Attributes, sparse files, etc.
LICENSE = GPLv3

include ../../mk/spksrc.archs.mk

ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
# use invariant integers, build for 64bit mode fails on src/libdar/macro_tools.cpp
PLIST_TRANSFORM = sed -e 's|libdar64|libdar|'
else
CONFIGURE_ARGS = --enable-mode=64
DEPENDS += cross/libthreadar
endif

GNU_CONFIGURE = 1

CONFIGURE_ARGS += --enable-special-alloc
CONFIGURE_ARGS = --enable-mode=64
CONFIGURE_ARGS += --disable-static
CONFIGURE_ARGS += --disable-dar-static
CONFIGURE_ARGS += --disable-upx
CONFIGURE_ARGS += --disable-python-binding
CONFIGURE_ARGS += --with-gpgme-prefix=$(STAGING_INSTALL_PREFIX)

ADDITIONAL_CPPFLAGS = -O
Expand Down
4 changes: 2 additions & 2 deletions cross/dar/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ bin:bin/dar_split
bin:bin/dar_xform
rsc:etc/darrc
lnk:lib/libdar64.so
lnk:lib/libdar64.so.5000
lib:lib/libdar64.so.5000.13.5
lnk:lib/libdar64.so.6000
lib:lib/libdar64.so.6000.7.2
6 changes: 3 additions & 3 deletions cross/dar/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dar-2.5.22.tar.gz SHA1 502b15a74e0ad1323b9b46b85b6a304d15f7a5ad
dar-2.5.22.tar.gz SHA256 5d2f4f4664c4ea2c9f509838f21f47a955e1444dfd7df06e0546fa75eafc0b3d
dar-2.5.22.tar.gz MD5 b51dbdfce3882cc6ddd5ec4bf6e3ad6b
dar-2.7.14.tar.gz SHA1 6c87630992cb63f28e2014f7b7d8a0e50e9af488
dar-2.7.14.tar.gz SHA256 40d4dba44260df3a8ddce1e61f411ea9ab43c2cfc47bd83ab868c939d19dc582
dar-2.7.14.tar.gz MD5 268f9e3c799eff1fcc2881baf7e45beb
Loading

0 comments on commit fe143a0

Please sign in to comment.