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: 13-Jun-2005 20:16:46
Branch: HEAD Handle: 2005061319164600
Modified files:
openpkg-src/rsync rsync.patch rsync.spec
Removed files:
openpkg-src/rsync rsync.patch.lastmatch
Log:
upgrading package: rsync 2.6.3 -> 2.6.5
Summary:
Revision Changes Path
1.17 +32 -99 openpkg-src/rsync/rsync.patch
1.2 +0 -150 openpkg-src/rsync/rsync.patch.lastmatch
1.75 +6 -13 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 rsync.patch
--- openpkg-src/rsync/rsync.patch 4 Mar 2005 11:05:48 -0000 1.16
+++ openpkg-src/rsync/rsync.patch 13 Jun 2005 18:16:46 -0000 1.17
@@ -1,94 +1,7 @@
-Index: popt/popt.c
---- popt/popt.c.orig 2004-06-09 23:41:21 +0200
-+++ popt/popt.c 2005-01-02 17:09:28 +0100
-@@ -1128,7 +1128,7 @@
- /[EMAIL PROTECTED]@*/
- }
-
--const char *const poptStrerror(const int error)
-+const char *poptStrerror(const int error)
- {
- switch (error) {
- case POPT_ERROR_NOARG:
-Index: popt/popt.h
---- popt/popt.h.orig 2004-01-27 17:27:05 +0100
-+++ popt/popt.h 2005-01-02 17:09:01 +0100
-@@ -373,7 +373,7 @@
- * @return error string
- */
- /[EMAIL PROTECTED]@*/
--/[EMAIL PROTECTED]@*/ const char *const poptStrerror(const int error)
-+/[EMAIL PROTECTED]@*/ const char *poptStrerror(const int error)
- /[EMAIL PROTECTED]/;
- /[EMAIL PROTECTED]@*/
-
-Index: receiver.c
---- receiver.c.orig 2004-09-21 11:24:06 +0200
-+++ receiver.c 2005-01-02 17:07:40 +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;
-Index: zlib/infcodes.c
---- zlib/infcodes.c.orig 2002-03-12 02:14:58 +0100
-+++ zlib/infcodes.c 2005-01-02 17:07:40 +0100
-@@ -197,8 +197,18 @@
- c->mode = COPY;
- case COPY: /* o: copying bytes in window, waiting for space */
- f = q - c->sub.copy.dist;
-+#ifdef __FreeBSD__
-+ {
-+ /* Work-around for a FreeBSD gcc bug. */
-+ volatile inflate_blocks_statef *s1 = s;
-+
-+ while (f < s1->window) /* modulo window size-"while"
instead */
-+ f += s1->end - s1->window; /* of "if" handles invalid
distances */
-+ }
-+#else
- while (f < s->window) /* modulo window size-"while"
instead */
- f += s->end - s->window; /* of "if" handles invalid
distances */
-+#endif
- while (c->len)
- {
- NEEDOUT
-Index: options.c
---- options.c.orig 2004-09-23 19:39:05 +0200
-+++ options.c 2005-01-02 17:30:40 +0100
-@@ -769,6 +769,12 @@
- }
- }
-
-+ if (bwlimit) {
-+ bwlimit_writemax = (size_t)bwlimit * 128;
-+ if (bwlimit_writemax < 512)
-+ bwlimit_writemax = 512;
-+ }
-+
- if (daemon_opt) {
- daemon_opt = 0;
- am_daemon = 1;
-@@ -807,12 +813,6 @@
- if (do_progress && !verbose)
- verbose = 1;
-
-- if (bwlimit) {
-- bwlimit_writemax = (size_t)bwlimit * 128;
-- if (bwlimit_writemax < 512)
-- bwlimit_writemax = 512;
-- }
--
- if (inplace) {
- #if HAVE_FTRUNCATE
- if (partial_dir) {
Index: compat.c
---- compat.c.orig 2004-07-22 01:59:22 +0200
-+++ compat.c 2005-03-04 11:57:39 +0100
-@@ -53,19 +53,22 @@
+--- compat.c.orig 2005-03-09 19:53:55 +0100
++++ compat.c 2005-03-31 17:41:51 +0200
+@@ -57,19 +57,21 @@
rprintf(FINFO, "(%s) Protocol versions: remote=%d,
negotiated=%d\n",
am_server? "Server" : "Client", remote_protocol,
protocol_version);
}
@@ -96,23 +9,21 @@
- || remote_protocol > MAX_PROTOCOL_VERSION) {
+ if ( ( am_server && (remote_protocol < MIN_CLIENT_PROTOCOL_VERSION ||
remote_protocol > MAX_CLIENT_PROTOCOL_VERSION))
+ || (!am_server && (remote_protocol < MIN_SERVER_PROTOCOL_VERSION ||
remote_protocol > MAX_SERVER_PROTOCOL_VERSION))) {
- rprintf(FERROR,"protocol version mismatch - is your shell
clean?\n");
+ rprintf(FERROR,"protocol version mismatch -- is your shell
clean?\n");
rprintf(FERROR,"(see the rsync man page for an explanation)\n");
exit_cleanup(RERR_PROTOCOL);
}
- if (remote_protocol < OLD_PROTOCOL_VERSION) {
- rprintf(FINFO,"%s is very old version of rsync, upgrade
recommended.\n",
- am_server? "Client" : "Server");
-- }
-- if (protocol_version < MIN_PROTOCOL_VERSION) {
+ if ( ( am_server && remote_protocol < OLD_CLIENT_PROTOCOL_VERSION)
+ || (!am_server && remote_protocol < OLD_SERVER_PROTOCOL_VERSION)) {
+ rprintf(FINFO,"%s is very old version (protocol %d) of rsync,
upgrade recommended.\n",
+ am_server? "Client" : "Server", remote_protocol);
-+ }
+ }
+- if (protocol_version < MIN_PROTOCOL_VERSION) {
+ if ( ( am_server && protocol_version < MIN_SERVER_PROTOCOL_VERSION)
-+ || (!am_server && protocol_version < MIN_CLIENT_PROTOCOL_VERSION)
-+ ) {
++ || (!am_server && protocol_version < MIN_CLIENT_PROTOCOL_VERSION)) {
rprintf(FERROR, "--protocol must be at least %d on the %s.\n",
- MIN_PROTOCOL_VERSION, am_server? "Server" : "Client");
+ am_server ? MIN_SERVER_PROTOCOL_VERSION :
MIN_CLIENT_PROTOCOL_VERSION, am_server? "Server" : "Client");
@@ -120,9 +31,9 @@
}
if (protocol_version > PROTOCOL_VERSION) {
Index: rsync.h
---- rsync.h.orig 2004-09-22 06:10:10 +0200
-+++ rsync.h 2005-03-04 12:01:01 +0100
-@@ -81,9 +81,12 @@
+--- rsync.h.orig 2005-03-28 19:08:47 +0200
++++ rsync.h 2005-03-31 17:28:54 +0200
+@@ -85,9 +85,12 @@
* unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and
* MAX_PROTOCOL_VERSION. */
@@ -138,3 +49,25 @@
#define RSYNC_PORT 873
+Index: zlib/infcodes.c
+--- zlib/infcodes.c.orig 2002-03-12 02:14:58 +0100
++++ zlib/infcodes.c 2005-03-31 17:28:54 +0200
+@@ -197,8 +197,18 @@
+ c->mode = COPY;
+ case COPY: /* o: copying bytes in window, waiting for space */
+ f = q - c->sub.copy.dist;
++#ifdef __FreeBSD__
++ {
++ /* Work-around for a FreeBSD gcc bug. */
++ volatile inflate_blocks_statef *s1 = s;
++
++ while (f < s1->window) /* modulo window size-"while"
instead */
++ f += s1->end - s1->window; /* of "if" handles invalid
distances */
++ }
++#else
+ while (f < s->window) /* modulo window size-"while"
instead */
+ f += s->end - s->window; /* of "if" handles invalid
distances */
++#endif
+ while (c->len)
+ {
+ NEEDOUT
@@ .
rm -f openpkg-src/rsync/rsync.patch.lastmatch <<'@@ .'
Index: openpkg-src/rsync/rsync.patch.lastmatch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.74 -r1.75 rsync.spec
--- openpkg-src/rsync/rsync.spec 24 Mar 2005 11:20:12 -0000 1.74
+++ openpkg-src/rsync/rsync.spec 13 Jun 2005 18:16:46 -0000 1.75
@@ -32,13 +32,12 @@
Class: CORE
Group: Filesystem
License: GPL
-Version: 2.6.3
-Release: 20050304
+Version: 2.6.5
+Release: 20050613
# package options
-%option with_lastmatch yes
+%option with_lastmatch no
%option with_timelimit no
-%option with_writeonly no
%option with_chmod no
# list of sources
@@ -46,7 +45,6 @@
Source1: rsync.conf
Source2: rc.rsync
Patch0: rsync.patch
-Patch1: rsync.patch.lastmatch
# build information
Prefix: %{l_prefix}
@@ -76,22 +74,16 @@
%prep
# unpack vendor sources
%setup -q
- %patch -p0 -P 0
+ %patch -p0
%if "%{with_lastmatch}" == "yes"
- %patch -p0 -P 1
+ %{l_patch} -p0 <patches/last-match.diff
%endif
%if "%{with_timelimit}" == "yes"
%{l_patch} -p0 <patches/time-limit.diff
%endif
-%if "%{with_writeonly}" == "yes"
- %{l_patch} -p0 <patches/write-only.diff
-%endif
%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
@@ -101,6 +93,7 @@
--prefix=%{l_prefix} \
--with-rsyncd-conf=%{l_prefix}/etc/rsync/rsync.conf \
--disable-debug \
+ --disable-locale \
--with-included-popt \
--with-rsh=ssh
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
