diff --git a/deps-packaging/rsync/cfbuild-rsync.spec b/deps-packaging/rsync/cfbuild-rsync.spec index 9bd68eaaa..c32dd1a04 100644 --- a/deps-packaging/rsync/cfbuild-rsync.spec +++ b/deps-packaging/rsync/cfbuild-rsync.spec @@ -1,10 +1,11 @@ -%define rsync_version 3.4.2 +%define rsync_version 3.4.3 Summary: CFEngine Build Automation -- rsync Name: cfbuild-rsync Version: %{version} Release: 1 Source0: rsync-%{rsync_version}.tar.gz +Patch0: fix-sys-openat2-undeclared.patch License: MIT Group: Other Url: https://cfengine.com @@ -18,6 +19,8 @@ AutoReqProv: no mkdir -p %{_builddir} %setup -q -n rsync-%{rsync_version} +%patch -P 0 -p1 + # liblz4, libxxhash, libzstd, and libssl give rsync extra compression # algorithms, extra checksum algorithms, and allow use of openssl's crypto lib # for (potentially) faster MD4/MD5 checksums. @@ -25,7 +28,7 @@ mkdir -p %{_builddir} %build -make +make %install diff --git a/deps-packaging/rsync/debian/rules b/deps-packaging/rsync/debian/rules index b6c38a195..09ab68032 100755 --- a/deps-packaging/rsync/debian/rules +++ b/deps-packaging/rsync/debian/rules @@ -12,6 +12,8 @@ build: build-stamp build-stamp: dh_testdir + patch -p1 < $(CURDIR)/fix-sys-openat2-undeclared.patch + # liblz4, libxxhash, libzstd, and libssl give rsync extra compression # algorithms, extra checksum algorithms, and allow use of openssl's crypto # lib for (potentially) faster MD4/MD5 checksums. diff --git a/deps-packaging/rsync/distfiles b/deps-packaging/rsync/distfiles index ffbf276fc..2d0543c64 100644 --- a/deps-packaging/rsync/distfiles +++ b/deps-packaging/rsync/distfiles @@ -1 +1 @@ -ff10aa2c151cd4b2dbbe6135126dbc854046113d2dfb49572a348233267eb315 rsync-3.4.2.tar.gz +c72e63ca3021cbc80ba86ec30102773f4c5631fbc492b52e773b3958f82a53d3 rsync-3.4.3.tar.gz diff --git a/deps-packaging/rsync/fix-sys-openat2-undeclared.patch b/deps-packaging/rsync/fix-sys-openat2-undeclared.patch new file mode 100644 index 000000000..f839dd09e --- /dev/null +++ b/deps-packaging/rsync/fix-sys-openat2-undeclared.patch @@ -0,0 +1,16 @@ +Fall back to defining SYS_openat2 when the running kernel-headers don't +export it from . See https://github.com/RsyncProject/rsync/issues/900. +The syscall number 437 is correct for all Linux architectures. + +--- a/syscall.c ++++ b/syscall.c +@@ -37,6 +37,9 @@ + #ifdef __linux__ + #include + #include ++#ifndef SYS_openat2 ++#define SYS_openat2 437 ++#endif + #endif + + #include "ifuncs.h"