OpenPKG Specs / changeset

     1.1 --- a/openpkg/make.patch	Wed May 19 13:23:54 2010 +0200
     1.2 +++ b/openpkg/make.patch	Fri Aug 27 14:56:07 2010 +0200
     1.3 @@ -1,7 +1,8 @@
     1.4  Index: glob/glob.c
     1.5 +diff -Nau glob/glob.c.orig glob/glob.c
     1.6  --- glob/glob.c.orig	2006-03-10 03:20:45 +0100
     1.7  +++ glob/glob.c	2006-04-01 19:09:18 +0200
     1.8 -@@ -216,13 +216,13 @@
     1.9 +@@ -217,13 +217,13 @@
    1.10   #  ifdef HAVE_ALLOCA_H
    1.11   #   include <alloca.h>
    1.12   #  else	/* Not HAVE_ALLOCA_H.  */
    1.13 @@ -18,12 +19,13 @@
    1.14   # endif	/* GCC.  */
    1.15   
    1.16  Index: make.h
    1.17 +diff -Nau make.h.orig make.h
    1.18  --- make.h.orig	2006-02-16 00:54:43 +0100
    1.19  +++ make.h	2006-04-01 19:09:18 +0200
    1.20 -@@ -31,7 +31,7 @@
    1.21 - #  ifdef _AIX
    1.22 +@@ -36,7 +36,7 @@
    1.23    #pragma alloca
    1.24 - #  else
    1.25 + # else
    1.26 + #  if !defined(__GNUC__) && !defined(WINDOWS32)
    1.27  -#   ifndef alloca /* predefined by HP cc +Olibcalls */
    1.28  +#   if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */
    1.29   char *alloca ();

     2.1 --- a/openpkg/openpkg.spec	Wed May 19 13:23:54 2010 +0200
     2.2 +++ b/openpkg/openpkg.spec	Fri Aug 27 14:56:07 2010 +0200
     2.3 @@ -39,21 +39,21 @@
     2.4  #   o any cc(1)
     2.5  
     2.6  #   the package version/release
     2.7 -%define       V_openpkg  20090106
     2.8 +%define       V_openpkg  20100826
     2.9  
    2.10  #   the used software versions
    2.11  %define       V_rpm      4.2.1
    2.12 -%define       V_zlib     1.2.3
    2.13 -%define       V_bzip2    1.0.4
    2.14 +%define       V_zlib     1.2.5
    2.15 +%define       V_bzip2    1.0.5
    2.16  %define       V_beecrypt 4.1.2
    2.17 -%define       V_curl     7.17.1
    2.18 -%define       V_make     3.81
    2.19 -%define       V_gzip     1.3.12
    2.20 +%define       V_curl     7.21.1
    2.21 +%define       V_make     3.82
    2.22 +%define       V_gzip     1.4
    2.23  %define       V_gzip_r   1.13
    2.24 -%define       V_patch    2.5.9
    2.25 -%define       V_tar      1.19
    2.26 +%define       V_patch    2.6.1
    2.27 +%define       V_tar      1.23
    2.28  %define       V_bash     3.2
    2.29 -%define       V_uuid     1.6.0
    2.30 +%define       V_uuid     1.6.2
    2.31  %define       V_config   20060923
    2.32  %define       V_registry 1.1.3
    2.33  %define       V_perl     5.10.0
    2.34 @@ -75,7 +75,7 @@
    2.35  Release:      %{V_openpkg}
    2.36  
    2.37  #   list of sources
    2.38 -Source0:      ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
    2.39 +Source0:      ftp://ftp.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
    2.40  Source1:      ftp://ftp.cwru.edu/pub/bash/bash-%{V_bash}.tar.gz
    2.41  Source2:      ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz
    2.42  Source3:      ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz
    2.43 @@ -84,6 +84,7 @@
    2.44  Source6:      ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/openpkg-tools-%{V_tools}.tar.gz
    2.45  Source7:      ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}-openpkg-r%{V_gzip_r}.tar
    2.46  Source8:      ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}.tar
    2.47 +Source8:      ftp://ftp.gnu.org/gnu/gzip/gzip-%{V_gzip}.tar
    2.48  Source9:      ftp://ftp.openpkg.org/sources/CPY/openpkg/openpkg-executable-%{V_exec}.tar.gz
    2.49  Source10:     ftp://ftp.openpkg.org/sources/CPY/openpkg/rpm-%{V_rpm}.tar.gz
    2.50  Source11:     ftp://ftp.openpkg.org/sources/CPY/perl/perl-%{V_perl}-mini.tar.gz
    2.51 @@ -527,7 +528,6 @@
    2.52        case $plid in
    2.53            Darwin/* ) echo "gzip_cv_assembler=no" >>config.cache ;;
    2.54        esac
    2.55 -      sh $shtool subst -e 's/futimens/gzip_&/' gzip.c lib/utimens.[ch]
    2.56        CC="${l_cc}" \
    2.57        GREP="grep" \
    2.58        ./configure \
    2.59 @@ -563,7 +563,7 @@
    2.60            --cache-file=./config.cache \
    2.61            --disable-largefile
    2.62        ${l_make} || exit $?
    2.63 -      ( mv patch ..; ${l_make} clean || true; mv ../patch . ) || exit $?
    2.64 +      ( mv src/patch ..; ${l_make} clean || true; mv ../patch . ) || exit $?
    2.65      ) || exit $?
    2.66      l_patch="`pwd`/patch-%{V_patch}/patch"; export l_patch
    2.67      echo "l_patch=\"$l_patch\"; export l_patch" >>.buildenv

     3.1 --- a/openpkg/tar.patch	Wed May 19 13:23:54 2010 +0200
     3.2 +++ b/openpkg/tar.patch	Fri Aug 27 14:56:07 2010 +0200
     3.3 @@ -1,19 +1,19 @@
     3.4  Index: Makefile.in
     3.5 ---- Makefile.in.orig	2007-10-10 13:00:22 +0200
     3.6 -+++ Makefile.in	2007-10-17 08:40:12 +0200
     3.7 -@@ -485,7 +485,7 @@
     3.8 - target_alias = @target_alias@
     3.9 +--- Makefile.in.orig	2010-03-10 11:52:09.000000000 +0100
    3.10 ++++ Makefile.in	2010-03-10 18:28:13.000000000 +0100
    3.11 +@@ -899,7 +899,7 @@
    3.12 + top_srcdir = @top_srcdir@
    3.13   ACLOCAL_AMFLAGS = -I m4
    3.14 - EXTRA_DIST = ChangeLog.1 PORTS
    3.15 --SUBDIRS = doc lib rmt src scripts po tests
    3.16 -+SUBDIRS = doc lib src
    3.17 - all: config.h
    3.18 - 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
    3.19 - 
    3.20 -Index: lib/argp-help.c
    3.21 ---- lib/argp-help.c.orig	2007-09-28 15:11:36 +0200
    3.22 -+++ lib/argp-help.c	2007-10-17 08:40:12 +0200
    3.23 -@@ -570,8 +570,7 @@
    3.24 + EXTRA_DIST = ChangeLog.1 Make.rules
    3.25 +-SUBDIRS = doc gnu lib rmt src scripts po tests
    3.26 ++SUBDIRS = doc gnu lib src
    3.27 + gen_start_date = 2009-03-06
    3.28 + prev_change_log = ChangeLog.CVS
    3.29 + changelog_dir = .
    3.30 +Index: gnu/argp-help.c
    3.31 +--- gnu/argp-help.c.orig	2010-03-10 11:50:33.000000000 +0100
    3.32 ++++ gnu/argp-help.c	2010-03-10 18:26:15.000000000 +0100
    3.33 +@@ -571,8 +571,7 @@
    3.34     return val;
    3.35   }
    3.36   
    3.37 @@ -21,12 +21,23 @@
    3.38  -__attribute__ ((always_inline))
    3.39  +static int
    3.40   hol_entry_long_iterate (const struct hol_entry *entry,
    3.41 - 			int (*func)(const struct argp_option *opt,
    3.42 - 				    const struct argp_option *real,
    3.43 +                         int (*func)(const struct argp_option *opt,
    3.44 +                                     const struct argp_option *real,
    3.45 +Index: gnu/strerror.c
    3.46 +--- gnu/strerror.c.orig	2010-03-10 11:50:43.000000000 +0100
    3.47 ++++ gnu/strerror.c	2010-03-10 18:26:15.000000000 +0100
    3.48 +@@ -25,6 +25,7 @@
    3.49 + 
    3.50 + # include <errno.h>
    3.51 + # include <stdio.h>
    3.52 ++# include <limits.h>
    3.53 + 
    3.54 + # if GNULIB_defined_ESOCK /* native Windows platforms */
    3.55 + #  if HAVE_WINSOCK2_H
    3.56  Index: src/compare.c
    3.57 ---- src/compare.c.orig	2007-08-26 10:56:55 +0200
    3.58 -+++ src/compare.c	2007-10-17 08:40:12 +0200
    3.59 -@@ -278,7 +278,7 @@
    3.60 +--- src/compare.c.orig	2010-01-26 12:28:09.000000000 +0100
    3.61 ++++ src/compare.c	2010-03-10 18:26:15.000000000 +0100
    3.62 +@@ -277,7 +277,7 @@
    3.63     size_t len = strlen (current_stat_info.link_name);
    3.64     char *linkbuf = alloca (len + 1);
    3.65   
    3.66 @@ -36,9 +47,9 @@
    3.67     if (status < 0)
    3.68       {
    3.69  Index: src/create.c
    3.70 ---- src/create.c.orig	2007-10-05 19:46:49 +0200
    3.71 -+++ src/create.c	2007-10-17 08:40:12 +0200
    3.72 -@@ -1696,7 +1696,7 @@
    3.73 +--- src/create.c.orig	2010-03-09 13:52:41.000000000 +0100
    3.74 ++++ src/create.c	2010-03-10 18:26:15.000000000 +0100
    3.75 +@@ -1690,7 +1690,7 @@
    3.76         if (linklen != st->stat.st_size || linklen + 1 == 0)
    3.77   	xalloc_die ();
    3.78         buffer = (char *) alloca (linklen + 1);
    3.79 @@ -46,21 +57,10 @@
    3.80  +      size = readlink (p, buffer, linklen);
    3.81         if (size < 0)
    3.82   	{
    3.83 - 	  readlink_diag (p);
    3.84 -Index: src/incremen.c
    3.85 ---- src/incremen.c.orig	2007-10-01 23:19:55 +0200
    3.86 -+++ src/incremen.c	2007-10-17 08:40:12 +0200
    3.87 -@@ -526,6 +526,7 @@
    3.88 -            children = CHANGED_CHILDREN;
    3.89 - 	 but changed to: */
    3.90 -       free (name_buffer);
    3.91 -+      if (dirp)
    3.92 -       free (dirp);
    3.93 -       return NULL;
    3.94 -     }
    3.95 + 	  file_removed_diag (p, top_level, readlink_diag);
    3.96  Index: src/tar.c
    3.97 ---- src/tar.c.orig	2007-09-26 23:36:58 +0200
    3.98 -+++ src/tar.c	2007-10-17 08:40:12 +0200
    3.99 +--- src/tar.c.orig	2010-03-09 13:52:41.000000000 +0100
   3.100 ++++ src/tar.c	2010-03-10 18:26:15.000000000 +0100
   3.101  @@ -20,6 +20,7 @@
   3.102      51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
   3.103   
   3.104 @@ -70,8 +70,8 @@
   3.105   #include <fnmatch.h>
   3.106   #include <argp.h>
   3.107  Index: src/utf8.c
   3.108 ---- src/utf8.c.orig	2007-06-27 15:30:32 +0200
   3.109 -+++ src/utf8.c	2007-10-17 08:40:12 +0200
   3.110 +--- src/utf8.c.orig	2010-01-26 12:30:20.000000000 +0100
   3.111 ++++ src/utf8.c	2010-03-10 18:26:15.000000000 +0100
   3.112  @@ -22,6 +22,9 @@
   3.113   #include "common.h"
   3.114   #ifdef HAVE_ICONV_H
   3.115 @@ -83,11 +83,11 @@
   3.116   
   3.117   #ifndef ICONV_CONST
   3.118  Index: src/xheader.c
   3.119 ---- src/xheader.c.orig	2007-06-27 15:30:32 +0200
   3.120 -+++ src/xheader.c	2007-10-17 08:40:12 +0200
   3.121 -@@ -27,6 +27,10 @@
   3.122 +--- src/xheader.c.orig	2010-02-12 11:03:09.000000000 +0100
   3.123 ++++ src/xheader.c	2010-03-10 18:26:15.000000000 +0100
   3.124 +@@ -26,6 +26,10 @@
   3.125   
   3.126 - #include <fnmatch.h>
   3.127 + #include "common.h"
   3.128   
   3.129  +#ifndef SIZE_MAX
   3.130  +# define SIZE_MAX ((size_t) -1)
   3.131 @@ -96,14 +96,3 @@
   3.132   static bool xheader_protected_pattern_p (char const *pattern);
   3.133   static bool xheader_protected_keyword_p (char const *keyword);
   3.134   static void xheader_set_single_keyword (char *) __attribute__ ((noreturn));
   3.135 -Index: lib/strerror.c
   3.136 ---- lib/strerror.c.orig	2007-09-28 15:11:37 +0200
   3.137 -+++ lib/strerror.c	2007-10-18 00:55:28 +0200
   3.138 -@@ -23,6 +23,7 @@
   3.139 - 
   3.140 - # include <string.h>
   3.141 - # include <stdio.h>
   3.142 -+# include <limits.h>
   3.143 - 
   3.144 - # undef strerror
   3.145 -