Development February 2023

development@lists.ipfire.org

9 participants
118 discussions

[PATCH 1/3] nfs-utils: Does not depend on libgssglue
by Stefan Schantl 21 Feb '23

21 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- nfs-utils/nfs-utils.nm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm index f703bf53a..6625f798c 100644 --- a/nfs-utils/nfs-utils.nm +++ b/nfs-utils/nfs-utils.nm @@ -5,7 +5,7 @@ name = nfs-utils version = 2.6.2 -release = 1 +release = 2 groups = Networking/Tools url = http://nfs.sourceforge.net/ @@ -35,7 +35,6 @@ build libdevmapper-devel libcap-devel libevent-devel - libgssglue-devel >= 0.3 libkeyutils-devel libmount-devel libtirpc-devel -- 2.30.2

1 2

[PATCH 1/3] keyutils: New package
by Stefan Schantl 21 Feb '23

21 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- keyutils/keyutils.nm | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 keyutils/keyutils.nm diff --git a/keyutils/keyutils.nm b/keyutils/keyutils.nm new file mode 100644 index 000000000..2fec320d1 --- /dev/null +++ b/keyutils/keyutils.nm @@ -0,0 +1,76 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = keyutils +version = 1.6.1 +release = 1 + +groups = System/Tools +url = http://people.redhat.com/~dhowells/keyutils/ +license = GPLv2+ and LGPLv2+ +summary = Linux Key Management Utilities + +description + Utilities to control the kernel key management facility and to provide + a mechanism by which the kernel call back to user space to get a key + instantiated. +end + +source_dl = http://people.redhat.com/~dhowells/keyutils/ +sources = %{thisapp}.tar.bz2 + +build + requires + kernel-headers + end + + make_build_targets += \ + NO_ARLIB=1 \ + ETCDIR=%{sysconfdir} \ + LIBDIR=%{libdir} \ + USRLIBDIR=%{libdir} \ + BINDIR=%{bindir} \ + SBINDIR=%{sbindir} \ + MANDIR=%{mandir} \ + INCLUDEDIR=%{includedir} \ + SHAREDIR=%{datadir}/%{name} \ + NO_GLIBC_KEYERR=1 \ + CFLAGS="-Wall %{CFLAGS}" \ + LDFLAGS="%{LDFLAGS}" + + make_install_targets += \ + NO_ARLIB=1 \ + ETCDIR=%{sysconfdir} \ + LIBDIR=%{libdir} \ + USRLIBDIR=%{libdir} \ + BINDIR=%{bindir} \ + SBINDIR=%{sbindir} \ + MANDIR=%{mandir} \ + INCLUDEDIR=%{includedir} \ + SHAREDIR=%{datadir}/%{name} + + install_cmds + # Fix broken symlink. + ln -svf libkeyutils.so.1 %{BUILDROOT}%{libdir}/libkeyutils.so + end +end + +packages + package %{name} + + package libkeyutils + template LIBS + end + + package libkeyutils-devel + template DEVEL + + requires += libkeyutils = %{thisver} + end + + package %{name}-debuginfo + template DEBUGINFO + end +end -- 2.30.2

1 2

[PATCH] librpcsecgss: Drop package
by Stefan Schantl 21 Feb '23

21 Feb '23

Deprecated, No relaese since 2009, Not longer used. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- librpcsecgss/librpcsecgss.nm | 41 ------------------------------------ 1 file changed, 41 deletions(-) delete mode 100644 librpcsecgss/librpcsecgss.nm diff --git a/librpcsecgss/librpcsecgss.nm b/librpcsecgss/librpcsecgss.nm deleted file mode 100644 index d7d8e3d07..000000000 --- a/librpcsecgss/librpcsecgss.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = librpcsecgss -version = 0.19 -release = 1 - -groups = System/Libraries -url = http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ -license = BSD -summary = A Library for secure rpc communication. - -description - rpcsecgss allows secure rpc communication using the rpcsec_gss \ - protocol. -end - -source_dl = http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ -sources = %{thisapp}.tar.gz - -build - requires - libgssglue-devel - pkg-config - end -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end -- 2.30.2

1 0

[PATCH] updatexlrator.cgi: Fixes bug#13024 - Table style rendering bug
by Adolf Belka 21 Feb '23

21 Feb '23

- This is happening due to the use of bgcolor which has been deprecated since HTML4.01 and is no longer supported in HTML5 - Similar approach used here as was used in the same fix for the dhcp.cgi page - CSS based approach utilised. - Partially tested in my vm testbed. The percentage bar works withg no problems. The table could not be confirmed as in my testbed I don't have updatexlrator running as my updates are all based on https and not http. - The table will need to be confirmed by the bug reporter or someone else that uses updatexlrator Fixes: Bug#13024 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- html/cgi-bin/updatexlrator.cgi | 64 +++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index fb3959457..47d3cca42 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -105,6 +105,46 @@ my @metadata=(); &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); +###--- HTML HEAD ---### +my $extraHead = <<END +<style> + .row-color20 { + background-color: $color{'color20'}; + } + .row-color22 { + background-color: $color{'color22'}; + } + .row-table1colour { + background-color: $Header::table1colour; + } + .row-table2colour { + background-color: $Header::table2colour; + } + .percent-box { + border-style: solid; + border-width: 1px; + border-color: #a0a0a0; + width: 100px; + height: 10px; + } + .percent-bar { + background-color: #a0a0a0; + border-style: solid; + border-width: 1px; + border-color: #e2e2e2; + } + .percent-space { + background-color: #e2e2e2; + border-style: solid; + border-width: 1px; + border-color: #e2e2e2; + } +</style> +END +; +###--- END HTML HEAD ---### + + $xlratorsettings{'ACTION'} = ''; $xlratorsettings{'ENABLE_LOG'} = 'off'; $xlratorsettings{'PASSIVE_MODE'} = 'off'; @@ -369,7 +409,7 @@ $selected{'NOT_ACCESSED_LAST'}{$xlratorsettings{'NOT_ACCESSED_LAST'}} = "selecte &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'updxlrtr configuration'}, 1, ''); +&Header::openpage($Lang::tr{'updxlrtr configuration'}, 1, $extraHead); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -532,9 +572,9 @@ END $id++; if ($id % 2) { - print "<tr bgcolor='$Header::table1colour'>\n"; } + print "<tr class='row-table1colour'>\n"; } else { - print "<tr bgcolor='$Header::table2colour'>\n"; } + print "<tr class='row-table2colour'>\n"; } $filesize = $size_updatefile; 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; @@ -823,9 +863,9 @@ foreach (@vendors) $id++; if ($id % 2) { - print "<tr bgcolor=''$color{'color20'}'>\n"; } + print "<tr class='row-color20'>\n"; } else { - print "<tr bgcolor=''$color{'color22'}'>\n"; } + print "<tr class='row-color22'>\n"; } print "<td class='base' align='center'><nobr> "; @@ -1162,9 +1202,9 @@ END $id++; if ($id % 2) { - print "<tr bgcolor='$Header::table1colour'>\n"; } + print "<tr class='row-table1colour'>\n"; } else { - print "<tr bgcolor='$Header::table2colour'>\n"; } + print "<tr class='row-table2colour'>\n"; } $filesize = $size_updatefile; 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; @@ -1522,22 +1562,20 @@ sub savesettings sub percentbar { my $percent = $_[0]; - my $fg = '#a0a0a0'; - my $bg = '#e2e2e2'; if ($percent =~ m/^(\d+)%$/ ) { print <<END -<table width='100' border='1' cellspacing='0' cellpadding='0' style='border-width:1px;border-style:solid;border-color:$fg;width:100px;height:10px;'> +<table width='100' border='1' cellspacing='0' cellpadding='0' class='percent-box'> <tr> END ; if ($percent eq "100%") { - print "<td width='100%' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>" + print "<td width='100%' class='percent-bar'>" } elsif ($percent eq "0%") { - print "<td width='100%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>" + print "<td width='100%' class='percent-space'>" } else { - print "<td width='$percent' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td width='" . (100-$1) . "%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>" + print "<td width='$percent' class='percent-bar'></td><td width='" . (100-$1) . "%' class='percent-space'>" } print <<END <img src='/images/null.gif' width='1' height='1' alt='' /></td></tr></table> -- 2.39.2

1 0

[PATCH] wio.cgi: Fixes bug#13039 - Input boxes extend outside of WUI boundary with some browsers
by Adolf Belka 21 Feb '23

21 Feb '23

- Original poster found this effect with using Vivaldi at 100% zoom. - I tested it with Vivaldi and Firefox on Arch Linux and was not able to show the effect but running SeaMonkey and changing the zoom from 100% to lower or higher caused the input boxes to go outside of the WUI boundary as described by the bug reporter. - It looks like the effect is dependent on the browser, the zoom setting and the OS Distribution. - In all cases the similar three input boxes in a row in the dhcp.cgi code for entering a fixed lease stayed fixed in ratrio to the WUI page whatever zoom or browser was used. - This patch changes the wio code for those three input boxes to use the approach from the dhcp.cgi code. - Tested on my vm testbed and change confirmed to fix the size of the input boxes irrespective of the browser or zoom setting. Fixes: Bug#13039 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- src/wio/wio.cgi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index a61102894..f31f5d565 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -1761,12 +1761,12 @@ print" <td colspan='4'> </td> </tr> <tr> - <td height='30'>$Lang::tr{'wio ipadress'}:</td> - <td align='left'><input type='text' name='IPADR' value='$wiosettings{'IPADR'}' size='25' /></td> - <td>$Lang::tr{'wio name'}:</td> - <td align='left'><input type='text' name='HOST' value='$wiosettings{'HOST'}' size='25' /></td> - <td>$Lang::tr{'remark'}:</td> - <td align='left'><input type='text' name='REMARK' value='$wiosettings{'REMARK'}' size='30'></td> + <td class='base'>$Lang::tr{'wio ipadress'}:</td> + <td><input type='text' name='IPADR' value='$wiosettings{'IPADR'}' size='18' /></td> + <td class='base'>$Lang::tr{'wio name'}:</td> + <td><input type='text' name='HOST' value='$wiosettings{'HOST'}' size='18' /></td> + <td class='base'>$Lang::tr{'remark'}:</td> + <td><input type='text' name='REMARK' value='$wiosettings{'REMARK'}' size='18' /></td> </tr> <tr> <td height='30'>$Lang::tr{'wio_ping_send'}:</td> -- 2.39.2

1 0

[PATCH] man-db: Update to 2.9.4
by Stefan Schantl 21 Feb '23

21 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- man-db/man-db.nm | 6 +++--- ...and-root-in-init-systemd-man-db.conf.patch | 19 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 man-db/patches/1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch diff --git a/man-db/man-db.nm b/man-db/man-db.nm index 590349e9a..5e92ba94e 100644 --- a/man-db/man-db.nm +++ b/man-db/man-db.nm @@ -4,8 +4,8 @@ ############################################################################### name = man-db -version = 2.7.1 -release = 3 +version = 2.9.4 +release = 1 groups = Documentation url = http://savannah.nongnu.org/projects/man-db @@ -27,7 +27,7 @@ build gdbm-devel groff less - libpipeline-devel >= 1.4.0 + libpipeline-devel >= 1.5.0 systemd-devel zlib-devel end diff --git a/man-db/patches/1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch b/man-db/patches/1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch deleted file mode 100644 index b91e6d01a..000000000 --- a/man-db/patches/1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 1d523a44a5ad360c83bff362a625cc68cbe7f296 Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka <jchaloup(a)redhat.com> -Date: Wed, 15 Oct 2014 09:46:56 +0200 -Subject: [PATCH] switch man and root in init/systemd/man-db.conf - ---- - init/systemd/man-db.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/init/systemd/man-db.conf b/init/systemd/man-db.conf -index 10b27b4..43dd2ad 100644 ---- a/init/systemd/man-db.conf -+++ b/init/systemd/man-db.conf -@@ -1 +1 @@ --d /var/cache/man 2755 man root 1w -+d /var/cache/man 2755 root man 1w --- -1.9.3 - -- 2.30.2

1 0

[PATCH] logrotate: Drop package
by Stefan Schantl 21 Feb '23

21 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- logrotate/logrotate.nm | 57 ----------------------------- logrotate/systemd/logrotate.service | 5 --- 2 files changed, 62 deletions(-) delete mode 100644 logrotate/logrotate.nm delete mode 100644 logrotate/systemd/logrotate.service diff --git a/logrotate/logrotate.nm b/logrotate/logrotate.nm deleted file mode 100644 index c15906b6b..000000000 --- a/logrotate/logrotate.nm +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = logrotate -version = 3.9.1 -release = 1 - -groups = System/Base -url = https://fedorahosted.org/releases/l/o/logrotate/ -license = GPL+ -summary = Rotates, compresses, removes and mails system log files. - -description - The logrotate utility is designed to simplify the administration of - log files on a system which generates a lot of log files. Logrotate - allows for the automatic rotation compression, removal and mailing of - log files. Logrotate can be set to handle a log file daily, weekly, - monthly or when the log file gets to a certain size. -end - -source_dl = https://fedorahosted.org/releases/l/o/logrotate/ - -build - requires - coreutils - gzip - popt-devel - which - end - - build - make RPM_OPT_FLAGS="%{CFLAGS}" %{PARALLELISMFLAGS} - end - - install - make install BASEDIR=%{prefix} PREFIX=%{BUILDROOT} \ - MANDIR=%{mandir} - - mkdir -pv %{BUILDROOT}%{localstatedir} - touch %{BUILDROOT}%{localstatedir}/logrotate.status - - # Creating directory for config files - mkdir -pv %{BUILDROOT}%{sysconfdir}/logrotate.d - end -end - -packages - package %{name} - groups += Base - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/logrotate/systemd/logrotate.service b/logrotate/systemd/logrotate.service deleted file mode 100644 index 0b45621d3..000000000 --- a/logrotate/systemd/logrotate.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=logrotate - -[Service] -ExexStart=/usr/sbin/logrotate /etc/logrotate.d/* -- 2.30.2

1 0

[PATCH] multipath-tools: Update to 0.9.4
by Stefan Schantl 21 Feb '23

21 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- multipath-tools/multipath-tools.nm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/multipath-tools/multipath-tools.nm b/multipath-tools/multipath-tools.nm index 02bfeeaf3..881c2dfd0 100644 --- a/multipath-tools/multipath-tools.nm +++ b/multipath-tools/multipath-tools.nm @@ -4,7 +4,7 @@ ############################################################################### name = multipath-tools -version = 0.6.3 +version = 0.9.4 release = 1 groups = System/Base @@ -17,26 +17,29 @@ description instructing the device-mapper multipath kernel module what to do. end -# git archive 0.6.3 --prefix=multipath-tools-0.6.3/ --format=tar | gzip --best > multipath-tools-0.6.3.tar.gz +source_dl = https://github.com/opensvc/%{name}/archive/refs/tags/%{version}.tar.gz#/ sources = %{thisapp}.tar.gz build requires gzip + json-c-devel libaio-devel libdevmapper-devel libudev-devel + liburcu-devel ncurses-devel readline-devel end - make_build_targets += -C kpartx LIB=%{lib} LDFLAGS="%{LDFLAGS} -ldevmapper" + make_build_targets += kpartx LIB=%{lib} LDFLAGS="%{LDFLAGS} -ldevmapper" # Install everything to the correct locations. make_install_targets += \ -C kpartx \ bindir=%{sbindir} \ syslibdir=%{libdir} \ + mandir=%{mandir} \ libdir=%{libdir}/multipath \ unitdir=%{unitdir} end @@ -49,6 +52,7 @@ packages end files + /usr/lib/udev %{sbindir}/kpartx %{mandir}/man8/kpartx.8* end -- 2.30.2

1 0

[PATCH] liburcu: Update to 0.14.0
by Stefan Schantl 21 Feb '23

21 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- liburcu/liburcu.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liburcu/liburcu.nm b/liburcu/liburcu.nm index b99918bf7..d5f1fb3ba 100644 --- a/liburcu/liburcu.nm +++ b/liburcu/liburcu.nm @@ -4,7 +4,7 @@ ############################################################################### name = liburcu -version = 0.13.2 +version = 0.14.0 release = 1 thisapp = userspace-rcu-%{version} -- 2.30.2

1 0

[PATCH] mdadm: Update to 4.2
by Stefan Schantl 21 Feb '23

21 Feb '23

* Depends on libudev-devel * Install systemd files. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- mdadm/mdadm.nm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm index 533795dd2..733f8ec7f 100644 --- a/mdadm/mdadm.nm +++ b/mdadm/mdadm.nm @@ -4,7 +4,7 @@ ############################################################################### name = mdadm -version = 3.4 +version = 4.2 release = 1 groups = System/Base @@ -25,6 +25,7 @@ sources = %{thisapp}.tar.xz build requires + libudev-devel groff end @@ -35,10 +36,19 @@ build end build - make %{PARALLELISMFLAGS} CXFLAGS="%{CFLAGS}" \ - CWFLAGS= SYSCONFDIR="%{sysconfdir}" MDASSEMBLE_AUTO=1 + make %{PARALLELISMFLAGS} \ + CXFLAGS="%{CFLAGS}" \ + CWFLAGS= \ + SYSCONFDIR="%{sysconfdir}" + MDASSEMBLE_AUTO=1 end + make_install_targets += \ + install-systemd \ + BINDIR=%{sbindir} \ + UDEVDIR=%{prefix}/%{lib}/udev \ + SYSTEMD_DIR="%{unitdir}" + install_cmds mkdir -pv %{BUILDROOT}/var/run/mdadm chmod 700 %{BUILDROOT}/var/run/mdadm -- 2.30.2

1 0

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2023