Hello community, here is the log from the commit of package csync2 for openSUSE:Factory checked in at 2012-05-03 10:54:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/csync2 (Old) and /work/SRC/openSUSE:Factory/.csync2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "csync2", Maintainer is "JShi@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/csync2/csync2.changes 2012-02-21 12:17:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.csync2.new/csync2.changes 2012-05-03 10:54:56.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Mar 19 12:51:03 UTC 2012 - tserong@suse.com + +- Force debug output off completely when running under xinetd (fixes + protocol breakage when target directories don't exist; bnc#752563) + +------------------------------------------------------------------- New: ---- force-debug-stderr-off-inetd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csync2.spec ++++++ --- /var/tmp/diff_new_pack.KofoEL/_old 2012-05-03 10:54:57.000000000 +0200 +++ /var/tmp/diff_new_pack.KofoEL/_new 2012-05-03 10:54:57.000000000 +0200 @@ -33,6 +33,7 @@ Patch2: csync2-1.34-pure-gnutls-r2.patch BuildRequires: pkg-config %endif +Patch3: force-debug-stderr-off-inetd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): openssl Requires: gnutls @@ -64,6 +65,7 @@ %if 0%{?suse_version} > 1120 %patch2 -p1 %endif +%patch3 -p1 install -p -m 644 %{SOURCE1} README.quickstart %build ++++++ force-debug-stderr-off-inetd.patch ++++++ Index: csync2-1.34/csync2.c =================================================================== --- csync2-1.34.orig/csync2.c +++ csync2-1.34/csync2.c @@ -458,6 +458,16 @@ int main(int argc, char ** argv) for (i=0; myhostname[i]; i++) myhostname[i] = tolower(myhostname[i]); + if ( mode == MODE_INETD ) { + /* Force debug level below zero when running under inetd, + * else stderr junk may be emitted back to some other host + * which breaks the protocol. One case is where a target + * directory does not exist resulting in allegations of + * I/O error during rsync write (bnc#752563) + */ + csync_debug_level = -1; + } + /* Stand-alone server mode. This is a hack.. */ if ( mode == MODE_SERVER || mode == MODE_SINGLE ) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org