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: 17-Oct-2007 09:01:35 Branch: HEAD Handle: 2007101708013400 Modified files: openpkg-src/openpkg HISTORY openpkg.spec openssl.patch tar.patch Log: try to port Tar and OpenSSL to AIX 5 and Solaris 8 again Summary: Revision Changes Path 1.480 +1 -0 openpkg-src/openpkg/HISTORY 1.616 +1 -1 openpkg-src/openpkg/openpkg.spec 1.10 +14 -0 openpkg-src/openpkg/openssl.patch 1.11 +22 -8 openpkg-src/openpkg/tar.patch ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY ============================================================================ $ cvs diff -u -r1.479 -r1.480 HISTORY --- openpkg-src/openpkg/HISTORY 15 Oct 2007 11:39:31 -0000 1.479 +++ openpkg-src/openpkg/HISTORY 17 Oct 2007 07:01:34 -0000 1.480 @@ -2,6 +2,7 @@ 2007 ==== +20071017 try to port Tar and OpenSSL to AIX 5 and Solaris 8 again 20071015 avoid calling of autoconf while building GNU bash 20071014 fix OpenSSL patch (some important portability related hunks were lost) 20071011 upgrade to OpenSSL 0.9.8f @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec ============================================================================ $ cvs diff -u -r1.615 -r1.616 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 15 Oct 2007 11:39:32 -0000 1.615 +++ openpkg-src/openpkg/openpkg.spec 17 Oct 2007 07:01:34 -0000 1.616 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20071015 +%define V_openpkg 20071017 # the used software versions %define V_rpm 4.2.1 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openssl.patch ============================================================================ $ cvs diff -u -r1.9 -r1.10 openssl.patch --- openpkg-src/openpkg/openssl.patch 14 Oct 2007 07:43:03 -0000 1.9 +++ openpkg-src/openpkg/openssl.patch 17 Oct 2007 07:01:34 -0000 1.10 @@ -77,6 +77,20 @@ my $cflags = $fields[$idx_cflags]; my $unistd = $fields[$idx_unistd]; my $thread_cflag = $fields[$idx_thread_cflag]; +Index: Configure +--- Configure.orig 2007-10-17 08:55:51 +0200 ++++ Configure 2007-10-17 08:56:05 +0200 +@@ -402,8 +402,8 @@ + + #### IBM's AIX. + "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::RC4_CHAR:::", +-"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", +-"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64", ++"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::", ++"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::", + # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE + # at build time. $OBJECT_MODE is respected at ./config stage! + "aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", Index: config --- config.orig 2007-08-01 13:21:35 +0200 +++ config 2007-10-11 22:45:07 +0200 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/tar.patch ============================================================================ $ cvs diff -u -r1.10 -r1.11 tar.patch --- openpkg-src/openpkg/tar.patch 10 Oct 2007 16:06:06 -0000 1.10 +++ openpkg-src/openpkg/tar.patch 17 Oct 2007 07:01:34 -0000 1.11 @@ -1,6 +1,6 @@ Index: Makefile.in --- Makefile.in.orig 2007-10-10 13:00:22 +0200 -+++ Makefile.in 2007-10-10 17:01:10 +0200 ++++ Makefile.in 2007-10-17 08:40:12 +0200 @@ -485,7 +485,7 @@ target_alias = @target_alias@ ACLOCAL_AMFLAGS = -I m4 @@ -12,7 +12,7 @@ Index: lib/argp-help.c --- lib/argp-help.c.orig 2007-09-28 15:11:36 +0200 -+++ lib/argp-help.c 2007-10-10 17:01:10 +0200 ++++ lib/argp-help.c 2007-10-17 08:40:12 +0200 @@ -570,8 +570,7 @@ return val; } @@ -23,9 +23,23 @@ hol_entry_long_iterate (const struct hol_entry *entry, int (*func)(const struct argp_option *opt, const struct argp_option *real, +Index: lib/system.h +--- lib/system.h.orig 2007-06-27 15:49:45 +0200 ++++ lib/system.h 2007-10-17 08:43:09 +0200 +@@ -417,6 +417,10 @@ + + #include <limits.h> + ++#ifndef CHAR_BIT ++# define CHAR_BIT 8 ++#endif ++ + #ifndef MB_LEN_MAX + # define MB_LEN_MAX 1 + #endif Index: src/compare.c --- src/compare.c.orig 2007-08-26 10:56:55 +0200 -+++ src/compare.c 2007-10-10 17:01:10 +0200 ++++ src/compare.c 2007-10-17 08:40:12 +0200 @@ -278,7 +278,7 @@ size_t len = strlen (current_stat_info.link_name); char *linkbuf = alloca (len + 1); @@ -37,7 +51,7 @@ { Index: src/create.c --- src/create.c.orig 2007-10-05 19:46:49 +0200 -+++ src/create.c 2007-10-10 17:01:10 +0200 ++++ src/create.c 2007-10-17 08:40:12 +0200 @@ -1696,7 +1696,7 @@ if (linklen != st->stat.st_size || linklen + 1 == 0) xalloc_die (); @@ -49,7 +63,7 @@ readlink_diag (p); Index: src/incremen.c --- src/incremen.c.orig 2007-10-01 23:19:55 +0200 -+++ src/incremen.c 2007-10-10 17:01:10 +0200 ++++ src/incremen.c 2007-10-17 08:40:12 +0200 @@ -526,6 +526,7 @@ children = CHANGED_CHILDREN; but changed to: */ @@ -60,7 +74,7 @@ } Index: src/tar.c --- src/tar.c.orig 2007-09-26 23:36:58 +0200 -+++ src/tar.c 2007-10-10 17:01:10 +0200 ++++ src/tar.c 2007-10-17 08:40:12 +0200 @@ -20,6 +20,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @@ -71,7 +85,7 @@ #include <argp.h> Index: src/utf8.c --- src/utf8.c.orig 2007-06-27 15:30:32 +0200 -+++ src/utf8.c 2007-10-10 17:01:10 +0200 ++++ src/utf8.c 2007-10-17 08:40:12 +0200 @@ -22,6 +22,9 @@ #include "common.h" #ifdef HAVE_ICONV_H @@ -84,7 +98,7 @@ #ifndef ICONV_CONST Index: src/xheader.c --- src/xheader.c.orig 2007-06-27 15:30:32 +0200 -+++ src/xheader.c 2007-10-10 17:01:10 +0200 ++++ src/xheader.c 2007-10-17 08:40:12 +0200 @@ -27,6 +27,10 @@ #include <fnmatch.h> @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org