Added new contributed Makefile.

4 files changed, 58 insertions, 5 deletions

diff --git a/changelog b/changelog
index a7aff96..7dba557 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,5 @@
 changelog for pam_pwdfile PAM module - Charl P. Botha <cpbotha@ieee.org>
-$Id: changelog,v 1.17 2003-01-17 14:10:46 cpbotha Exp $
+$Id: changelog,v 1.18 2003-07-07 15:09:35 cpbotha Exp $
 ---------------------------------------------------------------------------
 
 0.99 :
@@ -7,6 +7,7 @@ $Id: changelog,v 1.17 2003-01-17 14:10:46 cpbotha Exp $
 * added micro howto by Warwick Duncan (in contrib/ dir) explaining how to
   setup Cyrus IMAPD + pam_pwdfile so that one does not have to create system
   accounts for imapd users
+* added Makefile.standalone by Gerald Richter to the contrib files.
 
 0.98 : Mon Jun 10 23:49:46 CEST 2002
 
diff --git a/contrib/Makefile.standalone b/contrib/Makefile.standalone
index 136f04a..857eaff 100644
--- a/contrib/Makefile.standalone
+++ b/contrib/Makefile.standalone
@@ -6,15 +6,36 @@ CFLAGS = -fPIC -O2 -c -g -Wall -Wformat-security
 LDFLAGS = -x --shared 
 PAMLIB = -lpam
 CRYPTLIB = -lcrypt
+CPPFLAGS =
 
 all: pam_pwdfile.so
 
-pam_pwdfile.so: pam_pwdfile.o
-	$(LD) $(LDFLAGS) -o pam_pwdfile.so pam_pwdfile.o $(PAMLIB) $(CRYPTLIB)
+pam_pwdfile.so: pam_pwdfile.o bigcrypt.o md5_good.o md5_crypt_good.o md5_broken.o md5_crypt_broken.o
+	$(LD) $(LDFLAGS) -o pam_pwdfile.so pam_pwdfile.o md5_good.o md5_crypt_good.o md5_broken.o md5_crypt_broken.o bigcrypt.o $(PAMLIB) $(CRYPTLIB)
 
 pam_pwdfile.o: pam_pwdfile.c
 	$(CC) $(CFLAGS) pam_pwdfile.c
 
+bigcrypt.o: bigcrypt.c
+	$(CC) $(CFLAGS) bigcrypt.c
+
+
+md5_good.o: md5.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DHIGHFIRST -D'MD5Name(x)=Good##x' -c $< -o $@
+
+md5_broken.o: md5.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -D'MD5Name(x)=Broken##x' \
+                 -c $< -o $@
+
+md5_crypt_good.o: md5_crypt.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -D'MD5Name(x)=Good##x' \
+                 -c $< -o $@
+
+md5_crypt_broken.o: md5_crypt.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -D'MD5Name(x)=Broken##x' \
+                 -c $< -o $@
+
+
 install: pam_pwdfile.so
 	$(INSTALL) -m 0755 -d $(PAM_LIB_DIR)
 	$(INSTALL) -m 0755 pam_pwdfile.so $(PAM_LIB_DIR)
diff --git a/contrib/Makefile.standalone-0.95 b/contrib/Makefile.standalone-0.95
new file mode 100644
index 0000000..136f04a
--- /dev/null
+++ b/contrib/Makefile.standalone-0.95
@@ -0,0 +1,26 @@
+PAM_LIB_DIR = /lib/security
+CC = gcc
+LD = ld
+INSTALL = /usr/bin/install
+CFLAGS = -fPIC -O2 -c -g -Wall -Wformat-security
+LDFLAGS = -x --shared 
+PAMLIB = -lpam
+CRYPTLIB = -lcrypt
+
+all: pam_pwdfile.so
+
+pam_pwdfile.so: pam_pwdfile.o
+	$(LD) $(LDFLAGS) -o pam_pwdfile.so pam_pwdfile.o $(PAMLIB) $(CRYPTLIB)
+
+pam_pwdfile.o: pam_pwdfile.c
+	$(CC) $(CFLAGS) pam_pwdfile.c
+
+install: pam_pwdfile.so
+	$(INSTALL) -m 0755 -d $(PAM_LIB_DIR)
+	$(INSTALL) -m 0755 pam_pwdfile.so $(PAM_LIB_DIR)
+
+clean:
+	rm -f pam_pwdfile.o pam_pwdfile.so
+
+spotless:
+	rm -f pam_pwdfile.so pam_pwdfile.o *~ core
diff --git a/contrib/README.txt b/contrib/README.txt
index 6d5203b..a8c8462 100644
--- a/contrib/README.txt
+++ b/contrib/README.txt
@@ -1,6 +1,6 @@
-$Id: README.txt,v 1.2 2003-01-17 14:10:48 cpbotha Exp $
+$Id: README.txt,v 1.3 2003-07-07 15:09:41 cpbotha Exp $
 
-* Makefile.standalone and pam-pwdfile.spec were contributed by Jason F.
+* Makefile.standalone-0.95 and pam-pwdfile.spec were contributed by Jason F.
   McBrayer <jason@xeran.com>.  You can use these for building RPMs of
   pam_pwdfile; you should also be able to use the Makefile to build
   pam_pwdfile on other platforms _without_ the Linux-PAM hierarchy.
@@ -8,3 +8,8 @@ $Id: README.txt,v 1.2 2003-01-17 14:10:48 cpbotha Exp $
 * warwick_duncan-cyrus_without_system_accounts.txt is a short explanation by
   Warwick Duncan on how to get Cyrus IMAPD + pam_pwdfile to work WITHOUT
   having to create system accounts for IMAPD users.
+  
+* Makefile.standalone was contributed by Gerald Richter and should be more
+  up to date than Makefile.standalone-0.95.  The primary difference is that
+  Gerald's Makefile also takes into account the new md5 code.
+