From 9f927d0eb535564574424e74b69f8298b9c5734f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 23 2020 06:10:22 +0000
Subject: import rsync-3.1.3-12.el8


---

diff --git a/SOURCES/rsync-3.1.3-skip-compress.patch b/SOURCES/rsync-3.1.3-skip-compress.patch
new file mode 100644
index 0000000..3b5b612
--- /dev/null
+++ b/SOURCES/rsync-3.1.3-skip-compress.patch
@@ -0,0 +1,37 @@
+diff --git a/loadparm.c b/loadparm.c
+index 029f358f..534e7b63 100644
+--- a/loadparm.c
++++ b/loadparm.c
+@@ -449,7 +449,7 @@ static struct parm_struct parm_table[] =
+ };
+ 
+ /* Initialise the Default all_vars structure. */
+-static void reset_all_vars(void)
++void reset_daemon_vars(void)
+ {
+ 	memcpy(&Vars, &Defaults, sizeof Vars);
+ }
+@@ -872,7 +872,7 @@ int lp_load(char *pszFname, int globals_only)
+ {
+ 	bInGlobalSection = True;
+ 
+-	reset_all_vars();
++	reset_daemon_vars();
+ 
+ 	/* We get sections first, so have to start 'behind' to make up. */
+ 	iSectionIndex = -1;
+diff --git a/main.c b/main.c
+index 1328c504..9af9e5d3 100644
+--- a/main.c
++++ b/main.c
+@@ -1681,6 +1681,10 @@ int main(int argc,char *argv[])
+ 
+ 	memset(&stats, 0, sizeof(stats));
+ 
++	/* Even a non-daemon runs needs the default config values to be set, e.g.
++	 * lp_dont_compress() is queried when no --skip-compress option is set. */
++	reset_daemon_vars();
++
+ 	if (argc < 2) {
+ 		usage(FERROR);
+ 		exit_cleanup(RERR_SYNTAX);
diff --git a/SPECS/rsync.spec b/SPECS/rsync.spec
index ad6329d..c267baa 100644
--- a/SPECS/rsync.spec
+++ b/SPECS/rsync.spec
@@ -9,7 +9,7 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.1.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
@@ -34,6 +34,7 @@ Patch3: rsync-3.1.2-remove-symlinks.patch
 Patch4: rsync-3.1.2-vvv-hang.patch
 Patch5: rsync-3.1.3-ignore-missing.patch
 Patch6: rsync-3.1.3-append-check.patch
+Patch7: rsync-3.1.3-skip-compress.patch
 
 %description
 Rsync uses a reliable algorithm to bring remote and host files into
@@ -78,6 +79,7 @@ patch -p1 -i patches/copy-devices.diff
 %patch4 -p1 -b .vvv
 %patch5 -p1 -b .missing
 %patch6 -p1 -b .append
+%patch7 -p1 -b .skip-compress
 
 %build
 %configure
@@ -124,16 +126,19 @@ chmod -x support/*
 %systemd_postun_with_restart rsyncd.service
 
 %changelog
+* Fri Dec 18 2020 Michal Ruprich <mruprich@redhat.com> - 3.1.3-12
+- Resolves: #1816528 - Defaults for --skip-compress are not working, everything is being compressed
+
 * Thu Nov 05 2020 Tomas Korbar <tkorbar@redhat.com> - 3.1.3-11
 - Resolves: #1855981 - rsync segfaults in --append mode
 
 * Thu Nov 05 2020 Tomas Korbar <tkorbar@redhat.com> - 3.1.3-10
 - Resolves: #1727093 - rsync: "ABORTING due to invalid path from sender"
 
-* Mon Aug 24 2020 Michal Ruprich <michalruprich@gmail.com> - 3.1.3-9
+* Mon Aug 24 2020 Michal Ruprich <mruprich@redhat.com> - 3.1.3-9
 - Resolves: #1667436 - rsyncd.service fails to start at boot if address is configured
 
-* Wed Jun 10 2020 Michal Ruprich <michalruprich@gmail.com> - 3.1.3-8
+* Wed Jun 10 2020 Michal Ruprich <mruprich@redhat.com> - 3.1.3-8
 - Resolves: #1775561 - rsync 3.1.2 hangs when run with -vvv to sync a large repository
 
 * Tue Oct 29 2019 Michal Ruprich <mruprich@redhat.com> - 3.1.3-7