- portabilitly: solaris fixes.

CVS patchset: 5997
CVS date: 2003/01/06 19:47:33

diff --git a/CHANGES b/CHANGES
index 62b7d89..302bdaf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -98,6 +98,7 @@
        - fix: dependency helpers now rate limited at 10ms, not 1s.
        - add per-arch canonical color, only x86_64 enabled for now.
        - file: avoid ogg/vorbis file classification problems.
+       - portabilitly: solaris fixes.
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/installplatform b/installplatform
index 724245e..c619fdb 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 DESTDIR="${DESTDIR:-/}"
 pkglibdir="${pkglibdir:-/usr/lib/rpm}"

diff --git a/rpm.spec.in b/rpm.spec.in
index 3c68575..a5cfe01 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -15,7 +15,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.51
+Release: 0.52
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -459,7 +459,10 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
-* Sun Jan  5 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.1
+* Mon Jan  6 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.52
+- portabilitly: solaris fixes.
+
+* Sun Jan  5 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.51
 - file: avoid ogg/vorbis file classification problems.
 
 * Wed Jan  1 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.49

diff --git a/rpmio/fts.c b/rpmio/fts.c
index 57522aa..571aaab 100644 (file)
--- a/rpmio/fts.c
+++ b/rpmio/fts.c
@@ -53,6 +53,12 @@ static char sccsid[] = "@(#)fts.c    8.6 (Berkeley) 8/14/94";
 #   define _STAT_VER           0
 #   define __fxstat64(_stat_ver, _fd, _sbp)    fstat((_fd), (_sbp))
 #endif
+#if defined(sun)
+#   define __errno_location()  (&errno)
+#   define dirfd(dirp)         -1
+#   define _STAT_VER           0
+#   define __fxstat64(_stat_ver, _fd, _sbp)    fstat((_fd), (_sbp))
+#endif
 #include "system.h"
 #include "fts.h"
 #include "rpmio.h"

diff --git a/rpmio/fts.h b/rpmio/fts.h
index 036059a..eae95f2 100644 (file)
--- a/rpmio/fts.h
+++ b/rpmio/fts.h
@@ -51,6 +51,10 @@
 # define       _LARGEFILE64_SOURCE
 #endif
 
+#if defined(sun)
+# define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
+#endif
+
 #endif
 
 #include <sys/types.h>

diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c
index 45ec4e4..de21d88 100644 (file)
--- a/rpmio/rpmrpc.c
+++ b/rpmio/rpmrpc.c
@@ -1286,7 +1286,7 @@ static struct dirent * ftpReaddir(DIR * dir)
     dp->d_ino = i + 1;         /* W2DO? */
     dp->d_reclen = 0;          /* W2DO? */
 
-#if !defined(hpux)
+#if !defined(hpux) && !defined(sun)
     dp->d_off = 0;             /* W2DO? */
 /*@-boundsread@*/
     dp->d_type = dt[i];