Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7973 from IdrisKalp/master

Browse Source 
php
This commit is contained in:
Idris Kalp
2020-02-22 20:07:17 +03:00
committed by GitHub
parent c652ea289d cff603616e
commit 9ca6f1d124
11 changed files with 170 additions and 29250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/misc/libc-client/files/1006_openssl1.1_autoverify.patch
+58
View File
@@ -0,0 +1,58 @@
Description: Support OpenSSL 1.1
When building with OpenSSL 1.1 and newer, use the new built-in
hostname verification instead of code that doesn't compile due to
structs having been made opaque.
Bug-Debian: https://bugs.debian.org/828589
--- a/src/osdep/unix/ssl_unix.c
+++ b/src/osdep/unix/ssl_unix.c
@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
/* disable certificate validation? */
if (flags & NET_NOVALIDATECERT)
SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
- else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ else {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+ X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
+ X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ X509_VERIFY_PARAM_set1_host(param, host, 0);
+#endif
+
+ SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
/* set default paths to CAs... */
+ }
SSL_CTX_set_default_verify_paths (stream->context);
/* ...unless a non-standard path desired */
if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
if (SSL_write (stream->con,"",0) < 0)
return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
/* need to validate host names? */
+#if OPENSSL_VERSION_NUMBER < 0x10100000
if (!(flags & NET_NOVALIDATECERT) &&
(err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
host))) {
@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
return ssl_last_error = cpystr (tmp);
}
+#endif
return NIL;
}
@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
* Returns: NIL if validated, else string of error message
*/
+#if OPENSSL_VERSION_NUMBER < 0x10100000
static char *ssl_validate_cert (X509 *cert,char *host)
{
int i,n;
@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
else ret = "Unable to locate common name in certificate";
return ret;
}
+#endif
/* Case-independent wildcard pattern match
* Accepts: base string
network/misc/libc-client/pspec.xml
+9 -1
View File
@@ -29,7 +29,8 @@
<!--Patch level="1">imap-2007-paths.patch</Patch-->
<Patch level="1">imap-2007e-authmd5.patch</Patch>
<Patch level="1">imap-2007e-shared.patch</Patch>
<Patch level="1">uw-imap-2004c-amd64-so-fix.patch</Patch>
<Patch level="1">uw-imap-2004c-amd64-so-fix.patch</Patch>
<Patch level="1">1006_openssl1.1_autoverify.patch</Patch>
</Patches>
</Source>
@@ -45,6 +46,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-02-22</Date>
<Version>2007f</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-09-09</Date>
<Version>2007f</Version>
office/misc/mupdf/pspec.xml
+7
View File
@@ -81,6 +81,13 @@
</Package>
<History>
<Update release="7">
<Date>2020-02-22</Date>
<Version>1.16.1</Version>
<Comment>Rebuild.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="6">
<Date>2019-09-28</Date>
<Version>1.16.1</Version>
programming/misc/oniguruma/actions.py
+26
View File
@@ -0,0 +1,26 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
WorkDir = "onig-%s" %get.srcVERSION()
def setup():
autotools.autoreconf("-vfi")
autotools.configure()
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" %get.installDIR())
pisitools.dodoc("COPYING", "README*", "AUTHORS", "ChangeLog")
programming/misc/oniguruma/pspec.xml
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>oniguruma</Name>
<Homepage>https://github.com/kkos/oniguruma/</Homepage>
<Packager>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Packager>
<License>BSD</License>
<IsA>library</IsA>
<Summary>A regular expressions library</Summary>
<Description>Oniguruma is a modern and flexible regular expressions library. It encompasses features from different regular expression implementations that traditionally exist in different languages.</Description>
<Archive sha1sum="894a6285ccea5c63e289b0379df833f66fa8fe3a" type="targz">https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz</Archive>
</Source>
<Package>
<Name>oniguruma</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/</Path>
<Path fileType="man">/usr/share/man/man1</Path>
</Files>
</Package>
<Package>
<Name>oniguruma-devel</Name>
<Summary>Development files for oniguruma</Summary>
<RuntimeDependencies>
<Dependency release="current">oniguruma</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2020-02-22</Date>
<Version>6.9.4</Version>
<Comment>First release.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
</History>
</PISI>
programming/php/php/pspec.xml
+13 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>PHP7 is an HTML-embedded scripting language. The goal of the language is to allow web developers to write dynamically generated pages quickly</Summary>
<Description>PHP7 is an HTML-embedded scripting language. Much of its syntax is borrowed from C, Java and Perl with a couple of unique PHP-specific features thrown in. The goal of the language is to allow web developers to write dynamically generated pages quickly.</Description>
<Archive sha1sum="234d9e828362d4ab24efff82c1c666e8543701ac" type="tarbz2">https://www.php.net/distributions/php-7.3.10.tar.bz2</Archive>
<Archive sha1sum="1f314d52a63ef5d68f8f44a224759b24885cce17" type="tarxz">https://www.php.net/distributions/php-7.4.3.tar.xz</Archive>
<BuildDependencies>
<Dependency>gd-devel</Dependency>
<Dependency>re2c</Dependency>
@@ -36,6 +36,8 @@
<Dependency>libpng-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>oniguruma-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">int_overflow_in_mt_rand.patch</Patch> -->
@@ -68,6 +70,9 @@
<Dependency>postgresql-lib</Dependency>
<Dependency>openldap-client</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>oniguruma</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>openssl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/php/cli</Path>
@@ -217,6 +222,13 @@
<History>
<Update release="11">
<Date>2020-02-22</Date>
<Version>7.4.3</Version>
<Comment>Version bump</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="10">
<Date>2019-10-11</Date>
<Version>7.3.10</Version>
programming/pisi-index.xml
-29246
View File
File diff suppressed because it is too large Load Diff
programming/pisi-index.xml.sha1sum
-1
View File
@@ -1 +0,0 @@
baf4fc8a8aa3277ba7dfe21b8e82e476fec7c433
programming/pisi-index.xml.xz
BIN
View File
Binary file not shown.
programming/pisi-index.xml.xz.sha1sum
-1
View File
@@ -1 +0,0 @@
599b7220a5819538beaddcd87c6c777bd83b1e5c
util/crypt/libmcrypt/pspec.xml
+7
View File
@@ -43,6 +43,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-02-22</Date>
<Version>2.5.8</Version>
<Comment>Rebuild</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-08-10</Date>
<Version>2.5.8</Version>