فهرست منبع

upgrade to GNU tar 1.13.94

Ralf S. Engelschall 21 سال پیش
والد
کامیت
9f34c0f7b4
3فایلهای تغییر یافته به همراه36 افزوده شده و 5 حذف شده
  1. 2 0
      openpkg/HISTORY
  2. 9 5
      openpkg/openpkg.spec
  3. 25 0
      openpkg/tar.patch

+ 2 - 0
openpkg/HISTORY

@@ -2,6 +2,8 @@
 2004
 ====
 
+20040406 upgraded to GNU tar 1.13.94
+
 20040405 **** RELEASE AS PART OF OPENPKG 2.0.1 ***
 20040405 fix "openpkg man" command for embedded POD manual page rendering
 20040403 fix tracking of GNU tar

+ 9 - 5
openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040405
+%define       V_openpkg  20040406
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -50,7 +50,7 @@
 %define       V_make     3.80
 %define       V_gzip     1.3.5
 %define       V_patch    2.5.9
-%define       V_tar      1.13.25
+%define       V_tar      1.13.94
 %define       V_bash     2.05b
 %define       V_uuid     1.0.0
 
@@ -133,6 +133,7 @@ Source61:     install.sh
 Source62:     man.sh
 Source63:     uuid.pod
 Source64:     uuid.8
+Source65:     tar.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -206,7 +207,7 @@ Provides:     openpkg = 2.0.1-2.0.1
     prog openpkg:tar = {
         version   = %{V_tar}
         url       = ftp://alpha.gnu.org/gnu/tar/
-        regex     = tar-(\d+\.\d+\d\.(2\d|9[4-9]))\.tar\.gz
+        regex     = tar-(__VER__)\.tar\.gz
     }
     prog openpkg:zlib = {
         version   = %{V_zlib}
@@ -488,6 +489,9 @@ Provides:     openpkg = 2.0.1-2.0.1
     ( cd bash-%{V_bash}
       ${l_patch} -p0 <`SOURCE bash.patch`
     ) || exit $?
+    ( cd tar-%{V_tar}
+      ${l_patch} -p0 <`SOURCE tar.patch`
+    ) || exit $?
     ( cd beecrypt-%{V_beecrypt}
       ${l_patch} -p0 <`SOURCE beecrypt.patch`
     ) || exit $?
@@ -556,10 +560,10 @@ Provides:     openpkg = 2.0.1-2.0.1
       sh $shtool subst \
           -e 's;^rm conftest\.sed;rm -f conftest.sed;' \
           configure
-      CC="${l_cc}"
+      CC="${l_cc}" \
       ../bash-%{V_bash}/bash \
       ./configure \
-          --config-cache \
+          --cache-file=./config.cache \
           --prefix=%{l_prefix} \
           --disable-nls
       ${l_make} || exit $?

+ 25 - 0
openpkg/tar.patch

@@ -0,0 +1,25 @@
+Index: src/incremen.c
+--- 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 (path);
++      errno = 1;
++      return NULL;
+     }
+   errno = 0;
+ 
+Index: src/utf8.c
+--- 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>
++#else
++# define iconv_t void *
++# define ICONV_CONST const
+ #endif
+ 
+ struct langtab