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                      Date:   20-Dec-2004 20:35:01
  Branch: HEAD                             Handle: 2004122019350100

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

  Log:
    backout upgrade: 1.15 doesn't unpack bzip2-1.0.2.tar.gz correctly

  Summary:
    Revision    Changes     Path
    1.7         +11 -33     openpkg-src/tar/tar.patch
    1.44        +2  -1      openpkg-src/tar/tar.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/tar/tar.patch
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 tar.patch
  --- openpkg-src/tar/tar.patch 20 Dec 2004 19:05:50 -0000      1.6
  +++ openpkg-src/tar/tar.patch 20 Dec 2004 19:35:01 -0000      1.7
  @@ -1,19 +1,19 @@
   Index: src/incremen.c
  ---- src/incremen.c.orig      2004-09-06 13:30:42 +0200
  -+++ src/incremen.c   2004-12-20 19:55:06 +0100
  +--- src/incremen.c.orig      2004-02-21 10:39:18.000000000 +0100
  ++++ src/incremen.c   2004-04-05 08:25:44.000000000 +0200
   @@ -133,6 +133,8 @@
      if (! dirp)
        {
  -       savedir_error (dir_name);
  +       savedir_error (path);
   +      errno = 1;
   +      return;
        }
      errno = 0;
    
   Index: src/utf8.c
  ---- src/utf8.c.orig  2004-10-25 16:14:53 +0200
  -+++ src/utf8.c       2004-12-20 19:54:25 +0100
  -@@ -22,6 +22,9 @@
  +--- src/utf8.c.orig  2004-04-04 11:53:30.000000000 +0200
  ++++ src/utf8.c       2004-04-06 09:42:13.000000000 +0200
  +@@ -21,6 +21,9 @@
    #include "common.h"
    #ifdef HAVE_ICONV_H
    # include <iconv.h>
  @@ -22,37 +22,15 @@
   +# define ICONV_CONST const
    #endif
    
  - #ifndef ICONV_CONST
  + struct langtab
   Index: src/xheader.c
  ---- src/xheader.c.orig       2004-09-06 13:31:14 +0200
  -+++ src/xheader.c    2004-12-20 19:54:25 +0100
  -@@ -23,6 +23,7 @@
  +--- src/xheader.c.orig       2004-04-04 11:53:30.000000000 +0200
  ++++ src/xheader.c    2004-05-14 16:17:02.000000000 +0200
  +@@ -21,6 +21,7 @@
  + #include <hash.h>
    #include <quotearg.h>
  - #include <stpcpy.h>
    #include <xstrtol.h>
   +#include <stpcpy.h>
    
    #include "common.h"
    
  -Index: rmt/rmt.c
  ---- rmt/rmt.c.orig   2004-09-06 15:49:41 +0200
  -+++ rmt/rmt.c        2004-12-20 20:01:28 +0100
  -@@ -38,6 +38,7 @@
  - 
  - #include <getopt.h>
  - #include <sys/socket.h>
  -+#include <locale.h>
  - 
  - #ifndef EXIT_FAILURE
  - # define EXIT_FAILURE 1
  -Index: src/tar.c
  ---- src/tar.c.orig   2004-12-18 21:01:07 +0100
  -+++ src/tar.c        2004-12-20 20:01:54 +0100
  -@@ -20,6 +20,7 @@
  -    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
  - 
  - #include <system.h>
  -+#include <locale.h>
  - 
  - #include <fnmatch.h>
  - #include <argp.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tar/tar.spec
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 tar.spec
  --- openpkg-src/tar/tar.spec  20 Dec 2004 19:05:50 -0000      1.43
  +++ openpkg-src/tar/tar.spec  20 Dec 2004 19:35:01 -0000      1.44
  @@ -33,7 +33,7 @@
   Class:        CORE
   Group:        Archiver
   License:      GPL
  -Version:      1.15
  +Version:      1.14
   Release:      20041220
   
   #   list of sources
  @@ -58,6 +58,7 @@
   
   %track
       prog tar = {
  +        comment   = "rse: 1.15 problematic: doesn't correctly unpack 
bzip2-1.0.2.tar.gz"
           version   = %{version}
           url       = ftp://ftp.gnu.org/gnu/tar/
           regex     = tar-(\d+\.\d+(\.\d+)?)\.tar\.gz
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to