[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c8dfb46b43b4d9c7c9f76ef82e6c33077cc759e1
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 c8dfb46b43b4d9c7c9f76ef82e6c33077cc759e1 (commit) via baa5c07c1c6df38945f8c8263a11c17f37242224 (commit) via ec40d45d60ad60801507a427f071c954fbbae8ff (commit) via f16eeae07853bf8b7bc8e740a74f9f9b28cadb1d (commit) via dcb878d6a11ee9b75b4d0752a12b2d68b8691c8e (commit) from 3920ba127fb854422f19fb5f6bc7f192f2c2df80 (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 c8dfb46b43b4d9c7c9f76ef82e6c33077cc759e1 Author: Peter Müller peter.mueller@ipfire.org Date: Wed Jan 3 21:04:20 2024 +0000
nfs: Fix copy & waste in comment section
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit baa5c07c1c6df38945f8c8263a11c17f37242224 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Dec 18 18:29:00 2023 +0100
nfs: Update to version 2.6.4
- Update from version 2.6.3 to 2.6.4 - Update of rootfile not required - Changelog is no longer created. The commits in the git repo have to be reviewed for changes - http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=shortlog;h=refs/heads/mas...
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit ec40d45d60ad60801507a427f071c954fbbae8ff Author: Peter Müller peter.mueller@ipfire.org Date: Wed Jan 3 21:03:17 2024 +0000
Core Update 183: Ship dhcp.cgi
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f16eeae07853bf8b7bc8e740a74f9f9b28cadb1d Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Jan 1 15:35:46 2024 +0100
dhcp.cgi: Adjust legend entries to make clear they are legends and not messages
- A new IPFire user on the forum saw the orange and red coloured blocks in the legend section and believed that they were messages about problems that had been created with the fixed leases. - This change puts a small block with seperate explanatory text for both the orange and red coloured blocks. - This change will also be applied to the wiki in a much clearer way
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
commit dcb878d6a11ee9b75b4d0752a12b2d68b8691c8e Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Jan 1 15:35:45 2024 +0100
dhcp.cgi: Adjust spacing between an icon and explanatory text
- When dealing with a problem on the forum I noticed that in the Fixed Leases table Legend section there was a very large space between the empty checkbox icon and the explanatory text. It looks like the   that I have removed worked on the text section 'click to enable' as that was moved but not on the off.gif icon as that stayed in its original place leaving a very large space between the icon and the explanatory text. Removing the two commands fixes that. - Reading up about   the problem might be related to these tags no longer being recommended to use with the newer HTML versions and that indenting or spacing should be done via CSS code. Will have a look in future on how to accomplish this via CSS.
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/183/filelists/files | 1 + html/cgi-bin/dhcp.cgi | 9 ++++----- lfs/nfs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 html/cgi-bin/dhcp.cgi
Difference in files: diff --git a/config/rootfiles/core/183/filelists/files b/config/rootfiles/core/183/filelists/files index 58db2c50e..230e0974c 100644 --- a/config/rootfiles/core/183/filelists/files +++ b/config/rootfiles/core/183/filelists/files @@ -1,2 +1,3 @@ +srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat usr/local/bin/backupiso diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi old mode 100755 new mode 100644 index 84e2322af..c079fe1ae --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -1153,7 +1153,6 @@ print <<END <td class='boldbase'> <b>$Lang::tr{'legend'}: </b></td> <td><img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> <td class='base'>$Lang::tr{'click to disable'}</td> - <td> </td> <td><img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td> <td class='base'>$Lang::tr{'click to enable'}</td> <td> </td> @@ -1165,10 +1164,10 @@ print <<END </tr> <tr> <td> </td> - <td> </td> - <td class='base orange'>$Lang::tr{'ip address outside subnets'}</td> - <td>  </td> - <td class='base red'>$Lang::tr{'dhcp fixed ip address in dynamic range'}</td> + <td class='base orange'> </td> + <td class='base'> $Lang::tr{'ip address outside subnets'} </td> + <td class='base red'> </td> + <td class='base'> $Lang::tr{'dhcp fixed ip address in dynamic range'}</td> <td> </td> <td> </td> $dup diff --git a/lfs/nfs b/lfs/nfs index fb2283842..713dbeacd 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -26,7 +26,7 @@ include Config
SUMMARY = Support Utilities for Kernel nfsd
-VER = 2.6.3 +VER = 2.6.4
THISAPP = nfs-utils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 21 +PAK_VER = 22
DEPS = rpcbind
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1aafa7d49006a62e862a592e30c4f9ba762d6c1973cacd7b89709706cc69617aae8d23000f78841f3a09bf81140222904976536114f3fb78f6230defb039ae9b +$(DL_FILE)_BLAKE2 = eaec88d872e2b4cf8cd588e8770af44b7f7636685a229c9a70c10e6fab1344651c5e9a73ab9f520e7c92c2de455998bf14bba070b463db1e17e9e7042851b38f
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree
-
Peter Müller