From 3d28296aa71181839c688e0e5d602420f28a1a97 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 16 Jan 2018 18:56:46 +0100 Subject: [PATCH] opensmtpd: add missing patch --- .../patches/cross-no-varrun-check.patch | 39 +++++++++++++++++++ srcpkgs/opensmtpd/template | 3 +- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/opensmtpd/patches/cross-no-varrun-check.patch diff --git a/srcpkgs/opensmtpd/patches/cross-no-varrun-check.patch b/srcpkgs/opensmtpd/patches/cross-no-varrun-check.patch new file mode 100644 index 00000000000..8b3299f1fb8 --- /dev/null +++ b/srcpkgs/opensmtpd/patches/cross-no-varrun-check.patch @@ -0,0 +1,39 @@ +--- configure.ac.orig 2018-01-16 18:25:01.896527503 +0100 ++++ configure.ac 2018-01-16 18:25:27.827424062 +0100 +@@ -1310,36 +1310,6 @@ AC_SUBST([sockdir]) + + # Where to place smtpd.pid + piddir=/var/run +-AC_RUN_IFELSE( +- [ +- AC_LANG_PROGRAM([[ +-#include +-#include +-#ifdef HAVE_PATHS_H +-#include +-#endif +-#define DATA "conftest.piddir" +- ]], +- [[ +-#ifdef _PATH_VARRUN +-FILE *fd; +-int rc; +- +-if ((fd = fopen(DATA,"w")) == NULL) { exit(1); } +-if ((rc = fprintf(fd ,"%s\n", _PATH_VARRUN)) < 0) { exit(2); } +-exit(0); +-#else +-exit(-1); +-#endif +- ]]) +- ], [ +- piddir=`cat conftest.piddir` +- AC_MSG_RESULT([using $piddir from paths.h]) +- ], +- [ +- AC_MSG_RESULT([using $piddir from default value]) +- ] +-) + + AC_ARG_WITH([path-pidfile], + [ --with-path-pidfile=PATH Specify path to smtpd.pid directory (default=/var/run)], diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 6d44d9c8996..9ee86a234ae 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -1,12 +1,11 @@ # Template file for 'opensmtpd' pkgname=opensmtpd version=6.0.3p1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-path-socket=/run --with-mantype=doc --with-pie --with-table-db --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt - --with-path-mbox=/var/mail --with-maildir=/var/mail ac_cv_func_arc4random=yes ac_cv_func_arc4random_buf=yes