From ce88ee55b6deb1f06fbcd12a1277f1030f6ff41899cb08f48dadaf15c1b5a6f8 Mon Sep 17 00:00:00 2001 From: David Anes Date: Tue, 11 Apr 2023 13:31:23 +0000 Subject: [PATCH] Accepting request 1078381 from home:jsegitz:branches:network OBS-URL: https://build.opensuse.org/request/show/1078381 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=102 --- rsync.changes | 6 ++++++ rsync.spec | 5 +++-- rsyncd | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 rsyncd diff --git a/rsync.changes b/rsync.changes index fca93e9..80cdbc0 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 6 11:03:52 UTC 2023 - Johannes Segitz + +- Switch rsyncd symlink to a wrapper script to allow setting a distinct + SELinux type (bsc#1209654) + ------------------------------------------------------------------- Fri Oct 21 07:52:48 UTC 2022 - Michael Ströder diff --git a/rsync.spec b/rsync.spec index 7f21016..9177a37 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,7 +1,7 @@ # # spec file for package rsync # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -47,6 +47,7 @@ Source9: rsyncd@.service Source10: https://rsync.samba.org/ftp/rsync/src/rsync-%{version}.tar.gz.asc Source11: https://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.tar.gz.asc Source12: %{name}.keyring +Source13: rsyncd Patch0: rsync-no-libattr.patch BuildRequires: autoconf BuildRequires: automake @@ -122,7 +123,7 @@ rm -f %{buildroot}%{_sbindir}/rsyncd install -d %{buildroot}%{_sysconfdir}/init.d install -d %{buildroot}%{_sysconfdir}/xinetd.d install -d %{buildroot}%{_sbindir} -ln -sf ../bin/rsync %{buildroot}%{_sbindir}/rsyncd +install -m 755 %{SOURCE13} %{buildroot}%{_sbindir}/rsyncd install -m 755 support/rsyncstats %{buildroot}%{_bindir} %if 0%{?suse_version} > 1500 install -d %{buildroot}%{_distconfdir}/logrotate.d diff --git a/rsyncd b/rsyncd new file mode 100644 index 0000000..52b0175 --- /dev/null +++ b/rsyncd @@ -0,0 +1,6 @@ +#!/bin/sh + +# We need this wrapper instead of a plain symlink to be able to set +# a different SELinux label on this +exec -a rsyncd /usr/bin/rsync "$@" +