From: Michael Tremer Date: Tue, 9 Feb 2021 16:10:07 +0000 (+0000) Subject: pcre2: New package X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0c37190a50405c4226c806a667be8b9c8a06311;p=people%2Fms%2Fipfire-2.x.git pcre2: New package pcre is no longer receiving any feature updates, but only bug fixes. pcre2 is the successor which is replacing pcre. Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/pcre2 b/config/rootfiles/common/pcre2 new file mode 100644 index 0000000000..440af7b0da --- /dev/null +++ b/config/rootfiles/common/pcre2 @@ -0,0 +1,228 @@ +#usr/bin/pcre2-config +#usr/bin/pcre2grep +#usr/bin/pcre2test +#usr/include/pcre2.h +#usr/include/pcre2posix.h +#usr/lib/libpcre2-16.la +#usr/lib/libpcre2-16.so +usr/lib/libpcre2-16.so.0 +usr/lib/libpcre2-16.so.0.10.1 +#usr/lib/libpcre2-32.la +#usr/lib/libpcre2-32.so +usr/lib/libpcre2-32.so.0 +usr/lib/libpcre2-32.so.0.10.1 +#usr/lib/libpcre2-8.la +#usr/lib/libpcre2-8.so +usr/lib/libpcre2-8.so.0 +usr/lib/libpcre2-8.so.0.10.1 +#usr/lib/libpcre2-posix.la +#usr/lib/libpcre2-posix.so +usr/lib/libpcre2-posix.so.2 +usr/lib/libpcre2-posix.so.2.0.3 +#usr/lib/pkgconfig/libpcre2-16.pc +#usr/lib/pkgconfig/libpcre2-32.pc +#usr/lib/pkgconfig/libpcre2-8.pc +#usr/lib/pkgconfig/libpcre2-posix.pc +#usr/share/doc/pcre-pcre2-10.36 +#usr/share/doc/pcre-pcre2-10.36/AUTHORS +#usr/share/doc/pcre-pcre2-10.36/COPYING +#usr/share/doc/pcre-pcre2-10.36/ChangeLog +#usr/share/doc/pcre-pcre2-10.36/LICENCE +#usr/share/doc/pcre-pcre2-10.36/NEWS +#usr/share/doc/pcre-pcre2-10.36/README +#usr/share/doc/pcre-pcre2-10.36/html +#usr/share/doc/pcre-pcre2-10.36/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre-pcre2-10.36/html/README.txt +#usr/share/doc/pcre-pcre2-10.36/html/index.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2-config.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_callout_enumerate.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_copy_with_tables.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_config.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_converted_pattern_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_dfa_match.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_error_message.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_mark.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_match_data_size.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_ovector_count.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_ovector_pointer.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_startchar.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_compile.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_free_unused_memory.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_match.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_assign.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_maketables.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_maketables_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_create_from_pattern.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_pattern_convert.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_pattern_info.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_decode.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_encode.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_get_number_of_codes.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_bsr.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_callout.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_character_tables.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_compile_extra_options.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_compile_recursion_guard.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_depth_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_glob_escape.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_glob_separator.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_heap_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_match_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_max_pattern_length.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_newline.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_offset_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_parens_nest_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_recursion_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_recursion_memory_management.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_substitute_callout.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substitute.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_copy_byname.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_copy_bynumber.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_get_byname.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_get_bynumber.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_length_byname.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_length_bynumber.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_list_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_list_get.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_nametable_scan.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_number_from_name.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2api.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2build.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2callout.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2compat.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2convert.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2demo.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2grep.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2jit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2limits.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2matching.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2partial.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2pattern.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2perform.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2posix.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2sample.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2serialize.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2syntax.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2test.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2unicode.html +#usr/share/doc/pcre-pcre2-10.36/pcre2-config.txt +#usr/share/doc/pcre-pcre2-10.36/pcre2.txt +#usr/share/doc/pcre-pcre2-10.36/pcre2grep.txt +#usr/share/doc/pcre-pcre2-10.36/pcre2test.txt +#usr/share/man/man1/pcre2-config.1 +#usr/share/man/man1/pcre2grep.1 +#usr/share/man/man1/pcre2test.1 +#usr/share/man/man3/pcre2.3 +#usr/share/man/man3/pcre2_callout_enumerate.3 +#usr/share/man/man3/pcre2_code_copy.3 +#usr/share/man/man3/pcre2_code_copy_with_tables.3 +#usr/share/man/man3/pcre2_code_free.3 +#usr/share/man/man3/pcre2_compile.3 +#usr/share/man/man3/pcre2_compile_context_copy.3 +#usr/share/man/man3/pcre2_compile_context_create.3 +#usr/share/man/man3/pcre2_compile_context_free.3 +#usr/share/man/man3/pcre2_config.3 +#usr/share/man/man3/pcre2_convert_context_copy.3 +#usr/share/man/man3/pcre2_convert_context_create.3 +#usr/share/man/man3/pcre2_convert_context_free.3 +#usr/share/man/man3/pcre2_converted_pattern_free.3 +#usr/share/man/man3/pcre2_dfa_match.3 +#usr/share/man/man3/pcre2_general_context_copy.3 +#usr/share/man/man3/pcre2_general_context_create.3 +#usr/share/man/man3/pcre2_general_context_free.3 +#usr/share/man/man3/pcre2_get_error_message.3 +#usr/share/man/man3/pcre2_get_mark.3 +#usr/share/man/man3/pcre2_get_match_data_size.3 +#usr/share/man/man3/pcre2_get_ovector_count.3 +#usr/share/man/man3/pcre2_get_ovector_pointer.3 +#usr/share/man/man3/pcre2_get_startchar.3 +#usr/share/man/man3/pcre2_jit_compile.3 +#usr/share/man/man3/pcre2_jit_free_unused_memory.3 +#usr/share/man/man3/pcre2_jit_match.3 +#usr/share/man/man3/pcre2_jit_stack_assign.3 +#usr/share/man/man3/pcre2_jit_stack_create.3 +#usr/share/man/man3/pcre2_jit_stack_free.3 +#usr/share/man/man3/pcre2_maketables.3 +#usr/share/man/man3/pcre2_maketables_free.3 +#usr/share/man/man3/pcre2_match.3 +#usr/share/man/man3/pcre2_match_context_copy.3 +#usr/share/man/man3/pcre2_match_context_create.3 +#usr/share/man/man3/pcre2_match_context_free.3 +#usr/share/man/man3/pcre2_match_data_create.3 +#usr/share/man/man3/pcre2_match_data_create_from_pattern.3 +#usr/share/man/man3/pcre2_match_data_free.3 +#usr/share/man/man3/pcre2_pattern_convert.3 +#usr/share/man/man3/pcre2_pattern_info.3 +#usr/share/man/man3/pcre2_serialize_decode.3 +#usr/share/man/man3/pcre2_serialize_encode.3 +#usr/share/man/man3/pcre2_serialize_free.3 +#usr/share/man/man3/pcre2_serialize_get_number_of_codes.3 +#usr/share/man/man3/pcre2_set_bsr.3 +#usr/share/man/man3/pcre2_set_callout.3 +#usr/share/man/man3/pcre2_set_character_tables.3 +#usr/share/man/man3/pcre2_set_compile_extra_options.3 +#usr/share/man/man3/pcre2_set_compile_recursion_guard.3 +#usr/share/man/man3/pcre2_set_depth_limit.3 +#usr/share/man/man3/pcre2_set_glob_escape.3 +#usr/share/man/man3/pcre2_set_glob_separator.3 +#usr/share/man/man3/pcre2_set_heap_limit.3 +#usr/share/man/man3/pcre2_set_match_limit.3 +#usr/share/man/man3/pcre2_set_max_pattern_length.3 +#usr/share/man/man3/pcre2_set_newline.3 +#usr/share/man/man3/pcre2_set_offset_limit.3 +#usr/share/man/man3/pcre2_set_parens_nest_limit.3 +#usr/share/man/man3/pcre2_set_recursion_limit.3 +#usr/share/man/man3/pcre2_set_recursion_memory_management.3 +#usr/share/man/man3/pcre2_set_substitute_callout.3 +#usr/share/man/man3/pcre2_substitute.3 +#usr/share/man/man3/pcre2_substring_copy_byname.3 +#usr/share/man/man3/pcre2_substring_copy_bynumber.3 +#usr/share/man/man3/pcre2_substring_free.3 +#usr/share/man/man3/pcre2_substring_get_byname.3 +#usr/share/man/man3/pcre2_substring_get_bynumber.3 +#usr/share/man/man3/pcre2_substring_length_byname.3 +#usr/share/man/man3/pcre2_substring_length_bynumber.3 +#usr/share/man/man3/pcre2_substring_list_free.3 +#usr/share/man/man3/pcre2_substring_list_get.3 +#usr/share/man/man3/pcre2_substring_nametable_scan.3 +#usr/share/man/man3/pcre2_substring_number_from_name.3 +#usr/share/man/man3/pcre2api.3 +#usr/share/man/man3/pcre2build.3 +#usr/share/man/man3/pcre2callout.3 +#usr/share/man/man3/pcre2compat.3 +#usr/share/man/man3/pcre2convert.3 +#usr/share/man/man3/pcre2demo.3 +#usr/share/man/man3/pcre2jit.3 +#usr/share/man/man3/pcre2limits.3 +#usr/share/man/man3/pcre2matching.3 +#usr/share/man/man3/pcre2partial.3 +#usr/share/man/man3/pcre2pattern.3 +#usr/share/man/man3/pcre2perform.3 +#usr/share/man/man3/pcre2posix.3 +#usr/share/man/man3/pcre2sample.3 +#usr/share/man/man3/pcre2serialize.3 +#usr/share/man/man3/pcre2syntax.3 +#usr/share/man/man3/pcre2unicode.3 diff --git a/lfs/pcre2 b/lfs/pcre2 new file mode 100644 index 0000000000..d5d6c8e950 --- /dev/null +++ b/lfs/pcre2 @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 IPFire Team # +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 10.36 + +THISAPP = pcre2-$(VER) +DL_FILE = $(THISAPP).tar.gz +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 = a5d9aa7d18b61b0226696510e60c9582 + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static \ + --enable-unicode \ + --enable-jit \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --docdir=/usr/share/doc/pcre-$(THISAPP) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3c94509d3c..0bd67e808a 100755 --- a/make.sh +++ b/make.sh @@ -1102,6 +1102,7 @@ buildbase() { lfsmake2 lzip lfsmake2 pcre lfsmake2 pcre-compat + lfsmake2 pcre2 lfsmake2 gettext lfsmake2 attr lfsmake2 acl @@ -1817,9 +1818,9 @@ clean) for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do $LOSETUP -d $i 2>/dev/null done - for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do - umount $i - done + #for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do + # umount $i + #done stdumount for i in `seq 0 7`; do if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then