Development November 2017

development@lists.ipfire.org

15 participants
68 discussions

[PATCH] groff: remove deprecated configure options
by Marcel Lorenz 19 Nov '17

19 Nov '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- lfs/groff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/groff b/lfs/groff index a0bb0bd3f..341fb654c 100644 --- a/lfs/groff +++ b/lfs/groff @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls + cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr cd $(DIR_APP) && make cd $(DIR_APP) && make install ln -svf eqn /usr/bin/geqn -- 2.14.2

1 0

[PATCH] automake: remove deprecated --disable-nls configure option
by Marcel Lorenz 19 Nov '17

19 Nov '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- lfs/automake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/automake b/lfs/automake index a372443b3..d8763c6ac 100644 --- a/lfs/automake +++ b/lfs/automake @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch - cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \ + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) \ --docdir=/usr/share/doc/automake-1.15 cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.14.2

1 0

[PATCH] autoconf: remove deprecated --disable-nls configure option
by Marcel Lorenz 19 Nov '17

19 Nov '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- lfs/autoconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/autoconf b/lfs/autoconf index 9c58e20cc..2e102b36b 100644 --- a/lfs/autoconf +++ b/lfs/autoconf @@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.14.2

1 0

[PATCH v2] mpfr: update to 3.1.6
by Marcel Lorenz 19 Nov '17

19 Nov '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/mpfr | 2 +- lfs/mpfr | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/mpfr b/config/rootfiles/common/mpfr index 34c4dbe78..57135fcaf 100644 --- a/config/rootfiles/common/mpfr +++ b/config/rootfiles/common/mpfr @@ -4,7 +4,7 @@ #usr/lib/libmpfr.la #usr/lib/libmpfr.so usr/lib/libmpfr.so.4 -usr/lib/libmpfr.so.4.1.5 +usr/lib/libmpfr.so.4.1.6 #usr/share/doc/mpfr #usr/share/doc/mpfr/AUTHORS #usr/share/doc/mpfr/BUGS diff --git a/lfs/mpfr b/lfs/mpfr index f729b8fe2..ffb1fb8d6 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -24,7 +24,7 @@ include Config -VER = 3.1.5 +VER = 3.1.6 THISAPP = mpfr-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c4ac246cf9795a4491e7766002cd528f +$(DL_FILE)_MD5 = 51bfdbf81553966c8d43808122cc81b3 install : $(TARGET) @@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ - --enable-thread-safe --disable-nls + --enable-thread-safe cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.14.2

1 0

[PATCH] gmp: remove deprecated configure options
by Marcel Lorenz 19 Nov '17

19 Nov '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- lfs/gmp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lfs/gmp b/lfs/gmp index 8dc9b7350..4d55e4f76 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -39,9 +39,7 @@ endif CONFIGURE_OPTIONS = \ --prefix=/usr \ - --enable-cxx \ - --enable-mpbsd \ - --disable-nls + --enable-cxx ############################################################################### # Top-level Rules -- 2.14.2

1 0

[PATCH 1/3] allow remote syslog via TCP in syslogdctrl.c
by Peter Müller 16 Nov '17

16 Nov '17

Make syslogctrl.c use TCP as remote logging file if specified so. NOTE: This patch likely contains errors, since I do not know anything about C at all. Please have a close look at it. Sorry. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- src/misc-progs/syslogdctrl.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c index 52719023e..b356ebe49 100644 --- a/src/misc-progs/syslogdctrl.c +++ b/src/misc-progs/syslogdctrl.c @@ -32,13 +32,14 @@ int main(void) { - char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE]; + char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE], protocol[STRING_SIZE]; char varmessages[STRING_SIZE], asynclog[STRING_SIZE]; int config_fd,rc,fd,pid; struct stat st; struct keyvalue *kv = NULL; memset(buffer, 0, STRING_SIZE); memset(hostname, 0, STRING_SIZE); + memset(protocol, 0, STRING_SIZE); memset(varmessages, 0, STRING_SIZE); memset(asynclog, 0, STRING_SIZE); @@ -73,6 +74,12 @@ int main(void) exit(ERR_SETTINGS); } + if (!findkey(kv, "REMOTELOG_PROTOCOL", protocol)) + { + fprintf(stderr, "Cannot read REMOTELOG_PROTOCOL\n"); + exit(ERR_SETTINGS); + } + freekeyvalues(kv); @@ -105,9 +112,22 @@ int main(void) exit(ERR_CONFIG); } + /* differ between UDP and TCP as rsyslog protocol */ if (!strcmp(buffer,"on")) - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@\$.\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); + if ( protocol == "udp" ) + { + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@\$.\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); + } + elif ( protocol == "tcp" ) + { + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@@\$.\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); + } + else + { + fprintf(stderr, "Received invalid protocol for remote log\n"); + } else + /* turn off remote syslog if specified */ snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@.\\+\$$/#\\1/' /etc/syslog.conf >&%d", config_fd ); /* if the return code isn't 0 failsafe */ -- 2.13.6

2 2

[PATCH v2] display GeoIP information on active network connections
by Peter Müller 15 Nov '17

15 Nov '17

Display GeoIP information on active network connections in WebUI. Use newly implemented function in /var/ipfire/geoip-functions.pl . Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/connections.cgi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 96f09012b..e9e9e335c 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -31,6 +31,7 @@ use Switch; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require "${General::swroot}/geoip-functions.pl"; my $colour_multicast = "#A0A0A0"; @@ -379,6 +380,7 @@ print <<END; <a href="?sort_field=3&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a> <a href="?sort_field=3&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a> </th> + <th> </th> <th style='text-align:center' colspan='2'> <a href="?sort_field=2&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a> <a href="?sort_field=2&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a> @@ -386,6 +388,7 @@ print <<END; <a href="?sort_field=4&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a> <a href="?sort_field=4&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a> </th> + <th> </th> <th style='text-align:center'> <a href="?sort_field=8&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a> <a href="?sort_field=8&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a> @@ -409,10 +412,16 @@ print <<END; <th style='text-align:center' colspan='2'> $Lang::tr{'source ip and port'} </th> + <th style='text-align:center'> + $Lang::tr{'country'} + </th> <th style='text-align:center' colspan='2'> $Lang::tr{'dest ip and port'} </th> <th style='text-align:center'> + $Lang::tr{'country'} + </th> + <th style='text-align:center'> $Lang::tr{'download'} / <br>$Lang::tr{'upload'} </th> @@ -540,6 +549,12 @@ foreach my $line (@conntrack) { my $bytes_in = format_bytes($bytes[0]); my $bytes_out = format_bytes($bytes[1]); + # enumerate GeoIP information + my $srcccode = &GeoIP::lookup($sip_ret); + my $src_flag_icon = &GeoIP::get_flag_icon($srcccode); + my $dstccode = &GeoIP::lookup($dip_ret); + my $dst_flag_icon = &GeoIP::get_flag_icon($dstccode); + # Format TTL $ttl = format_time($ttl); @@ -601,6 +616,9 @@ foreach my $line (@conntrack) { </a> $sport_extra </td> + <td style='text-align:center; background-color:$sip_colour;'> + <a href='country.cgi#$srcccode'><img src='$src_flag_icon' border='0' align='absmiddle' alt='$srcccode' title='$srcccode' /></a> + </td> <td style='text-align:center; background-color:$dip_colour;'> <a href='/cgi-bin/ipinfo.cgi?ip=$dip'> <span style='color:#FFFFFF;'>$dip</span> @@ -613,6 +631,9 @@ foreach my $line (@conntrack) { </a> $dport_extra </td> + <td style='text-align:center; background-color:$sip_colour;'> + <a href='country.cgi#$dstccode'><img src='$dst_flag_icon' border='0' align='absmiddle' alt='$dstccode' title='$dstccode' /></a> + </td> <td style='text-align:center'> $bytes_in / $bytes_out </td> -- 2.13.6

1 0

[PATCH v2] display GeoIP information on ipinfo.cgi
by Peter Müller 15 Nov '17

15 Nov '17

Display GeoIP information on ipinfo.cgi and use newly implemented function in /var/ipfire/geoip-functions.pl . Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/ipinfo.cgi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi index 16541f126..b756a24d2 100644 --- a/html/cgi-bin/ipinfo.cgi +++ b/html/cgi-bin/ipinfo.cgi @@ -30,6 +30,7 @@ use strict; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require "${General::swroot}/geoip-functions.pl"; my %cgiparams=(); @@ -50,6 +51,10 @@ if (&General::validip($addr)) { my $hostname = gethostbyaddr($iaddr, AF_INET); if (!$hostname) { $hostname = $Lang::tr{'lookup failed'}; } + # enumerate GeoIP information for IP address... + my $ccode = &GeoIP::lookup($addr); + my $flag_icon = &GeoIP::get_flag_icon($ccode); + my $sock = new IO::Socket::INET ( PeerAddr => $whoisname, PeerPort => 43, Proto => 'tcp'); if ($sock) { @@ -81,7 +86,7 @@ if (&General::validip($addr)) { @lines = ( "$Lang::tr{'unable to contact'} $whoisname" ); } - &Header::openbox('100%', 'left', $addr . ' (' . $hostname . ') : '.$whoisname); + &Header::openbox('100%', 'left', $addr . " <a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a> (" . $hostname . ') : '.$whoisname); print "<pre>\n"; foreach my $line (@lines) { print &Header::cleanhtml($line,"y"); -- 2.13.6

1 0

[PATCH] Revived as addon: squid graphs 3.2
by Matthias Fischer 15 Nov '17

15 Nov '17

Hi, For details see: https://sourceforge.net/projects/squid-graph/ "Squid Graph is a free, simple, yet powerful Squid v2 native logfile analysis tool that generates reports with graphical representation of the proxy server's traffic, somewhat like the popular MRTG tool." I found by chance that the corresponding translation strings were still present, so I thought "Why not?". ;-) After some tests I decided to revive this tool - here it is as an IPFire addon. The original GUI and scripts were slightly tuned, localised and polished for better readability, translations went in '/var/ipfire/addon-lang' for better handling. For better GUI integration I had to move the 'entropy'-STATUS-entry one step down, so that the '*-graphs' entries were lying together. I found no problems with that during testing. Updates are made every five minutes through '/etc/fcron.cyclic', so there was no need to patch '/usr/local/bin/makegraphs' as before. Please test and report. ;-) Best, Matthias P.S.: Removed some unnecessary spaces in 'make.sh' Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/menu/20-status.menu | 2 +- config/rootfiles/packages/squid-graph | 16 +++++ lfs/squid-graph | 110 ++++++++++++++++++++++++++++++++++ make.sh | 5 +- src/paks/squid-graph/install.sh | 31 ++++++++++ src/paks/squid-graph/uninstall.sh | 29 +++++++++ src/paks/squid-graph/update.sh | 26 ++++++++ 7 files changed, 216 insertions(+), 3 deletions(-) create mode 100644 config/rootfiles/packages/squid-graph create mode 100644 lfs/squid-graph create mode 100644 src/paks/squid-graph/install.sh create mode 100644 src/paks/squid-graph/uninstall.sh create mode 100644 src/paks/squid-graph/update.sh diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 2bcf0d5e8..2e7c579e3 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -58,7 +58,7 @@ 'title' => "$Lang::tr{'hardware graphs'}", 'enabled' => 1, }; - $substatus->{'61.entropy'} = { + $substatus->{'62.entropy'} = { 'caption' => "$Lang::tr{'entropy'}", 'uri' => '/cgi-bin/entropy.cgi', 'title' => "$Lang::tr{'entropy graphs'}", diff --git a/config/rootfiles/packages/squid-graph b/config/rootfiles/packages/squid-graph new file mode 100644 index 000000000..4da515229 --- /dev/null +++ b/config/rootfiles/packages/squid-graph @@ -0,0 +1,16 @@ +etc/fcron.cyclic/update-squid-graphs +srv/web/ipfire/cgi-bin/sgraphs.cgi +srv/web/ipfire/html/sgraph +srv/web/ipfire/html/sgraph/logo.png +usr/bin/squid-graphs +usr/local/bin/update-squid-graphs.sh +var/ipfire/addon-lang/squid-graphs.de.pl +var/ipfire/addon-lang/squid-graphs.en.pl +var/ipfire/addon-lang/squid-graphs.es.pl +var/ipfire/addon-lang/squid-graphs.fr.pl +var/ipfire/addon-lang/squid-graphs.it.pl +var/ipfire/addon-lang/squid-graphs.nl.pl +var/ipfire/addon-lang/squid-graphs.pl.pl +var/ipfire/addon-lang/squid-graphs.ru.pl +var/ipfire/addon-lang/squid-graphs.tr.pl +var/ipfire/menu.d/EX-squid-graphs.menu diff --git a/lfs/squid-graph b/lfs/squid-graph new file mode 100644 index 000000000..1ba975d5e --- /dev/null +++ b/lfs/squid-graph @@ -0,0 +1,110 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2017 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.2 + +THISAPP = squid-graph-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PAK_VER = 1 +PROG = squid-graph + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = eaa3051dd36456a7b1d8eadb8605e201 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + +# Install GUI + install -v -m 755 $(DIR_SRC)/srv/web/ipfire/cgi-bin/sgraphs.cgi \ + /srv/web/ipfire/cgi-bin/sgraphs.cgi + +# Create sgraph dir, install logo + -mkdir -p /srv/web/ipfire/html/sgraph + install -v -m 644 $(DIR_SRC)/srv/web/ipfire/html/sgraph/logo.png \ + /srv/web/ipfire/html/sgraph/logo.png + +# Install main program + install -v -m 755 $(DIR_SRC)/usr/bin/squid-graphs \ + /usr/bin/squid-graphs + +# Install update script + install -v -m 755 $(DIR_SRC)/usr/local/bin/update-squid-graphs.sh \ + /usr/local/bin/update-squid-graphs.sh + +# Create symlink for five-minute-update-interval + ln -sf /usr/local/bin/update-squid-graphs.sh /etc/fcron.cyclic/update-squid-graphs + +# Install language files + install -v -m 004 $(DIR_SRC)/var/ipfire/addon-lang/squid-graphs.*.pl \ + /var/ipfire/addon-lang/ + +# Install menu entry + install -v -m 644 $(DIR_SRC)/var/ipfire/menu.d/EX-squid-graphs.menu \ + /var/ipfire/menu.d/EX-squid-graphs.menu + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f8a2e5b34..de31d1874 100755 --- a/make.sh +++ b/make.sh @@ -877,6 +877,7 @@ buildipfire() { lfsmake2 perl-Net-IP lfsmake2 wio lfsmake2 iftop + lfsmake2 squid-graph } buildinstaller() { @@ -893,7 +894,7 @@ buildpackages() { export LOGFILE echo "... see detailed log in _build.*.log files" >> $LOGFILE - + # Generating list of packages used echo -n "Generating packages list from logs" | tee -a $LOGFILE rm -f $BASEDIR/doc/packages-list @@ -908,7 +909,7 @@ buildpackages() { rm -f $BASEDIR/doc/packages-list # packages-list.txt is ready to be displayed for wiki page beautify message DONE - + # Update changelog cd $BASEDIR [ -z $GIT_TAG ] || LAST_TAG=$GIT_TAG diff --git a/src/paks/squid-graph/install.sh b/src/paks/squid-graph/install.sh new file mode 100644 index 000000000..833c14435 --- /dev/null +++ b/src/paks/squid-graph/install.sh @@ -0,0 +1,31 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_files + +# Update language-cache +/usr/local/bin/update-lang-cache + +restore_backup ${NAME} diff --git a/src/paks/squid-graph/uninstall.sh b/src/paks/squid-graph/uninstall.sh new file mode 100644 index 000000000..0823bc8b3 --- /dev/null +++ b/src/paks/squid-graph/uninstall.sh @@ -0,0 +1,29 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +make_backup ${NAME} +remove_files + +/usr/local/bin/update-lang-cache diff --git a/src/paks/squid-graph/update.sh b/src/paks/squid-graph/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/squid-graph/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh -- 2.15.0

2 4

[PATCH] OpenVPN: Fix to prevent exceedance of OpenSSLs max. validity.
by Erik Kapfer 14 Nov '17

14 Nov '17

- If the OpenSSL maximum of '999999' will be exceeded over the WUI, the entry in OpenVPNs database index.txt will be written without a timestamp and crashes the database which blocks the creation of new clients. To prevent this, a check has been set which restricts the data field of 'valid til days' to '6' numerics. Fixes: #10482 --- html/cgi-bin/ovpnmain.cgi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index ceb88c1..8f45f04 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4039,6 +4039,14 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } + # Check that OpenSSL maximum of valid days won´t be exceeded + if (length($cgiparams{'DAYS_VALID'}) > 6) { + $errormessage = $Lang::tr{'invalid input for valid till days'}; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; + } + if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) { $errormessage = $Lang::tr{'invalid input'}; goto VPNCONF_ERROR; @@ -4221,6 +4229,12 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } + # Check that OpenSSL maximum of valid days won´t be exceeded + if (length($cgiparams{'DAYS_VALID'}) > 6) { + $errormessage = $Lang::tr{'invalid input for valid till days'}; + goto VPNCONF_ERROR; + } + # Replace empty strings with a . (my $ou = $cgiparams{'CERT_OU'}) =~ s/^\s*$/\./; (my $city = $cgiparams{'CERT_CITY'}) =~ s/^\s*$/\./; -- 2.7.4

3 4

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development November 2017