Index: porting.h
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/porting.h,v
retrieving revision 1.24
diff -u -b -B -r1.24 porting.h
--- porting.h	18 Jan 2007 08:12:55 -0000	1.24
+++ porting.h	8 Apr 2007 17:28:00 -0000
@@ -53,7 +53,7 @@
 # include <elf-hints.h>
 # define __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG _PATH_ELF_HINTS
 #else
-# undef __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG
+# define __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG ""
 #endif
 
 /* bounds checking code will fart on free(NULL) even though that
@@ -120,6 +120,8 @@
 #  define __PAX_UTILS_BO LITTLE_ENDIAN
 # elif defined(WORDS_BIGENDIAN)
 #  define __PAX_UTILS_BO BIG_ENDIAN
+# elif defined( __sun__) && defined(i386)
+#  define __PAX_UTILS_BO LITTLE_ENDIAN
 # else
 #  error "no idea what the native byte order is"
 # endif
Index: scanelf.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v
retrieving revision 1.175
diff -u -b -B -r1.175 scanelf.c
--- scanelf.c	18 Jan 2007 08:15:16 -0000	1.175
+++ scanelf.c	8 Apr 2007 17:28:01 -0000
@@ -64,7 +64,7 @@
 static char *out_format = NULL;
 static char *search_path = NULL;
 static char fix_elf = 0;
-static char gmatch = 0;
+static char g_match = 0;
 static char use_ldcache = 0;
 
 static char **qa_textrels = NULL;
@@ -513,7 +513,7 @@
 			if (fstat(elf->fd, &st) != -1)
 				if ((st.st_mode & S_ISUID) || (st.st_mode & S_ISGID))
 					warnf("Security problem with %s='%s' in %s with mode set of %o",
-					      dt_type, item, elf->filename, st.st_mode & 07777);
+					      dt_type, item, elf->filename, (unsigned int) st.st_mode & 07777);
 			break;
 		default:
 			warnf("Maybe? sec problem with %s='%s' in %s", dt_type, item, elf->filename);
@@ -825,7 +825,7 @@
 						} \
 						*found_needed = 1; \
 					} else { \
-						if (!strncmp(find_lib, needed, strlen( !gmatch ? needed : find_lib))) { \
+						if (!strncmp(find_lib, needed, strlen( !g_match ? needed : find_lib))) { \
 							*found_lib = 1; \
 							return (be_wewy_wewy_quiet ? NULL : needed); \
 						} \
@@ -985,7 +985,7 @@
 					continue; \
 				} \
 				/* debug display ... show all symbols and some extra info */ \
-				if (gmatch ? rematch(ret, symname, REG_EXTENDED) == 0 : *ret == '*') { \
+				if (g_match ? rematch(ret, symname, REG_EXTENDED) == 0 : *ret == '*') { \
 					printf("%s(%s) %5lX %15s %s\n", \
 					       ((*found_sym == 0) ? "\n\t" : "\t"), \
 					       elf->base_filename, \
@@ -1765,7 +1765,7 @@
 					setpax = flags;
 			break;
 		}
-		case 'g': gmatch = 1; break;
+		case 'g': g_match = 1; break;
 		case 'L': use_ldcache = 1; break;
 		case 'y': scan_symlink = 0; break;
 		case 'A': scan_archives = 1; break;