Re: [PATCH 2/3] libselinux: use PCRE2 by default

[Petr Lautrbach <plautrba@redhat.com>]

Christian Göttsche <cgzones@googlemail.com> writes:

> Quoting pcre.org:
>
>     There are two major versions of the PCRE library. The current
>     version, PCRE2, released in 2015, is now at version 10.39.
>
>     The older, but still widely deployed PCRE library, originally
>     released in 1997, is at version 8.45. This version of PCRE is now at
>     end of life, and is no longer being actively maintained. Version
>     8.45 is expected to be the final release of the older PCRE library,
>     and new projects should use PCRE2 instead.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>

Thanks for this patchset!

Would it make sense to drop the pcre code completely?

It could be a problem for RHEL 6 where pcre2 is not available. But given
that RHEL 6 uses gcc 4.7 by default and libsepol uses __builtin_add_overflow
(introduced in gcc 7) libsepol can't be built on RHEL 6 anyway.


Petr


> ---
>  libselinux/Makefile       | 2 +-
>  libselinux/src/Makefile   | 1 -
>  libselinux/utils/Makefile | 1 -
>  3 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/libselinux/Makefile b/libselinux/Makefile
> index 439bc6a9..6d9e2736 100644
> --- a/libselinux/Makefile
> +++ b/libselinux/Makefile
> @@ -23,7 +23,7 @@ ifeq ($(DISABLE_X11),y)
>  endif
>  export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11 LABEL_BACKEND_ANDROID
>  
> -USE_PCRE2 ?= n
> +USE_PCRE2 ?= y
>  ifeq ($(USE_PCRE2),y)
>  	PCRE_MODULE := libpcre2-8
>  	PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8
> diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
> index 52c40f01..04bf4f24 100644
> --- a/libselinux/src/Makefile
> +++ b/libselinux/src/Makefile
> @@ -98,7 +98,6 @@ override LDFLAGS += -L/opt/local/lib -undefined dynamic_lookup
>  LD_SONAME_FLAGS=-install_name,$(LIBSO)
>  endif
>  
> -PCRE_LDLIBS ?= -lpcre
>  # override with -lfts when building on Musl libc to use fts-standalone
>  FTS_LDLIBS ?=
>  
> diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile
> index 36816155..801066cb 100644
> --- a/libselinux/utils/Makefile
> +++ b/libselinux/utils/Makefile
> @@ -44,7 +44,6 @@ endif
>  override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS)
>  override LDFLAGS += -L../src
>  override LDLIBS += -lselinux $(FTS_LDLIBS)
> -PCRE_LDLIBS ?= -lpcre
>  
>  ifeq ($(ANDROID_HOST),y)
>  TARGETS=sefcontext_compile
> -- 
> 2.34.0