* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a410004c610f8b21f9372056523a419085dbb3b7
@ 2020-12-10 13:18 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2020-12-10 13:18 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 68997 bytes --]
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 a410004c610f8b21f9372056523a419085dbb3b7 (commit)
via c84046215309c2c5dec62f4a87fd86d9e5bf8fb0 (commit)
via 904b8b625966c05324e39e5e2d9081555978f92e (commit)
via babe22939080474f8285eea24d2abc7ce1b1addc (commit)
via 5fd8c3e1f5e3a470f283485e562a9a41242265bd (commit)
via ebbda8ed863ac1eb29c549c015a363dea83fa580 (commit)
via 64dfe751428c2cac0c1d700fb71054166973e567 (commit)
via 8d3135455f05de92c6b1f22a4b8b2020903f80a6 (commit)
via fde5772fde4f47b923493c558280a70716bd6116 (commit)
via d7f93218b154f30a3b603956ebfa0d41aa48fa15 (commit)
via d978558809285afcee56b2120b10d9107b1b260b (commit)
via 50752f1b61997b60e7850d41d5c633a688ab1353 (commit)
via 14baf8472a74b18ff1779a9caf534a8af91e0134 (commit)
via d44ce7d4c25e9a1d0a8a358c0f16a17d1d417cf1 (commit)
via ca4ce968000125f237da77da6bcf88738ec6b060 (commit)
via 0f4d1a8e6b37a4ac1b9cb64bc34f9d4b31423099 (commit)
via c2f02d9d5977d7ead634760bc8987bafbfc62370 (commit)
via 86a7c165a1a3afdf21734aad5291403440d04d08 (commit)
from eaa9032166dcf1be88b6987419f23b617aa4a627 (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 a410004c610f8b21f9372056523a419085dbb3b7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 13:18:26 2020 +0000
shairport-sync: Update to 3.3.7
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c84046215309c2c5dec62f4a87fd86d9e5bf8fb0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 13:04:38 2020 +0000
core154: Ship PAM
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 904b8b625966c05324e39e5e2d9081555978f92e
Author: ummeegge <erik.kapfer(a)ipfire.org>
Date: Sun Dec 6 10:08:59 2020 +0000
Pam: Update to version 1.5.1
Several fixes and improvements since the current available 1.3.1 version are included.
CVE-2020-27780 has also been fixed.
For a full release overview --> https://github.com/linux-pam/linux-pam/releases .
Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit babe22939080474f8285eea24d2abc7ce1b1addc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 13:02:43 2020 +0000
core154: Ship unbound
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5fd8c3e1f5e3a470f283485e562a9a41242265bd
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 6 10:43:54 2020 +0100
unbound: Update to 1.13.0
For details see:
https://lists.nlnetlabs.nl/pipermail/unbound-users/2020-December/007102.html
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ebbda8ed863ac1eb29c549c015a363dea83fa580
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 13:01:45 2020 +0000
core154: Ship dhcpcd
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 64dfe751428c2cac0c1d700fb71054166973e567
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 6 10:39:05 2020 +0100
dhcpcd: Update to 9.3.4
For details see:
https://roy.marples.name/blog/dhcpcd-9-3-4-released.html
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d3135455f05de92c6b1f22a4b8b2020903f80a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 13:00:51 2020 +0000
core154: Ship bind
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fde5772fde4f47b923493c558280a70716bd6116
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 6 10:34:07 2020 +0100
bind: Update to 9.11.25
For details see:
https://downloads.isc.org/isc/bind9/9.11.25/RELEASE-NOTES-bind-9.11.25.html
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d7f93218b154f30a3b603956ebfa0d41aa48fa15
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 13:00:06 2020 +0000
core154: Ship services.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d978558809285afcee56b2120b10d9107b1b260b
Author: Adolf Belka <ahb.ipfire(a)gmail.com>
Date: Mon Dec 7 15:01:36 2020 +0100
Fix for bug 12539
The installer recognises cups and cups-filters both as cups and puts
two instances of cups in the add-on services table.
Based on input from Michael Tremer this patch replaces the command
returning the second element between hyphens with one that takes
what comes after "meta-" using Perl code rather than a shell command.
The second find command was changed as per Michael's suggestion.
Tested in my ipfire test bed system and only results in one cups
entry.
Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 50752f1b61997b60e7850d41d5c633a688ab1353
Author: ummeegge <erik.kapfer(a)ipfire.org>
Date: Mon Dec 7 14:23:05 2020 +0000
kerberos: Update to version 1.18.3
Since version 1.15.2 several fixes and enhancements has been introduced.
For a full overview the release notes can be found in the next lines.
https://web.mit.edu/kerberos/krb5-1.16/
https://web.mit.edu/kerberos/krb5-1.17/
https://web.mit.edu/kerberos/krb5-1.18/
Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 14baf8472a74b18ff1779a9caf534a8af91e0134
Author: ummeegge <erik.kapfer(a)ipfire.org>
Date: Sun Dec 6 15:03:45 2020 +0000
tshark: Update to version 3.4.0
- Since tshark uses since 3.4.0 an always enabled asynchronous DNS
resolution, c-ares is a needed dependency.
- Since the current actual version 3.2.6 a lot of bug fixes, fixed
vulnerabilities, updated features, new protocols but also updated
protocols has been integrated.
A full overview of all changes can be found in here -->
Update to version 3.2.7:
https://www.wireshark.org/docs/relnotes/wireshark-3.2.7.html
Update to version 3.2.8:
https://www.wireshark.org/docs/relnotes/wireshark-3.2.8.html
Update to version 3.4.0
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d44ce7d4c25e9a1d0a8a358c0f16a17d1d417cf1
Author: ummeegge <erik.kapfer(a)ipfire.org>
Date: Sun Dec 6 15:03:44 2020 +0000
c-ares: New package. Needed as tshark Dependency
- Since tshark uses with version 3.4.0 an always enabled asynchronous DNS
resolution c-ares is a needed dependency.
- Since curl can also use c-ares --> https://c-ares.haxx.se/ it has been
placed in make.sh before curl even no compiletime options has been set
to enable this. c-ares has also been placed in packages and not in common
which would be needed if it should be used for curl too.
Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ca4ce968000125f237da77da6bcf88738ec6b060
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 6 10:46:36 2020 +0100
nano: Update to 5.4
For details see:
https://www.nano-editor.org/news.php
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0f4d1a8e6b37a4ac1b9cb64bc34f9d4b31423099
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 6 00:26:21 2020 +0100
monit: Update to 5.27.1
For details see:
https://mmonit.com/monit/changes/
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c2f02d9d5977d7ead634760bc8987bafbfc62370
Author: Adolf Belka <ahb.ipfire(a)gmail.com>
Date: Sat Dec 5 15:51:11 2020 +0100
bacula: Update to use IPFire initscript
Bacula install used the bacula initscript for starting and stopping bacula.
This works fine but results in no pid or memory input in the addons table
under services.
Using the IPFire initscript also successfully starts and stops bacula with
no problems but also provides the pid and memory information in the services
addons table.
- rootfiles adjusted to remove the reference to bacula-ctl-fd
- lfs/bacula adjusted to remove the init.d/bacula link generation
remove the "rm -f /root/.rnd" command. This file is not present
and I have not seen this command in any other lfs file that I
have looked at.
- new bacula initscript created
Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 86a7c165a1a3afdf21734aad5291403440d04d08
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 12:28:12 2020 +0000
Start Core Update 154
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/bind | 9 +--
config/rootfiles/common/pam | 31 +++++++---
config/rootfiles/common/unbound | 2 +-
config/rootfiles/{oldcore/149 => core/154}/exclude | 0
.../{oldcore/100 => core/154}/filelists/bind | 0
.../{oldcore/125 => core/154}/filelists/dhcpcd | 0
.../{oldcore/146 => core/154}/filelists/files | 3 +-
.../{oldcore/119 => core/154}/filelists/pam | 0
.../{oldcore/106 => core/154}/filelists/unbound | 0
.../rootfiles/{oldcore/152 => core/154}/update.sh | 3 +-
config/rootfiles/{core => oldcore}/153/exclude | 0
.../{core => oldcore}/153/filelists/aarch64/linux | 0
.../153/filelists/aarch64/linux-initrd | 0
.../153/filelists/armv5tel/linux-initrd-multi | 0
.../153/filelists/armv5tel/linux-multi | 0
.../rootfiles/{core => oldcore}/153/filelists/bash | 0
.../rootfiles/{core => oldcore}/153/filelists/curl | 0
.../rootfiles/{core => oldcore}/153/filelists/ddns | 0
.../rootfiles/{core => oldcore}/153/filelists/file | 0
.../{core => oldcore}/153/filelists/files | 0
.../{core => oldcore}/153/filelists/hwdata | 0
.../153/filelists/i586/intel-microcode | 0
.../{core => oldcore}/153/filelists/i586/linux | 0
.../153/filelists/i586/linux-initrd | 0
.../153/filelists/i586/openssl-sse2 | 0
.../153/filelists/ids-ruleset-sources | 0
.../rootfiles/{core => oldcore}/153/filelists/knot | 0
.../{core => oldcore}/153/filelists/libarchive | 0
.../{core => oldcore}/153/filelists/libhtp | 0
.../{core => oldcore}/153/filelists/libloc | 0
.../{core => oldcore}/153/filelists/logwatch | 0
.../{core => oldcore}/153/filelists/openssl | 0
.../{core => oldcore}/153/filelists/openvpn | 0
.../{core => oldcore}/153/filelists/strongswan | 0
.../{core => oldcore}/153/filelists/suricata | 0
.../{core => oldcore}/153/filelists/tzdata | 0
.../{core => oldcore}/153/filelists/usb_modeswitch | 0
.../153/filelists/usb_modeswitch_data | 0
.../153/filelists/x86_64/intel-microcode | 0
.../{core => oldcore}/153/filelists/x86_64/linux | 0
.../153/filelists/x86_64/linux-initrd | 0
config/rootfiles/{core => oldcore}/153/update.sh | 0
config/rootfiles/packages/bacula | 2 +-
config/rootfiles/packages/c-ares | 68 ++++++++++++++++++++++
config/rootfiles/packages/krb5 | 30 ++++++----
config/rootfiles/packages/tshark | 68 +++++++++++++---------
html/cgi-bin/services.cgi | 9 +--
lfs/bacula | 8 ++-
lfs/bind | 4 +-
lfs/{fping => c-ares} | 15 ++---
lfs/dhcpcd | 4 +-
lfs/krb5 | 14 ++---
lfs/monit | 10 ++--
lfs/nano | 6 +-
lfs/pam | 6 +-
lfs/shairport-sync | 6 +-
lfs/tshark | 8 +--
lfs/unbound | 4 +-
make.sh | 3 +-
src/initscripts/packages/bacula | 28 +++++++++
.../krb5-1.18.3_prevent_spurious_text.patch | 18 ++++++
.../krb5-1.18.3_remove_known_failed_test.patch | 18 ++++++
62 files changed, 272 insertions(+), 105 deletions(-)
copy config/rootfiles/{oldcore/149 => core/154}/exclude (100%)
copy config/rootfiles/{oldcore/100 => core/154}/filelists/bind (100%)
copy config/rootfiles/{oldcore/125 => core/154}/filelists/dhcpcd (100%)
copy config/rootfiles/{oldcore/146 => core/154}/filelists/files (61%)
copy config/rootfiles/{oldcore/119 => core/154}/filelists/pam (100%)
copy config/rootfiles/{oldcore/106 => core/154}/filelists/unbound (100%)
copy config/rootfiles/{oldcore/152 => core/154}/update.sh (98%)
rename config/rootfiles/{core => oldcore}/153/exclude (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/aarch64/linux (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/aarch64/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/armv5tel/linux-initrd-multi (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/armv5tel/linux-multi (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/bash (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/curl (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/ddns (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/file (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/hwdata (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/i586/intel-microcode (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/i586/linux (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/i586/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/i586/openssl-sse2 (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/ids-ruleset-sources (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/knot (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/libarchive (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/libhtp (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/libloc (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/logwatch (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/openvpn (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/suricata (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/tzdata (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/usb_modeswitch (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/usb_modeswitch_data (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/x86_64/intel-microcode (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/x86_64/linux (100%)
rename config/rootfiles/{core => oldcore}/153/filelists/x86_64/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/153/update.sh (100%)
create mode 100644 config/rootfiles/packages/c-ares
copy lfs/{fping => c-ares} (94%)
create mode 100644 src/initscripts/packages/bacula
create mode 100644 src/patches/krb5-1.18.3_prevent_spurious_text.patch
create mode 100644 src/patches/krb5-1.18.3_remove_known_failed_test.patch
Difference in files:
diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index e3f055b43..e141c86e1 100644
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -122,6 +122,7 @@ usr/bin/nsupdate
#usr/include/isc/boolean.h
#usr/include/isc/buffer.h
#usr/include/isc/bufferlist.h
+#usr/include/isc/cmocka.h
#usr/include/isc/commandline.h
#usr/include/isc/condition.h
#usr/include/isc/counter.h
@@ -271,12 +272,12 @@ usr/lib/libbind9.so.161
usr/lib/libbind9.so.161.0.4
#usr/lib/libdns.la
#usr/lib/libdns.so
-usr/lib/libdns.so.1110
-usr/lib/libdns.so.1110.0.4
+usr/lib/libdns.so.1112
+usr/lib/libdns.so.1112.0.1
#usr/lib/libisc.la
#usr/lib/libisc.so
-usr/lib/libisc.so.1105
-usr/lib/libisc.so.1105.1.1
+usr/lib/libisc.so.1107
+usr/lib/libisc.so.1107.0.3
#usr/lib/libisccc.la
#usr/lib/libisccc.so
usr/lib/libisccc.so.161
diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam
index 0ca320f8f..e487e3fe2 100644
--- a/config/rootfiles/common/pam
+++ b/config/rootfiles/common/pam
@@ -2,6 +2,7 @@
etc/pam.d
etc/security
#etc/security/access.conf
+#etc/security/faillock.conf
#etc/security/group.conf
#etc/security/limits.conf
#etc/security/limits.d
@@ -11,6 +12,7 @@ etc/security
#etc/security/pam_env.conf
#etc/security/time.conf
#lib/security
+#lib/security/faillock
#lib/security/mkhomedir_helper
#lib/security/pam_access.la
lib/security/pam_access.so
@@ -26,6 +28,8 @@ lib/security/pam_env.so
lib/security/pam_exec.so
#lib/security/pam_faildelay.la
lib/security/pam_faildelay.so
+#lib/security/pam_faillock.la
+#lib/security/pam_faillock.so
#lib/security/pam_filter
#lib/security/pam_filter.la
#lib/security/pam_filter.so
@@ -56,6 +60,7 @@ lib/security/pam_mail.so
#lib/security/pam_motd.so
#lib/security/pam_namespace.la
#lib/security/pam_namespace.so
+#lib/security/pam_namespace_helper
#lib/security/pam_nologin.la
lib/security/pam_nologin.so
#lib/security/pam_permit.la
@@ -68,18 +73,14 @@ lib/security/pam_rhosts.so
#lib/security/pam_rootok.so
#lib/security/pam_securetty.la
#lib/security/pam_securetty.so
+#lib/security/pam_setquota.la
+#lib/security/pam_setquota.so
#lib/security/pam_shells.la
lib/security/pam_shells.so
#lib/security/pam_stress.la
#lib/security/pam_stress.so
#lib/security/pam_succeed_if.la
#lib/security/pam_succeed_if.so
-#lib/security/pam_tally
-#lib/security/pam_tally.la
-#lib/security/pam_tally.so
-#lib/security/pam_tally2
-#lib/security/pam_tally2.la
-#lib/security/pam_tally2.so
#lib/security/pam_time.la
#lib/security/pam_time.so
#lib/security/pam_timestamp.la
@@ -91,12 +92,15 @@ lib/security/pam_shells.so
lib/security/pam_unix.so
#lib/security/pam_userdb.la
#lib/security/pam_userdb.so
+#lib/security/pam_usertype.la
+#lib/security/pam_usertype.so
#lib/security/pam_warn.la
#lib/security/pam_warn.so
#lib/security/pam_wheel.la
#lib/security/pam_wheel.so
#lib/security/pam_xauth.la
#lib/security/pam_xauth.so
+#lib/security/pwhistory_helper
lib/security/unix_chkpwd
lib/security/unix_update
#usr/include/security
@@ -113,7 +117,7 @@ lib/security/unix_update
#usr/lib/libpam.la
#usr/lib/libpam.so
usr/lib/libpam.so.0
-usr/lib/libpam.so.0.84.2
+usr/lib/libpam.so.0.85.1
#usr/lib/libpam_misc.la
#usr/lib/libpam_misc.so
usr/lib/libpam_misc.so.0
@@ -122,6 +126,9 @@ usr/lib/libpam_misc.so.0.82.1
#usr/lib/libpamc.so
usr/lib/libpamc.so.0
usr/lib/libpamc.so.0.82.1
+#usr/lib/systemd
+#usr/lib/systemd/system
+#usr/lib/systemd/system/pam_namespace.service
#usr/share/doc/Linux-PAM
#usr/share/doc/Linux-PAM/draft-morgan-pam-current.txt
#usr/share/doc/Linux-PAM/index.html
@@ -170,6 +177,7 @@ usr/lib/libpamc.so.0.82.1
#usr/share/man/man3/pam_xauth_data.3
#usr/share/man/man5/access.conf.5
#usr/share/man/man5/environment.5
+#usr/share/man/man5/faillock.conf.5
#usr/share/man/man5/group.conf.5
#usr/share/man/man5/limits.conf.5
#usr/share/man/man5/namespace.conf.5
@@ -178,6 +186,7 @@ usr/lib/libpamc.so.0.82.1
#usr/share/man/man5/pam_env.conf.5
#usr/share/man/man5/time.conf.5
#usr/share/man/man8/PAM.8
+#usr/share/man/man8/faillock.8
#usr/share/man/man8/mkhomedir_helper.8
#usr/share/man/man8/pam.8
#usr/share/man/man8/pam_access.8
@@ -187,6 +196,7 @@ usr/lib/libpamc.so.0.82.1
#usr/share/man/man8/pam_env.8
#usr/share/man/man8/pam_exec.8
#usr/share/man/man8/pam_faildelay.8
+#usr/share/man/man8/pam_faillock.8
#usr/share/man/man8/pam_filter.8
#usr/share/man/man8/pam_ftp.8
#usr/share/man/man8/pam_group.8
@@ -201,24 +211,27 @@ usr/lib/libpamc.so.0.82.1
#usr/share/man/man8/pam_mkhomedir.8
#usr/share/man/man8/pam_motd.8
#usr/share/man/man8/pam_namespace.8
+#usr/share/man/man8/pam_namespace_helper.8
#usr/share/man/man8/pam_nologin.8
#usr/share/man/man8/pam_permit.8
#usr/share/man/man8/pam_pwhistory.8
#usr/share/man/man8/pam_rhosts.8
#usr/share/man/man8/pam_rootok.8
#usr/share/man/man8/pam_securetty.8
+#usr/share/man/man8/pam_setquota.8
#usr/share/man/man8/pam_shells.8
+#usr/share/man/man8/pam_stress.8
#usr/share/man/man8/pam_succeed_if.8
-#usr/share/man/man8/pam_tally.8
-#usr/share/man/man8/pam_tally2.8
#usr/share/man/man8/pam_time.8
#usr/share/man/man8/pam_timestamp.8
#usr/share/man/man8/pam_timestamp_check.8
#usr/share/man/man8/pam_umask.8
#usr/share/man/man8/pam_unix.8
#usr/share/man/man8/pam_userdb.8
+#usr/share/man/man8/pam_usertype.8
#usr/share/man/man8/pam_warn.8
#usr/share/man/man8/pam_wheel.8
#usr/share/man/man8/pam_xauth.8
+#usr/share/man/man8/pwhistory_helper.8
#usr/share/man/man8/unix_chkpwd.8
#usr/share/man/man8/unix_update.8
diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index f24c4f136..45fee4460 100644
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.8
-usr/lib/libunbound.so.8.1.10
+usr/lib/libunbound.so.8.1.11
#usr/lib/pkgconfig/libunbound.pc
usr/sbin/unbound
usr/sbin/unbound-anchor
diff --git a/config/rootfiles/core/154/exclude b/config/rootfiles/core/154/exclude
new file mode 100644
index 000000000..e7500a03d
--- /dev/null
+++ b/config/rootfiles/core/154/exclude
@@ -0,0 +1,32 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/154/filelists/bind b/config/rootfiles/core/154/filelists/bind
new file mode 120000
index 000000000..48a0ebaef
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/154/filelists/dhcpcd b/config/rootfiles/core/154/filelists/dhcpcd
new file mode 120000
index 000000000..1e799dabb
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/dhcpcd
@@ -0,0 +1 @@
+../../../common/dhcpcd
\ No newline at end of file
diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/core/154/filelists/files
new file mode 100644
index 000000000..b80133c11
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/files
@@ -0,0 +1,6 @@
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/services.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/154/filelists/pam b/config/rootfiles/core/154/filelists/pam
new file mode 120000
index 000000000..660a1d80e
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/pam
@@ -0,0 +1 @@
+../../../common/pam
\ No newline at end of file
diff --git a/config/rootfiles/core/154/filelists/unbound b/config/rootfiles/core/154/filelists/unbound
new file mode 120000
index 000000000..66adf0924
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/154/update.sh b/config/rootfiles/core/154/update.sh
new file mode 100644
index 000000000..37348e0df
--- /dev/null
+++ b/config/rootfiles/core/154/update.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2020 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=154
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Remove files
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+/etc/init.d/unbound restart
+
+# This update needs a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/core/153/exclude b/config/rootfiles/oldcore/153/exclude
similarity index 100%
rename from config/rootfiles/core/153/exclude
rename to config/rootfiles/oldcore/153/exclude
diff --git a/config/rootfiles/core/153/filelists/aarch64/linux b/config/rootfiles/oldcore/153/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/153/filelists/aarch64/linux
rename to config/rootfiles/oldcore/153/filelists/aarch64/linux
diff --git a/config/rootfiles/core/153/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/153/filelists/aarch64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/153/filelists/aarch64/linux-initrd
rename to config/rootfiles/oldcore/153/filelists/aarch64/linux-initrd
diff --git a/config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/153/filelists/armv5tel/linux-initrd-multi
similarity index 100%
rename from config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi
rename to config/rootfiles/oldcore/153/filelists/armv5tel/linux-initrd-multi
diff --git a/config/rootfiles/core/153/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/153/filelists/armv5tel/linux-multi
similarity index 100%
rename from config/rootfiles/core/153/filelists/armv5tel/linux-multi
rename to config/rootfiles/oldcore/153/filelists/armv5tel/linux-multi
diff --git a/config/rootfiles/core/153/filelists/bash b/config/rootfiles/oldcore/153/filelists/bash
similarity index 100%
rename from config/rootfiles/core/153/filelists/bash
rename to config/rootfiles/oldcore/153/filelists/bash
diff --git a/config/rootfiles/core/153/filelists/curl b/config/rootfiles/oldcore/153/filelists/curl
similarity index 100%
rename from config/rootfiles/core/153/filelists/curl
rename to config/rootfiles/oldcore/153/filelists/curl
diff --git a/config/rootfiles/core/153/filelists/ddns b/config/rootfiles/oldcore/153/filelists/ddns
similarity index 100%
rename from config/rootfiles/core/153/filelists/ddns
rename to config/rootfiles/oldcore/153/filelists/ddns
diff --git a/config/rootfiles/core/153/filelists/file b/config/rootfiles/oldcore/153/filelists/file
similarity index 100%
rename from config/rootfiles/core/153/filelists/file
rename to config/rootfiles/oldcore/153/filelists/file
diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/oldcore/153/filelists/files
similarity index 100%
rename from config/rootfiles/core/153/filelists/files
rename to config/rootfiles/oldcore/153/filelists/files
diff --git a/config/rootfiles/core/153/filelists/hwdata b/config/rootfiles/oldcore/153/filelists/hwdata
similarity index 100%
rename from config/rootfiles/core/153/filelists/hwdata
rename to config/rootfiles/oldcore/153/filelists/hwdata
diff --git a/config/rootfiles/core/153/filelists/i586/intel-microcode b/config/rootfiles/oldcore/153/filelists/i586/intel-microcode
similarity index 100%
rename from config/rootfiles/core/153/filelists/i586/intel-microcode
rename to config/rootfiles/oldcore/153/filelists/i586/intel-microcode
diff --git a/config/rootfiles/core/153/filelists/i586/linux b/config/rootfiles/oldcore/153/filelists/i586/linux
similarity index 100%
rename from config/rootfiles/core/153/filelists/i586/linux
rename to config/rootfiles/oldcore/153/filelists/i586/linux
diff --git a/config/rootfiles/core/153/filelists/i586/linux-initrd b/config/rootfiles/oldcore/153/filelists/i586/linux-initrd
similarity index 100%
rename from config/rootfiles/core/153/filelists/i586/linux-initrd
rename to config/rootfiles/oldcore/153/filelists/i586/linux-initrd
diff --git a/config/rootfiles/core/153/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/153/filelists/i586/openssl-sse2
similarity index 100%
rename from config/rootfiles/core/153/filelists/i586/openssl-sse2
rename to config/rootfiles/oldcore/153/filelists/i586/openssl-sse2
diff --git a/config/rootfiles/core/153/filelists/ids-ruleset-sources b/config/rootfiles/oldcore/153/filelists/ids-ruleset-sources
similarity index 100%
rename from config/rootfiles/core/153/filelists/ids-ruleset-sources
rename to config/rootfiles/oldcore/153/filelists/ids-ruleset-sources
diff --git a/config/rootfiles/core/153/filelists/knot b/config/rootfiles/oldcore/153/filelists/knot
similarity index 100%
rename from config/rootfiles/core/153/filelists/knot
rename to config/rootfiles/oldcore/153/filelists/knot
diff --git a/config/rootfiles/core/153/filelists/libarchive b/config/rootfiles/oldcore/153/filelists/libarchive
similarity index 100%
rename from config/rootfiles/core/153/filelists/libarchive
rename to config/rootfiles/oldcore/153/filelists/libarchive
diff --git a/config/rootfiles/core/153/filelists/libhtp b/config/rootfiles/oldcore/153/filelists/libhtp
similarity index 100%
rename from config/rootfiles/core/153/filelists/libhtp
rename to config/rootfiles/oldcore/153/filelists/libhtp
diff --git a/config/rootfiles/core/153/filelists/libloc b/config/rootfiles/oldcore/153/filelists/libloc
similarity index 100%
rename from config/rootfiles/core/153/filelists/libloc
rename to config/rootfiles/oldcore/153/filelists/libloc
diff --git a/config/rootfiles/core/153/filelists/logwatch b/config/rootfiles/oldcore/153/filelists/logwatch
similarity index 100%
rename from config/rootfiles/core/153/filelists/logwatch
rename to config/rootfiles/oldcore/153/filelists/logwatch
diff --git a/config/rootfiles/core/153/filelists/openssl b/config/rootfiles/oldcore/153/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/153/filelists/openssl
rename to config/rootfiles/oldcore/153/filelists/openssl
diff --git a/config/rootfiles/core/153/filelists/openvpn b/config/rootfiles/oldcore/153/filelists/openvpn
similarity index 100%
rename from config/rootfiles/core/153/filelists/openvpn
rename to config/rootfiles/oldcore/153/filelists/openvpn
diff --git a/config/rootfiles/core/153/filelists/strongswan b/config/rootfiles/oldcore/153/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/153/filelists/strongswan
rename to config/rootfiles/oldcore/153/filelists/strongswan
diff --git a/config/rootfiles/core/153/filelists/suricata b/config/rootfiles/oldcore/153/filelists/suricata
similarity index 100%
rename from config/rootfiles/core/153/filelists/suricata
rename to config/rootfiles/oldcore/153/filelists/suricata
diff --git a/config/rootfiles/core/153/filelists/tzdata b/config/rootfiles/oldcore/153/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/153/filelists/tzdata
rename to config/rootfiles/oldcore/153/filelists/tzdata
diff --git a/config/rootfiles/core/153/filelists/usb_modeswitch b/config/rootfiles/oldcore/153/filelists/usb_modeswitch
similarity index 100%
rename from config/rootfiles/core/153/filelists/usb_modeswitch
rename to config/rootfiles/oldcore/153/filelists/usb_modeswitch
diff --git a/config/rootfiles/core/153/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/153/filelists/usb_modeswitch_data
similarity index 100%
rename from config/rootfiles/core/153/filelists/usb_modeswitch_data
rename to config/rootfiles/oldcore/153/filelists/usb_modeswitch_data
diff --git a/config/rootfiles/core/153/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/153/filelists/x86_64/intel-microcode
similarity index 100%
rename from config/rootfiles/core/153/filelists/x86_64/intel-microcode
rename to config/rootfiles/oldcore/153/filelists/x86_64/intel-microcode
diff --git a/config/rootfiles/core/153/filelists/x86_64/linux b/config/rootfiles/oldcore/153/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/153/filelists/x86_64/linux
rename to config/rootfiles/oldcore/153/filelists/x86_64/linux
diff --git a/config/rootfiles/core/153/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/153/filelists/x86_64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/153/filelists/x86_64/linux-initrd
rename to config/rootfiles/oldcore/153/filelists/x86_64/linux-initrd
diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/oldcore/153/update.sh
similarity index 100%
rename from config/rootfiles/core/153/update.sh
rename to config/rootfiles/oldcore/153/update.sh
diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula
index bb766fb07..51869b47e 100644
--- a/config/rootfiles/packages/bacula
+++ b/config/rootfiles/packages/bacula
@@ -1,7 +1,7 @@
#etc/bacula
#etc/bacula/bacula
#etc/bacula/bacula-ctl-dir
-etc/bacula/bacula-ctl-fd
+#etc/bacula/bacula-ctl-fd
#etc/bacula/bacula-ctl-sd
etc/bacula/bacula-fd.conf
#etc/bacula/bacula-tray-monitor.desktop
diff --git a/config/rootfiles/packages/c-ares b/config/rootfiles/packages/c-ares
new file mode 100644
index 000000000..6027768f3
--- /dev/null
+++ b/config/rootfiles/packages/c-ares
@@ -0,0 +1,68 @@
+#usr/include/ares.h
+#usr/include/ares_build.h
+#usr/include/ares_dns.h
+#usr/include/ares_rules.h
+#usr/include/ares_version.h
+#usr/lib/libcares.la
+#usr/lib/libcares.so
+usr/lib/libcares.so.2
+usr/lib/libcares.so.2.4.2
+#usr/lib/pkgconfig/libcares.pc
+#usr/share/man/man3/ares_cancel.3
+#usr/share/man/man3/ares_create_query.3
+#usr/share/man/man3/ares_destroy.3
+#usr/share/man/man3/ares_destroy_options.3
+#usr/share/man/man3/ares_dup.3
+#usr/share/man/man3/ares_expand_name.3
+#usr/share/man/man3/ares_expand_string.3
+#usr/share/man/man3/ares_fds.3
+#usr/share/man/man3/ares_free_data.3
+#usr/share/man/man3/ares_free_hostent.3
+#usr/share/man/man3/ares_free_string.3
+#usr/share/man/man3/ares_freeaddrinfo.3
+#usr/share/man/man3/ares_get_servers.3
+#usr/share/man/man3/ares_get_servers_ports.3
+#usr/share/man/man3/ares_getaddrinfo.3
+#usr/share/man/man3/ares_gethostbyaddr.3
+#usr/share/man/man3/ares_gethostbyname.3
+#usr/share/man/man3/ares_gethostbyname_file.3
+#usr/share/man/man3/ares_getnameinfo.3
+#usr/share/man/man3/ares_getsock.3
+#usr/share/man/man3/ares_inet_ntop.3
+#usr/share/man/man3/ares_inet_pton.3
+#usr/share/man/man3/ares_init.3
+#usr/share/man/man3/ares_init_options.3
+#usr/share/man/man3/ares_library_cleanup.3
+#usr/share/man/man3/ares_library_init.3
+#usr/share/man/man3/ares_library_init_android.3
+#usr/share/man/man3/ares_library_initialized.3
+#usr/share/man/man3/ares_mkquery.3
+#usr/share/man/man3/ares_parse_a_reply.3
+#usr/share/man/man3/ares_parse_aaaa_reply.3
+#usr/share/man/man3/ares_parse_caa_reply.3
+#usr/share/man/man3/ares_parse_mx_reply.3
+#usr/share/man/man3/ares_parse_naptr_reply.3
+#usr/share/man/man3/ares_parse_ns_reply.3
+#usr/share/man/man3/ares_parse_ptr_reply.3
+#usr/share/man/man3/ares_parse_soa_reply.3
+#usr/share/man/man3/ares_parse_srv_reply.3
+#usr/share/man/man3/ares_parse_txt_reply.3
+#usr/share/man/man3/ares_process.3
+#usr/share/man/man3/ares_query.3
+#usr/share/man/man3/ares_save_options.3
+#usr/share/man/man3/ares_search.3
+#usr/share/man/man3/ares_send.3
+#usr/share/man/man3/ares_set_local_dev.3
+#usr/share/man/man3/ares_set_local_ip4.3
+#usr/share/man/man3/ares_set_local_ip6.3
+#usr/share/man/man3/ares_set_servers.3
+#usr/share/man/man3/ares_set_servers_csv.3
+#usr/share/man/man3/ares_set_servers_ports.3
+#usr/share/man/man3/ares_set_servers_ports_csv.3
+#usr/share/man/man3/ares_set_socket_callback.3
+#usr/share/man/man3/ares_set_socket_configure_callback.3
+#usr/share/man/man3/ares_set_socket_functions.3
+#usr/share/man/man3/ares_set_sortlist.3
+#usr/share/man/man3/ares_strerror.3
+#usr/share/man/man3/ares_timeout.3
+#usr/share/man/man3/ares_version.3
diff --git a/config/rootfiles/packages/krb5 b/config/rootfiles/packages/krb5
index 0db708f4e..9a68f1b87 100644
--- a/config/rootfiles/packages/krb5
+++ b/config/rootfiles/packages/krb5
@@ -16,6 +16,7 @@ usr/bin/kpasswd
#usr/include/gssapi
#usr/include/gssapi.h
#usr/include/gssapi/gssapi.h
+#usr/include/gssapi/gssapi_alloc.h
#usr/include/gssapi/gssapi_ext.h
#usr/include/gssapi/gssapi_generic.h
#usr/include/gssapi/gssapi_krb5.h
@@ -46,9 +47,12 @@ usr/bin/kpasswd
#usr/include/krb5
#usr/include/krb5.h
#usr/include/krb5/ccselect_plugin.h
+#usr/include/krb5/certauth_plugin.h
#usr/include/krb5/clpreauth_plugin.h
#usr/include/krb5/hostrealm_plugin.h
+#usr/include/krb5/kadm5_auth_plugin.h
#usr/include/krb5/kadm5_hook_plugin.h
+#usr/include/krb5/kdcpolicy_plugin.h
#usr/include/krb5/kdcpreauth_plugin.h
#usr/include/krb5/krb5.h
#usr/include/krb5/localauth_plugin.h
@@ -59,17 +63,18 @@ usr/bin/kpasswd
#usr/include/profile.h
#usr/include/verto-module.h
#usr/include/verto.h
-usr/lib/krb5
-usr/lib/krb5/plugins
+#usr/lib/krb5
+#usr/lib/krb5/plugins
usr/lib/krb5/plugins/authdata
usr/lib/krb5/plugins/kdb
usr/lib/krb5/plugins/kdb/db2.so
usr/lib/krb5/plugins/libkrb5
-usr/lib/krb5/plugins/preauth
+#usr/lib/krb5/plugins/preauth
usr/lib/krb5/plugins/preauth/otp.so
usr/lib/krb5/plugins/preauth/pkinit.so
+usr/lib/krb5/plugins/preauth/spake.so
usr/lib/krb5/plugins/preauth/test.so
-usr/lib/krb5/plugins/tls
+#usr/lib/krb5/plugins/tls
usr/lib/krb5/plugins/tls/k5tls.so
#usr/lib/libgssapi_krb5.so
usr/lib/libgssapi_krb5.so.2
@@ -82,15 +87,15 @@ usr/lib/libk5crypto.so.3
usr/lib/libk5crypto.so.3.1
#usr/lib/libkadm5clnt.so
#usr/lib/libkadm5clnt_mit.so
-usr/lib/libkadm5clnt_mit.so.11
-usr/lib/libkadm5clnt_mit.so.11.0
+usr/lib/libkadm5clnt_mit.so.12
+usr/lib/libkadm5clnt_mit.so.12.0
#usr/lib/libkadm5srv.so
#usr/lib/libkadm5srv_mit.so
-usr/lib/libkadm5srv_mit.so.11
-usr/lib/libkadm5srv_mit.so.11.0
+usr/lib/libkadm5srv_mit.so.12
+usr/lib/libkadm5srv_mit.so.12.0
#usr/lib/libkdb5.so
-usr/lib/libkdb5.so.8
-usr/lib/libkdb5.so.8.0
+usr/lib/libkdb5.so.10
+usr/lib/libkdb5.so.10.0
#usr/lib/libkrad.so
usr/lib/libkrad.so.0
usr/lib/libkrad.so.0.0
@@ -128,11 +133,13 @@ usr/lib/libverto.so.0.0
#usr/share/examples/krb5/kdc.conf
#usr/share/examples/krb5/krb5.conf
#usr/share/examples/krb5/services.append
+#usr/share/locale/de/LC_MESSAGES/mit-krb5.mo
#usr/share/locale/en_US
#usr/share/locale/en_US/LC_MESSAGES
#usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo
#usr/share/man/cat1
#usr/share/man/cat5
+#usr/share/man/cat7
#usr/share/man/cat8
#usr/share/man/man1/k5srvutil.1
#usr/share/man/man1/kadmin.1
@@ -153,6 +160,7 @@ usr/lib/libverto.so.0.0
#usr/share/man/man5/kadm5.acl.5
#usr/share/man/man5/kdc.conf.5
#usr/share/man/man5/krb5.conf.5
+#usr/share/man/man7/kerberos.7
#usr/share/man/man8/kadmin.local.8
#usr/share/man/man8/kadmind.8
#usr/share/man/man8/kdb5_ldap_util.8
@@ -163,5 +171,3 @@ usr/lib/libverto.so.0.0
#usr/share/man/man8/krb5kdc.8
#usr/share/man/man8/sserver.8
var/lib/krb5kdc
-var/lib/run
-var/lib/run/krb5kdc
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index c5081989c..48db7c329 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -29,6 +29,7 @@ usr/bin/tshark
#usr/include/wireshark/epan/capture_dissectors.h
#usr/include/wireshark/epan/charsets.h
#usr/include/wireshark/epan/chdlctypes.h
+#usr/include/wireshark/epan/cisco_pid.h
#usr/include/wireshark/epan/color_filters.h
#usr/include/wireshark/epan/column-info.h
#usr/include/wireshark/epan/column-utils.h
@@ -53,6 +54,7 @@ usr/bin/tshark
#usr/include/wireshark/epan/dissectors/file-rbm.h
#usr/include/wireshark/epan/dissectors/packet-6lowpan.h
#usr/include/wireshark/epan/dissectors/packet-a21.h
+#usr/include/wireshark/epan/dissectors/packet-acdr.h
#usr/include/wireshark/epan/dissectors/packet-acp133.h
#usr/include/wireshark/epan/dissectors/packet-acse.h
#usr/include/wireshark/epan/dissectors/packet-actrace.h
@@ -82,6 +84,7 @@ usr/bin/tshark
#usr/include/wireshark/epan/dissectors/packet-bthci_acl.h
#usr/include/wireshark/epan/dissectors/packet-bthci_cmd.h
#usr/include/wireshark/epan/dissectors/packet-bthci_evt.h
+#usr/include/wireshark/epan/dissectors/packet-bthci_iso.h
#usr/include/wireshark/epan/dissectors/packet-bthci_sco.h
#usr/include/wireshark/epan/dissectors/packet-btl2cap.h
#usr/include/wireshark/epan/dissectors/packet-btle.h
@@ -146,6 +149,7 @@ usr/bin/tshark
#usr/include/wireshark/epan/dissectors/packet-erf.h
#usr/include/wireshark/epan/dissectors/packet-ess.h
#usr/include/wireshark/epan/dissectors/packet-eth.h
+#usr/include/wireshark/epan/dissectors/packet-f1ap.h
#usr/include/wireshark/epan/dissectors/packet-f5ethtrailer.h
#usr/include/wireshark/epan/dissectors/packet-fc.h
#usr/include/wireshark/epan/dissectors/packet-fcbls.h
@@ -161,6 +165,7 @@ usr/bin/tshark
#usr/include/wireshark/epan/dissectors/packet-fmp.h
#usr/include/wireshark/epan/dissectors/packet-frame.h
#usr/include/wireshark/epan/dissectors/packet-ftam.h
+#usr/include/wireshark/epan/dissectors/packet-ftdi-ft.h
#usr/include/wireshark/epan/dissectors/packet-geonw.h
#usr/include/wireshark/epan/dissectors/packet-giop.h
#usr/include/wireshark/epan/dissectors/packet-gluster.h
@@ -238,6 +243,7 @@ usr/bin/tshark
#usr/include/wireshark/epan/dissectors/packet-lnet.h
#usr/include/wireshark/epan/dissectors/packet-logotypecertextn.h
#usr/include/wireshark/epan/dissectors/packet-lpp.h
+#usr/include/wireshark/epan/dissectors/packet-lppa.h
#usr/include/wireshark/epan/dissectors/packet-lte-rrc.h
#usr/include/wireshark/epan/dissectors/packet-mac-lte.h
#usr/include/wireshark/epan/dissectors/packet-mausb.h
@@ -417,6 +423,7 @@ usr/bin/tshark
#usr/include/wireshark/epan/dissectors/packet-xmpp-other.h
#usr/include/wireshark/epan/dissectors/packet-xmpp-utils.h
#usr/include/wireshark/epan/dissectors/packet-xmpp.h
+#usr/include/wireshark/epan/dissectors/packet-xnap.h
#usr/include/wireshark/epan/dissectors/packet-ypbind.h
#usr/include/wireshark/epan/dissectors/packet-yppasswd.h
#usr/include/wireshark/epan/dissectors/packet-ypserv.h
@@ -572,6 +579,7 @@ usr/bin/tshark
#usr/include/wireshark/wsutil/crc8.h
#usr/include/wireshark/wsutil/curve25519.h
#usr/include/wireshark/wsutil/eax.h
+#usr/include/wireshark/wsutil/epochs.h
#usr/include/wireshark/wsutil/filesystem.h
#usr/include/wireshark/wsutil/frequency-utils.h
#usr/include/wireshark/wsutil/g711.h
@@ -611,14 +619,14 @@ usr/bin/tshark
#usr/include/wireshark/wsutil/wsjson.h
#usr/include/wireshark/wsutil/xtea.h
#usr/lib/libwireshark.so
-usr/lib/libwireshark.so.13
-usr/lib/libwireshark.so.13.0.6
+usr/lib/libwireshark.so.14
+usr/lib/libwireshark.so.14.0.0
#usr/lib/libwiretap.so
-usr/lib/libwiretap.so.10
-usr/lib/libwiretap.so.10.0.6
+usr/lib/libwiretap.so.11
+usr/lib/libwiretap.so.11.0.0
#usr/lib/libwsutil.so
-usr/lib/libwsutil.so.11
-usr/lib/libwsutil.so.11.0.0
+usr/lib/libwsutil.so.12
+usr/lib/libwsutil.so.12.0.0
#usr/lib/pkgconfig/wireshark.pc
#usr/lib/wireshark
#usr/lib/wireshark/cmake
@@ -640,27 +648,28 @@ usr/lib/wireshark/extcap/randpktdump
usr/lib/wireshark/extcap/sshdump
usr/lib/wireshark/extcap/udpdump
#usr/lib/wireshark/plugins
-#usr/lib/wireshark/plugins/3.2
-#usr/lib/wireshark/plugins/3.2/codecs
-usr/lib/wireshark/plugins/3.2/codecs/g711.so
-usr/lib/wireshark/plugins/3.2/codecs/g722.so
-usr/lib/wireshark/plugins/3.2/codecs/g726.so
-usr/lib/wireshark/plugins/3.2/codecs/l16mono.so
-#usr/lib/wireshark/plugins/3.2/epan
-usr/lib/wireshark/plugins/3.2/epan/ethercat.so
-usr/lib/wireshark/plugins/3.2/epan/gryphon.so
-usr/lib/wireshark/plugins/3.2/epan/irda.so
-usr/lib/wireshark/plugins/3.2/epan/mate.so
-usr/lib/wireshark/plugins/3.2/epan/opcua.so
-usr/lib/wireshark/plugins/3.2/epan/profinet.so
-usr/lib/wireshark/plugins/3.2/epan/stats_tree.so
-usr/lib/wireshark/plugins/3.2/epan/transum.so
-usr/lib/wireshark/plugins/3.2/epan/unistim.so
-usr/lib/wireshark/plugins/3.2/epan/wimax.so
-usr/lib/wireshark/plugins/3.2/epan/wimaxasncp.so
-usr/lib/wireshark/plugins/3.2/epan/wimaxmacphy.so
-#usr/lib/wireshark/plugins/3.2/wiretap
-usr/lib/wireshark/plugins/3.2/wiretap/usbdump.so
+#usr/lib/wireshark/plugins/3.4
+#usr/lib/wireshark/plugins/3.4/codecs
+usr/lib/wireshark/plugins/3.4/codecs/g711.so
+usr/lib/wireshark/plugins/3.4/codecs/g722.so
+usr/lib/wireshark/plugins/3.4/codecs/g726.so
+usr/lib/wireshark/plugins/3.4/codecs/l16mono.so
+usr/lib/wireshark/plugins/3.4/codecs/opus_dec.so
+#usr/lib/wireshark/plugins/3.4/epan
+usr/lib/wireshark/plugins/3.4/epan/ethercat.so
+usr/lib/wireshark/plugins/3.4/epan/gryphon.so
+usr/lib/wireshark/plugins/3.4/epan/irda.so
+usr/lib/wireshark/plugins/3.4/epan/mate.so
+usr/lib/wireshark/plugins/3.4/epan/opcua.so
+usr/lib/wireshark/plugins/3.4/epan/profinet.so
+usr/lib/wireshark/plugins/3.4/epan/stats_tree.so
+usr/lib/wireshark/plugins/3.4/epan/transum.so
+usr/lib/wireshark/plugins/3.4/epan/unistim.so
+usr/lib/wireshark/plugins/3.4/epan/wimax.so
+usr/lib/wireshark/plugins/3.4/epan/wimaxasncp.so
+usr/lib/wireshark/plugins/3.4/epan/wimaxmacphy.so
+#usr/lib/wireshark/plugins/3.4/wiretap
+usr/lib/wireshark/plugins/3.4/wiretap/usbdump.so
#usr/share/doc/wireshark
#usr/share/doc/wireshark/androiddump.html
#usr/share/doc/wireshark/capinfos.html
@@ -711,7 +720,7 @@ usr/lib/wireshark/plugins/3.2/wiretap/usbdump.so
usr/share/wireshark/cfilters
#usr/share/wireshark/ciscodump.html
usr/share/wireshark/colorfilters
-usr/share/wireshark/dfilter_macros
+#usr/share/wireshark/dfilter_macros
usr/share/wireshark/dfilters
#usr/share/wireshark/dftest.html
#usr/share/wireshark/diameter
@@ -724,6 +733,7 @@ usr/share/wireshark/diameter/HP.xml
usr/share/wireshark/diameter/Huawei.xml
usr/share/wireshark/diameter/Inovar.xml
usr/share/wireshark/diameter/Juniper.xml
+usr/share/wireshark/diameter/Metaswitch.xml
usr/share/wireshark/diameter/Microsoft.xml
usr/share/wireshark/diameter/Nokia.xml
usr/share/wireshark/diameter/NokiaSolutionsAndNetworks.xml
@@ -839,6 +849,7 @@ usr/share/wireshark/radius/dictionary.dlink
usr/share/wireshark/radius/dictionary.dragonwave
usr/share/wireshark/radius/dictionary.efficientip
usr/share/wireshark/radius/dictionary.eltex
+usr/share/wireshark/radius/dictionary.enterasys
usr/share/wireshark/radius/dictionary.epygi
usr/share/wireshark/radius/dictionary.equallogic
usr/share/wireshark/radius/dictionary.ericsson
@@ -860,6 +871,7 @@ usr/share/wireshark/radius/dictionary.h3c
usr/share/wireshark/radius/dictionary.hp
usr/share/wireshark/radius/dictionary.huawei
usr/share/wireshark/radius/dictionary.iana
+usr/share/wireshark/radius/dictionary.identity_engines
usr/share/wireshark/radius/dictionary.iea
usr/share/wireshark/radius/dictionary.infoblox
usr/share/wireshark/radius/dictionary.infonet
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 26ab4f314..36954ba70 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -161,19 +161,20 @@ END
my $lines=0; # Used to count the outputlines to make different bgcolor
# Generate list of installed addon pak's
- my @pak = `find /opt/pakfire/db/installed/meta-* 2>/dev/null | cut -d"-" -f2`;
+ opendir (DIR, "/opt/pakfire/db/installed") || die "Cannot opendir /opt/pakfire/db/installed/: $!";
+ my @pak = sort readdir DIR;
foreach (@pak){
chomp($_);
+ next unless (m/^meta-/);
+ s/^meta-//;
# Check which of the paks are services
- my @svc = `find /etc/init.d/$_ 2>/dev/null | cut -d"/" -f4`;
- foreach (@svc){
+ if (-e "/etc/init.d/$_") {
# blacklist some packages
#
# alsa has trouble with the volume saving and was not really stopped
# mdadm should not stopped with webif because this could crash the system
#
- chomp($_);
if ( $_ eq 'squid' ) {
next;
}
diff --git a/lfs/bacula b/lfs/bacula
index 1921db11a..5268b46d6 100644
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = bacula
-PAK_VER = 7
+PAK_VER = 8
DEPS =
@@ -89,10 +89,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-client-only
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,bacula)
+
install -v -m 644 ${DIR_SRC}/config/backup/includes/bacula \
/var/ipfire/backup/addons/includes/bacula
- rm -f /root/.rnd
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/bind b/lfs/bind
index 053b8d8b7..7fa56f72e 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
include Config
-VER = 9.11.21
+VER = 9.11.25
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0967d4dd4e21e8f8d9202c5e148c27ca
+$(DL_FILE)_MD5 = c95cbe19481e1ed5e4257f32d1a9dcb2
install : $(TARGET)
diff --git a/lfs/c-ares b/lfs/c-ares
new file mode 100644
index 000000000..1f07623ac
--- /dev/null
+++ b/lfs/c-ares
@@ -0,0 +1,89 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2020 IPFire Team <info(a)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.17.1
+
+THISAPP = c-ares-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = c-ares
+PAK_VER = 1
+
+DEPS =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 28f65c8ee6c097986bd902fd4f0804e2
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --enable-static=no
+
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
+
diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 3bd33dc56..cf86c2b65 100644
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -24,7 +24,7 @@
include Config
-VER = 9.1.4
+VER = 9.3.4
THISAPP = dhcpcd-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dd77711cf3232002bb075f5210269f88
+$(DL_FILE)_MD5 = badb02dfc69fe9bbeec35a02efcdb4db
install : $(TARGET)
diff --git a/lfs/krb5 b/lfs/krb5
index 4ab342c01..766dc8d05 100644
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.15.2
+VER = 1.18.3
THISAPP = krb5-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)/src
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = krb5
-PAK_VER = 3
+PAK_VER = 4
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b160f72161c730897dc7689f876b6e2a
+$(DL_FILE)_MD5 = a64e8018a7572e0b4bd477c745129ffc
install : $(TARGET)
@@ -78,10 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && sed -e "s(a)python2.5/Python.h@& python2.7/Python.h(a)g" \
- -e "s(a)-lpython2.5]@&,\n AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \
- -i configure.in
- cd $(DIR_APP) && autoconf
+ cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_prevent_spurious_text.patch
+ cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_remove_known_failed_test.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr \
diff --git a/lfs/monit b/lfs/monit
index 99750370a..caaa022e2 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)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 = 5.25.3
+VER = 5.27.1
THISAPP = monit-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = monit
-PAK_VER = 11
+PAK_VER = 12
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8d91f6e756cca42450ab0815b3086d5b
+$(DL_FILE)_MD5 = 200068f37847e3402f6a9b061c2d327e
install : $(TARGET)
@@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist:
+dist:
@$(PAK)
###############################################################################
diff --git a/lfs/nano b/lfs/nano
index 36a1e25d9..826bd82b3 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
include Config
-VER = 5.3
+VER = 5.4
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nano
-PAK_VER = 33
+PAK_VER = 34
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0ff50c2d3068c6ce9e77b1f6a485eb19
+$(DL_FILE)_MD5 = 703d9b5317486c6f49918e27c435fbc9
install : $(TARGET)
diff --git a/lfs/pam b/lfs/pam
index d5ce5ef69..daae2def3 100644
--- a/lfs/pam
+++ b/lfs/pam
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.3.1
+VER = 1.5.1
THISAPP = Linux-PAM-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 558ff53b0fc0563ca97f79e911822165
+$(DL_FILE)_MD5 = 155f2a31d07077b2c63a1f135876c31b
install : $(TARGET)
diff --git a/lfs/shairport-sync b/lfs/shairport-sync
index e3bf9935d..6ec986bbe 100644
--- a/lfs/shairport-sync
+++ b/lfs/shairport-sync
@@ -24,7 +24,7 @@
include Config
-VER = 3.3.6
+VER = 3.3.7
THISAPP = shairport-sync-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = shairport-sync
-PAK_VER = 4
+PAK_VER = 5
DEPS = alac alsa avahi libdaemon soxr
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 769c6d0cc660567e5521467d79ee9939
+$(DL_FILE)_MD5 = 5f4206ac28e323fda3c150575eb64e15
install : $(TARGET)
diff --git a/lfs/tshark b/lfs/tshark
index 7b124ef5b..29c84c4c2 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -24,7 +24,7 @@
include Config
-VER = 3.2.6
+VER = 3.4.0
THISAPP = wireshark-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,8 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tshark
-DEPS = krb5
-PAK_VER = 7
+DEPS = krb5 c-ares
+PAK_VER = 8
###############################################################################
# Top-level Rules
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f14ef8d73fa5f30b57fec51283e6b73e
+$(DL_FILE)_MD5 = 5c656cd9d6b01dd2ad93ed665ca532e6
install : $(TARGET)
diff --git a/lfs/unbound b/lfs/unbound
index 5ffadff9b..69cb91d73 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -24,7 +24,7 @@
include Config
-VER = 1.12.0
+VER = 1.13.0
THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = eb03869cea5dd2b65e21ca068e78d6b0
+$(DL_FILE)_MD5 = 5a522f10c65332efe627098d2d24f947
install : $(TARGET)
diff --git a/make.sh b/make.sh
index b17aca457..f9b2ee6ba 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
# If you update the version don't forget to update backupiso and add it to core update
VERSION="2.25" # Version number
-CORE="153" # Core Level (Filename)
+CORE="154" # Core Level (Filename)
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10 # Nice level
@@ -1233,6 +1233,7 @@ buildipfire() {
lfsmake2 linux-atm
lfsmake2 gdbm
lfsmake2 pam
+ lfsmake2 c-ares
lfsmake2 curl
lfsmake2 tcl
lfsmake2 sqlite
diff --git a/src/initscripts/packages/bacula b/src/initscripts/packages/bacula
new file mode 100644
index 000000000..2b925ad4f
--- /dev/null
+++ b/src/initscripts/packages/bacula
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Begin $rc_base/init.d/bacula
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+
+. /etc/sysconfig/rc
+. $rc_functions
+
+case "$1" in
+ start)
+ boot_mesg "Starting bacula-fd daemon..."
+ loadproc /usr/sbin/bacula-fd
+ ;;
+ stop)
+ boot_mesg "Stopping bacula-fd daemon..."
+ killproc /usr/sbin/bacula-fd
+ ;;
+ status)
+ statusproc /usr/sbin/bacula-fd
+ ;;
+ *)
+ echo "Usage: $0 (start|stop|status)"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/bacula
+
diff --git a/src/patches/krb5-1.18.3_prevent_spurious_text.patch b/src/patches/krb5-1.18.3_prevent_spurious_text.patch
new file mode 100644
index 000000000..0e3015379
--- /dev/null
+++ b/src/patches/krb5-1.18.3_prevent_spurious_text.patch
@@ -0,0 +1,18 @@
+Submitted By: linuxfromscratch DOT org
+Date: 2020-11-19
+Initial Package Version: 1.18.3
+Origin: http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mitkrb.html
+Description: Patch increases the width of the virtual terminal used for some tests to prevent some spurious text in the output which is taken as a failure.
+
+diff --color -Nur krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp krb5-1.18.3/src/tests/dejagnu/config/default.exp
+--- krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp 2020-12-07 04:51:12.997708618 +0100
++++ krb5-1.18.3/src/tests/dejagnu/config/default.exp 2020-12-07 04:56:29.805839425 +0100
+@@ -12,7 +12,7 @@
+ # realm name, defaulting to KRBTEST.COM.
+
+ set timeout 100
+-set stty_init {erase \^h kill \^u}
++set stty_init {erase \^h kill \^u cols 300}
+ set env(TERM) dumb
+
+ set des3_krbtgt 0
diff --git a/src/patches/krb5-1.18.3_remove_known_failed_test.patch b/src/patches/krb5-1.18.3_remove_known_failed_test.patch
new file mode 100644
index 000000000..b148d4248
--- /dev/null
+++ b/src/patches/krb5-1.18.3_remove_known_failed_test.patch
@@ -0,0 +1,18 @@
+Submitted By: linuxfromscratch DOT org
+Date: 2020-11-19
+Initial Package Version: 1.18.3
+Origin: http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mitkrb.html
+Description: Patch removes a test that is known to fail.
+
+diff --color -Nur krb5-1.18.3.orig/src/plugins/kdb/db2/libdb2/test/run.test krb5-1.18.3/src/plugins/kdb/db2/libdb2/test/run.test
+--- krb5-1.18.3.orig/src/plugins/kdb/db2/libdb2/test/run.test 2020-12-07 04:58:27.210999666 +0100
++++ krb5-1.18.3/src/plugins/kdb/db2/libdb2/test/run.test 2020-12-07 04:58:48.579210832 +0100
+@@ -38,7 +38,7 @@
+ find $bindir -type f -exec test -r {} \; -print | head -100 > $BINFILES
+
+ if [ $# -eq 0 ]; then
+- for t in 1 2 3 4 5 6 7 8 9 10 11 12 13 20 40 41 50 60 61 62 63; do
++ for t in 1 2 3 4 5 6 7 8 9 10 11 13 20 40 41 50 60 61 62 63; do
+ test$t
+ done
+ else
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-10 13:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-10 13:18 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a410004c610f8b21f9372056523a419085dbb3b7 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox