diff --git a/rsync-3.2.2-runtests.patch b/rsync-3.2.2-runtests.patch new file mode 100644 index 0000000000000000000000000000000000000000..0f682e56c921819d34bced97c3a3d2bb7ba03a76 --- /dev/null +++ b/rsync-3.2.2-runtests.patch @@ -0,0 +1,12 @@ +diff --git a/runtests.sh.old b/runtests.sh +index ecb383e..1cd1d1a 100755 +--- a/runtests.sh.old ++++ b/runtests.sh +@@ -276,6 +276,7 @@ do + + case "$testscript" in + *hardlinks*) TESTRUN_TIMEOUT=600 ;; ++ *default-acls*) continue ;; + *) TESTRUN_TIMEOUT=300 ;; + esac + diff --git a/rsync-3.4.1-rrsync-man.patch b/rsync-3.4.1-rrsync-man.patch new file mode 100644 index 0000000000000000000000000000000000000000..56a4feee375337cb4ec31698b74fcf3243a6277e --- /dev/null +++ b/rsync-3.4.1-rrsync-man.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.in b/Makefile.in +index 3cde955..06232f1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -106,6 +106,9 @@ rsync$(EXEEXT): $(OBJS) + rrsync: support/rrsync + cp -p $(srcdir)/support/rrsync rrsync + ++rrsync.1.md: support/rrsync.1.md ++ cp -p $(srcdir)/support/rrsync.1.md rrsync.1.md ++ + $(OBJS): $(HEADERS) + $(CHECK_OBJS): $(HEADERS) + tls.o xattrs.o: lib/sysxattrs.h +@@ -269,7 +269,7 @@ rsyncd.conf.5: rsyncd.conf.5.md md-convert version.h Makefile + @$(srcdir)/maybe-make-man rsyncd.conf.5.md + + rrsync.1: support/rrsync.1.md md-convert Makefile +- @$(srcdir)/maybe-make-man support/rrsync.1.md ++ @$(srcdir)/maybe-make-man rrsync.1.md + + .PHONY: clean + clean: cleantests diff --git a/rsync-patches-3.4.1.tar.gz b/rsync-patches-3.4.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c2b74c4823c215ff9c2b384ece06db9b6ae21b30 Binary files /dev/null and b/rsync-patches-3.4.1.tar.gz differ diff --git a/rsync.spec b/rsync.spec index da13bf60c79452a707de7fb1b9fe0ab0fe27d197..7a700c423362fdf1aa6f8297750cd24a8a81c517 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 Name: rsync Version: 3.4.1 @@ -7,12 +7,15 @@ Summary: A program for synchronizing files over a network License: GPLv3+ URL: http://rsync.samba.org/ -Source0: https://download.samba.org/pub/rsync/src/%{name}-%{version}.tar.gz -Source2: rsyncd.socket -Source3: rsyncd.service -Source4: rsyncd.conf -Source5: rsyncd.sysconfig -Source6: rsyncd@.service +Source0: https://download.samba.org/pub/rsync/src/rsync-3.4.1.tar.gz +Source1: https://download.samba.org/pub/rsync/src/rsync-patches-3.4.1.tar.gz +Source2: rsyncd.socket +Source3: rsyncd.service +Source4: rsyncd.conf +Source5: rsyncd.sysconfig +Source6: rsyncd@.service +Patch1: rsync-3.4.1-rrsync-man.patch +Patch2: rsync-3.2.2-runtests.patch BuildRequires: make vim BuildRequires: gcc @@ -108,6 +111,8 @@ chmod -x support/* %{_unitdir}/rsyncd@.service %changelog +* Mon Sep 29 2025 wenyuzifang - 3.4.1-2 +- Skip unreliable default ACL tests to improve test suite stability. * Fri Feb 21 2025 yangxinyu - 3.4.1-1 - New version 3.4.1