From 871babdd6a75dfda7ef60364686c098a3c3784358d5c4be341816b766013830f Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Tue, 29 Mar 2011 14:20:06 +0000 Subject: [PATCH] update to 3.0.8 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=11 --- rsync-3.0.5-doc-fix.patch | 11 +++-- rsync-3.0.7.tar.bz2 | 3 -- rsync-3.0.8.tar.bz2 | 3 ++ rsync-patches-3.0.7.tar.bz2 | 3 -- rsync-patches-3.0.8.tar.bz2 | 3 ++ rsync.changes | 50 +++++++++++++++++++++++ rsync.spec | 80 ++++++++++++++++++------------------- rsyncd.rc | 13 +++--- 8 files changed, 105 insertions(+), 61 deletions(-) delete mode 100644 rsync-3.0.7.tar.bz2 create mode 100644 rsync-3.0.8.tar.bz2 delete mode 100644 rsync-patches-3.0.7.tar.bz2 create mode 100644 rsync-patches-3.0.8.tar.bz2 diff --git a/rsync-3.0.5-doc-fix.patch b/rsync-3.0.5-doc-fix.patch index 6e7ba04..69d7f36 100644 --- a/rsync-3.0.5-doc-fix.patch +++ b/rsync-3.0.5-doc-fix.patch @@ -1,9 +1,8 @@ -Index: rsync-3.0.5/rsync.1 -=================================================================== ---- rsync-3.0.5.orig/rsync.1 2008-12-29 03:03:37.000000000 +0100 -+++ rsync-3.0.5/rsync.1 2009-03-24 11:12:00.000000000 +0100 -@@ -442,8 +442,8 @@ - \-\-remove\-source\-files sender removes synchronized files (non-dir) +diff -up rsync-3.0.8/rsync.1.orig rsync-3.0.8/rsync.1 +--- rsync-3.0.8/rsync.1.orig 2011-03-29 13:45:53.211306762 +0200 ++++ rsync-3.0.8/rsync.1 2011-03-29 13:46:29.420079020 +0200 +@@ -450,8 +450,8 @@ to the detailed description below for a + \-\-remove\-source\-files sender removes synchronized files (non\-dir) \-\-del an alias for \-\-delete\-during \-\-delete delete extraneous files from dest dirs - \-\-delete\-before receiver deletes before transfer (default) diff --git a/rsync-3.0.7.tar.bz2 b/rsync-3.0.7.tar.bz2 deleted file mode 100644 index 1fe146d..0000000 --- a/rsync-3.0.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d810bbbfb113d5311093adb0c58dc01a21dc9582a4eebf882e65122155d1f4cf -size 641886 diff --git a/rsync-3.0.8.tar.bz2 b/rsync-3.0.8.tar.bz2 new file mode 100644 index 0000000..4dbdf02 --- /dev/null +++ b/rsync-3.0.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a34febcee2e36d327d630413fccd9b136e1a4ef57a31dc6952fa6918faf2edc8 +size 628955 diff --git a/rsync-patches-3.0.7.tar.bz2 b/rsync-patches-3.0.7.tar.bz2 deleted file mode 100644 index 46c067b..0000000 --- a/rsync-patches-3.0.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce72bbdbe6a418b0d569cc5ed50e2eb49d5173e7efe1d7d3fb009cb551fdcb24 -size 111272 diff --git a/rsync-patches-3.0.8.tar.bz2 b/rsync-patches-3.0.8.tar.bz2 new file mode 100644 index 0000000..0630028 --- /dev/null +++ b/rsync-patches-3.0.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f5f36d3873465fe8aeff7a88b4a314f7b1a4d24efb4d9a52210754b0d60d5b9 +size 120568 diff --git a/rsync.changes b/rsync.changes index 4feb078..c9c2985 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Tue Mar 29 13:53:04 UTC 2011 - puzel@novell.com + +- update to rsync-3.0.8 + - Notable changes: + - Fixed two buffer-overflow issues. + - Fixed a data-corruption issue when preserving hard-links + without preserving file ownership, and doing deletions either + before or during the transfer (CVE-2011-1097). + - Fixed a potential crash when an rsync daemon has a + filter/exclude list and the transfer is using ACLs or xattrs. + - Fixed a hang if a really large file is being processed by an + rsync that can't handle 64-bit numbers. + - For devices and special files, we now avoid gathering useless + ACL and/or xattr information for files that aren't being + copied. + - Properly handle requesting remote filenames that start with a + dash. + - Fixed a bug in the comparing of upper-case letters in file + suffixes for --skip-compress. + - If an rsync daemon has a module configured without a path + setting, rsync will now disallow access to that module. + - Some improvements to the hard-linking code to ensure that + device-number hashing is working right, and to supply more + information if the hard-link code fails. + - Fixed a bug that prevented --numeric-ids from disabling the + translation of user/group IDs for ACLs. + - The --link-dest checking for identical symlinks now avoids + considering attribute differences that cannot be changed on the + receiver. + - Fixed a bug with --fake-super when copying files and dirs that + aren't user writable. + - Fixed a bug where a sparse file could have its last sparse + block turned into a real block when rsync sets the file size + (requires ftruncate). + - Fixed the working of --force when used with --one-file-system. + - Various manpage improvements. +- run spec-cleaner + +------------------------------------------------------------------- +Sun Sep 19 10:55:59 UTC 2010 - jengelh@medozas.de + +- rsyncd.rc changes: +* Do not use killproc -TERM, but just killproc, so that killproc + waits until the service is actually shut down, before attempting + to restart it (when "restart" is used). Fixes bnc#546977. +* Change the "reload" action to return "missing" because rsyncd + does not handle SIGHUP +* Adjust "force-reload" accordingly + ------------------------------------------------------------------- Mon Jan 4 14:21:21 UTC 2010 - puzel@novell.com diff --git a/rsync.spec b/rsync.spec index 283b636..b66110d 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,5 +1,5 @@ # -# spec file for package rsync (Version 3.0.7) +# spec file for package rsync (Version 3.0.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,18 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define with_system_zlib 0 Name: rsync -Summary: Replacement for RCP/mirror that has Many More Features -Version: 3.0.7 -Release: 1 +Version: 3.0.8 +Release: 6 License: GPLv3+ -Group: Productivity/Networking/Other -AutoReqProv: on +Summary: Replacement for RCP/mirror that has Many More Features Url: http://rsync.samba.org/ +Group: Productivity/Networking/Other Source: %{name}-%{version}.tar.bz2 Source1: %{name}-patches-%{version}.tar.bz2 Source2: logrotate.rsync @@ -38,14 +36,21 @@ Source7: rsync-server.firewall Patch3: system-zlib.diff #PATCH-FIX-UPSTREAM rsync-3.0.5-doc-fix.patch bnc487591 petr.uzel@suse.cz -- based on upstream changes to rsync.yo Patch4: rsync-3.0.5-doc-fix.patch +BuildRequires: libacl-devel +BuildRequires: libpng +BuildRequires: openslp-devel +BuildRequires: popt-devel +BuildRequires: zlib-devel +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: grep +PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq %insserv_prereq sed grep -BuildRequires: libacl-devel libpng openslp-devel -BuildRequires: popt-devel zlib-devel %if 0%{?suse_version} > 1020 BuildRequires: texlive-latex %else -BuildRequires: te_ams te_latex +BuildRequires: te_ams +BuildRequires: te_latex %endif Recommends: logrotate @@ -60,13 +65,6 @@ between two files normally requires local access to both files. A technical report describing the rsync algorithm is included with this package. - - -Authors: --------- - Andrew Tridgell - Paul Mackerras - %prep %setup -q -b 1 -n %{name}-%{version} %if %with_system_zlib @@ -86,28 +84,28 @@ autoconf --enable-slp \ --enable-acl-support \ --enable-xattr-support -make %{?jobs:-j %jobs} +make %{?_smp_mflags} latex tech_report latex tech_report dvips tech_report -o tech_report.ps %install -%makeinstall -rm -f $RPM_BUILD_ROOT/usr/sbin/rsyncd -install -d $RPM_BUILD_ROOT/etc/logrotate.d -install -d $RPM_BUILD_ROOT/etc/init.d -install -d $RPM_BUILD_ROOT/etc/xinetd.d -install -d $RPM_BUILD_ROOT/usr/sbin -ln -sf ../bin/rsync $RPM_BUILD_ROOT/usr/sbin/rsyncd -install -m 755 support/rsyncstats $RPM_BUILD_ROOT/usr/bin -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/rsync -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/rsync -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/etc/init.d/rsyncd -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/rsyncd.conf -install -m 600 %{SOURCE6} $RPM_BUILD_ROOT/etc/rsyncd.secrets -ln -sf ../../etc/init.d/rsyncd $RPM_BUILD_ROOT/usr/sbin/rcrsyncd -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -install -m 644 %{S:7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/rsync-server +%make_install +rm -f %{buildroot}%{_sbindir}/rsyncd +install -d %{buildroot}%{_sysconfdir}/logrotate.d +install -d %{buildroot}%{_sysconfdir}/init.d +install -d %{buildroot}%{_sysconfdir}/xinetd.d +install -d %{buildroot}%{_prefix}/sbin +ln -sf ../bin/rsync %{buildroot}%{_sbindir}/rsyncd +install -m 755 support/rsyncstats %{buildroot}%{_prefix}/bin +install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/rsync +install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/xinetd.d/rsync +install -m 755 %{SOURCE4} %{buildroot}%{_initddir}/rsyncd +install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rsyncd.conf +install -m 600 %{SOURCE6} %{buildroot}%{_sysconfdir}/rsyncd.secrets +ln -sf ../../etc/init.d/rsyncd %{buildroot}%{_sbindir}/rcrsyncd +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services +install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/rsync-server %preun %stop_on_removal rsyncd @@ -123,15 +121,15 @@ fi %insserv_cleanup %clean -%{__rm} -rf ${RPM_BUILD_ROOT} +rm -rf %{buildroot} %files %defattr(-,root,root) -%config(noreplace) /etc/rsyncd.conf -%config(noreplace) /etc/rsyncd.secrets -%config(noreplace) /etc/logrotate.d/rsync -%config(noreplace) /etc/xinetd.d/rsync -%config /etc/init.d/rsyncd +%config(noreplace) %{_sysconfdir}/rsyncd.conf +%config(noreplace) %{_sysconfdir}/rsyncd.secrets +%config(noreplace) %{_sysconfdir}/logrotate.d/rsync +%config(noreplace) %{_sysconfdir}/xinetd.d/rsync +%config %{_sysconfdir}/init.d/rsyncd %{_sbindir}/rcrsyncd %{_sbindir}/rsyncd %{_bindir}/rsyncstats diff --git a/rsyncd.rc b/rsyncd.rc index 73b61e7..d7ba778 100644 --- a/rsyncd.rc +++ b/rsyncd.rc @@ -76,7 +76,7 @@ case "$1" in ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. - killproc -p $RSYNCD_PID -TERM $RSYNCD_BIN + killproc -p $RSYNCD_PID $RSYNCD_BIN # Remember status and be verbose rc_status -v @@ -104,17 +104,14 @@ case "$1" in ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. - echo -n "Reload service rsync" - killproc -p $RSYNCD_PID -HUP $RSYNCD_BIN + echo "Reload service rsync" + "$0" restart rc_status -v ;; reload) - ## Like force-reload, but if daemon does not support - ## signalling, do nothing (!) - - # If it supports signalling: + # rsyncd does not catch SIGHUP echo -n "Reload service rsync" - killproc -p $RSYNCD_PID -HUP $RSYNCD_BIN + rc_failed 3 rc_status -v ;; status)