This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 24c4594bef6f766261664084e7b524987ea56a54 (commit) via f90b0f24a21e95fea350262967558557b89145b8 (commit) via cdb7afe6de1d3dab78c73ea4a6ae4f7bd3ed877e (commit) via 73c4653f420074fb008748440d807590ffd964de (commit) via e7fadafc55ef72489745808a3e274f8fd7cebabd (commit) via 52c37b97d6c4324a38fee9222efa45a57da26667 (commit) via 074075afdcd4a65af8e4cac82ced2a42a6943fe6 (commit) via 54bed236cc90a1d44364420e19a63aeca0f121b5 (commit) via 18baaf4666702ddbeccd89c2149f24fc1b010af6 (commit) via 772178c24c296264d126b07ce3ed793e7834e744 (commit) via 5987dd200451c3cc3dcce96f640ea0f07a89b399 (commit) via bdc235b59aac86e3fc962c792e6a22bda733e956 (commit) via 45eaf0bfc5bb93f5ef456ea725248c8327d59f64 (commit) via b0c37190a50405c4226c806a667be8b9c8a06311 (commit) from d1ee557242b8428a190759467a98048f62a0451d (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 24c4594bef6f766261664084e7b524987ea56a54 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 12 12:00:15 2021 +0000
core155: Ship wirelessclient.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f90b0f24a21e95fea350262967558557b89145b8 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Feb 11 13:41:29 2021 +0100
wirelessclient.cgi: Fix for bug #12571
- Wirelessclient shows priority 0 to be most preferred and priority 4 as least preferred. Based on forum posters experience and the wpa_supplicant man page it is the other way round. - This patch moves the least preferred title to priority 0 and vice versa - Will ask bug reporter to test out the patch and confirm it works. The page is only shown if you have a wifi connection on red.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cdb7afe6de1d3dab78c73ea4a6ae4f7bd3ed877e Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Feb 10 12:06:02 2021 +0100
python-xattr: Removal of addon
- Update of attr causes current version of python-xattr to fail to build - Following input from Michael Tremer - This package was orihinally required for pakfire 3 which no longer depends on it - This is a python 2 module. Python 2 is EOL - lfs and rootfile removed from IPFire - make.sh updated to remove python-xattr entry
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 73c4653f420074fb008748440d807590ffd964de Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 12 11:58:00 2021 +0000
core155: Ship attr
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e7fadafc55ef72489745808a3e274f8fd7cebabd Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Feb 10 12:05:44 2021 +0100
attr: Update to 2.4.48
- Update attr from 2.4.47 (2013) to 2.4.48 (2018) - Update rootfiles - Changelog in tarball only goes up to 2.4.44 so extracted changes from commits between 2.4.47 and release of 2.4.48 v2.4.48 attr: Fix segmentation fault Andreas Gruenbacher po: update Andreas Gruenbacher setfacl: Include errno.h Andreas Gruenbacher copy_action: drop unused alloca.h include Mike Frysinger include: add uninstall target to fix distcheck Mike Frysinger attr_copy_{fd,file}: sync changes between the files Mike Frysinger xattr.conf: do not copy security.evm Stefan Berger Cleanup visibility of API functions Yury Usishchev Cleanup config.h usage Yury Usishchev Use stdint types consistently Felix Janda walk_tree_rec: Add parentheses to clarify code Andreas Gruenbacher Reintroduce symbols that used to be syscall wrappers Dmitry V. Levin Do not export symbols that are not supposed to be exported Dmitry V. Levin Add explicit symbol versioning for attr_copy_action Dmitry V. Levin ignore configure.lineno Mike Frysinger walk_tree: mark internal variables as static Dmitry V. Levin Remove the attr.5 man page (moved to man-pages) Andreas Gruenbacher Remove <attr/xattr.h> and the syscall wrappers Andreas Gruenbacher Remove the section 2 man pages Andreas Gruenbacher Remove outdated tests from test/attr.test Andreas Gruenbacher Remove test/ext/fs.test Andreas Gruenbacher Add setfattr --raw option Andreas Gruenbacher Properly set and report empty attribute values Andreas Gruenbacher Man pages: Minor fixes Andreas Gruenbacher build: unbreak attr_copy_fd() and attr_copy_file(). Nick Alcock attr: Don't report a NULL attribute name when -l (list) fails Andreas Gruenbacher attr_list / attr_listf: Fix cursor off-by-one error Andreas Gruenbacher Portability fix: <alloca.h> is Linux specific Emmanuel Dreyfus Portability fixes Emmanuel Dreyfus telldir return value and seekdir second parameters are of type long Cristian RodrÃguez License fixes Andreas Gruenbacher test: fix cleanup & running as root Mike Frysinger include examples/ in dist tarball Mike Frysinger build: ship a pkgconfig file for libattr Jan Engelhardt build: make use of an aux-dir to stow away helper scripts Jan Engelhardt avoid glibc-specific DECLS defines Mike Frysinger build: drop attrincludedir, use pkgincludedir Jan Engelhardt disable installation of man(2) pages by default Mike Frysinger po: regenerate files after move Mike Frysinger modernize build system Mike Frysinger test: make running parallel/out-of-tree safe Mike Frysinger move gettext logic into misc.h Mike Frysinger punt debian/rpm packaging logic Mike Frysinger Suppress deprecation warnings when building attr and libattr Andreas Gruenbacher Add a default /etc/xattr.conf file Andreas Gruenbacher Mark the Irix compatibility functions as deprecated Andreas Gruenbacher Make attr_get and attr_getf behave as described in the man page Andreas Gruenbacher Use autoreconf rather than autoconf to regenerate the files. Fabrice Bauzac .gitignore: ignore *~ and config.h.in. Fabrice Bauzac Fix ATTR_OP_REMOVE operation in attr_multi() Makefile: rename configure.in to configure.ac
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 52c37b97d6c4324a38fee9222efa45a57da26667 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Feb 9 21:23:36 2021 +0100
lcd4linux: Update due to autoconf change
- lcd4linux fails to build with autoconf-2.71 Required running of autoupdate on configure.in and autoreconf to solve files not found errors
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 074075afdcd4a65af8e4cac82ced2a42a6943fe6 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 12 11:55:23 2021 +0000
core155: Ship collectd
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 54bed236cc90a1d44364420e19a63aeca0f121b5 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Feb 9 21:23:25 2021 +0100
collectd: Update due to autoconf change
- collectd fails to build with autoconf-2.71 Required running of autoupdate on configure.in and addition of --with-fp-layout=nothing to configure options
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 18baaf4666702ddbeccd89c2149f24fc1b010af6 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Feb 9 21:23:13 2021 +0100
autoconf: Update to 2.71
- Update autoconf from 2.69 to 2.71 - Updated rootfile - Changelog Large amount of changes, especially in 2.70 - too many to add in here. Details of changes can be found in the NEWS file in the tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 772178c24c296264d126b07ce3ed793e7834e744 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 12 11:54:26 2021 +0000
core155: Ship unbound
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5987dd200451c3cc3dcce96f640ea0f07a89b399 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Feb 9 18:33:17 2021 +0100
unbound: Update to 1.13.1
For details see: https://nlnetlabs.nl/projects/unbound/download/#unbound-1-13-1
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bdc235b59aac86e3fc962c792e6a22bda733e956 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 12 11:51:45 2021 +0000
Drop pcre-compat
This version of the library is outdated for a long time and we have been shipping newer versions for long enough so that everyone should have been migrated by now.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 45eaf0bfc5bb93f5ef456ea725248c8327d59f64 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 12 11:49:51 2021 +0000
core155: Ship pcre2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b0c37190a50405c4226c806a667be8b9c8a06311 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 9 16:10:07 2021 +0000
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 michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/attr | 28 +-- config/rootfiles/common/autoconf | 8 +- config/rootfiles/common/pcre-compat | 2 - config/rootfiles/common/pcre2 | 228 +++++++++++++++++++++ config/rootfiles/common/unbound | 2 +- .../{oldcore/106 => core/155}/filelists/attr | 0 .../{oldcore/125 => core/155}/filelists/collectd | 0 config/rootfiles/core/155/filelists/files | 1 + config/rootfiles/core/155/filelists/pcre2 | 1 + .../{oldcore/106 => core/155}/filelists/unbound | 0 config/rootfiles/core/155/update.sh | 5 + config/rootfiles/packages/python-xattr | 2 - html/cgi-bin/wirelessclient.cgi | 4 +- lfs/attr | 8 +- lfs/autoconf | 4 +- lfs/collectd | 4 +- lfs/lcd4linux | 4 +- lfs/pcre-compat | 80 -------- lfs/{nettle => pcre2} | 17 +- lfs/python-xattr | 82 -------- lfs/unbound | 6 +- make.sh | 9 +- 22 files changed, 283 insertions(+), 212 deletions(-) delete mode 100644 config/rootfiles/common/pcre-compat create mode 100644 config/rootfiles/common/pcre2 copy config/rootfiles/{oldcore/106 => core/155}/filelists/attr (100%) copy config/rootfiles/{oldcore/125 => core/155}/filelists/collectd (100%) create mode 120000 config/rootfiles/core/155/filelists/pcre2 copy config/rootfiles/{oldcore/106 => core/155}/filelists/unbound (100%) delete mode 100644 config/rootfiles/packages/python-xattr delete mode 100644 lfs/pcre-compat copy lfs/{nettle => pcre2} (92%) delete mode 100644 lfs/python-xattr
Difference in files: diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr index edfefa7e1..ba3ed7db7 100644 --- a/config/rootfiles/common/attr +++ b/config/rootfiles/common/attr @@ -1,24 +1,31 @@ usr/bin/attr usr/bin/getfattr usr/bin/setfattr +#usr/etc +#usr/etc/xattr.conf #usr/include/attr #usr/include/attr/attributes.h #usr/include/attr/error_context.h #usr/include/attr/libattr.h -#usr/include/attr/xattr.h #usr/lib/libattr.a #usr/lib/libattr.la #usr/lib/libattr.so usr/lib/libattr.so.1 -usr/lib/libattr.so.1.1.0 +usr/lib/libattr.so.1.1.2448 +#usr/lib/pkgconfig/libattr.pc #usr/share/doc/attr -#usr/share/doc/attr/CHANGES.gz +#usr/share/doc/attr/CHANGES #usr/share/doc/attr/COPYING #usr/share/doc/attr/COPYING.LGPL #usr/share/doc/attr/PORTING -#usr/share/doc/attr/README #usr/share/locale/cs/LC_MESSAGES/attr.mo #usr/share/locale/de/LC_MESSAGES/attr.mo +#usr/share/locale/en@boldquot +#usr/share/locale/en@boldquot/LC_MESSAGES +#usr/share/locale/en@boldquot/LC_MESSAGES/attr.mo +#usr/share/locale/en@quot +#usr/share/locale/en@quot/LC_MESSAGES +#usr/share/locale/en@quot/LC_MESSAGES/attr.mo #usr/share/locale/es/LC_MESSAGES/attr.mo #usr/share/locale/fr/LC_MESSAGES/attr.mo #usr/share/locale/gl/LC_MESSAGES/attr.mo @@ -28,18 +35,6 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man1/attr.1 #usr/share/man/man1/getfattr.1 #usr/share/man/man1/setfattr.1 -#usr/share/man/man2/fgetxattr.2 -#usr/share/man/man2/flistxattr.2 -#usr/share/man/man2/fremovexattr.2 -#usr/share/man/man2/fsetxattr.2 -#usr/share/man/man2/getxattr.2 -#usr/share/man/man2/lgetxattr.2 -#usr/share/man/man2/listxattr.2 -#usr/share/man/man2/llistxattr.2 -#usr/share/man/man2/lremovexattr.2 -#usr/share/man/man2/lsetxattr.2 -#usr/share/man/man2/removexattr.2 -#usr/share/man/man2/setxattr.2 #usr/share/man/man3/attr_get.3 #usr/share/man/man3/attr_getf.3 #usr/share/man/man3/attr_list.3 @@ -50,4 +45,3 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man3/attr_removef.3 #usr/share/man/man3/attr_set.3 #usr/share/man/man3/attr_setf.3 -#usr/share/man/man5/attr.5 diff --git a/config/rootfiles/common/autoconf b/config/rootfiles/common/autoconf index 3e28ae744..c9aeb7a87 100644 --- a/config/rootfiles/common/autoconf +++ b/config/rootfiles/common/autoconf @@ -10,6 +10,7 @@ #usr/share/autoconf/Autom4te/C4che.pm #usr/share/autoconf/Autom4te/ChannelDefs.pm #usr/share/autoconf/Autom4te/Channels.pm +#usr/share/autoconf/Autom4te/Config.pm #usr/share/autoconf/Autom4te/Configure_ac.pm #usr/share/autoconf/Autom4te/FileUtils.pm #usr/share/autoconf/Autom4te/General.pm @@ -37,6 +38,7 @@ #usr/share/autoconf/autoconf/programs.m4 #usr/share/autoconf/autoconf/specific.m4 #usr/share/autoconf/autoconf/status.m4 +#usr/share/autoconf/autoconf/trailer.m4 #usr/share/autoconf/autoconf/types.m4 #usr/share/autoconf/autom4te.cfg #usr/share/autoconf/autoscan @@ -46,6 +48,10 @@ #usr/share/autoconf/autotest/autotest.m4f #usr/share/autoconf/autotest/general.m4 #usr/share/autoconf/autotest/specific.m4 +#usr/share/autoconf/build-aux +#usr/share/autoconf/build-aux/config.guess +#usr/share/autoconf/build-aux/config.sub +#usr/share/autoconf/build-aux/install-sh #usr/share/autoconf/m4sugar #usr/share/autoconf/m4sugar/foreach.m4 #usr/share/autoconf/m4sugar/m4sh.m4 @@ -61,6 +67,4 @@ #usr/share/man/man1/autoreconf.1 #usr/share/man/man1/autoscan.1 #usr/share/man/man1/autoupdate.1 -#usr/share/man/man1/config.guess.1 -#usr/share/man/man1/config.sub.1 #usr/share/man/man1/ifnames.1 diff --git a/config/rootfiles/common/pcre-compat b/config/rootfiles/common/pcre-compat deleted file mode 100644 index ff1b77643..000000000 --- a/config/rootfiles/common/pcre-compat +++ /dev/null @@ -1,2 +0,0 @@ -lib/libpcre.so.0 -lib/libpcre.so.0.0.1 diff --git a/config/rootfiles/common/pcre2 b/config/rootfiles/common/pcre2 new file mode 100644 index 000000000..440af7b0d --- /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/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 45fee4460..6d890daf0 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.11 +usr/lib/libunbound.so.8.1.12 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/core/155/filelists/attr b/config/rootfiles/core/155/filelists/attr new file mode 120000 index 000000000..c80801751 --- /dev/null +++ b/config/rootfiles/core/155/filelists/attr @@ -0,0 +1 @@ +../../../common/attr \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/collectd b/config/rootfiles/core/155/filelists/collectd new file mode 120000 index 000000000..871b32f14 --- /dev/null +++ b/config/rootfiles/core/155/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files index e69de29bb..23a48008d 100644 --- a/config/rootfiles/core/155/filelists/files +++ b/config/rootfiles/core/155/filelists/files @@ -0,0 +1 @@ +srv/web/ipfire/cgi-bin/wirelessclient.cgi diff --git a/config/rootfiles/core/155/filelists/pcre2 b/config/rootfiles/core/155/filelists/pcre2 new file mode 120000 index 000000000..4482caeae --- /dev/null +++ b/config/rootfiles/core/155/filelists/pcre2 @@ -0,0 +1 @@ +../../../common/pcre2 \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/unbound b/config/rootfiles/core/155/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/155/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index 975cf0508..f7b2e8279 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -32,6 +32,9 @@ for (( i=1; i<=$core; i++ )); do done
# Remove files +rm -vf \ + /lib/libpcre.so.0 \ + /lib/libpcre.so.0.0.1
# Stop services
@@ -48,6 +51,8 @@ ldconfig /usr/local/bin/filesystem-cleanup
# Start services +/etc/init.d/unbound restart +/etc/init.d/collectd restart /etc/init.d/squid restart
# This update needs a reboot... diff --git a/config/rootfiles/packages/python-xattr b/config/rootfiles/packages/python-xattr deleted file mode 100644 index 747ff5c2a..000000000 --- a/config/rootfiles/packages/python-xattr +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python2.7/site-packages/pyxattr-0.5.0-py2.7.egg-info -usr/lib/python2.7/site-packages/xattr.so diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index e8c3c9628..b1679c128 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -602,11 +602,11 @@ sub showEditBox() { </td> <td width='40%'> <select name='PRIO'> - <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option> + <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'least preferred'})</option> <option value="1" $selected{'PRIO'}{'1'}>1</option> <option value="2" $selected{'PRIO'}{'2'}>2</option> <option value="3" $selected{'PRIO'}{'3'}>3</option> - <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option> + <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'most preferred'})</option> </select> </td> <td colspan="2" width='40%'></td> diff --git a/lfs/attr b/lfs/attr index bdae19a11..f31c0f2b4 100644 --- a/lfs/attr +++ b/lfs/attr @@ -24,10 +24,10 @@
include Config
-VER = 2.4.47 +VER = 2.4.48
THISAPP = attr-$(VER) -DL_FILE = $(THISAPP).src.tar.gz +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 = 84f58dec00b60f2dc8fd1c9709291cc7 +$(DL_FILE)_MD5 = bc1e5cb5c96d99b24886f1f527d3bb3d
install : $(TARGET)
@@ -73,8 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure cd $(DIR_APP) && make cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-lib - cd $(DIR_APP) && make install-dev chmod -v 755 /usr/lib/libattr.so @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/autoconf b/lfs/autoconf index 4abc8353a..ed77c46ed 100644 --- a/lfs/autoconf +++ b/lfs/autoconf @@ -24,7 +24,7 @@
include Config
-VER = 2.69 +VER = 2.71
THISAPP = autoconf-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -39,7 +39,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 50f97f4159805e374639a73e2636f22e +$(DL_FILE)_MD5 = 12cfa1687ffa2606337efe1a64416106
install : $(TARGET)
diff --git a/lfs/collectd b/lfs/collectd index 0f99c4ce7..7c9744531 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -106,6 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch + cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \ @@ -116,7 +117,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-{interface,iptables,irq,load,logfile,memory,multimeter} \ --enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \ --enable-{tcpconns,unixsock,users,wireless} \ - --with-librrd=/usr/share/rrdtool-1.2.30 + --with-librrd=/usr/share/rrdtool-1.2.30 \ + --with-fp-layout=nothing cd $(DIR_APP) && make install #collectd-4 does not support parallel build cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn diff --git a/lfs/lcd4linux b/lfs/lcd4linux index 198607e25..9121e6fa0 100644 --- a/lfs/lcd4linux +++ b/lfs/lcd4linux @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/lcd4linux TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcd4linux -PAK_VER = 6 +PAK_VER = 7
DEPS = dpfhack libmpdclient
@@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && autoreconf -v -i + cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && ./configure --with-plugins=all,!qnaplog,!dbus --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/pcre-compat b/lfs/pcre2 similarity index 85% rename from lfs/pcre-compat rename to lfs/pcre2 index 5709a477b..d5d6c8e95 100644 --- a/lfs/pcre-compat +++ b/lfs/pcre2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2019 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 = 7.7 +VER = 10.36
-THISAPP = pcre-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = pcre2-$(VER) +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 = a5d9aa7d18b61b0226696510e60c9582
install : $(TARGET)
@@ -69,12 +69,16 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - 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-unicode \ + --enable-jit \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --docdir=/usr/share/doc/pcre-$(THISAPP) 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 + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/python-xattr b/lfs/python-xattr deleted file mode 100644 index a77d22a91..000000000 --- a/lfs/python-xattr +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # -# 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 = 0.5.0 - -THISAPP = pyxattr-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-xattr -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 0f7ab1e185087329e40f7de218517c84 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/unbound b/lfs/unbound index 69cb91d73..0bd437481 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 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,7 +24,7 @@
include Config
-VER = 1.13.0 +VER = 1.13.1
THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5a522f10c65332efe627098d2d24f947 +$(DL_FILE)_MD5 = 0cd660a40d733acc6e7cce43731cac62
install : $(TARGET)
diff --git a/make.sh b/make.sh index 3c94509d3..a0c71ce73 100755 --- a/make.sh +++ b/make.sh @@ -1101,7 +1101,7 @@ buildbase() { lfsmake2 xz lfsmake2 lzip lfsmake2 pcre - lfsmake2 pcre-compat + lfsmake2 pcre2 lfsmake2 gettext lfsmake2 attr lfsmake2 acl @@ -1552,7 +1552,6 @@ buildipfire() { lfsmake2 python-distutils-extra lfsmake2 python-lzma lfsmake2 python-progressbar - lfsmake2 python-xattr lfsmake2 ddns lfsmake2 python3-setuptools lfsmake2 python3-setuptools-scm @@ -1817,9 +1816,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
hooks/post-receive -- IPFire 2.x development tree