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:   04-Apr-2006 09:31:05
  Branch: HEAD                             Handle: 2006040408310301

  Modified files:
    openpkg-src/rsync       rsync.patch rsync.spec

  Log:
    apply a patch from the vendor mailing lists (via FreeBSD ports)

  Summary:
    Revision    Changes     Path
    1.20        +23 -2      openpkg-src/rsync/rsync.patch
    1.79        +1  -1      openpkg-src/rsync/rsync.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/rsync/rsync.patch
  ============================================================================
  $ cvs diff -u -r1.19 -r1.20 rsync.patch
  --- openpkg-src/rsync/rsync.patch     12 Mar 2006 09:09:44 -0000      1.19
  +++ openpkg-src/rsync/rsync.patch     4 Apr 2006 07:31:03 -0000       1.20
  @@ -1,6 +1,27 @@
  +Index: clientserver.c
  +--- clientserver.c.orig      2006-02-24 02:56:26 +0100
  ++++ clientserver.c   2006-04-04 09:29:20 +0200
  +@@ -733,8 +733,6 @@
  +     char *host = client_name(f_in);
  +     int i;
  + 
  +-    rprintf(FLOG, "connect from %s (%s)\n", host, addr);
  +-
  +     io_set_sock_fds(f_in, f_out);
  + 
  +     if (!lp_load(config_file, 0))
  +@@ -742,6 +740,8 @@
  + 
  +     log_init();
  + 
  ++    rprintf(FLOG, "connect from %s (%s)\n", host, addr);
  ++
  +     if (!am_server) {
  +             set_socket_options(f_in, "SO_KEEPALIVE");
  +             if (sockopts)
   Index: compat.c
   --- compat.c.orig    2006-02-24 17:43:44 +0100
  -+++ compat.c 2006-03-12 10:05:18 +0100
  ++++ compat.c 2006-04-04 09:29:20 +0200
   @@ -57,19 +57,21 @@
                rprintf(FINFO, "(%s) Protocol versions: remote=%d, 
negotiated=%d\n",
                        am_server? "Server" : "Client", remote_protocol, 
protocol_version);
  @@ -32,7 +53,7 @@
        if (protocol_version > PROTOCOL_VERSION) {
   Index: rsync.h
   --- rsync.h.orig     2006-02-27 22:11:56 +0100
  -+++ rsync.h  2006-03-12 10:05:18 +0100
  ++++ rsync.h  2006-04-04 09:29:20 +0200
   @@ -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.78 -r1.79 rsync.spec
  --- openpkg-src/rsync/rsync.spec      12 Mar 2006 09:09:44 -0000      1.78
  +++ openpkg-src/rsync/rsync.spec      4 Apr 2006 07:31:04 -0000       1.79
  @@ -33,7 +33,7 @@
   Group:        Filesystem
   License:      GPL
   Version:      2.6.7
  -Release:      20060312
  +Release:      20060404
   
   #   package options
   %option       with_lastmatch  no
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to