# HG changeset patch # User Michael Schloh von Bennewitz # Date 1282913767 -7200 # Node ID bda4f5eec616fcb6bd66578e590370b883b51639 # Parent e56c070371626add8a436b2846a290ed79ec8ce4 Update make, tar, patch, curl, uuid, zlib, gzip, and bzip2 to current versions. diff -r e56c07037162 -r bda4f5eec616 openpkg/make.patch --- a/openpkg/make.patch Wed May 19 13:23:54 2010 +0200 +++ b/openpkg/make.patch Fri Aug 27 14:56:07 2010 +0200 @@ -1,7 +1,8 @@ Index: glob/glob.c +diff -Nau glob/glob.c.orig glob/glob.c --- glob/glob.c.orig 2006-03-10 03:20:45 +0100 +++ glob/glob.c 2006-04-01 19:09:18 +0200 -@@ -216,13 +216,13 @@ +@@ -217,13 +217,13 @@ # ifdef HAVE_ALLOCA_H # include # else /* Not HAVE_ALLOCA_H. */ @@ -18,12 +19,13 @@ # endif /* GCC. */ Index: make.h +diff -Nau make.h.orig make.h --- make.h.orig 2006-02-16 00:54:43 +0100 +++ make.h 2006-04-01 19:09:18 +0200 -@@ -31,7 +31,7 @@ - # ifdef _AIX +@@ -36,7 +36,7 @@ #pragma alloca - # else + # else + # if !defined(__GNUC__) && !defined(WINDOWS32) -# ifndef alloca /* predefined by HP cc +Olibcalls */ +# if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */ char *alloca (); diff -r e56c07037162 -r bda4f5eec616 openpkg/openpkg.spec --- a/openpkg/openpkg.spec Wed May 19 13:23:54 2010 +0200 +++ b/openpkg/openpkg.spec Fri Aug 27 14:56:07 2010 +0200 @@ -39,21 +39,21 @@ # o any cc(1) # the package version/release -%define V_openpkg 20090106 +%define V_openpkg 20100826 # the used software versions %define V_rpm 4.2.1 -%define V_zlib 1.2.3 -%define V_bzip2 1.0.4 +%define V_zlib 1.2.5 +%define V_bzip2 1.0.5 %define V_beecrypt 4.1.2 -%define V_curl 7.17.1 -%define V_make 3.81 -%define V_gzip 1.3.12 +%define V_curl 7.21.1 +%define V_make 3.82 +%define V_gzip 1.4 %define V_gzip_r 1.13 -%define V_patch 2.5.9 -%define V_tar 1.19 +%define V_patch 2.6.1 +%define V_tar 1.23 %define V_bash 3.2 -%define V_uuid 1.6.0 +%define V_uuid 1.6.2 %define V_config 20060923 %define V_registry 1.1.3 %define V_perl 5.10.0 @@ -75,7 +75,7 @@ Release: %{V_openpkg} # list of sources -Source0: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz +Source0: ftp://ftp.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz Source1: ftp://ftp.cwru.edu/pub/bash/bash-%{V_bash}.tar.gz Source2: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz Source3: ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz @@ -84,6 +84,7 @@ Source6: ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/openpkg-tools-%{V_tools}.tar.gz Source7: ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}-openpkg-r%{V_gzip_r}.tar Source8: ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}.tar +Source8: ftp://ftp.gnu.org/gnu/gzip/gzip-%{V_gzip}.tar Source9: ftp://ftp.openpkg.org/sources/CPY/openpkg/openpkg-executable-%{V_exec}.tar.gz Source10: ftp://ftp.openpkg.org/sources/CPY/openpkg/rpm-%{V_rpm}.tar.gz Source11: ftp://ftp.openpkg.org/sources/CPY/perl/perl-%{V_perl}-mini.tar.gz @@ -527,7 +528,6 @@ case $plid in Darwin/* ) echo "gzip_cv_assembler=no" >>config.cache ;; esac - sh $shtool subst -e 's/futimens/gzip_&/' gzip.c lib/utimens.[ch] CC="${l_cc}" \ GREP="grep" \ ./configure \ @@ -563,7 +563,7 @@ --cache-file=./config.cache \ --disable-largefile ${l_make} || exit $? - ( mv patch ..; ${l_make} clean || true; mv ../patch . ) || exit $? + ( mv src/patch ..; ${l_make} clean || true; mv ../patch . ) || exit $? ) || exit $? l_patch="`pwd`/patch-%{V_patch}/patch"; export l_patch echo "l_patch=\"$l_patch\"; export l_patch" >>.buildenv diff -r e56c07037162 -r bda4f5eec616 openpkg/tar.patch --- a/openpkg/tar.patch Wed May 19 13:23:54 2010 +0200 +++ b/openpkg/tar.patch Fri Aug 27 14:56:07 2010 +0200 @@ -1,19 +1,19 @@ Index: Makefile.in ---- Makefile.in.orig 2007-10-10 13:00:22 +0200 -+++ Makefile.in 2007-10-17 08:40:12 +0200 -@@ -485,7 +485,7 @@ - target_alias = @target_alias@ +--- Makefile.in.orig 2010-03-10 11:52:09.000000000 +0100 ++++ Makefile.in 2010-03-10 18:28:13.000000000 +0100 +@@ -899,7 +899,7 @@ + top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = ChangeLog.1 PORTS --SUBDIRS = doc lib rmt src scripts po tests -+SUBDIRS = doc lib src - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -Index: lib/argp-help.c ---- lib/argp-help.c.orig 2007-09-28 15:11:36 +0200 -+++ lib/argp-help.c 2007-10-17 08:40:12 +0200 -@@ -570,8 +570,7 @@ + EXTRA_DIST = ChangeLog.1 Make.rules +-SUBDIRS = doc gnu lib rmt src scripts po tests ++SUBDIRS = doc gnu lib src + gen_start_date = 2009-03-06 + prev_change_log = ChangeLog.CVS + changelog_dir = . +Index: gnu/argp-help.c +--- gnu/argp-help.c.orig 2010-03-10 11:50:33.000000000 +0100 ++++ gnu/argp-help.c 2010-03-10 18:26:15.000000000 +0100 +@@ -571,8 +571,7 @@ return val; } @@ -21,12 +21,23 @@ -__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, + int (*func)(const struct argp_option *opt, + const struct argp_option *real, +Index: gnu/strerror.c +--- gnu/strerror.c.orig 2010-03-10 11:50:43.000000000 +0100 ++++ gnu/strerror.c 2010-03-10 18:26:15.000000000 +0100 +@@ -25,6 +25,7 @@ + + # include + # include ++# include + + # if GNULIB_defined_ESOCK /* native Windows platforms */ + # if HAVE_WINSOCK2_H Index: src/compare.c ---- src/compare.c.orig 2007-08-26 10:56:55 +0200 -+++ src/compare.c 2007-10-17 08:40:12 +0200 -@@ -278,7 +278,7 @@ +--- src/compare.c.orig 2010-01-26 12:28:09.000000000 +0100 ++++ src/compare.c 2010-03-10 18:26:15.000000000 +0100 +@@ -277,7 +277,7 @@ size_t len = strlen (current_stat_info.link_name); char *linkbuf = alloca (len + 1); @@ -36,9 +47,9 @@ if (status < 0) { Index: src/create.c ---- src/create.c.orig 2007-10-05 19:46:49 +0200 -+++ src/create.c 2007-10-17 08:40:12 +0200 -@@ -1696,7 +1696,7 @@ +--- src/create.c.orig 2010-03-09 13:52:41.000000000 +0100 ++++ src/create.c 2010-03-10 18:26:15.000000000 +0100 +@@ -1690,7 +1690,7 @@ if (linklen != st->stat.st_size || linklen + 1 == 0) xalloc_die (); buffer = (char *) alloca (linklen + 1); @@ -46,21 +57,10 @@ + size = readlink (p, buffer, linklen); if (size < 0) { - readlink_diag (p); -Index: src/incremen.c ---- src/incremen.c.orig 2007-10-01 23:19:55 +0200 -+++ src/incremen.c 2007-10-17 08:40:12 +0200 -@@ -526,6 +526,7 @@ - children = CHANGED_CHILDREN; - but changed to: */ - free (name_buffer); -+ if (dirp) - free (dirp); - return NULL; - } + file_removed_diag (p, top_level, readlink_diag); Index: src/tar.c ---- src/tar.c.orig 2007-09-26 23:36:58 +0200 -+++ src/tar.c 2007-10-17 08:40:12 +0200 +--- src/tar.c.orig 2010-03-09 13:52:41.000000000 +0100 ++++ src/tar.c 2010-03-10 18:26:15.000000000 +0100 @@ -20,6 +20,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @@ -70,8 +70,8 @@ #include #include Index: src/utf8.c ---- src/utf8.c.orig 2007-06-27 15:30:32 +0200 -+++ src/utf8.c 2007-10-17 08:40:12 +0200 +--- src/utf8.c.orig 2010-01-26 12:30:20.000000000 +0100 ++++ src/utf8.c 2010-03-10 18:26:15.000000000 +0100 @@ -22,6 +22,9 @@ #include "common.h" #ifdef HAVE_ICONV_H @@ -83,11 +83,11 @@ #ifndef ICONV_CONST Index: src/xheader.c ---- src/xheader.c.orig 2007-06-27 15:30:32 +0200 -+++ src/xheader.c 2007-10-17 08:40:12 +0200 -@@ -27,6 +27,10 @@ +--- src/xheader.c.orig 2010-02-12 11:03:09.000000000 +0100 ++++ src/xheader.c 2010-03-10 18:26:15.000000000 +0100 +@@ -26,6 +26,10 @@ - #include + #include "common.h" +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) @@ -96,14 +96,3 @@ 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)); -Index: lib/strerror.c ---- lib/strerror.c.orig 2007-09-28 15:11:37 +0200 -+++ lib/strerror.c 2007-10-18 00:55:28 +0200 -@@ -23,6 +23,7 @@ - - # include - # include -+# include - - # undef strerror -