php8.0: remove (incompatible with openssl 3)

This commit is contained in:
dkwo 2023-03-09 15:33:33 -05:00 committed by classabbyamp
parent 9b0dc687b0
commit 41bab35903
54 changed files with 28 additions and 936 deletions

View file

@ -1,2 +0,0 @@
#!/bin/sh
php8.0 /usr/libexec/composer.phar8.0 "$@"

View file

@ -1,27 +0,0 @@
# Template file for 'composer8.0'
pkgname=composer8.0
version=2.5.8
revision=1
build_style=fetch
depends="php8.0"
short_desc="Dependency manager for PHP"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="MIT"
homepage="https://getcomposer.org/"
changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
https://raw.githubusercontent.com/composer/composer/main/LICENSE"
checksum="f07934fad44f9048c0dc875a506cca31cc2794d6aebfc1867f3b1fbf48dce2c5
7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
alternatives="composer:composer:/usr/bin/composer8.0"
do_install() {
vbin ${FILESDIR}/composer8.0
vinstall composer.phar 644 usr/libexec composer.phar8.0
vlicense LICENSE
vmkdir /etc/php8.0/conf.d
printf 'extension=%s\n' phar iconv openssl zip \
>${DESTDIR}/etc/php8.0/conf.d/composer.ini
}

View file

@ -1 +0,0 @@
php8.0

View file

@ -1,3 +0,0 @@
To enable APCu add the following line to your php.ini:
extension=apcu.so

View file

@ -1,28 +0,0 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
version=5.1.22
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
make_check_target=test
hostmakedepends="autoconf php8.0-devel"
makedepends="php8.0-devel pcre2-devel"
depends="php8.0"
short_desc="In-memory key-value store for PHP"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.0
}
pre_install() {
make_install_args="INSTALL_ROOT=$DESTDIR"
}
post_install() {
rm -r $DESTDIR/usr/include
}

View file

@ -1,2 +0,0 @@
site="https://pecl.php.net/package/APCu"
pattern="apcu-\K[\d\.]*(?=\.tgz)"

View file

@ -1,2 +0,0 @@
To enable the ast extension please add the following to php.ini:
extension=ast.so

View file

@ -1,27 +0,0 @@
# Template file for 'php8.0-ast'
pkgname=php8.0-ast
version=1.1.0
revision=1
build_style=gnu-configure
make_check_target="test"
configure_args="--with-php-config=/usr/bin/php-config8.0"
hostmakedepends="php8.0-devel autoconf"
makedepends="php8.0-devel"
depends="php8.0"
checkdepends="${depends}"
short_desc="Exposes the abstract syntax tree generated by PHP"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="BSD-3-Clause"
homepage="https://github.com/nikic/php-ast"
distfiles="https://pecl.php.net/get/ast-${version}.tgz"
checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
make_check_pre="env NO_INTERACTION=1"
pre_configure() {
phpize8.0
}
do_install() {
make INSTALL_ROOT=${DESTDIR} install
vlicense LICENSE
}

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1,24 +0,0 @@
# Template file for 'php8.0-igbinary'
pkgname=php8.0-igbinary
version=3.2.14
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
hostmakedepends="autoconf php8.0-devel"
makedepends="php8.0-devel"
depends="php8.0"
short_desc="Igbinary is a drop in replacement for the standard php serializer"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="BSD-3-Clause"
homepage="https://github.com/igbinary/igbinary/"
distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
checksum=6337147a4fb888072566674837bda9928ee06ee7f0114b4338b86c816232925d
pre_configure() {
phpize8.0
}
do_install() {
make INSTALL_ROOT="${DESTDIR}" install
vlicense COPYING
}

View file

@ -1,3 +0,0 @@
To enable the Imagick extension add the following line to your php.ini:
extension=imagick.so

View file

@ -1,17 +0,0 @@
--- a/imagemagick.m4 2021-09-09 10:53:42.287881616 +0200
+++ b/imagemagick.m4 2021-09-09 11:14:47.662312430 +0200
@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+ elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+
+ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
+ IM_HEADER_STYLE="SEVEN"
+ AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
+
+ AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
+
elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"

View file

@ -1,28 +0,0 @@
# Template file for 'php8.0-imagick'
pkgname=php8.0-imagick
version=3.7.0
revision=7
build_style=gnu-configure
configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
--with-php-config=/usr/bin/php-config8.0"
hostmakedepends="php8.0-devel autoconf pkg-config"
makedepends="php8.0-devel pcre2-devel libmagick-devel"
depends="php8.0"
short_desc="Provides a PHP wrapper to the ImageMagick library"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/imagick"
distfiles="https://pecl.php.net/get/imagick-$version.tgz"
checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
pre_configure() {
phpize8.0
}
pre_install() {
make_install_args="INSTALL_ROOT=$DESTDIR"
}
post_install() {
rm -r $DESTDIR/usr/include
}

View file

@ -1 +0,0 @@
pattern='<th.*Release \K[\d.]+(?=:</th>)'

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1,3 +0,0 @@
To enable the MongoDB extension add the following line to your php.ini:
extension=mongodb

View file

@ -1,24 +0,0 @@
# Template file for 'php8.0-mongodb'
pkgname=php8.0-mongodb
version=1.16.1
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
hostmakedepends="php8.0-devel autoconf pkg-config"
makedepends="php8.0-devel pcre2-devel openssl-devel"
depends="php8.0"
short_desc="Official MongoDB PHP driver"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="Apache-2.0"
homepage="https://pecl.php.net/package/mongodb"
changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
checksum=2c5b7c7ccf6ca26d25af8487f4028390f0a7dc49efb2eb360a65840e1d6f566e
pre_configure() {
phpize8.0
}
pre_install() {
make_install_args="INSTALL_ROOT=$DESTDIR"
}

View file

@ -1 +0,0 @@
pattern='<th.*Release \K[\d.]+(?=:</th>)'

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1 +0,0 @@
php8.0

View file

@ -1,13 +0,0 @@
# Required modules: dir_module, php8.0_module
<IfModule dir_module>
<IfModule php8.0_module>
DirectoryIndex index.php index.html
<FilesMatch "\.php$">
SetHandler application/x-httpd-php
</FilesMatch>
<FilesMatch "\.phps$">
SetHandler application/x-httpd-php-source
</FilesMatch>
</IfModule>
</IfModule>

View file

@ -1,4 +0,0 @@
#!/bin/sh
exec 2>&1
[ -r conf ] && . ./conf
exec php-fpm8.0 --nodaemonize ${OPTS}

View file

@ -1,60 +0,0 @@
From b3646440b1808abf0874b6f89027ce53ec5da03f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Mon, 13 Sep 2021 14:48:13 +0200
Subject: [PATCH] Don't rely on libgd unused constants
---
ext/gd/gd.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 287cb2f712f8..880d6dddc7d7 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -88,10 +88,10 @@
#define M_PI 3.14159265358979323846
#endif
-/* workaround typo in system libgd 2.3.0 */
-#if defined(GD_FLIP_HORINZONTAL) && !defined(GD_FLIP_HORIZONTAL)
-#define GD_FLIP_HORIZONTAL GD_FLIP_HORINZONTAL
-#endif
+/* don't used libgd constants, not used, so going to be removed */
+#define PHP_GD_FLIP_HORIZONTAL 1
+#define PHP_GD_FLIP_VERTICAL 2
+#define PHP_GD_FLIP_BOTH 3
#ifdef HAVE_GD_FREETYPE
static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int);
@@ -400,9 +400,9 @@ PHP_MINIT_FUNCTION(gd)
/* GD2 image format types */
REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", PHP_GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", PHP_GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", PHP_GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
@@ -3599,15 +3599,15 @@ PHP_FUNCTION(imageflip)
im = php_gd_libgdimageptr_from_zval_p(IM);
switch (mode) {
- case GD_FLIP_VERTICAL:
+ case PHP_GD_FLIP_VERTICAL:
gdImageFlipVertical(im);
break;
- case GD_FLIP_HORIZONTAL:
+ case PHP_GD_FLIP_HORIZONTAL:
gdImageFlipHorizontal(im);
break;
- case GD_FLIP_BOTH:
+ case PHP_GD_FLIP_BOTH:
gdImageFlipBoth(im);
break;

View file

@ -1,25 +0,0 @@
This patch fixes .so links in man pages.
It's needed because of the configure option -
--program-suffix=${_php_version}
The changes made by this patch should be the same as the changes made by this
block of code -
_regexp='^[[:space:]]*\.so[[:space:]]'
for file in $(grep -l -e "$_regexp" -R .); do
vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
done
Where _php_version is defined in the template file.
--- a/ext/phar/phar.phar.1.in
+++ b/ext/phar/phar.phar.1.in
@@ -1 +1 @@
-.so man1/phar.1
+.so man1/phar8.0.1
--- a/sapi/cgi/php-cgi.1.in
+++ b/sapi/cgi/php-cgi.1.in
@@ -1 +1 @@
-.so man1/php.1
+.so man1/php8.0.1

View file

@ -1,15 +0,0 @@
--- a/ext/standard/crypt.c 2016-04-28 14:13:00.000000000 -0400
+++ b/ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400
@@ -267,6 +267,12 @@
}
# elif defined(HAVE_CRYPT)
crypt_res = crypt(password, salt);
+ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
+ return NULL;
+ } else {
+ result = zend_string_init(crypt_res, strlen(crypt_res), 0);
+ return result;
+ }
# else
# error No crypt() implementation
# endif

View file

@ -1,41 +0,0 @@
--- a/configure 2020-03-17 11:40:20.000000000 +0100
+++ b/configure 2020-04-12 19:51:57.216350534 +0200
@@ -6374,10 +6374,12 @@ IFS="- /.
as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
fi
+ APXS_PREFIX='$(INSTALL_ROOT)'/usr
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S PREFIX='$APXS_PREFIX' \
-i -n php"
else
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
@@ -6385,6 +6387,7 @@ IFS="- /.
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
+ -S PREFIX='$APXS_PREFIX' \
-i -a -n php"
fi
@@ -57170,7 +57173,7 @@ $as_echo_n "checking for pg_config... "
fi
done
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
$as_echo "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
@@ -58821,7 +58824,7 @@ $as_echo_n "checking for pg_config... "
fi
done
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
$as_echo "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`

View file

@ -1,13 +0,0 @@
--- a/sapi/fpm/Makefile.frag 2017-04-15 23:58:56.965737425 +0200
+++ b/sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200
@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
else \
echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
+ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
+ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
fi
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"

View file

@ -1,39 +0,0 @@
--- a/build/ltmain.sh 2021-09-09 15:19:14.822208365 +0200
+++ b/build/ltmain.sh 2021-09-09 15:47:55.397011151 +0200
@@ -2375,6 +2375,13 @@ EOF
*) . ./$lib ;;
esac
+ newdependency_libs=
+ for deplib in $dependency_libs; do
+ deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
+ newdependency_libs="$newdependency_libs $deplib"
+ done
+ dependency_libs=${newdependency_libs}
+
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -5750,6 +5757,13 @@ fi\
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
+
+ newdependency_libs=
+ for deplib in $dependency_libs; do
+ deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
+ newdependency_libs="$newdependency_libs $deplib"
+ done
+
$echo > $output "\
# $outputname - a libtool library file
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
@@ -5767,7 +5781,7 @@ library_names='$library_names'
old_library='$old_library'
# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
+dependency_libs='$newdependency_libs'
# Version information for $libname.
current=$current

View file

@ -1,14 +0,0 @@
diff --git a/configure b/configure.new
index 1159224b4c..29f763aa05 100755
--- a/configure
+++ b/configure.new
@@ -51689,7 +51689,8 @@ $as_echo "$have_shm_ipc" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
$as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; }
if test "$cross_compiling" = yes; then :
- have_shm_mmap_anon=no
+$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
+ have_shm_mmap_anon=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

View file

@ -1,23 +0,0 @@
--- a/pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100
+++ b/pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200
@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
PEAR_PREFIX = -dp a${program_prefix}
PEAR_SUFFIX = -ds a$(program_suffix)
PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
+PEAR_PHP ?= $(top_builddir)/sapi/cli/php
install-pear-installer: $(SAPI_CLI_PATH)
- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+ @$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
install-pear:
@echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
@@ -23,7 +24,7 @@ install-pear:
elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
else \
- $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
+ $(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
fi \
fi \
fi

View file

@ -1,29 +0,0 @@
--- a/ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200
+++ b/ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200
@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
+PHAR_PHP_MODULES ?= $(top_builddir)/modules
PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
PHP_PHARCMD_EXECUTABLE = ` \
- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
+ if test -x "$(PHAR_PHP)"; then \
+ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
if test "x$(PHP_MODULES)" != "x"; then \
- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
+ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
for i in bz2 zlib phar; do \
if test -f "$(top_builddir)/modules/$$i.la"; then \
. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
done; \
fi; \
else \
- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
+ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
fi;`
PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`

View file

@ -1,28 +0,0 @@
--- a/scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100
+++ b/scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200
@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
[lib],
[no])
+PHP_ARG_WITH([sysroot],,
+ [AS_HELP_STRING([--with-sysroot=NAME],
+ [System sysroot])],
+ [no],
+ [no])
+
PHP_RUNPATH_SWITCH
PHP_SHLIB_SUFFIX_NAMES
@@ -58,7 +64,11 @@ dnl For BC.
PHP_CONFIG=$PHP_PHP_CONFIG
prefix=`$PHP_CONFIG --prefix 2>/dev/null`
phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
+if test "x$PHP_SYSROOT" = xno; then :
+ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
+else
+ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
+fi
EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`

View file

@ -1,24 +0,0 @@
diff --git php.ini-production php.ini-production
index 794d3e8ddb..c7acf9c883 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -729,7 +729,7 @@ default_charset = "UTF-8"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
+include_path = ".:/usr/share/pear8.0"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
@@ -752,9 +752,7 @@ user_dir =
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
-;extension_dir = "./"
-; On windows:
-;extension_dir = "ext"
+extension_dir = "/usr/lib/php8.0/modules/"
; Directory where the temporary files should be placed.
; Defaults to the system default (see sys_get_temp_dir)

View file

@ -1,366 +0,0 @@
# Template file for 'php8.0'
pkgname=php8.0
version=8.0.29
revision=1
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
libffi-devel oniguruma-devel gd-devel"
short_desc="HTML-embedded scripting language"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
checksum=db6ee08df5706365f624cde1cffb20ad6de1effe59d7e886337213a09f2e2684
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
# phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
-DHAVE_DLSYM
-DHAVE_SHM_IPC
-DHAVE_SHM_MMAP_ANON
-DHAVE_SHM_MMAP_ZERO
-DHAVE_SHM_MMAP_POSIX
-DHAVE_SHM_MMAP_FILE"
fi
alternatives="
php:phar.phar:/usr/bin/phar${_php_version}.phar
php:php:/usr/bin/php${_php_version}
php:phar:/usr/bin/phar${_php_version}
php:phar.1:/usr/share/man/man1/phar${_php_version}.1
php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
php:php.1:/usr/share/man/man1/php${_php_version}.1"
do_build() {
local _phpconfig="--srcdir=.. \
--config-cache \
--prefix=/usr \
--sbindir=/usr/bin \
--sysconfdir=/etc/php${_php_version} \
--localstatedir=/var \
--with-layout=GNU \
--with-config-file-path=/etc/php${_php_version} \
--with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
--disable-rpath \
--mandir=/usr/share/man \
--libdir=/usr/lib/php${_php_version} \
--datarootdir=/usr/share/php${_php_version} \
--datadir=/usr/share/php${_php_version} \
--program-suffix=${_php_version} \
--includedir=/usr/include/php${_php_version} \
"
local _phpextensions="--enable-bcmath=shared \
--enable-calendar=shared \
--enable-exif=shared \
--enable-ftp=shared \
--enable-intl=shared \
--enable-mbstring \
--enable-opcache \
--enable-pcntl \
--enable-phar=shared \
--enable-posix=shared \
--enable-shmop=shared \
--enable-soap=shared \
--enable-sockets=shared \
--enable-sysvmsg=shared \
--enable-sysvsem=shared \
--enable-sysvshm=shared \
--enable-mysqlnd \
--enable-gd=shared \
--with-external-gd \
--with-ffi=shared \
--with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
--with-curl=shared \
--with-db4=$XBPS_CROSS_BASE/usr \
--with-enchant=shared,$XBPS_CROSS_BASE/usr \
--with-gdbm=$XBPS_CROSS_BASE/usr \
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
--with-ldap=shared,$XBPS_CROSS_BASE/usr \
--with-ldap-sasl \
--with-sodium=shared \
--with-mhash \
--with-mysql-sock=/run/mysqld/mysqld.sock \
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
--with-pear=/usr/share/pear${_php_version}
--with-pdo-mysql=shared,mysqlnd \
--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
--with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
--with-pgsql=shared,$XBPS_CROSS_BASE/usr \
--with-readline=$XBPS_CROSS_BASE/usr \
--with-snmp=shared,$XBPS_CROSS_BASE/usr \
--with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
--with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
--with-xsl=shared,$XBPS_CROSS_BASE/usr \
--with-tidy=shared,$XBPS_CROSS_BASE/usr \
--with-zip=shared \
--with-zlib \
${configure_args} \
"
if [ -n "$CROSS_BUILD" ]; then
local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
fi
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
# cgi,cli,embed,fcgi,fpm
mkdir -p build
cd build
ln -s ${wrksrc}/configure
./configure ${_phpconfig} \
--host=${XBPS_CROSS_TRIPLET} \
--enable-cgi \
--enable-fpm \
--with-fpm-user=http \
--with-fpm-group=http \
--enable-embed=shared \
${_phpextensions}
make ${makejobs} ${_make_env}
# apache
# reuse the previous run; this will save us a lot of time
cp -a ${wrksrc}/build ${wrksrc}/build-apache
cd ${wrksrc}/build-apache
./configure ${_phpconfig} \
--host=${XBPS_CROSS_TRIPLET} \
--with-apxs2 \
${_phpextensions}
make ${makejobs} ${_make_env}
}
do_install() {
cd ${wrksrc}/build
local _env="INSTALL_ROOT=${DESTDIR}"
if [ -n "$CROSS_BUILD" ]; then
_env+=" PHAR_PHP=/usr/bin/php${_php_version}"
fi
make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
# install php.ini
vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
# remove static modules
rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
}
php8.0-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/php${_php_version}/build"
vmove "usr/bin/php-config${_php_version}"
vmove "usr/bin/phpize${_php_version}"
vmove "usr/share/man/man1/phpize${_php_version}.1"
vmove "usr/share/man/man1/php-config${_php_version}.1"
}
}
php8.0-phpdbg_package() {
short_desc+=" - interactive debugger"
depends="php${_php_version}>=${version}_${revision}"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
}
}
php8.0-cgi_package() {
short_desc+=' - CGI and FCGI SAPI'
depends="php${_php_version}>=${version}_${revision}"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-cgi
}
}
php8.0-apache_package() {
short_desc+=' - Apache SAPI'
depends="php${_php_version}>=${version}_${revision}"
conf_files="/etc/apache/extra/php${_php_version}_module.conf"
pkg_install() {
vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
}
}
php8.0-fpm_package() {
short_desc+=' - FastCGI Process Manager'
depends="php${_php_version}>=${version}_${revision}"
conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-fpm
vsv "php-fpm${_php_version}"
}
}
php8.0-embed_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - Embed SAPI'
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
}
}
php8.0-pear_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}
php${_php_version}>=devel-${version}_${revision} autoconf"
short_desc+=' - PHP Extension and Application Repository'
conf_files="/etc/php${_php_version}/pear.conf"
pkg_install() {
cd ${wrksrc}/build
local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
if [ -n "$CROSS_BUILD" ]; then
_env+=" PEAR_PHP=/usr/bin/php${_php_version}"
fi
make install-pear ${_env}
rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
}
}
php8.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - enchant module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/enchant.so"
}
}
php8.0-gd_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - gd module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/gd.so"
}
}
php8.0-intl_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - Internationalization module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/intl.so"
}
}
php8.0-ldap_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - LDAP module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/ldap.so"
}
}
php8.0-mysql_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - MySQL modules'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
}
}
php8.0-odbc_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - ODBC modules'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/*odbc.so"
}
}
php8.0-pgsql_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - PostgreSQL modules'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
}
}
php8.0-snmp_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - snmp module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/snmp.so"
}
}
php8.0-sqlite_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - sqlite module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
}
}
php8.0-tidy_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - tidy HTML module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
}
}
php8.0-xsl_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - XSL module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/xsl.so"
}
}
php8.0-sodium_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - sodium module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/sodium.so"
}
}
php8.0-ffi_package() {
lib32disabled=yes
depends="php${_php_version}>=${version}_${revision}"
short_desc+=' - FFI module'
pkg_install() {
vmove "usr/lib/php${_php_version}/modules/ffi.so"
}
}

View file

@ -1,3 +0,0 @@
pkgname=php
ignore="8.[1-9].*"
site="https://www.php.net/distributions/"

View file

@ -62,6 +62,7 @@ replaces="
clamz<=0.5_4
clementine-spotify<=1.4.0rc1-343-gb49afcc5b
cointop<=1.6.10_1
composer8.0<=2.5.8_1
compton-conf<=0.15.0_1
couchdb<=1.7.1_2
couchpotato<=3.0.1_3
@ -429,6 +430,32 @@ replaces="
pgadmin3<=1.22.2_14
phonon-backend-gstreamer<=4.9.0_2
phonon-backend-vlc<=0.9.1_3
php8.0-apache<=8.0.29_1
php8.0-apcu<=5.1.22_1
php8.0-ast<=1.1.0_1
php8.0-cgi<=8.0.29_1
php8.0-devel<=8.0.29_1
php8.0-embed<=8.0.29_1
php8.0-enchant<=8.0.29_1
php8.0-ffi<=8.0.29_1
php8.0-fpm<=8.0.29_1
php8.0-gd<=8.0.29_1
php8.0-igbinary<=3.2.14_1
php8.0-imagick<=3.7.0_6
php8.0-intl<=8.0.29_1
php8.0-ldap<=8.0.29_1
php8.0-mongodb<=1.16.1_1
php8.0-mysql<=8.0.29_1
php8.0-odbc<=8.0.29_1
php8.0-pear<=8.0.29_1
php8.0-pgsql<=8.0.29_1
php8.0-phpdbg<=8.0.29_1
php8.0-snmp<=8.0.29_1
php8.0-sodium<=8.0.29_1
php8.0-sqlite<=8.0.29_1
php8.0-tidy<=8.0.29_1
php8.0-xsl<=8.0.29_1
php8.0<=8.0.29_1
plex-media-player<=2.58.0_4
plex-media-server<=1.15.3.876_4
polkit-qt<=0.112.0_5
@ -608,6 +635,7 @@ replaces="
wireguard-go<=0.0.20181222_2
wireshark-gtk<=3.0.7_1
xcdroast<=1.19_1
xdebug8.0<=3.2.1_1
xlennart<=1.1.1_1
xmonad-contrib<=0.16_3
xmonad<=0.15_5

View file

@ -1 +0,0 @@
You should add 'zend_extension="xdebug.so"' to php.ini

View file

@ -1,24 +0,0 @@
# Template file for 'xdebug8.0'
pkgname=xdebug8.0
version=3.2.1
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
hostmakedepends="autoconf php8.0-devel"
makedepends="php8.0-devel"
short_desc="PHP debugging extension"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
pre_configure() {
phpize8.0
}
do_install() {
make INSTALL_ROOT=${DESTDIR} install
vlicense LICENSE
}

View file

@ -1,2 +0,0 @@
site="https://xdebug.org/updates"
pattern='<dt><a name=.*></a>.*Xdebug \K[\d.]+(?=</dt>)'