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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2173 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  af578bab4599d5e9fe57aff7e6636e47ffcd2edd (commit)
       via  6c00bad302384208e825d0fd7c7ce332d6231219 (commit)
      from  e65fe151a5b7bf7df9525fcae1cb920667818c2a (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 af578bab4599d5e9fe57aff7e6636e47ffcd2edd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Aug 22 17:27:13 2013 +0200

    squid: Update rootfile.

commit 6c00bad302384208e825d0fd7c7ce332d6231219
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Aug 22 17:26:23 2013 +0200

    tor: Rootfile update.

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

Summary of changes:
 config/rootfiles/common/squid | 1 +
 config/rootfiles/packages/tor | 3 +++
 2 files changed, 4 insertions(+)

Difference in files:
diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 15c921f..9515dc3 100644
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -1824,6 +1824,7 @@ usr/lib/squid/errors/tr/ERR_AGENT_WPAD
 usr/lib/squid/errors/tr/ERR_CACHE_ACCESS_DENIED
 usr/lib/squid/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED
 usr/lib/squid/errors/tr/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/tr/ERR_CONFLICT_HOST
 usr/lib/squid/errors/tr/ERR_CONNECT_FAIL
 usr/lib/squid/errors/tr/ERR_DIR_LISTING
 usr/lib/squid/errors/tr/ERR_DNS_FAIL
diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor
index 8eb6dad..58de7da 100644
--- a/config/rootfiles/packages/tor
+++ b/config/rootfiles/packages/tor
@@ -1,6 +1,9 @@
 #etc/logrotate.d
 etc/logrotate.d/tor
 etc/rc.d/init.d/tor
+etc/rc.d/rc0.d/K40tor
+etc/rc.d/rc3.d/S60tor
+etc/rc.d/rc6.d/K40tor
 #etc/tor
 etc/tor/tor-tsocks.conf
 etc/tor/torrc


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