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: 22-Oct-2006 13:13:36
Branch: OPENPKG_2_STABLE Handle: 2006102212133500
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg HISTORY openpkg.spec tar.patch
Log:
MFC: latest changes
Summary:
Revision Changes Path
1.337.2.11 +5 -1 openpkg-src/openpkg/HISTORY
1.490.2.11 +4 -3 openpkg-src/openpkg/openpkg.spec
1.5.8.1 +88 -76 openpkg-src/openpkg/tar.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.337.2.10 -r1.337.2.11 HISTORY
--- openpkg-src/openpkg/HISTORY 16 Oct 2006 14:53:34 -0000
1.337.2.10
+++ openpkg-src/openpkg/HISTORY 22 Oct 2006 11:13:35 -0000
1.337.2.11
@@ -2,8 +2,12 @@
2006
====
+20061022 upgrade to GNU tar 1.16
+20061022 fix License header of "openpkg" package
+
+20061018 **** RELEASE AS PART OF OPENPKG 2.20061018 ***
20061016 upgrade to openpkg-tools 1.0.0 with no functional change to 0.8.80
-20060808 upgrade to openpkg-registry 1.0.0 with no functional change to 0.7.2
+20061008 upgrade to openpkg-registry 1.0.0 with no functional change to 0.7.2
20061016 upgrade to openpkg-tools 0.8.80
20061013 allow %{l_cc} and %{l_cxx} to be set in ~/.rpmmacros to values
containing spaces
20061013 new world order for "Packager" and "Distribution" headers
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.490.2.10 -r1.490.2.11 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 16 Oct 2006 14:53:35 -0000
1.490.2.10
+++ openpkg-src/openpkg/openpkg.spec 22 Oct 2006 11:13:35 -0000
1.490.2.11
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.20061018
+%define V_openpkg 2.20061022
# the used software versions
%define V_rpm 4.2.1
@@ -50,7 +50,7 @@
%define V_make 3.81
%define V_gzip 1.3.5
%define V_patch 2.5.9
-%define V_tar 1.15.1
+%define V_tar 1.16
%define V_bash 3.2
%define V_uuid 1.5.1
%define V_config 20060923
@@ -68,7 +68,7 @@
Distribution: OpenPKG Community
Class: CORE
Group: Bootstrapping
-License: GPL
+License: MIT/BSD/LGPL/GPL
Version: %{V_openpkg}
Release: %{V_openpkg}
@@ -557,6 +557,7 @@
-e 's;^rm conftest\.sed;rm -f conftest.sed;' \
configure
CC="${l_cc}" \
+ GREP="grep" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/tar.patch
============================================================================
$ cvs diff -u -r1.5 -r1.5.8.1 tar.patch
--- openpkg-src/openpkg/tar.patch 31 Jan 2005 20:45:06 -0000 1.5
+++ openpkg-src/openpkg/tar.patch 22 Oct 2006 11:13:35 -0000 1.5.8.1
@@ -1,18 +1,85 @@
-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
-@@ -133,6 +133,8 @@
- if (! dirp)
+Index: lib/argp-help.c
+--- lib/argp-help.c.orig 2006-09-12 10:59:04 +0200
++++ lib/argp-help.c 2006-10-22 11:35:12 +0200
+@@ -567,8 +567,7 @@
+ return val;
+ }
+
+-static inline int
+-__attribute__ ((always_inline))
++static int
+ hol_entry_long_iterate (const struct hol_entry *entry,
+ int (*func)(const struct argp_option *opt,
+ const struct argp_option *real,
+@@ -592,7 +591,7 @@
+ }
+
+ /* Iterator that returns true for the first short option. */
+-static inline int
++static int
+ until_short (const struct argp_option *opt, const struct argp_option *real,
+ const char *domain, void *cookie)
+ {
+Index: rmt/rmt.c
+--- rmt/rmt.c.orig 2006-09-27 10:54:46 +0200
++++ rmt/rmt.c 2006-10-22 11:35:12 +0200
+@@ -43,6 +43,7 @@
+ #include <obstack.h>
+ #include <getopt.h>
+ #include <sys/socket.h>
++#include <locale.h>
+
+ #ifndef EXIT_FAILURE
+ # define EXIT_FAILURE 1
+Index: src/compare.c
+--- src/compare.c.orig 2006-03-20 10:23:29 +0100
++++ src/compare.c 2006-10-22 11:36:29 +0200
+@@ -295,7 +295,7 @@
+ size_t len = strlen (current_stat_info.link_name);
+ char *linkbuf = alloca (len + 1);
+
+- int status = readlink (current_stat_info.file_name, linkbuf, len + 1);
++ int status = readlink (current_stat_info.file_name, linkbuf, len);
+
+ if (status < 0)
{
- savedir_error (dir_name);
-+ errno = 1;
-+ return;
+Index: src/create.c
+--- src/create.c.orig 2006-10-16 08:33:55 +0200
++++ src/create.c 2006-10-22 11:36:18 +0200
+@@ -1600,7 +1600,7 @@
+ if (linklen != st->stat.st_size || linklen + 1 == 0)
+ xalloc_die ();
+ buffer = (char *) alloca (linklen + 1);
+- size = readlink (p, buffer, linklen + 1);
++ size = readlink (p, buffer, linklen);
+ if (size < 0)
+ {
+ readlink_diag (p);
+Index: src/incremen.c
+--- src/incremen.c.orig 2006-09-08 18:42:18 +0200
++++ src/incremen.c 2006-10-22 11:43:46 +0200
+@@ -479,6 +479,7 @@
+ children = CHANGED_CHILDREN;
+ but changed to: */
+ free (name_buffer);
++ if (dirp)
+ free (dirp);
+ return NULL;
}
- errno = 0;
+Index: src/tar.c
+--- src/tar.c.orig 2006-10-17 10:11:31 +0200
++++ src/tar.c 2006-10-22 11:35:12 +0200
+@@ -20,6 +20,7 @@
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ #include <system.h>
++#include <locale.h>
+
+ #include <fnmatch.h>
+ #include <getline.h>
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
+--- src/utf8.c.orig 2005-05-18 14:23:49 +0200
++++ src/utf8.c 2006-10-22 11:35:12 +0200
@@ -22,6 +22,9 @@
#include "common.h"
#ifdef HAVE_ICONV_H
@@ -24,71 +91,16 @@
#ifndef ICONV_CONST
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 @@
- #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-21 15:11:26 +0100
-+++ src/tar.c 2005-01-31 21:34:57 +0100
-@@ -20,6 +20,7 @@
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
- #include <system.h>
-+#include <locale.h>
+--- src/xheader.c.orig 2006-10-22 11:35:12 +0200
++++ src/xheader.c 2006-10-22 11:40:55 +0200
+@@ -28,6 +28,10 @@
#include <fnmatch.h>
- #include <argp.h>
-@@ -617,9 +618,9 @@
-
- switch (key)
- {
-- case 1:
-+ case ARGP_KEY_ARG:
- /* File name or non-parsed option, because of ARGP_IN_ORDER */
-- name_add (optarg);
-+ name_add (arg);
- args->input_files++;
- break;
-
-Index: src/compare.c
---- src/compare.c.orig 2004-09-06 13:30:29 +0200
-+++ src/compare.c 2005-01-31 21:34:57 +0100
-@@ -327,7 +327,7 @@
- size_t len = strlen (current_stat_info.link_name);
- char *linkbuf = alloca (len + 1);
-- status = readlink (current_stat_info.file_name, linkbuf, len + 1);
-+ status = readlink (current_stat_info.file_name, linkbuf, len);
-
- if (status < 0)
- {
-Index: src/create.c
---- src/create.c.orig 2004-10-04 11:21:31 +0200
-+++ src/create.c 2005-01-31 21:34:57 +0100
-@@ -1482,7 +1482,7 @@
- if (linklen != st->stat.st_size || linklen + 1 == 0)
- xalloc_die ();
- buffer = (char *) alloca (linklen + 1);
-- size = readlink (p, buffer, linklen + 1);
-+ size = readlink (p, buffer, linklen);
- if (size < 0)
- {
- readlink_diag (p);
++#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));
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
