Development June 2021

development@lists.ipfire.org

12 participants
93 discussions

[PATCH] Unix-Syslog: Update to version 1.1
by Adolf Belka 22 Jun '21

22 Jun '21

- Update from 0.100 (2002) to 1.1 (2007 - latest version) - Update rootfile - Changelog 1.1 Sun May 18 21:13:38 2007 - Released version 1.1. - Clearly marked MSWin32 systems as unsupported. (How do 64bit Windows system identify themselves?) - Fixed bug that caused Perl to segfault when closelog() was called before openlog(). 1.0 Tue Oct 2 22:22:43 2007 - Bumped version number to 1.0. - License has changed to Artistic 2.0! - (Syslog.pm) Get rid of `require AutoLoader', which was wrong to begin with. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/Unix-Syslog | 2 -- lfs/Unix-Syslog | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/Unix-Syslog b/config/rootfiles/common/Unix-Syslog index 8de359e0f..c95d58b10 100644 --- a/config/rootfiles/common/Unix-Syslog +++ b/config/rootfiles/common/Unix-Syslog @@ -3,7 +3,5 @@ usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/Unix/Syslog.pm #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Unix #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Unix/Syslog #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Unix/Syslog/.packlist -#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Unix/Syslog/Syslog.bs usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Unix/Syslog/Syslog.so -usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Unix/Syslog/autosplit.ix #usr/share/man/man3/Unix::Syslog.3 diff --git a/lfs/Unix-Syslog b/lfs/Unix-Syslog index 089584b6e..11b2289ae 100644 --- a/lfs/Unix-Syslog +++ b/lfs/Unix-Syslog @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)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.100 +VER = 1.1 THISAPP = Unix-Syslog-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 655d2e04a043b3e92d1bb47caf8e8a3b +$(DL_FILE)_MD5 = 73d78e309fe9508ffc9a54d84d79aac9 install : $(TARGET) -- 2.32.0

1 0

[PATCH] clamav: Update to 0.103.3
by Matthias Fischer 22 Jun '21

22 Jun '21

For details see: https://blog.clamav.net/2021/06/clamav-01033-patch-release.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/clamav | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/clamav b/lfs/clamav index e36b4003d..4dc996ea4 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.103.2 +VER = 0.103.3 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 55 +PAK_VER = 56 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 508e6988e2937985e702cc3a2202b6e7 +$(DL_FILE)_MD5 = f8dcf678953f6af056ddd5917bcc50c3 install : $(TARGET) -- 2.18.0

2 1

[PATCHv2] ovpnmain.cgi: Fix typos.
by Stefan Schantl 22 Jun '21

22 Jun '21

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/ovpnmain.cgi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index e6b272f03..7a2833ce6 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1235,7 +1235,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' ) { &General::system("touch", "${General::swroot}/ovpn/enable_blue"); } else { - unlink(${General::swroot}/ovpn/enable_blue); + unlink("${General::swroot}/ovpn/enable_blue"); } if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' ) { @@ -1497,7 +1497,7 @@ END } } - @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem"); + my @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem"); my $casubject; foreach my $line (@casubject) { @@ -2526,7 +2526,7 @@ else if ($confighash{$cgiparams{'KEY'}}) { # Revoke certificate if certificate was deleted and rewrite the CRL - &General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf)"; + &General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf"); &General::system("/usr/bin/openssl", "ca", "-gencrl", "-out", "${General::swroot}/ovpn/crls/cacrl.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf"); ### -- 2.20.1

1 0

[PATCHv2] ovpnmain.cgi: Call correct system_output() function.
by Stefan Schantl 22 Jun '21

22 Jun '21

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/ovpnmain.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index d9e26de2f..e6b272f03 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -5764,7 +5764,7 @@ END # Adding DH parameter to chart if (-f "${General::swroot}/ovpn/ca/dh1024.pem") { - my @dhsubject = &System_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem"); + my @dhsubject = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem"); my $dhsubject; foreach my $line (@dhsubject) { -- 2.20.1

1 0

Core Update 158 and beyond
by Michael Tremer 22 Jun '21

22 Jun '21

Hello everyone, Yesterday, I merged the upcoming Core Update into master so that we can finalise it for its release. There are loads of changes in it that may require a little bit of extra testing. Especially the large amount of changes to the CGI files requires some extra love, so I hope that everyone of you can find a couple of minutes and click as many buttons as possible and see whether things are working fine. If not, please report here. I will work on a change log as soon as possible and publish it on the blog as usual. The next update will be put together by Arne who is now fully in charge of the next branch. It will come with the new kernel and to not make communication too difficult, he will just take charge and put the whole thing together. We probably won’t have too much space because the kernel is going to be quite large. However, there will be a new toolchain and loads of other things coming with it, so if you have any patches towards that, please coordinate on the list and submit. Of course I would like to know what everyone has in the pipeline so that we can schedule it accordingly. Best, -Michael

1 0

problem with downloading zstd from the IPFire source tree
by Adolf Belka 22 Jun '21

22 Jun '21

Hi All, On the forum someone flagged they were having a failure when doing a build with the download stage for zstd. I checked and confirmed the problem if i removed the zstd source file I had downloaded when doing the last update of zstd. The file in the source tree has a different md5 sum as the one I used for the lfs file in my update build. The download site https://github.com/facebook/zstd/releases/tag/v1.5.0 has both a zstd-1.5.0.tar.gz and "Souce code (tar.gz)" entry. Checking the md5 sums the one used in my build patch submission was the direct zstd-1.5.0.tar.gz file and the one in the IPFire source tree is the "Source code (tar.gz)" file. The source tree needs to be changed to use the direct file location. Regards, Adolf.

2 2

[PATCH] m4: Update to 1.4.19
by Adolf Belka 22 Jun '21

22 Jun '21

- Update from 1.4.18 (2016-12-31) to 1.4.19 (2021-05-28) - patch no longer required as changes have been built into the source tarball. - Update of rootfile - Changelog is too large to fit here. Detail can be found in ChangeLog file in the source tarball. 6 bugs fixed in this update. https://lists.gnu.org/archive/html/bug-m4/2021-04/msg00000.html https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00001.html https://lists.gnu.org/archive/html/bug-m4/2020-03/msg00000.html https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00002.html https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00003.html https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00004.html Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/m4 | 26 ++++ lfs/m4 | 7 +- .../m4-1.4.18-glibc-change-work-around.patch | 115 ------------------ 3 files changed, 29 insertions(+), 119 deletions(-) delete mode 100644 src/patches/m4-1.4.18-glibc-change-work-around.patch diff --git a/config/rootfiles/common/m4 b/config/rootfiles/common/m4 index 5e9acac22..380178494 100644 --- a/config/rootfiles/common/m4 +++ b/config/rootfiles/common/m4 @@ -2,4 +2,30 @@ #usr/share/info/m4.info #usr/share/info/m4.info-1 #usr/share/info/m4.info-2 +#usr/share/locale/bg/LC_MESSAGES/m4.mo +#usr/share/locale/cs/LC_MESSAGES/m4.mo +#usr/share/locale/da/LC_MESSAGES/m4.mo +#usr/share/locale/de/LC_MESSAGES/m4.mo +#usr/share/locale/el/LC_MESSAGES/m4.mo +#usr/share/locale/eo/LC_MESSAGES/m4.mo +#usr/share/locale/es/LC_MESSAGES/m4.mo +#usr/share/locale/fi/LC_MESSAGES/m4.mo +#usr/share/locale/fr/LC_MESSAGES/m4.mo +#usr/share/locale/ga/LC_MESSAGES/m4.mo +#usr/share/locale/gl/LC_MESSAGES/m4.mo +#usr/share/locale/hr/LC_MESSAGES/m4.mo +#usr/share/locale/id/LC_MESSAGES/m4.mo +#usr/share/locale/ja/LC_MESSAGES/m4.mo +#usr/share/locale/ko/LC_MESSAGES/m4.mo +#usr/share/locale/nl/LC_MESSAGES/m4.mo +#usr/share/locale/pl/LC_MESSAGES/m4.mo +#usr/share/locale/pt_BR/LC_MESSAGES/m4.mo +#usr/share/locale/ro/LC_MESSAGES/m4.mo +#usr/share/locale/ru/LC_MESSAGES/m4.mo +#usr/share/locale/sr/LC_MESSAGES/m4.mo +#usr/share/locale/sv/LC_MESSAGES/m4.mo +#usr/share/locale/uk/LC_MESSAGES/m4.mo +#usr/share/locale/vi/LC_MESSAGES/m4.mo +#usr/share/locale/zh_CN/LC_MESSAGES/m4.mo +#usr/share/locale/zh_TW/LC_MESSAGES/m4.mo #usr/share/man/man1/m4.1 diff --git a/lfs/m4 b/lfs/m4 index 3aa503fc4..724735449 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)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 = 1.4.18 +VER = 1.4.19 THISAPP = m4-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 730bb15d96fffe47e148d1e09235af82 +$(DL_FILE)_MD5 = 0d90823e1426f1da2fd872df0311298d install : $(TARGET) @@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/m4-1.4.18-glibc-change-work-around.patch cd $(DIR_APP) && ./configure --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/m4-1.4.18-glibc-change-work-around.patch b/src/patches/m4-1.4.18-glibc-change-work-around.patch deleted file mode 100644 index 582ae9b53..000000000 --- a/src/patches/m4-1.4.18-glibc-change-work-around.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c ---- m4-1.4.18/lib/fflush.c.orig 2018-05-02 12:35:59.536851666 +0200 -+++ m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200 -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - -diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c ---- m4-1.4.18/lib/fpending.c.orig 2018-05-02 12:35:32.305806774 +0200 -+++ m4-1.4.18/lib/fpending.c 2018-05-02 12:35:44.944827347 +0200 -@@ -32,7 +32,7 @@ __fpending (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return fp->_IO_write_ptr - fp->_IO_write_base; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c ---- m4-1.4.18/lib/fpurge.c.orig 2018-05-02 12:38:13.586078669 +0200 -+++ m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200 -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -diff -up m4-1.4.18/lib/freadahead.c.orig m4-1.4.18/lib/freadahead.c ---- m4-1.4.18/lib/freadahead.c.orig 2016-12-31 14:54:41.000000000 +0100 -+++ m4-1.4.18/lib/freadahead.c 2018-05-02 11:43:19.570336724 +0200 -@@ -25,7 +25,7 @@ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) -diff -up m4-1.4.18/lib/freading.c.orig m4-1.4.18/lib/freading.c ---- m4-1.4.18/lib/freading.c.orig 2018-05-02 12:37:33.970011368 +0200 -+++ m4-1.4.18/lib/freading.c 2018-05-02 12:37:59.393054359 +0200 -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); -diff -up m4-1.4.18/lib/fseeko.c.orig m4-1.4.18/lib/fseeko.c ---- m4-1.4.18/lib/fseeko.c.orig 2018-05-02 11:44:17.947460233 +0200 -+++ m4-1.4.18/lib/fseeko.c 2018-05-02 12:39:49.537216897 +0200 -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -diff -up m4-1.4.18/lib/stdio-impl.h.orig m4-1.4.18/lib/stdio-impl.h ---- m4-1.4.18/lib/stdio-impl.h.orig 2016-12-31 14:54:42.000000000 +0100 -+++ m4-1.4.18/lib/stdio-impl.h 2018-05-02 11:43:19.570336724 +0200 -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - -- 2.32.0

1 0

[PATCH 1/2] ovpnmain.cgi: Fix detection of used DH key lenght.
by Stefan Schantl 21 Jun '21

21 Jun '21

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/ovpnmain.cgi | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 023000dd5..5af1b807e 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -221,14 +221,23 @@ sub pkiconfigcheck # Warning if DH parameter is 1024 bit if (-f "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}") { my @dhparameter = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}"); + my $dhbit; + # Loop through the output and search for the DH bit lenght. foreach my $line (@dhparameter) { - my @dhbit = ($line =~ /(\d+)/); - if ($1 < 2048) { - $cryptoerror = "$Lang::tr{'ovpn error dh'}"; - goto CRYPTO_ERROR; + if ($line =~ (/(\d+)/)) { + # Assign match to dhbit value. + $dhbit = $1; + + last; } } + + # Check if the used key lenght is at least 2048 bit. + if ($dhbit < 2048) { + $cryptoerror = "$Lang::tr{'ovpn error dh'}"; + goto CRYPTO_ERROR; + } } # Warning if md5 is in usage -- 2.20.1

2 2

[PATCH 1/3] pppsetup.cgi: Fix typos.
by Stefan Schantl 21 Jun '21

21 Jun '21

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/pppsetup.cgi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 519a062bc..beb7fabc7 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -180,8 +180,8 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) goto ERROR; } # Read-in ddns config file, to check if at least one provider is enabled. - open(FILE, "${General::swroot}/ddns/config)"; - my @ddns_config = <FILE> + open(FILE, "${General::swroot}/ddns/config"); + my @ddns_config = <FILE>; close(FILE); if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && grep(/on/, @ddns_config) ) { @@ -529,7 +529,7 @@ END # Read-in atm devices from proc. open(PROC, "/proc/net/atm/devices"); -my @patm_devices = <PROC>; +my @atm_devices = <PROC>; close(PROC); my $atmdev = grep(/0/, @atm_devices); -- 2.20.1

1 2

[PATCH] speed.cgi: Add requirement for general-functions.pl.
by Stefan Schantl 20 Jun '21

20 Jun '21

The CGI now requires the general-functions library, because the get_red_interface() function is used. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/speed.cgi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi index 8acdb2bd8..b550fda52 100644 --- a/html/cgi-bin/speed.cgi +++ b/html/cgi-bin/speed.cgi @@ -19,6 +19,8 @@ # # ############################################################################### +require '/var/ipfire/general-functions.pl'; + my $data_last = $ENV{'QUERY_STRING'}; my $rxb_last = 0; my $txb_last = 0; -- 2.20.1

2 1

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development June 2021