auth_spa and plainext as dynamic modules

[exim.git] / src / OS / Makefile-Base

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 6778331c7100c218d7c7fc7a92a4bd969b40b016..05979f6cb7710da70d36bff1ba301f603818e8e9 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -5,7 +5,7 @@
 # optional, Local/* files at the front of this file, to create Makefile in the
 # build directory.
 #
 # optional, Local/* files at the front of this file, to create Makefile in the
 # build directory.
 #

-# Copyright (c) The Exim Maintainers 1995 - 2022
+# Copyright (c) The Exim Maintainers 1995 - 2024

 # SPDX-License-Identifier: GPL-2.0-or-later
 
 SHELL      = $(MAKE_SHELL)
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 SHELL      = $(MAKE_SHELL)


@@ -36,7 +36,7 @@ FE       = $(FULLECHO)
 # up-to-date. Then the os-specific source files and the C configuration file
 # are set up, and finally it goes to the main Exim target.
 
 # up-to-date. Then the os-specific source files and the C configuration file
 # are set up, and finally it goes to the main Exim target.
 

-all:       utils exim
+all:       utils exim dynmodules

 config:    $(EDITME) checklocalmake Makefile os.c config.h version.h version.sh macro.c
 
 exim_openssl exim_gnutls: clean exim
 config:    $(EDITME) checklocalmake Makefile os.c config.h version.h version.sh macro.c
 
 exim_openssl exim_gnutls: clean exim


@@ -108,7 +108,7 @@ config.h: Makefile buildconfig ../src/config.h.defaults $(EDITME)
 
 # Build the builtin-macros data struct
 
 
 # Build the builtin-macros data struct
 

-MACRO_HSRC = macro_predef.h os.h globals.h config.h macros.h \
+MACRO_HSRC = macro_predef.h os.h globals.h config.h macros.h path_max.h \

        routers/accept.h routers/dnslookup.h routers/ipliteral.h \
        routers/iplookup.h routers/manualroute.h routers/queryprogram.h \
        routers/redirect.h
        routers/accept.h routers/dnslookup.h routers/ipliteral.h \
        routers/iplookup.h routers/manualroute.h routers/queryprogram.h \
        routers/redirect.h


@@ -119,7 +119,7 @@ OBJ_MACRO = macro_predef.o \
        macro-appendfile.o macro-autoreply.o macro-lmtp.o macro-pipe.o macro-queuefile.o \
        macro-smtp.o macro-accept.o macro-dnslookup.o macro-ipliteral.o macro-iplookup.o \
        macro-manualroute.o macro-queryprogram.o macro-redirect.o \
        macro-appendfile.o macro-autoreply.o macro-lmtp.o macro-pipe.o macro-queuefile.o \
        macro-smtp.o macro-accept.o macro-dnslookup.o macro-ipliteral.o macro-iplookup.o \
        macro-manualroute.o macro-queryprogram.o macro-redirect.o \

-       macro-auth-spa.o macro-cram_md5.o macro-cyrus_sasl.o macro-dovecot.o macro-gsasl_exim.o \
+       macro-auth-spa.o macro-cram_md5.o macro-cyrus_sasl.o macro-dovecot.o macro-gsasl.o \

        macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-authtls.o macro-external.o \
        macro-dkim.o macro-malware.o macro-signing.o
 
        macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-authtls.o macro-external.o \
        macro-dkim.o macro-malware.o macro-signing.o
 


@@ -206,9 +206,9 @@ macro-dovecot.o:    auths/dovecot.c
 macro-external.o:      auths/external.c
        @echo "$(CC) -DMACRO_PREDEF auths/external.c"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/external.c
 macro-external.o:      auths/external.c
        @echo "$(CC) -DMACRO_PREDEF auths/external.c"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/external.c

-macro-gsasl_exim.o :   auths/gsasl_exim.c
-       @echo "$(CC) -DMACRO_PREDEF auths/gsasl_exim.c"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/gsasl_exim.c
+macro-gsasl.o :        auths/gsasl.c
+       @echo "$(CC) -DMACRO_PREDEF auths/gsasl.c"
+       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/gsasl.c

 macro-heimdal_gssapi.o:        auths/heimdal_gssapi.c
        @echo "$(CC) -DMACRO_PREDEF auths/heimdal_gssapi.c"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/heimdal_gssapi.c
 macro-heimdal_gssapi.o:        auths/heimdal_gssapi.c
        @echo "$(CC) -DMACRO_PREDEF auths/heimdal_gssapi.c"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/heimdal_gssapi.c


@@ -245,13 +245,12 @@ macro.c: macro_predef
 
 .PHONY: all config utils \
        buildauths buildlookups buildpdkim buildrouters \
 
 .PHONY: all config utils \
        buildauths buildlookups buildpdkim buildrouters \

-        buildtransports checklocalmake clean
+        buildtransports dynmodules checklocalmake clean

 
 
 utils: $(EXIM_MONITOR) exicyclog exinext exiwhat \
         exigrep eximstats exipick exiqgrep exiqsumm \
 
 
 utils: $(EXIM_MONITOR) exicyclog exinext exiwhat \
         exigrep eximstats exipick exiqgrep exiqsumm \

-        transport-filter.pl convert4r3 convert4r4 \
-        exim_checkaccess \
+        transport-filter.pl exim_checkaccess \

         exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb \
        exim_lock exim_msgdate exim_id_update
 
         exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb \
        exim_lock exim_msgdate exim_id_update
 


@@ -490,30 +489,6 @@ transport-filter.pl: config ../src/transport-filter.src
        @chmod a+x transport-filter.pl
        @echo ">>> transport-filter.pl script built"
 
        @chmod a+x transport-filter.pl
        @echo ">>> transport-filter.pl script built"
 

-convert4r3: config ../src/convert4r3.src
-       @rm -f convert4r3
-       @. ./version.sh && sed \
-         -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-         -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
-         -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
-         ../src/convert4r3.src > convert4r3-t
-       @mv convert4r3-t convert4r3
-       @chmod a+x convert4r3
-       @./convert4r3 -v 2>&1 >/dev/null
-       @echo ">>> convert4r3 script built"
-
-convert4r4: config ../src/convert4r4.src
-       @rm -f convert4r4
-       @. ./version.sh && sed \
-         -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-         -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
-         -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
-         ../src/convert4r4.src > convert4r4-t
-       @mv convert4r4-t convert4r4
-       @chmod a+x convert4r4
-       @./convert4r4 -v 2>&1 >/dev/null
-       @echo ">>> convert4r4 script built"
-

 
 # These are objects of optional features. They are always compiled, but
 # if the corresponding #defines are not set, they wind up empty and
 
 # These are objects of optional features. They are always compiled, but
 # if the corresponding #defines are not set, they wind up empty and


@@ -534,6 +509,14 @@ OBJ_EXPERIMENTAL = arc.o \
 # updated each time. We don't bother with that for the auxiliaries.
 
 OBJ_LOOKUPS = lookups/lf_quote.o lookups/lf_check_file.o lookups/lf_sqlperform.o
 # updated each time. We don't bother with that for the auxiliaries.
 
 OBJ_LOOKUPS = lookups/lf_quote.o lookups/lf_check_file.o lookups/lf_sqlperform.o

+OBJ_ROUTERS = routers/rf_change_domain.o routers/rf_expand_data.o \
+       routers/rf_get_errors_address.o \
+       routers/rf_get_munge_headers.o routers/rf_get_transport.o \
+       routers/rf_get_ugid.o routers/rf_lookup_hostlist.o \
+       routers/rf_queue_add.o routers/rf_self_action.o routers/rf_set_ugid.o
+OBJ_AUTHS = auths/auth-spa.o auths/call_pam.o auths/call_pwcheck.o \
+       auths/call_radius.o auths/check_serv_cond.o auths/get_data.o \
+       auths/get_no64_data.o auths/pwcheck.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 \
 
 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 \


@@ -543,8 +526,8 @@ OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o regex_cache.o \
         route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
         std-crypto.o store.o string.o tls.o tod.o transport.o tree.o verify.o \
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o regex_cache.o \
         route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
         std-crypto.o store.o string.o tls.o tod.o transport.o tree.o verify.o \

-        environment.o macro.o \
-        $(OBJ_LOOKUPS) \
+        xtextencode.o environment.o macro.o \
+        $(OBJ_LOOKUPS) $(OBJ_ROUTERS) $(OBJ_AUTHS) \

         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_EXPERIMENTAL)
 
         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_EXPERIMENTAL)
 


@@ -569,7 +552,7 @@ exim:   buildlookups buildauths pdkim/pdkim.a \
 
 # The utility for dumping the contents of an exim database
 
 
 # The utility for dumping the contents of an exim database
 

-OBJ_DUMPDB = exim_dumpdb.o util-os.o util-store.o
+OBJ_DUMPDB = exim_dumpdb.o util-os.o util-store.o util-xtextencode.o

 
 exim_dumpdb: $(OBJ_DUMPDB)
        @echo "$(LNCC) -o exim_dumpdb"
 
 exim_dumpdb: $(OBJ_DUMPDB)
        @echo "$(LNCC) -o exim_dumpdb"


@@ -584,7 +567,7 @@ exim_dumpdb: $(OBJ_DUMPDB)
 
 # The utility for interrogating/fixing the contents of an exim database
 
 
 # The utility for interrogating/fixing the contents of an exim database
 

-OBJ_FIXDB = exim_fixdb.o util-os.o util-store.o util-md5.o
+OBJ_FIXDB = exim_fixdb.o util-os.o util-store.o util-md5.o util-xtextencode.o

 
 exim_fixdb:  $(OBJ_FIXDB)
        @echo "$(LNCC) -o exim_fixdb"
 
 exim_fixdb:  $(OBJ_FIXDB)
        @echo "$(LNCC) -o exim_fixdb"


@@ -599,11 +582,12 @@ exim_fixdb:  $(OBJ_FIXDB)
 
 # The utility for tidying the contents of an exim database
 
 
 # The utility for tidying the contents of an exim database
 

-OBJ_TIDYDB = exim_tidydb.o util-os.o util-store.o
+OBJ_TIDYDB = exim_tidydb.o util-os.o util-store.o util-xtextencode.o

 
 exim_tidydb: $(OBJ_TIDYDB)
        @echo "$(LNCC) -o exim_tidydb"
 
 exim_tidydb: $(OBJ_TIDYDB)
        @echo "$(LNCC) -o exim_tidydb"

-       $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \
+       $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) \
+         $(OBJ_TIDYDB) \

          $(LIBS) $(EXTRALIBS) $(DBMLIB)
        @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
          echo $(STRIP_COMMAND) exim_tidydb; \
          $(LIBS) $(EXTRALIBS) $(DBMLIB)
        @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
          echo $(STRIP_COMMAND) exim_tidydb; \


@@ -614,9 +598,12 @@ exim_tidydb: $(OBJ_TIDYDB)
 
 # The utility for building dbm files
 
 
 # The utility for building dbm files
 

-exim_dbmbuild: exim_dbmbuild.o
+OBJ_DBMBUILD = exim_dbmbuild.o util-xtextencode.o
+
+exim_dbmbuild: $(OBJ_DBMBUILD)

        @echo "$(LNCC) -o exim_dbmbuild"
        @echo "$(LNCC) -o exim_dbmbuild"

-       $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.o \
+       $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) \
+         $(OBJ_DBMBUILD) \

          $(LIBS) $(EXTRALIBS) $(DBMLIB)
        @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
          echo $(STRIP_COMMAND) exim_dbmbuild; \
          $(LIBS) $(EXTRALIBS) $(DBMLIB)
        @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
          echo $(STRIP_COMMAND) exim_dbmbuild; \


@@ -661,10 +648,11 @@ OBJ_MONBIN = util-host_address.o \
             util-string.o \
             util-tod.o \
             util-tree.o \
             util-string.o \
             util-tod.o \
             util-tree.o \

+            util-xtextencode.o \

             $(MONBIN)
 
 eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) ../exim_monitor/em_version.c \
             $(MONBIN)
 
 eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) ../exim_monitor/em_version.c \

-               mytypes.h store.h macros.h
+               mytypes.h store.h path_max.h macros.h

        @echo "$(CC) exim_monitor/em_version.c"
        $(FE)$(CC) -o em_version.o -c \
          $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
        @echo "$(CC) exim_monitor/em_version.c"
        $(FE)$(CC) -o em_version.o -c \
          $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c


@@ -695,9 +683,15 @@ HDRS  =    blob.h \
        hash.h \
        hintsdb.h \
        hintsdb_structs.h \
        hash.h \
        hintsdb.h \
        hintsdb_structs.h \

+       hintsdb/hints_bdb.h \
+       hintsdb/hints_gdbm.h \
+       hintsdb/hints_ndbm.h \
+       hintsdb/hints_sqlite.h \
+       hintsdb/hints_tdb.h \

        local_scan.h \
        macros.h \
        mytypes.h \
        local_scan.h \
        macros.h \
        mytypes.h \

+       path_max.h \

        sha_ver.h \
        structs.h \
        os.h
        sha_ver.h \
        structs.h \
        os.h


@@ -708,9 +702,15 @@ PHDRS = ../config.h \
        ../globals.h \
        ../hintsdb.h \
        ../hintsdb_structs.h \
        ../globals.h \
        ../hintsdb.h \
        ../hintsdb_structs.h \

+       ../hintsdb/hints_bdb.h \
+       ../hintsdb/hints_gdbm.h \
+       ../hintsdb/hints_ndbm.h \
+       ../hintsdb/hints_sqlite.h \
+       ../hintsdb/hints_tdb.h \

        ../local_scan.h \
        ../macros.h \
        ../mytypes.h \
        ../local_scan.h \
        ../macros.h \
        ../mytypes.h \

+       ../path_max.h \

        ../structs.h \
        ../os.h
 
        ../structs.h \
        ../os.h
 


@@ -807,6 +807,10 @@ util-tree.o:   $(HDRS) tree.c
        @echo "$(CC) -DCOMPILE_UTILITY tree.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-tree.o tree.c
 
        @echo "$(CC) -DCOMPILE_UTILITY tree.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-tree.o tree.c
 

+util-xtextencode.o:   $(HDRS) xtextencode.c
+       @echo "$(CC) -DCOMPILE_UTILITY xtextencode.c"
+       $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-xtextencode.o xtextencode.c
+

 util-os.o:       $(HDRS) os.c
        @echo "$(CC) -DCOMPILE_UTILITY os.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) \
 util-os.o:       $(HDRS) os.c
        @echo "$(CC) -DCOMPILE_UTILITY os.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) \


@@ -882,6 +886,7 @@ tod.o:           $(HDRS) tod.c
 transport.o:     $(HDRS) transport.c
 tree.o:          $(HDRS) tree.c
 verify.o:        $(HDRS) transports/smtp.h verify.c
 transport.o:     $(HDRS) transport.c
 tree.o:          $(HDRS) tree.c
 verify.o:        $(HDRS) transports/smtp.h verify.c

+xtextencode.o:   $(HDRS) xtextencode.c

 dkim.o:          $(HDRS) pdkim/pdkim.h dkim.c
 dkim_transport.o: $(HDRS) dkim_transport.c
 
 dkim.o:          $(HDRS) pdkim/pdkim.h dkim.c
 dkim_transport.o: $(HDRS) dkim_transport.c
 


@@ -921,6 +926,8 @@ drtables.o:      $(HDRS) drtables.c
 # in the sub-directory unless we force that dependency:
 
 $(OBJ_LOOKUPS):  buildlookups
 # in the sub-directory unless we force that dependency:
 
 $(OBJ_LOOKUPS):  buildlookups

+$(OBJ_ROUTERS):  buildrouters
+$(OBJ_AUTHS):    buildauths

 
 # The exim monitor's private modules - the sources live in a private
 # subdirectory. The final binary combines the private modules with some
 
 # The exim monitor's private modules - the sources live in a private
 # subdirectory. The final binary combines the private modules with some


@@ -946,6 +953,18 @@ $(MONBIN): $(HDRS)
 
 # Targets for the various libraries that Exim uses.
 
 
 # Targets for the various libraries that Exim uses.
 

+# Copies of modules built as dynamic-load libraries
+
+dynmodules: buildlookups buildrouters buildtransports buildauths
+       rm -fr dynmodules
+       mkdir dynmodules
+       for d in lookup router transport auth; do \
+         for f in $${d}s/*.so; do \
+           [ -e $$f ] && ln $$f dynmodules/`basename $$f .so`_$$d.so; \
+         done; \
+       done; \
+       true
+

 # The lookups library.
 
 buildlookups: config
 # The lookups library.
 
 buildlookups: config


@@ -959,6 +978,7 @@ buildlookups: config
 
 buildrouters: config
         @cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
 
 buildrouters: config
         @cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \

+          CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \

           FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
         @echo " "
           FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
         @echo " "


@@ -967,6 +987,7 @@ buildrouters: config
 
 buildtransports: config
         @cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
 
 buildtransports: config
         @cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \

+          CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \

           FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
         @echo " "
           FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
         @echo " "


@@ -975,6 +996,7 @@ buildtransports: config
 
 buildauths: config
         @cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
 
 buildauths: config
         @cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \

+          CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \

           FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
         @echo " "
           FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
         @echo " "