OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Jan-2005 13:19:27
Branch: HEAD Handle: 2005010212192700
Modified files:
openpkg-src/rsync rsync.patch rsync.spec
Log:
apply --max-delete=N patch from the FreeBSD port and apply the shipped
mkfifo patch for the *BSD systems to get correct socket and fifo
synchronization
Summary:
Revision Changes Path
1.12 +12 -0 openpkg-src/rsync/rsync.patch
1.71 +4 -1 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 rsync.patch
--- openpkg-src/rsync/rsync.patch 1 Oct 2004 07:37:54 -0000 1.11
+++ openpkg-src/rsync/rsync.patch 2 Jan 2005 12:19:27 -0000 1.12
@@ -20,3 +20,15 @@
while (c->len)
{
NEEDOUT
+Index: receiver.c
+--- receiver.c.orig 2004-09-21 11:24:06 +0200
++++ receiver.c 2005-01-02 13:11:02 +0100
+@@ -116,7 +116,7 @@
+ rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
+
+ for (i = local_file_list->count-1; i >= 0; i--) {
+- if (max_delete && deletion_count > max_delete)
++ if (max_delete && deletion_count >= max_delete)
+ break;
+ if (!local_file_list->files[i]->basename)
+ continue;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 rsync.spec
--- openpkg-src/rsync/rsync.spec 1 Jan 2005 10:54:26 -0000 1.70
+++ openpkg-src/rsync/rsync.spec 2 Jan 2005 12:19:27 -0000 1.71
@@ -34,7 +34,7 @@
Group: Filesystem
License: GPL
Version: 2.6.3
-Release: 20041001
+Release: 20050102
# package options
%option with_timelimit no
@@ -85,6 +85,9 @@
%if "%{with_chmod}" == "yes"
%{l_patch} -p0 <patches/chmod-option.diff
%endif
+ case "%{l_platform -p}" in
+ *-*bsd* ) %{l_patch} -p0 <patches/mkfifo.diff ;;
+ esac
%build
# configure vendor sources
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
