Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

rdiff-backup: update and use alternate tmp dir (#4427) #6049

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cross/librsync/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PKG_NAME = librsync
PKG_VERS = 2.3.2
PKG_VERS = 2.3.4
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/librsync/$(PKG_NAME)/archive
PKG_DIST_SITE = https://github.com/librsync/librsync/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

Expand Down
2 changes: 1 addition & 1 deletion cross/librsync/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bin:bin/rdiff
lnk:lib/librsync.so
lnk:lib/librsync.so.2
lib:lib/librsync.so.2.3.2
lib:lib/librsync.so.2.3.4
6 changes: 3 additions & 3 deletions cross/librsync/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
librsync-2.3.2.tar.gz SHA1 02d513f7781e172cddf79a984f50284327b3ff4a
librsync-2.3.2.tar.gz SHA256 ef8ce23df38d5076d25510baa2cabedffbe0af460d887d86c2413a1c2b0c676f
librsync-2.3.2.tar.gz MD5 74ba5b50de5ba3d595828e9109fa5fce
librsync-2.3.4.tar.gz SHA1 d116958ee9cdfab5a6129e0b2e707e271b20550c
librsync-2.3.4.tar.gz SHA256 a0dedf9fff66d8e29e7c25d23c1f42beda2089fb4eac1b36e6acd8a29edfbd1f
librsync-2.3.4.tar.gz MD5 71d227be94f6fbfc7b6d0fce3ce81861
1 change: 1 addition & 0 deletions cross/python311/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ CROSSENV_WHEELS += poetry==1.6.1
CROSSENV_WHEELS += scikit-build==0.17.6
CROSSENV_WHEELS += setuptools-rust==1.7.0
CROSSENV_WHEELS += setuptools-scm==7.1.0
CROSSENV_WHEELS += expandvars==0.12.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will be reverted and migrated to ADDITIONAL_CROSSENV_WHEELS when #6040 is merged.

# For future use when building numpy >= 1.26
#CROSSENV_WHEELS += meson-python==0.13.2
#CROSSENV_WHEELS += scikit-build-core==0.5.0
Expand Down
9 changes: 6 additions & 3 deletions spk/rdiff-backup/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SPK_NAME = rdiff-backup
SPK_VERS = 2.2.5
SPK_REV = 5
SPK_VERS = 2.2.6
SPK_REV = 6
SPK_ICON = src/rdiff-backup.png

PYTHON_PACKAGE = python311
Expand All @@ -18,13 +18,16 @@ MAINTAINER = SynoCommunity
DESCRIPTION = Reverse differential backup tool, over a network or locally.
STARTABLE = no
DISPLAY_NAME = rdiff-backup
CHANGELOG = "1. Update to v2.2.5.<br/>2. Migrate to Python 3.11."
CHANGELOG = "1. Update to v2.2.6.<br/>2. Bring back support for ARMv5.<br/>3. Use alternate tmp dir."

HOMEPAGE = https://rdiff-backup.net/
LICENSE = GPLv2

SERVICE_SETUP = src/service-setup.sh

# https://github.com/SynoCommunity/spksrc/issues/4427
USE_ALTERNATE_TMPDIR = 1

SPK_USR_LOCAL_LINKS = bin:env/bin/rdiff-backup bin:env/bin/rdiff-backup-statistics

include ../../mk/spksrc.python.mk
14 changes: 7 additions & 7 deletions spk/rdiff-backup/src/requirements-crossenv.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
rdiff-backup==2.2.5
rdiff-backup==2.2.6

aiohttp==3.8.5
charset-normalizer==3.2.0
coverage==7.2.7
frozenlist==1.4.0
multidict==6.0.4
aiohttp==3.9.3
charset-normalizer==3.3.2
coverage==7.4.4
frozenlist==1.4.1
multidict==6.0.5
pylibacl==0.7.0
pyxattr==0.8.1
yarl==1.9.2
yarl==1.9.4

# [psutil]
# Last known version to build on armv5/ppc
Expand Down
35 changes: 17 additions & 18 deletions spk/rdiff-backup/src/requirements-pure.txt
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
# Snapshot using python 3.11 on Jul 22nd 2023
# Snapshot using python 3.11 on Mar 29th 2024
#aiohttp ==> crossenv
aiosignal==1.3.1
async-timeout==4.0.2
attrs==23.1.0
cachetools==5.3.1
async-timeout==4.0.3
attrs==23.2.0
cachetools==5.3.3
#certifi ==> py311
chardet==5.1.0
chardet==5.2.0
colorama==0.4.6
#coverage ==> crossenv
#distlib ==> py311
#filelock ==> py311
flake8==6.0.0
flake8==7.0.0
#frozenlist ==> crossenv
idna==3.4
idna==3.6
mccabe==0.7.0
#multidict ==> crossenv
packaging==23.1
packaging==24.0
#platformdirs ==> py311
pluggy==1.2.0
pluggy==1.4.0
#psutil ==> crossenv
py==1.11.0
pycodestyle==2.10.0
pyflakes==3.0.1
pycodestyle==2.11.1
pyflakes==3.2.0
#pylibacl ==> crossenv
pyparsing==3.1.0
pyproject-api==1.5.3
pyparsing==3.1.2
pyproject-api==1.6.1
#pyxattr ==> crossenv
#PyYAML ==> crossenv
#rdiff-backup ==> crossenv
requests==2.31.0
rqdb==1.0.11
setuptools-scm==7.1.0
rqdb==1.6.0
#six ==> py311
tomli==2.0.1
tox==4.6.4
typing_extensions==4.7.1
urllib3==2.0.4
tox==4.14.2
typing_extensions==4.10.0
urllib3==2.2.1
#virtualenv ==> py311
#yarl ==> crossenv