Remove deprecated functionality.

Changelog excerpt:
- Remove deprecated functionality (automatically downloading the main.cvd
  and/or daily.cvd files, internal self-update functionality; for the
  former, just download these files manually; for the latter, just use
  Composer instead).

Author: Maikuolan

Changelog.txt

@@ -7,7 +7,10 @@ Versioning guidelines for SemVer can be found at: https://semver.org/
 
 === Changes made since last versioned release ===
 
-None.
+- [2021.07.22; Maikuolan]: Remove deprecated functionality (automatically
+  downloading the main.cvd and/or daily.cvd files, internal self-update
+  functionality; for the former, just download these files manually; for the
+  latter, just use Composer instead).
 
 === Version/Release 1.0.3 ===
 PATCH RELEASE.
@@ -18,7 +21,7 @@ PATCH RELEASE.
 - [2021.07.21; Maikuolan]: SigTool now displays current RAM usage throughout
   its entire process.
 
-- [2021.07.22; Maikuolan]: Update requirements and installation instructions.
+- [2021.07.22; Maikuolan]: Updated requirements and installation instructions.
 
 Caleb M (Maikuolan),
 July 22, 2021.

SigTool.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * SigTool v1.0.3 (last modified: 2021.07.21).
+ * SigTool v2.0.0 (last modified: 2021.07.22).
  *
  * Generates signatures for phpMussel using main.cvd and daily.cvd from ClamAV.
  *
@@ -18,12 +18,12 @@ class SigTool extends \Maikuolan\Common\YAML
     /**
      * @var string Script version.
      */
-    public $Ver = '1.0.3';
+    public $Ver = '2.0.0';
 
     /**
      * @var string Last modified date.
      */
-    public $Modified = '2021.07.21';
+    public $Modified = '2021.07.22';
 
     /**
      * @var string Script user agent.
@@ -86,44 +86,6 @@ public function setRaw(string $Raw)
         $this->Raw = $Raw;
     }
 
-    /**
-     * Use cURL to fetch files.
-     *
-     * @param string $URI The resource to fetch.
-     * @param int $Timeout An optional timeout.
-     * @return string The cURL response (the fetched resource).
-     */
-    public function fetch($URI, $Timeout = 600)
-    {
-        /** Initialise the cURL session. */
-        $Request = curl_init($URI);
-
-        $LCURI = strtolower($URI);
-        $SSL = (substr($LCURI, 0, 6) === 'https:');
-
-        curl_setopt($Request, CURLOPT_FRESH_CONNECT, true);
-        curl_setopt($Request, CURLOPT_HEADER, false);
-        curl_setopt($Request, CURLOPT_POST, false);
-        if ($SSL) {
-            curl_setopt($Request, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
-            curl_setopt($Request, CURLOPT_SSL_VERIFYPEER, false);
-        }
-        curl_setopt($Request, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($Request, CURLOPT_MAXREDIRS, 1);
-        curl_setopt($Request, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($Request, CURLOPT_TIMEOUT, $Timeout);
-        curl_setopt($Request, CURLOPT_USERAGENT, $this->UA);
-
-        /** Execute and get the response. */
-        $Response = curl_exec($Request);
-
-        /** Close the cURL session. */
-        curl_close($Request);
-
-        /** Return the results of the request. */
-        return $Response;
-    }
-
     /**
      * Apply shorthand to signature names and remove any unwanted lines.
      *
@@ -325,36 +287,28 @@ private function formatSize($Size)
         " Arguments (all are OFF by default; include to turn ON):\n" .
         "  - No arguments: Display this help information.\n" .
         "  - x: Extract signature files from \"daily.cvd\" and \"main.cvd\".\n" .
-        "  - p: Process signature files for use with phpMussel.\n" .
-        "  - m: Download main.cvd before processing (deprecated).\n" .
-        "  - d: Download daily.cvd before processing (deprecated).\n" .
-        "  - u: Update SigTool (redownloads SigTool's files and dies;\n" .
-        "       doesn't perform any checks).\n\n"
+        "  - p: Process signature files for use with phpMussel.\n\n"
     ),
     'Accessing' => ' Accessing %s ...',
     'Decompressing' => ' Decompressing %s ...',
     'Deleting' => ' Deleting %s ...',
     'Done' => " Done!",
-    'Downloading' => ' Downloading %s ...',
     'Extracting_to_Cvd' => ' Extracting contents from %s to Cvd object ...',
     'Failed' => " Failed!",
     'Processing' => ' Processing ...',
-    'Sorting' => ' Sorting %s ...',
     'Writing' => ' Writing %s ...',
-    '_Error0' => ' Error at line "%d"! SigTool terminated.',
-    '_Error1' => ' Writing to "%2$s" failed at line "%1$d"! SigTool terminated.',
-    '_Error2' => ' Reading from "%2$s" failed at line "%1$d"! SigTool terminated.',
-    '_Error3' => ' Fetching "%2$s" from the upstream failed at line "%1$d"! SigTool terminated.',
-    '_Error4' => ' Fetching "%2$s" blocked by upstream firewall at line "%1$d"! SigTool terminated.',
-    '_Error5' => ' Reading "%2$s" failed at line "%1$d"! "%2$s" could be corrupted! SigTool terminated.'
+    '_Error_Corrupted' => ' Reading "%2$s" failed at line "%1$d"! "%2$s" could be corrupted! SigTool terminated.',
+    '_Error_Other' => ' Error at line "%d"! SigTool terminated.',
+    '_Error_Reading' => ' Reading from "%2$s" failed at line "%1$d"! SigTool terminated.',
+    '_Error_Writing' => ' Writing to "%2$s" failed at line "%1$d"! SigTool terminated.'
 ];
 
 /**
  * Terminate with debug information.
  */
-$Terminate = function ($Err = '_Error0', $Msg = '') use (&$SigTool, &$L10N) {
+$Terminate = function ($Err = '_Error_Other', $Msg = '') use (&$SigTool, &$L10N) {
     $Debug = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
-    $SigTool->outputMessage(sprintf($L10N[$Err] ?? $L10N['_Error0'], $Debug['line'], $Msg), true);
+    $SigTool->outputMessage(sprintf($L10N[$Err] ?? $L10N['_Error_Other'], $Debug['line'], $Msg), true);
     echo "\n\n";
     die;
 };
@@ -373,94 +327,23 @@ private function formatSize($Size)
 date_default_timezone_set('Europe/Zurich');
 
 /**
- * Updating SigTool.
- */
-if (strpos($RunMode, 'u') !== false) {
-    foreach (['SigTool.php', 'YAML.php', 'Cvd.php'] as $File) {
-        $SigTool->outputMessage(sprintf($L10N['Downloading'], $File), true);
-        try {
-            $Data = $SigTool->fetch('https://raw.githubusercontent.com/phpMussel/SigTool/master/' . $File);
-        } catch (\Exception $e) {
-            $Terminate('_Error3', $File);
-        }
-        $SigTool->outputMessage(sprintf($L10N['Downloading'], $File) . $L10N['Done']);
-        $SigTool->outputMessage(sprintf($L10N['Writing'], $File), true);
-        if (!file_put_contents($SigTool->fixPath(__DIR__ . '/' . $File), $Data)) {
-            $Terminate('_Error1', $File);
-        }
-        $SigTool->outputMessage(sprintf($L10N['Writing'], $File) . $L10N['Done']);
-    }
-    die;
-}
-
-/**
- * @deprecated
- * Phase 1: Download main.cvd.
- */
-if (strpos($RunMode, 'm') !== false) {
-    echo sprintf($L10N['Downloading'], 'main.cvd');
-    try {
-        $Data = $SigTool->fetch('http://database.clamav.net/main.cvd');
-    } catch (\Exception $e) {
-        $Terminate('_Error3', 'main.cvd');
-    }
-    if ($Data === '') {
-        $Terminate('_Error3', 'main.cvd');
-    }
-    if ($Data === 'error code: 1020') {
-        $Terminate('_Error4', 'main.cvd');
-    }
-    echo $L10N['Done'] . sprintf($L10N['Writing'], 'main.cvd');
-    if (!file_put_contents($SigTool->fixPath(__DIR__ . '/main.cvd'), $Data)) {
-        $Terminate('_Error1', 'main.cvd');
-    }
-    echo $L10N['Done'];
-    unset($Data);
-}
-
-/**
- * @deprecated
- * Phase 2: Download daily.cvd.
- */
-if (strpos($RunMode, 'd') !== false) {
-    echo sprintf($L10N['Downloading'], 'daily.cvd');
-    try {
-        $Data = $SigTool->fetch('http://database.clamav.net/daily.cvd');
-    } catch (\Exception $e) {
-        $Terminate('_Error3', 'daily.cvd');
-    }
-    if ($Data === '') {
-        $Terminate('_Error3', 'daily.cvd');
-    }
-    if ($Data === 'error code: 1020') {
-        $Terminate('_Error4', 'daily.cvd');
-    }
-    echo $L10N['Done'] . sprintf($L10N['Writing'], 'daily.cvd');
-    if (!file_put_contents($SigTool->fixPath(__DIR__ . '/daily.cvd'), $Data)) {
-        $Terminate('_Error1', 'daily.cvd');
-    }
-    echo $L10N['Done'];
-    unset($Data);
-}
-
-/**
- * Phase 3: Extract ClamAV signature files from "daily.cvd" and "main.cvd" packages.
+ * Extract ClamAV signature files from "daily.cvd" and "main.cvd" packages.
  */
 if (strpos($RunMode, 'x') !== false) {
     foreach (['daily.cvd', 'main.cvd'] as $Set) {
         $File = $SigTool->fixPath(__DIR__ . '/' . $Set);
 
         /** Terminate if the file is missing or unreadable. */
         if (!file_exists($File) || !is_readable($File)) {
-            $Terminate('_Error2', $Set);
+            $Terminate('_Error_Reading', $Set);
         }
 
         $SigTool->outputMessage(sprintf($L10N['Decompressing'], $Set), true);
         $Files = new Cvd($File);
         $SigTool->outputMessage(sprintf($L10N['Decompressing'], $Set) . $L10N['Done']);
         $SigTool->outputMessage(sprintf($L10N['Extracting_to_Cvd'], $Set), true);
         if ($Files->ErrorState !== 0) {
-            $Terminate('_Error5', $File);
+            $Terminate('_Error_Corrupted', $File);
         }
         $SigTool->outputMessage(sprintf($L10N['Extracting_to_Cvd'], $Set) . $L10N['Done']);
         while (true) {
@@ -470,7 +353,7 @@ private function formatSize($Size)
                 $SigTool->outputMessage(sprintf($L10N['Writing'], $Name), true);
                 $Handle = fopen($SigTool->fixPath(__DIR__ . '/' . $Name), 'wb');
                 if (!is_resource($Handle)) {
-                    $Terminate('_Error1', $Name);
+                    $Terminate('_Error_Writing', $Name);
                 }
                 fwrite($Handle, $Data);
                 fclose($Handle);
@@ -487,7 +370,7 @@ private function formatSize($Size)
 }
 
 /**
- * Phase 4: Process signature files for use with phpMussel.
+ * Process signature files for use with phpMussel.
  */
 if (strpos($RunMode, 'p') !== false) {
     /** Check if signatures.dat exists; If so, we'll read it for updating. */
@@ -605,13 +488,13 @@ private function formatSize($Size)
 
             /** Write to file. */
             if (!is_resource($Handle = fopen($SigTool->fixPath(__DIR__ . '/' . $Set[4]), 'wb'))) {
-                $Terminate('_Error1', $Set[4] . '.gz');
+                $Terminate('_Error_Writing', $Set[4] . '.gz');
             }
             fwrite($Handle, $FileData);
             fclose($Handle);
             if ($Set[5]) {
                 if (!is_resource($Handle = gzopen($SigTool->fixPath(__DIR__ . '/' . $Set[4] . '.gz'), 'wb'))) {
-                    $Terminate('_Error1', $Set[4] . '.gz');
+                    $Terminate('_Error_Writing', $Set[4] . '.gz');
                 }
                 gzwrite($Handle, $FileData);
                 gzclose($Handle);

_docs/readme.de.md

@@ -31,9 +31,6 @@ Möglichen Flaggen:
 - Keine Argumente: Zeigt diese Hilfeinformationen.
 - `x`: Extrahiert Signaturdateien aus "daily.cvd" und "main.cvd".
 - `p`: Verarbeitet Signaturdateien zur Verwendung mit phpMussel.
-- `m`: Holt `main.cvd` vor der Verarbeitung.
-- `d`: Holt `daily.cvd` vor der Verarbeitung.
-- `u`: Aktualisiert SigTool (lädt `SigTool.php` erneut herunter und die; es werden keine Prüfungen durchgeführt).
 
 Die Ausgabe ist verschiedenen phpMussel-Signaturdateien, direkt aus der ClamAV-Signaturdatenbank in zwei Formen generiert:
 - Signaturdateien, die direkt in das `/vault/signatures/`-Verzeichnis eingefügt werden können.

_docs/readme.en.md

@@ -31,9 +31,6 @@ Possible flags:
 - No arguments: Display this help information.
 - `x`: Extract signature files from `daily.cvd` and `main.cvd`.
 - `p`: Process signature files for use with phpMussel.
-- `m`: Download `main.cvd` before processing.
-- `d`: Download `daily.cvd` before processing.
-- `u`: Update SigTool (redownloads `SigTool.php` and dies; no checks performed).
 
 Output produced is various phpMussel signature files generated directly from the ClamAV signatures database, in two forms:
 - Signature files that can be inserted directly into the `/vault/signatures/` directory.

_docs/readme.es.md

@@ -31,9 +31,6 @@ Las posibles banderas:
 - Sin argumentos: Muestra esta información de ayuda.
 - `x`: Extraiga archivos de firmas de `daily.cvd` y `main.cvd`.
 - `p`: Procese archivos de firmas para uso con phpMussel.
-- `m`: Descargue `main.cvd` antes de procesar.
-- `d`: Descargue `daily.cvd` antes de procesar.
-- `u`: Actualizar SigTool (descarga `SigTool.php` de nuevo y die; no se realizan cualquier comprobaciones).
 
 La salida producida es varios archivos de firmas para phpMussel generados directamente de la base de datos de firmas para ClamAV, de dos formas:
 - Archivos de firmas que se pueden insertar directamente en el directorio `/vault/signatures/`.

_docs/readme.fr.md

@@ -31,9 +31,6 @@ Drapeaux possibles :
 - Aucun argument : Affichez ces informations d'aide.
 - `x` : Extrayez les fichiers de signature de `daily.cvd` et` main.cvd`.
 - `p` : Procurez-vous des fichiers de signature à utiliser avec phpMussel.
-- `m` : Télécharger `main.cvd` avant le traitement.
-- `d` : Télécharger `daily.cvd` avant le traitement.
-- `u` : Mettre à jour SigTool (télécharge `SigTool.php` à nouveau et die ; aucun contrôle effectué).
 
 La sortie produite est divers fichiers de signature pour phpMussel, généré directement à partir de la base de données de signature pour ClamAV, sous deux formes :
 - Fichiers de signatures qui peuvent être insérés directement dans le répertoire `/vault/signatures/`.

_docs/readme.id.md

@@ -31,9 +31,6 @@ Bendera yang mungkin:
 - Tidak ada argumen: Tampilkan informasi bantuan ini.
 - `x`: Ekstrak file tanda tangan dari `daily.cvd` dan `main.cvd`.
 - `p`: Proses file tanda tangan untuk digunakan dengan phpMussel.
-- `m`: Download `main.cvd` sebelum diproses.
-- `d`: Download `daily.cvd` sebelum diproses.
-- `u`: Perbarui SigTool (download `SigTool.php` lagi dan die; tidak ada pemeriksaan yang dilakukan).
 
 Output yang dihasilkan adalah berbagai file tanda tangan phpMussel yang dihasilkan langsung dari database tanda tangan ClamAV, dalam dua bentuk:
 - File tanda tangan yang bisa dimasukkan langsung ke direktori `/vault/signatures/`.

_docs/readme.it.md

@@ -31,9 +31,6 @@ Flag possibile:
 - Nessun argomento: Visualizza le informazioni di aiuto.
 - `x`: Estrarre i file di firme da `daily.cvd` e `main.cvd`.
 - `p`: Processare le file di firma per l'utilizzo con phpMussel.
-- `m`: Scaricare `main.cvd` prima di processare.
-- `d`: Scaricare `daily.cvd` prima di processare.
-- `u`: Aggiornare SigTool (scarica nuovamente `SigTool.php` e die; nessun controllo effettuato).
 
 L'output prodotto è vari file di firme per phpMussel generati direttamente dal database di firme per ClamAV, in due forme:
 - File di firme che possono essere inseriti direttamente nella cartella `/vault/signatures/`.

_docs/readme.ja.md

@@ -31,9 +31,6 @@ SigToolをインストールするための推奨される方法は、Composer
 - オプションを指定しないと、このヘルプ情報が表示されます。
 - `x`：`daily.cvd`と`main.cvd`からシグネチャ・ファイルを抽出します。
 - `p`：ｐｈｐＭｕｓｓｅｌで使用するためのシグネチャ・ファイルを処理します。
-- `m`：処理の前に`main.cvd`をダウンロードします。
-- `d`：処理の前に`daily.cvd`をダウンロードします。
-- `u`：ＳｉｇＴｏｏｌをアップデイトします（再度`SigTool.php`をダウンロードして終了します。チェックは実行されません）。
 
 生成される出力は、ＣｌａｍＡＶシグネチャ・データベースから直接生成されたｐｈｐＭｕｓｓｅｌシグネチャ・ファイルです。​２つの形式があります：
 - `/vault/signatures/`ディレクトリに直接挿入できるシグネチャ・ファイル。

_docs/readme.ko.md

@@ -31,9 +31,6 @@ SigTool이 호출되면 도움말 정보가 표시됩니다. SigTool을 사용
 - 옵션을 지정하지 않으면이, 도움말 정보가 표시됩니다.
 - `x` : `daily.cvd` 및 `main.cvd`에서 서명 파일을 추출합니다.
 - `p` : phpMussel과 함께 사용할 시그니처 파일 처리.
-- `m` : 처리하기 전에 `main.cvd`를 다운로드하십시오.
-- `d` : 처리하기 전에 `daily.cvd`를 다운로드하십시오.
-- `u` : SigTool 업데이트 (`SigTool.php`를 다시 다운로드 한 다음 종료하십시오; 아무것도 확인되지 않았다).
 
 생성 된 출력은 ClamAV 서명 데이터베이스에서 직접 생성 된 phpMussel 서명 파일입니다. 두 가지 양식을 사용할 수 있습니다 :
 - `/vault/signatures/` 디렉토리에 삽입 할 수있는 서명 파일.

_docs/readme.nl.md

@@ -31,9 +31,6 @@ Mogelijke vlaggen:
 - Geen argumenten: Laat deze hulpinformatie zien.
 - `x`: Extract signatuurbestanden uit `daily.cvd` en `main.cvd`.
 - `p`: Verwerk signatuurbestanden voor gebruik met phpMussel.
-- `m`: Download `main.cvd` voor verwerking.
-- `d`: Download `daily.cvd` voor verwerking.
-- `u`: Update SigTool (downloadt `SigTool.php` opnieuw en dies; geen controles uitgevoerd).
 
 Output geproduceerd is verschillende phpMussel signatuurbestanden die direct uit de ClamAV signatures database worden gegenereerd, in twee vormen:
 - Signatuurbestanden die direct in de `/vault/signatures/` map kunnen worden ingevoegd.

_docs/readme.pt.md

@@ -31,9 +31,6 @@ Bandeiras possíveis:
 - Sem argumentos: Exiba esta informação de ajuda.
 - `x`: Extraia arquivos de assinatura a partir de `daily.cvd` e` main.cvd`.
 - `p`: Processar arquivos de assinatura para uso com phpMussel.
-- `m`: Baixar `main.cvd` antes do processamento.
-- `d`: Baixar `daily.cvd` antes do processamento.
-- `u`: Atualizar SigTool (baixe `SigTool.php` novamente e die; nenhuma verificação realizada).
 
 Produção produzida são vários arquivos de assinatura para phpMussel gerados diretamente do banco de dados de assinaturas para ClamAV, em duas formas:
 - Arquivos de assinatura que podem ser inseridos diretamente no diretório `/vault/signatures/`.

_docs/readme.ru.md

@@ -31,9 +31,6 @@
 - Без аргументов: Показать эту справочную информацию.
 - `x`: Извлечь файлы сигнатуры из `daily.cvd` и `main.cvd`.
 - `p`: Обрабатывать файлы сигнатур для использования с phpMussel.
-- `m`: Скачайте `main.cvd` перед обработкой.
-- `d`: Скачайте `daily.cvd` перед обработкой.
-- `u`: Обновление SigTool (загрузите `SigTool.php` заново и умирает; проверки не выполняются).
 
 В результате получаются различные файлы сигнатур phpMussel, созданные непосредственно из базы данных сигнатур ClamAV, в двух формах:
 - Файлы сигнатуры, которые можно вставить непосредственно в каталог `/vault/signatures/`.

_docs/readme.vi.md

@@ -31,9 +31,6 @@ Các cờ có sẵn:
 - Không có đối số: Hiển thị thông tin trợ giúp này.
 - `x`: Trích xuất các tập tin chữ ký từ `daily.cvd` và `main.cvd`.
 - `p`: Xử lý các tập tin chữ ký để sử dụng với phpMussel.
-- `m`: Tải xuống `main.cvd` trước khi xử lý.
-- `d`: Tải xuống `daily.cvd` trước khi xử lý.
-- `u`: Cập nhật SigTool (tải xuống `SigTool.php` lại và die; không kiểm tra được thực hiện).
 
 Đầu ra được sản xuất là các tập tin chữ ký phpMussel khác nhau được tạo trực tiếp từ cơ sở dữ liệu chữ ký ClamAV, theo hai hình thức:
 - Chữ ký có thể được chèn trực tiếp vào thư mục `/vault/signatures/`.

_docs/readme.zh-tw.md

@@ -31,9 +31,6 @@
 - 沒有參數：顯示此幫助信息。
 - `x`：從`daily.cvd`和`main.cvd`中提取簽名文件。
 - `p`：處理用於phpMussel的簽名文件。
-- `m`：在處理之前下載`main.cvd`。
-- `d`：在處理之前下載`daily.cvd`。
-- `u`：更新SigTool（重新`SigTool.php`下載然後die；沒有檢查執行）.
 
 產生的產出是各種phpMussel簽名文件直接從ClamAV簽名數據庫生成，有兩種形式：
 - 可以直接插入在`/vault/signatures/`目錄的簽名文件。