From 4a7221117f9614b8295ed65b7e24b65b6730dfc78d67db7940521d8b73a0bf0a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 6 Sep 2008 01:26:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsync?expand=0&rev=16 --- NEWS-rsync-3.0.3 | 89 +++++++++++++++++++++++++++ lutimes-hack.diff | 8 --- rsync-3.0.2.tar.bz2 | 3 - rsync-3.0.4pre2-xattrs-test-fix.patch | 27 ++++++++ rsync-3.0.4pre2.tar.bz2 | 3 + rsync-patches-3.0.2.dif | 34 ---------- rsync-patches-3.0.2.tar.bz2 | 3 - rsync-patches-3.0.4pre2.tar.bz2 | 3 + rsync.changes | 25 ++++++++ rsync.spec | 68 ++++++++++++-------- 10 files changed, 190 insertions(+), 73 deletions(-) create mode 100644 NEWS-rsync-3.0.3 delete mode 100644 lutimes-hack.diff delete mode 100644 rsync-3.0.2.tar.bz2 create mode 100644 rsync-3.0.4pre2-xattrs-test-fix.patch create mode 100644 rsync-3.0.4pre2.tar.bz2 delete mode 100644 rsync-patches-3.0.2.dif delete mode 100644 rsync-patches-3.0.2.tar.bz2 create mode 100644 rsync-patches-3.0.4pre2.tar.bz2 diff --git a/NEWS-rsync-3.0.3 b/NEWS-rsync-3.0.3 new file mode 100644 index 0000000..04a4fc9 --- /dev/null +++ b/NEWS-rsync-3.0.3 @@ -0,0 +1,89 @@ +NEWS for rsync 3.0.3 (29 Jun 2008) +Protocol: 30 (unchanged) +Changes since 3.0.2: + + BUG FIXES: + + - Fixed a wildcard matching problem in the daemon when a module has + "use chroot" enabled. + + - Fixed a crash bug in the hard-link code. + + - Fixed the sending of xattr directory information when the code finds a + --link-dest or --copy-dest directory with unchanged xattrs -- the + destination directory now gets these unchanged xattrs properly applied. + + - Fixed an xattr-sending glitch that could cause an "Internal abbrev" + error. + + - Fixed the combination of --xattrs and --backup. + + - The generator no longer allows a '.' dir to be excluded by a daemon- + exclude rule. + + - Fixed deletion handling when copying a single, empty directory (with no + files) to a differently named, non-existent directory. + + - Fixed the conversion of spaces into dashes in the %M log escape. + + - Fixed several places in the code that were not returning the right + errno when a function failed. + + - Fixed the backing up of a device or special file into a backup dir. + + - Moved the setting of the socket options prior to the connect(). + + - If rsync exits in the middle of a --progress output, it now outputs a + newline to help prevent the progress line from being overwritten. + + - Fixed a problem with how a destination path with a trailing slash or + a trailing dot-dir was compared against the daemon excludes. + + - Fixed the sending of large (size > 16GB) files when talking to an older + rsync (protocols < 30): we now use a compatible block size limit. + + - If a file's length is so huge that we overflow a checksum buffer count + (i.e. several hundred TB), warn the user and avoid sending an invalid + checksum struct over the wire. + + - If a source arg is excluded, --relative no longer adds the excluded + arg's implied dirs to the transfer. This fix also made the exclude + check happen in the better place in the sending code. + + - Use the overflow_exit() function for overflows, not out_of_memory(). + + - Improved the code to better handle a system that has only 32-bit file + offsets. + + ENHANCEMENTS: + + - The rsyncd.conf manpage now consistently refers to the parameters in + the daemon config file as "parameters". + + - The description of the --inplace option was improved. + + EXTRAS: + + - Added a new script in the support directory, deny-rsync, which allows + an admin to (temporarily) replace the rsync command with a script that + sends an error message to the remote client via the rsync protocol. + + DEVELOPER RELATED: + + - Fixed a testcase failure if the tests are run as root and made some + compatibility improvements. + + - Improved the daemon tests, including checking module comments, the + listing of files, and the ensuring that daemon excludes can't affect + a dot-dir arg. + + - Improved some build rules for those that build in a separate directory + from the source, including better install rules for the man pages, and + the fixing of a proto.h-tstamp rule that could make the binaries get + rebuild without cause. + + - Improved the testsuite to work around a problem with some utilities + (e.g. cp -p & touch -r) rounding sub-second timestamps. + + - Ensure that the early patches don't cause any generated-file hunks to + bleed-over into patches that follow. diff --git a/lutimes-hack.diff b/lutimes-hack.diff deleted file mode 100644 index 0c65308..0000000 --- a/lutimes-hack.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- rsync.h~ 2007-08-17 14:46:24.000000000 +0200 -+++ rsync.h 2007-08-17 14:46:24.000000000 +0200 -@@ -927,3 +927,5 @@ - #ifdef MAINTAINER_MODE - const char *get_panic_action(void); - #endif -+ -+#undef HAVE_LUTIMES diff --git a/rsync-3.0.2.tar.bz2 b/rsync-3.0.2.tar.bz2 deleted file mode 100644 index 67bc35d..0000000 --- a/rsync-3.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87f24f968a9b3c453fdb42c631c4c9afe862dd5b7a345a97492567e3b6e366f9 -size 636884 diff --git a/rsync-3.0.4pre2-xattrs-test-fix.patch b/rsync-3.0.4pre2-xattrs-test-fix.patch new file mode 100644 index 0000000..9f346bd --- /dev/null +++ b/rsync-3.0.4pre2-xattrs-test-fix.patch @@ -0,0 +1,27 @@ +# Use 'just built' rsync instead of systemwide rsync +--- testsuite/xattrs.test.orig 2008-09-03 16:01:35.000000000 +0200 ++++ testsuite/xattrs.test 2008-09-03 16:09:52.000000000 +0200 +@@ -120,10 +120,10 @@ + cd "$fromdir" + rm -rf "$todir" "$chkdir" + +-rsync -aX file1 file2 +-rsync -aX file1 file2 ../chk/ +-rsync -aX --del ../chk/ . +-rsync -aX file1 ../lnk/ ++$RSYNC -aX file1 file2 ++$RSYNC -aX file1 file2 ../chk/ ++$RSYNC -aX --del ../chk/ . ++$RSYNC -aX file1 ../lnk/ + + xls file1 file2 >"$scratchdir/xattrs.txt" + +@@ -136,7 +136,7 @@ + rm "$todir/file2" + + echo extra >file1 +-rsync -aX . ../chk/ ++$RSYNC -aX . ../chk/ + + checkit "$RSYNC -aiiX . ../to" "$chkdir" "$todir" + diff --git a/rsync-3.0.4pre2.tar.bz2 b/rsync-3.0.4pre2.tar.bz2 new file mode 100644 index 0000000..64cd927 --- /dev/null +++ b/rsync-3.0.4pre2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4672eae4f3790355634cd77cb1ec460f523eb5a76eb8eda046c60c23ba3666ec +size 642589 diff --git a/rsync-patches-3.0.2.dif b/rsync-patches-3.0.2.dif deleted file mode 100644 index 5496b30..0000000 --- a/rsync-patches-3.0.2.dif +++ /dev/null @@ -1,34 +0,0 @@ ---- patches/xattrs.diff -+++ patches/xattrs.diff 2008/04/14 09:46:45 -@@ -186,31 +186,3 @@ - size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0; - if (dget_len + extra_len < dget_len) - out_of_memory("receive_xattr"); /* overflow */ --diff -up a/rsyncd.conf.5 b/rsyncd.conf.5 ----- a/rsyncd.conf.5 --+++ b/rsyncd.conf.5 --@@ -121,6 +121,16 @@ details on some of the options you may b -- special socket options are set. These settings are superseded by the -- \fB\-\-sockopts\fP command-line option. -- .IP --+.IP "\fBslp refresh\fP" --+This option is used to determine how long service --+advertisements are valid (measured in seconds), and is only applicable if --+you have Service Location Protocol support compiled in. If this option is --+not set or is set to zero, then service advertisements never time out. If --+this is set to less than 120 seconds, then 120 seconds is used. If it is --+set to more than 65535, then 65535 is used (which is a limitation of SLP). --+Using 3600 (one hour) is a good number if you tend to change your --+configuration. --+.IP -- .SH "MODULE OPTIONS" -- -- .PP --@@ -763,6 +773,7 @@ use chroot = yes -- max connections = 4 -- syslog facility = local5 -- pid file = /var/run/rsyncd.pid --+slp refresh = 3600 -- -- [ftp] -- path = /var/ftp/./pub diff --git a/rsync-patches-3.0.2.tar.bz2 b/rsync-patches-3.0.2.tar.bz2 deleted file mode 100644 index 95a0ba8..0000000 --- a/rsync-patches-3.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f141bd5dd9faa894b22fe23aa8a6ff11b4c95bb354cda180fe342c31df657a7 -size 107152 diff --git a/rsync-patches-3.0.4pre2.tar.bz2 b/rsync-patches-3.0.4pre2.tar.bz2 new file mode 100644 index 0000000..96a9b8d --- /dev/null +++ b/rsync-patches-3.0.4pre2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e2610ca4c4d3cd47793d7a0d09df9dd3ba34357fef926498e69cb0cf7778742 +size 111572 diff --git a/rsync.changes b/rsync.changes index 59cedad..ab3b86d 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Sep 4 12:29:19 CEST 2008 - puzel@suse.cz + +- update to 3.0.4pre2 + - Fixed the handling of a --partial-dir that cannot be created. + - Fixed a couple issues in the --fake-super handling of xattrs when the + destination files have root-level attributes (e.g. selinux values) that + a non-root copy can't affect. + - The --iconv option now converts the content of a symlink too, instead + of leaving it in the wrong character-set. + - Fixed a bug where --delete-during could delete in a directory before it + noticed that the sending side sent an I/O error for that directory. + - Fixed a crash bug in the hard-link code. + - Fixed the sending of xattr directory information when the code finds a + --link-dest or --copy-dest directory with unchanged xattrs + - Fixed deletion handling when copying a single, empty directory (with no + files) to a differently named, non-existent directory. + - too many other changes and fixes - please, see NEWS and NEWS-rsync-3.0.3 + files +- specfile fixes : + - use %configure and %makeinstall macros + - use %_bindir and %sbindir macros +- removed lutimes-hack.diff (not needed anymore) +- removed rsync-patches-3.0.2.dif (fixed in upstream) + ------------------------------------------------------------------- Tue Aug 12 10:10:06 CEST 2008 - puzel@suse.cz diff --git a/rsync.spec b/rsync.spec index e5343d5..ea4fc7c 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,5 +1,5 @@ # -# spec file for package rsync (Version 3.0.2) +# spec file for package rsync (Version 3.0.3.90) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,19 +31,19 @@ License: GPL v3 or later Group: Productivity/Networking/Other PreReq: %fillup_prereq %insserv_prereq sed grep AutoReqProv: on -Version: 3.0.2 -Release: 38 +Version: 3.0.3.90 +Release: 1 Summary: Replacement for RCP/mirror that has Many More Features -Source: samba.org/ftp/rsync/rsync-%{version}.tar.bz2 -Source1: samba.org/ftp/rsync/rsync-patches-%{version}.tar.bz2 +Source: rsync-3.0.4pre2.tar.bz2 +Source1: rsync-patches-3.0.4pre2.tar.bz2 Source2: logrotate.rsync Source3: rsync.xinetd Source4: rsyncd.rc Source5: rsyncd.conf Source6: rsyncd.secrets +Source7: NEWS-rsync-3.0.3 Patch3: system-zlib.diff -Patch4: lutimes-hack.diff -Patch10: rsync-patches-3.0.2.dif +Patch5: rsync-3.0.4pre2-xattrs-test-fix.patch Url: http://rsync.samba.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define with_system_zlib 0 @@ -67,10 +67,7 @@ Authors: Paul Mackerras %prep -%setup -q -b 1 -# remove erroneous/duplicate hunk in xattr.patch -%patch4 -%patch10 +%setup -n rsync-3.0.4pre2 -q -b 1 %if %with_system_zlib rm -f zlib/*.h %patch3 @@ -78,18 +75,17 @@ rm -f zlib/*.h patch -p1 < patches/acls.diff patch -p1 < patches/xattrs.diff patch -p1 < patches/slp.diff +cp %{SOURCE7} . +%patch5 %build autoheader autoconf -CFLAGS=$RPM_OPT_FLAGS \ - ./configure --prefix=/usr \ - --infodir=/usr/share/info \ - --disable-debug \ - --mandir=%{_mandir} \ - --enable-slp \ - --enable-acl-support \ - --enable-xattr-support +%configure \ + --disable-debug \ + --enable-slp \ + --enable-acl-support \ + --enable-xattr-support make %{?jobs:-j %jobs} latex tech_report latex tech_report @@ -103,7 +99,7 @@ make test %endif %install -make install DESTDIR=$RPM_BUILD_ROOT +%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 @@ -138,15 +134,37 @@ fi %config(noreplace) /etc/logrotate.d/rsync %config(noreplace) /etc/xinetd.d/rsync %config /etc/init.d/rsyncd -/usr/sbin/rcrsyncd -/usr/bin/rsync -/usr/sbin/rsyncd -/usr/bin/rsyncstats +%{_sbindir}/rcrsyncd +%{_sbindir}/rsyncd +%{_bindir}/rsyncstats +%{_bindir}/rsync %doc %{_mandir}/man1/rsync.1.gz %doc %{_mandir}/man5/rsyncd.conf.5.gz -%doc COPYING NEWS README tech_report.ps tech_report.tex +%doc COPYING NEWS NEWS-rsync-3.0.3 README tech_report.ps tech_report.tex %changelog +* Thu Sep 04 2008 puzel@suse.cz +- update to 3.0.4pre2 + - Fixed the handling of a --partial-dir that cannot be created. + - Fixed a couple issues in the --fake-super handling of xattrs when the + destination files have root-level attributes (e.g. selinux values) that + a non-root copy can't affect. + - The --iconv option now converts the content of a symlink too, instead + of leaving it in the wrong character-set. + - Fixed a bug where --delete-during could delete in a directory before it + noticed that the sending side sent an I/O error for that directory. + - Fixed a crash bug in the hard-link code. + - Fixed the sending of xattr directory information when the code finds a + --link-dest or --copy-dest directory with unchanged xattrs + - Fixed deletion handling when copying a single, empty directory (with no + files) to a differently named, non-existent directory. + - too many other changes and fixes - please, see NEWS and NEWS-rsync-3.0.3 + files +- specfile fixes : + - use %%configure and %%makeinstall macros + - use %%_bindir and %%sbindir macros +- removed lutimes-hack.diff (not needed anymore) +- removed rsync-patches-3.0.2.dif (fixed in upstream) * Tue Aug 12 2008 puzel@suse.cz - rsyncd.rc: use Should-Start instead of X-UnitedLinux-Should-Start - specfile fixes: