From d6e81e5fbdb2608edbf5a3c12ee09433ea07ecda Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 26 Apr 2019 19:36:40 +0100
Subject: [PATCH] Build: move md5.c from auths library to main; exim_fixdb no
 longer depends on auths

---
 src/OS/Makefile-Base      | 13 +++++++++----
 src/scripts/MakeLinks     | 14 +++++++-------
 src/src/auths/Makefile    |  3 +--
 src/src/{auths => }/md5.c |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)
 rename src/src/{auths => }/md5.c (99%)

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index b99cb9ffc..0fbee9d03 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -502,7 +502,7 @@ OBJ_LOOKUPS = lookups/lf_quote.o lookups/lf_check_file.o lookups/lf_sqlperform.o
 OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         directory.o dns.o drtables.o enq.o exim.o expand.o filter.o \
         filtertest.o globals.o dkim.o dkim_transport.o hash.o \
-        header.o host.o ip.o log.o lss.o match.o moan.o \
+        header.o host.o ip.o log.o lss.o match.o md5.o moan.o \
         os.o parse.o queue.o \
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o \
         route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
@@ -548,12 +548,12 @@ exim_dumpdb: $(OBJ_DUMPDB)
 
 # The utility for interrogating/fixing the contents of an exim database
 
-OBJ_FIXDB = exim_fixdb.o util-os.o util-store.o
+OBJ_FIXDB = exim_fixdb.o util-os.o util-store.o util-md5.o
 
-exim_fixdb:  $(OBJ_FIXDB) buildauths
+exim_fixdb:  $(OBJ_FIXDB)
 	@echo "$(LNCC) -o exim_fixdb"
 	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \
-	  auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB)
+	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
 	  echo $(STRIP_COMMAND) exim_fixdb; \
 	  $(STRIP_COMMAND) exim_fixdb; \
@@ -745,6 +745,10 @@ util-string.o:   $(HDRS) string.c
 	@echo "$(CC) -DCOMPILE_UTILITY string.c"
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-string.o string.c
 
+util-md5.o:   $(HDRS) md5.c
+	@echo "$(CC) -DCOMPILE_UTILITY queue.c"
+	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-md5.o md5.c
+
 util-queue.o:   $(HDRS) queue.c
 	@echo "$(CC) -DCOMPILE_UTILITY queue.c"
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-queue.o queue.c
@@ -794,6 +798,7 @@ ip.o:            $(HDRS) ip.c
 log.o:           $(HDRS) log.c
 lss.o:           $(HDRS) lss.c
 match.o:         $(HDRS) match.c
+md5.o:           $(HDRS) md5.c
 moan.o:          $(HDRS) moan.c
 os.o:            $(HDRS) $(OS_C_INCLUDES) os.c
 parse.o:         $(HDRS) parse.c
diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 8d8345c06..14fdb0000 100755
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -73,7 +73,7 @@ cd auths
 for f in README Makefile call_pam.c call_pwcheck.c \
   call_radius.c check_serv_cond.c cyrus_sasl.c cyrus_sasl.h gsasl_exim.c \
   gsasl_exim.h get_data.c get_no64_data.c heimdal_gssapi.c heimdal_gssapi.h \
-  md5.c xtextencode.c xtextdecode.c cram_md5.c cram_md5.h plaintext.c plaintext.h \
+  xtextencode.c xtextdecode.c cram_md5.c cram_md5.h plaintext.c plaintext.h \
   pwcheck.c pwcheck.h auth-spa.c auth-spa.h dovecot.c dovecot.h sha1.c spa.c \
   spa.h tls.c tls.h external.c external.h
 do
@@ -99,12 +99,12 @@ for f in blob.h dbfunctions.h dbstuff.h exim.h functions.h globals.h \
   hash.h local_scan.h \
   macros.h mytypes.h osfunctions.h store.h structs.h lookupapi.h sha_ver.h \
   \
-  acl.c buildconfig.c base64.c child.c crypt16.c daemon.c dbfn.c debug.c deliver.c \
-  directory.c dns.c drtables.c dummies.c enq.c exim.c exim_dbmbuild.c \
-  exim_dbutil.c exim_lock.c expand.c filter.c filtertest.c globals.c \
-  hash.c header.c host.c ip.c log.c lss.c match.c moan.c parse.c perl.c queue.c \
-  rda.c readconf.c receive.c retry.c rewrite.c rfc2047.c route.c search.c \
-  setenv.c environment.c \
+  acl.c buildconfig.c base64.c child.c crypt16.c daemon.c dbfn.c debug.c \
+  deliver.c directory.c dns.c drtables.c dummies.c enq.c exim.c \
+  exim_dbmbuild.c exim_dbutil.c exim_lock.c expand.c filter.c filtertest.c \
+  globals.c hash.c header.c host.c ip.c log.c lss.c match.c md5.c moan.c \
+  parse.c perl.c queue.c rda.c readconf.c receive.c retry.c rewrite.c \
+  rfc2047.c route.c search.c setenv.c environment.c \
   sieve.c smtp_in.c smtp_out.c spool_in.c spool_out.c std-crypto.c store.c \
   string.c tls.c tlscert-gnu.c tlscert-openssl.c tls-cipher-stdname.c \
   tls-gnu.c tls-openssl.c \
diff --git a/src/src/auths/Makefile b/src/src/auths/Makefile
index 402f1417a..e85b22a8a 100644
--- a/src/src/auths/Makefile
+++ b/src/src/auths/Makefile
@@ -8,7 +8,7 @@
 OBJ = auth-spa.o call_pam.o call_pwcheck.o \
       call_radius.o check_serv_cond.o cram_md5.o cyrus_sasl.o dovecot.o \
       external.o get_data.o get_no64_data.o gsasl_exim.o heimdal_gssapi.o \
-      md5.o plaintext.o pwcheck.o \
+      plaintext.o pwcheck.o \
       spa.o tls.o xtextdecode.o xtextencode.o
 
 auths.a:         $(OBJ)
@@ -28,7 +28,6 @@ call_radius.o:      $(HDRS) call_radius.c
 check_serv_cond.o:  $(HDRS) check_serv_cond.c
 get_data.o:         $(HDRS) get_data.c
 get_no64_data.o:    $(HDRS) get_no64_data.c
-md5.o:              $(HDRS) md5.c
 pwcheck.o:          $(HDRS) pwcheck.c pwcheck.h
 xtextdecode.o:      $(HDRS) xtextdecode.c
 xtextencode.o:      $(HDRS) xtextencode.c
diff --git a/src/src/auths/md5.c b/src/src/md5.c
similarity index 99%
rename from src/src/auths/md5.c
rename to src/src/md5.c
index 0536feefb..cc6607950 100644
--- a/src/src/auths/md5.c
+++ b/src/src/md5.c
@@ -6,7 +6,7 @@
 /* See the file NOTICE for conditions of use and distribution. */
 
 #ifndef STAND_ALONE
-#include "../exim.h"
+#include "exim.h"
 
 /* For stand-alone testing, we need to have the structure defined, and
 to be able to do I/O */
-- 
2.25.1