[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e308e4eb2534c260a29a17bd66700f894a84cb9
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 8e308e4eb2534c260a29a17bd66700f894a84cb9 (commit) via ed900d153ef5452779f8eae0320c424b4216d9b4 (commit) via f407f05a6f0b4a85e7852ac01d71f4d9373940ae (commit) via ece62d250091d962f12cbfb8de92ebfc26a0856e (commit) via 446b9291f9773ba462da8a561c966e59e48f19cb (commit) via 2e4321c1f49dc3a8b4c5b0357a8b60889d9da89c (commit) via 8474dc4a7743fc9da0cf1496c76c74c4aaf7cc36 (commit) via 8e07deb9839e341bf9841fd08e82c55cd5ab6017 (commit) via fe2c0e0fa0729589488e60eda4aa6dd6f70ee01f (commit) via 74e28f29f8cfe2ab8df905cee1b29cbfe00f81fb (commit) via 1116930315418a0dbc410a0c49de22134d68205d (commit) via 304f647749912c429cee7791d6da8ccd70692868 (commit) via 4306f30b6f80de3c7c0d7b398e42616abdc4d006 (commit) via 5de33a38d801a1fb0420efa20d108b9f5312d913 (commit) from 1a4e9c9db4857d0a578bcd5f4d4a60edc5129834 (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 8e308e4eb2534c260a29a17bd66700f894a84cb9 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 16:44:41 2021 +0000
Update contributors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ed900d153ef5452779f8eae0320c424b4216d9b4 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 11:24:50 2021 +0000
core154: Ship lzip
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f407f05a6f0b4a85e7852ac01d71f4d9373940ae Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Feb 4 23:17:22 2021 +0100
lzip: Installation of lzip-1.22
- Installation of lzip-1.22 into IPFire Build system. Required for update of ddrescue addon as gnu only using lzip compression for ddrescue from 2013. - Created rootfiles - Installed lzip into build sequence of make.sh at same location as other compressor packages.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ece62d250091d962f12cbfb8de92ebfc26a0856e Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Feb 4 23:17:08 2021 +0100
ddrescue: Update to 1.25
- Update ddrescue from 1.12 to 1.25 - Updated rootfiles - Since 2013 gnu started to only use lzip for compression of ddrescue Therefore second patch of this series is the installation of lzip in the IPFire Build. - Changelog 2020-02-21 Antonio Diaz Diaz antonio@gnu.org * Version 1.25 released. * block.h: Add default constructors to classes Block and Sblock. (Reported by Rosen Penev). * check.sh: Quote all file name variables to allow names with spaces. (Reported by David Morrison). * In rescue mode, join non-finished subsectors read from mapfile. (Reported by David Burton). * mapbook.cc (update_mapfile): Exclude writing time from intervals. (Reported by David Burton). * rescuebook.cc (extend_outfile_size): Use ftruncate if it works. * Print large numbers in groups of 3 digits separated by underscores. * main.cc: Set a valid invocation_name even if argc == 0. 2019-02-24 Antonio Diaz Diaz antonio@gnu.org * Version 1.24 released. * Added new option '--command-mode'. * Implemented mapfile backup. * ddrescue.texi: Documented final contents of bad areas in outfile. * configure: Accept appending to CXXFLAGS, 'CXXFLAGS+=OPTIONS'. 2018-02-13 Antonio Diaz Diaz antonio@gnu.org * Version 1.23 released. * rescuebook.cc (trim_errors): Fix wrong change to non-scraped. * Added new option '--same-file'. * Added new option '--shift' to ddrescuelog. * fillbook.cc (fill_block): Write location data as one line. * fillbook.cc (read_buffer): Do not require a seekable infile. * ddrescue.texi: Added chapter 'Output'. * check.sh: Added 'combined rescue' test. * io.cc: Added missing '#include <cstdio>'. 2017-02-03 Antonio Diaz Diaz antonio@gnu.org * Version 1.22 released. * Option '-X, --exit-on-error' replaced by '-X, --max-read-errors'. * Added new option '--max-slow-reads'. * Added new option '--delay-slow'. * Added new option '--reset-slow'. * Added new option '--log-events'. * Added new option '--mapfile-interval'. * Added new option '--pause-on-error'. * Option '--pause' has been renamed to '--pause-on-pass'. * Option '--max-errors' has been renamed to '--max-bad-areas'. * Renamed 'errsize' to 'bad_size' and 'errors' to 'bad_areas' * Rescuebook: Show read_errors, error_rate and slow_reads. * Added 'current_pass' field to mapfile. * Added two new passes (3 and 4) to the copying phase. * main.cc (parse_cpass): Accept ranges of passes. * Option '-K, --skip-size' now accepts sizes up to 1 EiB. * Initial skip size now defaults to (infile_size / 100_000). * rescuebook.cc (copy_non_tried): Don't reduce min_read_rate, enable it only for passes 1 and 2. * rescuebook.cc (trim_errors): Don't trim bad edges. * main_common.cc (getnum): Accept 's' after other multiplier. * '--ask', '-vv' now show size along with model and serial number. * non_posix.cc: Add 'device_id' for Cygwin. (Patch written by Christian Franke franke@computer.org). * rescuebook.cc (do_rescue): Show full sizes in domain warning. * Added new option '-A, --annotate-mapfile' to ddrescuelog. 2016-03-17 Antonio Diaz Diaz antonio@gnu.org * Version 1.21 released. * mapbook.cc (Mapbook): Fix iobuf alignment. (Reported by Heikki Tauriainen). * Removed short option names '-1' and '-2'. * Allow only regular files for '--log-rates' and '--log-reads'. * Option '-D, --odirect' now works also in fill mode. * rescuebook.cc (copy_block): Return 1 on unaligned read error. Set e_code on any error if verify_on_error. * Option '-X, --exit-on-error' has been extended to all phases. * Assigned short name '-Z' to option '--max-read-rate'. * mapbook.cc (update_mapfile): 'fsync' the mapfile every 5 minutes. * Rescuebook: Show full range of sizes from non-tried to finished. * rescuebook.cc (show_status): Show percentage rescued. * configure: Avoid warning on some shells when testing for g++. * Makefile.in: Detect the existence of install-info. 2015-09-10 Antonio Diaz Diaz antonio@gnu.org * Version 1.20 released. * 'logfile' has been renamed to 'mapfile' everywhere. * Changed short name of option '--synchronous' to '-y'. * Changed long name of option '-d' to '--idirect'. * Added new option '-D, --odirect'. * Added new option '-J, --verify-on-error'. * Added new option '--max-read-rate'. * rescuebook.cc (copy_block): Copy arbitrary blocks with '--idirect'. * Include only bad-sector blocks in 'errsize'. * rescuebook.cc (show_status): Show the estimated remaining time. * io.cc (format_time): Show time in days, hours, minutes and seconds. * Added per sector location data to fill mode. * mapbook.cc: Added emergency save of the mapfile. * Show device name with '--ask' or '-vv' on Haiku. * mapfile.cc (read_mapfile): Read read-only mapfiles from stdin. * ddrescuelog.cc: Allow multiple mapfiles for '-t, --show-status'. * ddrescuelog.cc (create_mapfile): '-' writes mapfile to stdout. * ddrescue.texi: Added new chapter 'Optical media'. * ddrescue.texi: Documented maximum size of the rescue domain. * configure: Option '--enable-linux' renamed to '--enable-non-posix'. * Makefile.in: Added new targets 'install*-compress'. * File 'ddrescue.h' renamed to 'mapbook.h'. * File 'logbook.cc' renamed to 'mapbook.cc'. * File 'logfile.cc' renamed to 'mapfile.cc'. * Files linux.{h,cc} renamed to non_posix.{h,cc}. 2014-10-03 Antonio Diaz Diaz antonio@gnu.org * Version 1.19 released. * Fixed a race condition at start of run with '--timeout=0'. * Added new option '-P, --data-preview'. * Added new option '-u, --unidirectional'. * Added new option '-X, --exit-on-error'. * Added new option '--ask' to ask for user confirmation. * Added new option '--cpass' to select passes during copying phase. * Added new option '--pause' to insert a pause between passes. * Removed option '-l, --logfile-size'. * Skip on the first error during the copying phase. * rescuebook.cc: Trimming done in one pass, may be run in reverse. * The splitting phase has been replaced by a scraping phase. * Changed long name of option '-n' to '--no-scrape'. * rescuebook.cc: Alternate direction of passes during retrying phase. * Show ATA model and serial number with '--ask' or '-vv' on Linux. * configure: Added new option '--enable-linux'. * New files linux.h linux.cc. * License changed to GPL version 2 or later. 2014-06-10 Antonio Diaz Diaz antonio@gnu.org * Version 1.18.1 released. * ddrescuelog.cc (do_logic_ops): Fixed 'or' and 'xor'. * Added new option '-H, --test-mode' to simulate read errors. * Added new option '-L, --loose-domain' to ddrescue and ddrescuelog. * Added new option '-N, --no-trim' to disable trimming of damaged areas. * Added new option '-O, --reopen-on-error'. * Added new options '-1, --log-rates', '-2, --log-reads'. * Extended '-K, --skip-size' with maximum and disable values. * Changed long name of option '-r' to '--retry-passes'. * Changed short name of option '--generate-mode' to '-G'. * Default value of option '-l, --logfile-size' increased to 10000. * If interrupted, ddrescue terminates by raising the signal received. * rescuebook.cc (copy_non_tried): Don't mark skipped blocks as non-trimmed. Try them in additional passes (before trimming). * rescuebook.cc: Limit the copying phase to 3 passes. * rescuebook.cc: Alternate direction of passes during copying phase. * rescuebook.cc: Smallest blocks are trimmed first. * rescuebook.cc (split_errors): Read largest first if logfile full. * Improved speed when using option '-m, --domain-logfile'. * io.cc (show_status): Show the current total run time. * rescuebook.cc: Show pass number and direction during copying. * rescuebook.cc (show_status): Show block pos instead of current_pos. * main.cc: Show "an unknown number of bytes" for unknown insize. * Added option '-B, --binary-prefixes' to ddrescuelog. * Added new option '-C, --complete-logfile' to ddrescuelog. * Added new option '-P, --compare-as-domain' to ddrescuelog. * Improved speed of logic operations in ddrescuelog. * rescuebook.cc (do_rescue): Show warning when domain is smaller than logfile. * ddrescuelog.cc (do_show_status): Show logfile and domain extents when domain is smaller than logfile. * block.h: Class Block now forces the invariant by itself. * Code reorganization. New class 'Logfile'. * Added status message to rescue logfile. * Many improvements to documentation. * ddrescue.texinfo: Renamed to ddrescue.texi. 2013-07-09 Antonio Diaz Diaz antonio@gnu.org * Version 1.17 released. * Added new option '-l, --logfile-size'. * Added new option '-w, --ignore-write-errors'. * Option '--fill' has been renamed to '--fill-mode'. * Option '--generate-logfile' has been renamed to '--generate-mode'. * Added option '--sector-size' as a synonym of '--block-size'. * Added option '--retries' as a synonym of '--max-retries'. * Added option '--size' as a synonym of '--max-size'. * rescuebook.cc: Trimming is now done from both edges of each non-trimmed block. Largest blocks are trimmed first. * rescuebook.cc: Largest blocks are now split first until logfile reaches '--logfile-size' entries. * logbook.cc (extend_sblock_vector, truncate_vector): Terminate if truncation would discard finished blocks. * rescuebook.cc: Mark failed blocks with 1 sector as bad-sector. * logbook.cc (extend_sblock_vector): Remove last block of logfile if it starts at insize and is not marked as finished. * io.cc (show_status, update_rates): Detect a jump back in time and adjust status. * ddrescue.h (slow_read): Return false for the first 10 seconds. * io.cc (show_status) Leave cursor after message so that ^C does not overwrite it. * main.cc: Don't require '--force' for generate mode. * ddrescue.h (Logbook::logfile_exists): Don't return false if logfile exists but is empty. * ddrescue.texinfo: Added new chapter 'Using ddrescue safely'. * Documented that 'direct disc access' only reads whole sectors. * configure: Options now accept a separate argument. * Makefile.in: Added new target 'install-bin'. 2012-06-11 Antonio Diaz Diaz ant_diaz@teleline.es * Version 1.16 released. * Added new option '-K, --skip-size'. * Added new option '-T, --timeout'. * Changed short name of option '--try-again' to '-A'. * Maximum skip size is now limited to 1% of infile size or 1 GiB (whichever is smaller), rounded to the next multiple of sector size. * Set current_pos to end of block when reading backwards. * The option '-E, --max-error-rate' now checks the rate of actually failed reads, not the growth of error size. * The option '-v, --verbose' now increases verbosity if repeated. * Changed quote characters in messages as advised by GNU Standards. * configure: 'datadir' renamed to 'datarootdir'. * New files rational.h, rational.cc. 2012-01-01 Antonio Diaz Diaz ant_diaz@teleline.es * Version 1.15 released. * Added new option '-a, --min-read-rate'. * Added new option '-I, --verify-input-size'. * Added new option '-x, --extend-outfile'. * main.cc: Verify that infile, outfile and logfile are all different. * Non-tried blocks are now read aligned to cluster-size sectors. * rescuebook.cc: Improved skip algorithm for the split pass. * main.cc: Removed spurious warning about '-D' ignored in fill mode. * ddrescue.texinfo: Improved description of algorithm. * logbook.cc (change_chunk_status): Return an adjust value (-1, 0, 1) to keep "errors" updated without calling count_errors every time. * ddrescue.cc: Renamed to io.cc. * Added 'ddrescuelog', a program for logfile manipulation. 2011-01-10 Antonio Diaz Diaz ant_diaz@teleline.es * Version 1.14 released. * Added new option '-R, --reverse'. * Added new option '-E, --max-error-rate'. * Extended syntax '--max-errors=+N' to specify new errors. * Changed short name of option '--retrim' to '-M'. * Removed spurious warning about 'preallocation not available'. * Code reorganization. New class 'Genbook'. 2010-08-27 Antonio Diaz Diaz ant_diaz@teleline.es * Version 1.13 released. * Non-regular output files are no longer overwritten by default. * Added new option '-f, --force'. * Added new option '-p, --preallocate'. * main.cc (write_logfile_header): Write command line to logfile. * ddrescue.texinfo: Added info about logfile and recoverable formats. * ddrescue.texinfo: Added a couple more warnings to the tutorial. * testsuite: 'test1' renamed to 'test.txt' * Revert to use 'long' instead of 'time_t' for time variables. Ddrescue only needs counting seconds and 'time_t' causes warnings on some systems.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 446b9291f9773ba462da8a561c966e59e48f19cb Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 11:23:30 2021 +0000
core154: Ship curl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2e4321c1f49dc3a8b4c5b0357a8b60889d9da89c Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Feb 4 17:21:46 2021 +0100
curl: Update to 7.75
For details see: https://curl.se/changes.html
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8474dc4a7743fc9da0cf1496c76c74c4aaf7cc36 Author: Peter Müller peter.mueller@ipfire.org Date: Thu Feb 4 21:39:32 2021 +0100
Tor: update to 0.4.4.7
Full changelog of this version as per https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.4.7:
Changes in version 0.4.4.7 - 2021-02-03 Tor 0.4.4.7 backports numerous bugfixes from later releases, including one that made v3 onion services more susceptible to denial-of-service attacks, and a feature that makes some kinds of DoS attacks harder to perform.
o Major bugfixes (onion service v3, backport from 0.4.5.3-rc): - Stop requiring a live consensus for v3 clients and services, and allow a "reasonably live" consensus instead. This allows v3 onion services to work even if the authorities fail to generate a consensus for more than 2 hours in a row. Fixes bug 40237; bugfix on 0.3.5.1-alpha.
o Major feature (exit, backport from 0.4.5.5-rc): - Re-entry into the network is now denied at the Exit level to all relays' ORPorts and authorities' ORPorts and DirPorts. This change should help mitgate a set of denial-of-service attacks. Closes ticket 2667.
o Minor feature (build system, backport from 0.4.5.4-rc): - New "make lsp" command to generate the compile_commands.json file used by the ccls language server. The "bear" program is needed for this. Closes ticket 40227.
o Minor features (compilation, backport from 0.4.5.2-rc): - Disable deprecation warnings when building with OpenSSL 3.0.0 or later. There are a number of APIs newly deprecated in OpenSSL 3.0.0 that Tor still requires. (A later version of Tor will try to stop depending on these APIs.) Closes ticket 40165.
o Minor features (crypto, backport from 0.4.5.3-rc): - Fix undefined behavior on our Keccak library. The bug only appeared on platforms with 32-byte CPU cache lines (e.g. armv5tel) and would result in wrong digests. Fixes bug 40210; bugfix on 0.2.8.1-alpha. Thanks to Bernhard Übelacker, Arnd Bergmann and weasel for diagnosing this.
o Minor bugfixes (compatibility, backport from 0.4.5.1-rc): - Strip '\r' characters when reading text files on Unix platforms. This should resolve an issue where a relay operator migrates a relay from Windows to Unix, but does not change the line ending of Tor's various state files to match the platform, and the CRLF line endings from Windows end up leaking into other files such as the extra-info document. Fixes bug 33781; bugfix on 0.0.9pre5.
o Minor bugfixes (compilation, backport from 0.4.5.3-rc): - Fix a compilation warning about unreachable fallthrough annotations when building with "--enable-all-bugs-are-fatal" on some compilers. Fixes bug 40241; bugfix on 0.3.5.4-alpha.
o Minor bugfixes (SOCKS5, backport from 0.4.5.3-rc): - Handle partial SOCKS5 messages correctly. Previously, our code would send an incorrect error message if it got a SOCKS5 request that wasn't complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha.
o Minor bugfixes (testing, backport from 0.4.5.2-alpha): - Fix the `config/parse_tcp_proxy_line` test so that it works correctly on systems where the DNS provider hijacks invalid queries. Fixes part of bug 40179; bugfix on 0.4.3.1-alpha. - Fix our Python reference-implementation for the v3 onion service handshake so that it works correctly with the version of hashlib provided by Python 3.9. Fixes part of bug 40179; bugfix on 0.3.1.6-rc. - Fix the `tortls/openssl/log_one_error` test to work with OpenSSL 3.0.0. Fixes bug 40170; bugfix on 0.2.8.1-alpha.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8e07deb9839e341bf9841fd08e82c55cd5ab6017 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Feb 4 18:27:21 2021 +0100
clamav: Update to 0.103.1
For details see: https://blog.clamav.net/2021/02/clamav-01031-patch-release.html
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fe2c0e0fa0729589488e60eda4aa6dd6f70ee01f Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 11:19:34 2021 +0000
core154: Ship pptp
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 74e28f29f8cfe2ab8df905cee1b29cbfe00f81fb Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Feb 4 13:56:39 2021 +0100
pptp: Update to 1.10.0
- Update pptp from 1.7.2 (Jun 2008) to 1.10.0 (Jan 2018) - No change to rootfile - Removal of pptp-1.7.2-compat.patch as all changes to pptp_compat.c are now included in the file in the new tarball.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1116930315418a0dbc410a0c49de22134d68205d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 11:17:54 2021 +0000
core154: Ship less
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 304f647749912c429cee7791d6da8ccd70692868 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Feb 4 13:56:27 2021 +0100
less: Update to version 563
- Update less from 530 to 563 - No change in rootfile - Changelog Version 563 was released on 21 Oct 2020. These are the differences between version 551 and version 563: Update Unicode tables. Treat Hangul Jamo medial vowels and final consonants as zero width. Display error message immediately when -o is toggled and input is not a pipe. Fix regression: make screen repaint when "squished" and a no-movement command is given. Fix erroneous EOF calculation when F command is interrupted. Make WIN32C version include this fix from 551: Don't count lines in initial screen if using -X with -F. Fix display bug in WIN32C version. Fix memory corruption when built with libtermcap. Fix crash on some systems due to realpath incompatibility. Support libtinfow. Version 551 was released on 11 Jun 2019 551 is the same as 550 except for a few documentation changes. Version 550 was released on 3 Jun 2019. These are the differences between version 530 and version 550: Add --mouse option. Add --wheel-lines option. Add --no-histdups option. Add --save-marks option. Support PCRE2 regular expression library. Redraw screen on SIGWINCH even if screen size doesn't change. Shell-escape filenames in history so they can be used again. Ring bell if user enters invalid long option name. Use PCRE_UTF8 flag for pcre regular expressions when in UTF-8 mode. Windows: use wide-char string to set console title. Don't count lines in initial screen if using -X with -F. Support mingw build system. Fix bug in v command on empty file. Fix bug in v command when filename contains shell metacharacters.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4306f30b6f80de3c7c0d7b398e42616abdc4d006 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 11:16:58 2021 +0000
core154: Ship findutils
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5de33a38d801a1fb0420efa20d108b9f5312d913 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Feb 4 13:55:08 2021 +0100
findutils: Update to 4.8.0
- Update findutils from 4.6.0 to 4.8.0 - Remove findutils-4.6.0-glibc2.28.patch from lfs as all patch items are now in the new tarball files. - Remove sed command on gl/lib/mountlist.c from lfs as all fixes are in the mountlist.c file in the new tarball. - Update rootfiles - Changelog Following are major changes. Further detailed info available in changelog file in tarball. * Noteworthy changes in release 4.8.0 (2021-01-09) [stable] ** Changes in xargs 'xargs -t' no longer outputs a trailing blank to stderr after the last argument of each constructed command line to be executed. [#57291] xargs now warns when more than one of the conflicting options --max-lines (-L, -l), --replace (-i/-I) and --max-args (-n) are specified on the command line. [#52137] ** Bug Fixes find no longer crashes when an XFS filesystem is heavily changed during the run. Discussed at: https://lists.gnu.org/r/bug-gnulib/2020-04/msg00068.html find -used works again. This predicate was not working properly since adding the support for sub-second timestamp resolution for various predicates in FINDUTILS_4_3_3-1 back in 2007. Discussed at: https://lists.gnu.org/r/bug-findutils/2019-11/msg00010.html ** Improvements 'find -D exec' now diagnoses all -exec, -execdir, -ok and -okdir runs including the call arguments and the exit code of the launched process. [#59083] ** Documentation Changes The documentation of 'find -printf %Ak' has been improved: it now refers to the strftime(3) documentation for a complete list of supported conversion specifiers, and documents the 'F' conversion specifier ('yyyy-mm-dd'). The man pages (find.1, locate.1, locatedb.5, updatedb.1, and xargs.1) now consistently end with the sections "REPORTING BUGS", "COPYRIGHT" and "SEE ALSO", with the latter referring to the online page on the GNU web server. The "EXAMPLES" section in the find.1 man page now shows the examples in a better structure and uses consistent formatting. Various man page fixes - syntax issues and typos. [#59745, #59330, #59012, #58193, #57807, #57775] Other documentation changes: #58654: doc: clarify that 'find -perm +MODE' is unrelated to umask #58458: doc: improve section 'Hard links', especially fix the description regarding 'find -L -samefile FILE'. #58205: find.1: clarify double dash '--' option #58149: 'xargs --help' now mentions that --replace (-I, -i) splits the input at newline characters. #57025: doc: enhance description of tests accepting numeric arguments in find.1 [see also #49640]. #54730: Add additional valuable example of find -quit #48135: Fix testsuite error on Hurd and BSD related to ln #35253: Clarify descriptions of -printf %f, %h. ** Changes to the build process The configure option --without-fts has been removed. The attempt to use it stopped configure with an error message since 4.5.18 (2015) anyway. * Major changes in release 4.7.0, 2019-08-29 ** Changes to locate / updatedb Support for generating old-format databases (with updatedb --old-format or updatedb --dbformat=old) has been removed. The old database format was deprecated in 2007 (and updatedb has warned about this since that time). The locate program will will read old-format databases, though this support also will be removed. The updatedb script now operates in the C locale only. This means that character encoding issues are now not likely to cause sort to fail. It also honours the TMPDIR environment variable if that was set, and no longer sorts file names case-insensitively. The (unspecified) order in which filenames are stored in the locate database is now different to previous versions. However, you should not rely on locate's output appearing in any particular order in any case. ** Improvements All utilities now only show the full usage text when requested via the --help option. Previously, when the user passed invalid options or arguments, the user's attention to the corresponding error diagnostic was distracted by that lengthy text. find now accepts multiple file type arguments to the -type and -xtype options separated by comma ','. For example, to search for symbolic links and directories simply provide the shorter '-type l,d' instead of the - yet more portable - '( -type l -o -type d )'. find now diagnoses failures returned by readdir(). This bug was inherent in the use of FTS. find now exits in more cases immediately after the error diagnostic, i.e., without the following usage text, to make the former more eye-catching. find now outputs a better hint in case the user passed an unquoted shell- glob pattern to options like -name, i.e., when the offending argument is an existing file. find now supports the debug option '-D all' to include all of the other debug options at once. xargs now supports the -o, --open-tty option to reopen stdin as /dev/tty in the child process before executing the command; useful to run an interactive application. Added for compatibility with BSD. xargs now supports the GNU_FINDUTILS_FD_LEAK_CHECK environment variable to enable/disable fd leak check. 'xargs -t' (--verbose) now properly quotes each part of the command to the executed if needed when printing it to stderr; likewise -p (--interactive). ** Documentation Changes Prefer https:// over http:// links where possible, e.g. for '*.gnu.org' servers. Both find.1 and the find texinfo manual now consistently document all of the 'N', 'L' and '?' possibilities in '-printf %Y' output when the determination of the type of a symlink target fails. find.1 now correctly states the -prune has no effect when the -depth option is given. Before, it wrongly stated that -prune would return false in that case. Some minor documentation improvements are listed in "Bug Fixes" below. ** Bug Fixes #56820: find: improve diagnostic when a global option like -maxdepth is specified after another argument like a test, thus hopefully avoiding translation issues (at least French, German). #56142: doc: fix bug #56142 by specifying which actions inhibit the default -print. #55272: find: improve diagnostic when -name or -iname is used with a pattern containing a directory separator ('/'), suggesting to use -wholename or -iwholename respectively. #54859: doc: fix typo in 'xargs -l' examples in texinfo manual. Change from 'xargs -1' (minus one) to 'xargs -l' (minus El) in 3 places. #54838: doc: fix the examples of the -perm option in the texinfo documentation. The example '-perm -g+w,o+w' was misplaced. Bug present since FINDUTILS_4_2_27-1. #54262: 'find -printf "%Y"' now correctly outputs 'N' for broken symlinks (ENOENT or ENOTDIR). Previously, it output 'l' in such a case. Bug introduced while attempting to fix #29460 in version v4.5.8. #54171: 'find -depth' now outputs the name of unreadable directories. Previously, FTS-based find missed to output those entries. Bug present since the FTS implementation in FINDUTILS_4_3_0-1. #52981: find: the '-delete' action no longer complains about disappeared files when the '-ignore_readdir_race' option is given, too. That action will also returns true in such a case now. #52220: 'find -D' without any further argument no longer crashes. Bug present since the implementation of -D in FINDUTILS_4_3_1-1. #51304: doc: use correct IEC unit prefixes in the documentation of 'find -size'. find(1) uses binary-based units for the suffixes 'k', 'M', and 'G' of the argument of the '-size' option: 1024, 1024*1024 and 1024^3. Therefore, the documentation should use the correct IEC prefixes kibibyte, mebibyte and gibibyte respectively (or their abbreviations 'KiB', 'MiB' and 'GiB'). #50758: doc: fix the description of the -perm examples matching the permission mode "022" in find's texinfo manual: the match is for the file's group and 'other' mode bits instead of for user and group. Bug introduced when adding the -perm examples in FINDUTILS-4.2.11. #50326: find no longer leaks memory for a recently added member in gnulib's mount list structure. #50259: find -printf '%h' now outputs the correct path for arguments with one or more trailing slashes. Previously, it would e.g. output "foo" instead of "." when "foo/" was passed; likewise, it would output "/user/xxx/" instead of "/user" when "/user/xxx//" was passed. Bug introduced in FINDUTILS-4.2.19. #48180: find -noop (an internal option not intended to be exposed to the user) no longer crashes. Bug introduced in FINDUTILS-4.3.1. #48030: find -exec + does not pass all arguments for certain specific filename lengths. After the internal (usually 128k) buffer is full and find(1) executed the given command with these arguments, it would miss to run the command yet another time if only one other file argument has to be processed. Bug introduced in FINDUTILS-4.2.12. #46784: frcode drops last char if no final newline ** Changes to the build process The configure option --enable-id-cache has been removed. It has been a no-op since findnutils-4.5.15. The configure option --enable-debug has been removed. Debugging in find is now controlled by its -D option only. The configure option --enable-silent-rules is the default now. Use --disable-silent-rules or "make V=1" to get verbose build output. "make dist" no longer builds .tar.gz files. xz is portable enough and in wide-enough use that distributing only .tar.xz files is enough. Maintainer builds from the Git repository now derive the version string from the version control system instead of using a fixed string (changed after each release manually). As a result, the inter-release builds can now be distinguished: e.g. "4.6.0.152-fe9c" is the 152th commit after the tag "v4.6.0" and has the Git short hash "fe9c". Builds from an unclean tree are marked with the suffix "-dirty". The translation files in the PO directory are no longer version controlled; instead bootstrap auto-updates them from "translationproject.org" during a maintainer build. A shell-style test framework borrowed from GNU coreutils has been added. This allows better tests with more control over stdin, stdout, stderr, signals, preparatory steps, cleanup, return code verification, root-only tests, etc.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/curl | 7 + config/rootfiles/common/findutils | 3 - config/rootfiles/common/lzip | 3 + .../{oldcore/104 => core/154}/filelists/curl | 0 .../{oldcore/103 => core/154}/filelists/findutils | 0 .../{oldcore/103 => core/154}/filelists/less | 0 config/rootfiles/core/154/filelists/lzip | 1 + .../{oldcore/66 => core/154}/filelists/pptp | 0 config/rootfiles/packages/ddrescue | 2 + html/cgi-bin/credits.cgi | 2 +- lfs/clamav | 6 +- lfs/curl | 6 +- lfs/ddrescue | 10 +- lfs/findutils | 15 +- lfs/less | 4 +- lfs/{xz => lzip} | 8 +- lfs/pptp | 5 +- lfs/tor | 8 +- make.sh | 1 + src/patches/findutils-4.6.0-glibc2.28.patch | 335 --------------------- src/patches/pptp-1.7.2-compat.patch | 71 ----- 21 files changed, 42 insertions(+), 445 deletions(-) create mode 100644 config/rootfiles/common/lzip copy config/rootfiles/{oldcore/104 => core/154}/filelists/curl (100%) copy config/rootfiles/{oldcore/103 => core/154}/filelists/findutils (100%) copy config/rootfiles/{oldcore/103 => core/154}/filelists/less (100%) create mode 120000 config/rootfiles/core/154/filelists/lzip copy config/rootfiles/{oldcore/66 => core/154}/filelists/pptp (100%) copy lfs/{xz => lzip} (96%) delete mode 100644 src/patches/findutils-4.6.0-glibc2.28.patch delete mode 100644 src/patches/pptp-1.7.2-compat.patch
Difference in files: diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index f4240065e..a542bd6c9 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -109,6 +109,7 @@ usr/lib/libcurl.so.4.7.0 #usr/share/man/man3/CURLOPT_ALTSVC_CTRL.3 #usr/share/man/man3/CURLOPT_APPEND.3 #usr/share/man/man3/CURLOPT_AUTOREFERER.3 +#usr/share/man/man3/CURLOPT_AWS_SIGV4.3 #usr/share/man/man3/CURLOPT_BUFFERSIZE.3 #usr/share/man/man3/CURLOPT_CAINFO.3 #usr/share/man/man3/CURLOPT_CAPATH.3 @@ -177,6 +178,12 @@ usr/lib/libcurl.so.4.7.0 #usr/share/man/man3/CURLOPT_HEADERDATA.3 #usr/share/man/man3/CURLOPT_HEADERFUNCTION.3 #usr/share/man/man3/CURLOPT_HEADEROPT.3 +#usr/share/man/man3/CURLOPT_HSTS.3 +#usr/share/man/man3/CURLOPT_HSTSREADDATA.3 +#usr/share/man/man3/CURLOPT_HSTSREADFUNCTION.3 +#usr/share/man/man3/CURLOPT_HSTSWRITEDATA.3 +#usr/share/man/man3/CURLOPT_HSTSWRITEFUNCTION.3 +#usr/share/man/man3/CURLOPT_HSTS_CTRL.3 #usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3 #usr/share/man/man3/CURLOPT_HTTP200ALIASES.3 #usr/share/man/man3/CURLOPT_HTTPAUTH.3 diff --git a/config/rootfiles/common/findutils b/config/rootfiles/common/findutils index edb91a9bf..d9f9ad0b6 100644 --- a/config/rootfiles/common/findutils +++ b/config/rootfiles/common/findutils @@ -5,8 +5,6 @@ usr/bin/locate usr/bin/updatedb usr/bin/xargs #usr/lib/findutils -usr/lib/findutils/bigram -usr/lib/findutils/code usr/lib/findutils/frcode #usr/share/info/find-maint.info #usr/share/info/find.info @@ -17,4 +15,3 @@ usr/lib/findutils/frcode #usr/share/man/man1/updatedb.1 #usr/share/man/man1/xargs.1 #usr/share/man/man5/locatedb.5 -var/lib/locate diff --git a/config/rootfiles/common/lzip b/config/rootfiles/common/lzip new file mode 100644 index 000000000..730246a74 --- /dev/null +++ b/config/rootfiles/common/lzip @@ -0,0 +1,3 @@ +usr/bin/lzip +#usr/share/info/lzip.info +#usr/share/man/man1/lzip.1 diff --git a/config/rootfiles/core/154/filelists/curl b/config/rootfiles/core/154/filelists/curl new file mode 120000 index 000000000..4b84bef53 --- /dev/null +++ b/config/rootfiles/core/154/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/findutils b/config/rootfiles/core/154/filelists/findutils new file mode 120000 index 000000000..545280ac5 --- /dev/null +++ b/config/rootfiles/core/154/filelists/findutils @@ -0,0 +1 @@ +../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/less b/config/rootfiles/core/154/filelists/less new file mode 120000 index 000000000..65c0e0771 --- /dev/null +++ b/config/rootfiles/core/154/filelists/less @@ -0,0 +1 @@ +../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/lzip b/config/rootfiles/core/154/filelists/lzip new file mode 120000 index 000000000..dd4b832b1 --- /dev/null +++ b/config/rootfiles/core/154/filelists/lzip @@ -0,0 +1 @@ +../../../common/lzip \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/pptp b/config/rootfiles/core/154/filelists/pptp new file mode 120000 index 000000000..2b3dfadc0 --- /dev/null +++ b/config/rootfiles/core/154/filelists/pptp @@ -0,0 +1 @@ +../../../common/pptp \ No newline at end of file diff --git a/config/rootfiles/packages/ddrescue b/config/rootfiles/packages/ddrescue index 3d0a0b9af..a3d8f5911 100644 --- a/config/rootfiles/packages/ddrescue +++ b/config/rootfiles/packages/ddrescue @@ -1,3 +1,5 @@ usr/bin/ddrescue +usr/bin/ddrescuelog #usr/share/info/ddrescue.info #usr/share/man/man1/ddrescue.1 +#usr/share/man/man1/ddrescuelog.1 diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 16145a0fb..67988a0bf 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -72,8 +72,8 @@ Jan Paul Tücking, Jonatan Schlag, Dirk Wagner, Marcel Lorenz, -Alf Høgemark, Adolf Belka, +Alf Høgemark, Ben Schweikert, Peter Pfeiffer, Daniel Glanzmann, diff --git a/lfs/clamav b/lfs/clamav index e3e55c3b9..2c4d6a6ba 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@
include Config
-VER = 0.103.0 +VER = 0.103.1
THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 53 +PAK_VER = 54
DEPS =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 453a389e0147b5df8fae5601b390d7db +$(DL_FILE)_MD5 = f895e9a261937ed91f5cb3ead4791555
install : $(TARGET)
diff --git a/lfs/curl b/lfs/curl index 1f188fc02..0d8f6a6fd 100644 --- a/lfs/curl +++ b/lfs/curl @@ -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 = 7.73.0 +VER = 7.75.0
THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d7df02d3b78b625fee4dd765808a6eb6 +$(DL_FILE)_MD5 = 9730df8636d67b4e256ebc49daf27246
install : $(TARGET)
diff --git a/lfs/ddrescue b/lfs/ddrescue index f30a5edb5..3c45896e9 100644 --- a/lfs/ddrescue +++ b/lfs/ddrescue @@ -24,14 +24,14 @@
include Config
-VER = 1.12 +VER = 1.25 THISAPP = ddrescue-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.lz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ddrescue -PAK_VER = 1 +PAK_VER = 2
DEPS =
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b3d8a9a9098b87939fba05a45848bd8d +$(DL_FILE)_MD5 = 99fd7a28bf9953d88534c7ee9ab5bd2a
install : $(TARGET)
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/findutils b/lfs/findutils index 1ec69c99a..0b2753dc1 100644 --- a/lfs/findutils +++ b/lfs/findutils @@ -24,10 +24,10 @@
include Config
-VER = 4.6.0 +VER = 4.8.0
THISAPP = findutils-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9936aa8009438ce185bea2694a997fc1 +$(DL_FILE)_MD5 = eeefe2e6380931a77dfa6d9350b43186
install : $(TARGET)
@@ -79,14 +79,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Newer C libraries omit this include from sys/types.h. - # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html - cd $(DIR_APP) && sed -i gl/lib/mountlist.c \ - -e "/include.*config.h/a#ifdef MAJOR_IN_SYSMACROS\n#include <sys/sysmacros.h>\n#endif\n" - - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/findutils-4.6.0-glibc2.28.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/less b/lfs/less index 2b4534214..4d6cf4877 100644 --- a/lfs/less +++ b/lfs/less @@ -24,7 +24,7 @@
include Config
-VER = 530 +VER = 563
THISAPP = less-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6a39bccf420c946b0fd7ffc64961315b +$(DL_FILE)_MD5 = 1ee44fa71447a845f6eef5b3f38d2781
install : $(TARGET)
diff --git a/lfs/lzip b/lfs/lzip new file mode 100644 index 000000000..d0a982590 --- /dev/null +++ b/lfs/lzip @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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 = 1.22 + +THISAPP = lzip-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) + +ifeq "$(ROOT)" "" + TARGET = $(DIR_INFO)/$(THISAPP) +else + TARGET = $(DIR_INFO)/$(THISAPP)-tools +endif + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f062faf68595d594a28fade73a43c001 + +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=$(PREFIX) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/pptp b/lfs/pptp index 850573810..91165bab7 100644 --- a/lfs/pptp +++ b/lfs/pptp @@ -24,7 +24,7 @@
include Config
-VER = 1.7.2 +VER = 1.10.0
THISAPP = pptp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4c3d19286a37459a632c7128c92a9857 +$(DL_FILE)_MD5 = 8d25341352fdae5ad5b36b9f18254908
install : $(TARGET)
@@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/pptp-1.7.2-compat.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/tor b/lfs/tor index 6d758dcb0..e36d5c6cf 100644 --- a/lfs/tor +++ b/lfs/tor @@ -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 = 0.4.4.6 +VER = 0.4.4.7
THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 56 +PAK_VER = 57
DEPS = libseccomp
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3635b2f7b6645910bf702ce8eaeffd0d +$(DL_FILE)_MD5 = 6ea60eb939ab3633a682a81fb46dd37f
install : $(TARGET)
diff --git a/make.sh b/make.sh index aabe08c9f..94bb86d5b 100755 --- a/make.sh +++ b/make.sh @@ -1097,6 +1097,7 @@ buildbase() { lfsmake2 readline-compat lfsmake2 bzip2 lfsmake2 xz + lfsmake2 lzip lfsmake2 pcre lfsmake2 pcre-compat lfsmake2 gettext diff --git a/src/patches/findutils-4.6.0-glibc2.28.patch b/src/patches/findutils-4.6.0-glibc2.28.patch deleted file mode 100644 index 651c2d265..000000000 --- a/src/patches/findutils-4.6.0-glibc2.28.patch +++ /dev/null @@ -1,335 +0,0 @@ -Fix build failure on glibc-2.28: - fseeko.c: In function 'rpl_fseeko': - fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." - #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." - -Patch by milan hodoscek. - -https://bugs.gentoo.org/663242 ---- a/old/stdio-impl.h -+++ b/gl/lib/stdio-impl.h -@@ -1,5 +1,5 @@ - /* Implementation details of FILE streams. -- Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc. - - 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 -@@ -12,12 +12,18 @@ - 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/. */ -+ along with this program. If not, see https://www.gnu.org/licenses/. */ - - /* Many stdio implementations have the same logic and therefore can share - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - -@@ -29,10 +35,10 @@ - #include <errno.h> /* For detecting Plan9. */ - - #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - - # if defined __DragonFly__ /* DragonFly */ -- /* See http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup. */ -+ /* See https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/stdio/priv_stdio.h. */ - # define fp_ ((struct { struct __FILE_public pub; \ - struct { unsigned char *_base; int _size; } _bf; \ - void *cookie; \ -@@ -49,30 +55,84 @@ - fpos_t _offset; \ - /* More fields, not relevant here. */ \ - } *) fp) -- /* See http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup. */ -+ /* See https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdio.h. */ - # define _p pub._p - # define _flags pub._flags - # define _r pub._r - # define _w pub._w -+# elif defined __ANDROID__ /* Android */ -+ /* Up to this commit from 2015-10-12 -+ https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a -+ the innards of FILE were public, and fp_ub could be defined like for OpenBSD, -+ see https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h -+ and https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h. -+ After this commit, the innards of FILE are hidden. */ -+# define fp_ ((struct { unsigned char *_p; \ -+ int _r; \ -+ int _w; \ -+ int _flags; \ -+ int _file; \ -+ struct { unsigned char *_base; size_t _size; } _bf; \ -+ int _lbfsize; \ -+ void *_cookie; \ -+ void *_close; \ -+ void *_read; \ -+ void *_seek; \ -+ void *_write; \ -+ struct { unsigned char *_base; size_t _size; } _ext; \ -+ unsigned char *_up; \ -+ int _ur; \ -+ unsigned char _ubuf[3]; \ -+ unsigned char _nbuf[1]; \ -+ struct { unsigned char *_base; size_t _size; } _lb; \ -+ int _blksize; \ -+ fpos_t _offset; \ -+ /* More fields, not relevant here. */ \ -+ } *) fp) - # else - # define fp_ fp - # endif - --# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ -+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */ - /* See http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup -- and http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup */ -+ and https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup -+ and https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h */ - struct __sfileext - { - struct __sbuf _ub; /* ungetc buffer */ - /* More fields, not relevant here. */ - }; - # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub --# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */ -+# elif defined __ANDROID__ /* Android */ -+ struct __sfileext -+ { -+ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */ -+ /* More fields, not relevant here. */ -+ }; -+# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub -+# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ - # define fp_ub fp_->_ub - # endif - - # define HASUB(fp) (fp_ub._base != NULL) - -+# if defined __ANDROID__ /* Android */ -+ /* Needed after this commit from 2016-01-25 -+ https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7 */ -+# ifndef __SEOF -+# define __SLBF 1 -+# define __SNBF 2 -+# define __SRD 4 -+# define __SWR 8 -+# define __SRW 0x10 -+# define __SEOF 0x20 -+# define __SERR 0x40 -+# endif -+# ifndef __SOFF -+# define __SOFF 0x1000 -+# endif -+# endif -+ - #endif - - -@@ -81,7 +141,7 @@ - #ifdef __TANDEM /* NonStop Kernel */ - # ifndef _IOERR - /* These values were determined by the program 'stdioext-flags' at -- http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html. */ -+ https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html. */ - # define _IOERR 0x40 - # define _IOREAD 0x80 - # define _IOWRT 0x4 -@@ -99,6 +159,8 @@ - int _file; \ - unsigned int _flag; \ - } *) fp) -+# elif defined __VMS /* OpenVMS */ -+# define fp_ ((struct _iobuf *) fp) - # else - # define fp_ fp - # endif -@@ -110,4 +172,31 @@ - # define _flag __flag - # endif - -+#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */ -+ -+/* <stdio.h> does not define the innards of FILE any more. */ -+# define WINDOWS_OPAQUE_FILE -+ -+struct _gl_real_FILE -+{ -+ /* Note: Compared to older Windows and to mingw, it has the fields -+ _base and _cnt swapped. */ -+ unsigned char *_ptr; -+ unsigned char *_base; -+ int _cnt; -+ int _flag; -+ int _file; -+ int _charbuf; -+ int _bufsiz; -+}; -+# define fp_ ((struct _gl_real_FILE *) fp) -+ -+/* These values were determined by a program similar to the one at -+ https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html. */ -+# define _IOREAD 0x1 -+# define _IOWRT 0x2 -+# define _IORW 0x4 -+# define _IOEOF 0x8 -+# define _IOERR 0x10 -+ - #endif ---- a/old/fseeko.c -+++ b/gl/lib/fseeko.c -@@ -1,5 +1,5 @@ - /* An fseeko() function that, together with fflush(), is POSIX compliant. -- Copyright (C) 2007-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2018 Free Software Foundation, Inc. - - 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 -@@ -12,7 +12,7 @@ - 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/. */ -+ with this program; if not, see https://www.gnu.org/licenses/. */ - - #include <config.h> - -@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - #if _GL_WINDOWS_64_BIT_OFF_T - # undef fseeko --# if HAVE__FSEEKI64 /* msvc, mingw64 */ -+# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */ - # define fseeko _fseeki64 --# else /* mingw */ -+# else /* mingw before msvcrt8.0 */ - # define fseeko fseeko64 - # endif - #endif -@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - # if defined __SL64 && defined __SCLE /* Cygwin */ - if ((fp->_flags & __SL64) == 0) - { -@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #elif defined __minix /* Minix */ - if (fp_->_ptr == fp_->_buf - && (fp_->_ptr == NULL || fp_->_count == 0)) --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ - if (fp_->_ptr == fp_->_base - && (fp_->_ptr == NULL || fp_->_cnt == 0)) - #elif defined __UCLIBC__ /* uClibc */ -@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence) - if (pos == -1) - { - #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - fp_->_flags &= ~__SOFF; - #endif - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ --# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -+# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix - /* fp_->_offset is typed as an integer. */ - fp_->_offset = pos; - # else -@@ -150,8 +152,8 @@ fseeko (FILE *fp, off_t offset, int whence) - fp_->_flags &= ~__SEOF; - #elif defined __EMX__ /* emx+gcc */ - fp->_flags &= ~_IOEOF; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -- fp->_flag &= ~_IOEOF; -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ -+ fp_->_flag &= ~_IOEOF; - #elif defined __MINT__ /* Atari FreeMiNT */ - fp->__offset = pos; - fp->__eof = 0; ---- a/old/freadahead.c -+++ b/gl/lib/freadahead.c -@@ -1,5 +1,5 @@ - /* Retrieve information about a FILE stream. -- Copyright (C) 2007-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2018 Free Software Foundation, Inc. - - 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 -@@ -12,7 +12,7 @@ - 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/. */ -+ along with this program. If not, see https://www.gnu.org/licenses/. */ - - #include <config.h> - -@@ -22,17 +22,26 @@ - #include <stdlib.h> - #include "stdio-impl.h" - -+#if defined __DragonFly__ -+/* Defined in libc, but not declared in <stdio.h>. */ -+extern size_t __sreadahead (FILE *); -+#endif -+ -+/* This file is not used on systems that have the __freadahead function, -+ namely musl libc. */ -+ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) - + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base : - 0); - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) - return 0; - # if defined __DragonFly__ -@@ -53,7 +62,7 @@ freadahead (FILE *fp) - if ((fp_->_flags & _IOWRITING) != 0) - return 0; - return fp_->_count; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ - if ((fp_->_flag & _IOWRT) != 0) - return 0; - return fp_->_cnt; diff --git a/src/patches/pptp-1.7.2-compat.patch b/src/patches/pptp-1.7.2-compat.patch deleted file mode 100644 index 0ea155166..000000000 --- a/src/patches/pptp-1.7.2-compat.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: pptp_compat.c -=================================================================== -RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v -retrieving revision 1.1 -retrieving revision 1.3 -diff -u -r1.1 -r1.3 ---- pptp_compat.c 19 Feb 2008 21:43:28 -0000 1.1 -+++ pptp_compat.c 25 Jul 2008 00:13:56 -0000 1.3 -@@ -7,14 +7,15 @@ - #include <fcntl.h> - #include <sys/types.h> - #include <unistd.h> --#include <stropts.h> - #include <stdlib.h> -+#if defined (__SVR4) && defined (__sun) /* Solaris */ -+#include <stropts.h> -+#endif - #include <strings.h> - #include "pptp_compat.h" - #include <stdio.h> - #include "util.h" - -- - #if defined (__SVR4) && defined (__sun) /* Solaris */ - /* - * daemon implementation from uClibc -Index: pptp.c -=================================================================== -RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v -retrieving revision 1.49 -retrieving revision 1.51 -diff -u -r1.49 -r1.51 ---- pptp.c 14 May 2008 06:32:52 -0000 1.49 -+++ pptp.c 24 Jul 2008 05:53:05 -0000 1.51 -@@ -61,9 +61,8 @@ - #include "version.h" - #if defined(__linux__) - #include <sys/prctl.h> --#else --#include "inststr.h" - #endif -+#include "inststr.h" - #include "util.h" - #include "pptp_quirks.h" - #include "pqueue.h" -@@ -129,7 +128,7 @@ - } - - #if defined (__SVR4) && defined (__sun) --struct in_addr localbind = { INADDR_ANY }; -+struct in_addr localbind = { .s_addr = INADDR_ANY }; - #else - struct in_addr localbind = { INADDR_NONE }; - #endif -@@ -183,6 +182,7 @@ - struct in_addr inetaddr; - volatile int callmgr_sock = -1; - char ttydev[PATH_MAX]; -+ char *tty_name; - int pty_fd, tty_fd, gre_fd, rc; - volatile pid_t parent_pid, child_pid; - u_int16_t call_id, peer_call_id; -@@ -391,7 +391,7 @@ - file2fd("/dev/null", "wb", STDERR_FILENO); - } - -- char *tty_name = ttyname(tty_fd); -+ tty_name = ttyname(tty_fd); - snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", - tty_name ? tty_name : "(null)"); - #ifdef PR_SET_NAME
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer