Clear previous message results before continued-delivery

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

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 29c0374013e0f3f820c9e90f5c97ac6600750086..afa2a7a2315918264a0b3edfd3308ac316eea53b 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)


@@ -39,6 +39,9 @@ FE       = $(FULLECHO)
 all:       utils exim
 config:    $(EDITME) checklocalmake Makefile os.c config.h version.h version.sh macro.c
 
 all:       utils exim
 config:    $(EDITME) checklocalmake Makefile os.c config.h version.h version.sh macro.c
 

+exim_openssl exim_gnutls: clean exim
+       cp exim $@
+

 checklocalmake:
        @if $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(OSTYPE) $(EDITME) || \
          $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(ARCHTYPE) $(EDITME) || \
 checklocalmake:
        @if $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(OSTYPE) $(EDITME) || \
          $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(ARCHTYPE) $(EDITME) || \


@@ -105,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


@@ -249,8 +252,8 @@ utils: $(EXIM_MONITOR) exicyclog exinext exiwhat \
         exigrep eximstats exipick exiqgrep exiqsumm \
         transport-filter.pl convert4r3 convert4r4 \
         exim_checkaccess \
         exigrep eximstats exipick exiqgrep exiqsumm \
         transport-filter.pl convert4r3 convert4r4 \
         exim_checkaccess \

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

 
 
 # Targets for special-purpose configuration header builders
 
 
 # Targets for special-purpose configuration header builders


@@ -284,6 +287,7 @@ exicyclog: config ../src/exicyclog.src
          ../src/exicyclog.src > exicyclog-t
        @mv exicyclog-t exicyclog
        @chmod a+x exicyclog
          ../src/exicyclog.src > exicyclog-t
        @mv exicyclog-t exicyclog
        @chmod a+x exicyclog

+       @./exicyclog -v 2>&1 >/dev/null

        @echo ">>> exicyclog script built"
 
 # Target for the exinext utility script
        @echo ">>> exicyclog script built"
 
 # Target for the exinext utility script


@@ -301,6 +305,7 @@ exinext: config ../src/exinext.src
          ../src/exinext.src > exinext-t
        @mv exinext-t exinext
        @chmod a+x exinext
          ../src/exinext.src > exinext-t
        @mv exinext-t exinext
        @chmod a+x exinext

+       @./exinext -v 2>&1 >/dev/null

        @echo ">>> exinext script built"
 
 # Target for the exiwhat utility script
        @echo ">>> exinext script built"
 
 # Target for the exiwhat utility script


@@ -325,6 +330,7 @@ exiwhat: config ../src/exiwhat.src
          ../src/exiwhat.src > exiwhat-t
        @mv exiwhat-t exiwhat
        @chmod a+x exiwhat
          ../src/exiwhat.src > exiwhat-t
        @mv exiwhat-t exiwhat
        @chmod a+x exiwhat

+       @./exiwhat -v 2>&1 >/dev/null

        @echo ">>> exiwhat script built"
 
 # Target for the exim_checkaccess utility script
        @echo ">>> exiwhat script built"
 
 # Target for the exim_checkaccess utility script


@@ -343,6 +349,7 @@ exim_checkaccess: config ../src/exim_checkaccess.src
          ../src/exim_checkaccess.src > exim_checkaccess-t
        @mv exim_checkaccess-t exim_checkaccess
        @chmod a+x exim_checkaccess
          ../src/exim_checkaccess.src > exim_checkaccess-t
        @mv exim_checkaccess-t exim_checkaccess
        @chmod a+x exim_checkaccess

+       # @./exim_checkaccess -v 2>&1 >/dev/null

        @echo ">>> exim_checkaccess script built"; echo ""
 
 # Target for the Exim monitor start-up script
        @echo ">>> exim_checkaccess script built"; echo ""
 
 # Target for the Exim monitor start-up script


@@ -363,6 +370,7 @@ eximon: config ../src/eximon.src ../OS/eximon.conf-Default \
          -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
          -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
          ../src/eximon.src >> eximon
          -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
          -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
          ../src/eximon.src >> eximon

+       @./eximon -v 2>&1 >/dev/null

        @echo ">>> eximon script built"; echo ""
 
 # Targets for utilities; these are all Perl scripts that have to get the
        @echo ">>> eximon script built"; echo ""
 
 # Targets for utilities; these are all Perl scripts that have to get the


@@ -382,6 +390,7 @@ exigrep: config ../src/exigrep.src
          ../src/exigrep.src > exigrep-t
        @mv exigrep-t exigrep
        @chmod a+x exigrep
          ../src/exigrep.src > exigrep-t
        @mv exigrep-t exigrep
        @chmod a+x exigrep

+       @./exigrep --version 2>&1 >/dev/null

        @echo ">>> exigrep script built"
 
 exim_msgdate: config ../src/exim_msgdate.src
        @echo ">>> exigrep script built"
 
 exim_msgdate: config ../src/exim_msgdate.src


@@ -399,6 +408,7 @@ exim_msgdate: config ../src/exim_msgdate.src
          ../src/exim_msgdate.src > exim_msgdate-t
        @mv exim_msgdate-t exim_msgdate
        @chmod a+x exim_msgdate
          ../src/exim_msgdate.src > exim_msgdate-t
        @mv exim_msgdate-t exim_msgdate
        @chmod a+x exim_msgdate

+       @./exim_msgdate -v 2>&1 >/dev/null

        @echo ">>> exim_msgdate script built"
 
 eximstats: config ../src/eximstats.src
        @echo ">>> exim_msgdate script built"
 
 eximstats: config ../src/eximstats.src


@@ -410,6 +420,7 @@ eximstats: config ../src/eximstats.src
          ../src/eximstats.src > eximstats-t
        @mv eximstats-t eximstats
        @chmod a+x eximstats
          ../src/eximstats.src > eximstats-t
        @mv eximstats-t eximstats
        @chmod a+x eximstats

+       @./eximstats -v 2>&1 >/dev/null

        @echo ">>> eximstats script built"
 
 exiqgrep: config ../src/exiqgrep.src
        @echo ">>> eximstats script built"
 
 exiqgrep: config ../src/exiqgrep.src


@@ -425,6 +436,7 @@ exiqgrep: config ../src/exiqgrep.src
          ../src/exiqgrep.src > exiqgrep-t
        @mv exiqgrep-t exiqgrep
        @chmod a+x exiqgrep
          ../src/exiqgrep.src > exiqgrep-t
        @mv exiqgrep-t exiqgrep
        @chmod a+x exiqgrep

+       @./exiqgrep -v 2>&1 >/dev/null

        @echo ">>> exiqgrep script built"
 
 exiqsumm: config ../src/exiqsumm.src
        @echo ">>> exiqgrep script built"
 
 exiqsumm: config ../src/exiqsumm.src


@@ -436,6 +448,7 @@ exiqsumm: config ../src/exiqsumm.src
          ../src/exiqsumm.src > exiqsumm-t
        @mv exiqsumm-t exiqsumm
        @chmod a+x exiqsumm
          ../src/exiqsumm.src > exiqsumm-t
        @mv exiqsumm-t exiqsumm
        @chmod a+x exiqsumm

+       @./exiqsumm -v 2>&1 >/dev/null

        @echo ">>> exiqsumm script built"
 
 exipick: config ../src/exipick.src
        @echo ">>> exiqsumm script built"
 
 exipick: config ../src/exipick.src


@@ -449,8 +462,23 @@ exipick: config ../src/exipick.src
          ../src/exipick.src > exipick-t
        @mv exipick-t exipick
        @chmod a+x exipick
          ../src/exipick.src > exipick-t
        @mv exipick-t exipick
        @chmod a+x exipick

+       @./exipick -v 2>&1 >/dev/null

        @echo ">>> exipick script built"
 
        @echo ">>> exipick script built"
 

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

 transport-filter.pl: config ../src/transport-filter.src
        @rm -f transport-filter.pl
        @. ./version.sh && sed \
 transport-filter.pl: config ../src/transport-filter.src
        @rm -f transport-filter.pl
        @. ./version.sh && sed \


@@ -471,6 +499,7 @@ convert4r3: config ../src/convert4r3.src
          ../src/convert4r3.src > convert4r3-t
        @mv convert4r3-t convert4r3
        @chmod a+x convert4r3
          ../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
        @echo ">>> convert4r3 script built"
 
 convert4r4: config ../src/convert4r4.src


@@ -482,6 +511,7 @@ convert4r4: config ../src/convert4r4.src
          ../src/convert4r4.src > convert4r4-t
        @mv convert4r4-t convert4r4
        @chmod a+x convert4r4
          ../src/convert4r4.src > convert4r4-t
        @mv convert4r4-t convert4r4
        @chmod a+x convert4r4

+       @./convert4r4 -v 2>&1 >/dev/null

        @echo ">>> convert4r4 script built"
 
 
        @echo ">>> convert4r4 script built"
 
 


@@ -497,7 +527,8 @@ OBJ_EXPERIMENTAL =  arc.o \
                        dmarc.o \
                        imap_utf7.o \
                        spf.o \
                        dmarc.o \
                        imap_utf7.o \
                        spf.o \

-                       utf8.o
+                       utf8.o \
+                       xclient.o

 
 # Targets for final binaries; the main one has a build number which is
 # updated each time. We don't bother with that for the auxiliaries.
 
 # Targets for final binaries; the main one has a build number which is
 # updated each time. We don't bother with that for the auxiliaries.


@@ -508,7 +539,7 @@ 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 dnsbl.o hash.o \
         header.o host.o host_address.o ip.o log.o lss.o match.o md5.o moan.o \
         directory.o dns.o drtables.o enq.o exim.o expand.o filter.o \
         filtertest.o globals.o dkim.o dkim_transport.o dnsbl.o hash.o \
         header.o host.o host_address.o ip.o log.o lss.o match.o md5.o moan.o \

-        os.o parse.o priv.o queue.o \
+        os.o parse.o priv.o proxy.o queue.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 \


@@ -633,7 +664,7 @@ OBJ_MONBIN = util-host_address.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


@@ -667,6 +698,7 @@ HDRS  =     blob.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


@@ -680,6 +712,7 @@ PHDRS = ../config.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
 


@@ -824,6 +857,7 @@ moan.o:          $(HDRS) moan.c
 os.o:            $(HDRS) $(OS_C_INCLUDES) os.c
 parse.o:         $(HDRS) parse.c
 priv.o:          $(HDRS) priv.c
 os.o:            $(HDRS) $(OS_C_INCLUDES) os.c
 parse.o:         $(HDRS) parse.c
 priv.o:          $(HDRS) priv.c

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

 queue.o:         $(HDRS) queue.c
 rda.o:           $(HDRS) rda.c
 readconf.o:      $(HDRS) readconf.c
 queue.o:         $(HDRS) queue.c
 rda.o:           $(HDRS) rda.c
 readconf.o:      $(HDRS) readconf.c


@@ -872,6 +906,7 @@ dmarc.o:    $(HDRS) pdkim/pdkim.h dmarc.h dmarc.c
 imap_utf7.o:   $(HDRS) imap_utf7.c
 spf.o:         $(HDRS) spf.h spf.c
 utf8.o:                $(HDRS) utf8.c
 imap_utf7.o:   $(HDRS) imap_utf7.c
 spf.o:         $(HDRS) spf.h spf.c
 utf8.o:                $(HDRS) utf8.c

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

 
 # The module containing tables of available lookups, routers, auths, and
 # transports must be rebuilt if any of them are. However, because the makefiles
 
 # The module containing tables of available lookups, routers, auths, and
 # transports must be rebuilt if any of them are. However, because the makefiles