[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91fe9748c92bd5a80e60b9467878f95da5bc7e8e

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91fe9748c92bd5a80e60b9467878f95da5bc7e8e

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4900 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  91fe9748c92bd5a80e60b9467878f95da5bc7e8e (commit)
       via  cb741b5a66046150c922a469dc19bb876f216c5f (commit)
       via  01ed9ff3219de2683b3a3e74cea6602dde3e04fb (commit)
      from  94845e08bc2ca9e24e208630979bdcddb84b2682 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91fe9748c92bd5a80e60b9467878f95da5bc7e8e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Sep 28 09:39:56 2023 +0000

    core181: Ship URLFilter changes
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit cb741b5a66046150c922a469dc19bb876f216c5f
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Tue Sep 26 16:07:01 2023 +0200

    urlfilter.cgi: Fixes bug#10649 - calls urlfilterctrl with remove option if update disabled
    
    - When the url filter update enable checkbox is unchecked then this patch calls
       urlfilterctrl with the remove option added in the otrher patch of this series.
    - Tested on my vm testbed that this change does remove the urlfilter symlink from the
       fcron directories when the update is disabled.
    
    Fixes: Bug#10649
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 01ed9ff3219de2683b3a3e74cea6602dde3e04fb
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Tue Sep 26 16:07:00 2023 +0200

    urlfilterctrl: Fix bug#10649 - add option to remove urlfilter from fcron directories
    
    - Currently if the urlfilter update is enabled then autoupdate.pl is renamed urlfilter and
       added into either the daily, weekly or monthly fcron directoiries. If the update is
       disabled then the urlfilter update script stays in the directory and is not removed.
    - This patch adds in the option of remove to the urlfilterctrl program. The first part
       of the urlfilterctrl.c code removes any existing symlinks so all that needs to be done
       for the remove option is to not add any symlinks to the fcron directories.
    - Confirmed in a vm testbed that the current approach leaves the symlink in place. Installed
       the changes from this and the previous patch and confirmed that when the url update is
       disabled the symlink is removed.
    
    Fixes: Bug#10649
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/181/filelists/files | 2 ++
 html/cgi-bin/urlfilter.cgi                | 5 +++++
 src/misc-progs/urlfilterctrl.c            | 2 ++
 3 files changed, 9 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/181/filelists/files b/config/rootfiles/core/181/filelists/files
index 7d390413f..9baabc29e 100644
--- a/config/rootfiles/core/181/filelists/files
+++ b/config/rootfiles/core/181/filelists/files
@@ -1,2 +1,4 @@
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi
 srv/web/ipfire/html/images/openvpn_encrypted.png
+usr/local/bin/urlfilterctrl
diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 1e54372f1..1ced06e26 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -982,6 +982,11 @@ if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter save schedule'})
 		{
 			&General::system('/usr/local/bin/urlfilterctrl', 'cron', 'monthly');
 		}
+		
+		if ($filtersettings{'ENABLE_AUTOUPDATE'} eq 'off')
+		{
+			&General::system('/usr/local/bin/urlfilterctrl', 'cron', 'remove');
+		}
 	}
 }
 
diff --git a/src/misc-progs/urlfilterctrl.c b/src/misc-progs/urlfilterctrl.c
index 28dc03075..a11d6d041 100644
--- a/src/misc-progs/urlfilterctrl.c
+++ b/src/misc-progs/urlfilterctrl.c
@@ -24,6 +24,8 @@ int main(int argc, char *argv[]){
 			safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.weekly/urlfilter");
 		} else if (strcmp(argv[2], "monthly") == 0){
 			safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.monthly/urlfilter");
+		} else if (strcmp(argv[2], "remove") == 0){
+			// Don't add urlfilter into any fcron directory
 		}else{
 			printf("invalid parameter(s)\n");
 		return(1);


hooks/post-receive
--
IPFire 2.x development tree