Merge commit 'upstream/1.4.8.dfsg1'

Conflicts:

	src/afs/LINUX/osi_module.c
	src/cf/linux-test4.m4
	src/cf/osconf.m4
	src/config/param.alpha_linux_26.h
	src/ptserver/pt_util.c

diff --cc configure.in
Simple merge

diff --cc src/cf/osconf.m4
index f66ed066b86e87583351253d99343afc74452156,f4b25a79fb1d0257609e137d64f0821bf0b02457..88841e879762ff1d3663d9214314b6a12ac97c24
--- 1/src/cf/osconf.m4
--- 2/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@@ -4,9 -4,10 +4,9 @@@ AC_DEFUN([OPENAFS_OSCONF], 
  dnl defaults, override in case below as needed
  XCFLAGS='${DBG} ${OPTMZ}'
  SHLIB_SUFFIX="so"
 -CC="cc"
 -CCOBJ="cc"
 -MT_CC="cc"
 +CCOBJ=$CC
 +MT_CC=$CC
- XLIBS="${LIB_AFSDB}"
+ XLIBS="${LIB_AFSDB} ${XBSA_XLIBS}"
  
  dnl debugging and optimization flag defaults
  dnl Note, these are all the defaults for if debug/optimize turned on, and

diff --cc src/config/afs_sysnames.h
Simple merge

diff --cc src/libafs/MakefileProto.LINUX.in
index b4c1e50e78aa0c40be7084a1aa964c79006743f2,e201bf9aab34dc85d3143938787484d78a35849f..08fef8b04c2b30cdbafe86d5fa2cd6f0619716bc
--- 1/src/libafs/MakefileProto.LINUX.in
--- 2/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@@ -249,13 -252,13 +250,13 @@@ libafs.bm: $(LIBAFS_BM
        echo BM Build Complete
  
  <linux26 linux_26 umlinux26>
 -${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: libafs.ko
 -      cp libafs.ko $@
 +${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: openafs.ko
 +      cp openafs.ko $@
  
  .FORCE:
 -libafs.ko: .FORCE
 +openafs.ko: .FORCE
        env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
-       env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
+       env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
          
  <all -linux26 -linux_26 -umlinux26>
  ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS)

diff --cc src/viced/host.c
Simple merge

diff --cc src/viced/viced.c
Simple merge