From: Russ Allbery <rra@debian.org>
Date: Wed, 16 Jul 2008 21:37:58 +0000 (-0700)
Subject: Merge commit 'upstream/1.5.50.dfsg1' into experimental
X-Git-Tag: debian/1.5.50.dfsg1-1~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=db1235cb990526f86e5568c189038c0017ba5bc4;p=packages%2Fo%2Fopenafs.git

Merge commit 'upstream/1.5.50.dfsg1' into experimental

Conflicts:

	configure.in
	src/afs/LINUX/osi_groups.c
	src/afs/LINUX/osi_module.c
	src/audit/audit.c
	src/auth/auth.p.h
	src/auth/userok.c
	src/cf/linux-test4.m4
	src/cf/osconf.m4
	src/config/param.alpha_linux_26.h
	src/libafs/MakefileProto.LINUX.in
	src/pam/Makefile.in
	src/ptserver/pt_util.c
	src/ptserver/ptprocs.c
	src/tviced/Makefile.in
	src/util/Makefile.in
	src/util/dirpath.c
	src/util/dirpath.hin
	src/util/dirpath_nt.h
	src/util/get_krbrlm.c
	src/viced/host.c
	src/viced/viced.c
---

db1235cb990526f86e5568c189038c0017ba5bc4
diff --cc configure.in
index 8f1524e3c,6be38ab51..9dd817fde
--- a/configure.in
+++ b/configure.in
@@@ -88,6 -90,10 +90,7 @@@ src/lwp/test/Makefile 
  src/mpp/Makefile \
  src/null/Makefile \
  src/package/Makefile \
+ src/packaging/Debian/rules \
 -src/packaging/MacOS/OpenAFS.Info.plist \
 -src/packaging/MacOS/OpenAFS.info \
 -src/packaging/MacOS/buildpkg.sh \
  src/packaging/RedHat/openafs.spec \
  src/pam/Makefile \
  src/pinstall/Makefile \
diff --cc src/cf/osconf.m4
index f66ed066b,5540abdf7..2c567bb28
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@@ -2,11 -2,13 +2,12 @@@
  AC_DEFUN([OPENAFS_OSCONF], [
  
  dnl defaults, override in case below as needed
+ CFLAGS=
  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
@@@ -326,13 -338,15 +337,14 @@@ case $AFS_SYSNAME i
  		;;
  
  	i386_umlinux22)
 -		CC="gcc -pipe"
 -		CCOBJ="gcc -pipe"
 -		MT_CC="gcc -pipe"
 +		CCOBJ="${CC} -pipe"
 +		MT_CC="${CC} -pipe"
  		KERN_OPTMZ=-O2
  		LEX="flex -l"
- 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -DUBIK_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
  		MT_LIBS="-lpthread"
- 		PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
+ 		PAM_OPTMZ=-O2
+ 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
  		SHLIB_CFLAGS="-fPIC"
  		SHLIB_LDFLAGS="-shared -Xlinker -x"
  		TXLIBS="-lncurses"
@@@ -342,11 -356,12 +354,11 @@@
  		;;
  
  	i386_linux*)
 -		CC="gcc -pipe"
 -		CCOBJ="gcc -pipe"
 -		MT_CC="gcc -pipe"
 +		CCOBJ="${CC} -pipe"
 +		MT_CC="${CC} -pipe"
  		KERN_OPTMZ=-O2
  		LEX="flex -l"
- 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -DUBIK_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
  		MT_LIBS="-lpthread"
  		DBG=-g
  		KERN_DBG=-g
@@@ -362,11 -377,12 +374,11 @@@
  		;;
  
  	i386_umlinux24)
 -		CC="gcc -pipe"
 -		CCOBJ="gcc -pipe"
 -		MT_CC="gcc -pipe"
 +		CCOBJ="${CC} -pipe"
 +		MT_CC="${CC} -pipe"
  		KERN_OPTMZ=-O2
  		LEX="flex -l"
- 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -DUBIK_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
  		MT_LIBS="-lpthread"
  		DBG=-g
  		KERN_DBG=-g
@@@ -382,11 -399,12 +395,11 @@@
  		;;
  
  	i386_umlinux26)
 -		CC="gcc -pipe"
 -		CCOBJ="gcc -pipe"
 -		MT_CC="gcc -pipe"
 +		CCOBJ="${CC} -pipe"
 +		MT_CC="${CC} -pipe"
  		KERN_OPTMZ=-O2
  		LEX="flex -l"
- 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -DUBIK_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
  		MT_LIBS="-lpthread"
  		DBG=-g
  		KERN_DBG=-g
diff --cc src/pam/Makefile.in
index c198ab013,a6fd70739..6aaff94f1
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@@ -25,17 -25,7 +25,17 @@@ LDFLAGS = ${SHLIB_LDFLAGS
  	  afs_pam_msg.o afs_message.o AFS_component_version_number.o
     OBJS = $(SHOBJS) test_pam.o
  INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} 
- CFLAGS =  ${DEBUG} ${INCLUDES} ${PAM_CFLAGS} ${MT_CFLAGS}
 -CFLAGS =  ${PAM_DBG} ${PAM_OPTMZ} ${INCLUDES} ${PAM_CFLAGS}
++CFLAGS =  ${PAM_DBG} ${PAM_OPTMZ} ${INCLUDES} ${PAM_CFLAGS} ${MT_CFLAGS}
 +
 +# For Debian, we link directly with the object files that would have gone
 +# into the libafsrpc and libafsauthent shared libraries.  The shared libraries
 +# themselves cannot be used because the interface isn't stable and they have
 +# no SONAME, but this is the easiest way of getting PIC objects built with the
 +# pthread API.
 +SHLIB_OBJS	:= `ls ../shlibafsauthent/*.o | grep -v version_num` \
 +		   `ls ../shlibafsrpc/*.o | grep -v version_num`
 +KRB_SHLIB_OBJS	:= `ls ../shlibafsauthent/*.o | egrep -v 'version_num|ktc.o'` \
 +		   `ls ../shlibafsrpc/*.o | grep -v version_num`
  
  all: test_pam ${TOP_LIBDIR}/pam_afs.so.1 ${TOP_LIBDIR}/pam_afs.krb.so.1