From patchwork Wed Apr 24 20:21:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1090449 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="d5tQtMAh"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qBYR4x95z9s4Y for ; Thu, 25 Apr 2019 06:21:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2D0F287D57; Wed, 24 Apr 2019 20:21:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DoRBa0QIVq3R; Wed, 24 Apr 2019 20:21:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 829EB87D60; Wed, 24 Apr 2019 20:21:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B8BE41BF3C2 for ; Wed, 24 Apr 2019 20:21:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B49CB309C9 for ; Wed, 24 Apr 2019 20:21:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AAZXZgQoK926 for ; Wed, 24 Apr 2019 20:21:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by silver.osuosl.org (Postfix) with ESMTPS id A993D2277A for ; Wed, 24 Apr 2019 20:21:37 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id h11so78896wmb.5 for ; Wed, 24 Apr 2019 13:21:37 -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:mime-version :content-transfer-encoding; bh=aQGzqCBMt+E/2pOwFtsM3WM5L4dwQVANHgb+QxoLqow=; b=d5tQtMAhRaQTGV4K6dfs42yjt18Npgi5bUtAgBwmUhWAk1IjGjBpmNpDjvUqqX67wW iACT+JZeYzqb/W7GCNEMQpfO4hbtnDQbP1FQ/jalVui2hSbUIj2f6DVty+yDZqKzJ+PF /pgHWtzx8UHkQ8+JOeFGgZL8M6ctOs99Ru4xiNkFy7+dRf6WDsJsRiTkPIHsGnjz3H/n kVp+kKCow2WcUA49HGtLYEoI6nt4QgAjkV/PKNTFR7WxOFgbTKVa7N4OSgGoSeE2CNZK TgYGaSwn+gX2DjRncOU6rExtHHiEB1kIYzFvCyAzxaFwPwNc3kp9ooZxPIv/M8Rhh7NG Vf/g== 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:mime-version :content-transfer-encoding; bh=aQGzqCBMt+E/2pOwFtsM3WM5L4dwQVANHgb+QxoLqow=; b=l3h/p1Sa8Bs862Xf6OYHdCt91cUXplzGRX4chsH77PCYqORkblrRGb1s87XfZgjZGP 59b9YGx4l05gdEhCqB77t030k4Z2yh4i24uVPCmPuPu/jLssAp4IPhax+nDJy9Oq1GnQ iLjzhWjpRnzOsfabTgUkugVAykAjXE/YCQnBJ9UTHDS2Wup8i8gV+ZRT5cPPCQqkaB3x P7k1WLMOYsuo4DrOwwH3wFG/w8J43+bvgOyCOy0lCkqpOXY0lfjzzrX0c39Ng9BHiXy/ 8LqyYWX8U3ypAA6kBR2N+uHyy5WjXEC/suEm5Lo9x3HWoBiXfcBUBWGfsllqBhhKmnhg QFGg== X-Gm-Message-State: APjAAAUs+GYMLhVgZ7LGUilEFpnaT2D7bv15ATbPaa3o26Ea1C01nOSY pLprUwCbE0+WY2QpHWFc2OBNy/5N X-Google-Smtp-Source: APXvYqyzSV+I/teJcncSuiNy3iKZiRihOwCPz9gqLOqQqeRn5fHy/Iwf2NPKfVCAbmGSGBVDLSohig== X-Received: by 2002:a1c:6c04:: with SMTP id h4mr637554wmc.135.1556137295802; Wed, 24 Apr 2019 13:21:35 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id u6sm36745725wrg.72.2019.04.24.13.21.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 13:21:35 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 24 Apr 2019 22:21:16 +0200 Message-Id: <20190424202118.14795-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/suricata: fix build on m68k X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/ed923bcc1454ce90444b8dac7c064b5f4ea4a0a5 Signed-off-by: Fabrice Fontaine --- .../0001-fix-build-on-m68k-with-uclibc.patch | 48 +++++++++++++++++++ package/suricata/suricata.mk | 2 + 2 files changed, 50 insertions(+) create mode 100644 package/suricata/0001-fix-build-on-m68k-with-uclibc.patch diff --git a/package/suricata/0001-fix-build-on-m68k-with-uclibc.patch b/package/suricata/0001-fix-build-on-m68k-with-uclibc.patch new file mode 100644 index 0000000000..09b4b70588 --- /dev/null +++ b/package/suricata/0001-fix-build-on-m68k-with-uclibc.patch @@ -0,0 +1,48 @@ +From 58750008dd562c08642bed1bb3194cb87e301570 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 24 Apr 2019 19:14:29 +0200 +Subject: [PATCH] fix build on m68k with uclibc + +uclibc on m68k defines _POSIX_SPIN_LOCKS but does not define +pthread_spin_unlock so check for this function before using +pthread_spin_xxx functions + +Fixes: + - http://autobuild.buildroot.org/results/ed923bcc1454ce90444b8dac7c064b5f4ea4a0a5 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OISF/suricata/pull/3816] +--- + configure.ac | 2 ++ + src/threads.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a6669ec47..ee59c9d8e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -889,6 +889,8 @@ + exit 1 + fi + ++ AC_CHECK_FUNCS([pthread_spin_unlock]) ++ + # libjansson + AC_ARG_WITH(libjansson_includes, + [ --with-libjansson-includes=DIR libjansson include directory], +diff --git a/src/threads.h b/src/threads.h +index 4e6f61134..4eb1a7360 100644 +--- a/src/threads.h ++++ b/src/threads.h +@@ -155,7 +155,7 @@ enum { + #define SCCtrlCondDestroy pthread_cond_destroy + + /* spinlocks */ +-#if ((_POSIX_SPIN_LOCKS - 200112L) < 0L) || defined HELGRIND ++#if ((_POSIX_SPIN_LOCKS - 200112L) < 0L) || defined HELGRIND || !defined(HAVE_PTHREAD_SPIN_UNLOCK) + #define SCSpinlock SCMutex + #define SCSpinLock(spin) SCMutexLock((spin)) + #define SCSpinTrylock(spin) SCMutexTrylock((spin)) +-- +2.20.1 + diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index e5884cdfe4..0491fad6d5 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -8,6 +8,8 @@ SURICATA_VERSION = 4.1.3 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE +# We're patching configure.ac +SURICATA_AUTORECONF = YES SURICATA_DEPENDENCIES = \ host-pkgconf \ From patchwork Wed Apr 24 20:21:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1090450 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fy2zcbb1"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qBYT1C5tz9s70 for ; Thu, 25 Apr 2019 06:21:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 877F886248; Wed, 24 Apr 2019 20:21:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w0MASC8BAhjt; Wed, 24 Apr 2019 20:21:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7111486135; Wed, 24 Apr 2019 20:21:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AB04C1BF3C2 for ; Wed, 24 Apr 2019 20:21:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A6854853E6 for ; Wed, 24 Apr 2019 20:21:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9DyG0Q0dsR9c for ; Wed, 24 Apr 2019 20:21:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id C3876823DF for ; Wed, 24 Apr 2019 20:21:40 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id a9so9330564wrp.6 for ; Wed, 24 Apr 2019 13:21:40 -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 :mime-version:content-transfer-encoding; bh=aQ9SjILlqfzNbDp+wZXOu3uTMoWYvTOLsSmpSnaL45w=; b=fy2zcbb1cyEnm5gpemCHLhyKvRoaNdsaiizHad0M7gVLUuc2ZQaKAXIm2fA2nmKSXQ qshlul7nDrjebb5Gex2KxPS+bpGDFCvf8a6P61tFHhnAReIFcQr2xZIEAk1tN5IV903m xHoq9yumpKH8tbU8+isQ/WPiEe/FSDQ3cmTLXq1a9YrfoI7wJcXZV4BiYv8EtbhbcWTM 4TkmfUbtLNyKtS8QmhSvDqHfktPt2/r16ulP/170P7uD7LyiGJiDsKIaTf0H2lb7cMfN GeX9AO/C8mPrt5mIo2+SyRD1s8Wmxq0qX/qGqdd/iT6FbrRGdQRWHQWNPWcWEjHuDSuv kDlg== 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:mime-version:content-transfer-encoding; bh=aQ9SjILlqfzNbDp+wZXOu3uTMoWYvTOLsSmpSnaL45w=; b=UJ7rOLdDsQgwc3xNgP5b4SekjiiBhJckOot0SBPkidj0ikQRrUmFmBnZc4USP8cYpz p3rTNi0JF3cxXwF2KRRDYPMXmNFszUtgudBj0bE98Nd6y8P5GvFYxuBTOpIayH7lPHSs oY9A8EHeldNNQ58xC9N7cZt5QrLMVZDsGtSEpHG7is3vyuqxclfdWCc5kgTXz/rOP/ai xh/2CbfCx1SiIOX1F5rJIBgZCtMzKa5yJYIWmced/5kBrkfdiODr6u716w5DLB9kZacz vo8qiNT+LmgfLPkcBXqziF2OZrZvPdhUcGnp+g/Z6Tv559/qGdYhqcqWyWhqWbAyOCcP G7bQ== X-Gm-Message-State: APjAAAUXq4laRqnQY3of2TCPbOub752hhEFUaW91Sv2n9HqwDEQ/JE2U 1w/T1JdBD1eOV5viXruqWwYJE1a0 X-Google-Smtp-Source: APXvYqweiApmIcnaIz8nz/z5vXCjprZzAxH8XdVfE0LvMWMkUZfGNpKQ+gy+DUBOpHICBLpyr05vHQ== X-Received: by 2002:a5d:624f:: with SMTP id m15mr20661050wrv.102.1556137299174; Wed, 24 Apr 2019 13:21:39 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id u6sm36745725wrg.72.2019.04.24.13.21.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 13:21:38 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 24 Apr 2019 22:21:17 +0200 Message-Id: <20190424202118.14795-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190424202118.14795-1-fontaine.fabrice@gmail.com> References: <20190424202118.14795-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/suricata: fix pcap static build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - no autobuilder failures yet Signed-off-by: Fabrice Fontaine --- ...figure.ac-fix-static-build-with-pcap.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/suricata/0002-configure.ac-fix-static-build-with-pcap.patch diff --git a/package/suricata/0002-configure.ac-fix-static-build-with-pcap.patch b/package/suricata/0002-configure.ac-fix-static-build-with-pcap.patch new file mode 100644 index 0000000000..3312550620 --- /dev/null +++ b/package/suricata/0002-configure.ac-fix-static-build-with-pcap.patch @@ -0,0 +1,29 @@ +From 2660123b0c16d7f6a49747711be676c4119561c9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 24 Apr 2019 20:35:20 +0200 +Subject: [PATCH] configure.ac: fix static build with pcap + +pcap can depends on nl-3 so use pkg-config to find these dependencies +otherwise all AC_CHECK_LIB calls will fail when building statically + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ee59c9d8e..5ec341231 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1331,6 +1331,7 @@ + AC_CHECK_HEADERS([pcap.h pcap/pcap.h pcap/bpf.h]) + + LIBPCAP="" ++ PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[]) + AC_CHECK_LIB(${PCAP_LIB_NAME}, pcap_open_live,, LIBPCAP="no") + if test "$LIBPCAP" = "no"; then + echo +-- +2.20.1 + From patchwork Wed Apr 24 20:21:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1090451 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VEbvBqPO"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qBYV6wJ3z9s4Y for ; Thu, 25 Apr 2019 06:21:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 51E788625E; Wed, 24 Apr 2019 20:21:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WV1gZ9IO-z05; Wed, 24 Apr 2019 20:21:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 509B28625F; Wed, 24 Apr 2019 20:21:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 624F81BF3C2 for ; Wed, 24 Apr 2019 20:21:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5EB04309C9 for ; Wed, 24 Apr 2019 20:21:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nnh51AXgutTP for ; Wed, 24 Apr 2019 20:21:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by silver.osuosl.org (Postfix) with ESMTPS id 783E92277A for ; Wed, 24 Apr 2019 20:21:44 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id c5so18032157wrs.11 for ; Wed, 24 Apr 2019 13:21:44 -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 :mime-version:content-transfer-encoding; bh=T6u/EtaJvls3gKRqQptH/5Cb4z6WXoAbtxpjGkfAyyM=; b=VEbvBqPOe3++JoE79ukLlIsafBRK3Ih+hrS1y2U/TufJdqvDomf7prilQ3nSs0f7xM 8kNcQ2RyZcHbigidkxs4OE9Dhst8SjKhl/P7Et+l58+V0+BZNoaNiSvb8wi6HJXhKi5H zSqP0Pb6SFAiDEy4+Gb12VVX8X2btG/xYpKsQ7ZJX7i7ZnEs4hw9pAmOn0QbWcSiv63u MRRMalORSq7z6YJmm35oG9mUUHwsOcIbnWRjtqvnJEuPlTnPqW68gNyCgzH1iCzLCdYo t8FselZv9S1Qv2vbvpXcrWe4RkMBrnFQrV6B1OOo6OlblTR7Qj9atZPKCfxsBkv2u9I3 rNfw== 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:mime-version:content-transfer-encoding; bh=T6u/EtaJvls3gKRqQptH/5Cb4z6WXoAbtxpjGkfAyyM=; b=sMrGkCtVSg8sMHMF8ciVk/FQoh51QIl6ZNoePqrf4Js+6V5gW/H1k5tIwAW+FO96Yd aFEb2poCs3QQuVVienFBZJjTbFvJ+ZqoruORy4kMZ1CCEcKjNGfxYhvUgjL/R5Ec9Xn7 y2AoczJcR0A3LFXd+JvWg6YNacPM0zdW69WtUTEl45fdbjyjB4DMntZ0UCQgKWiOFG7G msPmYLBD2Sb/yujSEjej96zrs3MYJDcLO10hrh3VjEweXAFv6KGPHrJWpSGKr/eMccPl 6WOH3GqWvk6wHfDDXhVtFY4HH3CPLAyouzOPdOHnV3uH9ZZrIJINrSkeUwHsFAmrfy+0 7Lyw== X-Gm-Message-State: APjAAAWO5vLL9BHM/8nl6y9FafMAv8YPE0mgjmbqep+sJMidCqvsniW1 K4e9A71tLupGqcBeSW9+U0kL5iv8 X-Google-Smtp-Source: APXvYqzozg5DHHmg4NVZ1pYd+XlFrZfMnrKnMiu04SpFiFvoF8Y9GP+qfxW5+8Zbj4O9oYseySq8KA== X-Received: by 2002:a5d:430f:: with SMTP id h15mr8296664wrq.132.1556137302690; Wed, 24 Apr 2019 13:21:42 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id u6sm36745725wrg.72.2019.04.24.13.21.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 13:21:42 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 24 Apr 2019 22:21:18 +0200 Message-Id: <20190424202118.14795-3-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190424202118.14795-1-fontaine.fabrice@gmail.com> References: <20190424202118.14795-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/3] package/libhtp: add -lz to htp.pc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This will fix static build of suricata Fixes: - No autobuilder failures Signed-off-by: Fabrice Fontaine --- ...002-htp.pc.in-add-lz-to-Libs.private.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch diff --git a/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch b/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch new file mode 100644 index 0000000000..b5b0c0e2b6 --- /dev/null +++ b/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch @@ -0,0 +1,29 @@ +From 39e534ab696157b244ec226d649c789dcf423e42 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 24 Apr 2019 20:48:57 +0200 +Subject: [PATCH] htp.pc.in: add -lz to Libs.private + +zlib is a mandatory dependency so add it to Libs.private otherwise +static linking iof suricata will fail + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + htp.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/htp.pc.in b/htp.pc.in +index 2fec995..9b1a6cc 100644 +--- a/htp.pc.in ++++ b/htp.pc.in +@@ -7,6 +7,6 @@ Name: @PACKAGE_NAME@ + Description: A security-aware HTTP parser, designed for use in IDS/IPS and WAF products. + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lhtp +-Libs.private: @LIBICONV@ ++Libs.private: -lz @LIBICONV@ + Cflags: -I${includedir} -I${libdir}/htp/include + +-- +2.20.1 +