From patchwork Thu Mar 21 10:04:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Bigonville X-Patchwork-Id: 10863263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D86D26C2 for ; Thu, 21 Mar 2019 10:13:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8FD62A0A8 for ; Thu, 21 Mar 2019 10:13:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD1522A096; Thu, 21 Mar 2019 10:13:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DA002A0A2 for ; Thu, 21 Mar 2019 10:13:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728053AbfCUKNu (ORCPT ); Thu, 21 Mar 2019 06:13:50 -0400 Received: from ithil.bigon.be ([163.172.57.153]:43284 "EHLO ithil.bigon.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727903AbfCUKNu (ORCPT ); Thu, 21 Mar 2019 06:13:50 -0400 X-Greylist: delayed 546 seconds by postgrey-1.27 at vger.kernel.org; Thu, 21 Mar 2019 06:13:49 EDT Received: from localhost (localhost [IPv6:::1]) by ithil.bigon.be (Postfix) with ESMTP id CAF0D1FC7C for ; Thu, 21 Mar 2019 11:04:41 +0100 (CET) Received: from ithil.bigon.be ([IPv6:::1]) by localhost (ithil.bigon.be [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id OA-Ox-obyHjo for ; Thu, 21 Mar 2019 11:04:41 +0100 (CET) Received: from edoras.bigon.be (mail2.vdab.be [193.53.238.200]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: bigon@bigon.be) by ithil.bigon.be (Postfix) with ESMTPSA for ; Thu, 21 Mar 2019 11:04:41 +0100 (CET) Received: from bigon (uid 1000) (envelope-from bigon@bigon.be) id 6308f by edoras.bigon.be (DragonFly Mail Agent v0.11); Thu, 21 Mar 2019 11:04:39 +0100 From: Laurent Bigonville To: selinux@vger.kernel.org Subject: [PATCH] restorecond: Do not link against libpcre Date: Thu, 21 Mar 2019 11:04:39 +0100 Message-Id: <20190321100439.7130-1-bigon@debian.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Laurent Bigonville For some reasons, restorecond was explicitly linking against libpcre but the code is not using any of its symbols Closes: https://github.com/SELinuxProject/selinux/issues/137 Signed-off-by: Laurent Bigonville Acked-by: Petr Lautrbach --- restorecond/Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/restorecond/Makefile b/restorecond/Makefile index b81f8c82..12452cd2 100644 --- a/restorecond/Makefile +++ b/restorecond/Makefile @@ -19,17 +19,7 @@ DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1) CFLAGS ?= -g -Werror -Wall -W override CFLAGS += $(DBUSFLAGS) -USE_PCRE2 ?= n -ifeq ($(USE_PCRE2),y) - PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 $(shell $(PKG_CONFIG) --cflags libpcre2-8) - PCRE_LDLIBS := $(shell $(PKG_CONFIG) --libs libpcre2-8) -else - PCRE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpcre) - PCRE_LDLIBS := $(shell $(PKG_CONFIG) --libs libpcre) -endif -export PCRE_CFLAGS PCRE_LDLIBS - -override LDLIBS += -lselinux $(PCRE_LDLIBS) $(DBUSLIB) +override LDLIBS += -lselinux $(DBUSLIB) all: restorecond