From e5f403ae1c4152afac7a5df071db12d86611923f Mon Sep 17 00:00:00 2001
From: Michal Luscon <mluscon@redhat.com>
Date: Sun, 20 Oct 2013 19:38:18 +0200
Subject: [PATCH] Update to latest upstream 3.1.0 Fixed #1018520 - missing
 rsyncd@.service

---
 .gitignore      |  2 ++
 rsync.spec      | 12 ++++++++++--
 rsyncd@.service |  8 ++++++++
 sources         |  4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 rsyncd@.service

diff --git a/.gitignore b/.gitignore
index 7ce3538..3b16170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ rsync-patches-3.0.8.tar.gz
 /rsync-patches-3.0.9.tar.gz
 /rsync-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
diff --git a/rsync.spec b/rsync.spec
index 1888c91..ea2e0ed 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,4 +1,4 @@
-%define isprerelease 1
+%define isprerelease 0
 
 %if %isprerelease
 %define prerelease pre1
@@ -7,7 +7,7 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.1.0
-Release: 1%{?prerelease}%{?dist}
+Release: 2%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
@@ -17,6 +17,8 @@ Source2: rsyncd.socket
 Source3: rsyncd.service
 Source4: rsyncd.conf
 Source5: rsyncd.sysconfig
+Source6: rsyncd@.service
+
 BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel, zlib-devel, systemd-units
 Requires: zlib
 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 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/rsyncd.conf
 install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyncd
+install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyncd
 %{_unitdir}/rsyncd.socket
 %{_unitdir}/rsyncd.service
+%{_unitdir}/rsyncd@.service
 
 %post
 %systemd_post rsyncd.service
@@ -103,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 %systemd_postun_with_restart rsyncd.service
 
 %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
 - Upstream 3.1.0 pre release
 - Fixed: #495310 - rsync contains forked copy of zlib
diff --git a/rsyncd@.service b/rsyncd@.service
new file mode 100644
index 0000000..89f9621
--- /dev/null
+++ b/rsyncd@.service
@@ -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
diff --git a/sources b/sources
index eb8f32f..c533b79 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b1a64cf0c1d74371d9c24f071755246f  rsync-3.1.0pre1.tar.gz
-2c8124f479db3bd59c44a390152866ff  rsync-patches-3.1.0pre1.tar.gz
+3be148772a33224771a8d4d2a028b132  rsync-3.1.0.tar.gz
+a6f46f342017644e4747c1c083feefac  rsync-patches-3.1.0.tar.gz