From 2273f4289f40797ffa2726477956d36aef150e5f Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 13 May 2005 01:12:38 +0000 Subject: [PATCH] * libpam-openafs-kaserver: Fix compilation so that the PAM module isn't missing symbols and therefore unusable. (Closes: #308844) --- debian/changelog | 7 +++++++ src/kauth/Makefile.in | 16 ++++++++-------- src/rx/Makefile.in | 8 ++++---- src/ubik/Makefile.in | 3 +-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6f703cfe..accaef2d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openafs (1.3.81-3sarge1) unstable; urgency=low + + * libpam-openafs-kaserver: Fix compilation so that the PAM module isn't + missing symbols and therefore unusable. (Closes: #308844) + + -- + openafs (1.3.81-3) unstable; urgency=low * Patch from kcr to fix osconf.m4 so that sparc defines afs_pthread_env and thus builds. diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 9fe631745..b3da403d9 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -51,6 +51,14 @@ KLIBS=${TOP_LIBDIR}/libubik.a \ OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o +PICTARGET =../pic/kauth +PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS)) +$(PICTARGET)/%.o: %.c $(PICTARGET) + $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@ + +$(PICTARGET): + mkdir -p $(PICTARGET) + all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb \ ${TOP_LIBDIR}/libkauth.a \ @@ -63,14 +71,6 @@ depinstall: \ ${TOP_INCDIR}/afs/kauth.h \ ${TOP_INCDIR}/afs/kaport.h -PICTARGET =../pic/kauth -PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS)) -$(PICTARGET)/%.o: %.c $(PICTARGET) - $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@ - -$(PICTARGET): - mkdir -p $(PICTARGET) - test tests: all diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index e7b0668cf..a3bd51f8a 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -41,15 +41,15 @@ BASICINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \ LIBS=librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/util.a -all: \ - includes \ - ${TOP_LIBDIR}/librx.a $(PICOBJS) - PICTARGET =../pic/rx PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS)) $(PICTARGET)/%.o: %.c $(PICTARGET) $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@ +all: \ + includes \ + ${TOP_LIBDIR}/librx.a $(PICOBJS) + depinstall: includes $(PICTARGET): diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 84918bd33..9e297fc67 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -20,8 +20,6 @@ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS} -all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client $(PICOBJS) - PICTARGET =../pic/ubik PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS)) $(PICTARGET)/%.o: %.c $(PICTARGET) @@ -34,6 +32,7 @@ depinstall: \ $(PICTARGET): mkdir -p $(PICTARGET) +all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client $(PICOBJS) utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a -- 2.39.5