From patchwork Wed Mar 11 15:01:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1036 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.27.255.54]) by backend30.mail.ord1d.rsapps.net with LMTP id SB7NMH4Hal7GWAAAIUCqbw for ; Thu, 12 Mar 2020 05:57:18 -0400 Received: from proxy3.mail.iad3a.rsapps.net ([172.27.255.54]) by director12.mail.ord1d.rsapps.net with LMTP id oG19Ln4Hal6MEAAAIasKDg ; Thu, 12 Mar 2020 05:57:18 -0400 Received: from smtp17.gate.iad3a ([172.27.255.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3a.rsapps.net with LMTP id 4AzaKX4Hal41VgAAYaqY3Q ; Thu, 12 Mar 2020 05:57:18 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp17.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: db89ae40-6447-11ea-835d-525400723ca9-1-1 Received: from [216.105.38.7] ([216.105.38.7:34396] helo=lists.sourceforge.net) by smtp17.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 96/2D-18103-E770A6E5; Thu, 12 Mar 2020 05:57:18 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jCKZq-00053O-7z; Thu, 12 Mar 2020 09:56:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jCKZn-00052i-CU for openvpn-devel@lists.sourceforge.net; Thu, 12 Mar 2020 09:56:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=pPPVCYnfCgaz5ErDhhkakfv9RM6oUwKIVQNV8Im3vZo=; b=GZfveQJI7rj8rWL3M7u5GJzqOg lKAN8efjWO163EO7T8/4GU2KMVE0dqGXsiXCz8eOPTny5diQFwoPnOmhTO/WFj9XeMivpYfRyCfh/ HW7lN7+LPav/siwOftHIqU87r16pgKDKtJLATWFQbWTCNj87S2I2+GRUUSQNQXLxnqXA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=pPPVCYnfCgaz5ErDhhkakfv9RM6oUwKIVQNV8Im3vZo=; b=fIiErZkpK6CduH0Lwy/itLRD13 ruyxdPIupXy+n9T2EvIMGeR8tjVpwVOvaBsagnDwqQ1sPs/nrKB9hQdxc7yTGX1CNP9oeYqfFCPAC 8SCeAxfFm/NEEXKs/LpN/EufA0fD5UGBopnd7DcUk4/ZIbpWxxyXZXSbzLIaH39d3zN4=; Received: from mail-qk1-f196.google.com ([209.85.222.196]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1jCKZh-009EaY-Le for openvpn-devel@lists.sourceforge.net; Thu, 12 Mar 2020 09:56:27 +0000 Received: by mail-qk1-f196.google.com with SMTP id d8so5100292qka.2 for ; Thu, 12 Mar 2020 02:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=pPPVCYnfCgaz5ErDhhkakfv9RM6oUwKIVQNV8Im3vZo=; b=Zj6z9/jmbmrKVnG03QnU8W7cX8lGxUjahnd+tGerUOWnvVr7Yd3f0fZqexIwVMQToU cOlDIzLL0kMDGuOfZEkibDA9gqpTqej5tHuPyFp2igv3FCkXZVAwLhx1PmWc6Yi7Znr7 HKmuImtwQzRq6y93YsXdSVhiPgZ9i2x//7DvpOWOAp5OzuSKI7rdbZuzBVTckn8aEiUb KqueiAnnVxTBPEInWgrraMU5LLlC+oYarX1w9qe9AgUfgkqHnWfwm8PE/Jes/2Ezanp5 u7ghM6SCg1/M6+MWFV2MvNfouRe/2gQTAXTpaakot80a3uHjQtimsjj6PpWALIot3QG5 Qhag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pPPVCYnfCgaz5ErDhhkakfv9RM6oUwKIVQNV8Im3vZo=; b=RpJsD9vkJIU5GnfdwnTR7gx+ykHr/r62/xW9QrSvvHTIDHQqa9gJkfzLwt0v8DpxBP jNzNe9WcgHcYUw63PFOIalo6zrbPlLPAhteH6dAvTeLcwaoEOnAcBELRRF/o6D9m9uJ3 Wqi+egZAHv1b+90j/Ob/AgjFURSxXaaxiE264lD/bW7fdqwm12NFYB5tSlKlY3Xpbk7l TU6+Ve2TBZqWYdxrYL+TXVU+8ZZCSAAKbeJBg068xjNk+265E26/2gym/sQkf6QyQXHf Pm7ybE/ujnpuM5nS7ranayupwVqxj3tePMRv4Tk5IktggzuxlWCGwgBe0YKlgxteP6st zCaQ== X-Gm-Message-State: ANhLgQ31swED8+tN1s76WcyoDTOVvPhqX4lbeye7vp5DuvFyJRI8QHdi npwfkpNVAdC2+TfJHA8+g6kjFy5Y X-Google-Smtp-Source: ADFU+vuZSs2eYiUm2BINIjdqliBdS4DgVtM0ODaRU/lPoleHDIWpMM8V0zc3PFx7bA9sP7ptWNi16Q== X-Received: by 2002:a37:cc5:: with SMTP id 188mr7059552qkm.161.1584006975081; Thu, 12 Mar 2020 02:56:15 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat2.panoulu.net. [185.38.2.2]) by smtp.gmail.com with ESMTPSA id i28sm27906076qtc.57.2020.03.12.02.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 02:56:14 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 12 Mar 2020 04:01:35 +0200 Message-Id: <20200312020135.20510-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: configure.ac] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.222.196 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.222.196 listed in wl.mailspike.net] 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1jCKZh-009EaY-Le Subject: [Openvpn-devel] [PATCH] Fix building with --enable-async-push in FreeBSD X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This option can be used in FreedBSD with devel/libinotify installed, however it requires linkage with -linotify. Trac #1256 Signed-off-by: Lev Stipakov --- configure.ac | 4 ++++ src/openvpn/Makefile.am | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a47ef3e7..d3a4158a 100644 --- a/configure.ac +++ b/configure.ac @@ -1344,6 +1344,9 @@ if test "${enable_async_push}" = "yes"; then AC_DEFINE([ENABLE_ASYNC_PUSH], [1], [Enable async push]), AC_MSG_ERROR([inotify.h not found.]) ) + case "$host" in + *-*-freebsd*) OPTIONAL_INOTIFY_LIBS="-linotify";; + esac fi CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`" @@ -1370,6 +1373,7 @@ AC_SUBST([OPTIONAL_LZ4_LIBS]) AC_SUBST([OPTIONAL_SYSTEMD_LIBS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_CFLAGS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS]) +AC_SUBST([OPTIONAL_INOTIFY_LIBS]) AC_SUBST([PLUGIN_AUTH_PAM_CFLAGS]) AC_SUBST([PLUGIN_AUTH_PAM_LIBS]) diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index 2ea47cda..b924014d 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -137,7 +137,8 @@ openvpn_LDADD = \ $(OPTIONAL_CRYPTO_LIBS) \ $(OPTIONAL_SELINUX_LIBS) \ $(OPTIONAL_SYSTEMD_LIBS) \ - $(OPTIONAL_DL_LIBS) + $(OPTIONAL_DL_LIBS) \ + $(OPTIONAL_INOTIFY_LIBS) if WIN32 openvpn_SOURCES += openvpn_win32_resources.rc block_dns.c block_dns.h ring_buffer.c ring_buffer.h openvpn_LDADD += -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm -lfwpuclnt -lrpcrt4 -lncrypt -lsetupapi