diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2021-12-14 23:48:42 +0200 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2021-12-16 16:20:50 +0000 |
| commit | 8a7aff86661fc2ee4824227f2c3171057bcfec91 (patch) | |
| tree | 9b0a158f0c02e570fbd4a32da9598d0cb064c6f2 | |
| parent | 04d4e07ad8bd54fe49fe32c117c47d91f31ae937 (diff) | |
| download | aports-8a7aff86661fc2ee4824227f2c3171057bcfec91.tar.gz aports-8a7aff86661fc2ee4824227f2c3171057bcfec91.tar.bz2 aports-8a7aff86661fc2ee4824227f2c3171057bcfec91.tar.xz | |
community/php7: upgrade to 7.4.27
| -rw-r--r-- | community/php7/APKBUILD | 8 | ||||
| -rw-r--r-- | community/php7/fix-test.patch | 102 |
2 files changed, 107 insertions, 3 deletions
diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD index e24bc09d43..fef376512a 100644 --- a/community/php7/APKBUILD +++ b/community/php7/APKBUILD @@ -25,8 +25,8 @@ pkgname=php7 _pkgreal=php -pkgver=7.4.26 -pkgrel=1 +pkgver=7.4.27 +pkgrel=0 _apiver=20190902 _suffix=${pkgname#php} # Is this package the default (latest) PHP version? @@ -100,6 +100,7 @@ source="https://php.net/distributions/$_pkgreal-$pkgver.tar.xz fix-tests-devserver.patch enchant-2.patch xfail-openssl-1.1-test.patch + fix-test.patch " builddir="$srcdir/$_pkgreal-$pkgver" @@ -685,7 +686,7 @@ _mv() { } sha512sums=" -36cd493c9c95aabb1ee47e82cb0c20b2be99fe7ebd98743355139064590d0b9a1746d71e31dd47f164df34ebe3f8366a75f3efc149262e1391b43d83d3045c6e php-7.4.26.tar.xz +2401f19d738a511c20efdf199fed7a6bdd02b51d91abf68a410f760cf846df87fce4bbf71acdf209926877cf3e8f8f39f045f1f03755862d09491f6ab6c9cfc8 php-7.4.27.tar.xz 1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f php7-fpm.initd cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691 php7-fpm.logrotate 274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198 php7-module.conf @@ -697,4 +698,5 @@ ebf571c5e595221b9944d7e840807ebb68c1be38bf117186e19a3bd1070310ece5918bcaa5f94167 3bfeea79f9acfaa7be5bab85cd3d02713abb569e54024a22bb2c747c06d97f83ac2c63dcd75c7c409426ac03f8bc2ccc01bcd66bc39a767930d32542349123f9 fix-tests-devserver.patch 7c8c3cac9efce81d525cb5a70e1402e393881b83ef4c7b5d39d3565803d21cd283daf3d74e9a8b059ecac66cf339756acc63608ffcb83d960dba86583bd45108 enchant-2.patch 996b9a542858b0385a300265194afc57eddb72b9d7e4dcdf63b4f1ba7d3588e67309030acc73f00af1717168becd50b1d3582fcb88605e9892fd683a33cae023 xfail-openssl-1.1-test.patch +d2b96ccf6939e6fc1cf6159b96dcabcd24c90f6bc2a4dcbe5c1607eb97b4ca7587cd7ca5fb43594fe9032a99799c572dacc9d6857d9985c680fd5ba6b2104e70 fix-test.patch " diff --git a/community/php7/fix-test.patch b/community/php7/fix-test.patch new file mode 100644 index 0000000000..2d890f20c4 --- /dev/null +++ b/community/php7/fix-test.patch @@ -0,0 +1,102 @@ +commit 98175fc7f1623873ceb2e9a017a319d19bfb3912 +Author: Christoph M. Becker <cmbecker69@gmx.de> +Date: Sun Dec 12 13:41:37 2021 +0100 + + Fix openssl_x509_checkpurpose_basic.phpt + + This test fails because san-cert.pem and san-ca.pem have expired. We + fix that by using the CertificateGenerator to generate temporary certs + during the test run. Since san-cert.pem and san-ca.pem have been + identical, we only generate one certificate. + + Closes GH-7763. + +diff --git a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt +index 99b4f0bdff..35629bd936 100644 +--- a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt ++++ b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt +@@ -8,10 +8,14 @@ if (OPENSSL_VERSION_NUMBER < 0x10000000) die("skip Output requires OpenSSL 1.0") + ?> + --FILE-- + <?php ++include 'CertificateGenerator.inc'; ++$certificateGenerator = new CertificateGenerator(); ++$certificateGenerator->saveCaCert(__DIR__ . "/san-cert.pem"); ++ + $cert = "file://" . __DIR__ . "/cert.crt"; + $bert = "file://" . __DIR__ . "/bug41033.pem"; + $sert = "file://" . __DIR__ . "/san-cert.pem"; +-$cpca = __DIR__ . "/san-ca.pem"; ++$cpca = __DIR__ . "/san-cert.pem"; + $utfl = __DIR__ . "/sni_server_uk.pem"; + $rcrt = openssl_x509_read($cert); + +@@ -84,6 +88,10 @@ var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SMIME_ENCRYPT, array($cpc + var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_CRL_SIGN, array($cpca), $utfl)); + var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_ANY, array($cpca), $utfl)); + ?> ++--CLEAN-- ++<?php ++@unlink(__DIR__ . "/san-cert.pem"); ++?> + --EXPECT-- + bool(false) + bool(false) +diff --git a/ext/openssl/tests/san-ca.pem b/ext/openssl/tests/san-ca.pem +deleted file mode 100644 +index 88682ba2dc..0000000000 +--- a/ext/openssl/tests/san-ca.pem ++++ /dev/null +@@ -1,15 +0,0 @@ +------BEGIN CERTIFICATE----- +-MIICYTCCAcqgAwIBAgIJAIaqxtY5dwjtMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNV +-BAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UEBxMLTWlubmVhcG9saXMxITAfBgNV +-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDAeFw0xMzA5MjQwODA1NTFaFw0y +-MTEyMTEwODA1NTFaMFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UE +-BxMLTWlubmVhcG9saXMxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRl +-ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsFGqfbU/8D+KjroQl4XMyt9m +-dcSP7iZtqphOu9nVZxYAAqfaqj8FnC/pwYV3TU6ZHndLTQAllwYT3sQBQPPGmZQ9 +-clSIMEL003t3pi4ZVXkttG6Vvr+Z9PBcHhlKLQ7WMHnn4qctllWXTSoyTQpkETF3 +-Fc3mrG5G37BhoUno7NECAwEAAaM9MDswOQYDVR0RBDIwMIILZXhhbXBsZS5vcmeC +-D3d3dy5leGFtcGxlLm9yZ4IQdGVzdC5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUF +-AAOBgQBf/FZhzheIcQJ+dyTk8xQ/nJLvpmBhbd1LNtfwk/MsC9UHsz4QXs9sBw1k +-rH0FjoqgM6avj7zKHJFTj6q7Rd+OX5V4HynYPhX67sWbN3KWEHffL98nGGd/bo3X +-pSjNk5vnyKYiwdUUe11Ac9csh0HcSBbhOYjy0T/i9AlQcKbuCg== +------END CERTIFICATE----- +diff --git a/ext/openssl/tests/san-cert.pem b/ext/openssl/tests/san-cert.pem +deleted file mode 100644 +index 923d490e72..0000000000 +--- a/ext/openssl/tests/san-cert.pem ++++ /dev/null +@@ -1,31 +0,0 @@ +------BEGIN CERTIFICATE----- +-MIICYTCCAcqgAwIBAgIJAIaqxtY5dwjtMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNV +-BAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UEBxMLTWlubmVhcG9saXMxITAfBgNV +-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDAeFw0xMzA5MjQwODA1NTFaFw0y +-MTEyMTEwODA1NTFaMFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UE +-BxMLTWlubmVhcG9saXMxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRl +-ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsFGqfbU/8D+KjroQl4XMyt9m +-dcSP7iZtqphOu9nVZxYAAqfaqj8FnC/pwYV3TU6ZHndLTQAllwYT3sQBQPPGmZQ9 +-clSIMEL003t3pi4ZVXkttG6Vvr+Z9PBcHhlKLQ7WMHnn4qctllWXTSoyTQpkETF3 +-Fc3mrG5G37BhoUno7NECAwEAAaM9MDswOQYDVR0RBDIwMIILZXhhbXBsZS5vcmeC +-D3d3dy5leGFtcGxlLm9yZ4IQdGVzdC5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUF +-AAOBgQBf/FZhzheIcQJ+dyTk8xQ/nJLvpmBhbd1LNtfwk/MsC9UHsz4QXs9sBw1k +-rH0FjoqgM6avj7zKHJFTj6q7Rd+OX5V4HynYPhX67sWbN3KWEHffL98nGGd/bo3X +-pSjNk5vnyKYiwdUUe11Ac9csh0HcSBbhOYjy0T/i9AlQcKbuCg== +------END CERTIFICATE----- +------BEGIN PRIVATE KEY----- +-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALBRqn21P/A/io66 +-EJeFzMrfZnXEj+4mbaqYTrvZ1WcWAAKn2qo/BZwv6cGFd01OmR53S00AJZcGE97E +-AUDzxpmUPXJUiDBC9NN7d6YuGVV5LbRulb6/mfTwXB4ZSi0O1jB55+KnLZZVl00q +-Mk0KZBExdxXN5qxuRt+wYaFJ6OzRAgMBAAECgYB11e5iWvqjPmQEZRdnnJU0VD8u +-n7ItT+Nk6qtb4gY8Abj6DWIW+01th5vqqJ8FvGyartFVYa69kuM+srG/zevAZWeu +-fGZtwiwZR4DRSyRcPp4rnNiksK3dkAZA6UewmRDPv8uyHJlXc5i+Ft1ILJ5Q5jgn +-UkC4z3EJP5Se9KZywQJBAOO4lRq42wLsYr2SDrQDSs4leie3FKc2bgvjF7Djosh1 +-ZYbf55F5b9w1zgnccmni2HkqOnyFu4SKarmXyCsYxrkCQQDGNvnUh7/zZswrdWZ/ +-PMp9zVDTh/5Oc2B4ByNLw1ERDwYhjchKgPRlQvn4cp3Pwf3UYPQ/8XGXzzEJey3A +-r0rZAkBf/tDEOgcBPXsGZQrTscuYCU5sbY5ESvqrAilbhSp7DJom+D5bIfEYyIm5 +-uHd20Yzlzvpmwc1huyPwZt6X5FLpAkATDReoGMAXSesXxjnqwtIHk2NQYYLM0YQV +-JUJ8NrKk/Bevw+vbVVeoH+7ctU97t36JGiR/vNoZKD3jVmaIXZDJAkEA4wJbwzIo +-L32mu9VmZa7wjmfkraQEmXTPaA5D9lNC0AwRTgkj+x2Qe1vawNblNK9PPLBDdplQ +-L//53ADq/wv5rA== +------END PRIVATE KEY----- |