diff options
| author | Shiz <hi@shiz.me> | 2017-04-04 14:48:27 +0000 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-05 02:18:31 +0200 |
| commit | 531254631214694d49f06ec344db95c4364015cc (patch) | |
| tree | 25314a9c164ed28f675b278763946135ab990486 /main/opensmtpd/autoconf-decl-checks.patch | |
| parent | f0549fe8dfe56b3035af6e3803d34a573325d853 (diff) | |
| download | aports-531254631214694d49f06ec344db95c4364015cc.tar.bz2 aports-531254631214694d49f06ec344db95c4364015cc.tar.xz | |
main/opensmtpd: update to 6.0.2p1
Removes old LibreSSL patch that seems to be checked properly now,
and fix some incorrect config.h checking. Also refactors the initd
script to be more natural/declarative.
Diffstat (limited to 'main/opensmtpd/autoconf-decl-checks.patch')
| -rw-r--r-- | main/opensmtpd/autoconf-decl-checks.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/main/opensmtpd/autoconf-decl-checks.patch b/main/opensmtpd/autoconf-decl-checks.patch new file mode 100644 index 0000000000..83b2509d25 --- /dev/null +++ b/main/opensmtpd/autoconf-decl-checks.patch @@ -0,0 +1,38 @@ +--- opensmtpd-6.0.2p1/openbsd-compat/defines.h ++++ opensmtpd-6.0.2p1-patched/openbsd-compat/defines.h +@@ -85,7 +85,7 @@ + # define STDERR_FILENO 2 + #endif + +-#if defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK == 0 ++#if !HAVE_DECL_O_NONBLOCK + # define O_NONBLOCK 00004 /* Non Blocking Open */ + #endif + +--- opensmtpd-6.0.2p1/openbsd-compat/openbsd-compat.h ++++ opensmtpd-6.0.2p1-patched/openbsd-compat/openbsd-compat.h +@@ -212,11 +212,11 @@ + #define pledge(promises, paths) 0 + #endif + +-#ifndef HAVE_DECL_AF_LOCAL ++#if !HAVE_DECL_AF_LOCAL + #define AF_LOCAL AF_UNIX + #endif + +-#ifndef HAVE_DECL_WAIT_MYPGRP ++#if !HAVE_DECL_WAIT_MYPGRP + #define WAIT_MYPGRP 0 + #endif + +--- opensmtpd-6.0.2p1/smtpd/to.c ++++ opensmtpd-6.0.2p1-patched/smtpd/to.c +@@ -210,7 +210,7 @@ + #if HAVE_STRUCT_TM_TM_GMTOFF + offset = lt->tm_gmtoff; + tz = lt->tm_zone; +-#elif defined HAVE_DECL_ALTZONE && defined HAVE_DECL_TIMEZONE ++#elif HAVE_DECL_ALTZONE && HAVE_DECL_TIMEZONE + offset = lt->tm_isdst > 0 ? altzone : timezone; + tz = lt->tm_isdst > 0 ? tzname[1] : tzname[0]; + #endif |