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: 08-Nov-2006 09:36:12
Branch: HEAD Handle: 2006110808361200
Modified files:
openpkg-src/rsync rsync.conf rsync.patch rsync.spec
Log:
upgrading package: rsync 2.6.8 -> 2.6.9
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-src/rsync/rsync.conf
1.23 +6 -97 openpkg-src/rsync/rsync.patch
1.85 +4 -5 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.conf
============================================================================
$ cvs diff -u -r1.4 -r1.5 rsync.conf
--- openpkg-src/rsync/rsync.conf 13 Jun 2005 18:23:00 -0000 1.4
+++ openpkg-src/rsync/rsync.conf 8 Nov 2006 08:36:12 -0000 1.5
@@ -17,7 +17,7 @@
read only = yes
ignore nonreadable = yes
transfer logging = yes
-log format = "%o %h [%a] %m (%u) %f %l"
+out format = "%o %h [%a] %m (%u) %f %l"
dont compress = *.bz2 *.gz *.zip *.z *.rpm *.deb *.tgz *.iso
list = no
uid = @l_nusr@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.patch
============================================================================
$ cvs diff -u -r1.22 -r1.23 rsync.patch
--- openpkg-src/rsync/rsync.patch 30 May 2006 18:34:03 -0000 1.22
+++ openpkg-src/rsync/rsync.patch 8 Nov 2006 08:36:12 -0000 1.23
@@ -1,7 +1,7 @@
Index: compat.c
---- compat.c.orig 2006-02-24 17:43:44 +0100
-+++ compat.c 2006-04-22 20:30:39 +0200
-@@ -57,19 +57,21 @@
+--- compat.c.orig 2006-04-26 01:51:12 +0200
++++ compat.c 2006-11-08 09:09:06 +0100
+@@ -54,19 +54,21 @@
rprintf(FINFO, "(%s) Protocol versions: remote=%d,
negotiated=%d\n",
am_server? "Server" : "Client", remote_protocol,
protocol_version);
}
@@ -31,9 +31,9 @@
}
if (protocol_version > PROTOCOL_VERSION) {
Index: rsync.h
---- rsync.h.orig 2006-04-13 18:53:15 +0200
-+++ rsync.h 2006-04-22 20:30:39 +0200
-@@ -85,9 +85,12 @@
+--- rsync.h.orig 2006-10-24 05:31:30 +0200
++++ rsync.h 2006-11-08 09:09:06 +0100
+@@ -86,9 +86,12 @@
* unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and
* MAX_PROTOCOL_VERSION. */
@@ -49,94 +49,3 @@
#define RSYNC_PORT 873
------------------------------------------------------------------------------
-
-Vendor patch to fix 'unexpected tag 3' errors.
-http://lists.samba.org/archive/rsync/2006-May/015607.html
-
-Index: io.c
---- io.c.orig 2006-04-21 18:40:19 +0200
-+++ io.c 2006-05-30 20:30:09 +0200
-@@ -273,10 +273,7 @@
- exit_cleanup(RERR_STREAMIO);
- }
- read_loop(fd, buf, len);
-- if (defer_forwarding_messages)
-- msg_list_add(&msg2sndr, MSG_DELETED, buf, len);
-- else
-- io_multiplex_write(MSG_DELETED, buf, len);
-+ send_msg(MSG_DELETED, buf, len);
- break;
- case MSG_SUCCESS:
- if (len != 4 || !am_generator) {
-@@ -286,10 +283,7 @@
- read_loop(fd, buf, len);
- if (remove_sent_files) {
- decrement_active_files(IVAL(buf,0));
-- if (defer_forwarding_messages)
-- msg_list_add(&msg2sndr, MSG_SUCCESS, buf, len);
-- else
-- io_multiplex_write(MSG_SUCCESS, buf, len);
-+ send_msg(MSG_SUCCESS, buf, len);
- }
- if (preserve_hard_links)
- flist_ndx_push(&hlink_list, IVAL(buf,0));
-@@ -309,10 +303,7 @@
- if (n >= sizeof buf)
- n = sizeof buf - 1;
- read_loop(fd, buf, n);
-- if (am_generator && am_server &&
defer_forwarding_messages)
-- msg_list_add(&msg2sndr, tag, buf, n);
-- else
-- rwrite((enum logcode)tag, buf, n);
-+ rwrite(tag, buf, n);
- len -= n;
- }
- break;
-@@ -386,14 +377,19 @@
- return 1;
- }
-
--void send_msg(enum msgcode code, char *buf, int len)
-+int send_msg(enum msgcode code, char *buf, int len)
- {
- if (msg_fd_out < 0) {
-- io_multiplex_write(code, buf, len);
-- return;
-+ if (!defer_forwarding_messages)
-+ return io_multiplex_write(code, buf, len);
-+ if (!io_multiplexing_out)
-+ return 0;
-+ msg_list_add(&msg2sndr, code, buf, len);
-+ return 1;
- }
- msg_list_add(&msg2genr, code, buf, len);
- msg2genr_flush(NORMAL_FLUSH);
-+ return 1;
- }
-
- int get_redo_num(int itemizing, enum logcode code)
-Index: log.c
---- log.c.orig 2006-04-08 18:04:34 +0200
-+++ log.c 2006-05-30 20:30:09 +0200
-@@ -264,7 +264,7 @@
-
- if (am_server) {
- /* Pass the message to the non-server side. */
-- if (io_multiplex_write((enum msgcode)code, buf, len))
-+ if (send_msg(code, buf, len))
- return;
- if (am_daemon) {
- /* TODO: can we send the error to the user somehow? */
-Index: proto.h
---- proto.h.orig 2006-04-22 17:38:34 +0200
-+++ proto.h 2006-05-30 20:30:09 +0200
-@@ -104,7 +104,7 @@
- void set_msg_fd_out(int fd);
- void increment_active_files(int ndx, int itemizing, enum logcode code);
- void decrement_active_files(int ndx);
--void send_msg(enum msgcode code, char *buf, int len);
-+int send_msg(enum msgcode code, char *buf, int len);
- int get_redo_num(int itemizing, enum logcode code);
- int get_hlink_num(void);
- void io_set_filesfrom_fds(int f_in, int f_out);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 rsync.spec
--- openpkg-src/rsync/rsync.spec 13 Oct 2006 17:33:50 -0000 1.84
+++ openpkg-src/rsync/rsync.spec 8 Nov 2006 08:36:12 -0000 1.85
@@ -32,8 +32,8 @@
Class: CORE
Group: Filesystem
License: GPL
-Version: 2.6.8
-Release: 20061013
+Version: 2.6.9
+Release: 20061108
# package options
%option with_lastmatch no
@@ -87,6 +87,7 @@
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-rsyncd-conf=%{l_prefix}/etc/rsync/rsync.conf \
--disable-debug \
--disable-locale \
@@ -99,9 +100,7 @@
%install
# perform vendor installation
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
# post-adjust vendor installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
