* Fix ppc build

* Fix debconf read in before write out
* afsdb support for debconf
* install rxdebug
* fix pt_util manpage
* Support for lintian overrides

diff --git a/debian/changelog b/debian/changelog
index 988e0f2333dc5c6e4d351dec9859b1b33a35e2e0..f4efc358dd4e9c49daf8bdc680f76872c1fc152e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+openafs (1.1.1-2) unstable; urgency=medium
+
+  * Swallow before vomiting, for it is the Debconf way, closes: #106030
+  * Fix setting of INSTALL macro on powerpc, closes: #106019
+  * Support AFSDB in debconf.  By default now (assuming you take the new
+    /etc/openafs/afs.conf), AFS will look up cells  it doesn't know
+    about in DNS.
+  * Include upstream patch to prevent potential DOS with two RX servers
+    looping rxdebug and version amongst each other.
+  * Install rxdebug (oops)
+  * Fix lintian overrides to get Lintian to stop complaining about
+    non-problems. 
+
+ -- Sam Hartman <hartmans@debian.org>  Sat, 21 Jul 2001 08:53:10 -0400
+
 openafs (1.1.1-1) unstable; urgency=low
 
   * New upstream release to fix readlink sometimes giving permission

diff --git a/debian/filelist b/debian/filelist
index c73a8228d2add9e1a771648959a02e041d235f56..cfca51ef44140f32d79a6e16ecf2c757edc0941f 100644 (file)
--- a/debian/filelist
+++ b/debian/filelist
@@ -1,5 +1,5 @@
 openafs-client/usr/bin bin/fs bin/pts bin/bos etc/vos bin/tokens
-openafs-client/usr/bin bin/udebug bin/cmdebug bin/pagsh
+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-fileserver/usr/lib/openafs  root.server/usr/afs/bin/fileserver root.server/usr/afs/bin/volserver

diff --git a/debian/openafs-client.config b/debian/openafs-client.config
index c944d3a8acef5f61962eee4bdabe3f136fc4abc1..7655bec7145571c98f5917e4171ac7f3071124a7 100644 (file)
--- a/debian/openafs-client.config
+++ b/debian/openafs-client.config
@@ -3,11 +3,18 @@
 . /usr/share/debconf/confmodule ||exit
 
 db_version 2.0
+if [ -r /etc/openafs/ThisCell] ; then
+    read cell </etc/openafs/ThisCell
+    db_set openafs-client/thiscell $cell
+    fi
 db_get openafs-client/thiscell || true
 if [ "x$RET" = "x" ] ; then
        db_set openafs-client/thiscell `dnsdomainname | tr 'A-Z' 'a-z'`
        fi
-
+if [ -r /etc/openafs/cacheinfo] ; then
+    IFS=: read mountpoint cachedir cachesize  </etc/openafs/cacheinfo
+    db_set openafs-client/cachesize $cachesize
+    fi
 db_input medium openafs-client/thiscell ||true
 db_input critical openafs-client/cachesize ||true
 db_go
@@ -16,4 +23,8 @@ if [ "x$AFS_CLIENT" != "x" ] ; then
     db_set openafs-client/run-client  $AFS_CLIENT
     fi
 db_input low openafs-client/run-client || true
+if [ "x$AFS_AFSDB" != "x" ] ;then
+    db_set openafs-client/afsdb $AFS_AFSDB
+    fi
+db_input low openafs-client/afsdb ||true
 db_go

diff --git a/debian/openafs-client.lintian b/debian/openafs-client.lintian
new file mode 100644 (file)
index 0000000..37df51c
--- /dev/null
+++ b/debian/openafs-client.lintian
@@ -0,0 +1,2 @@
+openafs-client: link-to-undocumented-manpage
+openafs-client: non-standard-dir-perm

diff --git a/debian/openafs-client.postinst b/debian/openafs-client.postinst
index ae1732054559033d05e28b8f400a736da0d373fa..71da37c5b91f4dc19d2ce3da88a99656ff44a10f 100644 (file)
--- a/debian/openafs-client.postinst
+++ b/debian/openafs-client.postinst
@@ -58,6 +58,8 @@ case "$1" in
 
        db_get openafs-client/run-client
        echo AFS_CLIENT=$RET >/etc/openafs/afs.conf.client
+db_get openafs-client/afsdb
+echo AFS_AFSDB=$RET >>/etc/openafs/afs.conf.client
 
     ;;
 

diff --git a/debian/openafs-client.templates b/debian/openafs-client.templates
index ce24009ecaa36b9645d261a504a859472b6b5969..dfc3f86cb8a0326df0e2b8f831861f52e140f522 100644 (file)
--- a/debian/openafs-client.templates
+++ b/debian/openafs-client.templates
@@ -40,3 +40,13 @@ Description: Run Openafs client now and at boot?
  If you answer no to this question, run /etc/init.d/openafs-client
  force-start to run.
 
+Template: openafs-client/afsdb
+Type: string
+Default: true
+Description: Look up AFS cells in DNS?
+ In order to contact an AFS cell, you need the IP addresses of the
+ cell's database servers.  Normally, this information is read from
+ /etc/openafs/CellServDB.  However, if Openafs cannot find a cell in
+ that file it can use DNS to look for AFSDB records that contain the
+information.
+

diff --git a/debian/openafs-client.undocumented b/debian/openafs-client.undocumented
index e95d6129828dae0956a365c8cf4154cabdfd4dfa..38955d9b85e63172b51436b967ccb1f96d56f2b8 100644 (file)
--- a/debian/openafs-client.undocumented
+++ b/debian/openafs-client.undocumented
@@ -7,6 +7,7 @@ kpwvalid.1
 pagsh.1
 pts.1
 tokens.1
+rxdebug.1
 udebug.1
 unlog.1
 vos.1

diff --git a/debian/openafs-fileserver.config b/debian/openafs-fileserver.config
index 5ead51b2a33a76def4c4335fa8b22eb90d504468..d90f89babb4e0bad053c1e0c54fc5d72f5bf5ffa 100644 (file)
--- a/debian/openafs-fileserver.config
+++ b/debian/openafs-fileserver.config
@@ -3,6 +3,10 @@
 . /usr/share/debconf/confmodule || exit
 
 db_version 2.0
+if [ -r /etc/openafs/server/ThisCell] ; then
+    read cell </etc/openafs/server/ThisCell
+    db_set openafs-fileserver/thiscell $cell
+    fi
 
 db_get openafs-fileserver/thiscell || true
 if [ "x$RET" = "x" ] ; then

diff --git a/debian/openafs-fileserver.lintian b/debian/openafs-fileserver.lintian
new file mode 100644 (file)
index 0000000..87d699b
--- /dev/null
+++ b/debian/openafs-fileserver.lintian
@@ -0,0 +1,2 @@
+openafs-fileserver: link-to-undocumented-manpage
+openafs-fileserver: non-standard-dir-perm

diff --git a/debian/rules b/debian/rules
index 406511af5569a539dc07c79eded53f46ef7dc234..5ee3dc40d8a4eeccd71efe933305600a8fb2d4d2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ ifndef KSRC
 KSRC=/usr/src/linux
 endif
 MODDIR=..
-
+LINTIAN_PACKAGES= openafs-client openafs-fileserver
 export KSRC 
 export KVERS
 
@@ -49,9 +49,6 @@ build-stamp:
        dh_testdir
 
        $(MAKE)
-       mkdir -p debian/openafs-dbserver/usr/share/man/man8
-               /usr/bin/docbook-to-man debian/pt_util.sgml  \
-               >debian/openafs-dbserver/usr/share/man/man8/pt_util.8
        -rm $(SYS_NAME)/dest/include/crypt.h
        touch build-stamp
 
@@ -74,7 +71,12 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-
+       mkdir -p debian/openafs-dbserver/usr/share/man/man8
+               /usr/bin/docbook-to-man debian/pt_util.sgml >debian/openafs-dbserver/usr/share/man/man8/pt_util.8
+       for foo in $(LINTIAN_PACKAGES) ; do \
+               install -d debian/$$foo/usr/share/lintian/overrides; \
+               cp debian/$$foo.lintian debian/$$foo/usr/share/lintian/overrides/$$foo; \
+               done
        for pkg in openafs-dbserver openafs-fileserver openafs-kpasswd; do \
                ln -s openafs-client debian/$$pkg/usr/share/doc/$$pkg; \
                done

diff --git a/src/afsd/afs.conf.linux b/src/afsd/afs.conf.linux
index c22c9c3eac2d7af089d0989294fcf97dee3dd6c2..466d933afc763555bcd3706c07c7d81c1bf3ac01 100644 (file)
--- a/src/afsd/afs.conf.linux
+++ b/src/afsd/afs.conf.linux
@@ -21,12 +21,18 @@ MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
 SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50"
 OPTIONS=$MEDIUM
 
+# Should we support afsdb?
+if [ "x$AFS_AFSDB" = "xtrue" ] ; then
+    AFSDB="-afsdb"
+    else AFSDB=""
+    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"
+OPTIONS="$OPTIONS $VERBOSE $AFSDB"
 
 
 # Sample server preferences function. Set server preferences using this.

diff --git a/src/config/Makefile.ppc_linux22.in b/src/config/Makefile.ppc_linux22.in
index 12d6df18a123d271048afc06605ca96a68ecead7..b40539b85716e6daf49ed93f4b449b51d34c603f 100644 (file)
--- a/src/config/Makefile.ppc_linux22.in
+++ b/src/config/Makefile.ppc_linux22.in
@@ -36,6 +36,7 @@ MV=mv
 RANLIB=ranlib
 RM=rm
 WASHTOOL=${SRCDIR}bin/washtool
+INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
 #