diff options
Diffstat (limited to 'mail-mta/sendmail/files')
-rw-r--r-- | mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch | 13 | ||||
-rw-r--r-- | mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch | 52 | ||||
-rw-r--r-- | mail-mta/sendmail/files/sendmail.service | 2 |
3 files changed, 53 insertions, 14 deletions
diff --git a/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch b/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch deleted file mode 100644 index 99ecbe081674..000000000000 --- a/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: sendmail-8.14.4/include/sm/bdb.h -=================================================================== ---- sendmail-8.14.4.orig/include/sm/bdb.h -+++ sendmail-8.14.4/include/sm/bdb.h -@@ -19,7 +19,7 @@ - # define DB_VERSION_MAJOR 1 - # endif /* ! DB_VERSION_MAJOR */ - --# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 -+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 - - # define DBTXN NULL , - diff --git a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch b/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch new file mode 100644 index 000000000000..03281d1990fe --- /dev/null +++ b/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch @@ -0,0 +1,52 @@ +https://bugs.gentoo.org/700108 + +--- sendmail-8.15.2-r1/libmilter/sm_gethost.c.orig 2014-03-04 19:59:45.000000000 -0500 ++++ sendmail-8.15.2-r1/libmilter/sm_gethost.c 2019-11-15 09:32:25.812406080 -0500 +@@ -51,18 +51,21 @@ + { + bool resv6 = true; + struct hostent *h; +- ++#ifdef RES_USE_INET6 + if (family == AF_INET6) + { + /* From RFC2133, section 6.1 */ + resv6 = bitset(RES_USE_INET6, _res.options); + _res.options |= RES_USE_INET6; + } ++#endif + SM_SET_H_ERRNO(0); + h = gethostbyname(name); ++#ifdef RES_USE_INET6 + if (family == AF_INET6 && !resv6) + _res.options &= ~RES_USE_INET6; + ++#endif + /* the function is supposed to return only the requested family */ + if (h != NULL && h->h_addrtype != family) + { +--- sendmail-8.15.2-r2/sendmail/conf.c.orig 2019-11-14 17:36:41.262218822 -0500 ++++ sendmail-8.15.2-r2/sendmail/conf.c 2019-11-15 09:57:43.550284580 -0500 +@@ -4243,18 +4243,21 @@ + + # else /* HAS_GETHOSTBYNAME2 */ + bool resv6 = true; +- ++#ifdef RES_USE_INET6 + if (family == AF_INET6) + { + /* From RFC2133, section 6.1 */ + resv6 = bitset(RES_USE_INET6, _res.options); + _res.options |= RES_USE_INET6; + } ++#endif + SM_SET_H_ERRNO(0); + h = gethostbyname(name); ++#ifdef RES_USE_INET6 + if (!resv6) + _res.options &= ~RES_USE_INET6; + ++#endif + /* the function is supposed to return only the requested family */ + if (h != NULL && h->h_addrtype != family) + { diff --git a/mail-mta/sendmail/files/sendmail.service b/mail-mta/sendmail/files/sendmail.service index 1aeb769ececc..2d268fa1f870 100644 --- a/mail-mta/sendmail/files/sendmail.service +++ b/mail-mta/sendmail/files/sendmail.service @@ -5,7 +5,7 @@ Wants=sm-client.service [Service] Type=forking -PIDFile=/var/run/sendmail.pid +PIDFile=/run/sendmail.pid ExecStartPre=-/usr/bin/newaliases ExecStartPre=-/bin/rm -f /var/spool/mqueue/xf* ExecStart=/usr/sbin/sendmail -bd -q30m -L sm-mta |