From 748be02208935a5f5b121077c51a09d1d6c5d1ee Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Wed, 4 Dec 2002 04:09:56 +0000
Subject: [PATCH] Document changes and prep for new version

---
 debian/changelog               | 11 +++++++++++
 debian/control                 |  1 +
 debian/filelist                |  6 +++---
 debian/openafs-fileserver.init |  2 +-
 src/afsd/afs.conf.linux        | 19 ++++++++++++++++++-
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a55d610b0..5357c7389 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openafs (1.2.7-3) unstable; urgency=low
+
+  * Apparently OpenAFS and  ircd conflict on a UDP port, so you can't use
+    both at once, Closes: #150242
+  * Patch from seph to add -nosettime when ntp is installed, Closes: #155123
+  * Fix bosserver  shutdown on restart after upgrade, Closes :#155586
+  * Install translate_et, Closes: #138672
+  * Allow byacc instead of bison
+  
+ -- Sam Hartman <hartmans@debian.org>  Tue,  3 Dec 2002 22:30:44 -0500
+
 openafs (1.2.7-2) unstable; urgency=low
 
   * Fix uss to build with bison 1.50 and 1.75 so we can throw away the
diff --git a/debian/control b/debian/control
index 0b81a1e20..c254767c3 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Description: The AFS distributed filesystem- old password changing
 Package: openafs-fileserver
 Architecture: i386 powerpc sparc alpha s390 ia64
 Depends: ${shlibs:Depends}, debconf, openafs-client (= ${Source-Version})
+Conflicts: ircd
 Recommends: ntp
 Description: The AFS distributed filesystem- file server
  AFS is a distributed filesystem allowing cross-platform sharing of
diff --git a/debian/filelist b/debian/filelist
index bb20054da..5e0ad5915 100644
--- a/debian/filelist
+++ b/debian/filelist
@@ -1,8 +1,8 @@
 openafs-client/usr/sbin etc/fms etc/butc etc/backup
-openafs-client/usr/bin bin/fs bin/pts bin/bos etc/vos bin/tokens bin/sys
-openafs-client/usr/bin bin/udebug bin/cmdebug bin/pagsh etc/rxdebug
+openafs-client/usr/bin bin/fs bin/pts bin/bos etc/vos bin/tokens bin/sys 
+openafs-client/usr/bin bin/udebug bin/cmdebug bin/pagsh etc/rxdebug 
 openafs-client/usr/sbin root.client/usr/vice/etc/afsd
-openafs-client/usr/bin bin/klog  bin/kpwvalid bin/unlog
+openafs-client/usr/bin bin/klog  bin/kpwvalid bin/unlog bin/translate_et
 openafs-fileserver/usr/lib/openafs  root.server/usr/afs/bin/fileserver root.server/usr/afs/bin/volserver
 openafs-kpasswd/usr/bin bin/kpasswd etc/kas
 openafs-fileserver/usr/sbin	root.server/usr/afs/bin/bosserver
diff --git a/debian/openafs-fileserver.init b/debian/openafs-fileserver.init
index 8835856f8..30ff3d8a5 100755
--- a/debian/openafs-fileserver.init
+++ b/debian/openafs-fileserver.init
@@ -34,7 +34,7 @@ case "$1" in
 	echo -n "Stopping $DESC: "
     bos shutdown localhost -wait -localauth
 	start-stop-daemon --stop --quiet  \
-		--exec $DAEMON
+		--user root --name bosserver
 	echo "$NAME."
 	;;
   #reload)
diff --git a/src/afsd/afs.conf.linux b/src/afsd/afs.conf.linux
index 065ee1110..33b8d7730 100644
--- a/src/afsd/afs.conf.linux
+++ b/src/afsd/afs.conf.linux
@@ -11,6 +11,8 @@
 # AFS_CLIENT and AFS_SERVER determine if we should start the client and or
 # the bosserver. Possible values are true and false.
 # These are loaded from files written by debconf
+# AFS_NOSETTIME is currently defaulted to auto because we believe  this is a reasonable default
+AFS_NOSETTIME=auto
 test -f /etc/openafs/afs.conf.client && . /etc/openafs/afs.conf.client
 
 AFS_SERVER=off
@@ -32,6 +34,9 @@ SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50"
 CACHESIZE=
 OPTIONS=$MEDIUM
 
+# if we're looking for ntp, what files do we look for?
+TIME_SBIN_PROGS="ntptime ntpd  "
+
 # Should we support afsdb?
 if [ "x$AFS_AFSDB" = "xtrue" ] ; then
     AFSDB="-afsdb"
@@ -45,13 +50,25 @@ if [ "x$AFS_FAKESTAT" = "xtrue" ] ; then
     FAKESTAT="-fakestat"
     else FAKESTAT=""
     fi
+if [ "x$AFS_NOSETTIME" = "xtrue" ] ; then
+    NOSETTIME="-nosettime"
+  elif [ "x$AFS_NOSETTIME" = "xauto" ] ; then
+    for f in $TIME_SBIN_PROGS; do
+       test -e "/usr/sbin/$f" && {
+           NOSETTIME="-nosettime"
+           break
+       }
+    done
+  else
+    NOSETTIME=""
+  fi
 
 # Set to "-verbose" for a lot of debugging information from afsd. Only
 # useful for debugging as it prints _a lot_ of information.
 VERBOSE=
 
 # OPTIONS are the options passed to afsd.
-OPTIONS="$OPTIONS $VERBOSE $DYNROOT $FAKESTAT $AFSDB"
+OPTIONS="$OPTIONS $VERBOSE $DYNROOT $FAKESTAT $AFSDB $NOSETTIME"
 
 
 # Sample server preferences function. Set server preferences using this.
-- 
2.39.5