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 ca1787b29ba370c2da9cdfb29e6f148fdb5edba1 (commit) via 3e5190f5c7fc828937fdefa0a65d97243b55c2ed (commit) via 77321ff12fc918f39ce6a4eeb37a97e25896b65f (commit) via e420c103dede60f9c8121386b55e83314d176634 (commit) via 233baacd6753d8adb756219d5fac536d9b6f92ae (commit) via c965daf6da233875d6cdf06fd8935f18102c7478 (commit) via 5f1abe00433812a75e58583ed254a452fe30a609 (commit) via 609007e54b85fafd14b35c3adfd9acb8a36b9b4d (commit) via 4ddb1fdac09c20d132935f668b395b918e9846a4 (commit) via 89e47eaca85d0d582195731b4506b6c4be1dfe75 (commit) via 7fc5e932944d61af0ccacf87bb562f0a94bb3f26 (commit) via 367a62f5151c1a8569c32d2d40a536d889dd55f6 (commit) via 024579de58e4410ce1d2eba61814f2ede59f53a5 (commit) via 0d0bfd0e5c68a6d0ebef31f37fbd601a90e71250 (commit) via f6121180b8a219e11a21d586df0ad175f1440b63 (commit) via 4929efb7d8a0b90040be24754b13f748a15f8a85 (commit) via 0f421901dde788a2bbb8af1fcf185477408a812b (commit) from ee2e7db90bf12ab1c028f5f3b955afaf9cdf76f5 (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 ca1787b29ba370c2da9cdfb29e6f148fdb5edba1 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 12:39:47 2022 +0000

libloc: Update rootfile

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 3e5190f5c7fc828937fdefa0a65d97243b55c2ed Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Oct 8 19:55:47 2022 +0200

samba: Update to 4.17.0

For details see: https://www.samba.org/samba/latest_news.html#4.17.0

This "just came my way" and I found the CVEs listed on https://www.samba.org/samba/history/security.html which address "All versions of Samba prior to 4.16.4" or "All versions of Samba" rather long.

The 'glibc_headers' patch is now included.

Sad to say, due to the lack of hardware I can only include the rootfile for x86_64.

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org

commit 77321ff12fc918f39ce6a4eeb37a97e25896b65f Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 09:07:18 2022 +0000

Core Update 172: Ship changes related to OpenVPN CRL handling

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit e420c103dede60f9c8121386b55e83314d176634 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 7 14:50:17 2022 +0000

openvpnctrl: Update CRL before starting the client daemon

If the CRL is outdated for some reason (e.g. a backup restored from ISO where we don't run the migration scripts), this will update it on reboot/restart of the service.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 233baacd6753d8adb756219d5fac536d9b6f92ae Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 7 14:50:16 2022 +0000

backup: Update OpenVPN CRL

After a backup is restored, the CRL might be out of data and client won't be able to connect to the server any more.

This will immediately update the CRL should it require an update.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit c965daf6da233875d6cdf06fd8935f18102c7478 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 09:05:23 2022 +0000

Core Update 172: Delete orphaned strongSwan files

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 5f1abe00433812a75e58583ed254a452fe30a609 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 09:04:29 2022 +0000

Core Update 172: Ship and restart Unbound

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 609007e54b85fafd14b35c3adfd9acb8a36b9b4d Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Oct 14 21:09:35 2022 +0200

unbound: Update to 1.17.0

For details see: https://nlnetlabs.nl/projects/unbound/download/#unbound-1-17-0

"Features

Merge #753: ACL per interface. (New interface-* configuration options).

Merge #760: PROXYv2 downstream support. (New proxy-protocol-port configuration option).

Bug Fixes

Fix #728: alloc_reg_obtain() core dump. Stop double alloc_reg_release when serviced_create fails. Fix edns subnet so that scope 0 answers only match sourcemask 0 queries for answers from cache if from a query with sourcemask 0. Fix unittest for edns subnet change. Merge #730 from luisdallos: Fix startup failure on Windows 8.1 due to unsupported IPV6_USER_MTU socket option being set. Fix ratelimit inconsistency, for ip-ratelimits the value is the amount allowed, like for ratelimits. Fix #734 [FR] enable unbound-checkconf to detect more (basic) errors. Fix to log accept error ENFILE and EMFILE errno, but slowly, once per 10 seconds. Also log accept failures when no slow down is used. Fix to avoid process wide fcntl calls mixed with nonblocking operations after a blocked write. Patch from Vadim Fedorenko that adds MSG_DONTWAIT to receive operations, so that instruction reordering does not cause mistakenly blocking socket operations. Fix to wait for blocked write on UDP sockets, with a timeout if it takes too long the packet is dropped. Fix for wait for udp send to stop when packet is successfully sent. Fix #741: systemd socket activation fails on IPv6. Fix to update config tests to fix checking if nonblocking sockets work on OpenBSD. Slow down log frequency of write wait failures. Fix to set out of file descriptor warning to operational verbosity. Fix to log a verbose message at operational notice level if a thread is not responding, to stats requests. It is logged with thread identifiers. Remove include that was there for debug purposes. Fix to check pthread_t size after pthread has been detected. Convert tdir tests to use the new skip_test functionality. Remove unused testcode/mini_tpkg.sh file. Better output for skipped tdir tests. Fix doxygen warning in respip.h. Fix to remove erroneous TC flag from TCP upstream. Fix test tdir skip report printout. Fix windows compile, the identifier interface is defined in headers. Fix to close errno block in comm_point_tcp_handle_read outside of ifdef. Fix static analysis report to remove dead code from the rpz_callback_from_iterator_module function. Fix to clean up after the acl_interface unit test. Merge #764: Leniency for target discovery when under load (for NRDelegation changes). Use DEBUG_TDIR from environment in mini_tdir.sh for debugging. Fix string comparison in mini_tdir.sh. Make ede.tdir test more predictable by using static data. Fix checkconf test for dnscrypt and proxy port. Fix dnscrypt compile for proxy protocol code changes. Fix to stop responses with TC flag from resulting in partial responses. It retries to fetch the data elsewhere, or fails the query and in depth fix removes the TC flag from the cached item. Fix proxy length debug output printout typecasts. Fix to stop possible loops in the tcp reuse code (write_wait list and tcp_wait list). Based on analysis and patch from Prad Seniappan and Karthik Umashankar. Fix PROXYv2 header read for TCP connections when no proxied addresses are provided."

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 4ddb1fdac09c20d132935f668b395b918e9846a4 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 09:03:08 2022 +0000

Core Update 172: Ship and restart OpenSSH

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 89e47eaca85d0d582195731b4506b6c4be1dfe75 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Oct 15 15:47:51 2022 +0000

OpenSSH: Update to 9.1p1

Please refer to https://www.openssh.com/releasenotes.html#9.1 for the release announcement of this version.

Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 7fc5e932944d61af0ccacf87bb562f0a94bb3f26 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 08:59:09 2022 +0000

Core Update 172: Ship tzdata

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 367a62f5151c1a8569c32d2d40a536d889dd55f6 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Oct 15 15:51:05 2022 +0000

tzdata: Update to 2022e

Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 024579de58e4410ce1d2eba61814f2ede59f53a5 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 08:58:51 2022 +0000

Core Update 172: Ship libloc

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 0d0bfd0e5c68a6d0ebef31f37fbd601a90e71250 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Oct 15 15:53:07 2022 +0000

libloc: Update to 0.9.15

Please refer to https://lists.ipfire.org/pipermail/location/2022-September/000579.html for the release announcement of this version.

Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit f6121180b8a219e11a21d586df0ad175f1440b63 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 08:57:00 2022 +0000

Core Update 172: Ship and restart strongSwan

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 4929efb7d8a0b90040be24754b13f748a15f8a85 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Oct 15 16:01:26 2022 +0000

strongSwan: Update to 5.9.8

Please refer to https://github.com/strongswan/strongswan/releases/tag/5.9.8 for the release announcement of this version.

Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 0f421901dde788a2bbb8af1fcf185477408a812b Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 24 08:55:12 2022 +0000

Start Core Update 172

Signed-off-by: Peter Müller peter.mueller@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/backup/backup.pl | 3 ++ config/rootfiles/common/libloc | 2 + config/rootfiles/common/strongswan | 8 +-- config/rootfiles/common/tzdata | 3 ++ config/rootfiles/common/unbound | 2 +- config/rootfiles/core/{171 => 172}/core-files | 0 config/rootfiles/core/{171 => 172}/exclude | 0 .../core/{171 => 172}/filelists/core-files | 0 config/rootfiles/core/172/filelists/files | 2 + .../rootfiles/core/{171 => 172}/filelists/libloc | 0 .../{oldcore/100 => core/172}/filelists/openssh | 0 .../core/{171 => 172}/filelists/strongswan | 0 .../{oldcore/100 => core/172}/filelists/tzdata | 0 .../rootfiles/core/{171 => 172}/filelists/unbound | 0 .../rootfiles/{oldcore/151 => core/172}/update.sh | 28 +++++----- config/rootfiles/{core => oldcore}/171/core-files | 0 config/rootfiles/{core => oldcore}/171/exclude | 0 .../171/filelists/aarch64/binutils | 0 .../{core => oldcore}/171/filelists/aarch64/efivar | 0 .../{core => oldcore}/171/filelists/aarch64/gcc | 0 .../{core => oldcore}/171/filelists/aarch64/glibc | 0 .../{core => oldcore}/171/filelists/aarch64/linux | 0 .../{core => oldcore}/171/filelists/aarch64/u-boot | 0 .../171/filelists/aarch64/util-linux | 0 .../171/filelists/armv6l/binutils | 0 .../{core => oldcore}/171/filelists/armv6l/gcc | 0 .../{core => oldcore}/171/filelists/armv6l/glibc | 0 .../{core => oldcore}/171/filelists/armv6l/linux | 0 .../{core => oldcore}/171/filelists/armv6l/u-boot | 0 .../171/filelists/armv6l/util-linux | 0 .../rootfiles/{core => oldcore}/171/filelists/bind | 0 .../171/filelists/ca-certificates | 0 .../{core => oldcore}/171/filelists/collectd | 0 .../{core => oldcore}/171/filelists/core-files | 0 .../rootfiles/{core => oldcore}/171/filelists/curl | 0 .../rootfiles/{core => oldcore}/171/filelists/dhcp | 0 .../{core => oldcore}/171/filelists/expat | 0 .../{core => oldcore}/171/filelists/files | 0 .../{core => oldcore}/171/filelists/hdparm | 0 .../{core => oldcore}/171/filelists/iproute2 | 0 .../rootfiles/{core => oldcore}/171/filelists/kbd | 0 .../{core => oldcore}/171/filelists/libarchive | 0 .../{core => oldcore}/171/filelists/libhtp | 0 .../{core => oldcore}/171/filelists/libloc | 0 .../{core => oldcore}/171/filelists/liboping | 0 .../{core => oldcore}/171/filelists/libsodium | 0 .../{core => oldcore}/171/filelists/nettle | 0 .../{core => oldcore}/171/filelists/openvpn | 0 .../rootfiles/{core => oldcore}/171/filelists/perl | 0 .../171/filelists/perl-Apache-Htpasswd | 0 .../171/filelists/perl-Archive-Tar | 0 .../171/filelists/perl-Archive-Zip | 0 .../171/filelists/perl-BerkeleyDB | 0 .../{core => oldcore}/171/filelists/perl-CGI | 0 .../171/filelists/perl-Canary-Stability | 0 .../171/filelists/perl-Compress-Zlib | 0 .../171/filelists/perl-Convert-TNEF | 0 .../171/filelists/perl-Convert-UUlib | 0 .../171/filelists/perl-Crypt-PasswdMD5 | 0 .../171/filelists/perl-DBD-SQLite | 0 .../{core => oldcore}/171/filelists/perl-DBI | 0 .../{core => oldcore}/171/filelists/perl-Data-UUID | 0 .../171/filelists/perl-Device-Modem | 0 .../171/filelists/perl-Device-SerialPort | 0 .../{core => oldcore}/171/filelists/perl-Digest | 0 .../171/filelists/perl-Digest-HMAC | 0 .../171/filelists/perl-Digest-SHA1 | 0 .../171/filelists/perl-Email-Date-Format | 0 .../171/filelists/perl-File-Remove | 0 .../{core => oldcore}/171/filelists/perl-Font-TTF | 0 .../{core => oldcore}/171/filelists/perl-GD | 0 .../{core => oldcore}/171/filelists/perl-GD-Graph | 0 .../171/filelists/perl-GD-TextUtil | 0 .../171/filelists/perl-HTML-Parser | 0 .../171/filelists/perl-HTML-Tagset | 0 .../171/filelists/perl-HTML-Template | 0 .../{core => oldcore}/171/filelists/perl-HTTP-Date | 0 .../171/filelists/perl-HTTP-Message | 0 .../171/filelists/perl-IO-Socket-SSL | 0 .../{core => oldcore}/171/filelists/perl-IO-String | 0 .../171/filelists/perl-IO-Stringy | 0 .../{core => oldcore}/171/filelists/perl-Imager | 0 .../171/filelists/perl-Imager-QRCode | 0 .../171/filelists/perl-LWP-Protocol-https | 0 .../171/filelists/perl-MIME-Base32 | 0 .../{core => oldcore}/171/filelists/perl-MIME-Lite | 0 .../171/filelists/perl-MIME-Tools | 0 .../171/filelists/perl-Mail-Tools | 0 .../171/filelists/perl-Net-CIDR-Lite | 0 .../{core => oldcore}/171/filelists/perl-Net-DNS | 0 .../{core => oldcore}/171/filelists/perl-Net-HTTP | 0 .../171/filelists/perl-Net-IPv4Addr | 0 .../171/filelists/perl-Net-Server | 0 .../171/filelists/perl-Net-Telnet | 0 .../171/filelists/perl-NetAddr-IP | 0 .../171/filelists/perl-Net_SSLeay | 0 .../{core => oldcore}/171/filelists/perl-PDF-API2 | 0 .../171/filelists/perl-Sort-Naturally | 0 .../{core => oldcore}/171/filelists/perl-Switch | 0 .../171/filelists/perl-Text-CSV_XS | 0 .../{core => oldcore}/171/filelists/perl-Try-Tiny | 0 .../{core => oldcore}/171/filelists/perl-URI | 0 .../171/filelists/perl-URI-Encode | 0 .../171/filelists/perl-Unix-Syslog | 0 .../171/filelists/perl-XML-Parser | 0 .../{core => oldcore}/171/filelists/perl-YAML-Tiny | 0 .../{core => oldcore}/171/filelists/perl-libwww | 0 .../{core => oldcore}/171/filelists/rrdtool | 0 .../{core => oldcore}/171/filelists/sqlite | 0 .../{core => oldcore}/171/filelists/squid | 0 .../{core => oldcore}/171/filelists/strongswan | 0 .../{core => oldcore}/171/filelists/suricata | 0 .../{core => oldcore}/171/filelists/sysvinit | 0 .../rootfiles/{core => oldcore}/171/filelists/udev | 0 .../{core => oldcore}/171/filelists/unbound | 0 .../{core => oldcore}/171/filelists/wireless-regdb | 0 .../171/filelists/x86_64/binutils | 0 .../{core => oldcore}/171/filelists/x86_64/efivar | 0 .../{core => oldcore}/171/filelists/x86_64/gcc | 0 .../{core => oldcore}/171/filelists/x86_64/glibc | 0 .../{core => oldcore}/171/filelists/x86_64/linux | 0 .../171/filelists/x86_64/syslinux | 0 .../171/filelists/x86_64/util-linux | 0 config/rootfiles/{core => oldcore}/171/update.sh | 0 config/rootfiles/packages/x86_64/samba | 59 ++++++++++++-------- lfs/libloc | 18 +++++-- lfs/openssh | 4 +- lfs/samba | 7 ++- lfs/tzdata | 6 +-- lfs/unbound | 4 +- make.sh | 2 +- src/misc-progs/openvpnctrl.c | 2 + .../libloc-0.9.15-Makefile-reset-Python-path.patch | 22 ++++++++ ...ix-generating-file-names-for-ipset-output.patch | 36 +++++++++++++ src/patches/samba-4.16.4-glibc-headers.patch | 62 ---------------------- 135 files changed, 151 insertions(+), 119 deletions(-) copy config/rootfiles/core/{171 => 172}/core-files (100%) copy config/rootfiles/core/{171 => 172}/exclude (100%) copy config/rootfiles/core/{171 => 172}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/172/filelists/files copy config/rootfiles/core/{171 => 172}/filelists/libloc (100%) copy config/rootfiles/{oldcore/100 => core/172}/filelists/openssh (100%) copy config/rootfiles/core/{171 => 172}/filelists/strongswan (100%) copy config/rootfiles/{oldcore/100 => core/172}/filelists/tzdata (100%) copy config/rootfiles/core/{171 => 172}/filelists/unbound (100%) copy config/rootfiles/{oldcore/151 => core/172}/update.sh (86%) rename config/rootfiles/{core => oldcore}/171/core-files (100%) rename config/rootfiles/{core => oldcore}/171/exclude (100%) rename config/rootfiles/{core => oldcore}/171/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/171/filelists/aarch64/efivar (100%) rename config/rootfiles/{core => oldcore}/171/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/171/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/171/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/171/filelists/aarch64/u-boot (100%) rename config/rootfiles/{core => oldcore}/171/filelists/aarch64/util-linux (100%) rename config/rootfiles/{core => oldcore}/171/filelists/armv6l/binutils (100%) rename config/rootfiles/{core => oldcore}/171/filelists/armv6l/gcc (100%) rename config/rootfiles/{core => oldcore}/171/filelists/armv6l/glibc (100%) rename config/rootfiles/{core => oldcore}/171/filelists/armv6l/linux (100%) rename config/rootfiles/{core => oldcore}/171/filelists/armv6l/u-boot (100%) rename config/rootfiles/{core => oldcore}/171/filelists/armv6l/util-linux (100%) rename config/rootfiles/{core => oldcore}/171/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/171/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/171/filelists/collectd (100%) rename config/rootfiles/{core => oldcore}/171/filelists/core-files (100%) rename config/rootfiles/{core => oldcore}/171/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/171/filelists/dhcp (100%) rename config/rootfiles/{core => oldcore}/171/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/171/filelists/files (100%) rename config/rootfiles/{core => oldcore}/171/filelists/hdparm (100%) rename config/rootfiles/{core => oldcore}/171/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/171/filelists/kbd (100%) rename config/rootfiles/{core => oldcore}/171/filelists/libarchive (100%) rename config/rootfiles/{core => oldcore}/171/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/171/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/171/filelists/liboping (100%) rename config/rootfiles/{core => oldcore}/171/filelists/libsodium (100%) rename config/rootfiles/{core => oldcore}/171/filelists/nettle (100%) rename config/rootfiles/{core => oldcore}/171/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Apache-Htpasswd (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Archive-Tar (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Archive-Zip (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-BerkeleyDB (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-CGI (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Canary-Stability (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Compress-Zlib (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Convert-TNEF (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Convert-UUlib (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Crypt-PasswdMD5 (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-DBD-SQLite (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-DBI (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Data-UUID (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Device-Modem (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Device-SerialPort (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Digest (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Digest-HMAC (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Digest-SHA1 (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Email-Date-Format (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-File-Remove (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Font-TTF (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-GD (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-GD-Graph (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-GD-TextUtil (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-HTML-Parser (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-HTML-Tagset (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-HTML-Template (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-HTTP-Date (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-HTTP-Message (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-IO-Socket-SSL (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-IO-String (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-IO-Stringy (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Imager (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Imager-QRCode (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-LWP-Protocol-https (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-MIME-Base32 (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-MIME-Lite (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-MIME-Tools (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Mail-Tools (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Net-CIDR-Lite (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Net-DNS (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Net-HTTP (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Net-IPv4Addr (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Net-Server (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Net-Telnet (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-NetAddr-IP (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Net_SSLeay (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-PDF-API2 (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Sort-Naturally (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Switch (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Text-CSV_XS (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Try-Tiny (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-URI (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-URI-Encode (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-Unix-Syslog (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-XML-Parser (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-YAML-Tiny (100%) rename config/rootfiles/{core => oldcore}/171/filelists/perl-libwww (100%) rename config/rootfiles/{core => oldcore}/171/filelists/rrdtool (100%) rename config/rootfiles/{core => oldcore}/171/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/171/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/171/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/171/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/171/filelists/sysvinit (100%) rename config/rootfiles/{core => oldcore}/171/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/171/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/171/filelists/wireless-regdb (100%) rename config/rootfiles/{core => oldcore}/171/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/171/filelists/x86_64/efivar (100%) rename config/rootfiles/{core => oldcore}/171/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/171/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/171/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/171/filelists/x86_64/syslinux (100%) rename config/rootfiles/{core => oldcore}/171/filelists/x86_64/util-linux (100%) rename config/rootfiles/{core => oldcore}/171/update.sh (100%) create mode 100644 src/patches/libloc-0.9.15-Makefile-reset-Python-path.patch create mode 100644 src/patches/libloc-0.9.15-export-Fix-generating-file-names-for-ipset-output.patch delete mode 100644 src/patches/samba-4.16.4-glibc-headers.patch

Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 54957a814..6fd9e45bb 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -184,6 +184,9 @@ restore_backup() { # move nobeeps if exist [ -e "/var/ipfire/ppp/nobeeps" ] && mv /var/ipfire/ppp/nobeeps /var/ipfire/red/nobeeps

+ # Update OpenVPN CRL + /etc/fcron.daily/openvpn-crl-updater + return 0 }

diff --git a/config/rootfiles/common/libloc b/config/rootfiles/common/libloc index 2b9562b58..7eb94217e 100644 --- a/config/rootfiles/common/libloc +++ b/config/rootfiles/common/libloc @@ -1,3 +1,5 @@ +#etc/cron.daily +#etc/cron.daily/location-update usr/bin/location #usr/bin/location-importer #usr/include/libloc diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index dd0fd233a..22adf24b4 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -70,7 +70,6 @@ etc/strongswan.d/charon/xauth-generic.conf etc/strongswan.d/charon/xauth-noauth.conf etc/strongswan.d/charon/xcbc.conf etc/strongswan.d/pki.conf -etc/strongswan.d/scepclient.conf etc/strongswan.d/starter.conf etc/strongswan.d/swanctl.conf #etc/swanctl @@ -170,7 +169,6 @@ usr/lib/ipsec/plugins/libstrongswan-xcbc.so #usr/libexec/ipsec usr/libexec/ipsec/_updown usr/libexec/ipsec/charon -usr/libexec/ipsec/scepclient usr/libexec/ipsec/starter usr/libexec/ipsec/stroke usr/libexec/ipsec/xfrmi @@ -178,6 +176,8 @@ usr/sbin/ipsec usr/sbin/swanctl #usr/share/man/man1/pki---acert.1 #usr/share/man/man1/pki---dn.1 +#usr/share/man/man1/pki---est.1 +#usr/share/man/man1/pki---estca.1 #usr/share/man/man1/pki---gen.1 #usr/share/man/man1/pki---issue.1 #usr/share/man/man1/pki---keyid.1 @@ -185,6 +185,8 @@ usr/sbin/swanctl #usr/share/man/man1/pki---print.1 #usr/share/man/man1/pki---pub.1 #usr/share/man/man1/pki---req.1 +#usr/share/man/man1/pki---scep.1 +#usr/share/man/man1/pki---scepca.1 #usr/share/man/man1/pki---self.1 #usr/share/man/man1/pki---signcrl.1 #usr/share/man/man1/pki---verify.1 @@ -194,7 +196,6 @@ usr/sbin/swanctl #usr/share/man/man5/strongswan.conf.5 #usr/share/man/man5/swanctl.conf.5 #usr/share/man/man8/ipsec.8 -#usr/share/man/man8/scepclient.8 #usr/share/man/man8/swanctl.8 #usr/share/strongswan #usr/share/strongswan/templates @@ -260,6 +261,5 @@ usr/sbin/swanctl #usr/share/strongswan/templates/config/strongswan.d/charon-logging.conf #usr/share/strongswan/templates/config/strongswan.d/charon.conf #usr/share/strongswan/templates/config/strongswan.d/pki.conf -#usr/share/strongswan/templates/config/strongswan.d/scepclient.conf #usr/share/strongswan/templates/config/strongswan.d/starter.conf #usr/share/strongswan/templates/config/strongswan.d/swanctl.conf diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index f6903a057..b64e19681 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -465,6 +465,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Europe/Kaliningrad #usr/share/zoneinfo/Europe/Kiev #usr/share/zoneinfo/Europe/Kirov +#usr/share/zoneinfo/Europe/Kyiv #usr/share/zoneinfo/Europe/Lisbon #usr/share/zoneinfo/Europe/Ljubljana #usr/share/zoneinfo/Europe/London @@ -1082,6 +1083,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Europe/Kaliningrad #usr/share/zoneinfo/posix/Europe/Kiev #usr/share/zoneinfo/posix/Europe/Kirov +#usr/share/zoneinfo/posix/Europe/Kyiv #usr/share/zoneinfo/posix/Europe/Lisbon #usr/share/zoneinfo/posix/Europe/Ljubljana #usr/share/zoneinfo/posix/Europe/London @@ -1699,6 +1701,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Europe/Kaliningrad #usr/share/zoneinfo/right/Europe/Kiev #usr/share/zoneinfo/right/Europe/Kirov +#usr/share/zoneinfo/right/Europe/Kyiv #usr/share/zoneinfo/right/Europe/Lisbon #usr/share/zoneinfo/right/Europe/Ljubljana #usr/share/zoneinfo/right/Europe/London diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 7af787f29..26ce13c3f 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.19 +usr/lib/libunbound.so.8.1.20 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/core/171/core-files b/config/rootfiles/core/172/core-files similarity index 100% rename from config/rootfiles/core/171/core-files rename to config/rootfiles/core/172/core-files diff --git a/config/rootfiles/core/171/exclude b/config/rootfiles/core/172/exclude similarity index 100% rename from config/rootfiles/core/171/exclude rename to config/rootfiles/core/172/exclude diff --git a/config/rootfiles/core/171/filelists/core-files b/config/rootfiles/core/172/filelists/core-files similarity index 100% rename from config/rootfiles/core/171/filelists/core-files rename to config/rootfiles/core/172/filelists/core-files diff --git a/config/rootfiles/core/172/filelists/files b/config/rootfiles/core/172/filelists/files new file mode 100644 index 000000000..206a50369 --- /dev/null +++ b/config/rootfiles/core/172/filelists/files @@ -0,0 +1,2 @@ +usr/local/bin/openvpnctrl +var/ipfire/backup/bin/backup.pl diff --git a/config/rootfiles/core/171/filelists/libloc b/config/rootfiles/core/172/filelists/libloc similarity index 100% rename from config/rootfiles/core/171/filelists/libloc rename to config/rootfiles/core/172/filelists/libloc diff --git a/config/rootfiles/core/172/filelists/openssh b/config/rootfiles/core/172/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/172/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/strongswan b/config/rootfiles/core/172/filelists/strongswan similarity index 100% rename from config/rootfiles/core/171/filelists/strongswan rename to config/rootfiles/core/172/filelists/strongswan diff --git a/config/rootfiles/core/172/filelists/tzdata b/config/rootfiles/core/172/filelists/tzdata new file mode 120000 index 000000000..5a6e3252f --- /dev/null +++ b/config/rootfiles/core/172/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/unbound b/config/rootfiles/core/172/filelists/unbound similarity index 100% rename from config/rootfiles/core/171/filelists/unbound rename to config/rootfiles/core/172/filelists/unbound diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh new file mode 100644 index 000000000..643a262bc --- /dev/null +++ b/config/rootfiles/core/172/update.sh @@ -0,0 +1,84 @@ +#!/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) 2022 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=172 + +# 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 + +# Stop services +/etc/rc.d/init.d/ipsec stop +/etc/rc.d/init.d/sshd stop +/etc/rc.d/init.d/unbound stop + +# Remove files +rm -rvf \ + /etc/strongswan.d/scepclient.conf \ + /usr/lib/libunbound.so.8.1.1* \ + /usr/libexec/ipsec/scepclient + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + +# Start services +/etc/init.d/unbound start +if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then + /etc/init.d/sshd start +fi +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi + +# 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/oldcore/171/core-files b/config/rootfiles/oldcore/171/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/171/core-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/oldcore/171/exclude b/config/rootfiles/oldcore/171/exclude new file mode 100644 index 000000000..378c2d563 --- /dev/null +++ b/config/rootfiles/oldcore/171/exclude @@ -0,0 +1,34 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +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/lib/location/database.db +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/171/filelists/aarch64/binutils b/config/rootfiles/oldcore/171/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/171/filelists/aarch64/binutils rename to config/rootfiles/oldcore/171/filelists/aarch64/binutils diff --git a/config/rootfiles/core/171/filelists/aarch64/efivar b/config/rootfiles/oldcore/171/filelists/aarch64/efivar similarity index 100% rename from config/rootfiles/core/171/filelists/aarch64/efivar rename to config/rootfiles/oldcore/171/filelists/aarch64/efivar diff --git a/config/rootfiles/core/171/filelists/aarch64/gcc b/config/rootfiles/oldcore/171/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/171/filelists/aarch64/gcc rename to config/rootfiles/oldcore/171/filelists/aarch64/gcc diff --git a/config/rootfiles/core/171/filelists/aarch64/glibc b/config/rootfiles/oldcore/171/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/171/filelists/aarch64/glibc rename to config/rootfiles/oldcore/171/filelists/aarch64/glibc diff --git a/config/rootfiles/core/171/filelists/aarch64/linux b/config/rootfiles/oldcore/171/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/171/filelists/aarch64/linux rename to config/rootfiles/oldcore/171/filelists/aarch64/linux diff --git a/config/rootfiles/core/171/filelists/aarch64/u-boot b/config/rootfiles/oldcore/171/filelists/aarch64/u-boot similarity index 100% rename from config/rootfiles/core/171/filelists/aarch64/u-boot rename to config/rootfiles/oldcore/171/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/171/filelists/aarch64/util-linux b/config/rootfiles/oldcore/171/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/171/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/171/filelists/aarch64/util-linux diff --git a/config/rootfiles/core/171/filelists/armv6l/binutils b/config/rootfiles/oldcore/171/filelists/armv6l/binutils similarity index 100% rename from config/rootfiles/core/171/filelists/armv6l/binutils rename to config/rootfiles/oldcore/171/filelists/armv6l/binutils diff --git a/config/rootfiles/core/171/filelists/armv6l/gcc b/config/rootfiles/oldcore/171/filelists/armv6l/gcc similarity index 100% rename from config/rootfiles/core/171/filelists/armv6l/gcc rename to config/rootfiles/oldcore/171/filelists/armv6l/gcc diff --git a/config/rootfiles/core/171/filelists/armv6l/glibc b/config/rootfiles/oldcore/171/filelists/armv6l/glibc similarity index 100% rename from config/rootfiles/core/171/filelists/armv6l/glibc rename to config/rootfiles/oldcore/171/filelists/armv6l/glibc diff --git a/config/rootfiles/core/171/filelists/armv6l/linux b/config/rootfiles/oldcore/171/filelists/armv6l/linux similarity index 100% rename from config/rootfiles/core/171/filelists/armv6l/linux rename to config/rootfiles/oldcore/171/filelists/armv6l/linux diff --git a/config/rootfiles/core/171/filelists/armv6l/u-boot b/config/rootfiles/oldcore/171/filelists/armv6l/u-boot similarity index 100% rename from config/rootfiles/core/171/filelists/armv6l/u-boot rename to config/rootfiles/oldcore/171/filelists/armv6l/u-boot diff --git a/config/rootfiles/core/171/filelists/armv6l/util-linux b/config/rootfiles/oldcore/171/filelists/armv6l/util-linux similarity index 100% rename from config/rootfiles/core/171/filelists/armv6l/util-linux rename to config/rootfiles/oldcore/171/filelists/armv6l/util-linux diff --git a/config/rootfiles/core/171/filelists/bind b/config/rootfiles/oldcore/171/filelists/bind similarity index 100% rename from config/rootfiles/core/171/filelists/bind rename to config/rootfiles/oldcore/171/filelists/bind diff --git a/config/rootfiles/core/171/filelists/ca-certificates b/config/rootfiles/oldcore/171/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/171/filelists/ca-certificates rename to config/rootfiles/oldcore/171/filelists/ca-certificates diff --git a/config/rootfiles/core/171/filelists/collectd b/config/rootfiles/oldcore/171/filelists/collectd similarity index 100% rename from config/rootfiles/core/171/filelists/collectd rename to config/rootfiles/oldcore/171/filelists/collectd diff --git a/config/rootfiles/oldcore/171/filelists/core-files b/config/rootfiles/oldcore/171/filelists/core-files new file mode 120000 index 000000000..709d6c14c --- /dev/null +++ b/config/rootfiles/oldcore/171/filelists/core-files @@ -0,0 +1 @@ +../core-files \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/curl b/config/rootfiles/oldcore/171/filelists/curl similarity index 100% rename from config/rootfiles/core/171/filelists/curl rename to config/rootfiles/oldcore/171/filelists/curl diff --git a/config/rootfiles/core/171/filelists/dhcp b/config/rootfiles/oldcore/171/filelists/dhcp similarity index 100% rename from config/rootfiles/core/171/filelists/dhcp rename to config/rootfiles/oldcore/171/filelists/dhcp diff --git a/config/rootfiles/core/171/filelists/expat b/config/rootfiles/oldcore/171/filelists/expat similarity index 100% rename from config/rootfiles/core/171/filelists/expat rename to config/rootfiles/oldcore/171/filelists/expat diff --git a/config/rootfiles/core/171/filelists/files b/config/rootfiles/oldcore/171/filelists/files similarity index 100% rename from config/rootfiles/core/171/filelists/files rename to config/rootfiles/oldcore/171/filelists/files diff --git a/config/rootfiles/core/171/filelists/hdparm b/config/rootfiles/oldcore/171/filelists/hdparm similarity index 100% rename from config/rootfiles/core/171/filelists/hdparm rename to config/rootfiles/oldcore/171/filelists/hdparm diff --git a/config/rootfiles/core/171/filelists/iproute2 b/config/rootfiles/oldcore/171/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/171/filelists/iproute2 rename to config/rootfiles/oldcore/171/filelists/iproute2 diff --git a/config/rootfiles/core/171/filelists/kbd b/config/rootfiles/oldcore/171/filelists/kbd similarity index 100% rename from config/rootfiles/core/171/filelists/kbd rename to config/rootfiles/oldcore/171/filelists/kbd diff --git a/config/rootfiles/core/171/filelists/libarchive b/config/rootfiles/oldcore/171/filelists/libarchive similarity index 100% rename from config/rootfiles/core/171/filelists/libarchive rename to config/rootfiles/oldcore/171/filelists/libarchive diff --git a/config/rootfiles/core/171/filelists/libhtp b/config/rootfiles/oldcore/171/filelists/libhtp similarity index 100% rename from config/rootfiles/core/171/filelists/libhtp rename to config/rootfiles/oldcore/171/filelists/libhtp diff --git a/config/rootfiles/oldcore/171/filelists/libloc b/config/rootfiles/oldcore/171/filelists/libloc new file mode 120000 index 000000000..ff4a92429 --- /dev/null +++ b/config/rootfiles/oldcore/171/filelists/libloc @@ -0,0 +1 @@ +../../../common/libloc \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/liboping b/config/rootfiles/oldcore/171/filelists/liboping similarity index 100% rename from config/rootfiles/core/171/filelists/liboping rename to config/rootfiles/oldcore/171/filelists/liboping diff --git a/config/rootfiles/core/171/filelists/libsodium b/config/rootfiles/oldcore/171/filelists/libsodium similarity index 100% rename from config/rootfiles/core/171/filelists/libsodium rename to config/rootfiles/oldcore/171/filelists/libsodium diff --git a/config/rootfiles/core/171/filelists/nettle b/config/rootfiles/oldcore/171/filelists/nettle similarity index 100% rename from config/rootfiles/core/171/filelists/nettle rename to config/rootfiles/oldcore/171/filelists/nettle diff --git a/config/rootfiles/core/171/filelists/openvpn b/config/rootfiles/oldcore/171/filelists/openvpn similarity index 100% rename from config/rootfiles/core/171/filelists/openvpn rename to config/rootfiles/oldcore/171/filelists/openvpn diff --git a/config/rootfiles/core/171/filelists/perl b/config/rootfiles/oldcore/171/filelists/perl similarity index 100% rename from config/rootfiles/core/171/filelists/perl rename to config/rootfiles/oldcore/171/filelists/perl diff --git a/config/rootfiles/core/171/filelists/perl-Apache-Htpasswd b/config/rootfiles/oldcore/171/filelists/perl-Apache-Htpasswd similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Apache-Htpasswd rename to config/rootfiles/oldcore/171/filelists/perl-Apache-Htpasswd diff --git a/config/rootfiles/core/171/filelists/perl-Archive-Tar b/config/rootfiles/oldcore/171/filelists/perl-Archive-Tar similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Archive-Tar rename to config/rootfiles/oldcore/171/filelists/perl-Archive-Tar diff --git a/config/rootfiles/core/171/filelists/perl-Archive-Zip b/config/rootfiles/oldcore/171/filelists/perl-Archive-Zip similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Archive-Zip rename to config/rootfiles/oldcore/171/filelists/perl-Archive-Zip diff --git a/config/rootfiles/core/171/filelists/perl-BerkeleyDB b/config/rootfiles/oldcore/171/filelists/perl-BerkeleyDB similarity index 100% rename from config/rootfiles/core/171/filelists/perl-BerkeleyDB rename to config/rootfiles/oldcore/171/filelists/perl-BerkeleyDB diff --git a/config/rootfiles/core/171/filelists/perl-CGI b/config/rootfiles/oldcore/171/filelists/perl-CGI similarity index 100% rename from config/rootfiles/core/171/filelists/perl-CGI rename to config/rootfiles/oldcore/171/filelists/perl-CGI diff --git a/config/rootfiles/core/171/filelists/perl-Canary-Stability b/config/rootfiles/oldcore/171/filelists/perl-Canary-Stability similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Canary-Stability rename to config/rootfiles/oldcore/171/filelists/perl-Canary-Stability diff --git a/config/rootfiles/core/171/filelists/perl-Compress-Zlib b/config/rootfiles/oldcore/171/filelists/perl-Compress-Zlib similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Compress-Zlib rename to config/rootfiles/oldcore/171/filelists/perl-Compress-Zlib diff --git a/config/rootfiles/core/171/filelists/perl-Convert-TNEF b/config/rootfiles/oldcore/171/filelists/perl-Convert-TNEF similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Convert-TNEF rename to config/rootfiles/oldcore/171/filelists/perl-Convert-TNEF diff --git a/config/rootfiles/core/171/filelists/perl-Convert-UUlib b/config/rootfiles/oldcore/171/filelists/perl-Convert-UUlib similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Convert-UUlib rename to config/rootfiles/oldcore/171/filelists/perl-Convert-UUlib diff --git a/config/rootfiles/core/171/filelists/perl-Crypt-PasswdMD5 b/config/rootfiles/oldcore/171/filelists/perl-Crypt-PasswdMD5 similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Crypt-PasswdMD5 rename to config/rootfiles/oldcore/171/filelists/perl-Crypt-PasswdMD5 diff --git a/config/rootfiles/core/171/filelists/perl-DBD-SQLite b/config/rootfiles/oldcore/171/filelists/perl-DBD-SQLite similarity index 100% rename from config/rootfiles/core/171/filelists/perl-DBD-SQLite rename to config/rootfiles/oldcore/171/filelists/perl-DBD-SQLite diff --git a/config/rootfiles/core/171/filelists/perl-DBI b/config/rootfiles/oldcore/171/filelists/perl-DBI similarity index 100% rename from config/rootfiles/core/171/filelists/perl-DBI rename to config/rootfiles/oldcore/171/filelists/perl-DBI diff --git a/config/rootfiles/core/171/filelists/perl-Data-UUID b/config/rootfiles/oldcore/171/filelists/perl-Data-UUID similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Data-UUID rename to config/rootfiles/oldcore/171/filelists/perl-Data-UUID diff --git a/config/rootfiles/core/171/filelists/perl-Device-Modem b/config/rootfiles/oldcore/171/filelists/perl-Device-Modem similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Device-Modem rename to config/rootfiles/oldcore/171/filelists/perl-Device-Modem diff --git a/config/rootfiles/core/171/filelists/perl-Device-SerialPort b/config/rootfiles/oldcore/171/filelists/perl-Device-SerialPort similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Device-SerialPort rename to config/rootfiles/oldcore/171/filelists/perl-Device-SerialPort diff --git a/config/rootfiles/core/171/filelists/perl-Digest b/config/rootfiles/oldcore/171/filelists/perl-Digest similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Digest rename to config/rootfiles/oldcore/171/filelists/perl-Digest diff --git a/config/rootfiles/core/171/filelists/perl-Digest-HMAC b/config/rootfiles/oldcore/171/filelists/perl-Digest-HMAC similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Digest-HMAC rename to config/rootfiles/oldcore/171/filelists/perl-Digest-HMAC diff --git a/config/rootfiles/core/171/filelists/perl-Digest-SHA1 b/config/rootfiles/oldcore/171/filelists/perl-Digest-SHA1 similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Digest-SHA1 rename to config/rootfiles/oldcore/171/filelists/perl-Digest-SHA1 diff --git a/config/rootfiles/core/171/filelists/perl-Email-Date-Format b/config/rootfiles/oldcore/171/filelists/perl-Email-Date-Format similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Email-Date-Format rename to config/rootfiles/oldcore/171/filelists/perl-Email-Date-Format diff --git a/config/rootfiles/core/171/filelists/perl-File-Remove b/config/rootfiles/oldcore/171/filelists/perl-File-Remove similarity index 100% rename from config/rootfiles/core/171/filelists/perl-File-Remove rename to config/rootfiles/oldcore/171/filelists/perl-File-Remove diff --git a/config/rootfiles/core/171/filelists/perl-Font-TTF b/config/rootfiles/oldcore/171/filelists/perl-Font-TTF similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Font-TTF rename to config/rootfiles/oldcore/171/filelists/perl-Font-TTF diff --git a/config/rootfiles/core/171/filelists/perl-GD b/config/rootfiles/oldcore/171/filelists/perl-GD similarity index 100% rename from config/rootfiles/core/171/filelists/perl-GD rename to config/rootfiles/oldcore/171/filelists/perl-GD diff --git a/config/rootfiles/core/171/filelists/perl-GD-Graph b/config/rootfiles/oldcore/171/filelists/perl-GD-Graph similarity index 100% rename from config/rootfiles/core/171/filelists/perl-GD-Graph rename to config/rootfiles/oldcore/171/filelists/perl-GD-Graph diff --git a/config/rootfiles/core/171/filelists/perl-GD-TextUtil b/config/rootfiles/oldcore/171/filelists/perl-GD-TextUtil similarity index 100% rename from config/rootfiles/core/171/filelists/perl-GD-TextUtil rename to config/rootfiles/oldcore/171/filelists/perl-GD-TextUtil diff --git a/config/rootfiles/core/171/filelists/perl-HTML-Parser b/config/rootfiles/oldcore/171/filelists/perl-HTML-Parser similarity index 100% rename from config/rootfiles/core/171/filelists/perl-HTML-Parser rename to config/rootfiles/oldcore/171/filelists/perl-HTML-Parser diff --git a/config/rootfiles/core/171/filelists/perl-HTML-Tagset b/config/rootfiles/oldcore/171/filelists/perl-HTML-Tagset similarity index 100% rename from config/rootfiles/core/171/filelists/perl-HTML-Tagset rename to config/rootfiles/oldcore/171/filelists/perl-HTML-Tagset diff --git a/config/rootfiles/core/171/filelists/perl-HTML-Template b/config/rootfiles/oldcore/171/filelists/perl-HTML-Template similarity index 100% rename from config/rootfiles/core/171/filelists/perl-HTML-Template rename to config/rootfiles/oldcore/171/filelists/perl-HTML-Template diff --git a/config/rootfiles/core/171/filelists/perl-HTTP-Date b/config/rootfiles/oldcore/171/filelists/perl-HTTP-Date similarity index 100% rename from config/rootfiles/core/171/filelists/perl-HTTP-Date rename to config/rootfiles/oldcore/171/filelists/perl-HTTP-Date diff --git a/config/rootfiles/core/171/filelists/perl-HTTP-Message b/config/rootfiles/oldcore/171/filelists/perl-HTTP-Message similarity index 100% rename from config/rootfiles/core/171/filelists/perl-HTTP-Message rename to config/rootfiles/oldcore/171/filelists/perl-HTTP-Message diff --git a/config/rootfiles/core/171/filelists/perl-IO-Socket-SSL b/config/rootfiles/oldcore/171/filelists/perl-IO-Socket-SSL similarity index 100% rename from config/rootfiles/core/171/filelists/perl-IO-Socket-SSL rename to config/rootfiles/oldcore/171/filelists/perl-IO-Socket-SSL diff --git a/config/rootfiles/core/171/filelists/perl-IO-String b/config/rootfiles/oldcore/171/filelists/perl-IO-String similarity index 100% rename from config/rootfiles/core/171/filelists/perl-IO-String rename to config/rootfiles/oldcore/171/filelists/perl-IO-String diff --git a/config/rootfiles/core/171/filelists/perl-IO-Stringy b/config/rootfiles/oldcore/171/filelists/perl-IO-Stringy similarity index 100% rename from config/rootfiles/core/171/filelists/perl-IO-Stringy rename to config/rootfiles/oldcore/171/filelists/perl-IO-Stringy diff --git a/config/rootfiles/core/171/filelists/perl-Imager b/config/rootfiles/oldcore/171/filelists/perl-Imager similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Imager rename to config/rootfiles/oldcore/171/filelists/perl-Imager diff --git a/config/rootfiles/core/171/filelists/perl-Imager-QRCode b/config/rootfiles/oldcore/171/filelists/perl-Imager-QRCode similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Imager-QRCode rename to config/rootfiles/oldcore/171/filelists/perl-Imager-QRCode diff --git a/config/rootfiles/core/171/filelists/perl-LWP-Protocol-https b/config/rootfiles/oldcore/171/filelists/perl-LWP-Protocol-https similarity index 100% rename from config/rootfiles/core/171/filelists/perl-LWP-Protocol-https rename to config/rootfiles/oldcore/171/filelists/perl-LWP-Protocol-https diff --git a/config/rootfiles/core/171/filelists/perl-MIME-Base32 b/config/rootfiles/oldcore/171/filelists/perl-MIME-Base32 similarity index 100% rename from config/rootfiles/core/171/filelists/perl-MIME-Base32 rename to config/rootfiles/oldcore/171/filelists/perl-MIME-Base32 diff --git a/config/rootfiles/core/171/filelists/perl-MIME-Lite b/config/rootfiles/oldcore/171/filelists/perl-MIME-Lite similarity index 100% rename from config/rootfiles/core/171/filelists/perl-MIME-Lite rename to config/rootfiles/oldcore/171/filelists/perl-MIME-Lite diff --git a/config/rootfiles/core/171/filelists/perl-MIME-Tools b/config/rootfiles/oldcore/171/filelists/perl-MIME-Tools similarity index 100% rename from config/rootfiles/core/171/filelists/perl-MIME-Tools rename to config/rootfiles/oldcore/171/filelists/perl-MIME-Tools diff --git a/config/rootfiles/core/171/filelists/perl-Mail-Tools b/config/rootfiles/oldcore/171/filelists/perl-Mail-Tools similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Mail-Tools rename to config/rootfiles/oldcore/171/filelists/perl-Mail-Tools diff --git a/config/rootfiles/core/171/filelists/perl-Net-CIDR-Lite b/config/rootfiles/oldcore/171/filelists/perl-Net-CIDR-Lite similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Net-CIDR-Lite rename to config/rootfiles/oldcore/171/filelists/perl-Net-CIDR-Lite diff --git a/config/rootfiles/core/171/filelists/perl-Net-DNS b/config/rootfiles/oldcore/171/filelists/perl-Net-DNS similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Net-DNS rename to config/rootfiles/oldcore/171/filelists/perl-Net-DNS diff --git a/config/rootfiles/core/171/filelists/perl-Net-HTTP b/config/rootfiles/oldcore/171/filelists/perl-Net-HTTP similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Net-HTTP rename to config/rootfiles/oldcore/171/filelists/perl-Net-HTTP diff --git a/config/rootfiles/core/171/filelists/perl-Net-IPv4Addr b/config/rootfiles/oldcore/171/filelists/perl-Net-IPv4Addr similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Net-IPv4Addr rename to config/rootfiles/oldcore/171/filelists/perl-Net-IPv4Addr diff --git a/config/rootfiles/core/171/filelists/perl-Net-Server b/config/rootfiles/oldcore/171/filelists/perl-Net-Server similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Net-Server rename to config/rootfiles/oldcore/171/filelists/perl-Net-Server diff --git a/config/rootfiles/core/171/filelists/perl-Net-Telnet b/config/rootfiles/oldcore/171/filelists/perl-Net-Telnet similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Net-Telnet rename to config/rootfiles/oldcore/171/filelists/perl-Net-Telnet diff --git a/config/rootfiles/core/171/filelists/perl-NetAddr-IP b/config/rootfiles/oldcore/171/filelists/perl-NetAddr-IP similarity index 100% rename from config/rootfiles/core/171/filelists/perl-NetAddr-IP rename to config/rootfiles/oldcore/171/filelists/perl-NetAddr-IP diff --git a/config/rootfiles/core/171/filelists/perl-Net_SSLeay b/config/rootfiles/oldcore/171/filelists/perl-Net_SSLeay similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Net_SSLeay rename to config/rootfiles/oldcore/171/filelists/perl-Net_SSLeay diff --git a/config/rootfiles/core/171/filelists/perl-PDF-API2 b/config/rootfiles/oldcore/171/filelists/perl-PDF-API2 similarity index 100% rename from config/rootfiles/core/171/filelists/perl-PDF-API2 rename to config/rootfiles/oldcore/171/filelists/perl-PDF-API2 diff --git a/config/rootfiles/core/171/filelists/perl-Sort-Naturally b/config/rootfiles/oldcore/171/filelists/perl-Sort-Naturally similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Sort-Naturally rename to config/rootfiles/oldcore/171/filelists/perl-Sort-Naturally diff --git a/config/rootfiles/core/171/filelists/perl-Switch b/config/rootfiles/oldcore/171/filelists/perl-Switch similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Switch rename to config/rootfiles/oldcore/171/filelists/perl-Switch diff --git a/config/rootfiles/core/171/filelists/perl-Text-CSV_XS b/config/rootfiles/oldcore/171/filelists/perl-Text-CSV_XS similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Text-CSV_XS rename to config/rootfiles/oldcore/171/filelists/perl-Text-CSV_XS diff --git a/config/rootfiles/core/171/filelists/perl-Try-Tiny b/config/rootfiles/oldcore/171/filelists/perl-Try-Tiny similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Try-Tiny rename to config/rootfiles/oldcore/171/filelists/perl-Try-Tiny diff --git a/config/rootfiles/core/171/filelists/perl-URI b/config/rootfiles/oldcore/171/filelists/perl-URI similarity index 100% rename from config/rootfiles/core/171/filelists/perl-URI rename to config/rootfiles/oldcore/171/filelists/perl-URI diff --git a/config/rootfiles/core/171/filelists/perl-URI-Encode b/config/rootfiles/oldcore/171/filelists/perl-URI-Encode similarity index 100% rename from config/rootfiles/core/171/filelists/perl-URI-Encode rename to config/rootfiles/oldcore/171/filelists/perl-URI-Encode diff --git a/config/rootfiles/core/171/filelists/perl-Unix-Syslog b/config/rootfiles/oldcore/171/filelists/perl-Unix-Syslog similarity index 100% rename from config/rootfiles/core/171/filelists/perl-Unix-Syslog rename to config/rootfiles/oldcore/171/filelists/perl-Unix-Syslog diff --git a/config/rootfiles/core/171/filelists/perl-XML-Parser b/config/rootfiles/oldcore/171/filelists/perl-XML-Parser similarity index 100% rename from config/rootfiles/core/171/filelists/perl-XML-Parser rename to config/rootfiles/oldcore/171/filelists/perl-XML-Parser diff --git a/config/rootfiles/core/171/filelists/perl-YAML-Tiny b/config/rootfiles/oldcore/171/filelists/perl-YAML-Tiny similarity index 100% rename from config/rootfiles/core/171/filelists/perl-YAML-Tiny rename to config/rootfiles/oldcore/171/filelists/perl-YAML-Tiny diff --git a/config/rootfiles/core/171/filelists/perl-libwww b/config/rootfiles/oldcore/171/filelists/perl-libwww similarity index 100% rename from config/rootfiles/core/171/filelists/perl-libwww rename to config/rootfiles/oldcore/171/filelists/perl-libwww diff --git a/config/rootfiles/core/171/filelists/rrdtool b/config/rootfiles/oldcore/171/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/171/filelists/rrdtool rename to config/rootfiles/oldcore/171/filelists/rrdtool diff --git a/config/rootfiles/core/171/filelists/sqlite b/config/rootfiles/oldcore/171/filelists/sqlite similarity index 100% rename from config/rootfiles/core/171/filelists/sqlite rename to config/rootfiles/oldcore/171/filelists/sqlite diff --git a/config/rootfiles/core/171/filelists/squid b/config/rootfiles/oldcore/171/filelists/squid similarity index 100% rename from config/rootfiles/core/171/filelists/squid rename to config/rootfiles/oldcore/171/filelists/squid diff --git a/config/rootfiles/oldcore/171/filelists/strongswan b/config/rootfiles/oldcore/171/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/oldcore/171/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/suricata b/config/rootfiles/oldcore/171/filelists/suricata similarity index 100% rename from config/rootfiles/core/171/filelists/suricata rename to config/rootfiles/oldcore/171/filelists/suricata diff --git a/config/rootfiles/core/171/filelists/sysvinit b/config/rootfiles/oldcore/171/filelists/sysvinit similarity index 100% rename from config/rootfiles/core/171/filelists/sysvinit rename to config/rootfiles/oldcore/171/filelists/sysvinit diff --git a/config/rootfiles/core/171/filelists/udev b/config/rootfiles/oldcore/171/filelists/udev similarity index 100% rename from config/rootfiles/core/171/filelists/udev rename to config/rootfiles/oldcore/171/filelists/udev diff --git a/config/rootfiles/oldcore/171/filelists/unbound b/config/rootfiles/oldcore/171/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/oldcore/171/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/wireless-regdb b/config/rootfiles/oldcore/171/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/171/filelists/wireless-regdb rename to config/rootfiles/oldcore/171/filelists/wireless-regdb diff --git a/config/rootfiles/core/171/filelists/x86_64/binutils b/config/rootfiles/oldcore/171/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/171/filelists/x86_64/binutils rename to config/rootfiles/oldcore/171/filelists/x86_64/binutils diff --git a/config/rootfiles/core/171/filelists/x86_64/efivar b/config/rootfiles/oldcore/171/filelists/x86_64/efivar similarity index 100% rename from config/rootfiles/core/171/filelists/x86_64/efivar rename to config/rootfiles/oldcore/171/filelists/x86_64/efivar diff --git a/config/rootfiles/core/171/filelists/x86_64/gcc b/config/rootfiles/oldcore/171/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/171/filelists/x86_64/gcc rename to config/rootfiles/oldcore/171/filelists/x86_64/gcc diff --git a/config/rootfiles/core/171/filelists/x86_64/glibc b/config/rootfiles/oldcore/171/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/171/filelists/x86_64/glibc rename to config/rootfiles/oldcore/171/filelists/x86_64/glibc diff --git a/config/rootfiles/core/171/filelists/x86_64/linux b/config/rootfiles/oldcore/171/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/171/filelists/x86_64/linux rename to config/rootfiles/oldcore/171/filelists/x86_64/linux diff --git a/config/rootfiles/core/171/filelists/x86_64/syslinux b/config/rootfiles/oldcore/171/filelists/x86_64/syslinux similarity index 100% rename from config/rootfiles/core/171/filelists/x86_64/syslinux rename to config/rootfiles/oldcore/171/filelists/x86_64/syslinux diff --git a/config/rootfiles/core/171/filelists/x86_64/util-linux b/config/rootfiles/oldcore/171/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/171/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/171/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/oldcore/171/update.sh similarity index 100% rename from config/rootfiles/core/171/update.sh rename to config/rootfiles/oldcore/171/update.sh diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 66b210a08..2d8f0ae0d 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -154,8 +154,8 @@ usr/lib/libndr-standard.so usr/lib/libndr-standard.so.0 usr/lib/libndr-standard.so.0.0.1 usr/lib/libndr.so -usr/lib/libndr.so.2 -usr/lib/libndr.so.2.0.0 +usr/lib/libndr.so.3 +usr/lib/libndr.so.3.0.0 usr/lib/libnetapi.so usr/lib/libnetapi.so.1 usr/lib/libnetapi.so.1.0.0 @@ -166,6 +166,7 @@ usr/lib/libsamba-credentials.so.1 usr/lib/libsamba-credentials.so.1.0.0 usr/lib/libsamba-errors.so usr/lib/libsamba-errors.so.1 +usr/lib/libsamba-errors.so.1.0.0 usr/lib/libsamba-hostconfig.so usr/lib/libsamba-hostconfig.so.0 usr/lib/libsamba-hostconfig.so.0.0.1 @@ -282,13 +283,31 @@ usr/lib/python3.10/site-packages/samba/emulate/traffic_packets.py usr/lib/python3.10/site-packages/samba/forest_update.py usr/lib/python3.10/site-packages/samba/gensec.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/getopt.py -usr/lib/python3.10/site-packages/samba/gp_cert_auto_enroll_ext.py -usr/lib/python3.10/site-packages/samba/gp_chromium_ext.py -usr/lib/python3.10/site-packages/samba/gp_ext_loader.py -usr/lib/python3.10/site-packages/samba/gp_firefox_ext.py -usr/lib/python3.10/site-packages/samba/gp_firewalld_ext.py -usr/lib/python3.10/site-packages/samba/gp_gnome_settings_ext.py -usr/lib/python3.10/site-packages/samba/gp_msgs_ext.py +usr/lib/python3.10/site-packages/samba/gp +usr/lib/python3.10/site-packages/samba/gp/gp_centrify_crontab_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_centrify_sudoers_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_cert_auto_enroll_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_chromium_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_ext_loader.py +usr/lib/python3.10/site-packages/samba/gp/gp_firefox_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_firewalld_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_gnome_settings_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_msgs_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_scripts_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_sec_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_smb_conf_ext.py +usr/lib/python3.10/site-packages/samba/gp/gp_sudoers_ext.py +usr/lib/python3.10/site-packages/samba/gp/gpclass.py +usr/lib/python3.10/site-packages/samba/gp/util +usr/lib/python3.10/site-packages/samba/gp/util/logging.py +usr/lib/python3.10/site-packages/samba/gp/vgp_access_ext.py +usr/lib/python3.10/site-packages/samba/gp/vgp_files_ext.py +usr/lib/python3.10/site-packages/samba/gp/vgp_issue_ext.py +usr/lib/python3.10/site-packages/samba/gp/vgp_motd_ext.py +usr/lib/python3.10/site-packages/samba/gp/vgp_openssh_ext.py +usr/lib/python3.10/site-packages/samba/gp/vgp_startup_scripts_ext.py +usr/lib/python3.10/site-packages/samba/gp/vgp_sudoers_ext.py +usr/lib/python3.10/site-packages/samba/gp/vgp_symlink_ext.py #usr/lib/python3.10/site-packages/samba/gp_parse usr/lib/python3.10/site-packages/samba/gp_parse/__init__.py usr/lib/python3.10/site-packages/samba/gp_parse/gp_aas.py @@ -296,11 +315,6 @@ usr/lib/python3.10/site-packages/samba/gp_parse/gp_csv.py usr/lib/python3.10/site-packages/samba/gp_parse/gp_inf.py usr/lib/python3.10/site-packages/samba/gp_parse/gp_ini.py usr/lib/python3.10/site-packages/samba/gp_parse/gp_pol.py -usr/lib/python3.10/site-packages/samba/gp_scripts_ext.py -usr/lib/python3.10/site-packages/samba/gp_sec_ext.py -usr/lib/python3.10/site-packages/samba/gp_smb_conf_ext.py -usr/lib/python3.10/site-packages/samba/gp_sudoers_ext.py -usr/lib/python3.10/site-packages/samba/gpclass.py usr/lib/python3.10/site-packages/samba/gpo.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/graph.py usr/lib/python3.10/site-packages/samba/hostconfig.py @@ -375,12 +389,14 @@ usr/lib/python3.10/site-packages/samba/samba3/libsmb_samba_internal.py usr/lib/python3.10/site-packages/samba/samba3/mdscli.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/samba3/param.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/samba3/passdb.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/samba/samba3/smbconf.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/samba3/smbd.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/samdb.py usr/lib/python3.10/site-packages/samba/schema.py usr/lib/python3.10/site-packages/samba/sd_utils.py usr/lib/python3.10/site-packages/samba/security.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/sites.py +usr/lib/python3.10/site-packages/samba/smbconf.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/subnets.py #usr/lib/python3.10/site-packages/samba/subunit usr/lib/python3.10/site-packages/samba/subunit/__init__.py @@ -407,6 +423,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/downgradedatabase.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/mdsearch.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/ndrdump.py +#usr/lib/python3.10/site-packages/samba/tests/blackbox/netads_dns.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/netads_json.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/samba_dnsupdate.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/smbcacls.py @@ -498,7 +515,9 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tgs_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kpasswd_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/nt_hash_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/pac_align_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/protected_users_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/raw_testcase.py #usr/lib/python3.10/site-packages/samba/tests/krb5/rfc4120_constants.py #usr/lib/python3.10/site-packages/samba/tests/krb5/rfc4120_pyasn1.py @@ -521,6 +540,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/ldap_upn_sam_account.py #usr/lib/python3.10/site-packages/samba/tests/libsmb.py #usr/lib/python3.10/site-packages/samba/tests/loadparm.py +#usr/lib/python3.10/site-packages/samba/tests/logfiles.py #usr/lib/python3.10/site-packages/samba/tests/lsa_string.py #usr/lib/python3.10/site-packages/samba/tests/messaging.py #usr/lib/python3.10/site-packages/samba/tests/ndr.py @@ -537,6 +557,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/ntlmdisabled.py #usr/lib/python3.10/site-packages/samba/tests/pam_winbind.py #usr/lib/python3.10/site-packages/samba/tests/pam_winbind_chauthtok.py +#usr/lib/python3.10/site-packages/samba/tests/pam_winbind_setcred.py #usr/lib/python3.10/site-packages/samba/tests/pam_winbind_warn_pwd_expire.py #usr/lib/python3.10/site-packages/samba/tests/param.py #usr/lib/python3.10/site-packages/samba/tests/password_hash.py @@ -606,8 +627,10 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/sddl.py #usr/lib/python3.10/site-packages/samba/tests/security.py #usr/lib/python3.10/site-packages/samba/tests/segfault.py +#usr/lib/python3.10/site-packages/samba/tests/sid_strings.py #usr/lib/python3.10/site-packages/samba/tests/smb-notify.py #usr/lib/python3.10/site-packages/samba/tests/smb.py +#usr/lib/python3.10/site-packages/samba/tests/smbconf.py #usr/lib/python3.10/site-packages/samba/tests/smbd_base.py #usr/lib/python3.10/site-packages/samba/tests/smbd_fuzztest.py #usr/lib/python3.10/site-packages/samba/tests/source.py @@ -624,14 +647,6 @@ usr/lib/python3.10/site-packages/samba/trust_utils.py usr/lib/python3.10/site-packages/samba/upgrade.py usr/lib/python3.10/site-packages/samba/upgradehelpers.py usr/lib/python3.10/site-packages/samba/uptodateness.py -usr/lib/python3.10/site-packages/samba/vgp_access_ext.py -usr/lib/python3.10/site-packages/samba/vgp_files_ext.py -usr/lib/python3.10/site-packages/samba/vgp_issue_ext.py -usr/lib/python3.10/site-packages/samba/vgp_motd_ext.py -usr/lib/python3.10/site-packages/samba/vgp_openssh_ext.py -usr/lib/python3.10/site-packages/samba/vgp_startup_scripts_ext.py -usr/lib/python3.10/site-packages/samba/vgp_sudoers_ext.py -usr/lib/python3.10/site-packages/samba/vgp_symlink_ext.py usr/lib/python3.10/site-packages/samba/werror.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/samba/xattr.py usr/lib/python3.10/site-packages/samba/xattr_native.cpython-310-x86_64-linux-gnu.so diff --git a/lfs/libloc b/lfs/libloc index 8fea42315..579982f11 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -24,8 +24,8 @@

include Config

-VER = 0.9.13 -DB_DATE = 2022-08-04 +VER = 0.9.15 +DB_DATE = 2022-10-15

THISAPP = libloc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,8 +43,8 @@ objects = $(DL_FILE) \ $(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_FILE) location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz

-$(DL_FILE)_BLAKE2 = 5fccd6f0564899499939c63af8975f20b1f7d5267a8cf6c15e14ab377b9d5c008ae5e154c804ac6a1106471aaeebac97dc4ebe6b70fc1e59f416fe2cc02c52a7 -location-$(DB_DATE).db.xz_BLAKE2 = 11b6e9735c911f3dd548fc1759f72ae983eacbe6262f211a4a0080b5b13e3d9704d5080dc9ed0cee289b9ca2643d2adbf266d8a8a25f39129318c3e370a7c9a9 +$(DL_FILE)_BLAKE2 = f3db0fc75ac930805f0df2892b00ffb8f31123a5f28a8cade78f8f1614c0cd806ea365810c5192720d067531b199c342a2c6039f3cd5370c4c9efeded4e31857 +location-$(DB_DATE).db.xz_BLAKE2 = b34b554923a8291ea60ec34c98609da1d71aab66bc1aa2f973ea2e6fd14b6f750559d1e9365df4dd3f707a8dce373aba5f79381c61a4953f272b3557be88af2c

install : $(TARGET)

@@ -77,12 +77,20 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) + + # https://lists.ipfire.org/pipermail/location/2022-October/000596.html + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.15-Makefile-reset-Python-path.patch + + # https://bugzilla.ipfire.org/show_bug.cgi?id=12944 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.15-export-Fix-generating-file-names-for-ipset-output.patch + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-man-pages + --disable-man-pages \ + --with-database-path=/var/lib/location/database.db cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install

diff --git a/lfs/openssh b/lfs/openssh index 302ae6041..452676b70 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@

include Config

-VER = 9.0p1 +VER = 9.1p1

THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 +$(DL_FILE)_BLAKE2 = 287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5

install : $(TARGET)

diff --git a/lfs/samba b/lfs/samba index 67ebebc2f..f743bfa30 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@

include Config

-VER = 4.16.4 +VER = 4.17.0 SUMMARY = A SMB/CIFS File, Print, and Authentication Server

THISAPP = samba-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 87 +PAK_VER = 88

DEPS = avahi cups libtirpc perl-Parse-Yapp perl-JSON

@@ -47,7 +47,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = e685511a76770272cabd1292f36d2b005e2d21212e4782cdf4fd05039f7667b35501873cffa9a53547d523805b2a91ffeba0881aaee905304968c42efef22dfa +$(DL_FILE)_BLAKE2 = d05b17748092bc151b0b627156b1da4a8b30b603569adcef376640745425321617a755add41315af0b38876344323a20185063e131c342c9b6fdcb9542be73f1

install : $(TARGET)

@@ -80,7 +80,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba-4.16.4-glibc-headers.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --libdir=/usr/lib/ \ diff --git a/lfs/tzdata b/lfs/tzdata index 34e7b9fd1..26500bba2 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -24,7 +24,7 @@

include Config

-VER = 2022a +VER = 2022e TZDATA_VER = $(VER) TZCODE_VER = $(VER)

@@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz

-tzdata$(TZDATA_VER).tar.gz_BLAKE2 = 0af5b785a6f5d871b017237ad58d3d9bedd0de38cf18ac51b32cd8df9811215af7af913d8cd3966de695ce65df3f49f52e239196e93b953094763814cc56ecd0 -tzcode$(TZCODE_VER).tar.gz_BLAKE2 = f9b3bb5eedc51896c2a1dd77fe8118518c8a1f35152325fa6c4163e11dd34aeb0c88b16b17a27ad022feb2f6818996ec0e40e06a7e1edd454187f586c3739070 +tzdata$(TZDATA_VER).tar.gz_BLAKE2 = 0c1aa99ac8c8f1a7a10602132da1e61921053ff7ed87449be73c45d23440457f28a2abe4dffd9775c4764e294dd9f92d15d3d401caf07a9d6d046fa27c4148f2 +tzcode$(TZCODE_VER).tar.gz_BLAKE2 = 874dca6d7f347276a87a055853617c8943b3b297fd89c80a3e8d6318c81df15af88f8c58bc05d5088359c30aba0d496089df4835f888c3f76cb0ecf6cd231d3a

install : $(TARGET)

diff --git a/lfs/unbound b/lfs/unbound index 636fe8bf9..3852c2e6a 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@

include Config

-VER = 1.16.3 +VER = 1.17.0

THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = b97deade78ab903363e06ff9d71b9895c754378ec276bb17556de62c48a88af5fbabd26f97fb47313d1e631fe75dee245aa38fbf42a865ac3e764882a1124a51 +$(DL_FILE)_BLAKE2 = 611c1b96ff84e6dd8f7a592135cc17f416cd810d0f35d27c8cedd56af069badd8dca112cc5927a1fe50ec3335c377b6bd6fc4e1a6d63a332a90d676e3c23dcef

install : $(TARGET)

diff --git a/make.sh b/make.sh index e25eeef17..58220d046 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,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.27" # Version number -CORE="171" # Core Level (Filename) +CORE="172" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index b9e4fd2a6..92b5989e9 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -497,6 +497,8 @@ void startDaemon(void) { fprintf(stderr, "OpenVPN is not enabled on any interface\n"); exit(1); } else { + snprintf(command, STRING_SIZE-1, "/etc/fcron.daily/openvpn-crl-updater"); + executeCommand(command); snprintf(command, STRING_SIZE-1, "/sbin/modprobe tun"); executeCommand(command); snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config /var/ipfire/ovpn/server.conf"); diff --git a/src/patches/libloc-0.9.15-Makefile-reset-Python-path.patch b/src/patches/libloc-0.9.15-Makefile-reset-Python-path.patch new file mode 100644 index 000000000..2d2a99887 --- /dev/null +++ b/src/patches/libloc-0.9.15-Makefile-reset-Python-path.patch @@ -0,0 +1,22 @@ +commit bed4777fc99494854335a90c5a6e7fc2e30edf4d +Author: Michael Tremer michael.tremer@ipfire.org +Date: Sat Oct 1 11:56:31 2022 +0000 + + Makefile: Reset Python path + + Signed-off-by: Michael Tremer michael.tremer@ipfire.org + +diff --git a/Makefile.am b/Makefile.am +index 81bd992..ec737d0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -56,8 +56,7 @@ databasedir = $(localstatedir)/lib/location + pkgconfigdir = $(libdir)/pkgconfig + + # Overwrite Python path +-#pkgpythondir = $(pythondir)/location +-pkgpythondir = /usr/lib/python3/dist-packages/location ++pkgpythondir = $(pythondir)/location + + %: %.in Makefile + $(SED_PROCESS) diff --git a/src/patches/libloc-0.9.15-export-Fix-generating-file-names-for-ipset-output.patch b/src/patches/libloc-0.9.15-export-Fix-generating-file-names-for-ipset-output.patch new file mode 100644 index 000000000..19fe42f12 --- /dev/null +++ b/src/patches/libloc-0.9.15-export-Fix-generating-file-names-for-ipset-output.patch @@ -0,0 +1,36 @@ +commit cd214f295797e5cc8dbc296753924863b33ab8bd +Author: Michael Tremer michael.tremer@ipfire.org +Date: Tue Oct 4 08:47:03 2022 +0000 + + export: Fix generating file names for ipset output + + The tag that is being used in the filename was set after creating the + filename. The order has now been fixed and the export works fine for me. + + Fixes: #12944 + Signed-off-by: Michael Tremer michael.tremer@ipfire.org + +diff --git a/src/python/location/export.py b/src/python/location/export.py +index f5ed37f..3f58498 100644 +--- a/src/python/location/export.py ++++ b/src/python/location/export.py +@@ -48,6 +48,9 @@ class OutputWriter(object): + self.family = family + self.directory = directory + ++ # Tag ++ self.tag = self._make_tag() ++ + # Open output file + if f: + self.f = f +@@ -58,9 +61,6 @@ class OutputWriter(object): + else: + self.f = io.StringIO() + +- # Tag +- self.tag = self._make_tag() +- + # Call any custom initialization + self.init() + diff --git a/src/patches/samba-4.16.4-glibc-headers.patch b/src/patches/samba-4.16.4-glibc-headers.patch deleted file mode 100644 index 8c75a4172..000000000 --- a/src/patches/samba-4.16.4-glibc-headers.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider asn@samba.org -Date: Tue, 2 Aug 2022 07:55:46 +0200 -Subject: [PATCH] lib:replace: Only include <sys/mount.h> on non-Linux systems -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Details at: -https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3... - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132 - -Signed-off-by: Andreas Schneider asn@samba.org -Reviewed-by: Ralph Boehme slow@samba.org - -Autobuild-User(master): Ralph Böhme slow@samba.org -Autobuild-Date(master): Tue Aug 2 11:05:14 UTC 2022 on sn-devel-184 ---- - lib/replace/system/filesys.h | 4 +++- - lib/replace/wscript | 3 +++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h -index 034e5d5886c..bb9482c69af 100644 ---- a/lib/replace/system/filesys.h -+++ b/lib/replace/system/filesys.h -@@ -36,7 +36,8 @@ - #include <sys/param.h> - #endif - --#ifdef HAVE_SYS_MOUNT_H -+/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */ -+#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H) - #include <sys/mount.h> - #endif - -@@ -44,6 +45,7 @@ - #include <mntent.h> - #endif - -+/* This include is required on Linux for statfs() */ - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -diff --git a/lib/replace/wscript b/lib/replace/wscript -index 4c774d9f0c3..dd9b19219a1 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -31,6 +31,9 @@ def configure(conf): - - conf.env.standalone_replace = conf.IN_LAUNCH_DIR() - -+ if sys.platform.rfind('linux') > -1: -+ conf.DEFINE('LINUX', '1') -+ - conf.DEFINE('BOOL_DEFINED', 1) - conf.DEFINE('HAVE_LIBREPLACE', 1) - conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) --- -2.30.2 -

hooks/post-receive -- IPFire 2.x development tree