pcre: Update to 8.31.

Needs a compat package.

diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
index d031bd3dd0273913e2dc15fe4a1d250307432b09..5c292700c77ce6d28e70b913f1190d8692baa33d 100644 (file)
--- a/config/rootfiles/common/pcre
+++ b/config/rootfiles/common/pcre
@@ -1,5 +1,3 @@
-lib/libpcre.so.0
-lib/libpcre.so.0.0.1
 #usr/bin/pcre-config
 #usr/bin/pcregrep
 #usr/bin/pcretest
@@ -9,57 +7,21 @@ lib/libpcre.so.0.0.1
 #usr/include/pcrecpp.h
 #usr/include/pcrecpparg.h
 #usr/include/pcreposix.h
-#usr/lib/libpcre.a
 #usr/lib/libpcre.la
 usr/lib/libpcre.so
-#usr/lib/libpcrecpp.a
+usr/lib/libpcre.so.1
+usr/lib/libpcre.so.1.0.1
 #usr/lib/libpcrecpp.la
 usr/lib/libpcrecpp.so
 usr/lib/libpcrecpp.so.0
 usr/lib/libpcrecpp.so.0.0.0
-#usr/lib/libpcreposix.a
 #usr/lib/libpcreposix.la
 usr/lib/libpcreposix.so
 usr/lib/libpcreposix.so.0
-usr/lib/libpcreposix.so.0.0.0
+usr/lib/libpcreposix.so.0.0.1
 #usr/lib/pkgconfig/libpcre.pc
-#usr/man/man1/pcregrep.1
-#usr/man/man1/pcretest.1
-#usr/man/man3/pcre.3
-#usr/man/man3/pcre_compile.3
-#usr/man/man3/pcre_compile2.3
-#usr/man/man3/pcre_config.3
-#usr/man/man3/pcre_copy_named_substring.3
-#usr/man/man3/pcre_copy_substring.3
-#usr/man/man3/pcre_dfa_exec.3
-#usr/man/man3/pcre_exec.3
-#usr/man/man3/pcre_free_substring.3
-#usr/man/man3/pcre_free_substring_list.3
-#usr/man/man3/pcre_fullinfo.3
-#usr/man/man3/pcre_get_named_substring.3
-#usr/man/man3/pcre_get_stringnumber.3
-#usr/man/man3/pcre_get_stringtable_entries.3
-#usr/man/man3/pcre_get_substring.3
-#usr/man/man3/pcre_get_substring_list.3
-#usr/man/man3/pcre_info.3
-#usr/man/man3/pcre_maketables.3
-#usr/man/man3/pcre_refcount.3
-#usr/man/man3/pcre_study.3
-#usr/man/man3/pcre_version.3
-#usr/man/man3/pcreapi.3
-#usr/man/man3/pcrebuild.3
-#usr/man/man3/pcrecallout.3
-#usr/man/man3/pcrecompat.3
-#usr/man/man3/pcrecpp.3
-#usr/man/man3/pcrematching.3
-#usr/man/man3/pcrepartial.3
-#usr/man/man3/pcrepattern.3
-#usr/man/man3/pcreperform.3
-#usr/man/man3/pcreposix.3
-#usr/man/man3/pcreprecompile.3
-#usr/man/man3/pcresample.3
-#usr/man/man3/pcrestack.3
 #usr/lib/pkgconfig/libpcrecpp.pc
+#usr/lib/pkgconfig/libpcreposix.pc
 #usr/share/doc/pcre
 #usr/share/doc/pcre/AUTHORS
 #usr/share/doc/pcre/COPYING
@@ -71,6 +33,8 @@ usr/lib/libpcreposix.so.0.0.0
 #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/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
@@ -78,6 +42,7 @@ usr/lib/libpcreposix.so.0.0.0
 #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
@@ -86,17 +51,23 @@ usr/lib/libpcreposix.so.0.0.0
 #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_info.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_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
@@ -107,6 +78,7 @@ usr/lib/libpcreposix.so.0.0.0
 #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
@@ -115,6 +87,33 @@ usr/lib/libpcreposix.so.0.0.0
 #usr/share/man/man1/pcregrep.1
 #usr/share/man/man1/pcretest.1
 #usr/share/man/man3/pcre.3
+#usr/share/man/man3/pcre16.3
+#usr/share/man/man3/pcre16_assign_jit_stack.3
+#usr/share/man/man3/pcre16_compile.3
+#usr/share/man/man3/pcre16_compile2.3
+#usr/share/man/man3/pcre16_config.3
+#usr/share/man/man3/pcre16_copy_named_substring.3
+#usr/share/man/man3/pcre16_copy_substring.3
+#usr/share/man/man3/pcre16_dfa_exec.3
+#usr/share/man/man3/pcre16_exec.3
+#usr/share/man/man3/pcre16_free_study.3
+#usr/share/man/man3/pcre16_free_substring.3
+#usr/share/man/man3/pcre16_free_substring_list.3
+#usr/share/man/man3/pcre16_fullinfo.3
+#usr/share/man/man3/pcre16_get_named_substring.3
+#usr/share/man/man3/pcre16_get_stringnumber.3
+#usr/share/man/man3/pcre16_get_stringtable_entries.3
+#usr/share/man/man3/pcre16_get_substring.3
+#usr/share/man/man3/pcre16_get_substring_list.3
+#usr/share/man/man3/pcre16_jit_stack_alloc.3
+#usr/share/man/man3/pcre16_jit_stack_free.3
+#usr/share/man/man3/pcre16_maketables.3
+#usr/share/man/man3/pcre16_pattern_to_host_byte_order.3
+#usr/share/man/man3/pcre16_refcount.3
+#usr/share/man/man3/pcre16_study.3
+#usr/share/man/man3/pcre16_utf16_to_host_byte_order.3
+#usr/share/man/man3/pcre16_version.3
+#usr/share/man/man3/pcre_assign_jit_stack.3
 #usr/share/man/man3/pcre_compile.3
 #usr/share/man/man3/pcre_compile2.3
 #usr/share/man/man3/pcre_config.3
@@ -122,6 +121,7 @@ usr/lib/libpcreposix.so.0.0.0
 #usr/share/man/man3/pcre_copy_substring.3
 #usr/share/man/man3/pcre_dfa_exec.3
 #usr/share/man/man3/pcre_exec.3
+#usr/share/man/man3/pcre_free_study.3
 #usr/share/man/man3/pcre_free_substring.3
 #usr/share/man/man3/pcre_free_substring_list.3
 #usr/share/man/man3/pcre_fullinfo.3
@@ -130,16 +130,21 @@ usr/lib/libpcreposix.so.0.0.0
 #usr/share/man/man3/pcre_get_stringtable_entries.3
 #usr/share/man/man3/pcre_get_substring.3
 #usr/share/man/man3/pcre_get_substring_list.3
-#usr/share/man/man3/pcre_info.3
+#usr/share/man/man3/pcre_jit_stack_alloc.3
+#usr/share/man/man3/pcre_jit_stack_free.3
 #usr/share/man/man3/pcre_maketables.3
+#usr/share/man/man3/pcre_pattern_to_host_byte_order.3
 #usr/share/man/man3/pcre_refcount.3
 #usr/share/man/man3/pcre_study.3
+#usr/share/man/man3/pcre_utf16_to_host_byte_order.3
 #usr/share/man/man3/pcre_version.3
 #usr/share/man/man3/pcreapi.3
 #usr/share/man/man3/pcrebuild.3
 #usr/share/man/man3/pcrecallout.3
 #usr/share/man/man3/pcrecompat.3
 #usr/share/man/man3/pcrecpp.3
+#usr/share/man/man3/pcrejit.3
+#usr/share/man/man3/pcrelimits.3
 #usr/share/man/man3/pcrematching.3
 #usr/share/man/man3/pcrepartial.3
 #usr/share/man/man3/pcrepattern.3
@@ -149,3 +154,4 @@ usr/lib/libpcreposix.so.0.0.0
 #usr/share/man/man3/pcresample.3
 #usr/share/man/man3/pcrestack.3
 #usr/share/man/man3/pcresyntax.3
+#usr/share/man/man3/pcreunicode.3

diff --git a/config/rootfiles/common/pcre-compat b/config/rootfiles/common/pcre-compat
new file mode 100644 (file)
index 0000000..ff1b776
--- /dev/null
+++ b/config/rootfiles/common/pcre-compat
@@ -0,0 +1,2 @@
+lib/libpcre.so.0
+lib/libpcre.so.0.0.1

diff --git a/lfs/pcre b/lfs/pcre
index f99abf3783a007af91047e8288e8d02e72929248..5aa40bd20d08d41253f4cd21326061dff376542f 100644 (file)
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 7.7
+VER        = 8.31
 
 THISAPP    = pcre-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 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 = 4b2e9cde1f7227448dddba59843efa0b
+$(DL_FILE)_MD5 = fab1bb3b91a4c35398263a5c1e0858c1
 
 install : $(TARGET)
 
@@ -69,11 +69,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --disable-static \
+               --enable-utf8 \
+               --enable-jit \
+               --enable-unicode-properties
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && mv -v /usr/lib/libpcre.so.* /lib/
-       cd $(DIR_APP) && ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/pcre-compat b/lfs/pcre-compat
new file mode 100644 (file)
index 0000000..6b20bca
--- /dev/null
+++ b/lfs/pcre-compat
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 7.7
+
+THISAPP    = pcre-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 4b2e9cde1f7227448dddba59843efa0b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8
+       cd $(DIR_APP) && make $(MAKETUNING)
+
+       install -m 755 $(DIR_APP)/.libs/libpcre.so.0.0.1 /lib
+       ln -svf libpcre.so.0.0.1 /lib/libpcre.so.0
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 80f63a92faecf0734371e04bfe42556ece6fea8c..0f12839ebd7820d9489d9382434933c37ff0aa66 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -318,6 +318,8 @@ buildbase() {
     lfsmake2 perl
     lfsmake2 readline
     lfsmake2 readline-compat
+    lfsmake2 pcre
+    lfsmake2 pcre-compat
     lfsmake2 autoconf
     lfsmake2 automake
     lfsmake2 bash