commit 4c9bf424abd1498b08dc83f4fcaf0812ccbc5db1 Author: Juergen Daubert <jue@jue.li> Date: Sun Nov 5 17:56:25 2023 +0100 exim: update to 4.97 diff --git a/exim/.footprint b/exim/.footprint index 73a0c96d..030d5bba 100644 --- a/exim/.footprint +++ b/exim/.footprint @@ -21,6 +21,7 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/exim_dumpdb -rwxr-xr-x root/root usr/sbin/exim_fixdb -rwxr-xr-x root/root usr/sbin/exim_lock +-rwxr-xr-x root/root usr/sbin/exim_msgdate -rwxr-xr-x root/root usr/sbin/exim_tidydb -rwxr-xr-x root/root usr/sbin/eximstats -rwxr-xr-x root/root usr/sbin/exinext diff --git a/exim/.signature b/exim/.signature index 6fb2c895..09b5bf24 100644 --- a/exim/.signature +++ b/exim/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqhq+V/Wlh94oZnIujiF0lf9LU8vIb6tZpJAXAXFFkrUZmAkPyAuSO7V9rATUg9+g68k2PkWrFOxJOutljP8PxQc= -SHA256 (Pkgfile) = 77ab008dbd6135151903b2a7a7df92f97a97776c6e65b4b65718478190aba62b -SHA256 (.footprint) = 3e5fe8471a7a9057c0c7486c016ea2ed1dc5ebd72adc13c23f432ef468d2fc5d -SHA256 (exim-4.96.2.tar.xz) = 038e327e8d1e93d005bac9bb06fd22aec44d5028930d6dbe8817ad44bbfc1de6 +RWRJc1FUaeVeqqUqD3Q1aIPmevrHLdbeE7qAae4jmTNCiDUI5XtyXsmZUZfBaWvrCYNRx3dW30sKtEDPDb3uiWPi0qyPzJqiJgA= +SHA256 (Pkgfile) = cac8ea3fbc4343de21188d71ac1677e7fe1e673efe9c1e5a65add14f4dc0f9e6 +SHA256 (.footprint) = ea3802c2571c2652b12d43cfb5d843810d15f43a991c3b4a6e1e807c27bb6c78 +SHA256 (exim-4.97.tar.xz) = 428150e67c494fa14fe5195d81b972c1b23e651ee4f9f2ff1788250266d31e9c SHA256 (exim) = fcc6489769d9b4503f6435747dca79d9f8aca1da05628dc82de6a27335cd27a7 -SHA256 (exim-config.patch) = 7cc7b24a7a28215d88fb70b0e8ed7c9e02c780b0f207ece81574e59111a7f405 +SHA256 (exim-config.patch) = 5b1843a12f62e830712cffcbc1fc585887e8fafcebc59cc47e299b2eefe54f96 +SHA256 (disable-id_update.patch) = f0deb49dc795a4f3c8094e73f92b923fed517b549c24864086f0996059947c88 diff --git a/exim/Pkgfile b/exim/Pkgfile index 86ac92da..766116a4 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -4,14 +4,16 @@ # Depends on: db libpcre2 openssl name=exim -version=4.96.2 +version=4.97 release=1 source=(https://ftp.exim.org/pub/exim/exim4/$name-$version.tar.xz - $name $name-config.patch) + $name $name-config.patch disable-id_update.patch) build() { cd $name-$version + patch -p1 -i $SRC/disable-id_update.patch + sed "s/#CFLAGS#/$CFLAGS/" $SRC/$name-config.patch | patch -p1 cp src/EDITME Local/Makefile diff --git a/exim/disable-id_update.patch b/exim/disable-id_update.patch new file mode 100644 index 00000000..19a8d293 --- /dev/null +++ b/exim/disable-id_update.patch @@ -0,0 +1,24 @@ +diff -Nru exim-4.97.orig/OS/Makefile-Base exim-4.97/OS/Makefile-Base +--- exim-4.97.orig/OS/Makefile-Base 2023-11-05 11:02:35.022263083 +0100 ++++ exim-4.97/OS/Makefile-Base 2023-11-05 11:03:51.618346653 +0100 +@@ -253,7 +253,7 @@ + transport-filter.pl convert4r3 convert4r4 \ + exim_checkaccess \ + exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb \ +- exim_lock exim_msgdate exim_id_update ++ exim_lock exim_msgdate + + + # Targets for special-purpose configuration header builders +diff -Nru exim-4.97.orig/scripts/exim_install exim-4.97/scripts/exim_install +--- exim-4.97.orig/scripts/exim_install 2023-11-05 11:02:35.018929775 +0100 ++++ exim-4.97/scripts/exim_install 2023-11-05 11:07:26.016688640 +0100 +@@ -198,7 +198,7 @@ + set exim${EXE} ${exim_monitor} exim_dumpdb${EXE} exim_fixdb${EXE} \ + exim_tidydb${EXE} exinext exiwhat exim_dbmbuild${EXE} exicyclog \ + exigrep eximstats exipick exiqgrep exiqsumm exim_lock${EXE} \ +- exim_checkaccess exim_msgdate exim_id_update ++ exim_checkaccess exim_msgdate + fi + + echo $com "" diff --git a/exim/exim-config.patch b/exim/exim-config.patch index e772823f..eadd827b 100644 --- a/exim/exim-config.patch +++ b/exim/exim-config.patch @@ -1,7 +1,7 @@ -diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME ---- exim-4.96.1.orig/src/EDITME 2023-10-02 14:52:52.316712933 +0200 -+++ exim-4.96.1/src/EDITME 2023-10-02 14:53:24.177000884 +0200 -@@ -73,7 +73,7 @@ +diff -Nru exim-4.97.orig/src/EDITME exim-4.97/src/EDITME +--- exim-4.97.orig/src/EDITME 2023-11-05 11:02:35.018929775 +0100 ++++ exim-4.97/src/EDITME 2023-11-05 11:09:56.482201757 +0100 +@@ -75,7 +75,7 @@ # this would be wanted. ############################################################################### @@ -10,7 +10,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME ############################################################################### # THESE ARE THINGS YOU MUST SPECIFY # -@@ -99,7 +99,7 @@ +@@ -101,7 +101,7 @@ # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. @@ -19,7 +19,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME #------------------------------------------------------------------------------ -@@ -115,7 +115,7 @@ +@@ -117,7 +117,7 @@ # don't exist. It will also install a default runtime configuration if this # file does not exist. @@ -28,7 +28,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. # In this case, Exim will use the first of them that exists when it is run. -@@ -132,7 +132,7 @@ +@@ -134,7 +134,7 @@ # deliveries. (Local deliveries run as various non-root users, typically as the # owner of a local mailbox.) Specifying these values as root is not supported. @@ -37,7 +37,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # If you specify EXIM_USER as a name, this is looked up at build time, and the # uid number is built into the binary. However, you can specify that this -@@ -210,10 +210,10 @@ +@@ -212,10 +212,10 @@ # If you are building with TLS, the library configuration must be done: # Uncomment this if you are using OpenSSL @@ -50,7 +50,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # TLS_LIBS=-lssl -lcrypto # TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto -@@ -349,7 +349,7 @@ +@@ -351,7 +351,7 @@ # MBX, is included only when requested. If you do not know what this is about, # leave these settings commented out. @@ -59,7 +59,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # SUPPORT_MAILSTORE=yes # SUPPORT_MBX=yes -@@ -409,8 +409,8 @@ +@@ -411,8 +411,8 @@ LOOKUP_LSEARCH=yes LOOKUP_DNSDB=yes @@ -70,7 +70,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # LOOKUP_IBASE=yes # LOOKUP_JSON=yes # LOOKUP_LDAP=yes -@@ -754,7 +754,7 @@ +@@ -785,7 +785,7 @@ # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -79,7 +79,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # AUTH_CYRUS_SASL=yes # AUTH_DOVECOT=yes # AUTH_EXTERNAL=yes -@@ -763,7 +763,7 @@ +@@ -794,7 +794,7 @@ # AUTH_HEIMDAL_GSSAPI=yes # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5 @@ -88,7 +88,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # AUTH_SPA=yes # AUTH_TLS=yes -@@ -901,7 +901,7 @@ +@@ -932,7 +932,7 @@ # %s. This will be replaced by one of the strings "main", "panic", or "reject" # to form the final file names. Some installations may want something like this: @@ -97,7 +97,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # which results in files with names /var/log/exim_mainlog, etc. The directory # in which the log files are placed must exist; Exim does not try to create -@@ -950,7 +950,7 @@ +@@ -981,7 +981,7 @@ # files. Both the name of the command and the suffix that it adds to files # need to be defined here. See also the EXICYCLOG_MAX configuration. @@ -106,7 +106,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME COMPRESS_SUFFIX=gz -@@ -965,7 +965,7 @@ +@@ -996,7 +996,7 @@ # ZCAT_COMMAND=zcat # # Or specify the full pathname: @@ -115,7 +115,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME #------------------------------------------------------------------------------ # Compiling in support for embedded Perl: If you want to be able to -@@ -1116,7 +1116,7 @@ +@@ -1147,7 +1147,7 @@ # # USE_TCP_WRAPPERS=yes # CFLAGS=-O -I/usr/local/include @@ -124,7 +124,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -1149,7 +1149,7 @@ +@@ -1180,7 +1180,7 @@ # aliases). The following setting can be changed to specify a different # location for the system alias file. @@ -133,7 +133,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME #------------------------------------------------------------------------------ -@@ -1185,7 +1185,7 @@ +@@ -1216,7 +1216,7 @@ #------------------------------------------------------------------------------ # Uncomment this setting to include IPv6 support. @@ -142,7 +142,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # -@@ -1206,13 +1206,13 @@ +@@ -1237,13 +1237,13 @@ # haven't got Perl, Exim will still build and run; you just won't be able to # use those utilities. @@ -163,7 +163,7 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME #------------------------------------------------------------------------------ -@@ -1414,7 +1414,7 @@ +@@ -1445,7 +1445,7 @@ # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: @@ -172,9 +172,9 @@ diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". -diff -Nru exim-4.96.1.orig/src/configure.default exim-4.96.1/src/configure.default ---- exim-4.96.1.orig/src/configure.default 2023-10-02 14:52:52.316712933 +0200 -+++ exim-4.96.1/src/configure.default 2023-10-02 14:53:24.177000884 +0200 +diff -Nru exim-4.97.orig/src/configure.default exim-4.97/src/configure.default +--- exim-4.97.orig/src/configure.default 2023-11-05 11:02:35.018929775 +0100 ++++ exim-4.97/src/configure.default 2023-11-05 11:09:56.482201757 +0100 @@ -67,7 +67,7 @@ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: