Solaris: use getpassphrase rather than getpass if available.

CVS patchset: 3266
CVS date: 1999/09/07 22:46:19

diff --git a/CHANGES b/CHANGES
index 9afa393..2b10b4a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -44,6 +44,7 @@
        - suggested changes to docs from Ken Estes (#4451).
        - link libbz2.a statically to avoid rpm->bzip2 dependence for now.
        - Tru64: avoid find-requires variable size limit (Tim Mooney).
+       - Solaris: use getpassphrase rather than getpass if available.
 
 3.0.1 -> 3.0.2
        - eliminate armv4 entries from rpmrc (Andrew E. Mileski).

diff --git a/configure.in b/configure.in
index 05d147b..5a4cdfb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -590,7 +590,7 @@ dnl XXX AC_FUNC_STRCOLL
 dnl XXX AC_FUNC_STRFTIME
 dnl XXX AC_FUNC_UTIME_NULL
 dnl XXX AC_FUNC_VFORK
-dnl XXX AC_CHECK_FUNCS(gethostname lchown mkdir mkfifo rmdir select uname)
+dnl XXX AC_CHECK_FUNCS(gethostname mkdir mkfifo rmdir select uname)
 
 AC_REPLACE_FUNCS(getcwd getwd glob inet_aton putenv realpath)
 AC_REPLACE_FUNCS(strdup strerror strtol strtoul strspn strstr)
@@ -601,16 +601,18 @@ AC_REPLACE_FUNCS(basename)
 
 AC_CHECK_FUNCS(setlocale)
 
+dnl XXX Solaris <= 2.6 only permits 8 chars in password.
+AC_CHECK_FUNCS(getpassphrase)
+
 AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT), [
   AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL),[
     AC_CHECK_FUNC(getmntinfo_r, AC_DEFINE(HAVE_GETMNTINFO_R), [
       AC_CHECK_LIB(c_r, getmntinfo_r, [LIBS="$LIBS -lc_r"; 
                                        AC_DEFINE(HAVE_GETMNTINFO_R)],
                  LIBOBJS="$LIBOBJS getmntent.o")])])])
-LCHOWN=no
-AC_CHECK_FUNC(lchown, [LCHOWN=yes; AC_DEFINE(HAVE_LCHOWN)])
 
-if test "$LCHOWN" = no; then 
+AC_CHECK_FUNC(lchown)
+if test $ac_cv_func_lchown = no; then 
     dnl Does chown() follow symlinks? This should be a good enough test.
     AC_MSG_CHECKING(whether chown() follows symlinks)
     AC_ARG_ENABLE([broken-chown],

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index d880f68..bdc4178 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -165,7 +165,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:

diff --git a/system.h b/system.h
index f799299..3d107f8 100644 (file)
--- a/system.h
+++ b/system.h
@@ -268,6 +268,11 @@ extern void *myrealloc(void *, size_t);
 #include <sys/select.h>
 #endif
 
+/* Solaris <= 2.6 limits getpass return to only 8 chars */
+#if HAVE_GETPASSPHRASE
+#define        getpass getpassphrase
+#endif
+
 #if ! HAVE_LCHOWN
 #define lchown chown
 #endif