[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b040e0fe32f7b05ac0844613e8b92b5b1cf5fc2e
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 b040e0fe32f7b05ac0844613e8b92b5b1cf5fc2e (commit) via ce7054ba18cccf97a148e41568a703a18302a5ba (commit) via 20743618b6355f56da4863119110fc0a4aae63be (commit) via 3850aa4c89d3e60bd70fc6f24fda24811747f169 (commit) via e9ab20310347a5ba3963048970721643266380f8 (commit) via c175e589461454ad35b1a90b409bc28ea94c9d25 (commit) via fe16865fb2e4e163a837975e10ffc0d45807c289 (commit) via 1cfbca8e69935af759f23d71c8005aacd4f9d7cd (commit) via bacde6d9c11ef0fba82044fc64c11477ae146c5d (commit) via 4a5312694593f905b65c37167d53fdb5570c385f (commit) via a66e5d3c7b30e15f3354f998c8baf69004c20806 (commit) via fb9e027b986aacbf927d2e73d83c801fe834a97b (commit) via 803603bba3f5447902f48512c3c57f8a99e99188 (commit) via c0766d8abbce8b2c2066ba828595d017a9cd76a0 (commit) via a2ede2ed2ae5cc74e6d0b457a489e1ec5b1156c0 (commit) via 21b37391f9769718df7bd726453140f4ec8ff1c0 (commit) from b89454b52a0f29cb4336c1e57f6a856cfa16fb3c (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 b040e0fe32f7b05ac0844613e8b92b5b1cf5fc2e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 16 06:55:02 2021 +0000
core160: add perl-MIME-Lite
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ce7054ba18cccf97a148e41568a703a18302a5ba Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jul 8 13:43:26 2021 +0200
perl-MIME-Lite: Update to version 3.033
- Update from 3.030 (Nov 2013) to 3.033 (Jun 2021) - Update of rootfile not required - Changelog Version 3.033 No changes since previous version, just made non-trial. Version 3.032 Fix an error in printing to Net::SMTP (thanks, Peter Heirich) Add "use warnings" and require v5.6 Version 3.031 Add an SSL option to connect to the SMTP relay via SSL on port 465. (thanks, Max Maischein) Document some tips on using non-ASCII content with MIME::Lite (thanks, traveljury.com and Tom Hukins)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 20743618b6355f56da4863119110fc0a4aae63be Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 16 06:53:09 2021 +0000
core160: add pcre
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 3850aa4c89d3e60bd70fc6f24fda24811747f169 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jul 8 13:43:11 2021 +0200
pcre: Update to version 8.45
- Update from 8.44 to 8.45 - Updated rootfile - Checked the dependencies of the old lib versions using find-dependencies nothing flagged - Changelog Version 8.45 15-June-2021 This is the final release of PCRE1. A few minor tidies are included. 1. CMakeLists.txt has two user-supplied patches applied, one to allow for the setting of MODULE_PATH, and the other to support the generation of pcre-config file and libpcre*.pc files. 2. There was a memory leak if a compile error occurred when there were more than 20 named groups (Bugzilla #2613). 3. Fixed some typos in code and documentation. 4. Fixed a small (*MARK) bug in the interpreter (Bugzilla #2771).
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit e9ab20310347a5ba3963048970721643266380f8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 16 06:51:35 2021 +0000
core160: add iproute2
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c175e589461454ad35b1a90b409bc28ea94c9d25 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jul 8 13:42:51 2021 +0200
iproute2: Update to version 5.13.0
- Update from 5.12.0 to 5.13.0 - Update of rootfile not required - Changelog is not available in source tarball and not on source website Below info obtained from the commits from the git repository devlink: Fix printf() type mismatches on 32-bit architectures Ben Hutchings utils: Fix BIT() to support up to 64 bits on all architectures Ben Hutchings uapi: update headers to 5.13 Stephen Hemminger devlink: Fix link errors on some systems Roi Dayan tc: pedit: add decrement operation Asbjørn Sloth Tønnesen tc: pedit: parse_cmd: add flags argument Asbjørn Sloth Tønnesen iplink: support for WWAN devices Sergey Ryazanov iplink: add support for parent device Sergey Ryazanov Import wwan.h uapi file David Ahern man: fix syntax for ip link property Stephen Hemminger seg6: add support for SRv6 End.DT46 Behavior Paolo Lungaroni Update kernel headers David Ahern utils: bump max args number to 512 for batch files Guillaume Nault uapi: update kernel headers to 5.13-rc6 Stephen Hemminger Merge branch 'devlink-rate-support' into next David Ahern devlink: Add ISO/IEC switch Dmytro Linkin devlink: Add port func rate support Dmytro Linkin devlink: Add helper function to validate object handler Dmytro Linkin Update kernel headers David Ahern devlink: Add optional controller user input Parav Pandit police: Add support for json output Roi Dayan tc: fq: add horizon attributes Eric Dumazet configure: convert LIBBPF environment variables to command-line options Hangbin Liu configure: add options ability Hangbin Liu ss: update ss man page Roman Mashak tc: f_flower: Add missing ct_state flags to usage description Ariel Levkovich tc: f_flower: Add option to match on related ct state Ariel Levkovich libgenl: make genl_add_mcast_grp set errno on error Florian Westphal lib/fs: fix issue when {name,open}_to_handle_at() is not implemented Heiko Thiery config.mk: Rerun configure when it is newer than config.mk David Ahern ip: dynamically size columns when printing stats Jakub Kicinski seg6: add counters support for SRv6 Behaviors Paolo Lungaroni tc: htb: improve burst error messages Andrea Claudi tipc: bail out if key is abnormally long Andrea Claudi tipc: bail out if algname is abnormally long Andrea Claudi tipc: call a sub-routine in separate socket Hoang Le tc-cake: update docs to include LE diffserv Tyson Moore dcb: fix memory leak Andrea Claudi dcb: fix return value on dcb_cmd_app_show Andrea Claudi lib: bpf_legacy: avoid to pass invalid argument to close() Andrea Claudi tc: q_ets: drop dead code from argument parsing Andrea Claudi ip: align the name of the 'nohandler' stat Jakub Kicinski Update kernel headers David Ahern Merge branch 'rdma-copy-on-fork' into next David Ahern rdma: Add copy-on-fork to get sys command Gal Pressman rdma: update uapi headers Gal Pressman mptcp: make sure flag signal is set when add addr with port Jianguo Wu Merge branch 'main' into next David Ahern ip: Add nodst option to macvlan type source Jethro Beekman Merge branch 'rdma-resource-tracking' into next David Ahern rdma: Add SRQ resource tracking information Neta Ostrovsky rdma: Add context resource tracking information Neta Ostrovsky rdma: Update uapi headers Neta Ostrovsky Update kernel headers David Ahern
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fe16865fb2e4e163a837975e10ffc0d45807c289 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 16 06:49:13 2021 +0000
core160: add suricata and libhtp
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1cfbca8e69935af759f23d71c8005aacd4f9d7cd Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Jul 4 15:38:56 2021 +0200
libhtp: Update to 5.0.38
For details see: https://github.com/OISF/libhtp/releases/tag/0.5.38
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit bacde6d9c11ef0fba82044fc64c11477ae146c5d Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Jul 4 15:38:55 2021 +0200
suricata: Update to 5.0.7
For details see:
https://forum.suricata.io/t/suricata-6-0-3-and-5-0-7-released/1489
and
https://redmine.openinfosecfoundation.org/versions/166
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 4a5312694593f905b65c37167d53fdb5570c385f Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jul 1 23:26:04 2021 +0200
traceroute: Update to version 2.1.0
- Update from 2.0.18 (2011) to 2.1.0 (2016 - latest version) - Update of rootfile not required - Changelog 2016-03-08 Dmitry Butskoy Dmitry@Butskoy.name - 2.1.0 * Improve the main loop for better interactivity. Instead of waiting silently for maximum expiration time of probes in progress, use timeout of the first probe (which will be printed first from now) only. * Speedup wait mechanism. Traditional traceroute implementation always waited the whole timeout for any probe. But if we already have some replies from the same hop, or even from some next hop, we can use the round trip time of such a reply as a hint to determine the actual reasonable amount of time to wait. Now the `-w' option has a form of three (in general) float values separated by a comma (or a slash): `-w MAX_SECS,HERE,NEAR' . (last two are optional). MAX_SECS specifies the maximum time (in seconds) to wait, in any case. The optional HERE specifies a factor to multiply the round trip time of an already received response from the same hop. The resulting value is used as a timeout for the probe, instead of (but no more than) MAX_SECS. The optional NEAR specifies a similar factor for a response from some next hop. The time of the first found result is used in both cases. First, we look for the same hop (of the probe which will be printed first from now). If nothing found, then look for some next hop. If nothing found, use MAX_SECS. If HERE and/or NEAR have zero values, the corresponding computation is skipped. HERE and NEAR are always set to zero if only MAX_SECS is specified (which provides compatibility with previous versions). Thus, if your scripts use `-w SECS', then nothing changed for you, since the lonely SECS implies `-w SECS,0,0' . Defaults are 5.0 seconds for MAX_SECS, 3.0 times for HERE and 10.0 times for NEAR. Certainly, the new algorithm can lead to premature expiry (especially when response times differ at times) and printing "*" instead of a time. Anyway, you can always switch this algorithm off, just by specifying `-w' with the desired timeout only (fe. `-w 5'). We continue to wait whole MAX_SECS when one probe per time must be sent (`--sport', `-P proto'), because it seems more harmful rather than helpful to try to wait less in such cases. To provide compatibility with 2.0.x versions, use: traceroute -w 5 (or any other desired `-w' value). * Hint people to use the system traceroute(8) instead of tcptraceroute wrapper (by providing a stderr header). The using of this wrapper is a little bit harmful, since it has less possibilities and a little different set of options. For those who are used to use tcptraceroute in cmdline, just create a link with that name to the system traceroute. When invoked as "tcp*", it then behaves as `traceroute -T'. (The simple manual page added for this case in the wrapper subdir). The original tcptraceroute had some options differ ("lpNSAE"), but they was rare used. Most common "dnFifmqwst" was just the same. Therefore it should be painless to use the system binary directly, instead of the limited wrapper (which is still provided indeed). 2016-02-15 Dmitry Butskoy Dmitry@Butskoy.name - 2.0.22 * Some portability fixing and improvements (Felix Janda) * Require clear numbers for options and arguments (Sergey Salnikov) * Drop compilation date from the version string (Debian #774365) * New tcp module option `reuse', which utilize SO_REUSEADDR to reuse local port numbers for the huge workloads (Richard Sheehan) * Avoid poll(2) call with spurious zero timeout in some rare cases by rounding the value properly using ceil(3) 2014-11-12 Dmitry Butskoy Dmitry@Butskoy.name - 2.0.21 * Fix `--mtu' and `-F' working on kernels >= 3.13 * Some manual page improving (Christopher Mann) 2014-06-14 Dmitry Butskoy Dmitry@Butskoy.name - 2.0.20 * Describe all complementary long options in the man page (Jan Synacek) * Use correct service name for AS lookups (Frederic Mangano) * Avoid some rare case null dereference (geogriffin@jsgriff.com) * Improve expiration check for simultaneous probes 2012-11-19 Dmitry Butskoy Dmitry@Butskoy.name - 2.0.19 * DCCP protocol support (rfc4340), by Samuel Jero Use "-D" option for it (the protocol-specific options are available too). * Update COPYING and COPYING.LIB license files to the latest published ones (due to FSF address changes etc.) (Jan Synacek) * Add mention of "-l" option to manual (Filip Holec)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit a66e5d3c7b30e15f3354f998c8baf69004c20806 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 16 06:29:30 2021 +0000
core160: add Text-Tabs+Wrap
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fb9e027b986aacbf927d2e73d83c801fe834a97b Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jul 1 23:25:48 2021 +0200
Text-Tabs+Wrap: Update to 2013.0523
- Update from 2005.0824 to 2013.0523 - latest version - Update of rootfile required - Changelog = 2013/05/23 Change module 'NAME' = 2013/05/22 Typos = 2013/04/26 Minor test suite fixes - bug 81698. Fixed bug 79766 -- an extraneous "=" in a regex. Changed the license to qualify as an "open source" license. = 2012/08/18 Packaging fix. Minor documentation fixes. = 2012/08/15 Minor fixes to test suites. Added back versions to support old versions of perl. = 2009/04/17 Added support for Unicode combining characters to both Text::Tabs and Text::Wrap, plus a new test suite for each of these new functionalities. --tchrist = 2009/03/05 Test improvements from Dave Mitchel sent back in 2005... Added code to increase $columns if it's not big enough to accommodate the subsequent tab. Minor documentation fixes from David Landgren <david at landgren.net>. Use warnings::warnif instead of just warn for columns < 2. Appled per request of Rafael Garcia-Suarez <rgarciasuarez at gmail.com>. = 2006/11/17 Text::Tabs can handle newlines now so the BUGS section has been removed per request from Aristotle Pagaltzis. = 2006/07/11 Further bomb-proofing to pass more tests: Dan Jacobson <jidanni at jidanni dot org> found another way to generate a "this shouldn't happen". = 2006/07/05 Made documentation and code changes to address perlbug: https://rt.perl.org/rt3/Ticket/Display.html?id=30229 Added in changes from the distributed-with-perl version. This took care of perlbug: https://rt.perl.org/rt3/Ticket/Display.html?id=34902 It also took care of suggestion from Matthijs Bomhoff <matthijs at bomhoff dot nl>. Made documentation changes (added EXAMPLES) as per a suggestion from Gabor Blasko <gblasko at cs dot columbia dot edu> belg4mit at MIT dot EDU reported that $columns==1 die'd. No longer. Added tests for each bug report.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 803603bba3f5447902f48512c3c57f8a99e99188 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 16 06:25:43 2021 +0000
core160: add sqlite
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c0766d8abbce8b2c2066ba828595d017a9cd76a0 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jul 1 23:25:32 2021 +0200
sqlite: Update to version 3360000
- Update from 3350500 to 3360000 - Update of rootfile not required - Changelog Improvement to the EXPLAIN QUERY PLAN output to make it easier to understand. Byte-order marks at the start of a token are skipped as if they were whitespace. An error is raised on any attempt to access the rowid of a VIEW or subquery. Formerly, the rowid of a VIEW would be indeterminate and often would be NULL. The -DSQLITE_ALLOW_ROWID_IN_VIEW compile-time option is available to restore the legacy behavior for applications that need it. The sqlite3_deserialize() and sqlite3_serialize() interfaces are now enabled by default. The -DSQLITE_ENABLE_DESERIALIZE compile-time option is no longer required. Instead, there is is a new -DSQLITE_OMIT_DESERIALIZE compile-time option to omit those interfaces. The "memdb" VFS now allows the same in-memory database to be shared among multiple database connections in the same process as long as the database name begins with "/". Back out the EXISTS-to-IN optimization (item 8b in the SQLite 3.35.0 change log) as it was found to slow down queries more often than speed them up. Improve the constant-propagation optimization so that it works on non-join queries. The REGEXP extension is now included in CLI builds.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit a2ede2ed2ae5cc74e6d0b457a489e1ec5b1156c0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 16 06:21:43 2021 +0000
core160: add rules.pl
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 21b37391f9769718df7bd726453140f4ec8ff1c0 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Jun 30 20:40:31 2021 +0200
Firewall: Proper allow to create REDIRECT rules.
This patch now proper allows to create rules for redirecting requests of a given host, group or network(s) to a specified port or service to the local IPFire system.
So it implements a very generic and easy to use feature to redirect (for example all DNS, NTP, or whatever) requests to the a local running instance and so to force usage of that local hosted service.
* The feature supports specifiying a single port and redirect the requests to another given one. ( For example requests to UDP 123 can be redirected to local UDP 1234 if you run an NTP server on that port.)
* It also supports direct usage of services or even service groups. ( So you can create a service group for DNS and redirect them to the local recursor, or create a "redirected services" group which easily can be managed...)
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/firewall/rules.pl | 28 ++++- config/rootfiles/common/Text-Tabs+Wrap | 6 +- config/rootfiles/common/pcre | 138 ++++++++++----------- .../136 => core/160}/filelists/Text-Tabs+Wrap | 0 config/rootfiles/core/160/filelists/files | 1 + .../{oldcore/106 => core/160}/filelists/iproute2 | 0 .../{oldcore/131 => core/160}/filelists/libhtp | 0 .../{oldcore/101 => core/160}/filelists/pcre | 0 .../136 => core/160}/filelists/perl-MIME-Lite | 0 .../{oldcore/125 => core/160}/filelists/sqlite | 0 .../{oldcore/131 => core/160}/filelists/suricata | 0 lfs/Text-Tabs+Wrap | 4 +- lfs/iproute2 | 4 +- lfs/libhtp | 4 +- lfs/pcre | 4 +- lfs/perl-MIME-Lite | 4 +- lfs/sqlite | 4 +- lfs/suricata | 4 +- lfs/traceroute | 6 +- ...-ipfire.patch => traceroute-2.1.0-ipfire.patch} | 0 20 files changed, 113 insertions(+), 94 deletions(-) copy config/rootfiles/{oldcore/136 => core/160}/filelists/Text-Tabs+Wrap (100%) copy config/rootfiles/{oldcore/106 => core/160}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/131 => core/160}/filelists/libhtp (100%) copy config/rootfiles/{oldcore/101 => core/160}/filelists/pcre (100%) copy config/rootfiles/{oldcore/136 => core/160}/filelists/perl-MIME-Lite (100%) copy config/rootfiles/{oldcore/125 => core/160}/filelists/sqlite (100%) copy config/rootfiles/{oldcore/131 => core/160}/filelists/suricata (100%) rename src/patches/{traceroute-2.0.18-ipfire.patch => traceroute-2.1.0-ipfire.patch} (100%)
Difference in files: diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index bc6187052..0dd1c9024 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -449,16 +449,28 @@ sub buildrules { my @nat_protocol_options = &get_protocol_options($hash, $key, $protocol, 1); push(@nat_options, @nat_protocol_options); } + + # Add time options. push(@nat_options, @time_options);
+ # Determine if a REDIRECT rule should be created. + my $use_redirect = ($destination_is_firewall && !$destination && $protocol_has_ports); + # Make port-forwardings useable from the internal networks. - my @internal_addresses = &fwlib::get_internal_firewall_ip_addresses(1); - unless ($nat_address ~~ @internal_addresses) { - &add_dnat_mangle_rules($nat_address, $source_intf, @nat_options); + if (!$use_redirect) { + my @internal_addresses = &fwlib::get_internal_firewall_ip_addresses(1); + unless ($nat_address ~~ @internal_addresses) { + &add_dnat_mangle_rules($nat_address, $source_intf, @nat_options); + } }
+ # Add source options. push(@nat_options, @source_options); - push(@nat_options, ("-d", $nat_address)); + + # Add NAT address. + if (!$use_redirect) { + push(@nat_options, ("-d", $nat_address)); + }
my $dnat_port; if ($protocol_has_ports) { @@ -468,9 +480,13 @@ sub buildrules { my @nat_action_options = ();
# Use iptables REDIRECT - my $use_redirect = ($destination_is_firewall && !$destination && $protocol_has_ports && $dnat_port); if ($use_redirect) { - push(@nat_action_options, ("-j", "REDIRECT", "--to-ports", $dnat_port)); + push(@nat_action_options, ("-j", "REDIRECT")); + + # Redirect to specified port if one has given. + if ($dnat_port) { + push(@nat_action_options, ("--to-ports", $dnat_port)); + }
# Use iptables DNAT } else { diff --git a/config/rootfiles/common/Text-Tabs+Wrap b/config/rootfiles/common/Text-Tabs+Wrap index 00e0a3812..9c6449ec3 100644 --- a/config/rootfiles/common/Text-Tabs+Wrap +++ b/config/rootfiles/common/Text-Tabs+Wrap @@ -1,2 +1,4 @@ -#usr/lib/perl5/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Text -#usr/lib/perl5/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Text/.packlist +#usr/lib/perl5/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Text-Wrap +#usr/lib/perl5/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Text-Wrap/.packlist +#usr/share/man/man3/modern::Text::Tabs.3 +#usr/share/man/man3/modern::Text::Wrap.3 diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index bd2e665fd..ce90d1d16 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,15 +10,15 @@ usr/bin/pcregrep #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.12 +usr/lib/libpcre.so.1.2.13 #usr/lib/libpcre16.la usr/lib/libpcre16.so usr/lib/libpcre16.so.0 -usr/lib/libpcre16.so.0.2.12 +usr/lib/libpcre16.so.0.2.13 #usr/lib/libpcre32.la usr/lib/libpcre32.so usr/lib/libpcre32.so.0 -usr/lib/libpcre32.so.0.0.12 +usr/lib/libpcre32.so.0.0.13 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 @@ -32,72 +32,72 @@ usr/lib/libpcreposix.so.0.0.7 #usr/lib/pkgconfig/libpcre32.pc #usr/lib/pkgconfig/libpcrecpp.pc #usr/lib/pkgconfig/libpcreposix.pc -#usr/share/doc/pcre-pcre-8.44 -#usr/share/doc/pcre-pcre-8.44/AUTHORS -#usr/share/doc/pcre-pcre-8.44/COPYING -#usr/share/doc/pcre-pcre-8.44/ChangeLog -#usr/share/doc/pcre-pcre-8.44/LICENCE -#usr/share/doc/pcre-pcre-8.44/NEWS -#usr/share/doc/pcre-pcre-8.44/README -#usr/share/doc/pcre-pcre-8.44/html -#usr/share/doc/pcre-pcre-8.44/html/NON-AUTOTOOLS-BUILD.txt -#usr/share/doc/pcre-pcre-8.44/html/README.txt -#usr/share/doc/pcre-pcre-8.44/html/index.html -#usr/share/doc/pcre-pcre-8.44/html/pcre-config.html -#usr/share/doc/pcre-pcre-8.44/html/pcre.html -#usr/share/doc/pcre-pcre-8.44/html/pcre16.html -#usr/share/doc/pcre-pcre-8.44/html/pcre32.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_assign_jit_stack.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_compile.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_compile2.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_config.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_copy_named_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_copy_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_dfa_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_study.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_substring_list.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_fullinfo.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_named_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_stringnumber.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_stringtable_entries.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_substring_list.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_stack_alloc.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_stack_free.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_maketables.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_pattern_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_refcount.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_study.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_utf16_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_utf32_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_version.html -#usr/share/doc/pcre-pcre-8.44/html/pcreapi.html -#usr/share/doc/pcre-pcre-8.44/html/pcrebuild.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecallout.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecompat.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecpp.html -#usr/share/doc/pcre-pcre-8.44/html/pcredemo.html -#usr/share/doc/pcre-pcre-8.44/html/pcregrep.html -#usr/share/doc/pcre-pcre-8.44/html/pcrejit.html -#usr/share/doc/pcre-pcre-8.44/html/pcrelimits.html -#usr/share/doc/pcre-pcre-8.44/html/pcrematching.html -#usr/share/doc/pcre-pcre-8.44/html/pcrepartial.html -#usr/share/doc/pcre-pcre-8.44/html/pcrepattern.html -#usr/share/doc/pcre-pcre-8.44/html/pcreperform.html -#usr/share/doc/pcre-pcre-8.44/html/pcreposix.html -#usr/share/doc/pcre-pcre-8.44/html/pcreprecompile.html -#usr/share/doc/pcre-pcre-8.44/html/pcresample.html -#usr/share/doc/pcre-pcre-8.44/html/pcrestack.html -#usr/share/doc/pcre-pcre-8.44/html/pcresyntax.html -#usr/share/doc/pcre-pcre-8.44/html/pcretest.html -#usr/share/doc/pcre-pcre-8.44/html/pcreunicode.html -#usr/share/doc/pcre-pcre-8.44/pcre-config.txt -#usr/share/doc/pcre-pcre-8.44/pcre.txt -#usr/share/doc/pcre-pcre-8.44/pcregrep.txt -#usr/share/doc/pcre-pcre-8.44/pcretest.txt +#usr/share/doc/pcre-pcre-8.45 +#usr/share/doc/pcre-pcre-8.45/AUTHORS +#usr/share/doc/pcre-pcre-8.45/COPYING +#usr/share/doc/pcre-pcre-8.45/ChangeLog +#usr/share/doc/pcre-pcre-8.45/LICENCE +#usr/share/doc/pcre-pcre-8.45/NEWS +#usr/share/doc/pcre-pcre-8.45/README +#usr/share/doc/pcre-pcre-8.45/html +#usr/share/doc/pcre-pcre-8.45/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre-pcre-8.45/html/README.txt +#usr/share/doc/pcre-pcre-8.45/html/index.html +#usr/share/doc/pcre-pcre-8.45/html/pcre-config.html +#usr/share/doc/pcre-pcre-8.45/html/pcre.html +#usr/share/doc/pcre-pcre-8.45/html/pcre16.html +#usr/share/doc/pcre-pcre-8.45/html/pcre32.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_assign_jit_stack.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_compile.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_compile2.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_config.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_copy_named_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_copy_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_dfa_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_study.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_substring_list.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_fullinfo.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_named_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_stringnumber.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_stringtable_entries.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_substring_list.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_stack_alloc.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_stack_free.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_maketables.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_pattern_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_refcount.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_study.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_utf16_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_utf32_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_version.html +#usr/share/doc/pcre-pcre-8.45/html/pcreapi.html +#usr/share/doc/pcre-pcre-8.45/html/pcrebuild.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecallout.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecompat.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecpp.html +#usr/share/doc/pcre-pcre-8.45/html/pcredemo.html +#usr/share/doc/pcre-pcre-8.45/html/pcregrep.html +#usr/share/doc/pcre-pcre-8.45/html/pcrejit.html +#usr/share/doc/pcre-pcre-8.45/html/pcrelimits.html +#usr/share/doc/pcre-pcre-8.45/html/pcrematching.html +#usr/share/doc/pcre-pcre-8.45/html/pcrepartial.html +#usr/share/doc/pcre-pcre-8.45/html/pcrepattern.html +#usr/share/doc/pcre-pcre-8.45/html/pcreperform.html +#usr/share/doc/pcre-pcre-8.45/html/pcreposix.html +#usr/share/doc/pcre-pcre-8.45/html/pcreprecompile.html +#usr/share/doc/pcre-pcre-8.45/html/pcresample.html +#usr/share/doc/pcre-pcre-8.45/html/pcrestack.html +#usr/share/doc/pcre-pcre-8.45/html/pcresyntax.html +#usr/share/doc/pcre-pcre-8.45/html/pcretest.html +#usr/share/doc/pcre-pcre-8.45/html/pcreunicode.html +#usr/share/doc/pcre-pcre-8.45/pcre-config.txt +#usr/share/doc/pcre-pcre-8.45/pcre.txt +#usr/share/doc/pcre-pcre-8.45/pcregrep.txt +#usr/share/doc/pcre-pcre-8.45/pcretest.txt #usr/share/man/man1/pcre-config.1 #usr/share/man/man1/pcregrep.1 #usr/share/man/man1/pcretest.1 diff --git a/config/rootfiles/core/160/filelists/Text-Tabs+Wrap b/config/rootfiles/core/160/filelists/Text-Tabs+Wrap new file mode 120000 index 000000000..71d20ed34 --- /dev/null +++ b/config/rootfiles/core/160/filelists/Text-Tabs+Wrap @@ -0,0 +1 @@ +../../../common/Text-Tabs+Wrap \ No newline at end of file diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/core/160/filelists/files index e68e90a52..36600adf0 100644 --- a/config/rootfiles/core/160/filelists/files +++ b/config/rootfiles/core/160/filelists/files @@ -1,2 +1,3 @@ +usr/lib/firewall/rules.pl srv/web/ipfire/cgi-bin/fwhosts.cgi var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/160/filelists/iproute2 b/config/rootfiles/core/160/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/160/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/160/filelists/libhtp b/config/rootfiles/core/160/filelists/libhtp new file mode 120000 index 000000000..676e2c5e8 --- /dev/null +++ b/config/rootfiles/core/160/filelists/libhtp @@ -0,0 +1 @@ +../../../common/libhtp \ No newline at end of file diff --git a/config/rootfiles/core/160/filelists/pcre b/config/rootfiles/core/160/filelists/pcre new file mode 120000 index 000000000..b390d9a36 --- /dev/null +++ b/config/rootfiles/core/160/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/160/filelists/perl-MIME-Lite b/config/rootfiles/core/160/filelists/perl-MIME-Lite new file mode 120000 index 000000000..aa0aa6be6 --- /dev/null +++ b/config/rootfiles/core/160/filelists/perl-MIME-Lite @@ -0,0 +1 @@ +../../../common/perl-MIME-Lite \ No newline at end of file diff --git a/config/rootfiles/core/160/filelists/sqlite b/config/rootfiles/core/160/filelists/sqlite new file mode 120000 index 000000000..4ea569766 --- /dev/null +++ b/config/rootfiles/core/160/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/160/filelists/suricata b/config/rootfiles/core/160/filelists/suricata new file mode 120000 index 000000000..f671f6993 --- /dev/null +++ b/config/rootfiles/core/160/filelists/suricata @@ -0,0 +1 @@ +../../../common/suricata \ No newline at end of file diff --git a/lfs/Text-Tabs+Wrap b/lfs/Text-Tabs+Wrap index 68f8662b0..9cdbe0412 100644 --- a/lfs/Text-Tabs+Wrap +++ b/lfs/Text-Tabs+Wrap @@ -24,7 +24,7 @@
include Config
-VER = 2005.0824 +VER = 2013.0523
THISAPP = Text-Tabs+Wrap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 99c061630027de809beca99d0b71f689 +$(DL_FILE)_MD5 = 3e421ed3810803512af8d13bad548993
install : $(TARGET)
diff --git a/lfs/iproute2 b/lfs/iproute2 index 4a1ee3865..ac5df26e1 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@
include Config
-VER = 5.12.0 +VER = 5.13.0
THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bbebacdabd4628ff86453ef4771a242a +$(DL_FILE)_MD5 = 15fc3786303a173a14e180afe4cd2ecd
install : $(TARGET)
diff --git a/lfs/libhtp b/lfs/libhtp index e21db73a9..242953254 100644 --- a/lfs/libhtp +++ b/lfs/libhtp @@ -24,7 +24,7 @@
include Config
-VER = 0.5.37 +VER = 0.5.38
THISAPP = libhtp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ccc2f25ab3c1db53a22034280f1600dd +$(DL_FILE)_MD5 = 4d3bee196a8adcb10bfd874ec6bd9ca0
install : $(TARGET)
diff --git a/lfs/pcre b/lfs/pcre index e73f3fa08..981a29323 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -24,7 +24,7 @@
include Config
-VER = 8.44 +VER = 8.45
THISAPP = pcre-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -58,7 +58,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cf7326204cc46c755b5b2608033d9d24 +$(DL_FILE)_MD5 = 4452288e6a0eefb2ab11d36010a1eebb
install : $(TARGET)
diff --git a/lfs/perl-MIME-Lite b/lfs/perl-MIME-Lite index 186a95c4b..7fd9903e5 100644 --- a/lfs/perl-MIME-Lite +++ b/lfs/perl-MIME-Lite @@ -24,7 +24,7 @@
include Config
-VER = 3.030 +VER = 3.033
THISAPP = MIME-Lite-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5a6d90329e049eee77248d667343acc7 +$(DL_FILE)_MD5 = 42f056ef1338f129b1187a05e7b44369
install : $(TARGET)
diff --git a/lfs/sqlite b/lfs/sqlite index a68bf462b..04eada9d8 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@
include Config
-VER = 3350500 +VER = 3360000
THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d1d1aba394c8e0443077dc9f1a681bb8 +$(DL_FILE)_MD5 = f5752052fc5b8e1b539af86a3671eac7
install : $(TARGET)
diff --git a/lfs/suricata b/lfs/suricata index 19038e7c4..c7f189bf4 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -24,7 +24,7 @@
include Config
-VER = 5.0.6 +VER = 5.0.7
THISAPP = suricata-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 82d80b4b3179315bf6f5695c6437ee1f +$(DL_FILE)_MD5 = f6ff77e4dcf8035853209ceeba9b530c
install : $(TARGET)
diff --git a/lfs/traceroute b/lfs/traceroute index 87157ff42..0ec14538e 100644 --- a/lfs/traceroute +++ b/lfs/traceroute @@ -24,7 +24,7 @@
include Config
-VER = 2.0.18 +VER = 2.1.0
THISAPP = traceroute-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = traceroute -PAK_VER = 3 +PAK_VER = 4
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b7254149b7f081cce07f4b9e065ba5ef +$(DL_FILE)_MD5 = 84d329d67abc3fb83fc8cb12aeaddaba
install : $(TARGET)
diff --git a/src/patches/traceroute-2.0.18-ipfire.patch b/src/patches/traceroute-2.1.0-ipfire.patch similarity index 100% rename from src/patches/traceroute-2.0.18-ipfire.patch rename to src/patches/traceroute-2.1.0-ipfire.patch
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter