From patchwork Wed Mar 11 16:03:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1037 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id YPuHKw4Wal4fPAAAIUCqbw for ; Thu, 12 Mar 2020 06:59:26 -0400 Received: from proxy1.mail.ord1c.rsapps.net ([172.28.255.1]) by director12.mail.ord1d.rsapps.net with LMTP id EM9ZKw4Wal7iEQAAIasKDg ; Thu, 12 Mar 2020 06:59:26 -0400 Received: from smtp40.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.ord1c.rsapps.net with LMTP id SOCnKg4Wal69ZAAA2VeTtA ; Thu, 12 Mar 2020 06:59:26 -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: smtp40.gate.ord1c.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: 89abb7f4-6450-11ea-b8cf-525400b3abc9-1-1 Received: from [216.105.38.7] ([216.105.38.7:40048] helo=lists.sourceforge.net) by smtp40.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 3B/6A-15264-E061A6E5; Thu, 12 Mar 2020 06:59:26 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jCLXb-0002Sm-Au; Thu, 12 Mar 2020 10:58:15 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jCLXZ-0002Sd-EV for openvpn-devel@lists.sourceforge.net; Thu, 12 Mar 2020 10:58:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sPjRkgPs3M6AQKXhxtvMpE9+L7PiOoLdi2luN4HKHus=; b=FSnu4uFyEIHydH1yK/MB/sAlB0 /wl6H6+vEr9LTJ3PAYxX6VmjAi9iUHutAuZaDB+LtL59NeroQS4CHpzSAffAxSAc6CeE/cUWYTD2J KU2Mb78m2++TyKW6nkY2sWN//DdIioOyaLpfPiiNaKIKFX+uM8obH7Za5db8cxnSy70M=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=sPjRkgPs3M6AQKXhxtvMpE9+L7PiOoLdi2luN4HKHus=; b=Y+nIHSeap434PtZOVoh//CaIt+ cx5JmIaktkTcnjhMW3BjLzULe2cdea/ZCOqVjDHhDRmnFJUtvDJ+UEgibxtBs+MqBIeaDECi3xWJH llqsKyR47YYP/3SIs901xFIVoOyITtj9N5sTfy8KcqwIWJX5FSk/ibISlvf1HGd6sIQ8=; Received: from mail-qt1-f181.google.com ([209.85.160.181]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1jCLXV-005bHk-BD for openvpn-devel@lists.sourceforge.net; Thu, 12 Mar 2020 10:58:13 +0000 Received: by mail-qt1-f181.google.com with SMTP id f17so2626744qtq.6 for ; Thu, 12 Mar 2020 03:58:09 -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:in-reply-to:references; bh=sPjRkgPs3M6AQKXhxtvMpE9+L7PiOoLdi2luN4HKHus=; b=Mp+1WRT/xRtLD8uTNnDYj1giw0ShP/RvuD8fUXA/GX3Y/rPghXhDZyYEUZ6bzYtKb8 3XxdqV0AHvJEBXnLG6sizGb351C8L6jZT9Ni6WyE2nM46nqLYwKm5Hws7YYUx3EEq0Gv IKwr+pouhSOr8HboqDPNnlrncohisM+/2N2P3sBCIWNP9Ym/P2OOev6PwIhS0RloiW/H AnLt0sOv6hA7D1+xzkCINsittQlm6VLihf7zF5pvnGQ7qkI7nhNapQiZMZA3/IKHW2gU ToNumeJ89uyADbV0o5xcJ8GuqX7bI8ZhMw9n8aLgd3RMTrGyfbg0LtqD2L3DuKTFZMot reFg== 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:in-reply-to :references; bh=sPjRkgPs3M6AQKXhxtvMpE9+L7PiOoLdi2luN4HKHus=; b=LFr5V7A17Nl6BTu3PYi+FuBZttm9UTMgdLZ0nepe6kg54BgR7a8bEM8Sy8CfKIyBgL K59tSWosq+hXWwStCF7ke7U7E9a87OCSmtxE2fhDRNlZoSPmCpruQy0Je8dO1gvi/2F4 a/HJhGm8O/hVMz5vlPkK/hYZJh19RE2OZ0hzx3QWnXheIvQ7IYHGbgwZFa/bxDbVUHHX MyodsrAV9JlqlZGeAWgIqdJo4y7pf54TGxabCuGghOiUkmCJiNdRRDMdlouAYuLQLThh 0YOE4XmfP+i91PMG41k1tin0axf5hzMkEsSgTTFSJho7d+ueIOXKTrUlvs3soTNPQgSa td9g== X-Gm-Message-State: ANhLgQ2IF7PTlriq3L5Fa/9WaX3jxNAiKjdJ4SMdF/KntjUusZ7y3xyv J0Va9VbWXlcykJ2n/quIh8AfFFuA X-Google-Smtp-Source: ADFU+vskry5pYBC35BXlmJe5KXUhPNTud95gqTNxnlMdFwYelfeDjYUAsQsHM9hor4UplsvgX4A3AA== X-Received: by 2002:ac8:7b5b:: with SMTP id m27mr6453150qtu.317.1584010682914; Thu, 12 Mar 2020 03:58:02 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat4.panoulu.net. [185.38.2.4]) by smtp.gmail.com with ESMTPSA id p24sm7445869qtq.37.2020.03.12.03.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 03:58:02 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 12 Mar 2020 05:03:23 +0200 Message-Id: <20200312030323.19293-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200312020135.20510-1-lstipakov@gmail.com> References: <20200312020135.20510-1-lstipakov@gmail.com> 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: makefile.am] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.160.181 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.160.181 listed in list.dnswl.org] 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 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1jCLXV-005bHk-BD Subject: [Openvpn-devel] [PATCH v2] 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. Detect presence of libinotify and link with its _LIBS variable. Trac #1256 Signed-off-by: Lev Stipakov --- v2: use PKG_CHECK_MODULES instead of hardcoded -linotify configure.ac | 9 +++++++++ src/openvpn/Makefile.am | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a47ef3e7..085e7b69 100644 --- a/configure.ac +++ b/configure.ac @@ -1344,6 +1344,14 @@ 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*) + PKG_CHECK_MODULES( + [OPTIONAL_INOTIFY], + [libinotify] + ) + ;; + esac fi CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`" @@ -1370,6 +1378,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