[1/1] Update Apache Dependencies

  Update apache dependencies:
APR: update to version 1.7.0
PCRE: update to version 8.44
---
 config/rootfiles/common/apr  |   3 +-
 config/rootfiles/common/pcre | 142 +++++++++++++++++------------------
 lfs/apr                      |   4 +-
 lfs/pcre                     |   4 +-
 4 files changed, 77 insertions(+), 76 deletions(-)
  

Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

Thank you, Wolfgang, for sending this in.

It would be easier to merge for us if it is split into one commit per package. But I think we can do it like this for this one.

-Michael

> On 2 Mar 2020, at 19:06, Wolfgang Apolinarski <wolfgang.apolinarski@ipfire.org> wrote:
> 
> Update apache dependencies:
> APR: update to version 1.7.0
> PCRE: update to version 8.44
> ---
> config/rootfiles/common/apr  |   3 +-
> config/rootfiles/common/pcre | 142 +++++++++++++++++------------------
> lfs/apr                      |   4 +-
> lfs/pcre                     |   4 +-
> 4 files changed, 77 insertions(+), 76 deletions(-)
> 
> diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr
> index 0fb0d7d37..52e59aaae 100644
> --- a/config/rootfiles/common/apr
> +++ b/config/rootfiles/common/apr
> @@ -5,6 +5,7 @@ usr/bin/apr-1-config
> #usr/include/apr-1/apr_atomic.h
> #usr/include/apr-1/apr_cstr.h
> #usr/include/apr-1/apr_dso.h
> +#usr/include/apr-1/apr_encode.h
> #usr/include/apr-1/apr_env.h
> #usr/include/apr-1/apr_errno.h
> #usr/include/apr-1/apr_escape.h
> @@ -44,7 +45,7 @@ usr/bin/apr-1-config
> #usr/lib/libapr-1.la
> #usr/lib/libapr-1.so
> usr/lib/libapr-1.so.0
> -usr/lib/libapr-1.so.0.6.5
> +usr/lib/libapr-1.so.0.7.0
> #usr/lib/pkgconfig/apr-1.pc
> #usr/share/apr-1
> #usr/share/apr-1/build
> diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
> index 79779fb94..bd2e665fd 100644
> --- a/config/rootfiles/common/pcre
> +++ b/config/rootfiles/common/pcre
> @@ -10,94 +10,94 @@ usr/bin/pcregrep
> #usr/lib/libpcre.la
> usr/lib/libpcre.so
> usr/lib/libpcre.so.1
> -usr/lib/libpcre.so.1.2.11
> +usr/lib/libpcre.so.1.2.12
> #usr/lib/libpcre16.la
> usr/lib/libpcre16.so
> usr/lib/libpcre16.so.0
> -usr/lib/libpcre16.so.0.2.11
> +usr/lib/libpcre16.so.0.2.12
> #usr/lib/libpcre32.la
> usr/lib/libpcre32.so
> usr/lib/libpcre32.so.0
> -usr/lib/libpcre32.so.0.0.11
> +usr/lib/libpcre32.so.0.0.12
> #usr/lib/libpcrecpp.la
> usr/lib/libpcrecpp.so
> usr/lib/libpcrecpp.so.0
> -usr/lib/libpcrecpp.so.0.0.1
> +usr/lib/libpcrecpp.so.0.0.2
> #usr/lib/libpcreposix.la
> usr/lib/libpcreposix.so
> usr/lib/libpcreposix.so.0
> -usr/lib/libpcreposix.so.0.0.6
> +usr/lib/libpcreposix.so.0.0.7
> #usr/lib/pkgconfig/libpcre.pc
> #usr/lib/pkgconfig/libpcre16.pc
> #usr/lib/pkgconfig/libpcre32.pc
> #usr/lib/pkgconfig/libpcrecpp.pc
> #usr/lib/pkgconfig/libpcreposix.pc
> -#usr/share/doc/pcre-pcre-8.43
> -#usr/share/doc/pcre-pcre-8.43/AUTHORS
> -#usr/share/doc/pcre-pcre-8.43/COPYING
> -#usr/share/doc/pcre-pcre-8.43/ChangeLog
> -#usr/share/doc/pcre-pcre-8.43/LICENCE
> -#usr/share/doc/pcre-pcre-8.43/NEWS
> -#usr/share/doc/pcre-pcre-8.43/README
> -#usr/share/doc/pcre-pcre-8.43/html
> -#usr/share/doc/pcre-pcre-8.43/html/NON-AUTOTOOLS-BUILD.txt
> -#usr/share/doc/pcre-pcre-8.43/html/README.txt
> -#usr/share/doc/pcre-pcre-8.43/html/index.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre-config.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre16.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre32.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_assign_jit_stack.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_compile.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_compile2.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_config.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_copy_named_substring.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_copy_substring.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_dfa_exec.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_exec.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_free_study.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_free_substring.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_free_substring_list.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_fullinfo.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_get_named_substring.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_get_stringnumber.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_get_stringtable_entries.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_get_substring.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_get_substring_list.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_jit_exec.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_jit_stack_alloc.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_jit_stack_free.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_maketables.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_pattern_to_host_byte_order.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_refcount.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_study.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_utf16_to_host_byte_order.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_utf32_to_host_byte_order.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcre_version.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcreapi.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrebuild.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrecallout.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrecompat.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrecpp.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcredemo.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcregrep.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrejit.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrelimits.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrematching.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrepartial.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrepattern.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcreperform.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcreposix.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcreprecompile.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcresample.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcrestack.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcresyntax.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcretest.html
> -#usr/share/doc/pcre-pcre-8.43/html/pcreunicode.html
> -#usr/share/doc/pcre-pcre-8.43/pcre-config.txt
> -#usr/share/doc/pcre-pcre-8.43/pcre.txt
> -#usr/share/doc/pcre-pcre-8.43/pcregrep.txt
> -#usr/share/doc/pcre-pcre-8.43/pcretest.txt
> +#usr/share/doc/pcre-pcre-8.44
> +#usr/share/doc/pcre-pcre-8.44/AUTHORS
> +#usr/share/doc/pcre-pcre-8.44/COPYING
> +#usr/share/doc/pcre-pcre-8.44/ChangeLog
> +#usr/share/doc/pcre-pcre-8.44/LICENCE
> +#usr/share/doc/pcre-pcre-8.44/NEWS
> +#usr/share/doc/pcre-pcre-8.44/README
> +#usr/share/doc/pcre-pcre-8.44/html
> +#usr/share/doc/pcre-pcre-8.44/html/NON-AUTOTOOLS-BUILD.txt
> +#usr/share/doc/pcre-pcre-8.44/html/README.txt
> +#usr/share/doc/pcre-pcre-8.44/html/index.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre-config.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre16.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre32.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_assign_jit_stack.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_compile.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_compile2.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_config.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_copy_named_substring.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_copy_substring.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_dfa_exec.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_exec.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_free_study.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_free_substring.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_free_substring_list.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_fullinfo.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_get_named_substring.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_get_stringnumber.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_get_stringtable_entries.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_get_substring.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_get_substring_list.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_exec.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_stack_alloc.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_stack_free.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_maketables.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_pattern_to_host_byte_order.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_refcount.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_study.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_utf16_to_host_byte_order.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_utf32_to_host_byte_order.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcre_version.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcreapi.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrebuild.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrecallout.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrecompat.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrecpp.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcredemo.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcregrep.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrejit.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrelimits.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrematching.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrepartial.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrepattern.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcreperform.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcreposix.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcreprecompile.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcresample.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcrestack.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcresyntax.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcretest.html
> +#usr/share/doc/pcre-pcre-8.44/html/pcreunicode.html
> +#usr/share/doc/pcre-pcre-8.44/pcre-config.txt
> +#usr/share/doc/pcre-pcre-8.44/pcre.txt
> +#usr/share/doc/pcre-pcre-8.44/pcregrep.txt
> +#usr/share/doc/pcre-pcre-8.44/pcretest.txt
> #usr/share/man/man1/pcre-config.1
> #usr/share/man/man1/pcregrep.1
> #usr/share/man/man1/pcretest.1
> diff --git a/lfs/apr b/lfs/apr
> index c5d342d2c..b42e53d7f 100644
> --- a/lfs/apr
> +++ b/lfs/apr
> @@ -25,7 +25,7 @@
> 
> include Config
> 
> -VER        = 1.6.5
> +VER        = 1.7.0
> 
> THISAPP    = apr-$(VER)
> DL_FILE    = $(THISAPP).tar.bz2
> @@ -42,7 +42,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = ad4add8efdfe87330b88e5e788241775
> +$(DL_FILE)_MD5 = 7a14a83d664e87599ea25ff4432e48a7
> 
> install : $(TARGET)
> 
> diff --git a/lfs/pcre b/lfs/pcre
> index 85dc1bc8d..03fff5162 100644
> --- a/lfs/pcre
> +++ b/lfs/pcre
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 8.43
> +VER        = 8.44
> 
> THISAPP    = pcre-$(VER)
> DL_FILE    = $(THISAPP).tar.bz2
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 636222e79e392c3d95dcc545f24f98c4
> +$(DL_FILE)_MD5 = cf7326204cc46c755b5b2608033d9d24
> 
> install : $(TARGET)
> 
> -- 
> 2.21.0
>