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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 4716 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  6de2306a6a7f8836c5d5ea7f1541a2cf68a09377 (commit)
       via  f204a2e64989f609629c014c0126171534989c85 (commit)
      from  d2a08170b9c36fbd4058d91178d8d873d6b722c1 (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 6de2306a6a7f8836c5d5ea7f1541a2cf68a09377
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Aug 21 10:47:11 2014 +0200

    Rootfile update

commit f204a2e64989f609629c014c0126171534989c85
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Aug 21 10:46:34 2014 +0200

    initscripts: Remove old firewall-reload symlink

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

Summary of changes:
 config/rootfiles/packages/owncloud         | 12 ++++++------
 config/rootfiles/packages/squid-accounting |  9 +++++----
 lfs/initscripts                            |  1 -
 3 files changed, 11 insertions(+), 11 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/owncloud b/config/rootfiles/packages/owncloud
index acfb40d..fed3b09 100644
--- a/config/rootfiles/packages/owncloud
+++ b/config/rootfiles/packages/owncloud
@@ -9944,14 +9944,14 @@ srv/web/owncloud
 #srv/web/owncloud/core/img/favicon.png
 #srv/web/owncloud/core/img/favicon.svg
 #srv/web/owncloud/core/img/filetypes
-#srv/web/owncloud/core/img/filetypes/application-epub#zip.png
-#srv/web/owncloud/core/img/filetypes/application-epub#zip.svg
+#srv/web/owncloud/core/img/filetypes/application-epub+zip.png
+#srv/web/owncloud/core/img/filetypes/application-epub+zip.svg
 #srv/web/owncloud/core/img/filetypes/application-javascript.png
 #srv/web/owncloud/core/img/filetypes/application-javascript.svg
 #srv/web/owncloud/core/img/filetypes/application-pdf.png
 #srv/web/owncloud/core/img/filetypes/application-pdf.svg
-#srv/web/owncloud/core/img/filetypes/application-rss#xml.png
-#srv/web/owncloud/core/img/filetypes/application-rss#xml.svg
+#srv/web/owncloud/core/img/filetypes/application-rss+xml.png
+#srv/web/owncloud/core/img/filetypes/application-rss+xml.svg
 #srv/web/owncloud/core/img/filetypes/application-x-cbr.png
 #srv/web/owncloud/core/img/filetypes/application-x-cbr.svg
 #srv/web/owncloud/core/img/filetypes/application-x-shockwave-flash.png
@@ -9976,8 +9976,8 @@ srv/web/owncloud
 #srv/web/owncloud/core/img/filetypes/folder.svg
 #srv/web/owncloud/core/img/filetypes/font.png
 #srv/web/owncloud/core/img/filetypes/font.svg
-#srv/web/owncloud/core/img/filetypes/image-svg#xml.png
-#srv/web/owncloud/core/img/filetypes/image-svg#xml.svg
+#srv/web/owncloud/core/img/filetypes/image-svg+xml.png
+#srv/web/owncloud/core/img/filetypes/image-svg+xml.svg
 #srv/web/owncloud/core/img/filetypes/image.png
 #srv/web/owncloud/core/img/filetypes/image.svg
 #srv/web/owncloud/core/img/filetypes/package-x-generic.png
diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfiles/packages/squid-accounting
index 73a75ef..29d09a1 100644
--- a/config/rootfiles/packages/squid-accounting
+++ b/config/rootfiles/packages/squid-accounting
@@ -1,13 +1,14 @@
 etc/fcron.hourly/squid-accounting
-var/log/accounting.log
 srv/web/ipfire/cgi-bin/accounting.cgi
+#srv/web/ipfire/html/accounting
 srv/web/ipfire/html/accounting/logo
 usr/local/bin/acct.pl
 var/ipfire/accounting
-var/ipfire/accounting/dbinstall.pl
-var/ipfire/accounting/bill
 var/ipfire/accounting/acct-lib.pl
+var/ipfire/accounting/bill
+var/ipfire/accounting/dbinstall.pl
 var/ipfire/addon-lang/acct.de.pl
 var/ipfire/addon-lang/acct.en.pl
-var/ipfire/menu.d/EX-squid-accounting.menu
 var/ipfire/backup/addons/includes/squid-accounting
+var/ipfire/menu.d/EX-squid-accounting.menu
+var/log/accounting.log
diff --git a/lfs/initscripts b/lfs/initscripts
index ab870dc..4acf65e 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -180,7 +180,6 @@ $(TARGET) :
 	ln -sf ../init.d/wlanclient  /etc/rc.d/rc6.d/K82wlanclient
 
 	ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
-	ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall
 	ln -sf ../../../../../usr/local/bin/snortctrl \
 		/etc/rc.d/init.d/networking/red.up/23-RS-snort
 	ln -sf ../../../../../usr/local/bin/qosctrl \


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