Update to latest upstream 3.1.0

Fixed #1018520 - missing rsyncd@.service
This commit is contained in:
Michal Luscon 2013-10-20 19:38:18 +02:00
parent 0de59c3585
commit e5f403ae1c
4 changed files with 22 additions and 4 deletions

2
.gitignore vendored
View File

@ -4,3 +4,5 @@ rsync-patches-3.0.8.tar.gz
/rsync-patches-3.0.9.tar.gz /rsync-patches-3.0.9.tar.gz
/rsync-3.1.0pre1.tar.gz /rsync-3.1.0pre1.tar.gz
/rsync-patches-3.1.0pre1.tar.gz /rsync-patches-3.1.0pre1.tar.gz
/rsync-3.1.0.tar.gz
/rsync-patches-3.1.0.tar.gz

View File

@ -1,4 +1,4 @@
%define isprerelease 1 %define isprerelease 0
%if %isprerelease %if %isprerelease
%define prerelease pre1 %define prerelease pre1
@ -7,7 +7,7 @@
Summary: A program for synchronizing files over a network Summary: A program for synchronizing files over a network
Name: rsync Name: rsync
Version: 3.1.0 Version: 3.1.0
Release: 1%{?prerelease}%{?dist} Release: 2%{?prerelease}%{?dist}
Group: Applications/Internet Group: Applications/Internet
URL: http://rsync.samba.org/ URL: http://rsync.samba.org/
@ -17,6 +17,8 @@ Source2: rsyncd.socket
Source3: rsyncd.service Source3: rsyncd.service
Source4: rsyncd.conf Source4: rsyncd.conf
Source5: rsyncd.sysconfig Source5: rsyncd.sysconfig
Source6: rsyncd@.service
BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel, zlib-devel, systemd-units BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel, zlib-devel, systemd-units
Requires: zlib Requires: zlib
Requires(post): systemd-units Requires(post): systemd-units
@ -78,6 +80,7 @@ install -D -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd.service
install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd.socket install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd.socket
install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/rsyncd.conf install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/rsyncd.conf
install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyncd install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyncd
install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -92,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/sysconfig/rsyncd %config(noreplace) %{_sysconfdir}/sysconfig/rsyncd
%{_unitdir}/rsyncd.socket %{_unitdir}/rsyncd.socket
%{_unitdir}/rsyncd.service %{_unitdir}/rsyncd.service
%{_unitdir}/rsyncd@.service
%post %post
%systemd_post rsyncd.service %systemd_post rsyncd.service
@ -103,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
%systemd_postun_with_restart rsyncd.service %systemd_postun_with_restart rsyncd.service
%changelog %changelog
* Sun Oct 20 2013 Michal Lusocn <mluscon@redhat.com> - 3.1.0-2
- Update to latest upstream 3.1.0
- Fixed #1018520 - missing rsyncd@.service
* Wed Aug 07 2013 Michal Luscon <mluscon@redhat.com> - 3.1.0-1pre1 * Wed Aug 07 2013 Michal Luscon <mluscon@redhat.com> - 3.1.0-1pre1
- Upstream 3.1.0 pre release - Upstream 3.1.0 pre release
- Fixed: #495310 - rsync contains forked copy of zlib - Fixed: #495310 - rsync contains forked copy of zlib

8
rsyncd@.service Normal file
View File

@ -0,0 +1,8 @@
[Unit]
Description=fast remote file copy program daemon
ConditionPathExists=/etc/rsyncd.conf
[Service]
EnvironmentFile=/etc/sysconfig/rsyncd
ExecStart=/usr/bin/rsync --daemon --no-detach "$OPTIONS"
StandardInput=socket

View File

@ -1,2 +1,2 @@
b1a64cf0c1d74371d9c24f071755246f rsync-3.1.0pre1.tar.gz 3be148772a33224771a8d4d2a028b132 rsync-3.1.0.tar.gz
2c8124f479db3bd59c44a390152866ff rsync-patches-3.1.0pre1.tar.gz a6f46f342017644e4747c1c083feefac rsync-patches-3.1.0.tar.gz