commit 832f678ef466cd1b6e853708b9c0433968666908 Author: Juergen Daubert <jue@jue.li> Date: Mon Jan 17 18:19:07 2022 +0100 exim: move pid location to /run diff --git a/exim/.signature b/exim/.signature index ed6adb3e..d947e9c9 100644 --- a/exim/.signature +++ b/exim/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqi5afoarHZqtr6y2x9wU62LttSePehPPpZv7WAWWhlXp39iHD/Ew2QXC7NJ+HukBRSpA5XVXYjBdtYleVp0BCwA= -SHA256 (Pkgfile) = 2ddd91145088d8d96823aca0866fc790dc41a74ea45db4a1a814045e0b9060f4 +RWRJc1FUaeVeqiW5lW+8+wmN4WvHqB0H0zm/TeQydsk+xjw3IT9MXR9ls4MvUmwOKdMoOjHxx2ElbrIFXiIKK+m55ddQ8PDUOgk= +SHA256 (Pkgfile) = 3e9449c39984a6983bbcad73c41ff934226470ea781257657ea0661fa2e6dd36 SHA256 (.footprint) = 3e5fe8471a7a9057c0c7486c016ea2ed1dc5ebd72adc13c23f432ef468d2fc5d SHA256 (exim-4.95.tar.xz) = cc9cb653fff2ea947c3702680b59c99ac0bd1bbf19976d37e22a463cd804f167 -SHA256 (exim) = 850f72cb4d069dc8d15ce138623e6b6a7fe33f5daebe37fbf93c7801fa2d6134 -SHA256 (exim-config.patch) = 9b634234d24679b689a1fb664ddaab98d8f80f9563244dbebbf8a81eeedd541e +SHA256 (exim) = fcc6489769d9b4503f6435747dca79d9f8aca1da05628dc82de6a27335cd27a7 +SHA256 (exim-config.patch) = 174097a1e0f92a6b87f3a9c757c13623113b300d5f3b7b79ef0774bd4a1ca4f3 SHA256 (exim-4.95-openssl30-build-fix.patch) = 86408bbe358d4d074a10e427e62afc0b4e82f17472512317b92fe62e51f25262 diff --git a/exim/Pkgfile b/exim/Pkgfile index e718a8fa..69744cbf 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -5,7 +5,7 @@ name=exim version=4.95 -release=2 +release=3 source=(https://ftp.exim.org/pub/exim/exim4/$name-$version.tar.xz $name $name-config.patch exim-4.95-openssl30-build-fix.patch) diff --git a/exim/exim b/exim/exim index 50ee4869..a05dc18a 100644 --- a/exim/exim +++ b/exim/exim @@ -5,7 +5,7 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/exim -PID=/var/run/exim.pid +PID=/run/exim.pid OPTS="-bd -q15m" CRT=/etc/ssl/certs/exim.crt diff --git a/exim/exim-config.patch b/exim/exim-config.patch index 69c5797d..8781fafa 100644 --- a/exim/exim-config.patch +++ b/exim/exim-config.patch @@ -1,6 +1,6 @@ -diff -Nru exim-4.94.2.orig/src/EDITME exim-4.94.2/src/EDITME ---- exim-4.94.2.orig/src/EDITME 2021-05-04 16:32:05.898523722 +0200 -+++ exim-4.94.2/src/EDITME 2021-05-04 16:32:29.351949411 +0200 +diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME +--- exim-4.95.orig/src/EDITME 2022-01-17 18:08:22.578366880 +0100 ++++ exim-4.95/src/EDITME 2022-01-17 18:12:07.286282151 +0100 @@ -73,7 +73,7 @@ # this would be wanted. ############################################################################### @@ -38,7 +38,7 @@ diff -Nru exim-4.94.2.orig/src/EDITME exim-4.94.2/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 @@ - # If you are buliding with TLS, the library configuration must be done: + # If you are building with TLS, the library configuration must be done: # Uncomment this if you are using OpenSSL -# USE_OPENSSL=yes @@ -50,7 +50,7 @@ diff -Nru exim-4.94.2.orig/src/EDITME exim-4.94.2/src/EDITME # TLS_LIBS=-lssl -lcrypto # TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto -@@ -346,7 +346,7 @@ +@@ -349,7 +349,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.94.2.orig/src/EDITME exim-4.94.2/src/EDITME # SUPPORT_MAILSTORE=yes # SUPPORT_MBX=yes -@@ -406,8 +406,8 @@ +@@ -409,8 +409,8 @@ LOOKUP_LSEARCH=yes LOOKUP_DNSDB=yes @@ -70,7 +70,7 @@ diff -Nru exim-4.94.2.orig/src/EDITME exim-4.94.2/src/EDITME # LOOKUP_IBASE=yes # LOOKUP_JSON=yes # LOOKUP_LDAP=yes -@@ -758,7 +758,7 @@ +@@ -764,7 +764,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.94.2.orig/src/EDITME exim-4.94.2/src/EDITME # AUTH_CYRUS_SASL=yes # AUTH_DOVECOT=yes # AUTH_EXTERNAL=yes -@@ -767,7 +767,7 @@ +@@ -773,7 +773,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.94.2.orig/src/EDITME exim-4.94.2/src/EDITME # AUTH_SPA=yes # AUTH_TLS=yes -@@ -905,7 +905,7 @@ +@@ -911,7 +911,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.94.2.orig/src/EDITME exim-4.94.2/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 -@@ -954,7 +954,7 @@ +@@ -960,7 +960,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.94.2.orig/src/EDITME exim-4.94.2/src/EDITME COMPRESS_SUFFIX=gz -@@ -969,7 +969,7 @@ +@@ -975,7 +975,7 @@ # ZCAT_COMMAND=zcat # # Or specify the full pathname: @@ -115,7 +115,7 @@ diff -Nru exim-4.94.2.orig/src/EDITME exim-4.94.2/src/EDITME #------------------------------------------------------------------------------ # Compiling in support for embedded Perl: If you want to be able to -@@ -1120,7 +1120,7 @@ +@@ -1126,7 +1126,7 @@ # # USE_TCP_WRAPPERS=yes # CFLAGS=-O -I/usr/local/include @@ -124,7 +124,7 @@ diff -Nru exim-4.94.2.orig/src/EDITME exim-4.94.2/src/EDITME # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -1153,7 +1153,7 @@ +@@ -1159,7 +1159,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.94.2.orig/src/EDITME exim-4.94.2/src/EDITME #------------------------------------------------------------------------------ -@@ -1189,7 +1189,7 @@ +@@ -1195,7 +1195,7 @@ #------------------------------------------------------------------------------ # Uncomment this setting to include IPv6 support. @@ -142,7 +142,7 @@ diff -Nru exim-4.94.2.orig/src/EDITME exim-4.94.2/src/EDITME ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # -@@ -1210,13 +1210,13 @@ +@@ -1216,13 +1216,13 @@ # haven't got Perl, Exim will still build and run; you just won't be able to # use those utilities. @@ -163,18 +163,18 @@ diff -Nru exim-4.94.2.orig/src/EDITME exim-4.94.2/src/EDITME #------------------------------------------------------------------------------ -@@ -1418,7 +1418,7 @@ +@@ -1424,7 +1424,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: -# PID_FILE_PATH=/var/lock/exim.pid -+PID_FILE_PATH=/var/run/exim.pid ++PID_FILE_PATH=/run/exim.pid # 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.94.2.orig/src/configure.default exim-4.94.2/src/configure.default ---- exim-4.94.2.orig/src/configure.default 2021-05-04 16:32:05.898523722 +0200 -+++ exim-4.94.2/src/configure.default 2021-05-04 16:32:29.351949411 +0200 +diff -Nru exim-4.95.orig/src/configure.default exim-4.95/src/configure.default +--- exim-4.95.orig/src/configure.default 2022-01-17 18:08:22.578366880 +0100 ++++ exim-4.95/src/configure.default 2022-01-17 18:10:47.748198676 +0100 @@ -67,7 +67,7 @@ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: @@ -194,4 +194,4 @@ diff -Nru exim-4.94.2.orig/src/configure.default exim-4.94.2/src/configure.defau +tls_privatekey = /etc/ssl/keys/exim.key # For OpenSSL, prefer EC- over RSA-authenticated ciphers - # tls_require_ciphers = ECDSA:RSA:!COMPLEMENTOFDEFAULT + .ifdef _HAVE_OPENSSL