]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: f3cbcfe)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 8 Feb 2019 08:59:31 +0000 (09:59 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 8 Feb 2019 08:59:31 +0000 (09:59 +0100)
39 files changed:
config/kernel/kernel.config.aarch64-ipfire patch | blob | blame | history
config/kernel/kernel.config.armv5tel-ipfire-kirkwood patch | blob | blame | history
config/kernel/kernel.config.armv5tel-ipfire-multi patch | blob | blame | history
config/kernel/kernel.config.i586-ipfire patch | blob | blame | history
config/kernel/kernel.config.i586-ipfire-pae patch | blob | blame | history
config/kernel/kernel.config.x86_64-ipfire patch | blob | blame | history
config/ovpn/openssl/ovpn.cnf patch | blob | blame | history
config/rootfiles/common/apache2 patch | blob | blame | history
config/rootfiles/common/apr patch | blob | blame | history
config/rootfiles/common/curl patch | blob | blame | history
config/rootfiles/common/python3-setuptools [new file with mode: 0644] patch | blob
config/rootfiles/common/python3-setuptools-scm [new file with mode: 0644] patch | blob
config/rootfiles/core/128/exclude patch | blob | blame | history
config/rootfiles/core/128/filelists/apr [new symlink] patch | blob
config/rootfiles/core/128/filelists/curl [new symlink] patch | blob
config/rootfiles/core/128/filelists/dhcpcd [new symlink] patch | blob
config/rootfiles/core/128/filelists/files patch | blob | blame | history
config/rootfiles/core/128/update.sh patch | blob | blame | history
config/rootfiles/packages/borgbackup [new file with mode: 0644] patch | blob
config/rootfiles/packages/i586/python3-msgpack [new file with mode: 0644] patch | blob
config/rootfiles/packages/python3-dateutil patch | blob | blame | history
config/rootfiles/packages/python3-llfuse [new file with mode: 0644] patch | blob
config/rootfiles/packages/python3-msgpack [new file with mode: 0644] patch | blob
config/rootfiles/packages/tor patch | blob | blame | history
config/ssl/openssl.cnf patch | blob | blame | history
lfs/apache2 patch | blob | blame | history
lfs/apr patch | blob | blame | history
lfs/borgbackup [new file with mode: 0644] patch | blob
lfs/curl patch | blob | blame | history
lfs/dhcpcd patch | blob | blame | history
lfs/haproxy patch | blob | blame | history
lfs/linux patch | blob | blame | history
lfs/python3-llfuse [new file with mode: 0644] patch | blob
lfs/python3-msgpack [new file with mode: 0644] patch | blob
lfs/python3-setuptools [new file with mode: 0644] patch | blob
lfs/python3-setuptools-scm [new file with mode: 0644] patch | blob
lfs/tor patch | blob | blame | history
make.sh patch | blob | blame | history
src/initscripts/system/firewall patch | blob | blame | history

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 53cb1f8b588450c43666b52584745b5a9fb71d8e..38c547c0b0549ec4d186a49a0a7c2f4f924a9770 100644 (file)
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.94-ipfire Kernel Configuration
+# Linux/arm64 4.14.97-ipfire Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -6292,7 +6292,7 @@ CONFIG_SUNRPC_DEBUG=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_ACL=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index e31a5d3fef9c4bd13b690ba9aae110f0cc85a83d..f596617db19379ed537c24137b24249664740e84 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.94-ipfire-kirkwood Kernel Configuration
+# Linux/arm 4.14.97-ipfire-kirkwood Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -5719,7 +5719,7 @@ CONFIG_SUNRPC_DEBUG=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_ACL=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 688479238d28cd03ff9c2d190a31a51d0a2f5eb0..3c3ee68d2a40bdf8d2099a1a00cca8b4d96db60c 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.94-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.97-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -6782,7 +6782,7 @@ CONFIG_SUNRPC_DEBUG=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_ACL=y
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index a2df2562810a3c87545d04bb4a0f30d922788ccd..aa7b0ed34d56af2f7f210be1055f9f7a5eef0d7a 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.94-ipfire-pae Kernel Configuration
+# Linux/x86 4.14.97-ipfire-pae Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -6411,7 +6411,7 @@ CONFIG_SUNRPC_DEBUG=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_ACL=y
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 459d3a25856a7177df4a9d698b68aad1b88edc87..781bb87e5e02164afd59cecec669a68bee4bcd8e 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.94-ipfire-pae Kernel Configuration
+# Linux/x86 4.14.97-ipfire-pae Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -6417,7 +6417,7 @@ CONFIG_SUNRPC_DEBUG=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_ACL=y
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 8875d70b1d70a83812ad8e0002059639a4636c0d..ed0f31c241d844ca41b880b6476dd2416ed2a6aa 100644 (file)
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.94-ipfire Kernel Configuration
+# Linux/x86 4.14.97-ipfire Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -6271,7 +6271,7 @@ CONFIG_SUNRPC_DEBUG=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_ACL=y
diff --git a/config/ovpn/openssl/ovpn.cnf b/config/ovpn/openssl/ovpn.cnf
index 40daf2a0a886dd4957df00c3303d3504f8cb0bc0..96c3dcb09dbbe99354ee24370c9844f4570bd72a 100644 (file)
--- a/config/ovpn/openssl/ovpn.cnf
+++ b/config/ovpn/openssl/ovpn.cnf
@@ -1,5 +1,4 @@
 HOME                           = .
-RANDFILE                       = /var/ipfire/ovpn/ca/.rnd
 oid_section                    = new_oids
 
 [ new_oids ]
@@ -17,7 +16,6 @@ certificate                   = $dir/ca/cacert.pem
 serial                         = $dir/certs/serial
 crl                            = $dir/crl.pem
 private_key                    = $dir/ca/cakey.pem
-RANDFILE                       = $dir/ca/.rand
 x509_extensions                        = usr_cert
 default_days                   = 999999
 default_crl_days               = 30
diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index e1b1ca8253ba9935503749f27feda69e6af19cc6..ee09c6cbe79711db6ce2df2e65846288009d6bd0 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -327,24 +327,24 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/bind.html
 #srv/web/ipfire/manual/bind.html.de
 #srv/web/ipfire/manual/bind.html.en
-#srv/web/ipfire/manual/bind.html.fr
+#srv/web/ipfire/manual/bind.html.fr.utf8
 #srv/web/ipfire/manual/bind.html.ja.utf8
 #srv/web/ipfire/manual/bind.html.ko.euc-kr
 #srv/web/ipfire/manual/bind.html.tr.utf8
 #srv/web/ipfire/manual/caching.html
 #srv/web/ipfire/manual/caching.html.en
-#srv/web/ipfire/manual/caching.html.fr
+#srv/web/ipfire/manual/caching.html.fr.utf8
 #srv/web/ipfire/manual/caching.html.tr.utf8
 #srv/web/ipfire/manual/configuring.html
 #srv/web/ipfire/manual/configuring.html.de
 #srv/web/ipfire/manual/configuring.html.en
-#srv/web/ipfire/manual/configuring.html.fr
+#srv/web/ipfire/manual/configuring.html.fr.utf8
 #srv/web/ipfire/manual/configuring.html.ja.utf8
 #srv/web/ipfire/manual/configuring.html.ko.euc-kr
 #srv/web/ipfire/manual/configuring.html.tr.utf8
 #srv/web/ipfire/manual/content-negotiation.html
 #srv/web/ipfire/manual/content-negotiation.html.en
-#srv/web/ipfire/manual/content-negotiation.html.fr
+#srv/web/ipfire/manual/content-negotiation.html.fr.utf8
 #srv/web/ipfire/manual/content-negotiation.html.ja.utf8
 #srv/web/ipfire/manual/content-negotiation.html.ko.euc-kr
 #srv/web/ipfire/manual/content-negotiation.html.tr.utf8
@@ -352,7 +352,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/custom-error.html
 #srv/web/ipfire/manual/custom-error.html.en
 #srv/web/ipfire/manual/custom-error.html.es
-#srv/web/ipfire/manual/custom-error.html.fr
+#srv/web/ipfire/manual/custom-error.html.fr.utf8
 #srv/web/ipfire/manual/custom-error.html.ja.utf8
 #srv/web/ipfire/manual/custom-error.html.ko.euc-kr
 #srv/web/ipfire/manual/custom-error.html.tr.utf8
@@ -386,54 +386,54 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/developer/thread_safety.html.en
 #srv/web/ipfire/manual/dns-caveats.html
 #srv/web/ipfire/manual/dns-caveats.html.en
-#srv/web/ipfire/manual/dns-caveats.html.fr
+#srv/web/ipfire/manual/dns-caveats.html.fr.utf8
 #srv/web/ipfire/manual/dns-caveats.html.ja.utf8
 #srv/web/ipfire/manual/dns-caveats.html.ko.euc-kr
 #srv/web/ipfire/manual/dns-caveats.html.tr.utf8
 #srv/web/ipfire/manual/dso.html
 #srv/web/ipfire/manual/dso.html.en
-#srv/web/ipfire/manual/dso.html.fr
+#srv/web/ipfire/manual/dso.html.fr.utf8
 #srv/web/ipfire/manual/dso.html.ja.utf8
 #srv/web/ipfire/manual/dso.html.ko.euc-kr
 #srv/web/ipfire/manual/dso.html.tr.utf8
 #srv/web/ipfire/manual/env.html
 #srv/web/ipfire/manual/env.html.en
-#srv/web/ipfire/manual/env.html.fr
+#srv/web/ipfire/manual/env.html.fr.utf8
 #srv/web/ipfire/manual/env.html.ja.utf8
 #srv/web/ipfire/manual/env.html.ko.euc-kr
 #srv/web/ipfire/manual/env.html.tr.utf8
 #srv/web/ipfire/manual/expr.html
 #srv/web/ipfire/manual/expr.html.en
-#srv/web/ipfire/manual/expr.html.fr
+#srv/web/ipfire/manual/expr.html.fr.utf8
 #srv/web/ipfire/manual/faq
 #srv/web/ipfire/manual/faq/index.html
 #srv/web/ipfire/manual/faq/index.html.en
 #srv/web/ipfire/manual/faq/index.html.es
-#srv/web/ipfire/manual/faq/index.html.fr
+#srv/web/ipfire/manual/faq/index.html.fr.utf8
 #srv/web/ipfire/manual/faq/index.html.tr.utf8
 #srv/web/ipfire/manual/faq/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/filter.html
 #srv/web/ipfire/manual/filter.html.en
 #srv/web/ipfire/manual/filter.html.es
-#srv/web/ipfire/manual/filter.html.fr
+#srv/web/ipfire/manual/filter.html.fr.utf8
 #srv/web/ipfire/manual/filter.html.ja.utf8
 #srv/web/ipfire/manual/filter.html.ko.euc-kr
 #srv/web/ipfire/manual/filter.html.tr.utf8
 #srv/web/ipfire/manual/getting-started.html
 #srv/web/ipfire/manual/getting-started.html.en
-#srv/web/ipfire/manual/getting-started.html.fr
+#srv/web/ipfire/manual/getting-started.html.fr.utf8
 #srv/web/ipfire/manual/glossary.html
 #srv/web/ipfire/manual/glossary.html.de
 #srv/web/ipfire/manual/glossary.html.en
 #srv/web/ipfire/manual/glossary.html.es
-#srv/web/ipfire/manual/glossary.html.fr
+#srv/web/ipfire/manual/glossary.html.fr.utf8
 #srv/web/ipfire/manual/glossary.html.ja.utf8
 #srv/web/ipfire/manual/glossary.html.ko.euc-kr
 #srv/web/ipfire/manual/glossary.html.tr.utf8
 #srv/web/ipfire/manual/handler.html
 #srv/web/ipfire/manual/handler.html.en
 #srv/web/ipfire/manual/handler.html.es
-#srv/web/ipfire/manual/handler.html.fr
+#srv/web/ipfire/manual/handler.html.fr.utf8
 #srv/web/ipfire/manual/handler.html.ja.utf8
 #srv/web/ipfire/manual/handler.html.ko.euc-kr
 #srv/web/ipfire/manual/handler.html.tr.utf8
@@ -442,52 +442,52 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/howto/access.html
 #srv/web/ipfire/manual/howto/access.html.en
 #srv/web/ipfire/manual/howto/access.html.es
-#srv/web/ipfire/manual/howto/access.html.fr
+#srv/web/ipfire/manual/howto/access.html.fr.utf8
 #srv/web/ipfire/manual/howto/auth.html
 #srv/web/ipfire/manual/howto/auth.html.en
 #srv/web/ipfire/manual/howto/auth.html.es
-#srv/web/ipfire/manual/howto/auth.html.fr
+#srv/web/ipfire/manual/howto/auth.html.fr.utf8
 #srv/web/ipfire/manual/howto/auth.html.ja.utf8
 #srv/web/ipfire/manual/howto/auth.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/auth.html.tr.utf8
 #srv/web/ipfire/manual/howto/cgi.html
 #srv/web/ipfire/manual/howto/cgi.html.en
 #srv/web/ipfire/manual/howto/cgi.html.es
-#srv/web/ipfire/manual/howto/cgi.html.fr
+#srv/web/ipfire/manual/howto/cgi.html.fr.utf8
 #srv/web/ipfire/manual/howto/cgi.html.ja.utf8
 #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/htaccess.html
 #srv/web/ipfire/manual/howto/htaccess.html.en
 #srv/web/ipfire/manual/howto/htaccess.html.es
-#srv/web/ipfire/manual/howto/htaccess.html.fr
+#srv/web/ipfire/manual/howto/htaccess.html.fr.utf8
 #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8
 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/htaccess.html.pt-br
 #srv/web/ipfire/manual/howto/http2.html
 #srv/web/ipfire/manual/howto/http2.html.en
 #srv/web/ipfire/manual/howto/http2.html.es
-#srv/web/ipfire/manual/howto/http2.html.fr
+#srv/web/ipfire/manual/howto/http2.html.fr.utf8
 #srv/web/ipfire/manual/howto/index.html
 #srv/web/ipfire/manual/howto/index.html.en
 #srv/web/ipfire/manual/howto/index.html.es
-#srv/web/ipfire/manual/howto/index.html.fr
+#srv/web/ipfire/manual/howto/index.html.fr.utf8
 #srv/web/ipfire/manual/howto/index.html.ja.utf8
 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/howto/public_html.html
 #srv/web/ipfire/manual/howto/public_html.html.en
 #srv/web/ipfire/manual/howto/public_html.html.es
-#srv/web/ipfire/manual/howto/public_html.html.fr
+#srv/web/ipfire/manual/howto/public_html.html.fr.utf8
 #srv/web/ipfire/manual/howto/public_html.html.ja.utf8
 #srv/web/ipfire/manual/howto/public_html.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/public_html.html.tr.utf8
 #srv/web/ipfire/manual/howto/reverse_proxy.html
 #srv/web/ipfire/manual/howto/reverse_proxy.html.en
-#srv/web/ipfire/manual/howto/reverse_proxy.html.fr
+#srv/web/ipfire/manual/howto/reverse_proxy.html.fr.utf8
 #srv/web/ipfire/manual/howto/ssi.html
 #srv/web/ipfire/manual/howto/ssi.html.en
 #srv/web/ipfire/manual/howto/ssi.html.es
-#srv/web/ipfire/manual/howto/ssi.html.fr
+#srv/web/ipfire/manual/howto/ssi.html.fr.utf8
 #srv/web/ipfire/manual/howto/ssi.html.ja.utf8
 #srv/web/ipfire/manual/howto/ssi.html.ko.euc-kr
 #srv/web/ipfire/manual/images
@@ -541,7 +541,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/index.html.de
 #srv/web/ipfire/manual/index.html.en
 #srv/web/ipfire/manual/index.html.es
-#srv/web/ipfire/manual/index.html.fr
+#srv/web/ipfire/manual/index.html.fr.utf8
 #srv/web/ipfire/manual/index.html.ja.utf8
 #srv/web/ipfire/manual/index.html.ko.euc-kr
 #srv/web/ipfire/manual/index.html.pt-br
@@ -551,7 +551,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/install.html.de
 #srv/web/ipfire/manual/install.html.en
 #srv/web/ipfire/manual/install.html.es
-#srv/web/ipfire/manual/install.html.fr
+#srv/web/ipfire/manual/install.html.fr.utf8
 #srv/web/ipfire/manual/install.html.ja.utf8
 #srv/web/ipfire/manual/install.html.ko.euc-kr
 #srv/web/ipfire/manual/install.html.tr.utf8
@@ -559,7 +559,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/invoking.html.de
 #srv/web/ipfire/manual/invoking.html.en
 #srv/web/ipfire/manual/invoking.html.es
-#srv/web/ipfire/manual/invoking.html.fr
+#srv/web/ipfire/manual/invoking.html.fr.utf8
 #srv/web/ipfire/manual/invoking.html.ja.utf8
 #srv/web/ipfire/manual/invoking.html.ko.euc-kr
 #srv/web/ipfire/manual/invoking.html.tr.utf8
@@ -567,7 +567,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/license.html.en
 #srv/web/ipfire/manual/logs.html
 #srv/web/ipfire/manual/logs.html.en
-#srv/web/ipfire/manual/logs.html.fr
+#srv/web/ipfire/manual/logs.html.fr.utf8
 #srv/web/ipfire/manual/logs.html.ja.utf8
 #srv/web/ipfire/manual/logs.html.ko.euc-kr
 #srv/web/ipfire/manual/logs.html.tr.utf8
@@ -575,25 +575,25 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/misc/index.html
 #srv/web/ipfire/manual/misc/index.html.en
 #srv/web/ipfire/manual/misc/index.html.es
-#srv/web/ipfire/manual/misc/index.html.fr
+#srv/web/ipfire/manual/misc/index.html.fr.utf8
 #srv/web/ipfire/manual/misc/index.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/index.html.tr.utf8
 #srv/web/ipfire/manual/misc/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/misc/password_encryptions.html
 #srv/web/ipfire/manual/misc/password_encryptions.html.en
-#srv/web/ipfire/manual/misc/password_encryptions.html.fr
+#srv/web/ipfire/manual/misc/password_encryptions.html.fr.utf8
 #srv/web/ipfire/manual/misc/perf-tuning.html
 #srv/web/ipfire/manual/misc/perf-tuning.html.en
-#srv/web/ipfire/manual/misc/perf-tuning.html.fr
+#srv/web/ipfire/manual/misc/perf-tuning.html.fr.utf8
 #srv/web/ipfire/manual/misc/perf-tuning.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/perf-tuning.html.tr.utf8
 #srv/web/ipfire/manual/misc/relevant_standards.html
 #srv/web/ipfire/manual/misc/relevant_standards.html.en
-#srv/web/ipfire/manual/misc/relevant_standards.html.fr
+#srv/web/ipfire/manual/misc/relevant_standards.html.fr.utf8
 #srv/web/ipfire/manual/misc/relevant_standards.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/security_tips.html
 #srv/web/ipfire/manual/misc/security_tips.html.en
-#srv/web/ipfire/manual/misc/security_tips.html.fr
+#srv/web/ipfire/manual/misc/security_tips.html.fr.utf8
 #srv/web/ipfire/manual/misc/security_tips.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/security_tips.html.tr.utf8
 #srv/web/ipfire/manual/mod
@@ -601,13 +601,13 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/core.html.de
 #srv/web/ipfire/manual/mod/core.html.en
 #srv/web/ipfire/manual/mod/core.html.es
-#srv/web/ipfire/manual/mod/core.html.fr
+#srv/web/ipfire/manual/mod/core.html.fr.utf8
 #srv/web/ipfire/manual/mod/core.html.ja.utf8
 #srv/web/ipfire/manual/mod/core.html.tr.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html
 #srv/web/ipfire/manual/mod/directive-dict.html.en
 #srv/web/ipfire/manual/mod/directive-dict.html.es
-#srv/web/ipfire/manual/mod/directive-dict.html.fr
+#srv/web/ipfire/manual/mod/directive-dict.html.fr.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html.ja.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/directive-dict.html.tr.utf8
@@ -615,530 +615,530 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/directives.html.de
 #srv/web/ipfire/manual/mod/directives.html.en
 #srv/web/ipfire/manual/mod/directives.html.es
-#srv/web/ipfire/manual/mod/directives.html.fr
+#srv/web/ipfire/manual/mod/directives.html.fr.utf8
 #srv/web/ipfire/manual/mod/directives.html.ja.utf8
 #srv/web/ipfire/manual/mod/directives.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/directives.html.tr.utf8
 #srv/web/ipfire/manual/mod/directives.html.zh-cn.utf8
 #srv/web/ipfire/manual/mod/event.html
 #srv/web/ipfire/manual/mod/event.html.en
-#srv/web/ipfire/manual/mod/event.html.fr
+#srv/web/ipfire/manual/mod/event.html.fr.utf8
 #srv/web/ipfire/manual/mod/index.html
 #srv/web/ipfire/manual/mod/index.html.de
 #srv/web/ipfire/manual/mod/index.html.en
 #srv/web/ipfire/manual/mod/index.html.es
-#srv/web/ipfire/manual/mod/index.html.fr
+#srv/web/ipfire/manual/mod/index.html.fr.utf8
 #srv/web/ipfire/manual/mod/index.html.ja.utf8
 #srv/web/ipfire/manual/mod/index.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/index.html.tr.utf8
 #srv/web/ipfire/manual/mod/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/mod/mod_access_compat.html
 #srv/web/ipfire/manual/mod/mod_access_compat.html.en
-#srv/web/ipfire/manual/mod/mod_access_compat.html.fr
+#srv/web/ipfire/manual/mod/mod_access_compat.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_access_compat.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_actions.html
 #srv/web/ipfire/manual/mod/mod_actions.html.de
 #srv/web/ipfire/manual/mod/mod_actions.html.en
-#srv/web/ipfire/manual/mod/mod_actions.html.fr
+#srv/web/ipfire/manual/mod/mod_actions.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_actions.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_actions.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_alias.html
 #srv/web/ipfire/manual/mod/mod_alias.html.en
-#srv/web/ipfire/manual/mod/mod_alias.html.fr
+#srv/web/ipfire/manual/mod/mod_alias.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_alias.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_alias.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_alias.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_allowmethods.html
 #srv/web/ipfire/manual/mod/mod_allowmethods.html.en
-#srv/web/ipfire/manual/mod/mod_allowmethods.html.fr
+#srv/web/ipfire/manual/mod/mod_allowmethods.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_asis.html
 #srv/web/ipfire/manual/mod/mod_asis.html.en
-#srv/web/ipfire/manual/mod/mod_asis.html.fr
+#srv/web/ipfire/manual/mod/mod_asis.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_asis.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_asis.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_auth_basic.html
 #srv/web/ipfire/manual/mod/mod_auth_basic.html.en
-#srv/web/ipfire/manual/mod/mod_auth_basic.html.fr
+#srv/web/ipfire/manual/mod/mod_auth_basic.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_auth_basic.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_auth_basic.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_auth_digest.html
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.en
-#srv/web/ipfire/manual/mod/mod_auth_digest.html.fr
+#srv/web/ipfire/manual/mod/mod_auth_digest.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_auth_form.html
 #srv/web/ipfire/manual/mod/mod_auth_form.html.en
-#srv/web/ipfire/manual/mod/mod_auth_form.html.fr
+#srv/web/ipfire/manual/mod/mod_auth_form.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authn_anon.html
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.en
-#srv/web/ipfire/manual/mod/mod_authn_anon.html.fr
+#srv/web/ipfire/manual/mod/mod_authn_anon.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authn_core.html
 #srv/web/ipfire/manual/mod/mod_authn_core.html.en
-#srv/web/ipfire/manual/mod/mod_authn_core.html.fr
+#srv/web/ipfire/manual/mod/mod_authn_core.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authn_dbd.html
 #srv/web/ipfire/manual/mod/mod_authn_dbd.html.en
-#srv/web/ipfire/manual/mod/mod_authn_dbd.html.fr
+#srv/web/ipfire/manual/mod/mod_authn_dbd.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.en
-#srv/web/ipfire/manual/mod/mod_authn_dbm.html.fr
+#srv/web/ipfire/manual/mod/mod_authn_dbm.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authn_file.html
 #srv/web/ipfire/manual/mod/mod_authn_file.html.en
-#srv/web/ipfire/manual/mod/mod_authn_file.html.fr
+#srv/web/ipfire/manual/mod/mod_authn_file.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authn_file.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_file.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authn_socache.html
 #srv/web/ipfire/manual/mod/mod_authn_socache.html.en
-#srv/web/ipfire/manual/mod/mod_authn_socache.html.fr
+#srv/web/ipfire/manual/mod/mod_authn_socache.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html
 #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.en
-#srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.fr
+#srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en
-#srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr
+#srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authz_core.html
 #srv/web/ipfire/manual/mod/mod_authz_core.html.en
-#srv/web/ipfire/manual/mod/mod_authz_core.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_core.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authz_dbd.html
 #srv/web/ipfire/manual/mod/mod_authz_dbd.html.en
-#srv/web/ipfire/manual/mod/mod_authz_dbd.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_dbd.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html.en
-#srv/web/ipfire/manual/mod/mod_authz_dbm.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_dbm.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.en
-#srv/web/ipfire/manual/mod/mod_authz_groupfile.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_groupfile.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_host.html
 #srv/web/ipfire/manual/mod/mod_authz_host.html.en
-#srv/web/ipfire/manual/mod/mod_authz_host.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_host.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authz_owner.html
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.en
-#srv/web/ipfire/manual/mod/mod_authz_owner.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_owner.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_user.html
 #srv/web/ipfire/manual/mod/mod_authz_user.html.en
-#srv/web/ipfire/manual/mod/mod_authz_user.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_user.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_authz_user.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_user.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_autoindex.html
 #srv/web/ipfire/manual/mod/mod_autoindex.html.en
-#srv/web/ipfire/manual/mod/mod_autoindex.html.fr
+#srv/web/ipfire/manual/mod/mod_autoindex.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_brotli.html
 #srv/web/ipfire/manual/mod/mod_brotli.html.en
-#srv/web/ipfire/manual/mod/mod_brotli.html.fr
+#srv/web/ipfire/manual/mod/mod_brotli.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_buffer.html
 #srv/web/ipfire/manual/mod/mod_buffer.html.en
-#srv/web/ipfire/manual/mod/mod_buffer.html.fr
+#srv/web/ipfire/manual/mod/mod_buffer.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_cache.html
 #srv/web/ipfire/manual/mod/mod_cache.html.en
-#srv/web/ipfire/manual/mod/mod_cache.html.fr
+#srv/web/ipfire/manual/mod/mod_cache.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_cache.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cache.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_cache_disk.html
 #srv/web/ipfire/manual/mod/mod_cache_disk.html.en
-#srv/web/ipfire/manual/mod/mod_cache_disk.html.fr
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_cache_disk.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cache_disk.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_cache_socache.html
 #srv/web/ipfire/manual/mod/mod_cache_socache.html.en
-#srv/web/ipfire/manual/mod/mod_cache_socache.html.fr
+#srv/web/ipfire/manual/mod/mod_cache_socache.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_cern_meta.html
 #srv/web/ipfire/manual/mod/mod_cern_meta.html.en
-#srv/web/ipfire/manual/mod/mod_cern_meta.html.fr
+#srv/web/ipfire/manual/mod/mod_cern_meta.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_cern_meta.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_cgi.html
 #srv/web/ipfire/manual/mod/mod_cgi.html.en
-#srv/web/ipfire/manual/mod/mod_cgi.html.fr
+#srv/web/ipfire/manual/mod/mod_cgi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_cgi.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cgi.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_cgid.html
 #srv/web/ipfire/manual/mod/mod_cgid.html.en
-#srv/web/ipfire/manual/mod/mod_cgid.html.fr
+#srv/web/ipfire/manual/mod/mod_cgid.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_cgid.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cgid.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_charset_lite.html
 #srv/web/ipfire/manual/mod/mod_charset_lite.html.en
-#srv/web/ipfire/manual/mod/mod_charset_lite.html.fr
+#srv/web/ipfire/manual/mod/mod_charset_lite.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_charset_lite.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_data.html
 #srv/web/ipfire/manual/mod/mod_data.html.en
-#srv/web/ipfire/manual/mod/mod_data.html.fr
+#srv/web/ipfire/manual/mod/mod_data.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_dav.html
 #srv/web/ipfire/manual/mod/mod_dav.html.en
-#srv/web/ipfire/manual/mod/mod_dav.html.fr
+#srv/web/ipfire/manual/mod/mod_dav.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_dav.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dav.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dav_fs.html
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.en
-#srv/web/ipfire/manual/mod/mod_dav_fs.html.fr
+#srv/web/ipfire/manual/mod/mod_dav_fs.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dav_lock.html
 #srv/web/ipfire/manual/mod/mod_dav_lock.html.en
-#srv/web/ipfire/manual/mod/mod_dav_lock.html.fr
+#srv/web/ipfire/manual/mod/mod_dav_lock.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_dav_lock.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dbd.html
 #srv/web/ipfire/manual/mod/mod_dbd.html.en
-#srv/web/ipfire/manual/mod/mod_dbd.html.fr
+#srv/web/ipfire/manual/mod/mod_dbd.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_deflate.html
 #srv/web/ipfire/manual/mod/mod_deflate.html.en
-#srv/web/ipfire/manual/mod/mod_deflate.html.fr
+#srv/web/ipfire/manual/mod/mod_deflate.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_deflate.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_deflate.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dialup.html
 #srv/web/ipfire/manual/mod/mod_dialup.html.en
-#srv/web/ipfire/manual/mod/mod_dialup.html.fr
+#srv/web/ipfire/manual/mod/mod_dialup.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_dir.html
 #srv/web/ipfire/manual/mod/mod_dir.html.en
-#srv/web/ipfire/manual/mod/mod_dir.html.fr
+#srv/web/ipfire/manual/mod/mod_dir.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_dir.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dir.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dir.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_dumpio.html
 #srv/web/ipfire/manual/mod/mod_dumpio.html.en
-#srv/web/ipfire/manual/mod/mod_dumpio.html.fr
+#srv/web/ipfire/manual/mod/mod_dumpio.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_dumpio.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_echo.html
 #srv/web/ipfire/manual/mod/mod_echo.html.en
-#srv/web/ipfire/manual/mod/mod_echo.html.fr
+#srv/web/ipfire/manual/mod/mod_echo.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_echo.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_echo.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_env.html
 #srv/web/ipfire/manual/mod/mod_env.html.en
-#srv/web/ipfire/manual/mod/mod_env.html.fr
+#srv/web/ipfire/manual/mod/mod_env.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_env.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_env.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_env.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_example_hooks.html
 #srv/web/ipfire/manual/mod/mod_example_hooks.html.en
-#srv/web/ipfire/manual/mod/mod_example_hooks.html.fr
+#srv/web/ipfire/manual/mod/mod_example_hooks.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_example_hooks.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_expires.html
 #srv/web/ipfire/manual/mod/mod_expires.html.en
-#srv/web/ipfire/manual/mod/mod_expires.html.fr
+#srv/web/ipfire/manual/mod/mod_expires.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_expires.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_expires.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_ext_filter.html
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.en
-#srv/web/ipfire/manual/mod/mod_ext_filter.html.fr
+#srv/web/ipfire/manual/mod/mod_ext_filter.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_file_cache.html
 #srv/web/ipfire/manual/mod/mod_file_cache.html.en
-#srv/web/ipfire/manual/mod/mod_file_cache.html.fr
+#srv/web/ipfire/manual/mod/mod_file_cache.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_file_cache.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_filter.html
 #srv/web/ipfire/manual/mod/mod_filter.html.en
-#srv/web/ipfire/manual/mod/mod_filter.html.fr
+#srv/web/ipfire/manual/mod/mod_filter.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_headers.html
 #srv/web/ipfire/manual/mod/mod_headers.html.en
-#srv/web/ipfire/manual/mod/mod_headers.html.fr
+#srv/web/ipfire/manual/mod/mod_headers.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_headers.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_headers.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_heartbeat.html
 #srv/web/ipfire/manual/mod/mod_heartbeat.html.en
-#srv/web/ipfire/manual/mod/mod_heartbeat.html.fr
+#srv/web/ipfire/manual/mod/mod_heartbeat.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_heartmonitor.html
 #srv/web/ipfire/manual/mod/mod_heartmonitor.html.en
-#srv/web/ipfire/manual/mod/mod_heartmonitor.html.fr
+#srv/web/ipfire/manual/mod/mod_heartmonitor.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_http2.html
 #srv/web/ipfire/manual/mod/mod_http2.html.en
-#srv/web/ipfire/manual/mod/mod_http2.html.fr
+#srv/web/ipfire/manual/mod/mod_http2.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_ident.html
 #srv/web/ipfire/manual/mod/mod_ident.html.en
-#srv/web/ipfire/manual/mod/mod_ident.html.fr
+#srv/web/ipfire/manual/mod/mod_ident.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_ident.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_ident.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_imagemap.html
 #srv/web/ipfire/manual/mod/mod_imagemap.html.en
-#srv/web/ipfire/manual/mod/mod_imagemap.html.fr
+#srv/web/ipfire/manual/mod/mod_imagemap.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_imagemap.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_include.html
 #srv/web/ipfire/manual/mod/mod_include.html.en
-#srv/web/ipfire/manual/mod/mod_include.html.fr
+#srv/web/ipfire/manual/mod/mod_include.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_include.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_info.html
 #srv/web/ipfire/manual/mod/mod_info.html.en
-#srv/web/ipfire/manual/mod/mod_info.html.fr
+#srv/web/ipfire/manual/mod/mod_info.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_info.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_info.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_isapi.html
 #srv/web/ipfire/manual/mod/mod_isapi.html.en
-#srv/web/ipfire/manual/mod/mod_isapi.html.fr
+#srv/web/ipfire/manual/mod/mod_isapi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_isapi.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html
 #srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html.en
-#srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html
 #srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html.en
-#srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html
 #srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html.en
-#srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html
 #srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html.en
-#srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_ldap.html
 #srv/web/ipfire/manual/mod/mod_ldap.html.en
-#srv/web/ipfire/manual/mod/mod_ldap.html.fr
+#srv/web/ipfire/manual/mod/mod_ldap.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_log_config.html
 #srv/web/ipfire/manual/mod/mod_log_config.html.en
-#srv/web/ipfire/manual/mod/mod_log_config.html.fr
+#srv/web/ipfire/manual/mod/mod_log_config.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_log_config.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_log_config.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_log_config.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_log_debug.html
 #srv/web/ipfire/manual/mod/mod_log_debug.html.en
-#srv/web/ipfire/manual/mod/mod_log_debug.html.fr
+#srv/web/ipfire/manual/mod/mod_log_debug.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_log_forensic.html
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.en
-#srv/web/ipfire/manual/mod/mod_log_forensic.html.fr
+#srv/web/ipfire/manual/mod/mod_log_forensic.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_logio.html
 #srv/web/ipfire/manual/mod/mod_logio.html.en
-#srv/web/ipfire/manual/mod/mod_logio.html.fr
+#srv/web/ipfire/manual/mod/mod_logio.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_logio.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_logio.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_logio.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_lua.html
 #srv/web/ipfire/manual/mod/mod_lua.html.en
-#srv/web/ipfire/manual/mod/mod_lua.html.fr
+#srv/web/ipfire/manual/mod/mod_lua.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_macro.html
 #srv/web/ipfire/manual/mod/mod_macro.html.en
-#srv/web/ipfire/manual/mod/mod_macro.html.fr
+#srv/web/ipfire/manual/mod/mod_macro.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_md.html
 #srv/web/ipfire/manual/mod/mod_md.html.en
 #srv/web/ipfire/manual/mod/mod_mime.html
 #srv/web/ipfire/manual/mod/mod_mime.html.en
-#srv/web/ipfire/manual/mod/mod_mime.html.fr
+#srv/web/ipfire/manual/mod/mod_mime.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_mime.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_mime_magic.html
 #srv/web/ipfire/manual/mod/mod_mime_magic.html.en
-#srv/web/ipfire/manual/mod/mod_mime_magic.html.fr
+#srv/web/ipfire/manual/mod/mod_mime_magic.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_negotiation.html
 #srv/web/ipfire/manual/mod/mod_negotiation.html.en
-#srv/web/ipfire/manual/mod/mod_negotiation.html.fr
+#srv/web/ipfire/manual/mod/mod_negotiation.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_negotiation.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_nw_ssl.html
 #srv/web/ipfire/manual/mod/mod_nw_ssl.html.en
-#srv/web/ipfire/manual/mod/mod_nw_ssl.html.fr
+#srv/web/ipfire/manual/mod/mod_nw_ssl.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_privileges.html
 #srv/web/ipfire/manual/mod/mod_privileges.html.en
-#srv/web/ipfire/manual/mod/mod_privileges.html.fr
+#srv/web/ipfire/manual/mod/mod_privileges.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy.html
 #srv/web/ipfire/manual/mod/mod_proxy.html.en
-#srv/web/ipfire/manual/mod/mod_proxy.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_ajp.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_ajp.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_balancer.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_balancer.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_connect.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_connect.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_express.html
 #srv/web/ipfire/manual/mod/mod_proxy_express.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_express.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_express.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_fcgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_fcgi.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_fcgi.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_fcgi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_fdpass.html
 #srv/web/ipfire/manual/mod/mod_proxy_fdpass.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_fdpass.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_fdpass.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_ftp.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_ftp.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html
 #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_html.html
 #srv/web/ipfire/manual/mod/mod_proxy_html.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_html.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_html.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_http.html
 #srv/web/ipfire/manual/mod/mod_proxy_http.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_http.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_http.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_http2.html
 #srv/web/ipfire/manual/mod/mod_proxy_http2.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_http2.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_http2.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_ratelimit.html
 #srv/web/ipfire/manual/mod/mod_ratelimit.html.en
-#srv/web/ipfire/manual/mod/mod_ratelimit.html.fr
+#srv/web/ipfire/manual/mod/mod_ratelimit.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_reflector.html
 #srv/web/ipfire/manual/mod/mod_reflector.html.en
-#srv/web/ipfire/manual/mod/mod_reflector.html.fr
+#srv/web/ipfire/manual/mod/mod_reflector.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_remoteip.html
 #srv/web/ipfire/manual/mod/mod_remoteip.html.en
-#srv/web/ipfire/manual/mod/mod_remoteip.html.fr
+#srv/web/ipfire/manual/mod/mod_remoteip.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_reqtimeout.html
 #srv/web/ipfire/manual/mod/mod_reqtimeout.html.en
-#srv/web/ipfire/manual/mod/mod_reqtimeout.html.fr
+#srv/web/ipfire/manual/mod/mod_reqtimeout.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_request.html
 #srv/web/ipfire/manual/mod/mod_request.html.en
-#srv/web/ipfire/manual/mod/mod_request.html.fr
+#srv/web/ipfire/manual/mod/mod_request.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_request.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_rewrite.html
 #srv/web/ipfire/manual/mod/mod_rewrite.html.en
-#srv/web/ipfire/manual/mod/mod_rewrite.html.fr
+#srv/web/ipfire/manual/mod/mod_rewrite.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_sed.html
 #srv/web/ipfire/manual/mod/mod_sed.html.en
-#srv/web/ipfire/manual/mod/mod_sed.html.fr
+#srv/web/ipfire/manual/mod/mod_sed.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_session.html
 #srv/web/ipfire/manual/mod/mod_session.html.en
-#srv/web/ipfire/manual/mod/mod_session.html.fr
+#srv/web/ipfire/manual/mod/mod_session.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_session_cookie.html
 #srv/web/ipfire/manual/mod/mod_session_cookie.html.en
-#srv/web/ipfire/manual/mod/mod_session_cookie.html.fr
+#srv/web/ipfire/manual/mod/mod_session_cookie.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_session_crypto.html
 #srv/web/ipfire/manual/mod/mod_session_crypto.html.en
-#srv/web/ipfire/manual/mod/mod_session_crypto.html.fr
+#srv/web/ipfire/manual/mod/mod_session_crypto.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_session_dbd.html
 #srv/web/ipfire/manual/mod/mod_session_dbd.html.en
-#srv/web/ipfire/manual/mod/mod_session_dbd.html.fr
+#srv/web/ipfire/manual/mod/mod_session_dbd.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_setenvif.html
 #srv/web/ipfire/manual/mod/mod_setenvif.html.en
-#srv/web/ipfire/manual/mod/mod_setenvif.html.fr
+#srv/web/ipfire/manual/mod/mod_setenvif.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_setenvif.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_setenvif.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_setenvif.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_slotmem_plain.html
 #srv/web/ipfire/manual/mod/mod_slotmem_plain.html.en
-#srv/web/ipfire/manual/mod/mod_slotmem_plain.html.fr
+#srv/web/ipfire/manual/mod/mod_slotmem_plain.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_slotmem_shm.html
 #srv/web/ipfire/manual/mod/mod_slotmem_shm.html.en
-#srv/web/ipfire/manual/mod/mod_slotmem_shm.html.fr
+#srv/web/ipfire/manual/mod/mod_slotmem_shm.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_so.html
 #srv/web/ipfire/manual/mod/mod_so.html.en
-#srv/web/ipfire/manual/mod/mod_so.html.fr
+#srv/web/ipfire/manual/mod/mod_so.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_so.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_so.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_so.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_socache_dbm.html
 #srv/web/ipfire/manual/mod/mod_socache_dbm.html.en
-#srv/web/ipfire/manual/mod/mod_socache_dbm.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_dbm.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_socache_dc.html
 #srv/web/ipfire/manual/mod/mod_socache_dc.html.en
-#srv/web/ipfire/manual/mod/mod_socache_dc.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_dc.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_socache_memcache.html
 #srv/web/ipfire/manual/mod/mod_socache_memcache.html.en
-#srv/web/ipfire/manual/mod/mod_socache_memcache.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_memcache.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_socache_shmcb.html
 #srv/web/ipfire/manual/mod/mod_socache_shmcb.html.en
-#srv/web/ipfire/manual/mod/mod_socache_shmcb.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_shmcb.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_speling.html
 #srv/web/ipfire/manual/mod/mod_speling.html.en
-#srv/web/ipfire/manual/mod/mod_speling.html.fr
+#srv/web/ipfire/manual/mod/mod_speling.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_speling.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_speling.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_ssl.html
 #srv/web/ipfire/manual/mod/mod_ssl.html.en
-#srv/web/ipfire/manual/mod/mod_ssl.html.fr
+#srv/web/ipfire/manual/mod/mod_ssl.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_status.html
 #srv/web/ipfire/manual/mod/mod_status.html.en
-#srv/web/ipfire/manual/mod/mod_status.html.fr
+#srv/web/ipfire/manual/mod/mod_status.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_status.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_status.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_status.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_substitute.html
 #srv/web/ipfire/manual/mod/mod_substitute.html.en
-#srv/web/ipfire/manual/mod/mod_substitute.html.fr
+#srv/web/ipfire/manual/mod/mod_substitute.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_suexec.html
 #srv/web/ipfire/manual/mod/mod_suexec.html.en
-#srv/web/ipfire/manual/mod/mod_suexec.html.fr
+#srv/web/ipfire/manual/mod/mod_suexec.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_suexec.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html
 #srv/web/ipfire/manual/mod/mod_unique_id.html.en
-#srv/web/ipfire/manual/mod/mod_unique_id.html.fr
+#srv/web/ipfire/manual/mod/mod_unique_id.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_unixd.html
 #srv/web/ipfire/manual/mod/mod_unixd.html.en
-#srv/web/ipfire/manual/mod/mod_unixd.html.fr
+#srv/web/ipfire/manual/mod/mod_unixd.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_unixd.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_userdir.html
 #srv/web/ipfire/manual/mod/mod_userdir.html.en
-#srv/web/ipfire/manual/mod/mod_userdir.html.fr
+#srv/web/ipfire/manual/mod/mod_userdir.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_userdir.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_userdir.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_userdir.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_usertrack.html
 #srv/web/ipfire/manual/mod/mod_usertrack.html.en
-#srv/web/ipfire/manual/mod/mod_usertrack.html.fr
+#srv/web/ipfire/manual/mod/mod_usertrack.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_version.html
 #srv/web/ipfire/manual/mod/mod_version.html.en
-#srv/web/ipfire/manual/mod/mod_version.html.fr
+#srv/web/ipfire/manual/mod/mod_version.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_version.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_version.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html.en
-#srv/web/ipfire/manual/mod/mod_vhost_alias.html.fr
+#srv/web/ipfire/manual/mod/mod_vhost_alias.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_watchdog.html
 #srv/web/ipfire/manual/mod/mod_watchdog.html.en
-#srv/web/ipfire/manual/mod/mod_watchdog.html.fr
+#srv/web/ipfire/manual/mod/mod_watchdog.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_xml2enc.html
 #srv/web/ipfire/manual/mod/mod_xml2enc.html.en
-#srv/web/ipfire/manual/mod/mod_xml2enc.html.fr
+#srv/web/ipfire/manual/mod/mod_xml2enc.html.fr.utf8
 #srv/web/ipfire/manual/mod/module-dict.html
 #srv/web/ipfire/manual/mod/module-dict.html.en
-#srv/web/ipfire/manual/mod/module-dict.html.fr
+#srv/web/ipfire/manual/mod/module-dict.html.fr.utf8
 #srv/web/ipfire/manual/mod/module-dict.html.ja.utf8
 #srv/web/ipfire/manual/mod/module-dict.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/module-dict.html.tr.utf8
 #srv/web/ipfire/manual/mod/mpm_common.html
 #srv/web/ipfire/manual/mod/mpm_common.html.de
 #srv/web/ipfire/manual/mod/mpm_common.html.en
-#srv/web/ipfire/manual/mod/mpm_common.html.fr
+#srv/web/ipfire/manual/mod/mpm_common.html.fr.utf8
 #srv/web/ipfire/manual/mod/mpm_common.html.ja.utf8
 #srv/web/ipfire/manual/mod/mpm_common.html.tr.utf8
 #srv/web/ipfire/manual/mod/mpm_netware.html
 #srv/web/ipfire/manual/mod/mpm_netware.html.en
-#srv/web/ipfire/manual/mod/mpm_netware.html.fr
+#srv/web/ipfire/manual/mod/mpm_netware.html.fr.utf8
 #srv/web/ipfire/manual/mod/mpm_winnt.html
 #srv/web/ipfire/manual/mod/mpm_winnt.html.de
 #srv/web/ipfire/manual/mod/mpm_winnt.html.en
-#srv/web/ipfire/manual/mod/mpm_winnt.html.fr
+#srv/web/ipfire/manual/mod/mpm_winnt.html.fr.utf8
 #srv/web/ipfire/manual/mod/mpm_winnt.html.ja.utf8
 #srv/web/ipfire/manual/mod/mpmt_os2.html
 #srv/web/ipfire/manual/mod/mpmt_os2.html.en
-#srv/web/ipfire/manual/mod/mpmt_os2.html.fr
+#srv/web/ipfire/manual/mod/mpmt_os2.html.fr.utf8
 #srv/web/ipfire/manual/mod/overrides.html
 #srv/web/ipfire/manual/mod/overrides.html.en
 #srv/web/ipfire/manual/mod/prefork.html
 #srv/web/ipfire/manual/mod/prefork.html.de
 #srv/web/ipfire/manual/mod/prefork.html.en
-#srv/web/ipfire/manual/mod/prefork.html.fr
+#srv/web/ipfire/manual/mod/prefork.html.fr.utf8
 #srv/web/ipfire/manual/mod/prefork.html.ja.utf8
 #srv/web/ipfire/manual/mod/prefork.html.tr.utf8
 #srv/web/ipfire/manual/mod/quickreference.html
 #srv/web/ipfire/manual/mod/quickreference.html.de
 #srv/web/ipfire/manual/mod/quickreference.html.en
 #srv/web/ipfire/manual/mod/quickreference.html.es
-#srv/web/ipfire/manual/mod/quickreference.html.fr
+#srv/web/ipfire/manual/mod/quickreference.html.fr.utf8
 #srv/web/ipfire/manual/mod/quickreference.html.ja.utf8
 #srv/web/ipfire/manual/mod/quickreference.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/quickreference.html.tr.utf8
@@ -1146,14 +1146,14 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/worker.html
 #srv/web/ipfire/manual/mod/worker.html.de
 #srv/web/ipfire/manual/mod/worker.html.en
-#srv/web/ipfire/manual/mod/worker.html.fr
+#srv/web/ipfire/manual/mod/worker.html.fr.utf8
 #srv/web/ipfire/manual/mod/worker.html.ja.utf8
 #srv/web/ipfire/manual/mod/worker.html.tr.utf8
 #srv/web/ipfire/manual/mpm.html
 #srv/web/ipfire/manual/mpm.html.de
 #srv/web/ipfire/manual/mpm.html.en
 #srv/web/ipfire/manual/mpm.html.es
-#srv/web/ipfire/manual/mpm.html.fr
+#srv/web/ipfire/manual/mpm.html.fr.utf8
 #srv/web/ipfire/manual/mpm.html.ja.utf8
 #srv/web/ipfire/manual/mpm.html.ko.euc-kr
 #srv/web/ipfire/manual/mpm.html.tr.utf8
@@ -1161,7 +1161,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/new_features_2_0.html
 #srv/web/ipfire/manual/new_features_2_0.html.de
 #srv/web/ipfire/manual/new_features_2_0.html.en
-#srv/web/ipfire/manual/new_features_2_0.html.fr
+#srv/web/ipfire/manual/new_features_2_0.html.fr.utf8
 #srv/web/ipfire/manual/new_features_2_0.html.ja.utf8
 #srv/web/ipfire/manual/new_features_2_0.html.ko.euc-kr
 #srv/web/ipfire/manual/new_features_2_0.html.pt-br
@@ -1169,13 +1169,13 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/new_features_2_0.html.tr.utf8
 #srv/web/ipfire/manual/new_features_2_2.html
 #srv/web/ipfire/manual/new_features_2_2.html.en
-#srv/web/ipfire/manual/new_features_2_2.html.fr
+#srv/web/ipfire/manual/new_features_2_2.html.fr.utf8
 #srv/web/ipfire/manual/new_features_2_2.html.ko.euc-kr
 #srv/web/ipfire/manual/new_features_2_2.html.pt-br
 #srv/web/ipfire/manual/new_features_2_2.html.tr.utf8
 #srv/web/ipfire/manual/new_features_2_4.html
 #srv/web/ipfire/manual/new_features_2_4.html.en
-#srv/web/ipfire/manual/new_features_2_4.html.fr
+#srv/web/ipfire/manual/new_features_2_4.html.fr.utf8
 #srv/web/ipfire/manual/new_features_2_4.html.tr.utf8
 #srv/web/ipfire/manual/platform
 #srv/web/ipfire/manual/platform/ebcdic.html
@@ -1183,167 +1183,167 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/platform/ebcdic.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/index.html
 #srv/web/ipfire/manual/platform/index.html.en
-#srv/web/ipfire/manual/platform/index.html.fr
+#srv/web/ipfire/manual/platform/index.html.fr.utf8
 #srv/web/ipfire/manual/platform/index.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/platform/netware.html
 #srv/web/ipfire/manual/platform/netware.html.en
-#srv/web/ipfire/manual/platform/netware.html.fr
+#srv/web/ipfire/manual/platform/netware.html.fr.utf8
 #srv/web/ipfire/manual/platform/netware.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/perf-hp.html
 #srv/web/ipfire/manual/platform/perf-hp.html.en
-#srv/web/ipfire/manual/platform/perf-hp.html.fr
+#srv/web/ipfire/manual/platform/perf-hp.html.fr.utf8
 #srv/web/ipfire/manual/platform/perf-hp.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/rpm.html
 #srv/web/ipfire/manual/platform/rpm.html.en
-#srv/web/ipfire/manual/platform/rpm.html.fr
+#srv/web/ipfire/manual/platform/rpm.html.fr.utf8
 #srv/web/ipfire/manual/platform/win_compiling.html
 #srv/web/ipfire/manual/platform/win_compiling.html.en
-#srv/web/ipfire/manual/platform/win_compiling.html.fr
+#srv/web/ipfire/manual/platform/win_compiling.html.fr.utf8
 #srv/web/ipfire/manual/platform/win_compiling.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/windows.html
 #srv/web/ipfire/manual/platform/windows.html.en
-#srv/web/ipfire/manual/platform/windows.html.fr
+#srv/web/ipfire/manual/platform/windows.html.fr.utf8
 #srv/web/ipfire/manual/platform/windows.html.ko.euc-kr
 #srv/web/ipfire/manual/programs
 #srv/web/ipfire/manual/programs/ab.html
 #srv/web/ipfire/manual/programs/ab.html.en
-#srv/web/ipfire/manual/programs/ab.html.fr
+#srv/web/ipfire/manual/programs/ab.html.fr.utf8
 #srv/web/ipfire/manual/programs/ab.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/ab.html.tr.utf8
 #srv/web/ipfire/manual/programs/apachectl.html
 #srv/web/ipfire/manual/programs/apachectl.html.en
-#srv/web/ipfire/manual/programs/apachectl.html.fr
+#srv/web/ipfire/manual/programs/apachectl.html.fr.utf8
 #srv/web/ipfire/manual/programs/apachectl.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/apachectl.html.tr.utf8
 #srv/web/ipfire/manual/programs/apxs.html
 #srv/web/ipfire/manual/programs/apxs.html.en
-#srv/web/ipfire/manual/programs/apxs.html.fr
+#srv/web/ipfire/manual/programs/apxs.html.fr.utf8
 #srv/web/ipfire/manual/programs/apxs.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/apxs.html.tr.utf8
 #srv/web/ipfire/manual/programs/configure.html
 #srv/web/ipfire/manual/programs/configure.html.en
-#srv/web/ipfire/manual/programs/configure.html.fr
+#srv/web/ipfire/manual/programs/configure.html.fr.utf8
 #srv/web/ipfire/manual/programs/configure.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/configure.html.tr.utf8
 #srv/web/ipfire/manual/programs/dbmmanage.html
 #srv/web/ipfire/manual/programs/dbmmanage.html.en
-#srv/web/ipfire/manual/programs/dbmmanage.html.fr
+#srv/web/ipfire/manual/programs/dbmmanage.html.fr.utf8
 #srv/web/ipfire/manual/programs/dbmmanage.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/dbmmanage.html.tr.utf8
 #srv/web/ipfire/manual/programs/fcgistarter.html
 #srv/web/ipfire/manual/programs/fcgistarter.html.en
-#srv/web/ipfire/manual/programs/fcgistarter.html.fr
+#srv/web/ipfire/manual/programs/fcgistarter.html.fr.utf8
 #srv/web/ipfire/manual/programs/fcgistarter.html.tr.utf8
 #srv/web/ipfire/manual/programs/htcacheclean.html
 #srv/web/ipfire/manual/programs/htcacheclean.html.en
-#srv/web/ipfire/manual/programs/htcacheclean.html.fr
+#srv/web/ipfire/manual/programs/htcacheclean.html.fr.utf8
 #srv/web/ipfire/manual/programs/htcacheclean.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htcacheclean.html.tr.utf8
 #srv/web/ipfire/manual/programs/htdbm.html
 #srv/web/ipfire/manual/programs/htdbm.html.en
-#srv/web/ipfire/manual/programs/htdbm.html.fr
+#srv/web/ipfire/manual/programs/htdbm.html.fr.utf8
 #srv/web/ipfire/manual/programs/htdbm.html.tr.utf8
 #srv/web/ipfire/manual/programs/htdigest.html
 #srv/web/ipfire/manual/programs/htdigest.html.en
-#srv/web/ipfire/manual/programs/htdigest.html.fr
+#srv/web/ipfire/manual/programs/htdigest.html.fr.utf8
 #srv/web/ipfire/manual/programs/htdigest.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htdigest.html.tr.utf8
 #srv/web/ipfire/manual/programs/htpasswd.html
 #srv/web/ipfire/manual/programs/htpasswd.html.en
-#srv/web/ipfire/manual/programs/htpasswd.html.fr
+#srv/web/ipfire/manual/programs/htpasswd.html.fr.utf8
 #srv/web/ipfire/manual/programs/htpasswd.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htpasswd.html.tr.utf8
 #srv/web/ipfire/manual/programs/httpd.html
 #srv/web/ipfire/manual/programs/httpd.html.en
-#srv/web/ipfire/manual/programs/httpd.html.fr
+#srv/web/ipfire/manual/programs/httpd.html.fr.utf8
 #srv/web/ipfire/manual/programs/httpd.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/httpd.html.tr.utf8
 #srv/web/ipfire/manual/programs/httxt2dbm.html
 #srv/web/ipfire/manual/programs/httxt2dbm.html.en
-#srv/web/ipfire/manual/programs/httxt2dbm.html.fr
+#srv/web/ipfire/manual/programs/httxt2dbm.html.fr.utf8
 #srv/web/ipfire/manual/programs/httxt2dbm.html.tr.utf8
 #srv/web/ipfire/manual/programs/index.html
 #srv/web/ipfire/manual/programs/index.html.en
 #srv/web/ipfire/manual/programs/index.html.es
-#srv/web/ipfire/manual/programs/index.html.fr
+#srv/web/ipfire/manual/programs/index.html.fr.utf8
 #srv/web/ipfire/manual/programs/index.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/index.html.tr.utf8
 #srv/web/ipfire/manual/programs/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/programs/log_server_status.html
 #srv/web/ipfire/manual/programs/log_server_status.html.en
-#srv/web/ipfire/manual/programs/log_server_status.html.fr
+#srv/web/ipfire/manual/programs/log_server_status.html.fr.utf8
 #srv/web/ipfire/manual/programs/logresolve.html
 #srv/web/ipfire/manual/programs/logresolve.html.en
-#srv/web/ipfire/manual/programs/logresolve.html.fr
+#srv/web/ipfire/manual/programs/logresolve.html.fr.utf8
 #srv/web/ipfire/manual/programs/logresolve.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/logresolve.html.tr.utf8
 #srv/web/ipfire/manual/programs/other.html
 #srv/web/ipfire/manual/programs/other.html.en
-#srv/web/ipfire/manual/programs/other.html.fr
+#srv/web/ipfire/manual/programs/other.html.fr.utf8
 #srv/web/ipfire/manual/programs/other.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/other.html.tr.utf8
 #srv/web/ipfire/manual/programs/rotatelogs.html
 #srv/web/ipfire/manual/programs/rotatelogs.html.en
-#srv/web/ipfire/manual/programs/rotatelogs.html.fr
+#srv/web/ipfire/manual/programs/rotatelogs.html.fr.utf8
 #srv/web/ipfire/manual/programs/rotatelogs.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/rotatelogs.html.tr.utf8
 #srv/web/ipfire/manual/programs/split-logfile.html
 #srv/web/ipfire/manual/programs/split-logfile.html.en
-#srv/web/ipfire/manual/programs/split-logfile.html.fr
+#srv/web/ipfire/manual/programs/split-logfile.html.fr.utf8
 #srv/web/ipfire/manual/programs/suexec.html
 #srv/web/ipfire/manual/programs/suexec.html.en
-#srv/web/ipfire/manual/programs/suexec.html.fr
+#srv/web/ipfire/manual/programs/suexec.html.fr.utf8
 #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/suexec.html.tr.utf8
 #srv/web/ipfire/manual/rewrite
 #srv/web/ipfire/manual/rewrite/access.html
 #srv/web/ipfire/manual/rewrite/access.html.en
-#srv/web/ipfire/manual/rewrite/access.html.fr
+#srv/web/ipfire/manual/rewrite/access.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/advanced.html
 #srv/web/ipfire/manual/rewrite/advanced.html.en
-#srv/web/ipfire/manual/rewrite/advanced.html.fr
+#srv/web/ipfire/manual/rewrite/advanced.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/avoid.html
 #srv/web/ipfire/manual/rewrite/avoid.html.en
-#srv/web/ipfire/manual/rewrite/avoid.html.fr
+#srv/web/ipfire/manual/rewrite/avoid.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/flags.html
 #srv/web/ipfire/manual/rewrite/flags.html.en
-#srv/web/ipfire/manual/rewrite/flags.html.fr
+#srv/web/ipfire/manual/rewrite/flags.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/htaccess.html
 #srv/web/ipfire/manual/rewrite/htaccess.html.en
-#srv/web/ipfire/manual/rewrite/htaccess.html.fr
+#srv/web/ipfire/manual/rewrite/htaccess.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/index.html
 #srv/web/ipfire/manual/rewrite/index.html.en
-#srv/web/ipfire/manual/rewrite/index.html.fr
+#srv/web/ipfire/manual/rewrite/index.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/index.html.tr.utf8
 #srv/web/ipfire/manual/rewrite/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/rewrite/intro.html
 #srv/web/ipfire/manual/rewrite/intro.html.en
-#srv/web/ipfire/manual/rewrite/intro.html.fr
+#srv/web/ipfire/manual/rewrite/intro.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/proxy.html
 #srv/web/ipfire/manual/rewrite/proxy.html.en
-#srv/web/ipfire/manual/rewrite/proxy.html.fr
+#srv/web/ipfire/manual/rewrite/proxy.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/remapping.html
 #srv/web/ipfire/manual/rewrite/remapping.html.en
-#srv/web/ipfire/manual/rewrite/remapping.html.fr
+#srv/web/ipfire/manual/rewrite/remapping.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/rewritemap.html
 #srv/web/ipfire/manual/rewrite/rewritemap.html.en
-#srv/web/ipfire/manual/rewrite/rewritemap.html.fr
+#srv/web/ipfire/manual/rewrite/rewritemap.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/tech.html
 #srv/web/ipfire/manual/rewrite/tech.html.en
-#srv/web/ipfire/manual/rewrite/tech.html.fr
+#srv/web/ipfire/manual/rewrite/tech.html.fr.utf8
 #srv/web/ipfire/manual/rewrite/vhosts.html
 #srv/web/ipfire/manual/rewrite/vhosts.html.en
-#srv/web/ipfire/manual/rewrite/vhosts.html.fr
+#srv/web/ipfire/manual/rewrite/vhosts.html.fr.utf8
 #srv/web/ipfire/manual/sections.html
 #srv/web/ipfire/manual/sections.html.en
-#srv/web/ipfire/manual/sections.html.fr
+#srv/web/ipfire/manual/sections.html.fr.utf8
 #srv/web/ipfire/manual/sections.html.ja.utf8
 #srv/web/ipfire/manual/sections.html.ko.euc-kr
 #srv/web/ipfire/manual/sections.html.tr.utf8
 #srv/web/ipfire/manual/server-wide.html
 #srv/web/ipfire/manual/server-wide.html.en
-#srv/web/ipfire/manual/server-wide.html.fr
+#srv/web/ipfire/manual/server-wide.html.fr.utf8
 #srv/web/ipfire/manual/server-wide.html.ja.utf8
 #srv/web/ipfire/manual/server-wide.html.ko.euc-kr
 #srv/web/ipfire/manual/server-wide.html.tr.utf8
@@ -1351,39 +1351,39 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/sitemap.html.de
 #srv/web/ipfire/manual/sitemap.html.en
 #srv/web/ipfire/manual/sitemap.html.es
-#srv/web/ipfire/manual/sitemap.html.fr
+#srv/web/ipfire/manual/sitemap.html.fr.utf8
 #srv/web/ipfire/manual/sitemap.html.ja.utf8
 #srv/web/ipfire/manual/sitemap.html.ko.euc-kr
 #srv/web/ipfire/manual/sitemap.html.tr.utf8
 #srv/web/ipfire/manual/sitemap.html.zh-cn.utf8
 #srv/web/ipfire/manual/socache.html
 #srv/web/ipfire/manual/socache.html.en
-#srv/web/ipfire/manual/socache.html.fr
+#srv/web/ipfire/manual/socache.html.fr.utf8
 #srv/web/ipfire/manual/ssl
 #srv/web/ipfire/manual/ssl/index.html
 #srv/web/ipfire/manual/ssl/index.html.en
-#srv/web/ipfire/manual/ssl/index.html.fr
+#srv/web/ipfire/manual/ssl/index.html.fr.utf8
 #srv/web/ipfire/manual/ssl/index.html.ja.utf8
 #srv/web/ipfire/manual/ssl/index.html.tr.utf8
 #srv/web/ipfire/manual/ssl/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/ssl/ssl_compat.html
 #srv/web/ipfire/manual/ssl/ssl_compat.html.en
-#srv/web/ipfire/manual/ssl/ssl_compat.html.fr
+#srv/web/ipfire/manual/ssl/ssl_compat.html.fr.utf8
 #srv/web/ipfire/manual/ssl/ssl_faq.html
 #srv/web/ipfire/manual/ssl/ssl_faq.html.en
-#srv/web/ipfire/manual/ssl/ssl_faq.html.fr
+#srv/web/ipfire/manual/ssl/ssl_faq.html.fr.utf8
 #srv/web/ipfire/manual/ssl/ssl_howto.html
 #srv/web/ipfire/manual/ssl/ssl_howto.html.en
-#srv/web/ipfire/manual/ssl/ssl_howto.html.fr
+#srv/web/ipfire/manual/ssl/ssl_howto.html.fr.utf8
 #srv/web/ipfire/manual/ssl/ssl_intro.html
 #srv/web/ipfire/manual/ssl/ssl_intro.html.en
-#srv/web/ipfire/manual/ssl/ssl_intro.html.fr
+#srv/web/ipfire/manual/ssl/ssl_intro.html.fr.utf8
 #srv/web/ipfire/manual/ssl/ssl_intro.html.ja.utf8
 #srv/web/ipfire/manual/stopping.html
 #srv/web/ipfire/manual/stopping.html.de
 #srv/web/ipfire/manual/stopping.html.en
 #srv/web/ipfire/manual/stopping.html.es
-#srv/web/ipfire/manual/stopping.html.fr
+#srv/web/ipfire/manual/stopping.html.fr.utf8
 #srv/web/ipfire/manual/stopping.html.ja.utf8
 #srv/web/ipfire/manual/stopping.html.ko.euc-kr
 #srv/web/ipfire/manual/stopping.html.tr.utf8
@@ -1415,60 +1415,60 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/style/xsl/util
 #srv/web/ipfire/manual/suexec.html
 #srv/web/ipfire/manual/suexec.html.en
-#srv/web/ipfire/manual/suexec.html.fr
+#srv/web/ipfire/manual/suexec.html.fr.utf8
 #srv/web/ipfire/manual/suexec.html.ja.utf8
 #srv/web/ipfire/manual/suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/suexec.html.tr.utf8
 #srv/web/ipfire/manual/upgrading.html
 #srv/web/ipfire/manual/upgrading.html.en
-#srv/web/ipfire/manual/upgrading.html.fr
+#srv/web/ipfire/manual/upgrading.html.fr.utf8
 #srv/web/ipfire/manual/urlmapping.html
 #srv/web/ipfire/manual/urlmapping.html.en
-#srv/web/ipfire/manual/urlmapping.html.fr
+#srv/web/ipfire/manual/urlmapping.html.fr.utf8
 #srv/web/ipfire/manual/urlmapping.html.ja.utf8
 #srv/web/ipfire/manual/urlmapping.html.ko.euc-kr
 #srv/web/ipfire/manual/urlmapping.html.tr.utf8
 #srv/web/ipfire/manual/vhosts
 #srv/web/ipfire/manual/vhosts/details.html
 #srv/web/ipfire/manual/vhosts/details.html.en
-#srv/web/ipfire/manual/vhosts/details.html.fr
+#srv/web/ipfire/manual/vhosts/details.html.fr.utf8
 #srv/web/ipfire/manual/vhosts/details.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/details.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/examples.html
 #srv/web/ipfire/manual/vhosts/examples.html.en
-#srv/web/ipfire/manual/vhosts/examples.html.fr
+#srv/web/ipfire/manual/vhosts/examples.html.fr.utf8
 #srv/web/ipfire/manual/vhosts/examples.html.ja.utf8
 #srv/web/ipfire/manual/vhosts/examples.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/examples.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/fd-limits.html
 #srv/web/ipfire/manual/vhosts/fd-limits.html.en
-#srv/web/ipfire/manual/vhosts/fd-limits.html.fr
+#srv/web/ipfire/manual/vhosts/fd-limits.html.fr.utf8
 #srv/web/ipfire/manual/vhosts/fd-limits.html.ja.utf8
 #srv/web/ipfire/manual/vhosts/fd-limits.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/fd-limits.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/index.html
 #srv/web/ipfire/manual/vhosts/index.html.de
 #srv/web/ipfire/manual/vhosts/index.html.en
-#srv/web/ipfire/manual/vhosts/index.html.fr
+#srv/web/ipfire/manual/vhosts/index.html.fr.utf8
 #srv/web/ipfire/manual/vhosts/index.html.ja.utf8
 #srv/web/ipfire/manual/vhosts/index.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/index.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/vhosts/ip-based.html
 #srv/web/ipfire/manual/vhosts/ip-based.html.en
-#srv/web/ipfire/manual/vhosts/ip-based.html.fr
+#srv/web/ipfire/manual/vhosts/ip-based.html.fr.utf8
 #srv/web/ipfire/manual/vhosts/ip-based.html.ja.utf8
 #srv/web/ipfire/manual/vhosts/ip-based.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/ip-based.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/mass.html
 #srv/web/ipfire/manual/vhosts/mass.html.en
-#srv/web/ipfire/manual/vhosts/mass.html.fr
+#srv/web/ipfire/manual/vhosts/mass.html.fr.utf8
 #srv/web/ipfire/manual/vhosts/mass.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/mass.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/name-based.html
 #srv/web/ipfire/manual/vhosts/name-based.html.de
 #srv/web/ipfire/manual/vhosts/name-based.html.en
-#srv/web/ipfire/manual/vhosts/name-based.html.fr
+#srv/web/ipfire/manual/vhosts/name-based.html.fr.utf8
 #srv/web/ipfire/manual/vhosts/name-based.html.ja.utf8
 #srv/web/ipfire/manual/vhosts/name-based.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/name-based.html.tr.utf8
diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr
index dfde82400596d3029cb5338e63324cad71bd3fae..0fb0d7d37abf6fd038df2cbeb8904b4cd46441e4 100644 (file)
--- a/config/rootfiles/common/apr
+++ b/config/rootfiles/common/apr
@@ -44,7 +44,7 @@ usr/bin/apr-1-config
 #usr/lib/libapr-1.la
 #usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.6.3
+usr/lib/libapr-1.so.0.6.5
 #usr/lib/pkgconfig/apr-1.pc
 #usr/share/apr-1
 #usr/share/apr-1/build
diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl
index aea07a6c7a375f7080fbd1315a3ff1ef8567b045..5c616f8da311b5c35a0f1bc2dc3eff34bd0343d3 100644 (file)
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -9,6 +9,7 @@ usr/bin/curl
 #usr/include/curl/stdcheaders.h
 #usr/include/curl/system.h
 #usr/include/curl/typecheck-gcc.h
+#usr/include/curl/urlapi.h
 #usr/lib/libcurl.la
 #usr/lib/libcurl.so
 usr/lib/libcurl.so.4
@@ -19,9 +20,11 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man1/curl.1
 #usr/share/man/man3/CURLINFO_ACTIVESOCKET.3
 #usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3
+#usr/share/man/man3/CURLINFO_APPCONNECT_TIME_T.3
 #usr/share/man/man3/CURLINFO_CERTINFO.3
 #usr/share/man/man3/CURLINFO_CONDITION_UNMET.3
 #usr/share/man/man3/CURLINFO_CONNECT_TIME.3
+#usr/share/man/man3/CURLINFO_CONNECT_TIME_T.3
 #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
 #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
 #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
@@ -40,9 +43,11 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLINFO_LOCAL_IP.3
 #usr/share/man/man3/CURLINFO_LOCAL_PORT.3
 #usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3
+#usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME_T.3
 #usr/share/man/man3/CURLINFO_NUM_CONNECTS.3
 #usr/share/man/man3/CURLINFO_OS_ERRNO.3
 #usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3
+#usr/share/man/man3/CURLINFO_PRETRANSFER_TIME_T.3
 #usr/share/man/man3/CURLINFO_PRIMARY_IP.3
 #usr/share/man/man3/CURLINFO_PRIMARY_PORT.3
 #usr/share/man/man3/CURLINFO_PRIVATE.3
@@ -51,6 +56,7 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3
 #usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3
 #usr/share/man/man3/CURLINFO_REDIRECT_TIME.3
+#usr/share/man/man3/CURLINFO_REDIRECT_TIME_T.3
 #usr/share/man/man3/CURLINFO_REDIRECT_URL.3
 #usr/share/man/man3/CURLINFO_REQUEST_SIZE.3
 #usr/share/man/man3/CURLINFO_RESPONSE_CODE.3
@@ -70,9 +76,11 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLINFO_SSL_ENGINES.3
 #usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3
 #usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3
+#usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME_T.3
 #usr/share/man/man3/CURLINFO_TLS_SESSION.3
 #usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3
 #usr/share/man/man3/CURLINFO_TOTAL_TIME.3
+#usr/share/man/man3/CURLINFO_TOTAL_TIME_T.3
 #usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
 #usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
 #usr/share/man/man3/CURLMOPT_MAXCONNECTS.3
@@ -118,17 +126,21 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3
 #usr/share/man/man3/CURLOPT_CRLF.3
 #usr/share/man/man3/CURLOPT_CRLFILE.3
+#usr/share/man/man3/CURLOPT_CURLU.3
 #usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3
 #usr/share/man/man3/CURLOPT_DEBUGDATA.3
 #usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3
 #usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3
 #usr/share/man/man3/CURLOPT_DIRLISTONLY.3
+#usr/share/man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3
 #usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3
 #usr/share/man/man3/CURLOPT_DNS_INTERFACE.3
 #usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3
 #usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3
 #usr/share/man/man3/CURLOPT_DNS_SERVERS.3
+#usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3
 #usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3
+#usr/share/man/man3/CURLOPT_DOH_URL.3
 #usr/share/man/man3/CURLOPT_EGDSOCKET.3
 #usr/share/man/man3/CURLOPT_ERRORBUFFER.3
 #usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3
@@ -153,6 +165,7 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_FTP_USE_PRET.3
 #usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3
 #usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3
+#usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3
 #usr/share/man/man3/CURLOPT_HEADER.3
 #usr/share/man/man3/CURLOPT_HEADERDATA.3
 #usr/share/man/man3/CURLOPT_HEADERFUNCTION.3
@@ -244,6 +257,7 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_PROXY_SSL_OPTIONS.3
 #usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3
 #usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3
+#usr/share/man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3
 #usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3
 #usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3
 #usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3
@@ -322,6 +336,7 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_TIMEOUT_MS.3
 #usr/share/man/man3/CURLOPT_TIMEVALUE.3
 #usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3
+#usr/share/man/man3/CURLOPT_TLS13_CIPHERS.3
 #usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3
 #usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3
 #usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3
@@ -329,7 +344,9 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3
 #usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3
 #usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3
+#usr/share/man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3
 #usr/share/man/man3/CURLOPT_UPLOAD.3
+#usr/share/man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3
 #usr/share/man/man3/CURLOPT_URL.3
 #usr/share/man/man3/CURLOPT_USERAGENT.3
 #usr/share/man/man3/CURLOPT_USERNAME.3
@@ -355,6 +372,7 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/curl_easy_setopt.3
 #usr/share/man/man3/curl_easy_strerror.3
 #usr/share/man/man3/curl_easy_unescape.3
+#usr/share/man/man3/curl_easy_upkeep.3
 #usr/share/man/man3/curl_escape.3
 #usr/share/man/man3/curl_formadd.3
 #usr/share/man/man3/curl_formfree.3
@@ -403,6 +421,11 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/curl_strequal.3
 #usr/share/man/man3/curl_strnequal.3
 #usr/share/man/man3/curl_unescape.3
+#usr/share/man/man3/curl_url.3
+#usr/share/man/man3/curl_url_cleanup.3
+#usr/share/man/man3/curl_url_dup.3
+#usr/share/man/man3/curl_url_get.3
+#usr/share/man/man3/curl_url_set.3
 #usr/share/man/man3/curl_version.3
 #usr/share/man/man3/curl_version_info.3
 #usr/share/man/man3/libcurl-easy.3
@@ -414,4 +437,5 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/libcurl-symbols.3
 #usr/share/man/man3/libcurl-thread.3
 #usr/share/man/man3/libcurl-tutorial.3
+#usr/share/man/man3/libcurl-url.3
 #usr/share/man/man3/libcurl.3
diff --git a/config/rootfiles/common/python3-setuptools b/config/rootfiles/common/python3-setuptools
new file mode 100644 (file)
index 0000000..ee78dcd
--- /dev/null
+++ b/config/rootfiles/common/python3-setuptools
@@ -0,0 +1,60 @@
+#usr/lib/python3.6/site-packages/pkg_resources/__pycache__/py31compat.cpython-36.pyc
+#usr/lib/python3.6/site-packages/pkg_resources/py31compat.py
+#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info
+#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/PKG-INFO
+#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/SOURCES.txt
+#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/dependency_links.txt
+#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/entry_points.txt
+#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/requires.txt
+#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/top_level.txt
+#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/zip-safe
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/_deprecation_warning.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/build_meta.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/config.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/dep_util.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/glibc.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/pep425tags.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/py33compat.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/py36compat.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/__pycache__/wheel.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_deprecation_warning.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor
+#usr/lib/python3.6/site-packages/setuptools/_vendor/__init__.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__
+#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/pyparsing.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/six.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__about__.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__init__.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/__about__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/_compat.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/_structures.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/markers.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/requirements.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/specifiers.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/utils.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/version.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/_compat.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/_structures.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/markers.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/requirements.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/specifiers.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/utils.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/version.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/pyparsing.py
+#usr/lib/python3.6/site-packages/setuptools/_vendor/six.py
+#usr/lib/python3.6/site-packages/setuptools/build_meta.py
+#usr/lib/python3.6/site-packages/setuptools/command/__pycache__/build_clib.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/command/__pycache__/dist_info.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools/command/build_clib.py
+#usr/lib/python3.6/site-packages/setuptools/command/dist_info.py
+#usr/lib/python3.6/site-packages/setuptools/config.py
+#usr/lib/python3.6/site-packages/setuptools/dep_util.py
+#usr/lib/python3.6/site-packages/setuptools/glibc.py
+#usr/lib/python3.6/site-packages/setuptools/pep425tags.py
+#usr/lib/python3.6/site-packages/setuptools/py33compat.py
+#usr/lib/python3.6/site-packages/setuptools/py36compat.py
+#usr/lib/python3.6/site-packages/setuptools/wheel.py
diff --git a/config/rootfiles/common/python3-setuptools-scm b/config/rootfiles/common/python3-setuptools-scm
new file mode 100644 (file)
index 0000000..bcc3d1c
--- /dev/null
+++ b/config/rootfiles/common/python3-setuptools-scm
@@ -0,0 +1,37 @@
+#usr/lib/python3.6/site-packages/setuptools_scm
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/PKG-INFO
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/SOURCES.txt
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/dependency_links.txt
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/entry_points.txt
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/top_level.txt
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/zip-safe
+#usr/lib/python3.6/site-packages/setuptools_scm/__init__.py
+#usr/lib/python3.6/site-packages/setuptools_scm/__main__.py
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/__main__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/config.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/discover.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder_git.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder_hg.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/git.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/hacks.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/hg.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/integration.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/utils.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/version.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/win_py31_compat.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/config.py
+#usr/lib/python3.6/site-packages/setuptools_scm/discover.py
+#usr/lib/python3.6/site-packages/setuptools_scm/file_finder.py
+#usr/lib/python3.6/site-packages/setuptools_scm/file_finder_git.py
+#usr/lib/python3.6/site-packages/setuptools_scm/file_finder_hg.py
+#usr/lib/python3.6/site-packages/setuptools_scm/git.py
+#usr/lib/python3.6/site-packages/setuptools_scm/hacks.py
+#usr/lib/python3.6/site-packages/setuptools_scm/hg.py
+#usr/lib/python3.6/site-packages/setuptools_scm/integration.py
+#usr/lib/python3.6/site-packages/setuptools_scm/utils.py
+#usr/lib/python3.6/site-packages/setuptools_scm/version.py
+#usr/lib/python3.6/site-packages/setuptools_scm/win_py31_compat.py
diff --git a/config/rootfiles/core/128/exclude b/config/rootfiles/core/128/exclude
index b221598781717c4568a58f0bfcff78c0c4942563..22cf4a994bd7ace7b8b0c55a2129bdb529249acf 100644 (file)
--- a/config/rootfiles/core/128/exclude
+++ b/config/rootfiles/core/128/exclude
@@ -11,7 +11,6 @@ etc/ipsec.user.secrets
 etc/localtime
 etc/shadow
 etc/snort/snort.conf
-etc/ssl/openssl.cnf
 etc/sudoers
 etc/sysconfig/firewall.local
 etc/sysconfig/rc.local
diff --git a/config/rootfiles/core/128/filelists/apr b/config/rootfiles/core/128/filelists/apr
new file mode 120000 (symlink)
index 0000000..87dd197
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/apr
@@ -0,0 +1 @@
+../../../common/apr
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/curl b/config/rootfiles/core/128/filelists/curl
new file mode 120000 (symlink)
index 0000000..4b84bef
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/dhcpcd b/config/rootfiles/core/128/filelists/dhcpcd
new file mode 120000 (symlink)
index 0000000..1e799da
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/dhcpcd
@@ -0,0 +1 @@
+../../../common/dhcpcd
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/core/128/filelists/files
index 007c06ab71b388e9968adf883bf6410fec67ee30..1998a08c01ba2d93dc5b3f5eb5db2ec359019b80 100644 (file)
--- a/config/rootfiles/core/128/filelists/files
+++ b/config/rootfiles/core/128/filelists/files
@@ -2,6 +2,11 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
+etc/rc.d/helper/aws-setup
+etc/rc.d/init.d/aws
+etc/rc.d/init.d/firewall
+etc/ssl/openssl.cnf
 etc/sysctl.conf
 srv/web/ipfire/cgi-bin/proxy.cgi
 usr/local/bin/xt_geoip_update
+var/ipfire/ovpn/openssl/ovpn.cnf
diff --git a/config/rootfiles/core/128/update.sh b/config/rootfiles/core/128/update.sh
index 4bc19bcabe0d7f877d5f1c5a56e8c55006075078..dc185ed7050e39ded580fc6fc0ce9b07d31610ce 100644 (file)
--- a/config/rootfiles/core/128/update.sh
+++ b/config/rootfiles/core/128/update.sh
@@ -35,8 +35,14 @@ done
 
 # Remove files
 rm -vf \
-       /usr/lib/libcrypto.so.10 \
-       /usr/lib/libssl.so.10
+       /usr/lib{,/sse2}/libcrypto.so.10 \
+       /usr/lib{,/sse2}/libssl.so.10 \
+       /home/nobody/.rnd \
+       /var/ipfire/ovpn/ca/.rnd \
+       /var/tmp/.rnd \
+       /.rnd \
+       /root/.rnd
+
 
 # Extract files
 extract_files
@@ -55,6 +61,10 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
        /etc/init.d/ipsec restart
 fi
 /etc/init.d/sshd restart
+/etc/init.d/apache restart
+
+# This update needs a reboot...
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup
new file mode 100644 (file)
index 0000000..32aacc0
--- /dev/null
+++ b/config/rootfiles/packages/borgbackup
@@ -0,0 +1,109 @@
+usr/bin/borg
+usr/lib/python3.6/site-packages/borg
+usr/lib/python3.6/site-packages/borg/__init__.py
+usr/lib/python3.6/site-packages/borg/__main__.py
+usr/lib/python3.6/site-packages/borg/__pycache__
+usr/lib/python3.6/site-packages/borg/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/__main__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archive.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archiver.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/cache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/fuse.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/helpers.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/key.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/keymanager.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/locking.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/logger.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/lrucache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/platform.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/remote.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/repository.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/shellpattern.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/upgrader.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/xattr.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/_chunker.c
+usr/lib/python3.6/site-packages/borg/_hashindex.c
+usr/lib/python3.6/site-packages/borg/_version.py
+usr/lib/python3.6/site-packages/borg/archive.py
+usr/lib/python3.6/site-packages/borg/archiver.py
+usr/lib/python3.6/site-packages/borg/cache.py
+usr/lib/python3.6/site-packages/borg/chunker.c
+usr/lib/python3.6/site-packages/borg/chunker.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/chunker.pyx
+usr/lib/python3.6/site-packages/borg/compress.c
+usr/lib/python3.6/site-packages/borg/compress.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/compress.pyx
+usr/lib/python3.6/site-packages/borg/crypto.c
+usr/lib/python3.6/site-packages/borg/crypto.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/crypto.pyx
+usr/lib/python3.6/site-packages/borg/fuse.py
+usr/lib/python3.6/site-packages/borg/hashindex.c
+usr/lib/python3.6/site-packages/borg/hashindex.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/hashindex.pyx
+usr/lib/python3.6/site-packages/borg/helpers.py
+usr/lib/python3.6/site-packages/borg/key.py
+usr/lib/python3.6/site-packages/borg/keymanager.py
+usr/lib/python3.6/site-packages/borg/locking.py
+usr/lib/python3.6/site-packages/borg/logger.py
+usr/lib/python3.6/site-packages/borg/lrucache.py
+usr/lib/python3.6/site-packages/borg/paperkey.html
+usr/lib/python3.6/site-packages/borg/platform.py
+usr/lib/python3.6/site-packages/borg/platform_darwin.c
+usr/lib/python3.6/site-packages/borg/platform_darwin.pyx
+usr/lib/python3.6/site-packages/borg/platform_freebsd.c
+usr/lib/python3.6/site-packages/borg/platform_freebsd.pyx
+usr/lib/python3.6/site-packages/borg/platform_linux.c
+usr/lib/python3.6/site-packages/borg/platform_linux.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/platform_linux.pyx
+usr/lib/python3.6/site-packages/borg/remote.py
+usr/lib/python3.6/site-packages/borg/repository.py
+usr/lib/python3.6/site-packages/borg/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite
+#usr/lib/python3.6/site-packages/borg/testsuite/__init__.py
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archive.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archiver.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/benchmark.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/chunker.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/compress.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/crypto.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/hashindex.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/helpers.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/key.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/locking.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/logger.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/lrucache.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/platform.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/repository.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/shellpattern.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/upgrader.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/xattr.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/archive.py
+#usr/lib/python3.6/site-packages/borg/testsuite/archiver.py
+#usr/lib/python3.6/site-packages/borg/testsuite/attic.tar.gz
+#usr/lib/python3.6/site-packages/borg/testsuite/benchmark.py
+#usr/lib/python3.6/site-packages/borg/testsuite/chunker.py
+#usr/lib/python3.6/site-packages/borg/testsuite/compress.py
+#usr/lib/python3.6/site-packages/borg/testsuite/crypto.py
+#usr/lib/python3.6/site-packages/borg/testsuite/hashindex.py
+#usr/lib/python3.6/site-packages/borg/testsuite/helpers.py
+#usr/lib/python3.6/site-packages/borg/testsuite/key.py
+#usr/lib/python3.6/site-packages/borg/testsuite/locking.py
+#usr/lib/python3.6/site-packages/borg/testsuite/logger.py
+#usr/lib/python3.6/site-packages/borg/testsuite/lrucache.py
+#usr/lib/python3.6/site-packages/borg/testsuite/platform.py
+#usr/lib/python3.6/site-packages/borg/testsuite/repository.py
+#usr/lib/python3.6/site-packages/borg/testsuite/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite/upgrader.py
+#usr/lib/python3.6/site-packages/borg/testsuite/xattr.py
+usr/lib/python3.6/site-packages/borg/upgrader.py
+usr/lib/python3.6/site-packages/borg/xattr.py
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/entry_points.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/requires.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/i586/python3-msgpack b/config/rootfiles/packages/i586/python3-msgpack
new file mode 100644 (file)
index 0000000..5580b25
--- /dev/null
+++ b/config/rootfiles/packages/i586/python3-msgpack
@@ -0,0 +1,17 @@
+#usr/lib/python3.6/site-packages/msgpack
+usr/lib/python3.6/site-packages/msgpack/__init__.py
+usr/lib/python3.6/site-packages/msgpack/__pycache__
+usr/lib/python3.6/site-packages/msgpack/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/exceptions.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/fallback.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/msgpack/_version.py
+usr/lib/python3.6/site-packages/msgpack/exceptions.py
+usr/lib/python3.6/site-packages/msgpack/fallback.py
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/python3-dateutil b/config/rootfiles/packages/python3-dateutil
index 1d0de62ac76322a8bf47bdec6fe3fdf036ab5f13..744d0894c82231c9d26f73caad8ce940a17bc9a9 100644 (file)
--- a/config/rootfiles/packages/python3-dateutil
+++ b/config/rootfiles/packages/python3-dateutil
@@ -43,10 +43,10 @@ usr/lib/python3.6/site-packages/dateutil
 #usr/lib/python3.6/site-packages/dateutil/zoneinfo/__pycache__/rebuild.cpython-36.pyc
 #usr/lib/python3.6/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz
 #usr/lib/python3.6/site-packages/dateutil/zoneinfo/rebuild.py
-#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info
-#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/PKG-INFO
-#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/SOURCES.txt
-#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/dependency_links.txt
-#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/requires.txt
-#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/top_level.txt
-#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/zip-safe
+#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info
+#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/PKG-INFO
+#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/SOURCES.txt
+#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/dependency_links.txt
+#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/requires.txt
+#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/top_level.txt
+#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/zip-safe
diff --git a/config/rootfiles/packages/python3-llfuse b/config/rootfiles/packages/python3-llfuse
new file mode 100644 (file)
index 0000000..a41caf2
--- /dev/null
+++ b/config/rootfiles/packages/python3-llfuse
@@ -0,0 +1,7 @@
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/top_level.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/zip-safe
+usr/lib/python3.6/site-packages/llfuse.cpython-36m-MACHINE-linux-gnu.so
diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack
new file mode 100644 (file)
index 0000000..1cc53c4
--- /dev/null
+++ b/config/rootfiles/packages/python3-msgpack
@@ -0,0 +1,17 @@
+#usr/lib/python3.6/site-packages/msgpack
+usr/lib/python3.6/site-packages/msgpack/__init__.py
+usr/lib/python3.6/site-packages/msgpack/__pycache__
+usr/lib/python3.6/site-packages/msgpack/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/exceptions.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/fallback.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/msgpack/_version.py
+usr/lib/python3.6/site-packages/msgpack/exceptions.py
+usr/lib/python3.6/site-packages/msgpack/fallback.py
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor
index 972b207758aa2e1146a63d3795db63d22c45ed82..c75e86f11895ba812af1b7fcfe9c0a6c6b7e50af 100644 (file)
--- a/config/rootfiles/packages/tor
+++ b/config/rootfiles/packages/tor
@@ -8,15 +8,18 @@ etc/tor/torrc
 srv/web/ipfire/cgi-bin/tor.cgi
 usr/bin/tor
 usr/bin/tor-gencert
+usr/bin/tor-print-ed-signing-cert
 usr/bin/tor-resolve
 #usr/bin/torify
 usr/local/bin/torctrl
 #usr/share/doc/tor
 #usr/share/doc/tor/tor-gencert.html
+#usr/share/doc/tor/tor-print-ed-signing-cert.html
 #usr/share/doc/tor/tor-resolve.html
 #usr/share/doc/tor/tor.html
 #usr/share/doc/tor/torify.html
 #usr/share/man/man1/tor-gencert.1
+#usr/share/man/man1/tor-print-ed-signing-cert.1
 #usr/share/man/man1/tor-resolve.1
 #usr/share/man/man1/tor.1
 #usr/share/man/man1/torify.1
diff --git a/config/ssl/openssl.cnf b/config/ssl/openssl.cnf
index 9d1e6e1ff5e5510483af261cb00eced32bb5893a..3b980fcd40f3bae0815bdcf37003d4d1483af09c 100644 (file)
--- a/config/ssl/openssl.cnf
+++ b/config/ssl/openssl.cnf
@@ -1,5 +1,4 @@
 HOME           = .
-RANDFILE       = /var/tmp/.rnd
 oid_section    = new_oids
 
 [ new_oids ]
@@ -17,7 +16,6 @@ certificate   = $dir/ca/cacert.pem
 serial         = $dir/certs/serial
 crl            = $dir/crls/cacrl.pem
 private_key    = $dir/private/cakey.pem
-RANDFILE       = $dir/tmp/.rand
 x509_extensions        = usr_cert
 default_days   = 999999
 default_crl_days= 30
diff --git a/lfs/apache2 b/lfs/apache2
index d2175e71c9eb808f345eb12271adf86278a62739..be5ffd9ec638ec5a6c73cac0459570f59113c866 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.4.35
+VER        = 2.4.38
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 30c1cde80ffe814a8d16b4fdffda330a
+$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084
 
 install : $(TARGET)
 
@@ -101,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        echo "</Layout>" >> $(DIR_APP)/config.layout
 
        cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event
+                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event --disable-lua --disable-md
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        chown -v root:root /usr/lib/apache/httpd.exp \
diff --git a/lfs/apr b/lfs/apr
index e384ab3c07fff350446a15cd555e26e39233a6e1..c5d342d2ca87c02f406b726efaa85e4e305a3bbb 100644 (file)
--- a/lfs/apr
+++ b/lfs/apr
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 1.6.3
+VER        = 1.6.5
 
 THISAPP    = apr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 12f2a349483ad6f12db49ba01fbfdbfa
+$(DL_FILE)_MD5 = ad4add8efdfe87330b88e5e788241775
 
 install : $(TARGET)
 
diff --git a/lfs/borgbackup b/lfs/borgbackup
new file mode 100644 (file)
index 0000000..a00a059
--- /dev/null
+++ b/lfs/borgbackup
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.0.12
+
+THISAPP    = borgbackup-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = borgbackup
+PAK_VER    = 1
+
+DEPS       = "python3 python3-llfuse python3-msgpack"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7bd9fa82a517d559d56a4e1ff5965bc8
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python3 setup.py build
+       cd $(DIR_APP) && python3 setup.py install --root=/
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/curl b/lfs/curl
index baf298e182e492bbb95e9de6c27a2b2f8c8bbf70..f00677b5e7c7f55e6d6e0c57c5c668c0408764a1 100644 (file)
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 7.59.0
+VER        = 7.63.0
 
 THISAPP    = curl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a44f98c25c7506e7103039b542aa5ad8
+$(DL_FILE)_MD5 = 6121427a7199cd6094fc48c9e31e8992
 
 install : $(TARGET)
 
diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 9f3f5fbb6ef7ede6efcb04ea638f763c723cb7a5..cd940ae8b45795b61db05ae716116a760bab4b21 100644 (file)
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 7.0.8
+VER        = 7.1.0
 
 THISAPP    = dhcpcd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 77bbb1d73b6f30d6ddcc8b0fd3eae266
+$(DL_FILE)_MD5 = 918520b171f32f0da97316f3bcf3edc1
 
 install : $(TARGET)
 
diff --git a/lfs/haproxy b/lfs/haproxy
index 51414d8b6ace254e72f798f9f8c8d716cb9935c0..ac531bede2bf9fa25b6ed2abec7e5499aaff0303 100644 (file)
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = ""
 
diff --git a/lfs/linux b/lfs/linux
index 7d16f939e36753691c7b9999dd3589c6eaa326ac..c031f1e80961cba0cbf05e39441fa137837823e8 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.95
-ARM_PATCHES = 4.14.95-ipfire0
+VER         = 4.14.97
+ARM_PATCHES = 4.14.97-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -82,8 +82,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 581f25286b695c77c7fc20711f2d3c89
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 1b7d72e71b8923d39eb2fede46c66d0c
+$(DL_FILE)_MD5                                 = 14dc56d3933045782caca454d32e8874
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = b2f6559b08f764c0d974e860660d416a
 
 install : $(TARGET)
 
diff --git a/lfs/python3-llfuse b/lfs/python3-llfuse
new file mode 100644 (file)
index 0000000..175c6c2
--- /dev/null
+++ b/lfs/python3-llfuse
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.3.5
+
+THISAPP    = llfuse-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python3-llfuse
+PAK_VER    = 1
+
+DEPS       = "python3"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 9fbb82c0db909d139f9fafa27c76781e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python3 setup.py build
+       cd $(DIR_APP) && python3 setup.py install --root=/
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack
new file mode 100644 (file)
index 0000000..1d9280a
--- /dev/null
+++ b/lfs/python3-msgpack
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.5.6
+
+THISAPP    = msgpack-python-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python3-msgpack
+PAK_VER    = 1
+
+DEPS       = "python3"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6d644c06a87a5a111bbbf5b34b4be440
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python3 setup.py build
+       cd $(DIR_APP) && python3 setup.py install --root=/
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools
new file mode 100644 (file)
index 0000000..5791452
--- /dev/null
+++ b/lfs/python3-setuptools
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 40.6.3
+
+THISAPP    = setuptools-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python3-setuptools
+PAK_VER    = 1
+
+DEPS       = "python3"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 425b58efe131537abde25c1b5624527a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -e '/tag_build = .post/d' -e '/tag_date = 1/d' -i setup.cfg
+       cd $(DIR_APP) && python3 bootstrap.py
+       cd $(DIR_APP) && python3 setup.py build
+       cd $(DIR_APP) && python3 setup.py install --root=/
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/python3-setuptools-scm b/lfs/python3-setuptools-scm
new file mode 100644 (file)
index 0000000..41f653b
--- /dev/null
+++ b/lfs/python3-setuptools-scm
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.2.0
+
+THISAPP    = setuptools_scm-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python3-setuptools-scm
+PAK_VER    = 1
+
+DEPS       = "python3"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 178e4e7b14c163e0e77ae7ec6684cc0f
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python3 setup.py build
+       cd $(DIR_APP) && python3 setup.py install --root=/
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/tor b/lfs/tor
index 2c3940638cebd425162afcf917cb820ec2c0f21c..e1027c131671f155817e91491ce7bbb38edd63da 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.3.4.9
+VER        = 0.3.5.7
 
 THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 31
+PAK_VER    = 32
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8a303c7c2491cd27b1646f6efdc4a5d0
+$(DL_FILE)_MD5 = 8076f11045b5a94fd4ef0a0114b845f6
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 2df9f649d23e63741559ed33c3ecac50421de699..70fc430f335000315d2007509bcd982559473fa9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1502,6 +1502,8 @@ buildipfire() {
   lfsmake2 python-progressbar
   lfsmake2 python-xattr
   lfsmake2 ddns
+  lfsmake2 python3-setuptools
+  lfsmake2 python3-setuptools-scm
   lfsmake2 python3-six
   lfsmake2 python3-dateutil
   lfsmake2 python3-jmespath
@@ -1512,6 +1514,8 @@ buildipfire() {
   lfsmake2 python3-rsa
   lfsmake2 python3-pyasn1
   lfsmake2 python3-botocore
+  lfsmake2 python3-llfuse
+  lfsmake2 python3-msgpack
   lfsmake2 aws-cli
   lfsmake2 transmission
   lfsmake2 dpfhack
@@ -1585,6 +1589,7 @@ buildipfire() {
   lfsmake2 nss-myhostname
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
+  lfsmake2 borgbackup
 }
 
 buildinstaller() {
diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index a4fcee2ce10ccfa2f3d2251c051b2477e05a8fba..f738757d7a500cef1d6a49a9705094593238ee44 100644 (file)
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -300,7 +300,7 @@ iptables_init() {
        iptables -N OVPNINPUT
        iptables -A INPUT -j OVPNINPUT
 
-       # TOR
+       # Tor
        iptables -N TOR_INPUT
        iptables -A INPUT -j TOR_INPUT
        
@@ -420,15 +420,6 @@ iptables_red_up() {
                iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i $DEVICE -j ACCEPT
        fi
 
-       # Orange pinholes
-       if [ "$ORANGE_DEV" != "" ]; then
-               # This rule enables a host on ORANGE network to connect to the outside
-               # (only if we have a red connection)
-               if [ "$IFACE" != "" ]; then
-                       iptables -A REDFORWARD -i $ORANGE_DEV -o $IFACE -j ACCEPT
-               fi
-       fi
-
        if [ "$IFACE" != "" -a -f /var/ipfire/red/active ]; then
                # DHCP
                if [ "$RED_DEV" != "" -a "$RED_TYPE" == "DHCP" ]; then
@@ -476,7 +467,7 @@ iptables_red_up() {
 
 iptables_red_down() {
        # Prohibit packets to reach the masquerading rule
-       # while the wan interface is down - this is required to
+       # while the WAN interface is down - this is required to
        # circumvent udp related NAT issues
        # http://forum.ipfire.org/index.php?topic=11127.0
        if [ -n "${IFACE}" ]; then
Peter's tree of IPFire 2.x