OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Mar-2006 10:09:47
Branch: HEAD Handle: 2006031209094400
Modified files:
openpkg-src/rsync rsync.patch rsync.spec
Log:
upgrading package: rsync 2.6.6 -> 2.6.7
Summary:
Revision Changes Path
1.19 +4 -4 openpkg-src/rsync/rsync.patch
1.78 +4 -8 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 rsync.patch
--- openpkg-src/rsync/rsync.patch 29 Jul 2005 07:39:18 -0000 1.18
+++ openpkg-src/rsync/rsync.patch 12 Mar 2006 09:09:44 -0000 1.19
@@ -1,6 +1,6 @@
Index: compat.c
---- compat.c.orig 2005-03-09 19:53:55 +0100
-+++ compat.c 2005-03-31 17:41:51 +0200
+--- compat.c.orig 2006-02-24 17:43:44 +0100
++++ compat.c 2006-03-12 10:05:18 +0100
@@ -57,19 +57,21 @@
rprintf(FINFO, "(%s) Protocol versions: remote=%d,
negotiated=%d\n",
am_server? "Server" : "Client", remote_protocol,
protocol_version);
@@ -31,8 +31,8 @@
}
if (protocol_version > PROTOCOL_VERSION) {
Index: rsync.h
---- rsync.h.orig 2005-03-28 19:08:47 +0200
-+++ rsync.h 2005-03-31 17:28:54 +0200
+--- rsync.h.orig 2006-02-27 22:11:56 +0100
++++ rsync.h 2006-03-12 10:05:18 +0100
@@ -85,9 +85,12 @@
* unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and
* MAX_PROTOCOL_VERSION. */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.77 -r1.78 rsync.spec
--- openpkg-src/rsync/rsync.spec 1 Jan 2006 13:21:34 -0000 1.77
+++ openpkg-src/rsync/rsync.spec 12 Mar 2006 09:09:44 -0000 1.78
@@ -32,13 +32,12 @@
Class: CORE
Group: Filesystem
License: GPL
-Version: 2.6.6
-Release: 20050729
+Version: 2.6.7
+Release: 20060312
# package options
%option with_lastmatch no
%option with_timelimit no
-%option with_chmod no
# list of sources
Source0: http://rsync.samba.org/ftp/rsync/rsync-%{version}.tar.gz
@@ -76,13 +75,10 @@
%setup -q
%patch -p0
%if "%{with_lastmatch}" == "yes"
- %{l_patch} -p0 <patches/last-match.diff
+ %{l_patch} -p1 <patches/last-match.diff
%endif
%if "%{with_timelimit}" == "yes"
- %{l_patch} -p0 <patches/time-limit.diff
-%endif
-%if "%{with_chmod}" == "yes"
- %{l_patch} -p0 <patches/chmod-option.diff
+ %{l_patch} -p1 <patches/time-limit.diff
%endif
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
