Development May 2020

development@lists.ipfire.org

16 participants
95 discussions

[PATCH] squidGuard: Fix generating databases with libdb >= 5
by Michael Tremer 23 May '20

23 May '20

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- lfs/squidguard | 1 + src/patches/squidGuard-1.4-db5.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 src/patches/squidGuard-1.4-db5.patch diff --git a/lfs/squidguard b/lfs/squidguard index f627a27d8..38efab0ee 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidguard-1.4-squid-helper-protocol.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidGuard-1.4-db5.patch cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \ --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man \ --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \ diff --git a/src/patches/squidGuard-1.4-db5.patch b/src/patches/squidGuard-1.4-db5.patch new file mode 100644 index 000000000..733fbad2e --- /dev/null +++ b/src/patches/squidGuard-1.4-db5.patch @@ -0,0 +1,12 @@ +diff -ruN squidGuard-1.4-vanilla/src/sgDb.c squidGuard-1.4/src/sgDb.c +--- squidGuard-1.4-vanilla/src/sgDb.c 2008-07-15 04:29:41.000000000 +1000 ++++ squidGuard-1.4/src/sgDb.c 2013-01-21 12:47:41.049325756 +1100 +@@ -114,7 +114,7 @@ + } + } + #endif +-#if DB_VERSION_MAJOR == 4 ++#if DB_VERSION_MAJOR >= 4 + if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){ + flag = DB_CREATE; + if(createdb) \ No newline at end of file -- 2.20.1

2 3

[PATCH] backup.cgi: Cosmetic fix - mark backup files bold for better readability
by Matthias Fischer 22 May '20

22 May '20

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/backup.cgi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index cac4146ab..3ced1371d 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -202,7 +202,7 @@ my $Datei = "/var/ipfire/backup/".$_; my @Info = stat($Datei); my $Size = $Info[7] / 1024 / 1024; $Size = sprintf("%0.2f", $Size); -print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='download' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>"; +print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='download' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>"; print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>"; } foreach (@backupisos){ @@ -212,7 +212,7 @@ my $Datei = "/var/tmp/backupiso/".$_; my @Info = stat($Datei); my $Size = $Info[7] / 1024 / 1024; $Size = sprintf("%0.2f", $Size); -print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='downloadiso' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>"; +print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='downloadiso' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>"; print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>"; } print <<END @@ -246,10 +246,10 @@ my $Size = $Info[7] / 1024; if ( -e $Datei ){ if ($Size < 1) { $Size = sprintf("%.2f", $Size); - print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; + print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; } else { $Size = sprintf("%2d", $Size); - print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; + print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; } @@ -272,7 +272,7 @@ END ; } else{ - print "<tr><td align='center'>$Lang::tr{'backup from'} $_ </td><td width='5' align='right'></td><td width='5' align='right'></td>"; + print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> </td><td width='5' align='right'></td><td width='5' align='right'></td>"; } print <<END <td align='right' width='5'> @@ -291,7 +291,7 @@ my $Datei = "/var/ipfire/backup/addons/backup/".$_.".ipf"; my @Info = stat($Datei); my $Size = $Info[7] / 1024; $Size = sprintf("%2d", $Size); -print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; +print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; print <<END <td align='right' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> -- 2.18.0

2 3

Re: [PATCH 0/3] Help for GUI
by Michael Tremer 22 May '20

22 May '20

> On 21 May 2020, at 20:31, Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk> wrote: > > On 21/05/2020 19:51, Jonatan Schlag wrote: >> Hi, >> >> >> 16.05.2020, 11:28 -0500 Jon Murphy: >>> My opinion: This encourages people to look at the wiki and gets them >>> pointed in the right direction. This is much better than a new user >>> firing off a quick question to the Community. Most anything that is >>> encourages people to get interested in IPFire is a good thing. >> >> >> I do not know if it will encourage people, but if a person wants to >> learn to find the starting point for a certain topic, is much easier. >> >> >> >>> >>> There are very few people that will read the whole wiki from the >>> start (not sure how many wiki pages?). Especially reading something >>> that is technically difficult. >> >> I think nobody requests or requested that everybody have to read the >> full wiki. From my experiences, it is just better to read and learn >> before doing things. Try and error is also ok, but then nobody should >> expecting that somebody helps, when they get into trouble. There is >> also a learning effect in finding the solutions on yourself. >> >> >> I also see your point that people might not read stuff that is >> technically >> difficult or hard to understand, but sometimes there is no way to avoid >> this. Learning new things can be hard and sometimes you have to read. >> Even links to the right wiki page will change nothing concerning the >> need that some people have to read a lot. The only thing that gets >> improved is that people have not to find the right place to start. They >> will have to read not more and not less. >> >>> >>> I’ll use myself as an example. Right now I am trying to learn a >>> little about SIP and Asterisks and FreePBX. I tried reading various >>> pages of Asterisks (or FreePBX) and it is over my head. So I try a >>> few things on my Asterisks box, watch a video, read a little, try >>> some thing than rinse & repeat. (And Yes I realize asterisks is not >>> the same as IPFire). >>> >>> I did the same with IPFire (and IPCop) many years ago. It works very >>> well for me. >>> >>> Anything that makes it super easy to find a way to the wiki is a good >>> thing! >>> >>> >>> >>>> From: Jon Murphy >>>> Sent: Saturday, May 16, 2020, 11:10 AM >>>> To: development-request(a)lists.ipfire.org, >>>> development(a)lists.ipfire.org >>>> Subject: Re: [PATCH 0/3] Help for GUI >>>> >>>> >>>> Oops… maybe my bad? >>>> >>>> >>>>> ------------------------------ >>>>> >>>>> Message: 3 >>>>> Date: Sat, 16 May 2020 10:35:00 +0100 >>>>> From: Michael Tremer <michael.tremer(a)ipfire.org> >>>>> To: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk> >>>>> Cc: development(a)lists.ipfire.org >>>>> Subject: Re: [PATCH 0/3] Help for GUI >>>>> Message-ID: <6390F8AE-998D-489E-A983-1A875E2761F2(a)ipfire.org> >>>>> Content-Type: text/plain; charset=utf-8 >>>>> >>>>> Hi Tim, >>>>> >>>>> Thank you very much for submitting these patches. >>>>> >>>>> I am afraid that I must say that I oppose these changes. >>>>> >>>>> This has recently been discussed on the community portal and >>>>> although I still have not made my mind up entirely, I think this >>>>> not helpful to anyone: >>>>> >>>>> * We do not have documentation for everything for a start >> >> >> So a few pages are missing, but from my point of view, it is better to >> have a context-sensitive help for 90% of the pages as for 0%. >> >>>>> * There is never this ?just read one sentence and you suddenly >>>>> will be an expert? thing this kind of promotes >>>>> >>>>> Should we not rather link the wiki somewhere in the footer and >>>>> encourage people to start reading the whole thing from the start >>>>> before they do something? >> >> I do not think that this promotes this. Maybe, but theses people then >> did not understand how things are working. Like written above, the need >> to read and also the amount people have to read will not change. When >> they do not understand this, I currently have no idea how to solve this >> issue. >> >> The real improvement I see here is, that people find the right entry >> point to the wiki. They're also people who have a lot of knowledge and >> for them, a link to the corresponding wiki site is a usability >> improvement. Context-Sensitive Help is a nice feature for all people >> who know how to use it. People who know, when they did not understand >> the page where they were redirected, that they have to read more. Or >> that they have to understand more of the context/technologie/ whatever. >> >> So to sum up what I try to explain: >> We should accept features which improving the usability for a lot of >> people. We should not drop these features because some people have a >> way to learn which does not work. We will not change these people, >> whatever we will do. So I vote to accept this improvement, but I still >> have some questions left. >> >> @Tim could you send a Screenshot how this will look? I cannot imagine >> such things from code >> >> @Michael: >> I also like the Idea that the wiki is linked in the footer. >> The guys at nextcloud have something like this: >> >> https://user-images.githubusercontent.com/5169868/58201395-fa749000-7ca2-11… >> >> Maybe we could create a website similar and pointing the users to right >> directions in the web interface itself? >> >> Greetings Jonatan >> >>>>> >>>>> What is your rationale to implementing this? >>>>> >>>>> Best, >>>>> -Michael >>>>> >>>>>> On 15 May 2020, at 22:39, Tim FitzGeorge < >>>>>> ipfr(a)tfitzgeorge.me.uk> wrote: >>>>>> >>>>>> Add per-page help link to GUI. >>>>>> The link is extracted from the menu file and added to the menu. >>>>>> Currently only implemented for 'ipfire' and 'ipfire-rounded' >>>>>> themes. >>>>>> >>>>>> Tim FitzGeorge (3): >>>>>> Help for GUI - ipfire theme code >>>>>> Help for GUI - Help links >>>>>> Help for GUI - help link style >>>>>> >>>>>> config/menu/10-system.menu | 11 +++++++ >>>>>> config/menu/20-status.menu | 13 ++++++++ >>>>>> config/menu/30-network.menu | 20 +++++++++-- >>>>>> config/menu/40-services.menu | 6 ++++ >>>>>> config/menu/50-firewall.menu | 8 ++++- >>>>>> config/menu/60-ipfire.menu | 1 + >>>>>> config/menu/70-log.menu | 33 >>>>>> ++++++++++++------- >>>>>> config/menu/EX-apcupsd.menu | 1 + >>>>>> config/menu/EX-guardian.menu | 1 + >>>>>> config/menu/EX-mpfire.menu | 1 + >>>>>> config/menu/EX-samba.menu | 1 + >>>>>> config/menu/EX-tor.menu | 1 + >>>>>> config/menu/EX-wlanap.menu | 1 + >>>>>> html/html/themes/ipfire/include/css/style.css | 8 +++++ >>>>>> html/html/themes/ipfire/include/functions.pl | 19 +++++++++-- >>>>>> 15 files changed, 107 insertions(+), 18 deletions(-) >>>>>> >>>>>> -- >>>>>> 2.26.1 >>>>>> >> > > Hi, > > On 21/05/2020 19:51, Jonatan Schlag wrote: >> Hi, >> >> 16.05.2020, 11:28 -0500 Jon Murphy: >>> My opinion: This encourages people to look at the wiki and gets them >>> pointed in the right direction. This is much better than a new user >>> firing off a quick question to the Community. Most anything that is >>> encourages people to get interested in IPFire is a good thing. >> >> I do not know if it will encourage people, but if a person wants to >> learn to find the starting point for a certain topic, is much easier. >> >>> >>> There are very few people that will read the whole wiki from the >>> start (not sure how many wiki pages?). Especially reading something >>> that is technically difficult. >> I think nobody requests or requested that everybody have to read the >> full wiki. From my experiences, it is just better to read and learn >> before doing things. Try and error is also ok, but then nobody should >> expecting that somebody helps, when they get into trouble. There is >> also a learning effect in finding the solutions on yourself. >> >> I also see your point that people might not read stuff that is >> technically >> difficult or hard to understand, but sometimes there is no way to avoid >> this. Learning new things can be hard and sometimes you have to read. >> Even links to the right wiki page will change nothing concerning the >> need that some people have to read a lot. The only thing that gets >> improved is that people have not to find the right place to start. They >> will have to read not more and not less. >>> >>> I’ll use myself as an example. Right now I am trying to learn a >>> little about SIP and Asterisks and FreePBX. I tried reading various >>> pages of Asterisks (or FreePBX) and it is over my head. So I try a >>> few things on my Asterisks box, watch a video, read a little, try >>> some thing than rinse & repeat. (And Yes I realize asterisks is not >>> the same as IPFire). >>> >>> I did the same with IPFire (and IPCop) many years ago. It works very >>> well for me. >>> >>> Anything that makes it super easy to find a way to the wiki is a good >>> thing! >>>>>>> From: Jon Murphy >>>> Sent: Saturday, May 16, 2020, 11:10 AM >>>> To: development-request(a)lists.ipfire.org, >>>> development(a)lists.ipfire.org >>>> Subject: Re: [PATCH 0/3] Help for GUI >>>> >>>> >>>> Oops… maybe my bad? >>>> >>>> >>>>> ------------------------------ >>>>> >>>>> Message: 3 >>>>> Date: Sat, 16 May 2020 10:35:00 +0100 >>>>> From: Michael Tremer <michael.tremer(a)ipfire.org> >>>>> To: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk> >>>>> Cc: development(a)lists.ipfire.org >>>>> Subject: Re: [PATCH 0/3] Help for GUI >>>>> Message-ID: <6390F8AE-998D-489E-A983-1A875E2761F2(a)ipfire.org> >>>>> Content-Type: text/plain; charset=utf-8 >>>>> >>>>> Hi Tim, >>>>> >>>>> Thank you very much for submitting these patches. >>>>> >>>>> I am afraid that I must say that I oppose these changes. >>>>> >>>>> This has recently been discussed on the community portal and >>>>> although I still have not made my mind up entirely, I think this >>>>> not helpful to anyone: >>>>> >>>>> * We do not have documentation for everything for a start >> >> >> So a few pages are missing, but from my point of view, it is better to >> have a context-sensitive help for 90% of the pages as for 0%. > > And maybe it will encourage people to add the missing pages? (I won't > hold my breath on this one). I would agree, but keeping my fingers crossed. > >> >>>>> * There is never this ?just read one sentence and you suddenly >>>>> will be an expert? thing this kind of promotes >>>>> >>>>> Should we not rather link the wiki somewhere in the footer and >>>>> encourage people to start reading the whole thing from the start >>>>> before they do something? >> >> I do not think that this promotes this. Maybe, but theses people then >> did not understand how things are working. Like written above, the need >> to read and also the amount people have to read will not change. When >> they do not understand this, I currently have no idea how to solve this >> issue. >> >> The real improvement I see here is, that people find the right entry >> point to the wiki. They're also people who have a lot of knowledge and >> for them, a link to the corresponding wiki site is a usability >> improvement. Context-Sensitive Help is a nice feature for all people >> who know how to use it. People who know, when they did not understand >> the page where they were redirected, that they have to read more. Or >> that they have to understand more of the context/technologie/ whatever. >> >> So to sum up what I try to explain: >> We should accept features which improving the usability for a lot of >> people. We should not drop these features because some people have a >> way to learn which does not work. We will not change these people, >> whatever we will do. So I vote to accept this improvement, but I still >> have some questions left. >> >> @Tim could you send a Screenshot how this will look? I cannot imagine >> such things from code > > I've attached the screenshot. I decided to just use a question mark > since, to me, I thought that putting 'Help' implies having a menu > underneath rather than a single help link. I put a circle around it to > make it a little more prominent, but that's handled in the stylesheet so > both are easily changed. I do not think this is the right place. It is not obvious that this changes with the page. Therefore I would rather suggest to have it in the top right corner of the first big white box on the page. > >> >> @Michael: >> I also like the Idea that the wiki is linked in the footer. >> The guys at nextcloud have something like this: >> >> > https://user-images.githubusercontent.com/5169868/58201395-fa749000-7ca2-11… > >> >> Maybe we could create a website similar and pointing the users to right >> directions in the web interface itself? > > I wonder whether putting a small font link or two in the standard wiki > page header might help new users. I would clutter up the header, but it > may be worth it, although as just clicking on the title takes you to the > top of the wiki it shouldn't really make a difference. Perhaps link the > web site and community? If we want to make things easy, we need to make sure that finding the wiki is easier than dropping a line on Community. We already have plenty of these useless posts and they are annoying and unhelpful to literally everybody. -Michael > > Tim > >> >> Greetings Jonatan >> >>>>> >>>>> What is your rationale to implementing this? >>>>> >>>>> Best, >>>>> -Michael >>>>> >>>>>>> On 15 May 2020, at 22:39, Tim FitzGeorge < >>>>>>> ipfr(a)tfitzgeorge.me.uk> wrote: >>>>>>> >>>>>>> Add per-page help link to GUI. >>>>>>> The link is extracted from the menu file and added to the menu. >>>>>>> Currently only implemented for 'ipfire' and 'ipfire-rounded' >>>>>>> themes. >>>>>>> >>>>>>> Tim FitzGeorge (3): >>>>>>> Help for GUI - ipfire theme code >>>>>>> Help for GUI - Help links >>>>>>> Help for GUI - help link style >>>>>>> >>>>>>> config/menu/10-system.menu | 11 +++++++ >>>>>>> config/menu/20-status.menu | 13 ++++++++ >>>>>>> config/menu/30-network.menu | 20 +++++++++-- >>>>>>> config/menu/40-services.menu | 6 ++++ >>>>>>> config/menu/50-firewall.menu | 8 ++++- >>>>>>> config/menu/60-ipfire.menu | 1 + >>>>>>> config/menu/70-log.menu | 33 >>>>>>> ++++++++++++------- >>>>>>> config/menu/EX-apcupsd.menu | 1 + >>>>>>> config/menu/EX-guardian.menu | 1 + >>>>>>> config/menu/EX-mpfire.menu | 1 + >>>>>>> config/menu/EX-samba.menu | 1 + >>>>>>> config/menu/EX-tor.menu | 1 + >>>>>>> config/menu/EX-wlanap.menu | 1 + >>>>>>> html/html/themes/ipfire/include/css/style.css | 8 +++++ >>>>>>> html/html/themes/ipfire/include/functions.pl | 19 +++++++++-- >>>>>>> 15 files changed, 107 insertions(+), 18 deletions(-) >>>>>>> >>>>>>> -- >>>>>>> 2.26.1 >>>>>>> >> > > > Screenshot_2020-05-21 testipfire - Status information.png > <Screenshot_2020-05-21 testipfire - Status information.png>

1 0

Re: [PATCH 0/3] Help for GUI
by Jon Murphy 22 May '20

22 May '20

Oops… maybe my bad? > > ------------------------------ > > Message: 3 > Date: Sat, 16 May 2020 10:35:00 +0100 > From: Michael Tremer <michael.tremer(a)ipfire.org> > To: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk> > Cc: development(a)lists.ipfire.org > Subject: Re: [PATCH 0/3] Help for GUI > Message-ID: <6390F8AE-998D-489E-A983-1A875E2761F2(a)ipfire.org> > Content-Type: text/plain; charset=utf-8 > > Hi Tim, > > Thank you very much for submitting these patches. > > I am afraid that I must say that I oppose these changes. > > This has recently been discussed on the community portal and although I still have not made my mind up entirely, I think this not helpful to anyone: > > * We do not have documentation for everything for a start > * There is never this ?just read one sentence and you suddenly will be an expert? thing this kind of promotes > > Should we not rather link the wiki somewhere in the footer and encourage people to start reading the whole thing from the start before they do something? > > What is your rationale to implementing this? > > Best, > -Michael > >> On 15 May 2020, at 22:39, Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk> wrote: >> >> Add per-page help link to GUI. >> The link is extracted from the menu file and added to the menu. >> Currently only implemented for 'ipfire' and 'ipfire-rounded' themes. >> >> Tim FitzGeorge (3): >> Help for GUI - ipfire theme code >> Help for GUI - Help links >> Help for GUI - help link style >> >> config/menu/10-system.menu | 11 +++++++ >> config/menu/20-status.menu | 13 ++++++++ >> config/menu/30-network.menu | 20 +++++++++-- >> config/menu/40-services.menu | 6 ++++ >> config/menu/50-firewall.menu | 8 ++++- >> config/menu/60-ipfire.menu | 1 + >> config/menu/70-log.menu | 33 ++++++++++++------- >> config/menu/EX-apcupsd.menu | 1 + >> config/menu/EX-guardian.menu | 1 + >> config/menu/EX-mpfire.menu | 1 + >> config/menu/EX-samba.menu | 1 + >> config/menu/EX-tor.menu | 1 + >> config/menu/EX-wlanap.menu | 1 + >> html/html/themes/ipfire/include/css/style.css | 8 +++++ >> html/html/themes/ipfire/include/functions.pl | 19 +++++++++-- >> 15 files changed, 107 insertions(+), 18 deletions(-) >> >> -- >> 2.26.1 >> > >

3 3

[PATCH 0/3] Help for GUI
by Tim FitzGeorge 22 May '20

22 May '20

Add per-page help link to GUI. The link is extracted from the menu file and added to the menu. Currently only implemented for 'ipfire' and 'ipfire-rounded' themes. Tim FitzGeorge (3): Help for GUI - ipfire theme code Help for GUI - Help links Help for GUI - help link style config/menu/10-system.menu | 11 +++++++ config/menu/20-status.menu | 13 ++++++++ config/menu/30-network.menu | 20 +++++++++-- config/menu/40-services.menu | 6 ++++ config/menu/50-firewall.menu | 8 ++++- config/menu/60-ipfire.menu | 1 + config/menu/70-log.menu | 33 ++++++++++++------- config/menu/EX-apcupsd.menu | 1 + config/menu/EX-guardian.menu | 1 + config/menu/EX-mpfire.menu | 1 + config/menu/EX-samba.menu | 1 + config/menu/EX-tor.menu | 1 + config/menu/EX-wlanap.menu | 1 + html/html/themes/ipfire/include/css/style.css | 8 +++++ html/html/themes/ipfire/include/functions.pl | 19 +++++++++-- 15 files changed, 107 insertions(+), 18 deletions(-) -- 2.26.1

2 6

[PATCH] pakfire.cgi: Cosmetic fix
by Matthias Fischer 22 May '20

22 May '20

The two text passages for 'pakfire install...' and 'pakfire uninstall...' under 'Available' and 'Installed Addons:' are so close together that the first line appears as a single line. This patch separates these two areas a bit from each other so that they are better readable. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/pakfire.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index dacbe11f4..fa5bcdffa 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -250,7 +250,7 @@ END <tr><td colspan="2">  <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b> <td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b> - <tr><td align="center"> + <td style="padding:5px 10px 20px 20px" align="center"> <p>$Lang::tr{'pakfire install description'}</p> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name="INSPAKS" size="10" multiple> @@ -264,7 +264,7 @@ print <<END; <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/list-add.png' /> </form> - <td align="center"> + <td style="padding:5px 10px 20px 20px" align="center"> <p>$Lang::tr{'pakfire uninstall description'}</p> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name="DELPAKS" size="10" multiple> -- 2.18.0

1 0

[PATCH] debian: Enable location-download.timer after installation
by Stefan Schantl 21 May '20

21 May '20

This timer periodly executes the location-downloader and keeps the location database up to date. Fixes #12412. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 55d4334..1c6d171 100755 --- a/debian/rules +++ b/debian/rules @@ -11,3 +11,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all override_dh_perl: dh_perl -d + +override_dh_systemd_enable: + dh_systemd_enable location-downloader.timer -- 2.26.1

1 0

[PATCH] debian: Ship database signing key.
by Stefan Schantl 21 May '20

21 May '20

This key is needed to download and verify the database. Fixes #12410. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- debian/libloc.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libloc.install b/debian/libloc.install index 30ce9d8..eb3b49a 100644 --- a/debian/libloc.install +++ b/debian/libloc.install @@ -6,3 +6,4 @@ usr/lib/python3*/dist-packages usr/lib/python3*/lib-dynload/*.so src/systemd/*.service /lib/systemd/system/ src/systemd/*.timer /lib/systemd/system/ +var/lib/location/signing-key.pem -- 2.26.1

1 0

[PATCH] examples/create-database.py: Add hack to allow loading the module in build environment.
by Stefan Schantl 21 May '20

21 May '20

This script is needed to generate the database which is used by the testsuite of the perl binding of libloc. This allows us to revert the following commits: * 482eb94f165507ffcb6503e162535064d6dcecac * 3d26288681601b273f034de1f2241dc4342791b5 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- examples/python/create-database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/python/create-database.py b/examples/python/create-database.py index 86205e0..0eaa945 100644 --- a/examples/python/create-database.py +++ b/examples/python/create-database.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -import location +import _location as location import os import sys -- 2.26.1

1 0

[PATCH v2] LDAP Auth: add parameter "-R" to not follow referrals.
by Frank Schütte 20 May '20

20 May '20

--- html/cgi-bin/proxy.cgi | 11 +++++++++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 13 insertions(+) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 73646a5ae..23377c42e 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -253,6 +253,7 @@ $proxysettings{'LDAP_PORT'} = '389'; $proxysettings{'LDAP_BINDDN_USER'} = ''; $proxysettings{'LDAP_BINDDN_PASS'} = ''; $proxysettings{'LDAP_GROUP'} = ''; +$proxysettings{'LDAP_REFERRALS'} = 'on'; $proxysettings{'NTLM_AUTH_GROUP'} = ''; $proxysettings{'NTLM_AUTH_BASIC'} = 'off'; $proxysettings{'NTLM_DOMAIN'} = ''; @@ -826,6 +827,10 @@ $selected{'NCSA_GROUP'}{$proxysettings{'NCSA_GROUP'}} = "selected='selected'"; $selected{'LDAP_TYPE'}{$proxysettings{'LDAP_TYPE'}} = "selected='selected'"; +$checked{'LDAP_REFERRALS'}{'off'} = ''; +$checked{'LDAP_REFERRALS'}{'on'} = ''; +$checked{'LDAP_REFERRALS'}{$proxysettings{'LDAP_REFERRALS'}} = "checked='checked'"; + $proxysettings{'NTLM_ENABLE_INT_AUTH'} = 'on' unless exists $proxysettings{'NTLM_ENABLE_INT_AUTH'}; $checked{'NTLM_ENABLE_INT_AUTH'}{'off'} = ''; @@ -1932,6 +1937,10 @@ print <<END <td width='20%' class='base'>$Lang::tr{'advproxy LDAP port'}:</td> <td><input type='text' name='LDAP_PORT' value='$proxysettings{'LDAP_PORT'}' size='3' /></td> </tr> +<tr> + <td width='20%' class='base'>$Lang::tr{'advproxy LDAP follow referrals'}:</td> + <td width='80%'><input type='checkbox' name='LDAP_REFERRALS' $checked{'LDAP_REFERRALS'}{'on'} /></td> +</tr> </table> <hr size ='1'> <table width='100%'> @@ -2081,6 +2090,7 @@ print <<END <td><input type='hidden' name='LDAP_BINDDN_USER' value='$proxysettings{'LDAP_BINDDN_USER'}'></td> <td><input type='hidden' name='LDAP_BINDDN_PASS' value='$proxysettings{'LDAP_BINDDN_PASS'}'></td> <td><input type='hidden' name='LDAP_GROUP' value='$proxysettings{'LDAP_GROUP'}'></td> +<td><input type='hidden' name='LDAP_REFERRALS' value='$proxysettings{'LDAP_REFERRALS'}'></td> END ; } @@ -3283,6 +3293,7 @@ END print FILE "auth_param basic program $authdir/basic_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\""; if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D \"$proxysettings{'LDAP_BINDDN_USER'}\""; } if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; } + if (!($proxysettings{'LDAP_REFERRALS'} eq 'on')) { print FILE " -R"; } if ($proxysettings{'LDAP_TYPE'} eq 'ADS') { if ($proxysettings{'LDAP_GROUP'} eq '') diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 216d49d7c..050c30a3d 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -203,6 +203,7 @@ 'advproxy LDAP common settings' => 'Allgemeine LDAP-Einstellungen', 'advproxy LDAP group access control' => 'Gruppenbasierte Zugriffskontrolle', 'advproxy LDAP group required' => 'Erforderliche Gruppe', +'advproxy LDAP referrals' => 'Folge Referrals', 'advproxy LDAP port' => 'Port', 'advproxy LDAP server' => 'LDAP-Server', 'advproxy LDAP type' => 'LDAP-Typ', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ff08bce0c..9d1d2be81 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -200,6 +200,7 @@ 'advproxy LDAP common settings' => 'Common LDAP settings', 'advproxy LDAP group access control' => 'Group based access control', 'advproxy LDAP group required' => 'Required group', +'advproxy LDAP referrals' => 'follow referrals', 'advproxy LDAP port' => 'Port', 'advproxy LDAP server' => 'LDAP Server', 'advproxy LDAP type' => 'LDAP type', -- 2.26.1

1 0

← 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 May 2020