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 74218cba8cc09fc591f4ed9d2b1597f051cab9db (commit) via a5c7005c3d3e739cdcbcf0c9bcde821019d93f05 (commit) via a7ac62f4a67fa2016edc27735cec71bc1474c2b7 (commit) via 0555434effc70080d8278ca3db38fef51bba1efa (commit) via d1a3fd9e0debf994055a410fbc7e5ba7c7c074b0 (commit) from dcd828666ae3b6df8d88579a930c7f90f80dc707 (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 74218cba8cc09fc591f4ed9d2b1597f051cab9db Merge: a5c7005c3d a7ac62f4a6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 29 11:29:11 2024 +0000
Merge branch 'master' into next
commit a5c7005c3d3e739cdcbcf0c9bcde821019d93f05 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Sep 29 09:44:55 2024 +0200
mpd: fix chown syntax
this remove a warning at boot that user and group should seperated by ":" and not by "."
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/header.pl | 2 +- config/rootfiles/oldcore/189/filelists/files | 1 + html/cgi-bin/ovpnmain.cgi | 2 +- lfs/mpd | 2 +- src/initscripts/packages/mpd | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-)
Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 3778c4e59..2d4aa89f2 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -195,7 +195,7 @@ print <<END; <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="/favicon.ico" /> <script type="text/javascript" src="/include/jquery.js"></script> - <script src="/include/rrdimage.js"></script> + <script src="/include/rrdimage.js?v=20240926"></script>
$extrahead <script type="text/javascript"> diff --git a/config/rootfiles/oldcore/189/filelists/files b/config/rootfiles/oldcore/189/filelists/files index 7afa1ac2e..7e7959886 100644 --- a/config/rootfiles/oldcore/189/filelists/files +++ b/config/rootfiles/oldcore/189/filelists/files @@ -5,6 +5,7 @@ etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/suricata srv/web/ipfire/cgi-bin/getrrdimage.cgi srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/html/include/rrdimage.js usr/bin/suricata-watcher var/ipfire/graphs.pl diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index daaa059a4..20f256f4b 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4402,7 +4402,7 @@ if ($cgiparams{'TYPE'} eq 'net') { print CCDRWCONF "#This client uses the dynamic pool\n"; }else{ print CCDRWCONF "#Ip address client and server\n"; - print CCDRWCONF "ifconfig-push $ccdip ".&General::getlastip($ccdip,1)."\n"; + print CCDRWCONF "ifconfig-push $ccdip ". &Network::bin2ip(&Network::ip2bin($ccdip) - 1) ."\n"; } if ($confighash{$key}[34] eq 'on'){ print CCDRWCONF "\n#Redirect Gateway: \n#All IP traffic is redirected through the vpn \n"; diff --git a/lfs/mpd b/lfs/mpd index 6fd78f2af..4ef453fb1 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 40 +PAK_VER = 41 # SUP_ARCH = aarch64 x86_64
DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt diff --git a/src/initscripts/packages/mpd b/src/initscripts/packages/mpd index d42c0c549..4d031c472 100644 --- a/src/initscripts/packages/mpd +++ b/src/initscripts/packages/mpd @@ -25,7 +25,7 @@ case "$1" in start) boot_mesg "Starting MPD..." - chown -R root.nobody /var/ipfire/mpd/db + chown -R root:nobody /var/ipfire/mpd/db /bin/nice --5 /usr/bin/mpd evaluate_retval ;;
hooks/post-receive -- IPFire 2.x development tree