[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5138aaeb9bada2e6dc89bb0b5ea26b762efb1bdd
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 5138aaeb9bada2e6dc89bb0b5ea26b762efb1bdd (commit) via 11a2fce5d13eb9bbe6216a5151f15a4dfc563f0e (commit) via c3e53a041deade09ab81f9ec9ee104736b42a4c6 (commit) via 7d5b68a92c608fa5c58fbd582e38acea1be29abc (commit) via c4df0637a41c8d5fa99c409c29377ae2e60d5640 (commit) via 83681f4f2e725db514733d53599a93d52d330d22 (commit) via 40a3053a67f1fc70cc837fff5b33072605ccd3ec (commit) via 10a2b80cce0b0c1ae2d9f88da6f51c18046c76cc (commit) via 113b93fde619d410273a3282ebfebe01ba71c1b1 (commit) via 21e59055e96bebfe6411b9516cbdddf3ec9856b7 (commit) from 542edad66e46b160cdb2967bff2a0bea2fb48586 (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 5138aaeb9bada2e6dc89bb0b5ea26b762efb1bdd Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 19 22:46:54 2021 +0000
tshark: update to 3.4.7
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 11a2fce5d13eb9bbe6216a5151f15a4dfc563f0e Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 19 10:54:50 2021 +0000
README: Update installation URL
Reported-by: Konrad Panzlaff konrad.panzlaff@pa-bu.de Fixes: #12661 Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c3e53a041deade09ab81f9ec9ee104736b42a4c6 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Jul 14 22:41:39 2021 +0200
tshark: Update to version 3.4.6
- Update from 3.4.3 to 3.4.6 - Update rootfile - Changelog Wireshark 3.4.6 Release Notes What’s New The Windows installers now ship with Npcap 1.31. They previously shipped with Npcap 1.10. The Windows installers now ship with Qt 5.15.2. They previously shipped with Qt 5.12.1. Bug Fixes • wnpa-sec-2021-04[1] DVB-S2-BB dissector infinite loop The following bugs have been fixed: • Macro filters can’t handle escaped characters Issue 17160[2]. • Display filter crashes Wireshark Issue 17316[3]. • IEEE-1588 Signalling Unicast TLV incorrectly reported as being malformed Issue 17355[4]. • IETF QUIC TLS decryption error with extraneous packets during the handshake Issue 17383[5]. • Statistics → Resolved Addresses: multi-protocol (TCP/UDP/…) ports not displayed Issue 17395[6]. New and Updated Features New Protocol Support There are no new protocols in this release. Updated Protocol Support DNP, DVB-S2-BB, ProtoBuf, PTP, QUIC, RANAP, and TACACS New and Updated Capture File Support Ascend, ERF, K12, NetScaler, and pcapng Wireshark 3.4.5 Release Notes What’s New Bug Fixes The following vulnerabilities have been fixed: • wnpa-sec-2021-04[1] MS-WSP dissector excessive memory consumption. Issue 17331[2]. The following bugs have been fixed: • TShark does not print GeoIP information Issue 14691[3]. • TShark error when piping to "head" Issue 16192[4]. • Parts of ASCII representation in Packet Bytes pane are missing Issue 17087[5]. • Buildbot crash output: fuzz-2021-02-22-1012761.pcap Issue 17254[6]. • NDPE attribute of NAN packet is not dissected Issue 17278[7]. • TECMP: reserved flag interpreted as part of timestamp Issue 17279[8]. • Master branch does not compile at least with gcc-11 Issue 17281[9]. • DNS IXFR/AXFR multiple response Issue 17293[10]. • File too large Issue 17301[11]. • Build fails with CMake 3.20 Issue 17314[12]. New and Updated Features New Protocol Support There are no new protocols in this release. Updated Protocol Support DECT, DNS, EAP, Kerberos, LDAP, MS-WSP, SMB2, Sysdig, TECMP, and WiFi NAN New and Updated Capture File Support pcapng Wireshark 3.4.4 Release Notes What’s New Bug Fixes The following vulnerabilities have been fixed: • wnpa-sec-2021-03[1] Wireshark could open unsafe URLs. Issue 17232[2]. CVE-2021-22191[3]. The following bugs have been fixed: • NTP Version 3 Client Decode PDML output issue (Reference ID Issue) Issue 17112[4]. • 3.4.2: public wireshark include files are including build time "config.h" Issue 17190[5]. • wireshark-3.4.3/epan/dissectors/packet-s7comm.c:3521: bad array index ? Issue 17198[6]. • SIP protocol: P-Called-Party-ID header mixed up with P-Charge-Info header Issue 17215[7]. • Asterix CAT010 Decode Error Issue 17226[8]. • _ws.expert columns not populated for IPv4 Issue 17228[9]. • Buildbot crash output: fuzz-2021-02-12-1651908.pcap Issue 17233[10]. • gQUIC: Wireshark 3.4.3 fails to dissect a packet (gQUIC q024) that v3.2.6 succeeds. Issue 17250[11]. New and Updated Features New Protocol Support There are no new protocols in this release. Updated Protocol Support ASTERIX, Frame Relay, GQUIC, NTP, NVMe Fabrics RDMA, S7COMM, and SIP New and Updated Capture File Support iSeries
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7d5b68a92c608fa5c58fbd582e38acea1be29abc Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Jul 14 22:41:23 2021 +0200
tftpd: Update to version 5.2
- Update from 0.48 (2007) to 5.2 (2011) Version 5.2 is the last update made to this program - Update to rootfile - Changelog Changes in 5.2: Fix breakage on newer Linux when a single interface has multiple IP addresses. Changes in 5.1: Add -P option to write a PID file. Patch by Ferenc Wagner. Bounce the syslog socket in standalone mode, in case the syslog daemon has been restarted. Patch by Ferenc Wagner. Build fixes. Fix handling of block number wraparound after a successful options negotiation. Fix a buffer overflow in option parsing. Changes in 5.0: Try to on platforms with getaddrinfo() without AI_ADDRCONFIG or AI_CANONNAME. Implement the "rollover" option, for clients which want block number to rollover to anything other than zero. Correctly disable PMTU in standalone mode. Patch by Florian Lohoff. Changes in 0.49: Add IPv6 support. Patch by Karsten Keil. Support systems with editline instead of readline. Support long options in the server.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c4df0637a41c8d5fa99c409c29377ae2e60d5640 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Jul 14 13:37:12 2021 +0200
samba: Update version to 4.14.6
- Update from 4.14.4 to 4.14.6 - Update of rootfile not required - Changelog Release Notes for Samba 4.14.6 * BUG 14722: s3: lib: Fix talloc heirarcy error in parent_smb_fname(). * BUG 14732: smbd: Fix pathref unlinking in create_file_unixpath(). * BUG 14734: s3: VFS: default: Add proc_fd's fallback for vfswrap_fchown(). * BUG 14736: s3: smbd: Remove erroneous TALLOC_FREE(smb_fname_parent) in change_file_owner_to_parent() error path. * BUG 14730: NT_STATUS_FILE_IS_A_DIRECTORY error messages when using glusterfs VFS module. * BUG 14734: s3/modules: fchmod: Fallback to path based chmod if pathref. * BUG 14740: Spotlight RPC service doesn't work with vfs_glusterfs. * BUG 14750: gensec_krb5: Restore ipv6 support for kpasswd. * BUG 14752: smbXsrv_{open,session,tcon}: protect smbXsrv_{open,session,tcon}_global_traverse_fn against invalid records. * BUG 14027: samba-tool domain backup offline doesn't work against bind DLZ backend. * BUG 14669: netcmd: Use next_free_rid() function to calculate a SID for restoring a backup. Release Notes for Samba 4.14.5 * BUG 14696: s3: smbd: SMB1 SMBsplwr doesn't send a reply packet on success. * BUG 14708: s3: smbd: Ensure POSIX default ACL is mapped into returned Windows ACL for directory handles. * BUG 14721: s3: smbd: Fix uninitialized memory read in process_symlink_open() when used with vfs_shadow_copy2(). * BUG 14689: docs: Expand the "log level" docs on audit logging. * BUG 14714: smbd: Correctly initialize close timestamp fields. * BUG 14699: Fix gcc11 compiler issues. * BUG 14718: docs-xml: Update smbcacls manpage. * BUG 14719: docs: Update list of available commands in rpcclient. * BUG 14475: ctdb: Fix a crash in run_proc_signal_handler(). * BUG 14695: s3:winbind: For 'security = ADS' require realm/workgroup to be set. * BUG 14699: lib:replace: Do not build strndup test with gcc 11 or newer.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 83681f4f2e725db514733d53599a93d52d330d22 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 19 18:21:49 2021 +0000
core159: add mountkernfs script to update
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 40a3053a67f1fc70cc837fff5b33072605ccd3ec Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jul 16 11:14:13 2021 +0000
libvirtd: Enable required cgroups
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 10a2b80cce0b0c1ae2d9f88da6f51c18046c76cc Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jul 16 11:14:12 2021 +0000
mountkernfs: Mount cgroup2 hierarchy
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 113b93fde619d410273a3282ebfebe01ba71c1b1 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Jul 16 13:12:58 2021 +0200
libcdada: Patch file to allow build to work with GCC 11 and update version to 0.3.5
- Update from 0.3.4 to 0.3.5 - Created libcdada-0.3.5-Werror.patch based on the gentoo 0.3.5 patch to remove -Werror flags from the configure. This was flagging up warnings as errors and stopping the build - Removed the SUP_ARCH line to allow it to build again - Added --without-tests and --without-checks to the ./configure statement. This prevents the test and checks being built - Removed libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch as no longer needed with the tests and checks no longer being built - No update required for rootfile - Changelog v0.3.5 (20th April 2021) New - Improved public API documentation - build: add --without-tests --without-examples build options Bug fix - Fix `E_EMPTY` return codes set/map/list/stack/queue - Fix `make check` when valgrind is not installed
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 21e59055e96bebfe6411b9516cbdddf3ec9856b7 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Jul 16 13:12:57 2021 +0200
pmacct: Patch file to allow build to work with GCC 11
- Created pmacct-1.7.6-Werror.patch to remove -Werror flags from the configure This was flagging up warnings as errors and stopping the build - Removed the SUP_ARCH line to allow it to build again - No update required to the rootfile
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cdrom/README.txt | 3 +- config/rootfiles/core/159/filelists/files | 1 + config/rootfiles/packages/tftpd | 8 ++-- config/rootfiles/packages/tshark | 4 +- lfs/libcdada | 18 +++---- lfs/libvirt | 2 +- lfs/pmacct | 17 +++---- lfs/samba | 6 +-- lfs/tftpd | 8 ++-- lfs/tshark | 8 ++-- src/initscripts/packages/libvirtd | 7 ++- src/initscripts/system/mountkernfs | 5 ++ ...ared-library-for-tests-and-examples-build.patch | 56 ---------------------- src/patches/libcdada-0.3.5-Werror.patch | 24 ++++++++++ src/patches/pmacct-1.7.6-Werror.patch | 38 +++++++++++++++ 15 files changed, 113 insertions(+), 92 deletions(-) delete mode 100644 src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch create mode 100644 src/patches/libcdada-0.3.5-Werror.patch create mode 100644 src/patches/pmacct-1.7.6-Werror.patch
Difference in files: diff --git a/config/cdrom/README.txt b/config/cdrom/README.txt index e342bc401..e42df6744 100644 --- a/config/cdrom/README.txt +++ b/config/cdrom/README.txt @@ -5,10 +5,11 @@ Installation ------------
Please read the IPFire Installation manual before installing the firewall. -This document is located on our wiki (http://wiki.ipfire.org/en/installation/start) +This document is located on our wiki (https://wiki.ipfire.org/installation) It will guide you through the installation process and will help you make the necessary decisions during the installation process.
+ License -------
diff --git a/config/rootfiles/core/159/filelists/files b/config/rootfiles/core/159/filelists/files index a788f2c3b..3cc1b7969 100644 --- a/config/rootfiles/core/159/filelists/files +++ b/config/rootfiles/core/159/filelists/files @@ -1,5 +1,6 @@ etc/rc.d/init.d/firewall etc/rc.d/init.d/leds +etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/sysctl usr/local/bin/makegraphs diff --git a/config/rootfiles/packages/tftpd b/config/rootfiles/packages/tftpd index eb1965740..377f8a21e 100644 --- a/config/rootfiles/packages/tftpd +++ b/config/rootfiles/packages/tftpd @@ -1,6 +1,6 @@ +etc/rc.d/init.d/tftpd usr/bin/tftp -#usr/man/man1/tftp.1 -#usr/man/man8/in.tftpd.8 -#usr/man/man8/tftpd.8 usr/sbin/tftpd -etc/rc.d/init.d/tftpd +#usr/share/man/man1/tftp.1 +#usr/share/man/man8/in.tftpd.8 +#usr/share/man/man8/tftpd.8 diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark index dbe9488fd..f46d7ba01 100644 --- a/config/rootfiles/packages/tshark +++ b/config/rootfiles/packages/tshark @@ -620,10 +620,10 @@ usr/bin/tshark #usr/include/wireshark/wsutil/xtea.h #usr/lib/libwireshark.so usr/lib/libwireshark.so.14 -usr/lib/libwireshark.so.14.0.3 +usr/lib/libwireshark.so.14.0.7 #usr/lib/libwiretap.so usr/lib/libwiretap.so.11 -usr/lib/libwiretap.so.11.0.3 +usr/lib/libwiretap.so.11.0.7 #usr/lib/libwsutil.so usr/lib/libwsutil.so.12 usr/lib/libwsutil.so.12.0.0 diff --git a/lfs/libcdada b/lfs/libcdada index f1470ea05..201cd8351 100644 --- a/lfs/libcdada +++ b/lfs/libcdada @@ -24,7 +24,7 @@
include Config
-VER = 0.3.4 +VER = 0.3.5
THISAPP = libcdada-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,9 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libcdada -PAK_VER = 1 +PAK_VER = 2
-SUP_ARCH = none
DEPS =
@@ -46,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f5067835014e02d221af9754df8b140b +$(DL_FILE)_MD5 = adbd5fef042d34b9fff01ceedb81b5ee
install : $(TARGET)
@@ -79,11 +78,14 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libcdada-0.3.5-Werror.patch cd $(DIR_APP) && ./autogen.sh - cd $(DIR_APP)/build && ../configure \ - --prefix=/usr \ - --disable-static + cd $(DIR_APP) && autoupdate + cd $(DIR_APP)/build && ../configure \ + --prefix=/usr \ + --disable-static \ + --without-tests \ + --without-examples cd $(DIR_APP)/build && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libvirt b/lfs/libvirt index 28a95d317..b680cbb3d 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 25 +PAK_VER = 26
DEPS = ebtables libpciaccess libtirpc libyajl ncat qemu
diff --git a/lfs/pmacct b/lfs/pmacct index 5674ecc1b..2307f8c87 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -32,9 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pmacct -PAK_VER = 1 +PAK_VER = 2
-SUP_ARCH = none
DEPS = libcdada
@@ -79,13 +78,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && rm configure + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/pmacct-1.7.6-Werror.patch cd $(DIR_APP) && ./autogen.sh - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/pmacct \ - --enable-sqlite3 \ - --enable-l2 \ - --enable-jansson + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/pmacct \ + --enable-sqlite3 \ + --enable-l2 \ + --enable-jansson # Add directory for plugins and pipes -mkdir -v /var/spool/pmacct # Add configuration folder and copy conf file to it diff --git a/lfs/samba b/lfs/samba index 4c6ebddf6..bcb65668a 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@
include Config
-VER = 4.14.4 +VER = 4.14.6
THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 80 +PAK_VER = 81
DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 171629ad42b4b303107e8b0fff942a1f +$(DL_FILE)_MD5 = 0e6b5607ad37209a5a10235579fa9765
install : $(TARGET)
diff --git a/lfs/tftpd b/lfs/tftpd index 81f9f3c95..aec900d8a 100644 --- a/lfs/tftpd +++ b/lfs/tftpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 0.48 +VER = 5.2
THISAPP = tftp-hpa-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tftpd -PAK_VER = 1 +PAK_VER = 2
DEPS =
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f2e0a1ca0c49ae46ecad26a54df3e887 +$(DL_FILE)_MD5 = 46c9bd20bbffa62f79c958c7b99aac21
install : $(TARGET)
diff --git a/lfs/tshark b/lfs/tshark index baa8bfa41..5c62d0968 100644 --- a/lfs/tshark +++ b/lfs/tshark @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 3.4.3 +VER = 3.4.7
THISAPP = wireshark-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tshark DEPS = krb5 c-ares -PAK_VER = 10 +PAK_VER = 11
############################################################################### # Top-level Rules @@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7988932a5e3930fa6035b8f8b584f0d8 +$(DL_FILE)_MD5 = 4954b93a4ea4936f2bed5718e44040c5
install : $(TARGET)
diff --git a/src/initscripts/packages/libvirtd b/src/initscripts/packages/libvirtd index 40bc6bee3..f0a0b1e8a 100644 --- a/src/initscripts/packages/libvirtd +++ b/src/initscripts/packages/libvirtd @@ -20,9 +20,14 @@ case $1 in boot_mesg "Load required kernel modules for Libvirt" modprobe tun vhost_net evaluate_retval + + # Enable required cgroup controllers + if [ -d "/sys/fs/cgroup" ]; then + echo "+cpu +io" > /sys/fs/cgroup/cgroup.subtree_control + fi + boot_mesg "Starting Libvirt Daemon..." loadproc /usr/sbin/libvirtd -d - ;;
stop) diff --git a/src/initscripts/system/mountkernfs b/src/initscripts/system/mountkernfs index f0bfc5289..264da24c4 100644 --- a/src/initscripts/system/mountkernfs +++ b/src/initscripts/system/mountkernfs @@ -34,6 +34,11 @@ case "${1}" in mount -n -t tmpfs -o nosuid,nodev,mode=755,size=8M /run /run || failed=1 fi
+ if ! mountpoint /sys/fs/cgroup &> /dev/null; then + boot_mesg -n " /sys/fs/cgroup" ${NORMAL} + mount -t cgroup2 none /sys/fs/cgroup || failed=1 + fi + # create folder for dhcpcd changeroot mkdir -p /run/dhcpcd/chroot chown dhcpcd:dhcpcd /run/dhcpcd/chroot diff --git a/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch b/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch deleted file mode 100644 index adb06ad9d..000000000 --- a/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ruN libcdada-0.3.4.orig/examples/Makefile.am libcdada-0.3.4/examples/Makefile.am ---- libcdada-0.3.4.orig/examples/Makefile.am 2021-01-15 00:01:59.000000000 +0100 -+++ libcdada-0.3.4/examples/Makefile.am 2021-02-28 15:41:13.940082099 +0100 -@@ -11,32 +11,32 @@ - - list_u32_SOURCES = list_u32.c - list_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --list_u32_LDADD = ../src/.libs/libcdada.a -lstdc++ -+list_u32_LDADD = ../src/.libs/libcdada.so -lstdc++ - - map_struct_SOURCES = map_struct.c - map_struct_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --map_struct_LDADD = ../src/.libs/libcdada.a -lstdc++ -+map_struct_LDADD = ../src/.libs/libcdada.so -lstdc++ - - custom_gen_SOURCES = custom-gen/my_program_gen.c custom-gen/cdada.cc - custom_gen_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --custom_gen_LDADD = ../src/.libs/libcdada.a -lstdc++ -+custom_gen_LDADD = ../src/.libs/libcdada.so -lstdc++ - - custom_macro_SOURCES = custom-macro/my_program.c custom-macro/cdada.cc - custom_macro_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --custom_macro_LDADD = ../src/.libs/libcdada.a -lstdc++ -+custom_macro_LDADD = ../src/.libs/libcdada.so -lstdc++ - - str_SOURCES = str.c - str_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --str_LDADD = ../src/.libs/libcdada.a -lstdc++ -+str_LDADD = ../src/.libs/libcdada.so -lstdc++ - - bbitmap_SOURCES = bbitmap.c - bbitmap_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --bbitmap_LDADD = ../src/.libs/libcdada.a -lstdc++ -+bbitmap_LDADD = ../src/.libs/libcdada.so -lstdc++ - - queue_u32_SOURCES = queue_u32.c - queue_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --queue_u32_LDADD = ../src/.libs/libcdada.a -lstdc++ -+queue_u32_LDADD = ../src/.libs/libcdada.so -lstdc++ - - stack_u32_SOURCES = stack_u32.c - stack_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --stack_u32_LDADD = ../src/.libs/libcdada.a -lstdc++ -+stack_u32_LDADD = ../src/.libs/libcdada.so -lstdc++ -diff -ruN libcdada-0.3.4.orig/test/Makefile.am libcdada-0.3.4/test/Makefile.am ---- libcdada-0.3.4.orig/test/Makefile.am 2021-01-15 00:01:59.000000000 +0100 -+++ libcdada-0.3.4/test/Makefile.am 2021-02-28 15:40:37.458117227 +0100 -@@ -63,7 +63,7 @@ - benchmark_SOURCES= benchmark.cc - benchmark_CXXFLAGS= -O3 - benchmark_CPPFLAGS= -I$(top_builddir)/include/ -I$(top_srcdir)/include/ --benchmark_LDADD= -lpthread ../src/.libs/libcdada.a -+benchmark_LDADD= -lpthread ../src/.libs/libcdada.so - - #Valgrind - if VALGRIND_ENABLED diff --git a/src/patches/libcdada-0.3.5-Werror.patch b/src/patches/libcdada-0.3.5-Werror.patch new file mode 100644 index 000000000..94ceb4502 --- /dev/null +++ b/src/patches/libcdada-0.3.5-Werror.patch @@ -0,0 +1,24 @@ +diff --git a/configure.ac b/configure.ac +index f2c4dde..fbde89c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,7 @@ AC_INIT(LIBCDADA, m4_esyscmd_s(cat VERSION), marcdevel@gmail.com, libcdada, http + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) + + AC_GNU_SOURCE + +@@ -24,8 +24,8 @@ LT_INIT + AC_ENABLE_STATIC + + # Some useful default flags +-CFLAGS="-std=gnu89 -Werror -Wall $CFLAGS" +-CXXFLAGS="-Werror -Wall $CXXFLAGS" ++CFLAGS="-std=gnu89 -Wall $CFLAGS" ++CXXFLAGS="-Wall $CXXFLAGS" + AC_DEFINE([__STDC_FORMAT_MACROS], [], [Description]) + + # Check for Python3 diff --git a/src/patches/pmacct-1.7.6-Werror.patch b/src/patches/pmacct-1.7.6-Werror.patch new file mode 100644 index 000000000..57bb7d1ff --- /dev/null +++ b/src/patches/pmacct-1.7.6-Werror.patch @@ -0,0 +1,38 @@ +--- pmacct-1.7.6/configure.ac.orig 2021-02-05 02:07:36.000000000 +0100 ++++ pmacct-1.7.6/configure.ac 2021-07-15 19:58:37.247916727 +0200 +@@ -1153,9 +1153,9 @@ AC_ARG_ENABLE(debug, + AC_MSG_RESULT(yes) + tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'` + CFLAGS="$tmp_CFLAGS" +- CFLAGS="$CFLAGS -g -Wall -Werror" ++ CFLAGS="$CFLAGS -g -Wall" + else +- CFLAGS="$CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS -Wall" + AC_MSG_RESULT(no) + fi + ], + + +--- pmacct-1.7.6/src/external_libs/libcdada/configure.ac.orig 2021-02-07 16:29:15.000000000 +0100 ++++ pmacct-1.7.6/src/external_libs/libcdada/configure.ac 2021-07-16 09:04:30.858749121 +0200 +@@ -4,7 +4,7 @@ AC_INIT(LIBCDADA, m4_esyscmd_s(cat VERSI + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) + + AC_GNU_SOURCE + +@@ -24,8 +24,8 @@ LT_INIT + AC_ENABLE_STATIC + + # Some useful default flags +-CFLAGS="-std=gnu89 -Werror -Wall $CFLAGS" +-CXXFLAGS="-Werror -Wall $CXXFLAGS" ++CFLAGS="-std=gnu89 -Wall $CFLAGS" ++CXXFLAGS="-Wall $CXXFLAGS" + AC_DEFINE([__STDC_FORMAT_MACROS], [], [Description]) + + # Check for Python3
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter