From 9a4594fd82717c91b3a195a33f8b8607c0e08353 Mon Sep 17 00:00:00 2001 From: Guillaume Barbe Date: Mon, 7 Dec 2015 13:24:32 -0500 Subject: [PATCH 1/4] Added support for .co, which has the same layout as .cc --- bureau/class/m_dom.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php index 712692cc..d7ed3ff5 100644 --- a/bureau/class/m_dom.php +++ b/bureau/class/m_dom.php @@ -987,6 +987,14 @@ class m_dom { } } break; + case "co": + if (preg_match("#Name Server:#", $ligne)) { + $found = true; + $tmp = strtolower(str_replace(chr(10), "", str_replace(chr(13), "", str_replace(" ", "", str_replace("Name Server:", "", $ligne))))); + if ($tmp) + $serveurList[] = $tmp; + } + break; case "cx": $ligne = str_replace(chr(10), "", str_replace(chr(13), "", str_replace(" ", "", $ligne))); if ($ligne == "" && $state == 1) { From 76895cf5fe1fd936cbfba9728acd70a529bd6deb Mon Sep 17 00:00:00 2001 From: asso-infini Date: Mon, 15 Feb 2016 21:16:22 +0100 Subject: [PATCH 2/4] Update m_bro.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gestion des archives dont l'extension est .bz, .bz2, .Z, .tgz, tbz ou tbz2 Si on a réussi à traiter l'archive, on n'essaye pas de la traiter une nouvelle fois. Dans le cas de l'utilisation de la commande tar, on utilise plutôt les id proprietaire et groupe des fichiers plutot que le nom des proprietaires et groupes des fichiers avec l'option --numeric-owner --- bureau/class/m_bro.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php index 030809db..56210142 100644 --- a/bureau/class/m_bro.php +++ b/bureau/class/m_bro.php @@ -659,23 +659,28 @@ class m_bro { return 1; } $lfile = strtolower($file); - if (substr($lfile, -4) == ".tar" || substr($lfile, -8) == ".tar.bz2" || substr($lfile, -7) == ".tar.gz" || substr($lfile, -6) == ".tar.z") { + if (substr($lfile, -4) == ".tar" || substr($lfile, -8) == ".tar.bz2" || substr($lfile, -7) == ".tar.gz" || substr($lfile, -6) == ".tar.z" || substr($lfile, -4) == ".tgz" || substr($lfile, -4) == ".tbz" || substr($lfile, -5) == ".tbz2" ) { // TODO new version of tar supports `tar xf ...` so there is no // need to specify the compression format echo "

" . _("Uncompressing through TAR") . "

";
             $ret = 0;
-            passthru("tar -xvf " . escapeshellarg($file) . " -C " . escapeshellarg($dest) . " 2>&1", $ret);
+            passthru("tar -xvf " . escapeshellarg($file) . " --numeric-owner -C " . escapeshellarg($dest) . " 2>&1", $ret);
         }
-        if (substr($lfile, -4) == ".zip") {
+        elseif (substr($lfile, -4) == ".zip") {
             echo "
" . _("Uncompressing through UNZIP") . "
";
             $cmd = "unzip -o " . escapeshellarg($file) . " -d " . escapeshellarg($dest) . " 2>&1";
             passthru($cmd, $ret);
         }
-        if (substr($lfile, -3) == ".gz" && substr($lfile, -7) != ".tar.gz") {
+        elseif (substr($lfile, -3) == ".gz" || substr($lfile, -2) == ".Z") {
             echo "
" . _("Uncompressing through GUNZIP") . "
";
             $cmd = "gunzip " . escapeshellarg($file) . " 2>&1";
             passthru($cmd, $ret);
         }
+        elseif (substr($lfile, -3) == ".bz" || substr($lfile, -4) == ".bz2") {
+            echo "
" . _("Uncompressing through bunzip2") . "
";
+            $cmd = "bunzip2 " . escapeshellarg($file) . " 2>&1";
+            passthru($cmd, $ret);
+        }
         echo "
";
         if ($ret) {
             $err->raise("bro", _("I cannot find a way to extract the file %s, it is an unsupported compressed format"), $file);

From dd468785e5796cf2259192ec80d5fe818c4bb609 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag 
Date: Wed, 24 Feb 2016 16:15:00 +0100
Subject: [PATCH 3/4] adding TLD cc + co

---
 install/upgrades/3.4.4.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 install/upgrades/3.4.4.sql

diff --git a/install/upgrades/3.4.4.sql b/install/upgrades/3.4.4.sql
new file mode 100644
index 00000000..ae509f4b
--- /dev/null
+++ b/install/upgrades/3.4.4.sql
@@ -0,0 +1,3 @@
+
+INSERT IGNORE INTO tld VALUES ('co', 1);
+INSERT IGNORE INTO tld VALUES ('cc', 1);

From 72c02478091edff8707ae128b606b798b6d68e19 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag 
Date: Wed, 24 Feb 2016 16:15:16 +0100
Subject: [PATCH 4/4] adding proper TLS configuration for Postfix (in and out)

---
 etc/alternc/templates/alternc/postfix/postfix.cf | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/etc/alternc/templates/alternc/postfix/postfix.cf b/etc/alternc/templates/alternc/postfix/postfix.cf
index 857fe844..2e246818 100644
--- a/etc/alternc/templates/alternc/postfix/postfix.cf
+++ b/etc/alternc/templates/alternc/postfix/postfix.cf
@@ -55,3 +55,19 @@ message_size_limit = 100000000
 virtual_mailbox_limit = 0
 mailbox_size_limit = 0
 enable_original_recipient = no
+smtp_tls_dcert_file = $smtpd_tls_dcert_file
+smtp_tls_dkey_file = $smtpd_tls_dcert_file
+smtp_tls_CAfile = $smtpd_tls_CAfile
+smtp_tls_key_file = $smtpd_tls_dcert_file
+smtp_tls_cert_file = $smtpd_tls_dcert_file
+smtp_use_tls = yes
+smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
+smtpd_tls_protocols = TLSv1, TLSv1.1, TLSv1.2
+smtp_tls_protocols = TLSv1, TLSv1.1, TLSv1.2
+smtpd_tls_exclude_ciphers = aNULL, DES, 3DES, MD5, DES+MD5, RC4
+smtp_tls_exclude_ciphers = aNULL, DES, 3DES, MD5, DES+MD5, RC4                                                                                            
+tls_preempt_cipherlist      = yes
+smtpd_tls_mandatory_ciphers = high
+smtp_tls_mandatory_ciphers = high
+smtpd_tls_ciphers           = high
+smtp_tls_ciphers           = high