[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15de7a78feecdfe2fed7ab27d3d8182d8ffa27b3
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 15de7a78feecdfe2fed7ab27d3d8182d8ffa27b3 (commit) via 12f867444d5e19844dfa2e67752cd5720870294d (commit) via 397050eb2240da12fb1f2fc7b0e0125ef315e2a1 (commit) via 3bd2e49dda6183e98f2d06e6ebe235d82952799a (commit) via 8f58e6612b63a0b3bcfabd36dc2e0dbf958e6d98 (commit) via e0a904f56a6e7b44580aa4df530c3922b57b19dc (commit) via e0d7964a6c8cdf8d114e743ff7f8233c218bbf02 (commit) via ebbe05695dc684739ff0a7bbd92db5f930f52f0f (commit) via e975769800a4f4afe6a4cacdc42b6a2ef109e8f1 (commit) via 34a98832ee5ec33ef75f4732dfed003e9b76185c (commit) via b0759cc31c84c76f0e02b9e7618eb645619d31fe (commit) via b0fbd41651e788b0e07d8815990cacc8dff14c3d (commit) via 853717ba406c9ad8163e2556c627be4898e2ed2b (commit) from 7ef16982176a01b5e5027f3af9bf11358789a469 (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 15de7a78feecdfe2fed7ab27d3d8182d8ffa27b3 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Jan 29 09:40:36 2022 +0000
Revert "perl-libwww: Update to version 6.60 and rename from libwww-perl to perl-libwww"
This reverts commit 976b84ccb6303a172416e904b7dc431c7b8c46c4.
See: https://bugzilla.ipfire.org/show_bug.cgi?id=12769#c4
Reported-by: Arne Fitzenreiter arne.fitzenreiter@ipfire.org Cc: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 12f867444d5e19844dfa2e67752cd5720870294d Author: Peter Müller peter.mueller@ipfire.org Date: Sat Jan 29 09:38:56 2022 +0000
Revert "Core Update 164: Ship perl-libwww and delete obsolete files"
This reverts commit e0a904f56a6e7b44580aa4df530c3922b57b19dc.
See: https://bugzilla.ipfire.org/show_bug.cgi?id=12769#c4
Reported-by: Arne Fitzenreiter arne.fitzenreiter@ipfire.org Cc: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 397050eb2240da12fb1f2fc7b0e0125ef315e2a1 Merge: 3bd2e49dd 7ef169821 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Jan 29 09:38:37 2022 +0000
Merge branch 'next' into temp-c164-development
commit 3bd2e49dda6183e98f2d06e6ebe235d82952799a Author: Peter Müller peter.mueller@ipfire.org Date: Tue Jan 25 17:34:05 2022 +0000
Core Update 164: Ship log.dat
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 8f58e6612b63a0b3bcfabd36dc2e0dbf958e6d98 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jan 21 18:07:56 2022 +0100
log.dat: Fix an error with 'monit' logging too much data.
Making the regex "non-greedy" fixes an error Jon found.
'monit' logged a whole line from '/var/log/messages' where it should only log the first part.
Reference: https://www.ultraedit.com/support/tutorials-power-tips/ultraedit/non-greedy-...
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit e0a904f56a6e7b44580aa4df530c3922b57b19dc Author: Peter Müller peter.mueller@ipfire.org Date: Tue Jan 25 16:50:26 2022 +0000
Core Update 164: Ship perl-libwww and delete obsolete files
Reported-by: Arne Fitzenreiter arne.fitzenreiter@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit e0d7964a6c8cdf8d114e743ff7f8233c218bbf02 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Jan 25 16:39:13 2022 +0000
Core Update 164: Ship Bind
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit ebbe05695dc684739ff0a7bbd92db5f930f52f0f Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jan 21 17:47:24 2022 +0100
bind: Update to 9.11.25
For details (v9.16.22-v9.16.25) see: https://downloads.isc.org/isc/bind9/9.16.25/doc/arm/html/notes.html#notes-fo...
"Notes for BIND 9.16.25 Feature Changes
Overall memory use by named has been optimized and reduced, especially on systems with many CPU cores. The default memory allocator has been switched from internal to external. A new command-line option -M internal allows named to be started with the old internal memory allocator. [GL #2398]
Bug Fixes
On FreeBSD, TCP connections leaked a small amount of heap memory, leading to an eventual out-of-memory problem. This has been fixed. [GL #3051]
If signatures created by the ZSK were expired and the ZSK private key was offline, the signatures were not replaced. This behavior has been amended to replace the expired signatures with new signatures created using the KSK. [GL #3049]
Under certain circumstances, the signed version of an inline-signed zone could be dumped to disk without the serial number of the unsigned version of the zone. This prevented resynchronization of the zone contents after named restarted, if the unsigned zone file was modified while named was not running. This has been fixed. [GL #3071] ... "
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit e975769800a4f4afe6a4cacdc42b6a2ef109e8f1 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Jan 25 16:38:23 2022 +0000
Core Update 164: Ship pciutils
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 34a98832ee5ec33ef75f4732dfed003e9b76185c Author: Peter Müller peter.mueller@ipfire.org Date: Fri Jan 14 20:57:01 2022 +0000
pciutils: Update to 3.7.0
Please refer to https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/log/ for a history of this release. Sourcecode retrieved from https://mj.ucw.cz/download/linux/pci/ .
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit b0759cc31c84c76f0e02b9e7618eb645619d31fe Author: Peter Müller peter.mueller@ipfire.org Date: Tue Jan 25 16:35:29 2022 +0000
Core Update 164: Ship libyang
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit b0fbd41651e788b0e07d8815990cacc8dff14c3d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 22 10:18:55 2022 +0000
frr: Depend on elfutils
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit 853717ba406c9ad8163e2556c627be4898e2ed2b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 22 10:18:54 2022 +0000
libyang: Include in the core distribution
This isn't only a build dependency for FRR, but is required at runtime as well.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/bind | 14 +-- config/rootfiles/common/libwww-perl | 102 +++++++++++++++++++++ config/rootfiles/common/libyang | 4 +- config/rootfiles/common/pciutils | 2 +- config/rootfiles/common/perl-libwww | 44 --------- .../{oldcore/100 => core/164}/filelists/bind | 0 config/rootfiles/core/164/filelists/files | 1 + config/rootfiles/core/164/filelists/libyang | 1 + .../{oldcore/101 => core/164}/filelists/pciutils | 0 html/cgi-bin/logs.cgi/log.dat | 2 +- lfs/bind | 6 +- lfs/frr | 4 +- lfs/{perl-libwww => libwww-perl} | 4 +- lfs/pciutils | 6 +- make.sh | 2 +- 15 files changed, 126 insertions(+), 66 deletions(-) create mode 100644 config/rootfiles/common/libwww-perl delete mode 100644 config/rootfiles/common/perl-libwww copy config/rootfiles/{oldcore/100 => core/164}/filelists/bind (100%) create mode 120000 config/rootfiles/core/164/filelists/libyang copy config/rootfiles/{oldcore/101 => core/164}/filelists/pciutils (100%) rename lfs/{perl-libwww => libwww-perl} (97%)
Difference in files: diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index a89af5bcb..4ea64dc0c 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -274,24 +274,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.22.so +usr/lib/libbind9-9.16.25.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.22.so +usr/lib/libdns-9.16.25.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.22.so +usr/lib/libirs-9.16.25.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.22.so +usr/lib/libisc-9.16.25.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.22.so +usr/lib/libisccc-9.16.25.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.22.so +usr/lib/libisccfg-9.16.25.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.22.so +usr/lib/libns-9.16.25.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/common/libwww-perl b/config/rootfiles/common/libwww-perl new file mode 100644 index 000000000..a3f79e4d7 --- /dev/null +++ b/config/rootfiles/common/libwww-perl @@ -0,0 +1,102 @@ +#usr/lib/perl5/site_perl/5.32.1/Bundle +usr/lib/perl5/site_perl/5.32.1/Bundle/LWP.pm +#usr/lib/perl5/site_perl/5.32.1/File +usr/lib/perl5/site_perl/5.32.1/File/Listing.pm +usr/lib/perl5/site_perl/5.32.1/HTML/Form.pm +#usr/lib/perl5/site_perl/5.32.1/HTTP +#usr/lib/perl5/site_perl/5.32.1/HTTP/Cookies +usr/lib/perl5/site_perl/5.32.1/HTTP/Cookies.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Cookies/Microsoft.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Cookies/Netscape.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Daemon.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Date.pm +#usr/lib/perl5/site_perl/5.32.1/HTTP/Headers +usr/lib/perl5/site_perl/5.32.1/HTTP/Headers.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/Auth.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/ETag.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/Util.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Message.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Negotiate.pm +#usr/lib/perl5/site_perl/5.32.1/HTTP/Request +usr/lib/perl5/site_perl/5.32.1/HTTP/Request.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Request/Common.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Response.pm +usr/lib/perl5/site_perl/5.32.1/HTTP/Status.pm +#usr/lib/perl5/site_perl/5.32.1/LWP +usr/lib/perl5/site_perl/5.32.1/LWP.pm +#usr/lib/perl5/site_perl/5.32.1/LWP/Authen +usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Basic.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Digest.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Ntlm.pm +usr/lib/perl5/site_perl/5.32.1/LWP/ConnCache.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Debug.pm +usr/lib/perl5/site_perl/5.32.1/LWP/DebugFile.pm +usr/lib/perl5/site_perl/5.32.1/LWP/MediaTypes.pm +usr/lib/perl5/site_perl/5.32.1/LWP/MemberMixin.pm +#usr/lib/perl5/site_perl/5.32.1/LWP/Protocol +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/GHTTP.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/cpan.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/data.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/file.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/ftp.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/gopher.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/http.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/http10.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/https.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/https10.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/loopback.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/mailto.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/nntp.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/nogo.pm +usr/lib/perl5/site_perl/5.32.1/LWP/RobotUA.pm +usr/lib/perl5/site_perl/5.32.1/LWP/Simple.pm +usr/lib/perl5/site_perl/5.32.1/LWP/UserAgent.pm +usr/lib/perl5/site_perl/5.32.1/LWP/media.types +#usr/lib/perl5/site_perl/5.32.1/Net +#usr/lib/perl5/site_perl/5.32.1/Net/HTTP +usr/lib/perl5/site_perl/5.32.1/Net/HTTP.pm +usr/lib/perl5/site_perl/5.32.1/Net/HTTP/Methods.pm +usr/lib/perl5/site_perl/5.32.1/Net/HTTP/NB.pm +usr/lib/perl5/site_perl/5.32.1/Net/HTTPS.pm +#usr/lib/perl5/site_perl/5.32.1/WWW +#usr/lib/perl5/site_perl/5.32.1/WWW/RobotRules +usr/lib/perl5/site_perl/5.32.1/WWW/RobotRules.pm +usr/lib/perl5/site_perl/5.32.1/WWW/RobotRules/AnyDBM_File.pm +#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww-perl +#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww-perl/.packlist +#usr/lib/perl5/site_perl/5.32.1/lwpcook.pod +#usr/lib/perl5/site_perl/5.32.1/lwptut.pod +#usr/share/man/man3/Bundle::LWP.3 +#usr/share/man/man3/File::Listing.3 +#usr/share/man/man3/HTML::Form.3 +#usr/share/man/man3/HTTP::Cookies.3 +#usr/share/man/man3/HTTP::Cookies::Microsoft.3 +#usr/share/man/man3/HTTP::Cookies::Netscape.3 +#usr/share/man/man3/HTTP::Daemon.3 +#usr/share/man/man3/HTTP::Date.3 +#usr/share/man/man3/HTTP::Headers.3 +#usr/share/man/man3/HTTP::Headers::Util.3 +#usr/share/man/man3/HTTP::Message.3 +#usr/share/man/man3/HTTP::Negotiate.3 +#usr/share/man/man3/HTTP::Request.3 +#usr/share/man/man3/HTTP::Request::Common.3 +#usr/share/man/man3/HTTP::Response.3 +#usr/share/man/man3/HTTP::Status.3 +#usr/share/man/man3/LWP.3 +#usr/share/man/man3/LWP::Authen::Ntlm.3 +#usr/share/man/man3/LWP::ConnCache.3 +#usr/share/man/man3/LWP::Debug.3 +#usr/share/man/man3/LWP::DebugFile.3 +#usr/share/man/man3/LWP::MediaTypes.3 +#usr/share/man/man3/LWP::MemberMixin.3 +#usr/share/man/man3/LWP::Protocol.3 +#usr/share/man/man3/LWP::RobotUA.3 +#usr/share/man/man3/LWP::Simple.3 +#usr/share/man/man3/LWP::UserAgent.3 +#usr/share/man/man3/Net::HTTP.3 +#usr/share/man/man3/Net::HTTP::NB.3 +#usr/share/man/man3/WWW::RobotRules.3 +#usr/share/man/man3/WWW::RobotRules::AnyDBM_File.3 +#usr/share/man/man3/lwpcook.3 +#usr/share/man/man3/lwptut.3 diff --git a/config/rootfiles/common/libyang b/config/rootfiles/common/libyang index 433b09fc8..f77ef8b70 100644 --- a/config/rootfiles/common/libyang +++ b/config/rootfiles/common/libyang @@ -24,8 +24,8 @@ #usr/include/libyang/tree_schema.h #usr/include/libyang/version.h #usr/lib/libyang.so -#usr/lib/libyang.so.2 -#usr/lib/libyang.so.2.1.4 +usr/lib/libyang.so.2 +usr/lib/libyang.so.2.1.4 #usr/lib/pkgconfig #usr/lib/pkgconfig/libyang.pc #usr/share/man/man1/yanglint.1 diff --git a/config/rootfiles/common/pciutils b/config/rootfiles/common/pciutils index da35ef6a1..17a3ede66 100644 --- a/config/rootfiles/common/pciutils +++ b/config/rootfiles/common/pciutils @@ -1,7 +1,7 @@ bin/lspci bin/setpci lib/libpci.so.3 -lib/libpci.so.3.5.6 +lib/libpci.so.3.7.0 sbin/update-pciids #usr/include/pci #usr/include/pci/config.h diff --git a/config/rootfiles/common/perl-libwww b/config/rootfiles/common/perl-libwww deleted file mode 100644 index fc275a81f..000000000 --- a/config/rootfiles/common/perl-libwww +++ /dev/null @@ -1,44 +0,0 @@ -#usr/lib/perl5/site_perl/5.32.1/LWP -usr/lib/perl5/site_perl/5.32.1/LWP.pm -#usr/lib/perl5/site_perl/5.32.1/LWP/Authen -usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Basic.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Digest.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Ntlm.pm -usr/lib/perl5/site_perl/5.32.1/LWP/ConnCache.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Debug -usr/lib/perl5/site_perl/5.32.1/LWP/Debug.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Debug/TraceHTTP.pm -usr/lib/perl5/site_perl/5.32.1/LWP/DebugFile.pm -usr/lib/perl5/site_perl/5.32.1/LWP/MemberMixin.pm -#usr/lib/perl5/site_perl/5.32.1/LWP/Protocol -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/cpan.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/data.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/file.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/ftp.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/gopher.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/http.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/loopback.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/mailto.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/nntp.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/nogo.pm -usr/lib/perl5/site_perl/5.32.1/LWP/RobotUA.pm -usr/lib/perl5/site_perl/5.32.1/LWP/Simple.pm -usr/lib/perl5/site_perl/5.32.1/LWP/UserAgent.pm -#usr/lib/perl5/site_perl/5.32.1/libwww -usr/lib/perl5/site_perl/5.32.1/libwww/lwpcook.pod -usr/lib/perl5/site_perl/5.32.1/libwww/lwptut.pod -#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww -#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww/perl -#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww/perl/.packlist -#usr/share/man/man3/LWP.3 -#usr/share/man/man3/LWP::Authen::Ntlm.3 -#usr/share/man/man3/LWP::ConnCache.3 -#usr/share/man/man3/LWP::Debug.3 -#usr/share/man/man3/LWP::MemberMixin.3 -#usr/share/man/man3/LWP::Protocol.3 -#usr/share/man/man3/LWP::RobotUA.3 -#usr/share/man/man3/LWP::Simple.3 -#usr/share/man/man3/LWP::UserAgent.3 -#usr/share/man/man3/libwww::lwpcook.3 -#usr/share/man/man3/libwww::lwptut.3 diff --git a/config/rootfiles/core/164/filelists/bind b/config/rootfiles/core/164/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/164/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/164/filelists/files b/config/rootfiles/core/164/filelists/files index ad6caaac3..cf47c16c4 100644 --- a/config/rootfiles/core/164/filelists/files +++ b/config/rootfiles/core/164/filelists/files @@ -4,6 +4,7 @@ etc/rc.d/init.d/squid etc/suricata/suricata.yaml etc/sysctl.conf srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/optionsfw.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/html/include/pakfire.js diff --git a/config/rootfiles/core/164/filelists/libyang b/config/rootfiles/core/164/filelists/libyang new file mode 120000 index 000000000..50c26d048 --- /dev/null +++ b/config/rootfiles/core/164/filelists/libyang @@ -0,0 +1 @@ +../../../common/libyang \ No newline at end of file diff --git a/config/rootfiles/core/164/filelists/pciutils b/config/rootfiles/core/164/filelists/pciutils new file mode 120000 index 000000000..aeb45e7b3 --- /dev/null +++ b/config/rootfiles/core/164/filelists/pciutils @@ -0,0 +1 @@ +../../../common/pciutils \ No newline at end of file diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 0d6c6722a..3364b7bea 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -62,7 +62,7 @@ my %sections = ( 'ipfire' => '(ipfire: )', 'ipsec' => '(ipsec_[\w_]+: |pluto[.*]: |charon: |vpnwatch: )', 'kernel' => '(kernel: (?!DROP_))', - 'monit' => '(monit[.*]: )', + 'monit' => '(monit[.*?]: )', 'ntp' => '(ntpd(?:ate)?[.*]: )', 'oinkmaster' => '(oinkmaster[.*]: )', 'openvpn' => '(openvpnserver[.*]: |.*n2n[.*]: )', diff --git a/lfs/bind b/lfs/bind index 8544f0f1f..fc6e7654e 100644 --- a/lfs/bind +++ b/lfs/bind @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2022 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 # @@ -25,7 +25,7 @@
include Config
-VER = 9.16.22 +VER = 9.16.25
THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6a45478b33c04c830d4263635d8cd137 +$(DL_FILE)_MD5 = 361a54fc5ebeb3a1af77abec08b33661
install : $(TARGET)
diff --git a/lfs/frr b/lfs/frr index 1af776eb6..04f1aa590 100644 --- a/lfs/frr +++ b/lfs/frr @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = frr -PAK_VER = 2 +PAK_VER = 3
-DEPS = +DEPS = elfutils
CFLAGS += -fcommon
diff --git a/lfs/perl-libwww b/lfs/libwww-perl similarity index 97% rename from lfs/perl-libwww rename to lfs/libwww-perl index f6811fc5a..536a49769 100644 --- a/lfs/perl-libwww +++ b/lfs/libwww-perl @@ -24,7 +24,7 @@
include Config
-VER = 6.60 +VER = 5.803
THISAPP = libwww-perl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ce5180358d9279b2843a6518bf2de200 +$(DL_FILE)_MD5 = 3345d5f15a4f42350847254141725c8f
install : $(TARGET)
diff --git a/lfs/pciutils b/lfs/pciutils index 2068c5a0c..995c3c0a4 100644 --- a/lfs/pciutils +++ b/lfs/pciutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2022 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 = 3.5.6 +VER = 3.7.0
THISAPP = pciutils-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 63b347d2bb5719b7769c03a1bb72a5b7 +$(DL_FILE)_MD5 = 51554c538b5a57b61123326e14ea28a1
install : $(TARGET)
diff --git a/make.sh b/make.sh index 74dd06be8..378cd35eb 100755 --- a/make.sh +++ b/make.sh @@ -1301,7 +1301,7 @@ buildipfire() { lfsmake2 Digest lfsmake2 Digest-SHA1 lfsmake2 Digest-HMAC - lfsmake2 perl-libwww + lfsmake2 libwww-perl lfsmake2 Net-DNS lfsmake2 Net-IPv4Addr lfsmake2 Net_SSLeay
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter