Merge V1_0_FREEZE_3 into the mainline. (Note this merge does *not*

include the doc subtree!!)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9632 dc483132-0cff-0310-8789-dd5450dbe970

12 files changed, 104 insertions, 47 deletions

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 9a3cb27f8..4c5f1c633 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 25 21:00:24 1996  Tom Yu  <tlyu@mit.edu>
+
+	* mkrel: Add support for --srconly, --doconly, --nocheckout,
+	--repository, etc.  They do the obvious things.
+
+Fri Nov 22 11:08:16 1996  Sam Hartman  <hartmans@tertius.mit.edu>
+
+	* makeshlib.sh (VERSION): Fix SunOS shared libs [226]
+
 Tue Nov 12 17:32:08 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* send-pr/send-pr.sh (MAIL_AGENT): change "[-x" to "[ -x"
diff --git a/src/util/db2/obj/ChangeLog b/src/util/db2/obj/ChangeLog
index d2c8bb808..6f09fcd60 100644
--- a/src/util/db2/obj/ChangeLog
+++ b/src/util/db2/obj/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 25 16:20:35 1996  Sam Hartman  <hartmans@mit.edu>
+
+	* Makefile.in (check): Remove install rule to fix pmake problem. [236]
+
 Wed Sep 11 18:55:38 1996  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in (memmove.o): add -DMEMMOVE to compile as memmove
diff --git a/src/util/db2/obj/Makefile.in b/src/util/db2/obj/Makefile.in
index 4445e37c6..0c022e273 100644
--- a/src/util/db2/obj/Makefile.in
+++ b/src/util/db2/obj/Makefile.in
@@ -56,10 +56,6 @@ check:: dbtest
 	TMPDIR=$(TMPDIR) $(FCTSH) $(top_srcdir)/test/run.test
 
 install::
-	cp $(LIBDB) $(libdir)
-	$(RANLIB) $(libdir)/$(LIBDB)
-	cp $(top_srcdir)/include/db.h $(includedir)
-	cp ../db-config.h $(includedir)
 
 clean::
 	rm -f $(ALL_OBJS) $(LIBDB) \
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 38d80eb7a..227dc7caf 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 18 20:37:19 1996  Ezra Peisach  <epeisach@mit.edu>
+
+	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
+
 Wed Nov 13 19:19:08 1996  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in (clean-unix): Remove shared/*.
diff --git a/src/util/et/configure.in b/src/util/et/configure.in
index 7b0cf00f7..15fd8d84d 100644
--- a/src/util/et/configure.in
+++ b/src/util/et/configure.in
@@ -25,5 +25,5 @@ AC_HEADER_STDARG
 AC_HAVE_HEADERS(stdlib.h)
 CopySrcHeader(com_err.h,$(BUILDTOP)/include)
 V5_SHARED_LIB_OBJS
-V5_MAKE_SHARED_LIB(libcom_err,0.1,[$](TOPLIBD), ../util/et)
+V5_MAKE_SHARED_LIB(libcom_err,1.0,[$](TOPLIBD), ../util/et)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/makeshlib.sh b/src/util/makeshlib.sh
index 74c73b705..a8afb3b11 100644
--- a/src/util/makeshlib.sh
+++ b/src/util/makeshlib.sh
@@ -96,15 +96,16 @@ mips-sni-sysv4)
  
 	optflags=""
 	if test "$HAVE_GCC"x = "x" ; then
-		optflags="-h $library"
+		optflags=""
+     CC=ld
 	else
 		# XXX assumes that we're either using
 		# recent gld (binutils 2.7?) or else using native ld
-		optflags="-Wl,-h -Wl,$library"
+		optflags=""
 	fi
 
 	echo ld -dp -assert pure-text $ldflags -o $library $optflags $FILES $libdirfl
-	ld -dp -assert pure-text $ldflags -o $library $optflags $FILES $libdirfl
+ld	 -dp -assert pure-text $ldflags -o $library $optflags $FILES $libdirfl
 	stat=$?
 	;;
 *-*-aix*)
diff --git a/src/util/mkrel b/src/util/mkrel
index 20b61a3af..d072dfc7f 100644
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -1,12 +1,25 @@
 #!/bin/sh
-: ${repository=/afs/athena.mit.edu/astaff/project/krbdev/.cvsroot}
-case $# in
-2);;
-*)
-	echo "usage: $0 release-tag release-dir"
+repository=/afs/athena.mit.edu/astaff/project/krbdev/.cvsroot
+dodoc=t
+dosrc=t
+checkout=t
+while test $# -gt 2; do
+	case $1 in
+	--srconly)
+		dodoc=nil;;
+	--doconly)
+		dosrc=nil;;
+	--repository)
+		shift; repository=$1;;
+	--nocheckout)
+		checkout=nil;;
+	esac
+	shift
+done
+if test $# -lt 2; then
+	echo "usage: $0 [opts] release-tag release-dir"
 	exit 1
-	;;
-esac
+fi
 
 reltag=$1
 reldir=$2
@@ -24,37 +37,48 @@ if test ! -d $reldir; then
 fi
 
 echo "Checking out krb5 with tag $reltag into directory $reldir..."
-(cd $reldir; cvs -q -d $repository export -r$reltag krb5)
+if test $checkout = t; then
+	(cd $reldir; cvs -q -d $repository export -r$reltag krb5)
+fi
 
-echo "Building autoconf..."
-(cd $reldir/src/util/autoconf
-	M4=gm4 ./configure
-	make)
+if test $dosrc = t; then
+	echo "Building autoconf..."
+	(cd $reldir/src/util/autoconf
+		M4=gm4 ./configure
+		make)
 
-echo "Creating configure scripts..."
-(cd $reldir/src; util/reconf)
+	echo "Creating configure scripts..."
+	(cd $reldir/src; util/reconf)
 
-echo "Cleaning src/util/autoconf..."
-(cd $reldir/src/util/autoconf; make distclean)
+	echo "Cleaning src/util/autoconf..."
+	(cd $reldir/src/util/autoconf; make distclean)
+fi
 
 echo "Nuking unneeded files..."
 find $reldir \( -name TODO -o -name todo -o -name .cvsignore \
 	-o -name BADSYMS -o -name .Sanitize \) -print \
 	| xargs rm -f
 
-echo "Building doc..."
-(cd $reldir/doc; make)
+if test $dodoc = t; then
+	echo "Building doc..."
+	(cd $reldir/doc; make)
+fi
 
 echo "Generating tarfiles..."
-gtar --exclude $reldir/src/lib/crypto \
-	--exclude $reldir/src/lib/des425 \
-	-zcf ${reldir}.src.tar.gz $reldir
+if test $dosrc = t; then
+	gtar --exclude $reldir/src/lib/crypto \
+		--exclude $reldir/src/lib/des425 \
+		--exclude $reldir/doc \
+		-zcf ${reldir}.src.tar.gz $reldir
 
-gtar zcf ${reldir}.crypto.tar.gz \
-	$reldir/src/lib/crypto \
-	$reldir/src/lib/des425
+	gtar zcf ${reldir}.crypto.tar.gz \
+		$reldir/src/lib/crypto \
+		$reldir/src/lib/des425
+fi
 
-gtar zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README
+if test $dodoc = t; then
+	gtar zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README
+fi
 
 ls -l ${reldir}.*.tar.gz
 
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 8816ca86b..6482c6c23 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,13 @@
+Thu Dec  5 22:43:35 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* update_utmp.c (pty_update_utmp): Apply platform specific patch
+		so that HPUX works.  (Kludge for 1.0 release) [PR#40]
+
+Fri Nov 22 11:52:52 1996  Sam Hartman  <hartmans@mit.edu>
+
+	* configure.in : Make sure time_t is define [203]
+	* update_wtmp.c (ptyint_update_wtmp): Use time_t for call to time(2). [203]
+
 Fri Nov 15 08:33:54 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* update_utmp.c (pty_update_utmp): Handle case where utmp uses
diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in
index 2394debbe..3c6386af7 100644
--- a/src/util/pty/configure.in
+++ b/src/util/pty/configure.in
@@ -50,6 +50,7 @@ dnl
 AC_SUBST(LOGINLIBS)
 dnl
 AC_TYPE_MODE_T
+AC_CHECK_TYPE(time_t, int)
 AC_FUNC_CHECK(strsave,AC_DEFINE(HAS_STRSAVE))
 AC_HAVE_FUNCS(getutent setreuid gettosbyname setsid ttyname line_push ptsname grantpt openpty logwtmp getutmpx)
 AC_CHECK_HEADERS(unistd.h stdlib.h string.h utmpx.h utmp.h sys/filio.h sys/sockio.h sys/label.h sys/tty.h ttyent.h lastlog.h sys/select.h sys/ptyvar.h)
diff --git a/src/util/pty/update_utmp.c b/src/util/pty/update_utmp.c
index 9effab134..3b1f74185 100644
--- a/src/util/pty/update_utmp.c
+++ b/src/util/pty/update_utmp.c
@@ -138,8 +138,14 @@ long pty_update_utmp (process_type, pid, username, line, host, flags)
 #ifdef UT_EXIT_STRUCTURE_DIFFER
     utx.ut_exit.ut_exit = ent.ut_exit.e_exit;
 #else
+/* KLUDGE for now; eventually this will be a feature test... See PR#[40] */
+#ifdef __hpux	
+    utx.ut_exit.__e_termination = ent.ut_exit.e_termination;
+    utx.ut_exit.__e_exit = ent.ut_exit.e_exit;
+#else
     utx.ut_exit = ent.ut_exit;
 #endif
+#endif
     utx.ut_tv.tv_sec = ent.ut_time;
     utx.ut_tv.tv_usec = 0;
 #endif
diff --git a/src/util/pty/update_wtmp.c b/src/util/pty/update_wtmp.c
index c2f9461ec..7f6890230 100644
--- a/src/util/pty/update_wtmp.c
+++ b/src/util/pty/update_wtmp.c
@@ -40,6 +40,7 @@ long ptyint_update_wtmp (ent , host, user)
     struct utmp ut;
     struct stat statb;
     int fd;
+    time_t uttime;
 #ifdef HAVE_UPDWTMPX
     struct utmpx utx;
 
@@ -71,7 +72,8 @@ long ptyint_update_wtmp (ent , host, user)
 #ifndef NO_UT_HOST
 	  (void)strncpy(ut.ut_host, ent->ut_host, sizeof(ut.ut_host));
 #endif
-	  (void)time(&ut.ut_time);
+	  (void)time(&uttime);
+	  ut.ut_time = uttime;
 #if defined(HAVE_GETUTENT) && defined(USER_PROCESS)
 	  if (ent->ut_name) {
 	    if (!ut.ut_pid)
diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in
index c2fc7eb49..82e6c79a2 100644
--- a/src/util/send-pr/Makefile.in
+++ b/src/util/send-pr/Makefile.in
@@ -1,4 +1,4 @@
-#
+#l
 # Makefile for building a standalone send-pr.
 #
 RELEASE=1.0
@@ -24,19 +24,19 @@ install-sid: install-sid.sh
 	sed -e 's,@ADMIN_BINDIR@,$(ADMIN_BINDIR),g' $(srcdir)/install-sid.sh > install-sid
 
 install:: all
-	if [ -d $(prefix) ]; then true ; else mkdir $(prefix) ; fi
-	if [ -d $(ADMIN_BINDIR) ]; then true ; else mkdir $(ADMIN_BINDIR) ; fi
-	cp send-pr $(ADMIN_BINDIR)/$(sendprname)
-	chmod 755 $(ADMIN_BINDIR)/$(sendprname)
-	if [ -d $(datadir) ] ; then true ; else mkdir $(datadir) ; fi
-	if [ -d $(datadir)/gnats ] ; then true ; else mkdir $(datadir)/gnats ; fi
-	cp $(srcdir)/categories $(datadir)/gnats/mit
-	chmod 644 $(datadir)/gnats/mit
-	-parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
+	if [ -d $(DESTDIR)$(prefix) ]; then true ; else mkdir $(DESTDIR)$(prefix) ; fi
+	if [ -d $(DESTDIR)$(ADMIN_BINDIR) ]; then true ; else mkdir $(DESTDIR)$(ADMIN_BINDIR) ; fi
+	cp send-pr $(DESTDIR)$(ADMIN_BINDIR)/$(sendprname)
+	chmod 755 $(DESTDIR)$(ADMIN_BINDIR)/$(sendprname)
+	if [ -d $(DESTDIR)$(datadir) ] ; then true ; else mkdir $(DESTDIR)$(datadir) ; fi
+	if [ -d $(DESTDIR)$(datadir)/gnats ] ; then true ; else mkdir $(DESTDIR)$(datadir)/gnats ; fi
+	cp $(srcdir)/categories $(DESTDIR)$(datadir)/gnats/mit
+	chmod 644 $(DESTDIR)$(datadir)/gnats/mit
+	-parent=`echo $(DESTDIR)$(man1dir)|sed -e 's@/[^/]*$$@@'`; \
 	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
-	if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi
-	cp $(srcdir)/send-pr.1 $(man1dir)/$(sendprname).1
-	chmod 644 $(man1dir)/$(sendprname).1
+	if [ -d $(DESTDIR)$(man1dir) ] ; then true ; else mkdir $(DESTDIR)$(man1dir) ; fi
+	cp $(srcdir)/send-pr.1 $(DESTDIR)$(man1dir)/$(sendprname).1
+	chmod 644 $(DESTDIR)$(man1dir)/$(sendprname).1
 
 clean::
 	rm -f install-sid send-pr send-pr.el*