From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC68FC43381 for ; Thu, 21 Mar 2019 12:06:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7C0B218A5 for ; Thu, 21 Mar 2019 12:06:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727868AbfCUMGd (ORCPT ); Thu, 21 Mar 2019 08:06:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57536 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726551AbfCUMGd (ORCPT ); Thu, 21 Mar 2019 08:06:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0710330BC643; Thu, 21 Mar 2019 12:06:33 +0000 (UTC) Received: from localhost (ovpn-204-57.brq.redhat.com [10.40.204.57]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E24F60857; Thu, 21 Mar 2019 12:06:32 +0000 (UTC) References: <20190321100439.7130-1-bigon@debian.org> User-agent: mu4e 1.0; emacs 26.1 From: Petr Lautrbach To: selinux@vger.kernel.org Cc: Laurent Bigonville Subject: Re: [PATCH] restorecond: Do not link against libpcre In-reply-to: <20190321100439.7130-1-bigon@debian.org> Date: Thu, 21 Mar 2019 13:06:30 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 21 Mar 2019 12:06:33 +0000 (UTC) Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Laurent Bigonville writes: > 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 It looks likes it was accidentally added by commit 50f0910cf05bdc1d10710c7c3fb748a178473387 ("libselinux: add support for pcre2") 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