head	1.5;
access;
symbols
	RELEASE_4_3_0:1.4
	RELEASE_4_2_0:1.3;
locks; strict;
comment	@# @;


1.5
date	2001.07.24.17.14.44;	author nectar;	state dead;
branches;
next	1.4;

1.4
date	2001.01.23.21.42.11;	author nectar;	state Exp;
branches;
next	1.3;

1.3
date	2000.11.06.20.00.02;	author nectar;	state Exp;
branches;
next	1.2;

1.2
date	2000.11.06.19.56.21;	author nectar;	state Exp;
branches;
next	1.1;

1.1
date	2000.11.06.19.01.43;	author nectar;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Update pam_krb5 1.0 -> 1.0.1.
Change MASTER_SITES.

NB: This  versioning is  bogus.  Unfortunately,  there is  no official
release of  pam_krb5 yet,  but it has  substantially changed.   I made
this release based on what is in CVS.
@
text
@--- Makefile.orig	Tue Jan  4 19:08:51 2000
+++ Makefile	Tue Jan 23 15:38:42 2001
@@@@ -1,46 +1,56 @@@@
 #
 # Makefile for pam_krb5
 #
+CC = cc
+CFLAGS = -O -fPIC -Wall
+# WHAT? shared and static?  are you mad?  
+# No, this allows us to make a shared object that has minimal undefined
+# references.
+LDFLAGS = -shared -Wl,-Bstatic
+
+OSLIBS = -lpam
+
+# We have to specify full paths to some of these libraries so that we
+# are sure we get the right version... in most cases, we don't want the
+# version in the base system.  Version numbers don't help us, because we
+# are not looking for shared libraries.
+
+# HEIMDAL
+LIBS_heimdal =	${KRB5BASE}/lib/libkrb5.a ${KRB5BASE}/lib/libgssapi.a \
+		${KRB5BASE}/lib/libasn1.a ${KRB5BASE}/lib/libroken.a \
+		-lcrypto -lcrypt
+# MIT
+LIBS_mit = ${KRB5BASE}/lib/libkrb5.a ${KRB5BASE}/lib/libcom_err.a \
+	${KRB5BASE}/lib/libk5crypto.a
 
-CC = gcc
-CFLAGS = -O2 -fPIC
-#LDFLAGS = -shared
-LDFLAGS = -G
+LIBS = $(OSLIBS) ${LIBS_${KRB5_IMPL}}
+COMPAT = compat_${KRB5_IMPL}.c
 
-DESTDIR = /usr/lib/security
-MANDIR = /opt/local/man/man5
-
-OSLIBS = -lpam -lnsl -lsocket
-KRB5LIBS = -L/opt/local/lib -lkrb5 -lk5crypto -lcom_err
-
-LIBS = $(OSLIBS) $(KRB5LIBS)
-
-INC = -I/opt/local/include
+INC = -I${KRB5BASE}/include
 
 
 ####################################################################
 # No changes below this line
 
 SRCS = pam_krb5_auth.c pam_krb5_pass.c pam_krb5_acct.c pam_krb5_sess.c \
-	support.c
+	support.c ${COMPAT}
 
 OBJS = pam_krb5_auth.o pam_krb5_pass.o pam_krb5_acct.o pam_krb5_sess.o \
-	support.o
+	support.o ${COMPAT:.c=.o}
 
-all: pam_krb5.so.1
+all: pam_krb5.so
 
-pam_krb5.so.1: $(OBJS)
-	$(CC) -o $@@ $(LDFLAGS) $(OBJS) $(LIBS)
+pam_krb5.so: $(OBJS)
+	$(CC) -o $@@ $(LDFLAGS) $(OBJS) -L${KRB5BASE}/lib $(LIBS)
 
 install:
-	cp pam_krb5.so.1 $(DESTDIR)
-	chown root:sys $(DESTDIR)/pam_krb5.so.1
-	ln -s ./pam_krb5.so.1 $(DESTDIR)/pam_krb5.so
-	cp pam_krb5.5 $(MANDIR)
-	chown root:sys $(MANDIR)/pam_krb5.5
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 0555 pam_krb5.so \
+	    ${PREFIX}/lib/pam_krb5.so
+	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 0444 pam_krb5.5 \
+	    ${MANPREFIX}/man/man8/pam_krb5.8
 
 clean:
-	rm -f *.so.1 *.o
+	rm -f *.so *.o
 
 pam_krb5_auth.o: pam_krb5_auth.c pam_krb5.h
 	$(CC) -c $(CFLAGS) $(INC) $<
@@@@ -55,5 +65,11 @@@@
 	$(CC) -c $(CFLAGS) $(INC) $<
 
 support.o: support.c pam_krb5.h
+	$(CC) -c $(CFLAGS) $(INC) $<
+
+compat_heimdal.o: compat_heimdal.c
+	$(CC) -c $(CFLAGS) $(INC) $<
+
+compat_mit.o: compat_mit.c
 	$(CC) -c $(CFLAGS) $(INC) $<
 
@


1.4
log
@Fix linking the pam_krb5.so module:
  = Be very specific about where we think the libraries are, to avoid
    getting the old crusty Heimdal from the base system.
  = Minimize the undefined symbols in pam_krb5.so
@
text
@@


1.3
log
@(forced commit)

Double oops.  I initially added a version of this port that was a bit
dated.  The last commit brings it up to date: in particular, MIT Kerberos
support was broken in theory (though not in practice).
@
text
@d2 2
a3 2
+++ Makefile	Mon Nov  6 13:44:54 2000
@@@@ -1,46 +1,49 @@@@
d9 19
a27 1
+LDFLAGS = -shared
d33 2
a34 1
+OSLIBS = -lpam
d38 1
a38 5
+# HEIMDAL
+LIBS_heimdal = ${KRB5BASE}/lib/libkrb5.a ${KRB5BASE}/lib/libasn1.a   \
+	${KRB5BASE}/lib/libcom_err.a ${KRB5BASE}/lib/libroken.a  \
+	${KRB5BASE}/lib/libgssapi.a ${KRB5BASE}/lib/libdes.a 
 
d41 1
a41 4
+# MIT
+LIBS_mit = ${KRB5BASE}/lib/libkrb5.a ${KRB5BASE}/lib/libcom_err.a \
+	${KRB5BASE}/lib/libk5crypto.a
 
d43 1
a43 3
+LIBS = $(OSLIBS) ${LIBS_${KRB5_IMPL}}
+COMPAT = compat_${KRB5_IMPL}.c
 
d63 1
d65 1
a65 1
 	$(CC) -o $@@ $(LDFLAGS) $(OBJS) $(LIBS)
d84 1
a84 1
@@@@ -55,5 +58,11 @@@@
@


1.2
log
@Oops,
@
text
@@


1.1
log
@A Pluggable Authentication Module for Kerberos 5.
@
text
@d2 2
a3 2
+++ Makefile	Mon Nov  6 10:59:16 2000
@@@@ -1,48 +1,51 @@@@
d71 1
a71 2
-pam_krb5_auth.o: pam_krb5_auth.c pam_krb5.h
+pam_krb5_auth.o: pam_krb5_auth.c pam_krb5.h krb5compat.h
d73 1
a73 4
 
 pam_krb5_pass.o: pam_krb5_pass.c pam_krb5.h
@@@@ -54,6 +57,12 @@@@
 pam_krb5_sess.o: pam_krb5_sess.c pam_krb5.h
d76 1
a76 2
-support.o: support.c pam_krb5.h
+support.o: support.c pam_krb5.h krb5compat.h
d79 1
a79 1
+compat_heimdal.o: compat_heimdal.c krb5compat.h
d82 1
a82 1
+compat_mit.o: compat_mit.c krb5compat.h
@

