--- rsync-3.0.6.orig/debian/default +++ rsync-3.0.6/debian/default @@ -0,0 +1,32 @@ +# defaults file for rsync daemon mode + +# start rsync in daemon mode from init.d script? +# only allowed values are "true", "false", and "inetd" +# Use "inetd" if you want to start the rsyncd from inetd, +# all this does is prevent the init.d script from printing a message +# about not starting rsyncd (you still need to modify inetd's config yourself). +RSYNC_ENABLE=false + +# which file should be used as the configuration file for rsync. +# This file is used instead of the default /etc/rsyncd.conf +# Warning: This option has no effect if the daemon is accessed +# using a remote shell. When using a different file for +# rsync you might want to symlink /etc/rsyncd.conf to +# that file. +# RSYNC_CONFIG_FILE= + +# what extra options to give rsync --daemon? +# that excludes the --daemon; that's always done in the init.d script +# Possibilities are: +# --address=123.45.67.89 (bind to a specific IP address) +# --port=8730 (bind to specified port; default 873) +RSYNC_OPTS='' + +# run rsyncd at a nice level? +# the rsync daemon can impact performance due to much I/O and CPU usage, +# so you may want to run it at a nicer priority than the default priority. +# Allowed values are 0 - 19 inclusive; 10 is a reasonable value. +RSYNC_NICE='' + +# Don't forget to create an appropriate config file, +# else the daemon will not start. --- rsync-3.0.6.orig/debian/logrotate.conf.rsync +++ rsync-3.0.6/debian/logrotate.conf.rsync @@ -0,0 +1,8 @@ +/var/log/rsyncd.log { + weekly + rotate 99 + missingok + notifempty + compress + delaycompress +} --- rsync-3.0.6.orig/debian/postinst +++ rsync-3.0.6/debian/postinst @@ -0,0 +1,21 @@ +#!/bin/sh -e + +action="$1" +oldversion="$2" + +if [ "$action" != configure ] + then + exit 0 +fi + + +if [ -x /etc/init.d/rsync ]; then + update-rc.d rsync defaults >/dev/null + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d rsync restart + else + /etc/init.d/rsync restart + fi +fi + +exit 0 --- rsync-3.0.6.orig/debian/rsyncd.conf +++ rsync-3.0.6/debian/rsyncd.conf @@ -0,0 +1,42 @@ +# sample rsyncd.conf configuration file + +# GLOBAL OPTIONS + +#motd file=/etc/motd +#log file=/var/log/rsyncd +# for pid file, do not use /var/run/rsync.pid if +# you are going to run rsync out of the init.d script. +pid file=/var/run/rsyncd.pid +#syslog facility=daemon +#socket options= + +# MODULE OPTIONS + +[ftp] + + comment = public archive + path = /var/www/pub + use chroot = yes +# max connections=10 + lock file = /var/lock/rsyncd +# the default for read only is yes... + read only = yes + list = yes + uid = nobody + gid = nogroup +# exclude = +# exclude from = +# include = +# include from = +# auth users = +# secrets file = /etc/rsyncd.secrets + strict modes = yes +# hosts allow = +# hosts deny = + ignore errors = no + ignore nonreadable = yes + transfer logging = no +# log format = %t: host %h (%a) %o %f (%l bytes). Total %b bytes. + timeout = 600 + refuse options = checksum dry-run + dont compress = *.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz --- rsync-3.0.6.orig/debian/copyright +++ rsync-3.0.6/debian/copyright @@ -0,0 +1,38 @@ +This is Debian's prepackaged version of Andrew Tridgell and +Paul Mackerras' rsync utility. + +This package provides the rsync program, which is a replacement +for rcp that uses the rsync algorythm to transfer only the +differences between two sets of files. + +This package was put together by Philip Hands , +from sources obtained from: + http://rsync.samba.org/ftp/rsync/rsync-2.5.4.tar.gz +The current version was downloaded from: + http://rsync.samba.org/ftp/rsync/src/rsync-3.0.6.tar.gz +on 2009-06-17 by Paul Slootman . + +The changes were very minimal - merely adding support for the Debian +package maintenance scheme by adding various debian/* files. +The only significant change is passing the -4 / -6 options through to ssh. +See the debian/patches/ directory. + + + +COPYRIGHT +--------- + +Copyright (C) 1996-2009 by Andrew Tridgell, Wayne Davison, and others. + +Rsync was originally written by Andrew Tridgell and is currently +maintained by Wayne Davison. It has been improved by many developers +from around the world. + +Rsync may be used, modified and redistributed only under the terms of +the GNU General Public License, found in the file: + + /usr/share/common-licenses/GPL-3 + +on Debian systems, or at + + http://www.fsf.org/licensing/licenses/gpl.html --- rsync-3.0.6.orig/debian/prerm +++ rsync-3.0.6/debian/prerm @@ -0,0 +1,30 @@ +#!/bin/sh -e +# prerm for rsync + +case "$1" in + remove|deconfigure) + if [ -h /usr/doc/rsync ]; then + rm -f /usr/doc/rsync + fi + if [ -x /etc/init.d/rsync ]; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d rsync stop + else + /etc/init.d/rsync stop + fi + fi + ;; + upgrade) + if [ -h /usr/doc/rsync ]; then + rm -f /usr/doc/rsync + fi + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +exit 0 --- rsync-3.0.6.orig/debian/postrm +++ rsync-3.0.6/debian/postrm @@ -0,0 +1,8 @@ +#!/bin/sh -e +# postrm for rsync + +if [ "$1" = "purge" ] ; then + update-rc.d rsync remove >/dev/null +fi + +exit 0 --- rsync-3.0.6.orig/debian/rules +++ rsync-3.0.6/debian/rules @@ -0,0 +1,133 @@ +#!/usr/bin/make -f +# debian.rules file for rsync +# Copyright 1996 by Philip Hands. +# Copyright 2001 Colin Walters +# Based on the sample debian.rules file - for GNU Hello (1.3). +# Copyright 1994,1995 by Ian Jackson. +# I hereby give you perpetual unlimited permission to copy, +# modify and relicense this file, provided that you do not remove +# my name from the file itself. (I assert my moral right of +# paternity under the Copyright, Designs and Patents Act 1988.) + + +SHELL = /bin/bash +BINS = rsync +CFLAGS= -Wall +INSTALL = install +INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 +INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + +# policy stuff +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +CFLAGS += -g +else +CFLAGS += -g -O2 +endif + +# backwards compatibility stuff, from dpkg-architecture manpage +DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture) +DEB_BUILD_GNU_CPU := $(patsubst hurd-%,%,$(DEB_BUILD_ARCH)) +ifeq ($(filter-out hurd-%,$(DEB_BUILD_ARCH)),) +DEB_BUILD_GNU_SYSTEM := gnu +else +DEB_BUILD_GNU_SYSTEM := linux +endif +DEB_BUILD_GNU_TYPE=$(DEB_BUILD_GNU_CPU)-$(DEB_BUILD_GNU_SYSTEM) + +DEB_HOST_ARCH=$(DEB_BUILD_ARCH) +DEB_HOST_GNU_CPU=$(DEB_BUILD_GNU_CPU) +DEB_HOST_GNU_SYSTEM=$(DEB_BUILD_GNU_SYSTEM) +DEB_HOST_GNU_TYPE=$(DEB_BUILD_GNU_TYPE) + +DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + + +build: + echo building build tree + -rm -rf debian/buildtree + mkdir debian/buildtree + cp -p * debian/buildtree || true + cp -r lib popt support testsuite zlib debian/buildtree + @echo applying acl support patch + cat patches/acls.diff | (cd debian/buildtree; patch -p1) + @echo applying misc Debian patches + for i in debian/patches/*.patch debian/patches/*.diff; do if [ -s $$i ]; then echo " $$i ..."; cat $$i | (cd debian/buildtree; patch -p1) || exit 1; fi; done + echo configuring + (cd debian/buildtree; ./configure --prefix=/usr --mandir='$${prefix}/share/man' --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)) + # --enable-acl-support + echo building + $(MAKE) --directory=debian/buildtree CFLAGS="$(CFLAGS)" all + touch build + echo done + +clean: checkdir + -rm -f build + # -$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean + -rm -rf debian/buildtree + -rm -rf *~ debian/tmp debian/*~ debian/*.bak debian/files* debian/substvars + # -rm -f lib/dummy zlib/dummy + # rm -f config.cache config.log acconfig.h + +binary-indep: checkroot build +# nothing to do + +binary-arch: checkroot build + -rm -rf debian/tmp + $(INSTALL_DIR) debian/tmp \ + debian/tmp/DEBIAN \ + debian/tmp/usr/bin \ + debian/tmp/usr/share/doc/rsync/examples \ + debian/tmp/usr/share/doc/rsync/scripts \ + debian/tmp/usr/share/man/man1 \ + debian/tmp/usr/share/man/man5 \ + debian/tmp/usr/share/lintian/overrides \ + debian/tmp/etc \ + debian/tmp/etc/default \ + debian/tmp/etc/init.d + # debian/tmp/usr/lib/debian-test/tests +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + $(MAKE) --directory=debian/buildtree install-strip prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp/usr +else + $(MAKE) --directory=debian/buildtree install prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp/usr +endif + $(INSTALL_FILE) debian/changelog debian/tmp/usr/share/doc/rsync/changelog.Debian + $(INSTALL_FILE) README tech_report.tex debian/tmp/usr/share/doc/rsync/ + $(INSTALL_FILE) TODO debian/tmp/usr/share/doc/rsync/ + $(INSTALL_FILE) NEWS debian/tmp/usr/share/doc/rsync/changelog + $(INSTALL_FILE) packaging/cull_options debian/tmp/usr/share/doc/rsync/scripts/ + $(INSTALL_FILE) support/atomic-rsync support/cvs2includes support/file-attr-restore support/files-to-excludes support/git-set-file-times support/logfilter support/lsh support/mnt-excl support/munge-symlinks support/rrsync support/rsyncstats debian/tmp/usr/share/doc/rsync/scripts/ + # $(INSTALL_FILE) debian/README.Debian debian/tmp/usr/share/doc/rsync/ + echo -e '\n\f' >> debian/tmp/usr/share/doc/rsync/changelog + cat OLDNEWS >> debian/tmp/usr/share/doc/rsync/changelog + gzip -9fr `find debian/tmp/usr/share/doc/ debian/tmp/usr/share/man/ -type f` + $(INSTALL_FILE) debian/rsyncd.conf debian/logrotate.conf.rsync debian/tmp/usr/share/doc/rsync/examples/ + $(INSTALL_FILE) debian/copyright debian/tmp/usr/share/doc/rsync/ + # $(INSTALL_SCRIPT) test.sh debian/tmp/usr/lib/debian-test/tests/rsync + $(INSTALL_SCRIPT) debian/postinst debian/tmp/DEBIAN/ + $(INSTALL_SCRIPT) debian/prerm debian/tmp/DEBIAN/ + $(INSTALL_SCRIPT) debian/postrm debian/tmp/DEBIAN/ + $(INSTALL_FILE) debian/default debian/tmp/etc/default/rsync + $(INSTALL_SCRIPT) debian/init.d debian/tmp/etc/init.d/rsync + $(INSTALL_FILE) debian/lintian.overrides debian/tmp/usr/share/lintian/overrides/rsync + (cd debian/tmp; find ./etc -type f | sed s,.,,) > debian/tmp/DEBIAN/conffiles + (cd debian/tmp; find usr -type f -print0 | xargs -0 md5sum) > debian/tmp/DEBIAN/md5sums + dpkg-shlibdeps debian/tmp/usr/bin/$(BINS) + dpkg-gencontrol -isp + chown -R root.root debian/tmp + chmod -R go=rX debian/tmp + dpkg --build debian/tmp .. + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +checkdir: + @test -f rsync.c -a -f debian/rules + +checkroot: checkdir + @test 0 = `id -u` || { echo "Error: not super-user"; exit 1; } + +.PHONY: binary binary-arch binary-indep clean checkroot checkdir --- rsync-3.0.6.orig/debian/lintian.overrides +++ rsync-3.0.6/debian/lintian.overrides @@ -0,0 +1 @@ +rsync: embedded-zlib ./usr/bin/rsync --- rsync-3.0.6.orig/debian/control +++ rsync-3.0.6/debian/control @@ -0,0 +1,21 @@ +Source: rsync +Section: net +Priority: optional +Maintainer: Paul Slootman +Build-Depends: libpopt-dev,libacl1-dev,libattr1-dev +Standards-Version: 3.8.1 + +Package: rsync +Architecture: any +Depends: ${shlibs:Depends}, lsb-base (>= 3.2-14), base-files (>= 4.0.1) +Suggests: openssh-client, openssh-server +Description: fast remote file copy program (like rcp) + rsync is a program that allows files to be copied to and from remote + machines in much the same way as rcp. It has many more options than + rcp, and uses the rsync remote-update protocol to greatly speed up + file transfers when the destination file already exists. + . + The rsync remote-update protocol allows rsync to transfer just the + differences between two sets of files across the network link. + . + This package also includes rsyncd daemon functionality. --- rsync-3.0.6.orig/debian/init.d +++ rsync-3.0.6/debian/init.d @@ -0,0 +1,157 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: rsyncd +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Should-Start: $named +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: fast remote file copy program daemon +# Description: rsync is a program that allows files to be copied to and +# from remote machines in much the same way as rcp. +# This provides rsyncd daemon functionality. +### END INIT INFO + +set -e + +# /etc/init.d/rsync: start and stop the rsync daemon + +DAEMON=/usr/bin/rsync +RSYNC_ENABLE=false +RSYNC_OPTS='' +RSYNC_DEFAULTS_FILE=/etc/default/rsync +RSYNC_CONFIG_FILE=/etc/rsyncd.conf +RSYNC_NICE_PARM='' + +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions +. /etc/default/rcS + +if [ -s $RSYNC_DEFAULTS_FILE ]; then + . $RSYNC_DEFAULTS_FILE + case "x$RSYNC_ENABLE" in + xtrue|xfalse) ;; + xinetd) exit 0 + ;; + *) log_failure_msg "Value of RSYNC_ENABLE in $RSYNC_DEFAULTS_FILE must be either 'true' or 'false';" + log_failure_msg "not starting rsync daemon." + exit 1 + ;; + esac + case "x$RSYNC_NICE" in + x[0-9]) RSYNC_NICE_PARM="--nicelevel $RSYNC_NICE";; + x[1-9][0-9]) RSYNC_NICE_PARM="--nicelevel $RSYNC_NICE";; + x) ;; + *) log_warning_msg "Value of RSYNC_NICE in $RSYNC_DEFAULTS_FILE must be a value between 0 and 19 (inclusive);" + log_warning_msg "ignoring RSYNC_NICE now." + ;; + esac +fi + +export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" + +case "$1" in + start) + if "$RSYNC_ENABLE"; then + log_daemon_msg "Starting rsync daemon" "rsync" + if [ -s /var/run/rsync.pid ] && kill -0 $(cat /var/run/rsync.pid) >/dev/null 2>&1; then + log_progress_msg "apparently already running" + log_end_msg 0 + exit 0 + fi + if [ ! -s "$RSYNC_CONFIG_FILE" ]; then + log_failure_msg "missing or empty config file $RSYNC_CONFIG_FILE" + log_end_msg 1 + exit 1 + fi + if start-stop-daemon --start --quiet --background \ + --pidfile /var/run/rsync.pid --make-pidfile \ + $RSYNC_NICE_PARM --exec /usr/bin/rsync \ + -- --no-detach --daemon --config "$RSYNC_CONFIG_FILE" $RSYNC_OPTS + then + rc=0 + sleep 1 + if ! kill -0 $(cat /var/run/rsync.pid) >/dev/null 2>&1; then + log_failure_msg "rsync daemon failed to start" + rc=1 + fi + else + rc=1 + fi + if [ $rc -eq 0 ]; then + log_end_msg 0 + else + log_end_msg 1 + rm -f /var/run/rsync.pid + fi + else + if [ -s "$RSYNC_CONFIG_FILE" ]; then + [ "$VERBOSE" != no ] && log_warning_msg "rsync daemon not enabled in /etc/default/rsync, not starting..." + fi + fi + ;; + stop) + log_daemon_msg "Stopping rsync daemon" "rsync" + start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/rsync.pid + log_end_msg $? + rm -f /var/run/rsync.pid + ;; + + reload|force-reload) + log_warning_msg "Reloading rsync daemon: not needed, as the daemon" + log_warning_msg "re-reads the config file whenever a client connects." + ;; + + restart) + set +e + if $RSYNC_ENABLE; then + log_daemon_msg "Restarting rsync daemon" "rsync" + if [ -s /var/run/rsync.pid ] && kill -0 $(cat /var/run/rsync.pid) >/dev/null 2>&1; then + start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/rsync.pid || true + sleep 1 + else + log_warning_msg "rsync daemon not running, attempting to start." + rm -f /var/run/rsync.pid + fi + if [ ! -s "$RSYNC_CONFIG_FILE" ]; then + log_failure_msg "missing or empty config file $RSYNC_CONFIG_FILE" + log_end_msg 1 + exit 1 + fi + if start-stop-daemon --start --quiet --background \ + --pidfile /var/run/rsync.pid --make-pidfile \ + $RSYNC_NICE_PARM --exec /usr/bin/rsync \ + -- --no-detach --daemon --config "$RSYNC_CONFIG_FILE" $RSYNC_OPTS + then + rc=0 + sleep 1 + if ! kill -0 $(cat /var/run/rsync.pid) >/dev/null 2>&1; then + log_failure_msg "rsync daemon failed to start" + rc=1 + fi + else + rc=1 + fi + if [ $rc -eq 0 ]; then + log_end_msg 0 + else + log_end_msg 1 + rm -f /var/run/rsync.pid + fi + else + [ "$VERBOSE" != no ] && log_warning_msg "rsync daemon not enabled in /etc/default/rsync, not starting..." + fi + ;; + + status) + status_of_proc -p /var/run/rsync.pid "$DAEMON" rsync + exit $? # exit 0 would be enough due to set -e + ;; + *) + echo "Usage: /etc/init.d/rsync {start|stop|reload|force-reload|restart|status}" + exit 1 +esac + +exit 0 --- rsync-3.0.6.orig/debian/README.source +++ rsync-3.0.6/debian/README.source @@ -0,0 +1,4 @@ +The debian/ subdirectory contains everything that's needed to patch the +sources and build the binary package. The rules file applies the patches +in the debian/patches/ subdirectory to a copy of the sources in +debian/buildtree/ before compiling it there. --- rsync-3.0.6.orig/debian/changelog +++ rsync-3.0.6/debian/changelog @@ -0,0 +1,973 @@ +rsync (3.0.6-1~bpo50+1) lenny-backports; urgency=low + + * Backport testing version for backports.org + + -- Micah Anderson Thu, 02 Jul 2009 15:20:35 +0000 + +rsync (3.0.6-1) unstable; urgency=low + + * new upstream release. + * Manpage now states that MD5 is used for protocol version 30 and higher. + closes:#520330 + * Updated to standards version 3.8.2. Added debian/README.source . + * Added lintian override for embedded-zlib, as this is a modified version + optimized for the rsync protocol. I.e. the standard zlib version will not + work as well. + * Added a 'status' option to the init.d script. + closes:#492138 + * Manpage now declares --delete-during to be the default in the summary. + closes:#472767,#476368 + + -- Paul Slootman Wed, 17 Jun 2009 13:43:12 +0200 + +rsync (3.0.5-1) unstable; urgency=low + + * new upstream release. + * From the upstream NEWS file: + Fixed a bug when using --sparse on a sparse file that has over 2GB of + consecutive sparse data. + closes:#512635 + + -- Paul Slootman Thu, 22 Jan 2009 15:05:27 +0100 + +rsync (3.0.4-3) unstable; urgency=low + + * When transferring files from an older rsync daemon without any options, + the daemon complained about "unknown option: -". Fixed that with a + patch from Matt McCutchen. + closes:#493559 + * Sometimes rsync crashed with a segfault when transferring files with -X + (preserve extended attributes). Fixed that with a patch from upstream + (Wayne Davison). + closes:#498083 + + -- Paul Slootman Wed, 24 Sep 2008 11:35:15 +0200 + +rsync (3.0.4-2) unstable; urgency=low + + * The log format '%P' patch accidentally reverted an ability to transform a + relative module path into an absolute one when chroot was not enabled. + + -- Paul Slootman Fri, 12 Sep 2008 11:00:20 +0200 + +rsync (3.0.4-1) unstable; urgency=low + + * new upstream release. + * Fix log format '%P' when a module is chrooted. + closes:#493539 + * Add a comment to the rsyncd.conf manpage that a hash sign (for comments) + can only be used at the beginning of a line. + closes:#498332 + + -- Paul Slootman Thu, 11 Sep 2008 11:57:46 +0200 + +rsync (3.0.3-2) unstable; urgency=low + + * Included some patches from the upcoming 3.0.4 release, which I consider + important enough to include now. See debian/patches/README for the + details. + * Ensure that the build bails out if patching fails. + * Added md5sums for this package. + closes:#484343 + * Updated to standards version 3.7.3. No changes necessary. + + -- Paul Slootman Fri, 25 Jul 2008 10:43:00 +0200 + +rsync (3.0.3-1) unstable; urgency=low + + * New upstream release + + -- Paul Slootman Wed, 02 Jul 2008 11:07:22 +0200 + +rsync (3.0.2-2) unstable; urgency=low + + * Fixed a crash if a non-incremental-recursion transfer has a skipped file + in a set of hard-links. + closes:#477931 + + -- Paul Slootman Mon, 28 Apr 2008 13:06:35 +0200 + +rsync (3.0.2-1) unstable; urgency=high + + * new upstream release + * fixes security problem: potential buffer overflow in the + extended attribute support. For more info, see + http://rsync.samba.org/security.html + + -- Paul Slootman Tue, 08 Apr 2008 19:34:22 +0200 + +rsync (3.0.1-1) unstable; urgency=low + + * new upstream release + * call ssh with -6 option if rsync was called with -6 option, + and ditto for -4 option. + Upstream considers the -4 and -6 options for use only when talking to a + daemon, hence this change will remain a Debian-only feature. + closes:367319 + + -- Paul Slootman Fri, 04 Apr 2008 12:36:56 +0200 + +rsync (3.0.1~pre3-1) experimental; urgency=low + + * prerelease version + + -- Paul Slootman Mon, 31 Mar 2008 15:29:51 +0200 + +rsync (3.0.0-3) unstable; urgency=low + + * unreleased + * call ssh with -6 option if rsync was called with -6 option, + and ditto for -4 option. + closes:367319 + + -- Paul Slootman Tue, 04 Mar 2008 18:51:47 +0100 + +rsync (3.0.0-2) unstable; urgency=low + + * patch from upstream to fix crash in single-use daemon mode. + see #469172, although this only fixes the secondary part of that report. + + -- Paul Slootman Tue, 04 Mar 2008 12:34:03 +0100 + +rsync (3.0.0-1) unstable; urgency=low + + * new upstream release + * manpage typo fixed upstream. + closes:#414636 + * fixed LSB header in init.d script. + closes:#458442 + * the progress display will not show negative values, if the file changes + (becomes shorter) during the transfer. + closes:#415648 + * manpage now correctly show the short form of copy-dirlinks as -k, not -K + closes:#418923 + * invalid free() pointer doesn't occur anymore. + closes:#451558 + * rsync will now write in log when --exclude-from is stdin. + closes:#466950 + * check for rsyncd.conf in init.d script when starting or restarting. + closes:#412448 + * include scripts from upstream support directory in + /usr/share/doc/rsync/scripts/ + closes:#458200 + * include example logrotate config file in /usr/share/doc/rsync/examples/ + closes:#416316 + * filename conversion is now possible with the --iconv option. Noe exactly + what was asked, but close enough IMHO to close:#320223 + + -- Paul Slootman Sun, 02 Mar 2008 13:45:09 +0100 + +rsync (3.0.0~pre10-1) experimental; urgency=low + + * OK, one more prerelease version + * fixed LSB header in init.d script. + closes:#458442 + * manpage typo fixed. + closes:#414636 + + -- Paul Slootman Wed, 20 Feb 2008 11:20:47 +0100 + +rsync (3.0.0~pre9-1) experimental; urgency=low + + * prerelease version 9 of 3.0.0, hopefully the last before official 3.0.0 + * Updated fsf.org link to GPL-3 text in copyright file. + + -- Paul Slootman Mon, 11 Feb 2008 11:35:13 +0100 + +rsync (3.0.0~pre8-2) experimental; urgency=low + + * fix hardlinking 64-bit inodes + + -- Paul Slootman Mon, 04 Feb 2008 16:25:54 +0100 + +rsync (3.0.0~pre8-1) experimental; urgency=low + + * prerelease version 8 of 3.0.0 + + -- Paul Slootman Sun, 13 Jan 2008 13:37:17 +0100 + +rsync (3.0.0~pre7-1) experimental; urgency=low + + * prerelease version 7 of 3.0.0 + * includes fix for the recent CVE-2007-6199, CVE-2007-6200 vulnerabilities + * modified the way supplemental patches from debian/patches/ are applied + (accept both .patch and .diff extensions) + + -- Paul Slootman Thu, 20 Dec 2007 12:53:35 +0100 + +rsync (3.0.0~pre6-1) experimental; urgency=low + + * prerelease version 6 of 3.0.0 + + -- Paul Slootman Wed, 28 Nov 2007 12:54:15 +0100 + +rsync (3.0.0~pre5-1) experimental; urgency=low + + * prerelease version 5 of 3.0.0 + + -- Paul Slootman Mon, 12 Nov 2007 12:30:38 +0100 + +rsync (3.0.0~pre4-1) experimental; urgency=low + + * prerelease version 4 of 3.0.0 + + -- Paul Slootman Thu, 08 Nov 2007 19:32:18 +0100 + +rsync (3.0.0~pre1-1) experimental; urgency=low + + * prerelease version 1 of 3.0.0 + + -- Paul Slootman Fri, 05 Oct 2007 11:06:31 +0200 + +rsync (2.6.9-5) unstable; urgency=high + + * fix two off-by-one errors leading to potential buffer overflow which may + corrupt the stack (CVE-2007-4091) + closes:#438125 + + -- Paul Slootman Wed, 15 Aug 2007 21:24:47 +0200 + +rsync (2.6.9-4) unstable; urgency=low + + * Check for empty filename (buggy kernel may have that in /sys) + * include README.Debian in the package... + * init.d script checks whether rsync stays running, or whether it was + running during a restart. + closes:#412448 + * fixed typos in manpage + closes:414636 + + -- Paul Slootman Thu, 26 Jul 2007 19:03:54 +0200 + +rsync (2.6.9-3) unstable; urgency=low + + * Add patch from upstream to fix error when using -vv together with --stats. + closes:#402381 + * treat errno == ENOSYS the same as errno == ENOTSUP on hppa as far as ACL + support is concerned. + closes:#401189 + + -- Paul Slootman Tue, 12 Dec 2006 14:39:43 +0100 + +rsync (2.6.9-2) unstable; urgency=low + + * Applied patch from upstream to fix problem + with --acl together with --delete + (see http://lists.samba.org/archiv:ee/rsync/2006-November/016706.html) + * Couple of adjustments to manpage formatting. + + -- Paul Slootman Mon, 20 Nov 2006 15:43:12 +0100 + +rsync (2.6.9-1) unstable; urgency=low + + * New upstream release. + * (from experimental version 2.6.9~pre3-1) + Applied a mix of the patches from Martin Pitt and David Härdeman for + LSBfying init script. + closes:#375985,#385877 + * Upstream now includes the patch for replacing a dir with a symlink when + using --delete-after. + closes:#350522 + * Now includes the ACL patch. + + -- Paul Slootman Tue, 7 Nov 2006 12:32:20 +0100 + +rsync (2.6.9~pre3-1) experimental; urgency=low + + * 2.6.9-pre3 + * Applied a mix of the patches from Martin Pitt and David Härdeman for + LSBfying init script. + closes:#375985,#385877 + * Updated policy version from 3.6.2 to 3.7.2; no changes needed + * Applied ACL patch. Please test :-) + + -- Paul Slootman Fri, 27 Oct 2006 12:27:45 +0200 + +rsync (2.6.9~pre1-1) experimental; urgency=low + + * 1st prerelease of rsync-2.6.9 + + -- Paul Slootman Sat, 14 Oct 2006 18:48:27 +0200 + +rsync (2.6.8-2) unstable; urgency=low + + * Ignore empty value for RSYNC_NICE. + closes:#365261 + + -- Paul Slootman Sat, 29 Apr 2006 13:07:43 +0200 + +rsync (2.6.8-1) unstable; urgency=low + + * new upstream version + * Updated standards version to 3.6.2 (no changes necessary). + * (from experimental version 2.6.7-2.6.8pre1): + Split ssh suggestion into openssh-server and openssh-client. + Also added blurb about supplying daemon functionality in the description. + closes:#356994 + * (from experimental version 2.6.7-2.6.8pre1): + Added support for running rsyncd at a nice value via the defaults file. + closes:#354306 + + -- Paul Slootman Mon, 24 Apr 2006 12:26:19 +0200 + +rsync (2.6.7-2.6.8pre1) experimental; urgency=low + + * new upstream version (prerelease 2.6.8pre1). + * Split ssh suggestion into openssh-server and openssh-client + as suggested in #356994 (not closing yet). Also added blurb + about supplying daemon functionality in the description. + * Added support for running rsyncd at a nice value via the defaults file, + as suggested in #354306 (not closing yet). + + -- Paul Slootman Thu, 13 Apr 2006 10:51:39 +0200 + +rsync (2.6.7-1) unstable; urgency=low + + * new upstream version. + closes:#357314 + * Includes a patch for an exclude bug when dealing with --relative + while copying an absolute path. This bug will lead to 2.6.8 being released + within the next couple of weeks, but this way 2.6.7 can get some Debian + exposure before then. + * Removed mention of ssh being a suitable replacement for rsh. + closes:#324200 + * Fixed "!" in ~/.cvsignore. + closes:#314473 + + -- Paul Slootman Fri, 17 Mar 2006 11:39:22 +0100 + +rsync (2.6.6-1) unstable; urgency=low + + * new upstream version. + bug-fix release to handle a null-pointer bug that turned up in rsync's + version of zlib 1.1.4 (this is not the recent zlib 1.2.2 security fix, + which did not affect rsync) and to squash a few other minor bugs. To deal + with the zlib issue, rsync has been upgraded to include zlib 1.2.3. + * Now use the --min-size patch as included by upstream, instead of the + (minimally different) Debian patch. + * Fixed some minor typos in the manpage. + closes:#309100 + * Clarified text about pidfile in sample rsyncd.conf. + closes:#319335 + + -- Paul Slootman Fri, 29 Jul 2005 10:47:04 +0200 + +rsync (2.6.5-1) unstable; urgency=low + + * new upstream version. + Contains the patches previously applied in 2.6.4-3 from CVS. + * Now should handle locale-specific characters better in logging output + (i.e. the correct chars should be displayed, not '?'). + + -- Paul Slootman Fri, 3 Jun 2005 19:17:28 +0200 + +rsync (2.6.4-6) unstable; urgency=high + + * Fixed grave bug: + replaced the Debian-specific patch to log.c with the upstream CVS version, + as upstream changes conflict with the Debian patch, causing syslog logging + (the default!) to fail, meaning that for most people the rsync as daemon + doesn't work. + This includes people using systemimager-server, as that generates the + rsyncd.conf on the fly without a log file line, hence the rsync bug + causes a total failure of that package. + closes:#307923,#308428 + * fixed the rsync.1 manpage, where cut&paste from a diff was not done + correctly (the leading '+'s were still there). + + -- Paul Slootman Tue, 10 May 2005 21:44:29 +0200 + +rsync (2.6.4-5) unstable; urgency=high + + * Fixed not backupping deleted files when --backup is used in combination + with --delete-after (this was considered a critical bug). + closes:#306981 + * Removed spurious log.c.DEBIAN file from source (diff, actually). + * Removed old rsyncstats script from diff. + * Install rsyncstats script to /usr/sbin/. + * Fixed some typos in the man page. + closes:#305627 + * Implemented a --min-size option. + closes#:27126 + + -- Paul Slootman Wed, 27 Apr 2005 10:54:43 +0200 + +rsync (2.6.4-4) unstable; urgency=low + + * Fix from upstream for incompatibility with older rsync versions when using + --exclude (and not --delete). + closes:#306368 + + -- Paul Slootman Tue, 26 Apr 2005 17:39:55 +0200 + +rsync (2.6.4-3) unstable; urgency=low + + * Added comment to /etc/default/rsync that the rsyncd.conf specified there + is not used when accessing the daemon via a remote shell. + closes:#298002 + * Correctly report whether what we're not creating is a file or a directory. + closes:#142258 + * Concat the upstream NEWS & OLDNEWS together as changelog instead of as-is. + closes:#306250 + * assorted recommended patches from upstream, collected in debian/patches/ + in the source package: + - fix for sending a single file with -H + - improper handling of --one-file-system in some cases + - --link-dest / --hard-links problem + - new hard-links in not-yet-created directories + + -- Paul Slootman Tue, 26 Apr 2005 17:05:55 +0200 + +rsync (2.6.4-2) unstable; urgency=low + + (voor 2.6.5 close 266373) + * Fixed problem with rsyncd when use chroot = no and module path = / + closes:#303900 + * Added comment to example rsyncd.conf to make it clear that read only is + the default. + closes:#290905,#290882 + + -- Paul Slootman Sun, 10 Apr 2005 14:06:28 +0200 + +rsync (2.6.4-1) unstable; urgency=low + + * New upstream version. + * --bwlimit-mod is now removed. + + -- Paul Slootman Mon, 4 Apr 2005 15:46:38 +0200 + +rsync (2.6.3-2) unstable; urgency=low + + * Now supports alternate location for rsync daemon config file through + /etc/default/rsync . + closes:#271713,#282092 + * If the daemon isn't set to be started, only give a message is there is an + rsyncd.conf file. + closes:#252441 + * RSYNC_ENABLE may now also be set to "inetd" for those who want to start + rsyncd from inetd; all this does is prevent the init.d script from + outputting a message. You still need to add rsyncd to inetd's config + yourself. + * Fixed a few unescaped hyphens in the manpage, thanks to Joseph Nahmias for + finding them. + closes:#279586 + * Removed a double line from the man page left behind while editing. + closes:#282148 + * Patch for --bwlimit when used in daemon mode, which enables the behaviour + that rsync had previous to 2.6.3 i.e. specifying a default bwlimit (_not_ + a maximum!). + closes:#281519 + + -- Paul Slootman Wed, 17 Nov 2004 18:22:36 +0100 + +rsync (2.6.3-1) unstable; urgency=low + + * New upstream version. + * --bwlimit-mod is now deprecated, as the standard --bwlimit implementation + now uses ideas from --bwlimit-mod and should always work satisfactorily. + closes 181336 + * Corrected example rsyncd.conf + closes 256938 + + -- Paul Slootman Mon, 4 Oct 2004 11:58:18 +0200 + +rsync (2.6.2.pre3.2-1) experimental; urgency=low + + * Second preliminary version of what is to be 2.6.3. + + -- Paul Slootman Wed, 22 Sep 2004 12:57:38 +0200 + +rsync (2.6.2.pre3.1-1) experimental; urgency=low + + * preliminary version of what is to be 2.6.3. + * --bwlimit-mod is now deprecated, as the standard --bwlimit implementation + now uses ideas from --bwlimit-mod and should always work satisfactorily. + closes 181336 + * Corrected example rsyncd.conf + closes 256938 + + -- Paul Slootman Tue, 17 Aug 2004 11:16:13 +0200 + +rsync (2.6.2-3) unstable; urgency=high + + * security: directory traversal in daemon mode fix + (advisory CAN-2004-0792) + closes:#265662 + + -- Paul Slootman Sat, 14 Aug 2004 14:11:22 +0200 + +rsync (2.6.2-2) unstable; urgency=low + + * Build with -g by default. + closes:#239906 + * Check value of RSYNC_ENABLE as set in the defaults file, that it's + either 'true' or 'false'. + closes:#256791 + * If set to start the daemon, print an error if the rsyncd.conf file + doesn't exist. + closes:#238222 + * Added description of --bwlimit-mod to rsync manpage. + closes:#245579 + + -- Paul Slootman Tue, 29 Jun 2004 15:20:06 +0200 + +rsync (2.6.2-1) unstable; urgency=medium + + * New upstream version. + - fixes bug with --relative option in 2.6.1 that can cause files to be + transferred incorrectly. + * Additional patch to fix possible segmentation violation with --delete + option. + + -- Paul Slootman Mon, 3 May 2004 14:05:15 +0200 + +rsync (2.6.1-1) unstable; urgency=high + + * New upstream version. + + -- Paul Slootman Tue, 27 Apr 2004 14:07:30 +0200 + +rsync (2.6.0-3) unstable; urgency=low + + * Fix for .cvsignore in one dir affecting other dirs. + closes#239791 + + -- Paul Slootman Wed, 24 Mar 2004 20:23:34 +0100 + +rsync (2.6.0-2) unstable; urgency=low + + * Fixed building on GNU/KNetBSD (by adding DEB_BUILD_GNU_TYPE and + DEB_HOST_GNU_TYPE settings after backwards compatibilty stuff in rules). + closes:#223267 + * Experimental modification of --bwlimit option to limit the size of writes + when using small bwlimit values. Use --bwlimit-mod instead of --bwlimit. + Note that this needs an rsync version at both ends that has this + modification. See bug 191557 for more info. + * Removed own kludge to fix #146045 (interrupting while ssh is asking for a + password leaves tty in non-echoing state) as upstream rsync now has its + own kludge for this in another place. + * Added init.d script for those who want to start rsync in daemon mode + automatically. You'll need to edit /etc/default/rsync and create an + appropriate rsyncd.conf file to actually get it to start. + closes:#211007 + + -- Paul Slootman Mon, 5 Jan 2004 16:00:22 +0100 + +rsync (2.6.0-1) unstable; urgency=low + + * New Year's Day official release of 2.6.0. + * In short, the most important points from NEWS: + * - ssh is now the default remote shell for rsync. + * - Added --files-from, --no-relative, --no-implied-dirs, and --from0. + * - Fixed several exclude/include matching bugs when using wild-cards. + Please check the NEWS file for details on subtle changes in + exclude/include matching. + * - Make --link-dest honor the absence of -p, -o, and -g. + * - Fixed file I/O error detection. + * - Improved file-related error messages to better indicate exactly what + pathname failed. + * - Fixed bug that prevented regular files from replacing special files and + caused a directory in --link-dest or --compare-dest to block the creation + of a file with the same path. A directory still cannot be replaced by a + regular file unless --delete specified. (J.W. Schultz) + + -- Paul Slootman Thu, 1 Jan 2004 21:09:52 +0100 + +rsync (2.5.99pre2-1) unstable; urgency=low + + * Test release of version 2.6.0pre2 + Final version of rsync 2.6.0 is scheduled for January 1st. + + -- Paul Slootman Mon, 29 Dec 2003 10:03:08 +0100 + +rsync (2.5.99pre1-1) experimental; urgency=low + + * Test release of version 2.6.0pre1 + * manpage hasn't all the proper patches, for the rest it should be like the + final version as far as Debian is concerned. + + -- Paul Slootman Fri, 19 Dec 2003 22:54:33 +0100 + +rsync (2.5.7-1) unstable; urgency=high + + * New upstream version + * Fixes heap overflow vulnerability when run as a server. + + -- Paul Slootman Thu, 4 Dec 2003 11:20:26 +0100 + +rsync (2.5.6-2) unstable; urgency=low + + * If the specified log file can't be opened, don't segfault trying to write + to the file pointer; fall back to syslog instead (and log an appropriate + message there). This was especially irritating when starting it in daemon + mode. + closes:#165839 + + -- Paul Slootman Mon, 17 Nov 2003 16:51:41 +0100 + +rsync (2.5.6-1) unstable; urgency=low + + * New maintainer + * Added a small delay when an interrupt is received so that child processes + can clean up (i.e. ssh can restore tty settings) before the child + processes are killed. + closes:#146045 + * Removed the backslashes before single quotes in the manpage to prevent + them getting turned into acute accents. Also changed - to \- and + " to \(lq and \(rq, and ' to \(oq and \(cq where appropriate. + closes:#152135 + * Moved the /usr/share/doc/rsync/sample.rsyncd.conf to + /usr/share/doc/examples/rsyncd.conf . Also removed debian/dirs as it + wasn't being used... + closes:#193024 + * Added upstream's NEWS, OLDNEWS, and TODO to doc directory. Removed + debian/docs as it wasn't being used... + closes:#128708 + * Removed the description for --csum-length from the manpage, as there's no + such option in the program. + closes:#122629 + * Removed postinst, all it did was add a link to /usr/doc/ + * Updated the Fix for "mkstemp: filename too long" (#183667) + to the current upstream CVS version. + + -- Paul Slootman Thu, 25 Sep 2003 20:48:00 +0200 + +rsync (2.5.6-0.1) unstable; urgency=low + + * NMU + * New upstream version + - with updated manpage for rsyncd.conf for the exclude option, + closes:#172778 + * Updated manpage text for --perms option to clarify its behaviour. + closes:#181582 + * Fix for "mkstemp: filename too long". closes:#183667 + + -- Paul Slootman Fri, 7 Mar 2003 12:03:45 +0100 + +rsync (2.5.5-0.2) unstable; urgency=medium + + * NMU + * Be sure to use "nogroup" instead of "nobody" for server group + (Closes: #144570). + + -- Colin Walters Tue, 7 May 2002 17:23:01 -0400 + +rsync (2.5.5-0.1) unstable; urgency=high + + * NMU + * New upstream release. + - Includes fix for --whole-file option defaulting to on. + (Closes: #141552) + + -- Colin Walters Sat, 6 Apr 2002 20:36:16 -0500 + +rsync (2.5.4-1) unstable; urgency=high + + * New upstream release + * includes fix for zlib double-free bug (closes: #137958) + * update copyright to mention Martin Pool as upstream maintainer + + -- Philip Hands Fri, 15 Mar 2002 15:23:06 +0000 + +rsync (2.5.2-0.1) unstable; urgency=high + + * NMU + * new upstream release from 2001-01-26 + * new version fixes security problem (remote exploit) + (closes: Bug#130924) + * new version added new option "--ignore-existing" + (closes: Bug#124286) + * added debian/docs with NEWS, OLDNEWS, TODO + (closes: Bug#128708) + * added Makefile.in changes from 2.5.1-0.1 + * downloaded http://rsync.samba.org/ftp/rsync/cvs.log and added + it to the package but its not uptodate.:( + * added "RSYNC=/usr/bin/rsync" to test.sh like previous version + * changed group in loadparm.c from nobody to nogroup + like previous version + + -- Noel Koethe Sat, 26 Jan 2002 20:40:00 +0100 + +rsync (2.5.1-0.1) unstable; urgency=low + + * NMU + * New upstream version (Closes: #96193). + + -- Colin Walters Thu, 3 Jan 2002 20:00:01 -0500 + +rsync (2.5.0-0.3) unstable; urgency=medium + + * NMU + * debian/rules: + - Configure for the correct host and target. + * Backport patch to configure.in and config.h from CVS so we build on + alpha, ia64, etc. Yes, this horridly bloats the Debian diff... + + -- Colin Walters Mon, 31 Dec 2001 03:53:47 -0500 + +rsync (2.5.0-0.2) unstable; urgency=medium + + * NMU + * debian/control: + - Add Build-Depends. + - Clean up description a bit. + + -- Colin Walters Sun, 30 Dec 2001 03:46:11 -0500 + +rsync (2.5.0-0.1) unstable; urgency=medium + + * NMU + * New upstream release + (Closes: #83597, #62160, #26775, #31208, #41805, #44710, #121249). + * debian/rules: + - Modernize a bit; add stock code from current policy, change to use + $(INSTALL), etc. + - Install cvs.log and sample rsyncd.conf in /usr/share/doc/rsync + (Closes: #71406, #121792) + + -- Colin Walters Mon, 24 Dec 2001 02:13:13 -0500 + +rsync (2.4.6-1) unstable; urgency=low + + * New upstream release (closes: #67674) + + -- Philip Hands Sun, 10 Sep 2000 21:40:07 +0100 + +rsync (2.4.4-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Sat, 29 Jul 2000 11:55:30 +0100 + +rsync (2.4.3-1) unstable; urgency=low + + * New upstream release (closes: #63840) + + -- Philip Hands Wed, 28 Jun 2000 23:48:58 +0100 + +rsync (2.4.2-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Sun, 2 Apr 2000 00:24:52 +0100 + +rsync (2.4.1-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Thu, 3 Feb 2000 00:42:38 +0000 + +rsync (2.3.2-1.2) frozen unstable; urgency=low + + * Apply patch from Jason Gunthorpe, to fix rsync segfaults. Closes: + #51705, #54850. + + -- Adam Heath Thu, 20 Jan 2000 00:31:00 -0600 + +rsync (2.3.2-1.1) unstable; urgency=low + + * Use rsync zlib again (closes:Bug#50248). + + -- Joel Klecker Tue, 7 Dec 1999 09:46:25 -0800 + +rsync (2.3.2-1) unstable; urgency=low + + * New upstream release + * use zlib from zlib1g-dev (closes: 38273) + * switch to using /usr/share for docs, and add compatibility /usr/doc link + + -- Philip Hands Thu, 11 Nov 1999 15:30:14 +0000 + +rsync (2.3.1-2) unstable; urgency=low + + * apply Patrik Rak's fix for directory atribute setting (closes: #36179) + + -- Philip Hands Mon, 10 May 1999 12:24:16 +0100 + +rsync (2.3.1-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Sat, 8 May 1999 10:53:53 +0100 + +rsync (2.3.0-1) unstable; urgency=low + + * New upstream release + * change rsyncd's default group to ``nogroup'' (closes: #25299) + + -- Philip Hands Tue, 16 Mar 1999 12:22:05 +0000 + +rsync (2.2.1-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Sun, 6 Dec 1998 11:14:23 +0000 + +rsync (2.2.0-2) unstable; urgency=low + + * check if local ssh conections are allowed before using it as part of the + test script. + + -- Philip Hands Fri, 6 Nov 1998 10:23:07 +0000 + +rsync (2.2.0-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Thu, 5 Nov 1998 15:47:05 +0000 + +rsync (2.1.1-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Thu, 17 Sep 1998 17:35:41 +0100 + +rsync (2.1.0-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Mon, 20 Jul 1998 11:52:26 +0100 + +rsync (2.0.19-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Sat, 18 Jul 1998 01:19:18 +0100 + +rsync (2.0.18-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Thu, 18 Jun 1998 15:52:11 +0100 + +rsync (2.0.16-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Mon, 1 Jun 1998 15:04:58 +0100 + +rsync (2.0.14-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Fri, 29 May 1998 15:26:18 +0100 + +rsync (2.0.13-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Thu, 28 May 1998 01:17:34 +0100 + +rsync (2.0.12-1) unstable; urgency=high + + * New upstream release + (fixes bug that could result in loss of data in files stored in deep + directory trees i.e. with path names of more than 255 characters) + + -- Philip Hands Tue, 26 May 1998 18:12:14 +0100 + +rsync (2.0.11-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Sat, 23 May 1998 12:00:28 +0100 + +rsync (2.0.10-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Wed, 20 May 1998 01:58:45 +0100 + +rsync (2.0.9-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Mon, 18 May 1998 15:44:56 +0100 + +rsync (2.0.3-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Fri, 15 May 1998 09:47:18 +0100 + +rsync (2.0.0-1) unstable; urgency=low + + * New upstream release + (this includes the new --daemon code, which needs testing, so consider + this to be beta software, and use with care) + + The alpha version that I released a couple of days ago, + is incompatible with this version, and should be discarded. + + -- Philip Hands Thu, 14 May 1998 11:22:25 +0100 + +rsync (1.7.4-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Fri, 17 Apr 1998 10:50:44 +0100 + +rsync (1.7.2-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Thu, 9 Apr 1998 10:19:08 +0100 + +rsync (1.7.1-0bo1) bo-unstable; urgency=low + + * recompiled for libc5 + + -- Philip Hands Thu, 26 Mar 1998 10:27:48 +0000 + +rsync (1.7.1-1) unstable; urgency=low + + * New upstream release (closes: #16181 #16860) + * Fixed typo in description (closes: #18948) + * add /usr/doc/rsync/test.sh + + -- Philip Hands Thu, 26 Mar 1998 09:35:24 +0000 + +rsync (1.6.9-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Tue, 13 Jan 1998 17:16:06 +0000 + +rsync (1.6.8-2) unstable; urgency=low + + * Add upstream patch to fix --suffix option + (From Andrew Tridgell on the rsync mailing list) + + -- Philip Hands Tue, 30 Dec 1997 10:54:57 +0000 + +rsync (1.6.8-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Mon, 29 Dec 1997 10:46:41 +0000 + +rsync (1.6.7-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Wed, 17 Dec 1997 09:04:16 +0000 + +rsync (1.6.3-2) unstable; urgency=low + + * recompile with libc6 + + -- Philip Hands Wed, 20 Aug 1997 10:21:04 +0100 + +rsync (1.6.3-1) unstable; urgency=low + + * New upstream release + + -- Philip Hands Tue, 22 Apr 1997 15:17:38 +0100 + +rsync (1.6.2-1) unstable; urgency=low + + * Initial Release + + -- Philip Hands Wed, 9 Oct 1996 23:45:08 +0100 + + --- rsync-3.0.6.orig/debian/patches/README +++ rsync-3.0.6/debian/patches/README @@ -0,0 +1,25 @@ +These are the main patches to the rsync source. +(The changes to the manpages for correct hyphens +and quotes is a bit big, so not included.) + +If you're wondering about the lack of patches, the +explanation is that upstream has adopted most of them :-) + +logdir.diff - fix the location of the logdir +ssh-6-option.diff - call ssh with -6 option if rsync was called with -6, + ditto with -4 +rsyncd.conf.5.comment.diff - explain that a hash can only be at the beginning + of a line. + +These are patches from the development branch that I consider important +enough to include now: + +cast--1-size_t.diff + - Explicitly cast a -1 that is being assigned to a size_t. +hash-64bit-cast.diff + - Explicitly cast an int64 to an int32. +progress-cursor-pos.diff + - The --progress output now leaves the cursor at the end of the line + (instead of the start) in order to be extra sure that an error won't + overwrite it. We also ensure that the progress option can't be enabled + on the server side. --- rsync-3.0.6.orig/debian/patches/cast--1-size_t.diff +++ rsync-3.0.6/debian/patches/cast--1-size_t.diff @@ -0,0 +1,69 @@ +From: Wayne Davison +Date: Tue, 22 Jul 2008 06:21:09 +0000 (-0700) +Subject: Explicitly cast a -1 that is being assigned to a size_t. +X-Git-Url: http://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=bb640d32213c5dce2ad26515b5fc26e023ec9b98;hp=0566dc54b18fcaa6d666711ec3356bf6096af87e + +Explicitly cast a -1 that is being assigned to a size_t. +--- + +diff --git a/flist.c b/flist.c +index 7c21f73..2d17bf7 100644 +--- a/flist.c ++++ b/flist.c +@@ -689,7 +689,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, + xbuf outbuf, inbuf; + + INIT_CONST_XBUF(outbuf, thisname); +- INIT_XBUF(inbuf, lastname, basename_len, -1); ++ INIT_XBUF(inbuf, lastname, basename_len, (size_t)-1); + + if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) { + io_error |= IOERR_GENERAL; +diff --git a/io.c b/io.c +index d884846..6068575 100644 +--- a/io.c ++++ b/io.c +@@ -511,7 +511,7 @@ static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, + xbuf outbuf, inbuf; + + INIT_XBUF(outbuf, buffer + 4, 0, sizeof buffer - 4); +- INIT_XBUF(inbuf, (char*)buf, len, -1); ++ INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1); + + iconvbufs(ic_send, &inbuf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); +@@ -1093,7 +1093,7 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) + int add_null = 0; + + INIT_CONST_XBUF(outbuf, line); +- INIT_XBUF(inbuf, ibuf, 0, -1); ++ INIT_XBUF(inbuf, ibuf, 0, (size_t)-1); + + while (msg_bytes) { + inbuf.len = msg_bytes > sizeof ibuf +diff --git a/log.c b/log.c +index d50523b..13c9311 100644 +--- a/log.c ++++ b/log.c +@@ -351,7 +351,7 @@ output_msg: + int ierrno; + + INIT_CONST_XBUF(outbuf, convbuf); +- INIT_XBUF(inbuf, (char*)buf, len, -1); ++ INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1); + + while (inbuf.len) { + iconvbufs(ic, &inbuf, &outbuf, 0); +diff --git a/rsync.h b/rsync.h +index 6540257..3a709d3 100644 +--- a/rsync.h ++++ b/rsync.h +@@ -851,7 +851,7 @@ typedef struct { + } xbuf; + + #define INIT_XBUF(xb, str, ln, sz) (xb).buf = (str), (xb).len = (ln), (xb).size = (sz), (xb).pos = 0 +-#define INIT_XBUF_STRLEN(xb, str) (xb).buf = (str), (xb).len = strlen((xb).buf), (xb).size = (-1), (xb).pos = 0 ++#define INIT_XBUF_STRLEN(xb, str) (xb).buf = (str), (xb).len = strlen((xb).buf), (xb).size = (size_t)-1, (xb).pos = 0 + /* This one is used to make an output xbuf based on a char[] buffer: */ + #define INIT_CONST_XBUF(xb, bf) (xb).buf = (bf), (xb).size = sizeof (bf), (xb).len = (xb).pos = 0 + --- rsync-3.0.6.orig/debian/patches/hash-64bit-cast.diff +++ rsync-3.0.6/debian/patches/hash-64bit-cast.diff @@ -0,0 +1,21 @@ +From: Wayne Davison +Date: Tue, 22 Jul 2008 06:11:23 +0000 (-0700) +Subject: Explicitly cast an int64 to an int32. +X-Git-Url: http://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=aad635f766c450cd2cfac5fe5705213a417050b4;hp=a72f37bb67f16c2d5a17bae77f7a82bcfdd96a9c + +Explicitly cast an int64 to an int32. +--- + +diff --git a/hashtable.c b/hashtable.c +index 7da907c..1775a0b 100644 +--- a/hashtable.c ++++ b/hashtable.c +@@ -142,7 +142,7 @@ void *hashtable_find(struct hashtable *tbl, int64 key, int allocate_if_missing) + if (key64) + ((struct ht_int64_node*)node)->key = key; + else +- node->key = key; ++ node->key = (int32)key; + tbl->entries++; + return node; + } --- rsync-3.0.6.orig/debian/patches/logdir.diff +++ rsync-3.0.6/debian/patches/logdir.diff @@ -0,0 +1,11 @@ +--- rsync-2.6.9.orig/support/rsyncstats.orig 2006-11-20 15:50:42.711007850 +0100 ++++ rsync-2.6.9/support/rsyncstats 2006-11-20 15:51:05.531353306 +0100 +@@ -12,7 +12,7 @@ + use Getopt::Long; + + # You may wish to edit the next line to customize for your default log file. +-$usage_file = "/var/log/rsyncd.log"; ++$usage_file = "/var/log/rsyncd"; + + # Edit the following lines for default report settings. + # Entries defined here will be over-ridden by the command line. --- rsync-3.0.6.orig/debian/patches/manpage.diff +++ rsync-3.0.6/debian/patches/manpage.diff @@ -0,0 +1,11 @@ +--- a/rsync.1 2008-07-25 11:33:51.170390961 +0200 ++++ b/rsync.1 2008-07-25 11:34:01.826819292 +0200 +@@ -2728,7 +2728,7 @@ + .RS + \f(CWmerge /etc/rsync/default.rules\fP + .br +-\f(CW. /etc/rsync/default.rules\fP ++\f(CW\&. /etc/rsync/default.rules\fP + .br + \f(CWdir\-merge .per\-dir\-filter\fP + .br --- rsync-3.0.6.orig/debian/patches/progress-cursor-pos.diff +++ rsync-3.0.6/debian/patches/progress-cursor-pos.diff @@ -0,0 +1,127 @@ +From: Wayne Davison +Date: Sat, 5 Jul 2008 07:21:05 +0000 (-0700) +Subject: The --progress output now leaves the cursor at the end of the line +X-Git-Url: http://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=bb4e4d889f51065dcef6f34d8ba4a80c051149a1;hp=93f3fbf73e2e2b1c2560482fb395c3f9a6835fc8 + +The --progress output now leaves the cursor at the end of the line +(instead of the start) in order to be extra sure that an error won't +overwrite it. We also ensure that the progress option can't be enabled +on the server side. +--- + +diff --git a/cleanup.c b/cleanup.c +index e59565d..279b532 100644 +--- a/cleanup.c ++++ b/cleanup.c +@@ -27,6 +27,7 @@ extern int am_daemon; + extern int io_error; + extern int keep_partial; + extern int got_xfer_error; ++extern int progress_is_active; + extern char *partial_dir; + extern char *logfile_name; + +@@ -115,6 +116,11 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) + + exit_code = unmodified_code = code; + ++ if (progress_is_active) { ++ fputc('\n', stdout); ++ progress_is_active = 0; ++ } ++ + if (verbose > 3) { + rprintf(FINFO, + "_exit_cleanup(code=%d, file=%s, line=%d): entered\n", +diff --git a/log.c b/log.c +index 975ebaf..9100f5d 100644 +--- a/log.c ++++ b/log.c +@@ -321,7 +321,7 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8) + exit_cleanup(RERR_MESSAGEIO); + } + +- if (progress_is_active && !am_server) { ++ if (progress_is_active) { + fputc('\n', f); + progress_is_active = 0; + } +@@ -329,6 +329,12 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8) + trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r') + ? buf[--len] : 0; + ++ if (len && buf[0] == '\r') { ++ fputc('\r', f); ++ buf++; ++ len--; ++ } ++ + #ifdef ICONV_CONST + if (ic != (iconv_t)-1) { + xbuf outbuf, inbuf; +diff --git a/options.c b/options.c +index 0ad26f8..0ac5bfd 100644 +--- a/options.c ++++ b/options.c +@@ -1532,8 +1532,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) + log_before_transfer = !am_server; + } + +- if (do_progress && !verbose && !log_before_transfer && !am_server) +- verbose = 1; ++ if (do_progress) { ++ if (am_server) ++ do_progress = 0; ++ else if (!verbose && !log_before_transfer && !am_server) ++ verbose = 1; ++ } + + if (dry_run) + do_xfers = 0; +diff --git a/progress.c b/progress.c +index 86f8ea1..25033b8 100644 +--- a/progress.c ++++ b/progress.c +@@ -71,6 +71,11 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, + double rate, remain; + + if (is_last) { ++ snprintf(eol, sizeof eol, ++ " (xfer#%d, to-check=%d/%d)\n", ++ stats.num_transferred_files, ++ stats.num_files - current_file_index - 1, ++ stats.num_files); + /* Compute stats based on the starting info. */ + if (!ph_start.time.tv_sec + || !(diff = msdiff(&ph_start.time, now))) +@@ -79,6 +84,7 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, + /* Switch to total time taken for our last update. */ + remain = (double) diff / 1000.0; + } else { ++ strlcpy(eol, " ", sizeof eol); + /* Compute stats based on recent progress. */ + if (!(diff = msdiff(&ph_list[oldest_hpos].time, now))) + diff = 1; +@@ -106,18 +112,13 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, + (int) remain % 60); + } + +- if (is_last) { +- snprintf(eol, sizeof eol, " (xfer#%d, to-check=%d/%d)\n", +- stats.num_transferred_files, +- stats.num_files - current_file_index - 1, +- stats.num_files); +- } else +- strlcpy(eol, "\r", sizeof eol); + progress_is_active = 0; +- rprintf(FCLIENT, "%12s %3d%% %7.2f%s %s%s", ++ rprintf(FCLIENT, "\r%12s %3d%% %7.2f%s %s%s", + human_num(ofs), pct, rate, units, rembuf, eol); +- if (!is_last) ++ if (!is_last) { + progress_is_active = 1; ++ fflush(stdout); ++ } + } + + void set_current_file_index(struct file_struct *file, int ndx) --- rsync-3.0.6.orig/debian/patches/rsyncd.conf.5.comment.diff +++ rsync-3.0.6/debian/patches/rsyncd.conf.5.comment.diff @@ -0,0 +1,12 @@ +--- a/rsyncd.conf.5 2008-09-06 18:33:03.000000000 +0200 ++++ b/rsyncd.conf.5 2008-09-11 12:15:41.383977909 +0200 +@@ -33,6 +33,9 @@ + .PP + Any line beginning with a hash (#) is ignored, as are lines containing + only whitespace. ++Note that a hash in the middle of a line is used as-is, ++hence it is not possible to put a comment at the end of a parameter; ++the hash and following text becomes part of the parameter. + .PP + Any line ending in a \e is \(lqcontinued\(rq on the next line in the + customary UNIX fashion. --- rsync-3.0.6.orig/debian/patches/ssh-6-option.diff +++ rsync-3.0.6/debian/patches/ssh-6-option.diff @@ -0,0 +1,34 @@ +--- a/main.c 2008-03-01 21:01:41.000000000 +0100 ++++ b/main.c 2008-03-04 18:55:10.933488013 +0100 +@@ -82,6 +82,7 @@ + #ifdef ICONV_OPTION + extern iconv_t ic_send; + #endif ++extern int default_af_hint; + + uid_t our_uid; + int local_server = 0; +@@ -381,6 +382,23 @@ + *t++ = '\0'; + } + ++#ifdef AF_INET ++ if (default_af_hint == AF_INET) { ++ if (strncmp(cmd, "ssh", 3) == 0 || strstr(cmd, "/ssh") != NULL) { ++ /* we're using ssh so we can add a -4 option */ ++ args[argc++] = "-4"; ++ } ++ } ++#endif ++#ifdef AF_INET6 ++ if (default_af_hint == AF_INET6) { ++ if (strncmp(cmd, "ssh", 3) == 0 || strstr(cmd, "/ssh") != NULL) { ++ /* we're using ssh so we can add a -6 option */ ++ args[argc++] = "-6"; ++ } ++ } ++#endif ++ + /* check to see if we've already been given '-l user' in + * the remote-shell command */ + for (i = 0; i < argc-1; i++) { --- rsync-3.0.6.orig/debian/patches/manpage.diff.new +++ rsync-3.0.6/debian/patches/manpage.diff.new @@ -0,0 +1,22 @@ +--- a/rsync.1 2009-05-08 19:42:39.000000000 +0200 ++++ b/rsync.1 2009-06-17 14:46:24.459735130 +0200 +@@ -442,8 +442,8 @@ + \-\-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) +- \-\-delete\-during receiver deletes during xfer, not before ++ \-\-delete\-before receiver deletes before transfer ++ \-\-delete\-during receiver deletes during xfer, not before (default) + \-\-delete\-delay find deletions during, delete after + \-\-delete\-after receiver deletes after transfer, not before + \-\-delete\-excluded also delete excluded files from dest dirs +@@ -2809,7 +2809,7 @@ + .RS + \f(CWmerge /etc/rsync/default.rules\fP + .br +-\f(CW. /etc/rsync/default.rules\fP ++\f(CW\&. /etc/rsync/default.rules\fP + .br + \f(CWdir\-merge .per\-dir\-filter\fP + .br