diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f1dcee3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+SOURCES/rsync-3.1.2.tar.gz
+SOURCES/rsync-patches-3.1.2.tar.gz
diff --git a/.rsync.metadata b/.rsync.metadata
new file mode 100644
index 0000000..0ee2af5
--- /dev/null
+++ b/.rsync.metadata
@@ -0,0 +1,2 @@
+0d4c7fb7fe3fc80eeff922a7c1d81df11dbb8a1a SOURCES/rsync-3.1.2.tar.gz
+5ba449a5e570ac372b35ec0fdabb1a9c33c70cb4 SOURCES/rsync-patches-3.1.2.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
- 
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
- 
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/rsync-3.0.10-lose-track.patch b/SOURCES/rsync-3.0.10-lose-track.patch
new file mode 100644
index 0000000..b132124
--- /dev/null
+++ b/SOURCES/rsync-3.0.10-lose-track.patch
@@ -0,0 +1,11 @@
+--- rsync-3.0.9/flist.c	2011-08-27 23:58:04.000000000 +0200
++++ rsync-3.0.9/flist.c	2012-10-16 13:25:30.201627611 +0200
+@@ -369,7 +369,7 @@
+ 	pathname = dir;
+ 	pathname_len = dirlen;
+ 
+-	if (!dir)
++	if (!dir || (*dir=='.' && dirlen==1))
+ 		dir = orig_dir;
+ 
+ 	if (!change_dir(dir, CD_NORMAL)) {
diff --git a/SOURCES/rsync-3.0.6-iconv-logging.patch b/SOURCES/rsync-3.0.6-iconv-logging.patch
new file mode 100644
index 0000000..bf7d943
--- /dev/null
+++ b/SOURCES/rsync-3.0.6-iconv-logging.patch
@@ -0,0 +1,22 @@
+diff --git a/log.c b/log.c
+index 34a013b..1aca728 100644
+--- a/log.c
++++ b/log.c
+@@ -377,10 +377,13 @@ output_msg:
+ 				filtered_fwrite(f, convbuf, outbuf.len, 0);
+ 				outbuf.len = 0;
+ 			}
+-			if (!ierrno || ierrno == E2BIG)
+-				continue;
+-			fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++));
+-			inbuf.len--;
++			/* Log one byte of illegal/incomplete sequence and continue with
++			 * the next character. Check that the buffer is non-empty for the
++			 * sake of robustness. */
++			if ((ierrno == EILSEQ || ierrno == EINVAL) && inbuf.len) {
++				fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++));
++				inbuf.len--;
++			}
+ 		}
+ 	} else
+ #endif
diff --git a/SOURCES/rsync-3.1.2-zlib.patch b/SOURCES/rsync-3.1.2-zlib.patch
new file mode 100644
index 0000000..50f699e
--- /dev/null
+++ b/SOURCES/rsync-3.1.2-zlib.patch
@@ -0,0 +1,13 @@
+diff --git a/token.c.old b/token.c
+index ad9b9bc..b2a3614 100644
+--- a/token.c.old
++++ b/token.c
+@@ -21,7 +21,7 @@
+ 
+ #include "rsync.h"
+ #include "itypes.h"
+-#include <zlib.h>
++#include "zlib/zlib.h"
+ 
+ extern int do_compression;
+ extern int protocol_version;
diff --git a/SOURCES/rsync-man.patch b/SOURCES/rsync-man.patch
new file mode 100644
index 0000000..d1a08ca
--- /dev/null
+++ b/SOURCES/rsync-man.patch
@@ -0,0 +1,10 @@
+--- rsync-3.0.9/rsync.1   2011-09-23 18:42:26.000000000 +0200
++++ rsync-3.0.9/rsync.1   2012-09-19 10:40:19.698802861 +0200
+@@ -438,6 +438,7 @@
+  \-o, \-\-owner                 preserve owner (super\-user only)
+  \-g, \-\-group                 preserve group
+      \-\-devices               preserve device files (super\-user only)
++     \-\-copy-devices          copy device contents as regular file
+      \-\-specials              preserve special files
+  \-D                          same as \-\-devices \-\-specials
+  \-t, \-\-times                 preserve modification times
diff --git a/SOURCES/rsyncd.conf b/SOURCES/rsyncd.conf
new file mode 100644
index 0000000..6e058aa
--- /dev/null
+++ b/SOURCES/rsyncd.conf
@@ -0,0 +1,20 @@
+# /etc/rsyncd: configuration file for rsync daemon mode
+
+# See rsyncd.conf man page for more options.
+
+# configuration example:
+
+# uid = nobody
+# gid = nobody
+# use chroot = yes
+# max connections = 4
+# pid file = /var/run/rsyncd.pid
+# exclude = lost+found/
+# transfer logging = yes
+# timeout = 900
+# ignore nonreadable = yes
+# dont compress   = *.gz *.tgz *.zip *.z *.Z *.rpm *.deb *.bz2
+
+# [ftp]
+#        path = /home/ftp
+#        comment = ftp export area
diff --git a/SOURCES/rsyncd.service b/SOURCES/rsyncd.service
new file mode 100644
index 0000000..3ffecce
--- /dev/null
+++ b/SOURCES/rsyncd.service
@@ -0,0 +1,10 @@
+[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"
+
+[Install]
+WantedBy=multi-user.target
diff --git a/SOURCES/rsyncd.socket b/SOURCES/rsyncd.socket
new file mode 100644
index 0000000..7306ad0
--- /dev/null
+++ b/SOURCES/rsyncd.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Rsync Server Socket
+Conflicts=rsyncd.service
+
+[Socket]
+ListenStream=873
+Accept=yes
+
+[Install]
+WantedBy=sockets.target 
diff --git a/SOURCES/rsyncd.sysconfig b/SOURCES/rsyncd.sysconfig
new file mode 100644
index 0000000..90a5a43
--- /dev/null
+++ b/SOURCES/rsyncd.sysconfig
@@ -0,0 +1 @@
+OPTIONS="" 
diff --git a/SOURCES/rsyncd@.service b/SOURCES/rsyncd@.service
new file mode 100644
index 0000000..89f9621
--- /dev/null
+++ b/SOURCES/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/SPECS/rsync.spec b/SPECS/rsync.spec
new file mode 100644
index 0000000..d5f6d55
--- /dev/null
+++ b/SPECS/rsync.spec
@@ -0,0 +1,569 @@
+%global _hardened_build 1
+%define isprerelease 0
+
+%if %isprerelease
+%define prerelease pre1
+%endif
+
+Summary: A program for synchronizing files over a network
+Name: rsync
+Version: 3.1.2
+Release: 4%{?prerelease}%{?dist}
+Group: Applications/Internet
+URL: http://rsync.samba.org/
+
+Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}%{?prerelease}.tar.gz
+Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}%{?prerelease}.tar.gz
+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
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+License: GPLv3+
+
+Patch0: rsync-3.0.10-lose-track.patch
+Patch1: rsync-man.patch
+Patch3: rsync-3.0.6-iconv-logging.patch
+Patch4: rsync-3.1.2-zlib.patch
+
+%description
+Rsync uses a reliable algorithm to bring remote and host files into
+sync very quickly. Rsync is fast because it just sends the differences
+in the files over the network instead of sending the complete
+files. Rsync is often used as a very powerful mirroring process or
+just as a more capable replacement for the rcp command. A technical
+report which describes the rsync algorithm is included in this
+package.
+
+%prep
+# TAG: for pre versions use
+
+%if %isprerelease
+%setup -q -n rsync-%{version}%{?prerelease}
+%setup -q -b 1 -n rsync-%{version}%{?prerelease}
+%else
+%setup -q
+%setup -q -b 1
+%endif
+
+#Needed for compatibility with previous patched rsync versions
+patch -p1 -i patches/acls.diff
+patch -p1 -i patches/xattrs.diff
+
+#Enable --copy-devices parameter
+patch -p1 -i patches/copy-devices.diff
+
+%patch0 -p1 -b .lose-track
+%patch1 -p1 -b .man
+%patch3 -p1 -b .iconv-logging
+%patch4 -p1 -b .zlib
+
+%build
+rm -fr autom4te.cache
+autoconf -o configure.sh
+autoheader && touch config.h.in
+
+%configure
+    
+make proto
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%makeinstall INSTALLCMD='install -p' INSTALLMAN='install -p'
+
+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
+
+%check
+make check
+chmod -x support/*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc COPYING NEWS OLDNEWS README tech_report.tex support/
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man5/rsyncd.conf.5*
+%config(noreplace) %{_sysconfdir}/rsyncd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/rsyncd
+/%{_unitdir}/rsyncd.socket
+/%{_unitdir}/rsyncd.service
+/%{_unitdir}/rsyncd@.service
+
+%post
+%systemd_post rsyncd.service
+
+%preun
+%systemd_preun rsyncd.service
+
+%postun
+%systemd_postun_with_restart rsyncd.service
+
+%changelog
+* Wed Oct 18 2017 Michal Ruprich - 3.1.2-4
+- Related: #1432899 - removing dependencies on perl
+- using the bundled zlib.h(#1491582)
+- turning on upstream tests
+
+* Wed Aug 30 2017 Michal Ruprich - 3.1.2-1
+- Resolves: #1432899 - Rebase rsync to version >= 3.1.0
+- rebase to 3.1.2
+
+* Tue Jan 24 2017 Michal Ruprich - 3.0.9-18
+- Resolves: #1324754 -  rsyncd unit enters failed state on exit
+
+* Tue Jun 23 2015 Luboš Uhliarik <luhliari@redhat.com> - 3.0.9-17
+- Resolves: #1082496 - socket activation for rsync doesn't work (added missing
+  rsyncd@.service file)
+
+* Tue Jun 23 2015 Luboš Uhliarik <luhliari@redhat.com> - 3.0.9-16
+- Resolves: #1090825 - rsync -X is ineffective when setting owner/group
+- Fixed bogus dates
+
+* Tue Feb 11 2014 Pavel Šimerda <psimerda@redhat.com> - 3.0.9-15
+- Resolves: #1032637 - rsync unit tests cannot be compiled
+- switch to hardened build
+
+* Tue Jan 28 2014 Pavel Šimerda <psimerda@redhat.com> - 3.0.9-14
+- Resolves: #1052814 - rsync command is terminated with SIGSEGV
+- Resolves: #1052814 - add missing patch file
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 3.0.9-13
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 3.0.9-12
+- Mass rebuild 2013-12-27
+
+* Fri Jun 28 2013 Michal Luscon <mluscon@redhat.com> - 3.0.9-11
+- Add BuildRequires: systemd-units
+
+* Mon Jun 17 2013 Michal Luscon <mluscon@redhat.com> - 3.0.9-10
+- Fixed: #947765 - rsync daemon chooses wrong destination place
+
+* Fri May 17 2013 Michal Luscon <mluscon@redhat.com> - 3.0.9-9
+- Fix missing man page and help options
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.9-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Nov 15 2012 Michal Luscon <mluscon@redhat.com> 3.0.9-6
+- Systemd units for rsync
+
+* Tue Oct 23 2012 Michal Luscon <mluscon@redhat.com> 3.0.9-5
+- Reverted: #495310 - rsync contains forked copy of zlib
+
+* Tue Oct 16 2012 Michal Luscon <mluscon@redhat.com> 3.0.9-4
+- Fixed: #823088 - rsync loses track of files with different directory prefixes
+- Fixed: #495310 - rsync contains forked copy of zlib
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Sep 14 2011 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 3.0.9-1
+- Rebase to 3.0.9 (#741004)
+
+* Wed Sep 14 2011 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 3.0.8-2
+- Fix security context of symbolic links (#709779)
+
+* Tue Mar 29 2011 Vojtech Vitek <vvitek@redhat.com> - 3.0.8-1
+- Rebase to 3.0.8, remove buffer overflow patch (#691362, #675036)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Mar 29 2010 Jan Zeleny <jzeleny@redhat.com> - 3.0.7-3
+- buffer overflow patch replaced by upstream version
+
+* Fri Jan 22 2010 Jan Zeleny <jzeleny@redhat.com> - 3.0.7-2
+- fixed issue with buffer overflow when using long filenames (#557916)
+
+* Tue Jan 19 2010 Jan Zeleny <jzeleny@redhat.com> - 3.0.7-1
+- rebased to 3.0.7
+
+* Mon Dec 07 2009 Jan Zeleny <jzeleny@redhat.com> - 3.0.6-4
+- applied patch to avoid retouching dir permissions (#542679)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun  1 2009 Simo Sorce <ssorce@redhat.com> 3.0.6-2
+- Final 3.0.6 release
+
+* Thu May 21 2009 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 3.0.6-1pre1
+- Enabled patches/copy-devices.diff patch (bz#494313)
+
+* Wed Apr 15 2009 Simo Sorce <ssorce@redhat.com> 3.0.6-0pre1
+- First 3.0.6 pre release
+- Also change the spec to simplify releasing pre-releases
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.5-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jan  1 2009 Simo Sorce <ssorce@redhat.com> 3.0.5-0.fc11
+- New upstream bugfix release
+
+* Mon Sep  8 2008 Simo Sorce <ssorce@redhat.com> 3.0.4-0.fc10
+- New upstream bugfix release
+
+* Mon Jun 30 2008 Simo Sorce <ssorce@redhat.com> 3.0.3-0.fc10
+- New upstream release
+
+* Tue Apr  8 2008 Simo Sorce <ssorce@redhat.com> 3.0.2-0.fc9
+- Security release: http://rsync.samba.org/security.html#s3_0_2
+
+* Fri Apr  4 2008 Simo Sorce <ssorce@redhat.com> 3.0.1-2.fc9
+- Make sure support scripts are not executable so that no bad perl dependecies
+  are created
+
+* Fri Apr  4 2008 Simo Sorce <ssorce@redhat.com> 3.0.1-1.fc9
+- Add NEWS and support/ scripts in the docs section
+- 3.0.1 final
+
+* Mon Mar 31 2008 Simo Sorce <ssorce@redhat.com> 3.0.1-0.3.pre3.fc9
+- 3.0.1 pre release #3
+- Fixes some annoying minor bugs (see release notes)
+
+* Thu Mar 27 2008 Simo Sorce <ssorce@redhat.com> 3.0.1-0.2.pre2.fc9
+- 3.0.1 pre release #2
+- Fixes #439074
+
+* Tue Mar 25 2008 Simo Sorce <ssorce@redhat.com> 3.0.1-0.1.pre1.fc9
+- 3.0.1 pre release #1
+- Fixes #438694
+
+* Sun Mar  2 2008 Simo Sorce <ssorce@redhat.com> 3.0.0-1.fc9
+- Final 3.0.0 release
+
+* Sat Feb 23 2008 Simo Sorce <ssorce@redhat.com> 3.0.0-0.pre10.fc9
+- Tenth preprelease of the 3.0.0 series
+
+* Sat Feb 16 2008 Simo Sorce <ssorce@redhat.com> 3.0.0-0.pre9.fc9
+- Ninth preprelease of the 3.0.0 series
+
+* Sat Feb  2 2008 Simo Sorce <ssorce@redhat.com> 3.0.0-0.pre8.fc9
+- Eight prerelease
+- Add second source, now patches are in a separate file
+- Add temporary fix to the xattrs.diff patch line as, in this version
+  the patch contains one extra humk already contained in acls.diff
+
+* Sat Oct 27 2007 Simo Sorce <ssorce@redhat.com> 3.0.0-0.pre4.fc9
+- Fourth prerelease
+
+* Mon Oct 15 2007 Simo Sorce <ssorce@redhat.com> 3.0.0-0.pre2.1.fc9
+- Add support for IPv6 by default with xinetd
+
+* Fri Oct 12 2007 Simo Sorce <ssorce@redhat.com> 3.0.0-0.pre2.fc9
+- Second prerelease
+
+* Wed Oct 10 2007 Simo Sorce <ssorce@redhat.com> 3.0.0-0.pre1.fc9
+- New Major version prerelease
+
+* Wed Sep 5 2007 Simo Sorce <ssorce@redhat.com> 2.6.9-3.fc8
+- Add patch to fix crash bug with hardlinks and ACLs patches
+
+* Mon Feb 19 2007 Adam Jackson <ajax@redhat.com> 2.6.9-2
+- Add dist tag to Release to fix upgrades from FC5 or FC6.
+
+* Mon Feb 19 2007 Simo Sorce <ssorce@redhat.com> - 2.6.9-2
+- fix acl/xattr bug with --delete: (bz#229145)
+
+* Wed Nov 22 2006 Florian La Roche <laroche@redhat.com> - 2.6.9-1
+- update to 2.6.9
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.6.8-3.1
+- rebuild
+
+* Fri Jun 9 2006 Jay Fenlason <fenlason@redhat.com> 2.6.8-3
+- Add my xattrs_bug patch to fix a bug where xattrs don't get sent correctly.
+- Add BuildRequires to make sure libattr-devel and libacl-devel are avaliable
+- replace --with... with --enable... so they actually work
+- Add make, autoconf and gcc to BuildRequires
+
+* Mon May 8 2006 Jay Fenlason <fenlason@redhat.com> 2.6.8-2
+- New upstream release
+- Use the upstream xattr patch instead of mine.  This closes
+  bz#190208 CVE-2006-2083 rsync buffer overflow issue
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.6.6-2.2.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.6.6-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Thu Jul 28 2005 Jay Fenlason <fenlason@redhat.com> 2.6.6-2
+- New upstream release.  See the NEWS file for details.
+
+* Thu Jun 2 2005 Jay Fenlason <fenlason@redhat.com> 2.6.5-2
+- New upstream release
+
+* Tue May 17 2005 Jay Fenlason <fenlason@redhat.com> 2.6.5-0.pre1.0
+- new upstream pre-release
+
+* Tue May 17 2005 Jay Fenlason <fenlason@redhat.com> 2.6.4-3
+- Include the -address patch from upstream, to close
+  bz#154752 Unable to use --address in client mode
+
+* Thu Mar 31 2005 Jay Fenlason <fenlason@redhat.com> 2.6.4-2
+- New upstream version
+
+* Wed Mar 2 2005 Jay Fenlason <fenlason@redhat.com> 2.6.3-3
+- bump release, rebuild with gcc4
+- pass RPM_OPT_FLAGS to make
+
+* Thu Feb 10 2005 Jay Fenlason <fenlason@redhat.com> 2.6.3-2
+- Added my -xattr patch, which is based on the -acl patch.
+
+* Thu Sep 30 2004 Jay Fenlason <fenlason@redhat.com> 2.6.3-1
+- New upstream release.
+
+* Tue Sep 21 2004 Jay Fenlason <fenlason@redhat.com> 2.6.3-0.pre2
+- new upstream version.
+
+* Tue Aug 17 2004 Jay Fenlason <fenlason@redhat.com> 2.6.3-0.pre1
+- New upstream version with security fix for CAN-2004-0792
+- This obsoletes the -lastdir-corruption patch.
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue May 25 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.2-1
+- Backport fix for crasher when passing multiple directories of the same
+  length (bug #123708)
+
+* Fri Apr 30 2004 Jay Fenlason <fenlason@redhat.com> 2.6.2-0
+- New upstream version to correct the problems with 2.6.1.
+  This obsoletes all the patches to 2.6.1
+
+* Thu Apr 29 2004 Jay Fenlason <fenlason@redhat.com> 2.6.1-1
+- Rsync 2.6.1 final.
+- Add a patch from Wayne Davison <wayned@samba.org> that fixes a
+  use of uninitilized memory in the map_uid and map_gid functions.
+- Add another patch from Wayne Davidson that fixes the -R option.
+- Add a patch (extracted from a patch by Sami Farin
+  <safari-rsync@safari.iki.fi>) to not ignore the return value
+  of close().
+
+* Thu Mar 25 2004 Jay Fenlason <fenlason@redhat.com> 2.6.1-0.pre1
+- New upstream version
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Jan  5 2004 Jay Fenlason <fenlason@redhat.com> 2.6.0-0
+- New upstream version, obsoletes the rsync-2.5.6-signal.patch
+
+* Wed Dec  3 2003 Bill Nottingham <notting@redhat.com> 2.5.7-2
+- rebuild
+
+* Wed Dec  3 2003 Bill Nottingham <notting@redhat.com> 2.5.7-1
+- update to 2.5.7
+
+* Tue Aug 05 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-20
+- rebuild in new build env
+
+* Tue Aug 05 2003 Lon Hohberger <lhh@redhat.com> 2.5.6-19
+- spec file fix
+
+* Tue Aug 05 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-18
+- rebuild in new build env
+
+* Tue Aug 05 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-17
+- fixed spec - added patch0 to prep.
+
+* Tue Aug 05 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-16
+- rebuild in new build env
+
+* Mon Aug 04 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-15
+- add rsync-2.5.6-signal.patch to fix kernel warnings that
+  appear because socket.c sets SIGCHLD to SIG_IGN and then
+  calls wait.  This is in response to bug#98740.  This patch
+  *has* been committed to CVS upstream and will be in
+  upstream rsync-2.5.7.
+
+* Fri Jun 13 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-14
+- build scratch - for compile warnings
+
+* Fri Jun 13 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-13
+- build scratch - for compile warnings
+
+* Thu Jun 12 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-12
+- rebuild in new build env
+
+* Thu Jun 12 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-11
+- removed rsync-2.5.6-sign.patch.  Upstream code
+  incorporates signed vs unsigned changes.
+
+* Wed Jun 11 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-10_CVSHEAD_signpatch
+- build scratch - added rsync-2.5.6-sign.patch.
+
+* Wed Jun 11 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-9_CVSHEAD_nopatches
+- build scratch.
+
+* Wed Jun 11 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-8
+- build scratch - deleted rsync-2.5.6-sign.patch.
+
+* Mon Jun 09 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-7
+- rebuild in new build env
+
+* Thu Jun 05 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-6
+- removed patch rsync-2.5.4-maxdel.patch
+- removed patch rsync-2.4.6-segv.patch
+   - current 2.5.6 properly handles (no segfault) the situation
+     (rsync '[a]') that caused a need for this patch.
+- added patch rsync-2.5.6-sign.patch, which is a working
+  subset of patches (that still apply) included in the original
+  rsync-2.5.4-moresignage.patch
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Mar 11 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-4
+- rebuild in new build env
+
+* Tue Mar 11 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-3
+- fixed changelog comments
+
+* Mon Mar 10 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-2
+- rebuild in new build env
+
+* Mon Mar 10 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.6-1
+- update to 2.5.6 from upstream
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Fri Jan 17 2003 Hardy Merrill <hmerrill@redhat.com> 2.5.5-3
+- fix spelling mistake in rsync.xinetd.  #66036 & dup #75006
+
+* Wed Dec 11 2002 Tim Powers <timp@redhat.com> 2.5.5-2
+- rebuild on all arches
+
+* Mon Jun 24 2002 Bill Nottingham <notting@redhat.com> 2.5.5-1
+- update to 2.5.5
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Wed Apr 10 2002 Bill Nottingham <notting@redhat.com> 2.5.4-2
+- upstream patches: fix accidental use of --whole-file, fix
+  minor memory leak, and bad worst-case child kill behavior
+- make passing -e to rsync:// URLs not cause an error exit (#62489)
+
+* Wed Mar 13 2002 Bill Nottingham <notting@redhat.com> 2.5.4-1
+- update to 2.5.4, do assorted patchmerging
+
+* Wed Feb 20 2002 Bill Nottingham <notting@redhat.com>
+- fix --address (#60127)
+- call setgroups before dropping privs (<mkp@samba.org>)
+
+* Mon Jan 28 2002 Bill Nottingham <notting@redhat.com>
+- fix some errors in the unsigned patch
+
+* Sun Jan 27 2002 Bill Nottingham <notting@redhat.com>
+- rebuild to get proper LFS_CFLAGS
+
+* Wed Jan 23 2002 Bill Nottingham <notting@redhat.com>
+- fix some signed/unsigned issues (<krahmer@suse.de>)
+- tweak ipv6 patch (#55337, <john.l.villalovos@intel.com>)
+- make xinetd file %config(noreplace)
+
+* Fri Aug 17 2001 Bill Nottingham <notting@redhat.com>
+- fix segfault on weird arguments (#51801)
+
+* Tue Jul 24 2001 Bill Nottingham <notting@redhat.com>
+- IPv6 patch (<pekkas@netcore.fi>) (#47780)
+
+* Tue Jun 19 2001 Bill Nottingham <notting@redhat.com>
+- add patch to fix hangs at end of sync, and other odd behaviors (#42111)
+
+* Sat Sep 30 2000 Florian La Roche <Florian.LaRoche@redhat.de>
+- add xinetd configuration
+
+* Tue Sep 26 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- 2.4.6
+
+* Mon Jul 31 2000 Bill Nottingham <notting@redhat.com>
+- update to 2.4.4 - fixes yet another problem with rsh transport
+
+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
+- automatic rebuild
+
+* Sat Jun 10 2000 Bill Nottingham <notting@redhat.com>
+- rebuild in new build env.
+
+* Mon Apr 10 2000 Bill Nottingham <notting@redhat.com>
+- update to 2.4.3
+
+* Tue Apr  4 2000 Bill Nottingham <notting@redhat.com>
+- update to 2.4.2
+
+* Tue Mar  7 2000 Bill Nottingham <notting@redhat.com>
+- fix maxdelete behavior so it isn't sent to older servers.
+
+* Mon Jan 31 2000 Jeff Johnson <jbj@redhat.com>
+- update to 2.4.1.
+
+* Fri Dec 17 1999 Bill Nottingham <notting@redhat.com>
+- update to 2.3.2
+
+* Sat Jun 12 1999 Jeff Johnson <jbj@redhat.com>
+- add "max. delete" patch to limit damage when server is hosed.
+
+* Wed Apr 07 1999 Bill Nottingham <notting@redhat.com>
+- update to 2.3.1.
+
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+- auto rebuild in the new build environment (release 2)
+
+* Tue Mar 16 1999 Jeff Johnson <jbj@redhat.com>
+- update to 2.3.0.
+
+* Sat Mar 13 1999 Jeff Johnson <jbj@redhat.com>
+- update to 2.3.0 beta.
+
+* Fri Dec 18 1998 Bill Nottingham <notting@redhat.com>
+- update to 2.2.1
+
+* Thu Sep 10 1998 Jeff Johnson <jbj@redhat.com>
+- updated to 2.1.1
+
+* Mon Aug 17 1998 Erik Troan <ewt@redhat.com>
+- updated to 2.1.0
+
+* Thu Aug 06 1998 Erik Troan <ewt@redhat.com>
+- buildrooted and attr-rophied
+- removed tech-report.ps; the .tex should be good enough
+
+* Mon Aug 25 1997 John A. Martin <jam@jamux.com>
+- Built 1.6.3-2 after finding no rsync-1.6.3-1.src.rpm although there
+  was an ftp://ftp.redhat.com/pub/contrib/alpha/rsync-1.6.3-1.alpha.rpm
+  showing no packager nor signature but giving 
+  "Source RPM: rsync-1.6.3-1.src.rpm".
+- Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip
+  to '%%build', removed '%%prefix'.
+
+* Thu Apr 10 1997 Michael De La Rue <miked@ed.ac.uk>
+- rsync-1.6.2-1 packaged.  (This entry by jam to credit Michael for the
+  previous package(s).)