From a4c90f9b4201d535d300be898b89053d60381ba4 Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Thu, 30 Jan 2025 11:17:42 +0100
Subject: [PATCH] Resolves: RHEL-71293 - Build rsync with --with-rrsync

---
 rsync.spec | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/rsync.spec b/rsync.spec
index 6aa1bb0..8ca039d 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -9,7 +9,7 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.4.1
-Release: 1%{?prerelease}%{?dist}
+Release: 2%{?prerelease}%{?dist}
 URL: https://rsync.samba.org/
 
 Source0: https://download.samba.org/pub/rsync/src/rsync-%{version}%{?prerelease}.tar.gz
@@ -64,6 +64,15 @@ Requires: %{name} = %{version}-%{release}
 Rsync can be used to offer read only access to anonymous clients. This
 package provides the anonymous rsync service.
 
+%package rrsync
+Summary: A script to setup restricted rsync users via ssh logins
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+Requires: %{__python3}
+%description rrsync
+This subpackage provides rrsync script and its manpage. rrsync
+may be used to setup a restricted rsync users via ssh logins.
+
 %prep
 # TAG: for pre versions use
 
@@ -75,7 +84,6 @@ package provides the anonymous rsync service.
 %setup -q -b 1
 %endif
 
-#%patch0 -p1 -b .verify-hostname
 %patch 1 -p1 -b .runtests
 %patch 2 -p1 -b .rrsync
 
@@ -109,10 +117,8 @@ install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
 %license COPYING
 %doc support/ tech_report.tex
 %{_bindir}/%{name}
-%{_bindir}/r%{name}
 %{_bindir}/%{name}-ssl
 %{_mandir}/man1/%{name}.1*
-%{_mandir}/man1/r%{name}.1*
 %{_mandir}/man1/%{name}-ssl.1*
 %{_mandir}/man5/rsyncd.conf.5*
 %config(noreplace) %{_sysconfdir}/rsyncd.conf
@@ -123,6 +129,10 @@ install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
 %{_unitdir}/rsyncd.service
 %{_unitdir}/rsyncd@.service
 
+%files rrsync
+%{_bindir}/r%{name}
+%{_mandir}/man1/r%{name}.1*
+
 %post daemon
 %systemd_post rsyncd.service
 
@@ -133,6 +143,9 @@ install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
 %systemd_postun_with_restart rsyncd.service
 
 %changelog
+* Thu Jan 30 2025 Michal Ruprich <mruprich@redhat.com> - 3.4.1-2
+- Resolves: RHEL-71293 - Build rsync with --with-rrsync
+
 * Wed Jan 15 2025 Michal Ruprich <mruprich@redhat.com> - 3.4.1-1
 - New version 3.4.1
 - Resolves: RHEL-70151 - Heap Buffer Overflow in Rsync due to Improper Checksum Length Handling