From becee3b772027e8fe8bf92869f39de5e16aeb012 Mon Sep 17 00:00:00 2001 From: Jakub Onderka Date: Fri, 6 Sep 2019 21:32:49 +0200 Subject: [PATCH] chg: Install crypt_gpg by composer --- .gitmodules | 6 ------ .travis.yml | 2 +- INSTALL/INSTALL.sh | 9 --------- INSTALL/INSTALL.sh.sha1 | 2 +- INSTALL/INSTALL.sh.sha256 | 2 +- INSTALL/INSTALL.sh.sha384 | 2 +- INSTALL/INSTALL.sh.sha512 | 2 +- INSTALL/ansible/roles/misp/tasks/main.yml | 20 -------------------- INSTALL/dependencies/Console_CommandLine | 1 - INSTALL/dependencies/Crypt_GPG | 1 - app/composer.json | 3 ++- docs/INSTALL.rhel7.md | 5 ----- docs/INSTALL.rhel8.md | 7 +------ docs/INSTALL.ubuntu1804.md | 5 ----- docs/generic/supportFunctions.md | 2 -- docs/xINSTALL.centos6.md | 5 ----- docs/xINSTALL.centos7.md | 5 ----- docs/xINSTALL.debian10.md | 4 ---- docs/xINSTALL.debian9.md | 4 ---- docs/xINSTALL.tsurugi.md | 2 -- 20 files changed, 8 insertions(+), 81 deletions(-) delete mode 160000 INSTALL/dependencies/Console_CommandLine delete mode 160000 INSTALL/dependencies/Crypt_GPG diff --git a/.gitmodules b/.gitmodules index fcfb3688b..4033ceb5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,12 +37,6 @@ path = Plugin/DebugKit url = https://github.com/cakephp/debug_kit.git branch = 2.2 -[submodule "INSTALL/Crypt_GPG"] - path = INSTALL/dependencies/Crypt_GPG - url = https://github.com/pear/Crypt_GPG -[submodule "INSTALL/Console_CommandLine"] - path = INSTALL/dependencies/Console_CommandLine - url = https://github.com/pear/Console_CommandLine [submodule "INSTALL/dependencies/Net_GeoIP"] path = INSTALL/dependencies/Net_GeoIP url = https://github.com/pear/Net_GeoIP diff --git a/.travis.yml b/.travis.yml index 28bae8234..dcbcb9f4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: - sudo apt-get -y update # Travis lacks entropy. - sudo apt-get -y install haveged - - sudo apt-get -y install python3 python3-pip python3-dev python3-nose libxml2-dev libzmq3-dev zlib1g-dev apache2 curl php-mysql php-dev php-cli libapache2-mod-php libfuzzy-dev php-mbstring libonig4 php-json php-xml php-opcache php-readline php-pear php-redis php-gnupg php-gd + - sudo apt-get -y install python3 python3-pip python3-dev python3-nose libxml2-dev libzmq3-dev zlib1g-dev apache2 curl php-mysql php-dev php-cli libapache2-mod-php libfuzzy-dev php-mbstring libonig4 php-json php-xml php-opcache php-readline php-redis php-gnupg php-gd - sudo apt-get -y dist-upgrade - sudo pip3 install --upgrade pip setuptools requests pyzmq - sudo pip3 install --upgrade -r requirements.txt diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh index 8e334e508..d9ddafc4f 100644 --- a/INSTALL/INSTALL.sh +++ b/INSTALL/INSTALL.sh @@ -763,7 +763,6 @@ installDepsPhp70 () { php php-cli \ php-dev \ php-json php-xml php-mysql php-opcache php-readline php-mbstring \ - php-pear \ php-redis php-gnupg \ php-gd @@ -785,7 +784,6 @@ installDepsPhp73 () { php7.3 php7.3-cli \ php7.3-dev \ php7.3-json php7.3-xml php7.3-mysql php7.3-opcache php7.3-readline php7.3-mbstring \ - php-pear \ php-redis php-gnupg \ php-gd } @@ -1137,7 +1135,6 @@ installDepsPhp73 () { php7.3 php7.3-cli \ php7.3-dev \ php7.3-json php7.3-xml php7.3-mysql php7.3-opcache php7.3-readline php7.3-mbstring \ - php-pear \ php-redis php-gnupg \ php-gd } @@ -1153,7 +1150,6 @@ installDepsPhp72 () { php php-cli \ php-dev \ php-json php-xml php-mysql php7.2-opcache php-readline php-mbstring \ - php-pear \ php-redis php-gnupg \ php-gd @@ -1174,7 +1170,6 @@ installDepsPhp70 () { php php-cli \ php-dev \ php-json php-xml php-mysql php-opcache php-readline php-mbstring \ - php-pear \ php-redis php-gnupg \ php-gd @@ -1324,10 +1319,6 @@ installCore () { # install plyara $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara - - # Install Crypt_GPG and Console_CommandLine - sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml - sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml } installCake () { diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1 index 8e3690848..b5e4192e3 100644 --- a/INSTALL/INSTALL.sh.sha1 +++ b/INSTALL/INSTALL.sh.sha1 @@ -1 +1 @@ -75d9de9742ccb2383d044f6a19fed73ea2909f9d INSTALL.sh +6f5260ea0b7af730f4b94007e5046f661e3c2585 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256 index 383df84c6..b146d4980 100644 --- a/INSTALL/INSTALL.sh.sha256 +++ b/INSTALL/INSTALL.sh.sha256 @@ -1 +1 @@ -c5f790fc1c13af0b95490cc2136324b9dd9930af1b4c0afb6da4687b47c58e23 INSTALL.sh +babd4491825edd02153d7d09624f1668c452ee14279872f367c5729dd51171bc INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384 index 8d959efb6..875836e37 100644 --- a/INSTALL/INSTALL.sh.sha384 +++ b/INSTALL/INSTALL.sh.sha384 @@ -1 +1 @@ -5c2aaba9cafc88f5f81dafa7717e95daaec671ddd9aa32ed2ce0daf7654c2a11eab59271802590566f1cdd285a485673 INSTALL.sh +0cf66499a027baaf5b52aba19270a7f6e5fbc7d99df225a9049bf9c35c35f9c4316a59ef92ec544ef2f23eea416897b0 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512 index 4b032f6dc..36612fe4b 100644 --- a/INSTALL/INSTALL.sh.sha512 +++ b/INSTALL/INSTALL.sh.sha512 @@ -1 +1 @@ -dcb06c97ca3d4528b41c81f9d6933de235260e5fcfcc28c5fdd2fb19a287b421e492c3ae5ab3896ee3119309f7539be4b1a03422510721dae3f20d07ec2cc415 INSTALL.sh +cfc7e4b1749ad8ed2d75fd3e7d984bb48ab253559c4a37318568dfc175fad40612a05bb59d3672dc3de88b651bd18e8b959457c4ae9c72eff2c0a7418e51fce8 INSTALL.sh diff --git a/INSTALL/ansible/roles/misp/tasks/main.yml b/INSTALL/ansible/roles/misp/tasks/main.yml index b6114e62e..c8540b7e2 100644 --- a/INSTALL/ansible/roles/misp/tasks/main.yml +++ b/INSTALL/ansible/roles/misp/tasks/main.yml @@ -74,26 +74,6 @@ - "/opt/misp-server/tmp" - "/opt/misp-server/backup" -######### PEAR: CRYPTPGP ######### -- name: Configure PEAR proxy - shell: "{{ item }}" - args: - creates: /home/misp/ansible/ansible_shell_pear_configure_proxy.log - with_items: - - "pear config-set http_proxy http://{{proxy_host}}:{{proxy_port}} > /home/misp/ansible/ansible_shell_pear_configure_proxy.log" - -- name: Configure PEAR tmp - shell: "{{ item }}" - args: - creates: /home/misp/ansible/ansible_shell_pear_configure_tmp.log - with_items: - - pear config-set temp_dir /opt/misp-server/tmp/ > /home/misp/ansible/ansible_shell_pear_configure_tmp.log - -- name: Install CryptGPG - pear: - name: Crypt_GPG - state: present - ######### MISP REPOSITORY ######### - name: Clone MISP repository diff --git a/INSTALL/dependencies/Console_CommandLine b/INSTALL/dependencies/Console_CommandLine deleted file mode 160000 index 40fca1d3d..000000000 --- a/INSTALL/dependencies/Console_CommandLine +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 40fca1d3dabbbb23e13b333bd5c615ca19d7d73f diff --git a/INSTALL/dependencies/Crypt_GPG b/INSTALL/dependencies/Crypt_GPG deleted file mode 160000 index bf07ab512..000000000 --- a/INSTALL/dependencies/Crypt_GPG +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bf07ab51207446ed33ea0075083df9bbc2358617 diff --git a/app/composer.json b/app/composer.json index 281858edc..4f88ca3cf 100644 --- a/app/composer.json +++ b/app/composer.json @@ -2,7 +2,8 @@ "prefer-stable": true, "minimum-stability": "dev", "require": { - "kamisama/cake-resque": "4.1.2" + "kamisama/cake-resque": "4.1.2", + "pear/crypt_gpg": "1.6.3" }, "suggest": { "elasticsearch/elasticsearch": "For logging to elasticsearch", diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md index 2d6748c85..cddb771ed 100644 --- a/docs/INSTALL.rhel7.md +++ b/docs/INSTALL.rhel7.md @@ -216,11 +216,6 @@ installCoreRHEL () { # Make git ignore filesystem permission differences $SUDO_WWW git config core.filemode false - # Install packaged pears - sudo $RUN_PHP -- pear channel-update pear.php.net - sudo $RUN_PHP -- pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml - sudo $RUN_PHP -- pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml - # Create a python3 virtualenv $SUDO_WWW $RUN_PYTHON -- virtualenv -p python3 $PATH_TO_MISP/venv sudo mkdir /usr/share/httpd/.cache diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md index d8b9300f7..4c5688954 100644 --- a/docs/INSTALL.rhel8.md +++ b/docs/INSTALL.rhel8.md @@ -142,7 +142,7 @@ yumInstallCoreDeps () { sudo systemctl enable --now redis.service PHP_INI=/etc/php.ini - sudo yum install php php-fpm php-devel php-pear \ + sudo yum install php php-fpm php-devel \ php-mysqlnd \ php-mbstring \ php-xml \ @@ -200,11 +200,6 @@ installCoreRHEL () { # Make git ignore filesystem permission differences $SUDO_WWW git config core.filemode false - # Install packaged pears - sudo $RUN_PHP -- pear channel-update pear.php.net - sudo $RUN_PHP -- pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml - sudo $RUN_PHP -- pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml - # Create a python3 virtualenv $SUDO_WWW virtualenv-3 -p python3 $PATH_TO_MISP/venv sudo mkdir /usr/share/httpd/.cache diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md index 0ce54a6e2..3a7d74e2e 100644 --- a/docs/INSTALL.ubuntu1804.md +++ b/docs/INSTALL.ubuntu1804.md @@ -116,7 +116,6 @@ installDepsPhp72 () { php php-cli \ php-dev \ php-json php-xml php-mysql php7.2-opcache php-readline php-mbstring \ - php-pear \ php-redis php-gnupg \ php-gd @@ -190,10 +189,6 @@ installCore () { # install plyara $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara - - # Install Crypt_GPG and Console_CommandLine - sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml - sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml } # ``` diff --git a/docs/generic/supportFunctions.md b/docs/generic/supportFunctions.md index e357ff502..58ec305c7 100644 --- a/docs/generic/supportFunctions.md +++ b/docs/generic/supportFunctions.md @@ -605,7 +605,6 @@ installDepsPhp70 () { php php-cli \ php-dev \ php-json php-xml php-mysql php-opcache php-readline php-mbstring \ - php-pear \ php-redis php-gnupg \ php-gd @@ -629,7 +628,6 @@ installDepsPhp73 () { php7.3 php7.3-cli \ php7.3-dev \ php7.3-json php7.3-xml php7.3-mysql php7.3-opcache php7.3-readline php7.3-mbstring \ - php-pear \ php-redis php-gnupg \ php-gd } diff --git a/docs/xINSTALL.centos6.md b/docs/xINSTALL.centos6.md index 7a983ecb8..d8343647e 100644 --- a/docs/xINSTALL.centos6.md +++ b/docs/xINSTALL.centos6.md @@ -145,11 +145,6 @@ $SUDO_WWW git submodule update --init --recursive # Make git ignore filesystem permission differences for submodules $SUDO_WWW git submodule foreach --recursive git config core.filemode false -# Install packaged pears -sudo $RUN_PHP "pear channel-update pear.php.net" -sudo $RUN_PHP "pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml" -sudo $RUN_PHP "pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml" - # Create a python3 virtualenv $SUDO_WWW $RUN_PYTHON "virtualenv -p python3 $PATH_TO_MISP/venv" sudo mkdir /var/www/.cache diff --git a/docs/xINSTALL.centos7.md b/docs/xINSTALL.centos7.md index 4a131d549..eea9600b0 100644 --- a/docs/xINSTALL.centos7.md +++ b/docs/xINSTALL.centos7.md @@ -137,11 +137,6 @@ $SUDO_WWW git submodule foreach --recursive git config core.filemode false # Make git ignore filesystem permission differences $SUDO_WWW git config core.filemode false -# Install packaged pears -sudo $RUN_PHP "pear channel-update pear.php.net" -sudo $RUN_PHP "pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml" -sudo $RUN_PHP "pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml" - # Create a python3 virtualenv $SUDO_WWW $RUN_PYTHON "virtualenv -p python3 $PATH_TO_MISP/venv" sudo mkdir /usr/share/httpd/.cache diff --git a/docs/xINSTALL.debian10.md b/docs/xINSTALL.debian10.md index 6f0f5f7d3..2f3f99531 100644 --- a/docs/xINSTALL.debian10.md +++ b/docs/xINSTALL.debian10.md @@ -180,10 +180,6 @@ $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic # install plyara $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara - -# Install Crypt_GPG and Console_CommandLine -sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml -sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml ``` ### 4/ CakePHP diff --git a/docs/xINSTALL.debian9.md b/docs/xINSTALL.debian9.md index 18f938aa0..c1f4743d0 100644 --- a/docs/xINSTALL.debian9.md +++ b/docs/xINSTALL.debian9.md @@ -205,10 +205,6 @@ $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic # install plyara $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara - -# Install Crypt_GPG and Console_CommandLine -sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml -sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml ``` ### 4/ CakePHP diff --git a/docs/xINSTALL.tsurugi.md b/docs/xINSTALL.tsurugi.md index a91618ed5..bb87dc6ec 100644 --- a/docs/xINSTALL.tsurugi.md +++ b/docs/xINSTALL.tsurugi.md @@ -172,8 +172,6 @@ function installMISPonTsurugi() { a2dissite 000-default a2ensite default-ssl - pear channel-update pear.php.net - pear install Crypt_GPG pecl channel-update pecl.php.net yes '' |pecl install redis