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 openpkg-web          Date:   16-Dec-2003 20:21:15
  Branch: OPENPKG_1_3_SOLID HEAD           Handle: 2003121619211302

  Added files:              (Branch: OPENPKG_1_3_SOLID)
    openpkg-src/lftp        lftp.patch
  Modified files:
    openpkg-web             news.txt
  Modified files:           (Branch: OPENPKG_1_3_SOLID)
    openpkg-src/lftp        lftp.spec

  Log:
    modifying package: lftp-2.6.6 1.3.0 -> 1.3.1

  Summary:
    Revision    Changes     Path
    1.1.2.1.2.1 +42 -0      openpkg-src/lftp/lftp.patch
    1.39.2.2.2.2+3  -1      openpkg-src/lftp/lftp.spec
    1.7781      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/lftp/lftp.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1.2.1.2.1 lftp.patch
  --- /dev/null 2003-12-16 20:21:15.000000000 +0100
  +++ lftp.patch        2003-12-16 20:21:15.000000000 +0100
  @@ -0,0 +1,42 @@
  +Index: src/Http.cc
  +--- src/Http.cc.orig 2003-05-28 14:39:23.000000000 +0200
  ++++ src/Http.cc      2003-12-16 20:09:13.000000000 +0100
  +@@ -1077,7 +1077,7 @@
  +      const char *eol=find_eol(buf,len,&eol_size);
  +      if(eol)
  +      {
  +-        if(eol==buf)
  ++        if((eol==buf) && status)
  +         {
  +            DebugPrint("<--- ","",4);
  +            recv_buf->Skip(eol_size);
  +Index: src/HttpDir.cc
  +--- src/HttpDir.cc.orig      2003-04-15 13:26:32.000000000 +0200
  ++++ src/HttpDir.cc   2003-12-16 20:05:16.000000000 +0100
  +@@ -195,7 +195,7 @@
  +    if(real_eol>buf && real_eol[-1]=='\r')
  +    {
  +       real_eol--;
  +-      *eol_size++;
  ++      (*eol_size)++;
  +    }
  +    return real_eol;
  + }
  +@@ -354,7 +354,7 @@
  +       debug("Netscape-Proxy 2.53 listing matched");
  +       return true;
  +    }
  +-   n=sscanf(str,"%3s %3s %d %2d:%2d:%2d %4d %s",
  ++   n=sscanf(str,"%3s %3s %d %2d:%2d:%2d %4d %30s",
  +         week_day,info.month_name,&info.day,
  +         &info.hour,&info.minute,&info.second,&info.year,info.size_str);
  +    if(n==7 || (n==8 && !is_ascii_digit(info.size_str[0])))
  +@@ -372,7 +372,7 @@
  +    info.clear();
  + 
  +    char week_day[4];
  +-   int n=sscanf(str,"%3s %3s %d %2d:%2d:%2d %4d %s",
  ++   int n=sscanf(str,"%3s %3s %d %2d:%2d:%2d %4d %30s",
  +         week_day,info.month_name,&info.day,
  +         &info.hour,&info.minute,&info.second,&info.year,info.size_str);
  +    if(n==8) // maybe squid's EPLF listing.
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lftp/lftp.spec
  ============================================================================
  $ cvs diff -u -r1.39.2.2.2.1 -r1.39.2.2.2.2 lftp.spec
  --- openpkg-src/lftp/lftp.spec        29 Jul 2003 14:59:34 -0000      1.39.2.2.2.1
  +++ openpkg-src/lftp/lftp.spec        16 Dec 2003 19:21:15 -0000      1.39.2.2.2.2
  @@ -33,10 +33,11 @@
   Group:        FTP
   License:      GPL
   Version:      2.6.6
  -Release:      1.3.0
  +Release:      1.3.1
   
   #   list of sources
   Source0:      
http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2
  +Patch0:       lftp.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -51,6 +52,7 @@
   
   %prep
       %setup -q
  +    %patch -p0
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7780 -r1.7781 news.txt
  --- openpkg-web/news.txt      16 Dec 2003 17:06:19 -0000      1.7780
  +++ openpkg-web/news.txt      16 Dec 2003 19:21:13 -0000      1.7781
  @@ -1,3 +1,4 @@
  +16-Dec-2003: Upgraded package: P<lftp-2.6.6-1.3.1>
   16-Dec-2003: Upgraded package: P<ripe-dbase-3.2.0-20031216>
   16-Dec-2003: New package: P<radiator-3.7.1-20031216>
   16-Dec-2003: Upgraded package: P<grepmail-5.22-20031216>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to