From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81b2c3f16507eb2321d34eda5829d1c97773c2e7
Date: Wed, 13 Jun 2012 15:43:44 +0200 [thread overview]
Message-ID: <20120613134345.8144A200B0@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2228 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 81b2c3f16507eb2321d34eda5829d1c97773c2e7 (commit)
from e516f073d61d528068aa138665ab5c7a03b11165 (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 81b2c3f16507eb2321d34eda5829d1c97773c2e7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 13 15:43:27 2012 +0200
squid: Enable ICAP client.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{52 => 61}/filelists/squid | 0
config/rootfiles/core/61/update.sh | 1 +
lfs/squid | 2 +-
3 files changed, 2 insertions(+), 1 deletions(-)
copy config/rootfiles/core/{52 => 61}/filelists/squid (100%)
Difference in files:
diff --git a/config/rootfiles/core/61/filelists/squid b/config/rootfiles/core/61/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/61/update.sh b/config/rootfiles/core/61/update.sh
index c6a8580..e203246 100644
--- a/config/rootfiles/core/61/update.sh
+++ b/config/rootfiles/core/61/update.sh
@@ -41,6 +41,7 @@ extract_files
#
#Start services
+/etc/init.d/squid restart &>/dev/null
#
#Update Language cache
diff --git a/lfs/squid b/lfs/squid
index 814985c..61f17df 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -105,7 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-ipf-transparent \
--enable-kill-parent-hack \
--disable-wccpv2 \
- --disable-icap-client \
+ --enable-icap-client \
--disable-esi
cd $(DIR_APP) && make $(MAKETUNING)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-06-13 13:43 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=20120613134345.8144A200B0@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