* Back out patch to ptserver that breaks it

* Don't build libafs in default makefile

diff --git a/Makefile.in b/Makefile.in
index 148d59aea197df9c25116756910181e0eaac2f69..4d151bd0355450de191a4eca5043a8a785576426 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -375,7 +375,7 @@ libadmin: libafsauthent bozo
                echo Not building MT libadmin for ${SYS_NAME} ;; \
        esac
 
-finale: project cmd comerr afsd allrcmds butc tbutc libafs libuafs audit kauth log package \
+finale: project cmd comerr afsd allrcmds butc tbutc  libuafs audit kauth log package \
        ptserver scout bu_utils ubik uss bozo vfsck volser \
        venus update xstat afsmonitor dauth tests libafsrpc \
        libafsauthent libadmin

diff --git a/debian/patch.001_ptserver_lossage b/debian/patch.001_ptserver_lossage
new file mode 100644 (file)
index 0000000..6dab8a2
--- /dev/null
+++ b/debian/patch.001_ptserver_lossage
@@ -0,0 +1,23 @@
+Index: src/ptserver//ptserver.c
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/ptserver/ptserver.c,v
+retrieving revision 1.1.1.5
+diff -u -r1.1.1.5 ptserver.c
+--- src/ptserver//ptserver.c   5 Jul 2001 01:03:41 -0000       1.1.1.5
++++ src/ptserver//ptserver.c   5 Jul 2001 02:58:45 -0000
+@@ -43,6 +43,7 @@
+ extern afs_int32 ubik_lastYesTime;
+ extern afs_int32 ubik_nBuffers;
+ 
++extern int afsconf_ClientAuth();
+ extern int afsconf_ServerAuth();
+ extern int afsconf_CheckAuth();
+ 
+@@ -255,6 +256,7 @@
+     sc[0] = rxnull_NewServerSecurityObject();
+     sc[1] = 0;
+     if (kerberosKeys) {
++      extern int afsconf_GetKey();
+       sc[2] = rxkad_NewServerSecurityObject
+           (0, prdir, afsconf_GetKey, (char *)0);
+     }

diff --git a/src/config/Makefile.ppc_linux22 b/src/config/Makefile.ppc_linux22
deleted file mode 100644 (file)
index d230b83..0000000
--- a/src/config/Makefile.ppc_linux22
+++ /dev/null
@@ -1,46 +0,0 @@
-# AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
-AFS_OSTYPE = LINUX
-
-# Base directory for linux kernel source. Actually a prefix which is complete
-# when LINUX_VERS is appended to it.
-LINUX_SRCDIR = $(KSRC)
-# Default list of Linux kernels to build. Build will run only if all
-# can be built. To build a different set, specify LINUX_VERS to make.
-LINUX_VERS = $(KVERS)
-
-#
-# compilation and link editor flags
-DBG=-g
-OPTMZ=-O2
-PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC
-# Put -O2 here to _ensure_ all Makefiles pick it up.
-XCFLAGS= -O2
-MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}
-XLDFLAGS=
-SHARE_LDFLAGS = -shared -Xlinker -x
-SHLIB_SUFFIX=so
-SHLIB_CFLAGS=
-#
-# libraries
-MTLIBS=-lpthread
-TXLIBS= /usr/lib/libncurses.so
-XLIBS=
-#
-# programs
-AR=ar
-AS=as
-CP=cp
-INSTALL=${DESTDIR}bin/install
-LD=ld
-MT_CC=cc
-MV=mv
-RANLIB=ranlib
-RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
-#
-# Other OS specific requirements
-#
-YACC = bison -y
-LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o

diff --git a/src/config/Makefile.ppc_linux22.in b/src/config/Makefile.ppc_linux22.in
index e67acec07873667b7ecdad9fc60f263e49484da9..12d6df18a123d271048afc06605ca96a68ecead7 100644 (file)
--- a/src/config/Makefile.ppc_linux22.in
+++ b/src/config/Makefile.ppc_linux22.in
@@ -30,7 +30,6 @@ XLIBS=@LIB_AFSDB@
 AR=ar
 AS=as
 CP=cp
-INSTALL=install
 LD=ld
 MT_CC=cc
 MV=mv

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 15fc531128cc34e4af2ef54bddaf72004fee630f..df5dcedd81f068d387ac9226dcbf80f707d325ee 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -43,6 +43,7 @@ struct afsconf_dir *prdir;
 extern afs_int32 ubik_lastYesTime;
 extern afs_int32 ubik_nBuffers;
 
+extern int afsconf_ClientAuth();
 extern int afsconf_ServerAuth();
 extern int afsconf_CheckAuth();
 
@@ -255,6 +256,7 @@ void main (argc, argv)
     sc[0] = rxnull_NewServerSecurityObject();
     sc[1] = 0;
     if (kerberosKeys) {
+       extern int afsconf_GetKey();
        sc[2] = rxkad_NewServerSecurityObject
            (0, prdir, afsconf_GetKey, (char *)0);
     }