Skip to content
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# Copyright © 2020-2024 Matt Robinson
# Copyright © 2020-2026 Matt Robinson
#
# SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -79,8 +79,8 @@ jobs:
- name: Extract version to environment vars
run: |
echo "BUILD_RELEASE=$(cat buildinfo/release)" >> "$GITHUB_ENV"
echo "JAR_VERSION=$(cat buildinfo/release | sed -e 's/^v//')" \
>> "$GITHUB_ENV"
echo "JAR_VERSION=$(cat buildinfo/release | \
sed 's/^v//;s/p/-/')" >> "$GITHUB_ENV"

- name: Latest release tag name
id: latest_release
Expand Down
2 changes: 2 additions & 0 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ PreCommit:

TrailingWhitespace:
enabled: true
exclude:
- '*.patch'

FileEncoding:
description: Check text files are valid UTF-8
Expand Down
44 changes: 44 additions & 0 deletions 0001-Only-try-falling-back-to-mkfifoat-if-available.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 99bc66813be58d7c16810b179e53b574e88ac591 Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Wed, 20 May 2026 20:19:12 +0100
Subject: [PATCH] Only try falling back to mkfifoat() if available

If MKNOD_CREATES_FIFOS is not defined by configure (such as when
cross-compiling), mkfifo() is available but mkfifoat() is not then
compilation fails since 30656c5e35.

Add a function check for mkfifoat and update the preprocessor
conditional that wraps the call to it to reference HAVE_MKFIFOAT.
---
configure.ac | 2 +-
syscall.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4062651d..b0b5d201 100644
--- a/configure.ac
+++ b/configure.ac
@@ -886,7 +886,7 @@ dnl AC_FUNC_MEMCMP

AC_FUNC_UTIME_NULL
AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(waitpid wait4 getcwd chown chmod lchmod mknod mkfifo \
+AC_CHECK_FUNCS(waitpid wait4 getcwd chown chmod lchmod mknod mkfifo mkfifoat \
fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
chflags getattrlist mktime innetgr linkat \
memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
diff --git a/syscall.c b/syscall.c
index e317bccc..eee96d46 100644
--- a/syscall.c
+++ b/syscall.c
@@ -597,7 +597,7 @@ int do_mknod_at(const char *pathname, mode_t mode, dev_t dev)
return ret;
}

-#if !defined MKNOD_CREATES_FIFOS && defined HAVE_MKFIFO
+#if !defined MKNOD_CREATES_FIFOS && defined HAVE_MKFIFOAT
if (S_ISFIFO(mode))
ret = mkfifoat(dfd, bname, mode);
else
--
2.53.0
12 changes: 10 additions & 2 deletions build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -e

# Copyright © 2020-2025 Matt Robinson
# Copyright © 2020-2026 Matt Robinson
#
# SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -14,16 +14,24 @@ PLATFORM=21

toolchain=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64
version=$(cat rsync-version)
patches=$(find . -maxdepth 1 -name "*.patch" | wc -l)
[ "$patches" -lt 1 ] && unset -v patches

[ -d buildinfo ] || mkdir buildinfo
echo $PLATFORM > buildinfo/minsdk
echo "$version" > buildinfo/release
echo "$version${patches+p$patches}" > buildinfo/release
grep Pkg.Revision "$ANDROID_NDK_HOME/source.properties" | \
cut -d ' ' -f 3 >> buildinfo/ndkver

git clone -b "$version" --depth 1 https://github.com/RsyncProject/rsync.git
cd rsync

if [ "$patches" ]; then
for patch in ../*.patch; do
patch -p1 < "$patch"
done
fi

./configure --host="$TARGET" --disable-md2man \
--disable-lz4 --disable-openssl --disable-xxhash --disable-zstd \
AR="$toolchain/bin/llvm-ar" \
Expand Down
2 changes: 1 addition & 1 deletion rsync-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.4.2
v3.4.3