From b8312b58cf8951626f7c535a8942a06a559c747e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 12 Nov 2018 12:32:14 -0800 Subject: [PATCH] clamsmtp: Really fix compilation It seems Linux headers are broken/incompatible with musl for some reason. Signed-off-by: Rosen Penev --- mail/clamsmtp/Makefile | 2 +- mail/clamsmtp/patches/010-fix-build.patch | 29 ++++++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile index aa3e31e4f2..3eb6d88beb 100644 --- a/mail/clamsmtp/Makefile +++ b/mail/clamsmtp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=clamsmtp PKG_VERSION:=1.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=http://thewalter.net/stef/software/clamsmtp/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/mail/clamsmtp/patches/010-fix-build.patch b/mail/clamsmtp/patches/010-fix-build.patch index a3d88dceec..a285a77398 100644 --- a/mail/clamsmtp/patches/010-fix-build.patch +++ b/mail/clamsmtp/patches/010-fix-build.patch @@ -1,12 +1,19 @@ -diff --git a/common/sock_any.h b/common/sock_any.h -index 77c3841..1e30974 100644 ---- a/common/sock_any.h -+++ b/common/sock_any.h -@@ -39,7 +39,6 @@ - #ifndef __SOCK_ANY_H__ - #define __SOCK_ANY_H__ - --#include - #include - #include +--- a/configure.in ++++ b/configure.in +@@ -78,16 +78,6 @@ AC_CHECK_HEADERS([limits.h err.h paths.h],,) + AC_CHECK_HEADERS([unistd.h stdio.h stddef.h fcntl.h stdlib.h assert.h errno.h stdarg.h string.h netdb.h], , + [echo "ERROR: Required C header missing"; exit 1]) +-# Check for linux type transparent proxy support +-AC_CHECK_HEADERS([linux/netfilter_ipv4.h], +- AC_DEFINE(LINUX_TRANSPARENT_PROXY, 1, [Whether the system supports a linux type transparent proxy]), +- , +- [[ +- #ifdef HAVE_LIMITS_H +- #include +- #endif +- ]] ) +- + # Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + AC_TYPE_SIZE_T -- 2.30.2