http://www.pcre.org/original/changelog.txt
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/common/pcre | 146 +++++++++++++++++++++++-------------------- lfs/pcre | 17 +++-- 2 files changed, 89 insertions(+), 74 deletions(-)
diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index 1d6310f..55fb9d7 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,7 +10,15 @@ #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.6 +usr/lib/libpcre.so.1.2.7 +#usr/lib/libpcre16.la +usr/lib/libpcre16.so +usr/lib/libpcre16.so.0 +usr/lib/libpcre16.so.0.2.7 +#usr/lib/libpcre32.la +usr/lib/libpcre32.so +usr/lib/libpcre32.so.0 +usr/lib/libpcre32.so.0.0.7 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 @@ -18,76 +26,78 @@ usr/lib/libpcrecpp.so.0.0.1 #usr/lib/libpcreposix.la usr/lib/libpcreposix.so usr/lib/libpcreposix.so.0 -usr/lib/libpcreposix.so.0.0.3 +usr/lib/libpcreposix.so.0.0.4 #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 -#usr/share/doc/pcre/AUTHORS -#usr/share/doc/pcre/COPYING -#usr/share/doc/pcre/ChangeLog -#usr/share/doc/pcre/LICENCE -#usr/share/doc/pcre/NEWS -#usr/share/doc/pcre/README -#usr/share/doc/pcre/html -#usr/share/doc/pcre/html/NON-AUTOTOOLS-BUILD.txt -#usr/share/doc/pcre/html/README.txt -#usr/share/doc/pcre/html/index.html -#usr/share/doc/pcre/html/pcre-config.html -#usr/share/doc/pcre/html/pcre.html -#usr/share/doc/pcre/html/pcre16.html -#usr/share/doc/pcre/html/pcre32.html -#usr/share/doc/pcre/html/pcre_assign_jit_stack.html -#usr/share/doc/pcre/html/pcre_compile.html -#usr/share/doc/pcre/html/pcre_compile2.html -#usr/share/doc/pcre/html/pcre_config.html -#usr/share/doc/pcre/html/pcre_copy_named_substring.html -#usr/share/doc/pcre/html/pcre_copy_substring.html -#usr/share/doc/pcre/html/pcre_dfa_exec.html -#usr/share/doc/pcre/html/pcre_exec.html -#usr/share/doc/pcre/html/pcre_free_study.html -#usr/share/doc/pcre/html/pcre_free_substring.html -#usr/share/doc/pcre/html/pcre_free_substring_list.html -#usr/share/doc/pcre/html/pcre_fullinfo.html -#usr/share/doc/pcre/html/pcre_get_named_substring.html -#usr/share/doc/pcre/html/pcre_get_stringnumber.html -#usr/share/doc/pcre/html/pcre_get_stringtable_entries.html -#usr/share/doc/pcre/html/pcre_get_substring.html -#usr/share/doc/pcre/html/pcre_get_substring_list.html -#usr/share/doc/pcre/html/pcre_jit_exec.html -#usr/share/doc/pcre/html/pcre_jit_stack_alloc.html -#usr/share/doc/pcre/html/pcre_jit_stack_free.html -#usr/share/doc/pcre/html/pcre_maketables.html -#usr/share/doc/pcre/html/pcre_pattern_to_host_byte_order.html -#usr/share/doc/pcre/html/pcre_refcount.html -#usr/share/doc/pcre/html/pcre_study.html -#usr/share/doc/pcre/html/pcre_utf16_to_host_byte_order.html -#usr/share/doc/pcre/html/pcre_utf32_to_host_byte_order.html -#usr/share/doc/pcre/html/pcre_version.html -#usr/share/doc/pcre/html/pcreapi.html -#usr/share/doc/pcre/html/pcrebuild.html -#usr/share/doc/pcre/html/pcrecallout.html -#usr/share/doc/pcre/html/pcrecompat.html -#usr/share/doc/pcre/html/pcrecpp.html -#usr/share/doc/pcre/html/pcredemo.html -#usr/share/doc/pcre/html/pcregrep.html -#usr/share/doc/pcre/html/pcrejit.html -#usr/share/doc/pcre/html/pcrelimits.html -#usr/share/doc/pcre/html/pcrematching.html -#usr/share/doc/pcre/html/pcrepartial.html -#usr/share/doc/pcre/html/pcrepattern.html -#usr/share/doc/pcre/html/pcreperform.html -#usr/share/doc/pcre/html/pcreposix.html -#usr/share/doc/pcre/html/pcreprecompile.html -#usr/share/doc/pcre/html/pcresample.html -#usr/share/doc/pcre/html/pcrestack.html -#usr/share/doc/pcre/html/pcresyntax.html -#usr/share/doc/pcre/html/pcretest.html -#usr/share/doc/pcre/html/pcreunicode.html -#usr/share/doc/pcre/pcre-config.txt -#usr/share/doc/pcre/pcre.txt -#usr/share/doc/pcre/pcregrep.txt -#usr/share/doc/pcre/pcretest.txt +#usr/share/doc/pcre-pcre-8.39 +#usr/share/doc/pcre-pcre-8.39/AUTHORS +#usr/share/doc/pcre-pcre-8.39/COPYING +#usr/share/doc/pcre-pcre-8.39/ChangeLog +#usr/share/doc/pcre-pcre-8.39/LICENCE +#usr/share/doc/pcre-pcre-8.39/NEWS +#usr/share/doc/pcre-pcre-8.39/README +#usr/share/doc/pcre-pcre-8.39/html +#usr/share/doc/pcre-pcre-8.39/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre-pcre-8.39/html/README.txt +#usr/share/doc/pcre-pcre-8.39/html/index.html +#usr/share/doc/pcre-pcre-8.39/html/pcre-config.html +#usr/share/doc/pcre-pcre-8.39/html/pcre.html +#usr/share/doc/pcre-pcre-8.39/html/pcre16.html +#usr/share/doc/pcre-pcre-8.39/html/pcre32.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_assign_jit_stack.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_compile.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_compile2.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_config.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_copy_named_substring.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_copy_substring.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_dfa_exec.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_exec.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_free_study.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_free_substring.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_free_substring_list.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_fullinfo.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_get_named_substring.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_get_stringnumber.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_get_stringtable_entries.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_get_substring.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_get_substring_list.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_jit_exec.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_jit_stack_alloc.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_jit_stack_free.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_maketables.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_pattern_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_refcount.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_study.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_utf16_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_utf32_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.39/html/pcre_version.html +#usr/share/doc/pcre-pcre-8.39/html/pcreapi.html +#usr/share/doc/pcre-pcre-8.39/html/pcrebuild.html +#usr/share/doc/pcre-pcre-8.39/html/pcrecallout.html +#usr/share/doc/pcre-pcre-8.39/html/pcrecompat.html +#usr/share/doc/pcre-pcre-8.39/html/pcrecpp.html +#usr/share/doc/pcre-pcre-8.39/html/pcredemo.html +#usr/share/doc/pcre-pcre-8.39/html/pcregrep.html +#usr/share/doc/pcre-pcre-8.39/html/pcrejit.html +#usr/share/doc/pcre-pcre-8.39/html/pcrelimits.html +#usr/share/doc/pcre-pcre-8.39/html/pcrematching.html +#usr/share/doc/pcre-pcre-8.39/html/pcrepartial.html +#usr/share/doc/pcre-pcre-8.39/html/pcrepattern.html +#usr/share/doc/pcre-pcre-8.39/html/pcreperform.html +#usr/share/doc/pcre-pcre-8.39/html/pcreposix.html +#usr/share/doc/pcre-pcre-8.39/html/pcreprecompile.html +#usr/share/doc/pcre-pcre-8.39/html/pcresample.html +#usr/share/doc/pcre-pcre-8.39/html/pcrestack.html +#usr/share/doc/pcre-pcre-8.39/html/pcresyntax.html +#usr/share/doc/pcre-pcre-8.39/html/pcretest.html +#usr/share/doc/pcre-pcre-8.39/html/pcreunicode.html +#usr/share/doc/pcre-pcre-8.39/pcre-config.txt +#usr/share/doc/pcre-pcre-8.39/pcre.txt +#usr/share/doc/pcre-pcre-8.39/pcregrep.txt +#usr/share/doc/pcre-pcre-8.39/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/pcre b/lfs/pcre index c946714..7b724df 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@
include Config
-VER = 8.38 +VER = 8.39
THISAPP = pcre-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8a353fe1450216b6655dfcf3561716d9 +$(DL_FILE)_MD5 = e3fca7650a0556a2647821679d81f585
install : $(TARGET)
@@ -70,13 +70,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.38-upstream_fixes-1.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-static \ --enable-utf8 \ --disable-jit \ - --enable-unicode-properties + --enable-pcre16 \ + --enable-pcre32 \ + --enable-pcregrep-libz \ + --enable-pcregrep-libbz2 \ + --enable-pcretest-libreadline \ + --enable-unicode-properties \ + --docdir=/usr/share/doc/pcre-$(THISAPP) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)