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: 06-Apr-2004 10:20:04
Branch: HEAD Handle: 2004040609200300
Added files:
openpkg-src/openpkg tar.patch
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
upgrade to GNU tar 1.13.94
Summary:
Revision Changes Path
1.155 +2 -0 openpkg-src/openpkg/HISTORY
1.310 +9 -5 openpkg-src/openpkg/openpkg.spec
1.1 +25 -0 openpkg-src/openpkg/tar.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.154 -r1.155 HISTORY
--- openpkg-src/openpkg/HISTORY 5 Apr 2004 19:56:22 -0000 1.154
+++ openpkg-src/openpkg/HISTORY 6 Apr 2004 08:20:03 -0000 1.155
@@ -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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.309 -r1.310 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Apr 2004 19:56:23 -0000 1.309
+++ openpkg-src/openpkg/openpkg.spec 6 Apr 2004 08:20:03 -0000 1.310
@@ -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 @@
Source62: man.sh
Source63: uuid.pod
Source64: uuid.8
+Source65: tar.patch
# build information
Prefix: %{l_prefix}
@@ -206,7 +207,7 @@
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 @@
( 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 @@
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 $?
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/tar.patch
============================================================================
$ cvs diff -u -r0 -r1.1 tar.patch
--- /dev/null 2004-04-06 10:20:03.000000000 +0200
+++ tar.patch 2004-04-06 10:20:03.000000000 +0200
@@ -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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
