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 d6fc413aea8c863587a4793b320ab2db6c29eb5d (commit) via b8ffb101f86d40c68482c8a305b760a382036d78 (commit) via 28fdd8ede6b241144e1aa3a05ac2c5ac82d56ae3 (commit) via 0469187ca03c808f23521caf5e4749a41d3a95b2 (commit) from 3a5ba6cf97322c9c931b841d72a3642109b2718c (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 d6fc413aea8c863587a4793b320ab2db6c29eb5d Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Apr 12 12:34:11 2022 +0200
ipvsadm: Update to version 1.31
- Update from 1.29 to 1.31 - Update of rootfile not required - Changelog Version 1.31 In ipvsadm(8) add using nft or an eBPF program to set a packet mark Add --pe sip option in ipvsadm(8) man page ipvsadm: allow tunneling with gre encapsulation Merge branch 'GUE-encap' ipvsadm: allow tunneling with gue encapsulation ipvsadm: convert options to unsigned long long Version 1.30 Merge: ipvsadm: Document/add support for fo/ovf/mh schedulers Add support for mh scheduler Document support of ovf scheduler Document support of fo scheduler libipvs: fix some buffer sizes libipvs: discrepancy with libnl genlmsg_put ipvsadm: catch the original errno from netlink answer Version 1.29 ipvsadm: new attributes for sync daemon ipvsadm: support 64-bit stats and rates
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit b8ffb101f86d40c68482c8a305b760a382036d78 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Apr 12 12:34:28 2022 +0200
keepalived: Update to version 2.2.7
- Update from 2.2.4 to 2.2.7 - Update of rootfile - Changelog Release 2.2.7 brings lots of improvements and fix some minor issues reported. It add some new VRRP features as well. Stability has been even more extended. New ipvs: Add support to twos scheduler. vrrp: Add vrf option for unicast without specifying an interface. vrrp: Add option unicast_fault_no_peer. Previously if unicast_src_ip (or any other unicast option) was specified, but no unicast peers were configured, then the VRRP instance would operate in multicast mode. A user has identified that, due to automatic configuration generation, they could have a configuration that should operate in unicast mode, but that no unicast peers were configured. In this case, they did not want the VRRP instance to revert to multicast mode. In order to maintain backward compatibility, keepalived can’t simply change to not allowing no unicast peers. Instead, this commit adds the configuration option “unicast_fault_no_peer”, which if specified causes the VRRP instance to go to fault state if no unicast peers are configured. vrrp: Allow specification of multicast address to be used. vrrp: Add vrf option to static and vrrp routes. vrrp: Add option to resend vrrp states on fifos after reload. Since keepalived restarts FIFOs scripts it is managing when a reload occurs, it can be helpful to send the VRRP instance and group states after a reload. This commit adds option fifo_write_vrrp_states_on_reload to do that, and it means that what is written to the FIFOs with default configuration does not change. vrrp: Allow duplication of VRIDs on an interface with unicast peers. If two VRRP instances are using unicast peers and there is no overlap of unicast peers between the vrrp instances, then the vrrp instances can use the same VRIDs. global: Don’t assume running as user root. systemd: Add keepalived-non-root.service systemd service file. keepalived-non-root.service allows keepalived to be run as a non root user, but with specific added capabilities to allow all the functionality that keepalived needs. Improvements vrrp: Stop receiving any data on garp and ndisc sockets. This is a send-only channel. vrrp: Open gratuitous ARP socket as an ARP socket rather than RARP. Now that the receiving of packets on the garp socket has been stopped, we can open the socket with the correct type of binding, and we won’t have a queue of received messages build up. vrrp: Extend cBPF filtering code to support standard definition. vrrp: Optimise nftables configuration to limit some rules to macvlans. If we are moving messages that have been generated on a macvlan, we nftables rules can be optimised to restrict them to macvlan interfaces. vrrp: Drop ICMPV6 Router Solicitation messages from vmac interfaces. When we create a vmac interface, a short time afterwards the kernel sends a router solicition message with the source MAC address of the vmac interface. The problem is that this will upset snooping switches if the VRRP instance is in backup state. Furthermore, we can’t simply move the packet onto the underlying interface since the ICMPV6 payload also contains the MAC address of the vmac interface. We can’t just change the MAC address in the ICMPV6 message, since there is also a checksum which would need to be recalculated. The only solution at the moment is to drop the packet. This shouldn’t be a problem since the underlying interface should have sent a Router solicitation message when it came up. vrrp: Add option to specify MAC address for VMACs. vrrp: Don’t lose some configuration faults. The following errors were being detected in vrrp_complete_instance() and the VRRP instance was then supposed to be put into fault state since it couldn’t operate. However, the need to go to fault state was subsequently being lost. The configuration errors that were being lost were: (a) Configuring use of a VMAC on a non Ethernet interface (b) Attempting to use multicast on an interface that doesn’t support it (c) Using an ipvlan without a source IP address (d) ipvlan address family not matching VRRP isntance’s (e) VRID conflicts on an interface which could be deleted an recreated on a different interface (f) An interface specified for a VIP is the same as the VRRP instance’s VMAC or another VRRP instance’s VMAC. This improvement ensures that the VRRP instance will be put into, and remain in, fault state, since it cannot successfully operate. As can be seen from the list of circumstances above, they were very unlikely to occur, but were possible. vrrp: Bind IPv6 socket to multicast address. Previously IPv6 sockets were being bound to the ::1 address, since trying to bind to the multicast address was failing. The reason for failing has now been discovered to be that the scope_id needed to be set (i.e. the interface index), since the multicast addresses that we use are link-local multicast addresses. This improvement now sets the scope_id, so the socket can successfully be bound to the multicast address. vrrp: Set IPV6_MULTICAST_ALL on IPv6 sockets if available. vrrp: Some SNMP extension and improvements: - Correct FastOpenNoCookie and L3Mdev variable types - Don’t write multicast address to SNMP when using unicast. - Don’t write unconfigured LVS sync daemon address to SNMP. - Define and use SNMP_TruthValue. - Define and use SNMP_InetAddressType. - Correct reporting accept mode for VRRPv3 SNMP. vrrp: Misc DBus improvements (Opening, logging, data_dir, policy, …) vrrp: Handle VMAC’s interface changing on reload properly. vrrp: If accept traffic for VIPs changes on reload, update firewall. vrrp: Stop going to backup if reload IPv6 and change vmac_xmit_base. vrrp: Add add/prepend/append options to static and virtual routes. The kernel by default prepends routes, whereas the ip (iproute2) utility be default adds routes (adding a route does not allow duplicates whereas appending or prepending does). keepalived previously has not set the flags relating to this, and so has always prepended routes. This means that duplicate routes could be created. lib: Update Red Black tree code to Linux 5.15-rc4. script: Extend sample_notify_fifo.sh. doc: Misc documentation updates. docker: Upate docker file. init: Init handling extensions. Make parent process exit with meaningful status on error. Ensure systemd is not notified of successful start if failed. fix building without systemd notify suport. bfd: handle unexpected closure of pipe to checker and vrrp processes. If the parent process abnormally terminates and then the BFD process terminates due to PDEATHSIG before the vrrp or checker processes terminate, the vrrp and checker processes can get a read error on the pipes used to communicate with the BFD process. bfd: make BFD work when IPv6 disabled on system. Fixes lib: Fix calculating CLOCK_REALTIME and CLOCK_MONOTONIC offsets. lib: scheduler: Handle cancelling timer thread on ready queue. The timer thread on the ready queue, if cancelled, was corrupting the read list_head, since it assumed it was on a red black tree. snap: Fix building snaps. ipvs: Fix building with glibc prior to v2.19 (released 2014). bfd: Handle interface down/address missing when keepalived starts. This resolves a segfault, and also makes bfd retry once per minute to create send socket if it cannot do so due to no address to bind to on an interface. vrrp: Fix unicast with interface in a VRF domain. vrrp: Fix moving excess VIPs to eVIPs, by properly handling vip_cnt. vrrp: Fix configured IPv6 multicast addresses with VMACs. Using different multicast addresses with IPv6 on the same interface without using VMACs is only supported if the kernel supports IPV6_MULTICAST_ALL (from Linux v4.20). vrrp: Fix checking for unicast with VMAC/ipvlan and no peers. vrrp: Fix checking if have unicast ppers if unicast_ttl specified. vrrp: Don’t segfault if duplicate VMAC name, but ignore second name. vrrp: Don’t delete and recreate VMAC on reload if only VRID has changed. There seems to be an issue deleting and then immediately recreating a VMAC on the same interface. This commit therefore simply changes the MAC address if the only change is the VRID. vrrp: Fix nftables config if VMAC interface changed on reload. vrrp: Don’t segfault if don’t have permission for ARP/NDISC socket. vrrp: Fix IPv6 with vmac_xmit_base. vrrp: fix disabling vmac-xmit-base with VRRPv3 IPv6 use_vmac. vrrp: Fix specifying user/group for vrrp_scripts.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 28fdd8ede6b241144e1aa3a05ac2c5ac82d56ae3 Author: Peter Müller peter.mueller@ipfire.org Date: Sun Apr 24 19:01:13 2022 +0000
Core Update 168: Ship procps
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 0469187ca03c808f23521caf5e4749a41d3a95b2 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Apr 23 23:26:55 2022 +0200
procps: Update to version v4.0.0
- Update from v3.3.16 to v4.0.0 - added --disable-static to ./configure to remove static libs from rootfile - Update of rootfile - Changed lib name. Ran ./make.sh find-dependencies. No dependencies on old libraries - Changelog procps-ng-4.0.0 * Rename pwait to pidwait * free: Add committed line option merge #25 * free: Fix -h --si combined options issue #133, #223 * free: Fix first column justification issue #229, #204, #206, Debian #1001689 * free: Better spacing for Chinese language issue #213 * library: renamed to libproc-2 and reset to 0:0:0 * library: add support for accessing smaps_rollup issue #112, #201 * library: add support for accessing autogroups * library: add support for LIBPROC_HIDE_KERNEL env var merge #147 * library: add support for cpu utilization to pids i/f * pkill: Check for lt- variants of program name issue #192 * pgrep: Add newline after regex error message merge #91 * pgrep: Fix selection where uid/gid > 2^31 merge !146 * pgrep: Select on cgroup v2 paths issue #168 * ps: Add OOM and OOMADJ fields issue #198 * ps: Add IO Accounting fields issue #184 * ps: Add PSS and USS fields issue #112 * ps: Add two new autogroup fields * ps: Ignore SIGURG merge !142 * slabtop: Don't combine d and o options issue #160 * sysctl: Add support for systemd glob patterns issue #191 * sysctl: Check resolved path to be under /proc/sys issue #179 * sysctl: return non-zero if EINVAL return for write merge #76 * sysctl.conf.5: Note max line length issue #77 * top: added LOGID similar to 3.3.13 ps LUID * top: added EXE identical to 3.3.17 ps EXE * top: exploit some library smaps_rollup provisions issue #112 * top: added four new IO accounting fields issue #184 * top: 'F' key is now a new forest view 'focus' toggle * top: summary area memory lines can print two abreast * top: added two new autogroup fields * top: added long versions of command line options * top: added cpu utilization & 2 time related fields * top: the time related fields can now be user scaled * uptime: print short/pretty format correctly issue #217 * vmstat: add -y option to remove first line merge !72 procps-ng-3.3.17 * library: Incremented to 8:3:0 (no removals or additions, internal changes only) * all: properly handle utf8 cmdline translations issue #176 * kill: Pass int to signalled process merge #32 * pgrep: Pass int to signalled process merge #32 * pgrep: Check sanity of SG_ARG_MAX issue #152 * pgrep: Add older than selection merge #79 * pidof: Quiet mode merge #83 * pidof: show worker threads Redhat #1803640 * ps.1: Mention stime alias issue #164 * ps: check also match on truncated 16 char comm names * ps: Add exe output option Redhat #1399206 * pwait: New command waits for a process merge #97 * sysctl: Match systemd directory order Debian #950788 * sysctl: Document directory order Debian #951550 * top: ensure config file backward compatibility Debian #951335 * top: add command line 'e' for symmetry with 'E' issue #165 * top: add '4' toggle for two abreast cpu display issue #172 * top: add '!' toggle for combining multiple cpus * top: fix potential SEGV involving -p switch merge #114 * vmstat: Wide mode gives wider proc columns merge #48 * watch: Add environment variable for interval merge #62 * watch: Add no linewrap option issue #182 * watch: Support more colors merge #106,#109 * free,uptime,slabtop: complain about extra ops issue #181
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/procps | 44 ++++++++++------------ .../{oldcore/103 => core/168}/filelists/procps | 0 config/rootfiles/core/168/update.sh | 1 + config/rootfiles/packages/keepalived | 5 +-- lfs/ipvsadm | 6 +-- lfs/keepalived | 6 +-- lfs/procps | 7 ++-- 7 files changed, 32 insertions(+), 37 deletions(-) copy config/rootfiles/{oldcore/103 => core/168}/filelists/procps (100%)
Difference in files: diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps index fc7d9326e..144af75d7 100644 --- a/config/rootfiles/common/procps +++ b/config/rootfiles/common/procps @@ -1,16 +1,16 @@ bin/kill bin/ps -#lib/libprocps.a -#lib/libprocps.la -#lib/libprocps.so -lib/libprocps.so.8 -lib/libprocps.so.8.0.2 +#lib/libproc-2.la +#lib/libproc-2.so +lib/libproc-2.so.0 +lib/libproc-2.so.0.0.0 #lib/pkgconfig -#lib/pkgconfig/libprocps.pc +#lib/pkgconfig/libproc-2.pc sbin/sysctl usr/bin/free usr/bin/pgrep usr/bin/pidof +usr/bin/pidwait #usr/bin/pkill #usr/bin/pmap #usr/bin/pwdx @@ -20,23 +20,19 @@ usr/bin/top usr/bin/vmstat usr/bin/w usr/bin/watch -#usr/include/proc -#usr/include/proc/alloc.h -#usr/include/proc/devname.h -#usr/include/proc/escape.h -#usr/include/proc/numa.h -#usr/include/proc/procps.h -#usr/include/proc/pwcache.h -#usr/include/proc/readproc.h -#usr/include/proc/sig.h -#usr/include/proc/slab.h -#usr/include/proc/sysinfo.h -#usr/include/proc/version.h -#usr/include/proc/wchan.h -#usr/include/proc/whattime.h +#usr/include/procps +#usr/include/procps/diskstats.h +#usr/include/procps/meminfo.h +#usr/include/procps/misc.h +#usr/include/procps/pids.h +#usr/include/procps/slabinfo.h +#usr/include/procps/stat.h +#usr/include/procps/vmstat.h +#usr/include/procps/xtra-procps-debug.h #usr/share/doc/procps-ng #usr/share/doc/procps-ng/FAQ #usr/share/doc/procps-ng/bugs.md +#usr/share/doc/procps-ng/libproc.supp #usr/share/locale/de/LC_MESSAGES/procps-ng.mo #usr/share/locale/fr/LC_MESSAGES/procps-ng.mo #usr/share/locale/pl/LC_MESSAGES/procps-ng.mo @@ -49,9 +45,9 @@ usr/bin/watch #usr/share/man/man1/kill.1 #usr/share/man/man1/pgrep.1 #usr/share/man/man1/pidof.1 +#usr/share/man/man1/pidwait.1 #usr/share/man/man1/pkill.1 #usr/share/man/man1/pmap.1 -#usr/share/man/man1/procps.1 #usr/share/man/man1/ps.1 #usr/share/man/man1/pwdx.1 #usr/share/man/man1/slabtop.1 @@ -59,9 +55,9 @@ usr/bin/watch #usr/share/man/man1/top.1 #usr/share/man/man1/w.1 #usr/share/man/man1/watch.1 -#usr/share/man/man3/openproc.3 -#usr/share/man/man3/readproc.3 -#usr/share/man/man3/readproctab.3 +#usr/share/man/man3/procps.3 +#usr/share/man/man3/procps_misc.3 +#usr/share/man/man3/procps_pids.3 #usr/share/man/man5/sysctl.conf.5 #usr/share/man/man8/sysctl.8 #usr/share/man/man8/vmstat.8 diff --git a/config/rootfiles/core/168/filelists/procps b/config/rootfiles/core/168/filelists/procps new file mode 120000 index 000000000..e17e8ed70 --- /dev/null +++ b/config/rootfiles/core/168/filelists/procps @@ -0,0 +1 @@ +../../../common/procps \ No newline at end of file diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh index 44464725b..bcf253137 100644 --- a/config/rootfiles/core/168/update.sh +++ b/config/rootfiles/core/168/update.sh @@ -33,6 +33,7 @@ done
# Remove files rm -rvf \ + /lib/libprocps.so* \ /usr/bin/dnet-config \ /usr/bin/sdparm \ /usr/lib/libart_lgpl_2.so* \ diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages/keepalived index 4865db0b0..b0fbe7363 100644 --- a/config/rootfiles/packages/keepalived +++ b/config/rootfiles/packages/keepalived @@ -1,8 +1,6 @@ #etc/keepalived -etc/keepalived/keepalived.conf +etc/keepalived/keepalived.conf.sample etc/keepalived/samples -#etc/keepalived/samples/client.pem -#etc/keepalived/samples/dh1024.pem #etc/keepalived/samples/keepalived.conf.HTTP_GET.port #etc/keepalived/samples/keepalived.conf.IPv6 #etc/keepalived/samples/keepalived.conf.PING_CHECK @@ -28,7 +26,6 @@ etc/keepalived/samples #etc/keepalived/samples/keepalived.conf.vrrp.scripts #etc/keepalived/samples/keepalived.conf.vrrp.static_ipaddress #etc/keepalived/samples/keepalived.conf.vrrp.sync -#etc/keepalived/samples/root.pem #etc/keepalived/samples/sample.misccheck.smbcheck.sh #etc/keepalived/samples/sample_notify_fifo.sh etc/rc.d/init.d/keepalived diff --git a/lfs/ipvsadm b/lfs/ipvsadm index a1e9cb5a1..3108c2e2f 100644 --- a/lfs/ipvsadm +++ b/lfs/ipvsadm @@ -26,7 +26,7 @@ include Config
SUMMARY = A Utility for Administering the Linux Virtual Server
-VER = 1.29 +VER = 1.31
THISAPP = ipvsadm-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipvsadm -PAK_VER = 2 +PAK_VER = 3
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 29f8c353f5c7a6a461b17b0ef7fa4c7803fe52cae5f8f719b25370f502d8724e0847bb3b4e25312b95a49a4bfcd0b6562f61118506c477eafbd1a99fc7c3914c +$(DL_FILE)_BLAKE2 = a42ceea834fb16e25ea34417227f6b632fe3b94c8a7ce5d3daff4375884fd47f14999551eab3bf7226d5eb02f25aef4c77a8287592b642946683bc5ddc6783da
install : $(TARGET)
diff --git a/lfs/keepalived b/lfs/keepalived index 0b45f24d9..d6c913f7a 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -26,7 +26,7 @@ include Config
SUMMARY = A keepalive facility for Linux
-VER = 2.2.4 +VER = 2.2.7
THISAPP = keepalived-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = keepalived -PAK_VER = 10 +PAK_VER = 11
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 835198fb23312e87894e7740427411d974c00f71029b273d8da3e787ef92848127d896b456fb40db8d802b6c7555e6524872f136f868e19c62387a9471e44b0f +$(DL_FILE)_BLAKE2 = 62c4534eb1eebeac596b628a1fa5fb4069498d532fdeff0dc51afbc71e90125bff7fcffb897da3fd34765c64f43d7b04dcf184169b1bc2cf33413e109f9f5cdc
install : $(TARGET)
diff --git a/lfs/procps b/lfs/procps index 258d1c769..5189e477b 100644 --- a/lfs/procps +++ b/lfs/procps @@ -24,7 +24,7 @@
include Config
-VER = v3.3.16 +VER = v4.0.0
THISAPP = procps-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 44b5871deeba9d37a38a113937c8b632cc3e400d184fbdf9d64d53370c4f52d1339c1b5e15cc7d53141c4774f993de0cafc0b53aeff6d7fb658126c9b9ad88da +$(DL_FILE)_BLAKE2 = 5b6c684aaaf4114ea6d53287f220fbc375556a9630a54d9ad8e0750d1d373ab73cf38e06df7cc663853d11fa69237ecd89dffaf3a84dc57df652357983f536cb
install : $(TARGET)
@@ -73,7 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ - --libdir=/lib + --libdir=/lib \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc
hooks/post-receive -- IPFire 2.x development tree