public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 34ebab463b96f2b1d7876d9bce1b1db4411f6399
Date: Sat, 20 Sep 2014 11:50:51 +0200	[thread overview]
Message-ID: <20140920095051.66C9021135@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1677 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  34ebab463b96f2b1d7876d9bce1b1db4411f6399 (commit)
      from  9cc46b56ad55f2091c022f44aa56ddddc87128db (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 34ebab463b96f2b1d7876d9bce1b1db4411f6399
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Sep 20 11:49:39 2014 +0200

    urlfilter.cgi: Fix path to squidGuard binary when converting custom blacklists.
    
    Fixes #10626.

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

Summary of changes:
 html/cgi-bin/urlfilter.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files:
diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 9f7e6ff..78f7b32 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -935,7 +935,7 @@ if (($besettings{'ACTION'} eq $Lang::tr{'urlfilter install blacklist'}) && ($bes
 		close FILE;
 
 		system("rm -f $dbdir/$besettings{'BE_NAME'}/*.db");
-		system("/usr/sbin/squidGuard -c $editdir/install.conf -C all");
+		system("/usr/bin/squidGuard -c $editdir/install.conf -C all");
 		system("chmod a+w $dbdir/$besettings{'BE_NAME'}/*.db");
 
 		&readblockcategories;


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

                 reply	other threads:[~2014-09-20  9:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140920095051.66C9021135@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox