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: 10-Jun-2006 12:05:44
Branch: HEAD Handle: 2006061011054201
Modified files:
openpkg-src/tar tar.patch tar.spec
Log:
enhance portability of security patch and this way fix building under
acient platforms (like FreeBSD 4)
Summary:
Revision Changes Path
1.12 +21 -10 openpkg-src/tar/tar.patch
1.51 +1 -1 openpkg-src/tar/tar.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tar/tar.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 tar.patch
--- openpkg-src/tar/tar.patch 5 Mar 2006 18:53:56 -0000 1.11
+++ openpkg-src/tar/tar.patch 10 Jun 2006 10:05:42 -0000 1.12
@@ -98,9 +98,20 @@
Security Fixes (CVE-2006-0300)
Index: src/xheader.c
---- src/xheader.c.orig 2006-03-05 09:35:35 +0100
-+++ src/xheader.c 2006-03-05 09:38:10 +0100
-@@ -784,6 +784,32 @@
+--- src/xheader.c.orig 2006-06-10 08:58:04 +0200
++++ src/xheader.c 2006-06-10 09:01:31 +0200
+@@ -33,6 +33,10 @@
+
+ #include <fnmatch.h>
+
++#ifndef SIZE_MAX
++# define SIZE_MAX ((size_t) -1)
++#endif
++
+ static bool xheader_protected_pattern_p (char const *pattern);
+ static bool xheader_protected_keyword_p (char const *keyword);
+ static void xheader_set_single_keyword (char *) __attribute__ ((noreturn));
+@@ -784,6 +788,32 @@
xheader_print (xhdr, keyword, sbuf);
}
@@ -133,7 +144,7 @@
static void
dummy_coder (struct tar_stat_info const *st __attribute__ ((unused)),
char const *keyword __attribute__ ((unused)),
-@@ -822,7 +848,7 @@
+@@ -822,7 +852,7 @@
gid_decoder (struct tar_stat_info *st, char const *arg)
{
uintmax_t u;
@@ -142,7 +153,7 @@
st->stat.st_gid = u;
}
-@@ -904,7 +930,7 @@
+@@ -904,7 +934,7 @@
size_decoder (struct tar_stat_info *st, char const *arg)
{
uintmax_t u;
@@ -151,7 +162,7 @@
st->archive_file_size = st->stat.st_size = u;
}
-@@ -919,7 +945,7 @@
+@@ -919,7 +949,7 @@
uid_decoder (struct tar_stat_info *st, char const *arg)
{
uintmax_t u;
@@ -160,7 +171,7 @@
st->stat.st_uid = u;
}
-@@ -947,7 +973,7 @@
+@@ -947,7 +977,7 @@
sparse_size_decoder (struct tar_stat_info *st, char const *arg)
{
uintmax_t u;
@@ -169,7 +180,7 @@
st->stat.st_size = u;
}
-@@ -963,10 +989,10 @@
+@@ -963,10 +993,10 @@
sparse_numblocks_decoder (struct tar_stat_info *st, char const *arg)
{
uintmax_t u;
@@ -182,7 +193,7 @@
st->sparse_map_avail = 0;
}
}
-@@ -983,8 +1009,14 @@
+@@ -983,8 +1013,14 @@
sparse_offset_decoder (struct tar_stat_info *st, char const *arg)
{
uintmax_t u;
@@ -198,7 +209,7 @@
}
static void
-@@ -999,15 +1031,13 @@
+@@ -999,15 +1035,13 @@
sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg)
{
uintmax_t u;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tar/tar.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 tar.spec
--- openpkg-src/tar/tar.spec 5 Mar 2006 18:53:56 -0000 1.50
+++ openpkg-src/tar/tar.spec 10 Jun 2006 10:05:43 -0000 1.51
@@ -33,7 +33,7 @@
Group: Archiver
License: GPL
Version: 1.15.1
-Release: 20060305
+Release: 20060610
# list of sources
Source0: ftp://ftp.gnu.org/gnu/tar/tar-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
