[meta-oe][PATCH 1/1] php: zlib and zip support

[meta-oe][PATCH 1/1] php: zlib and zip support

[Joe Slater]

Add back zlib support.  Define zip support but do not enable it.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
 meta-oe/recipes-devtools/php/php.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 33bcf12..08173ea 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -59,7 +59,7 @@ EXTRA_OECONF = "--enable-mbstring \
                 --enable-fpm \
                 --with-libdir=${baselib} \
                 --with-gettext=${STAGING_LIBDIR}/.. \
-                --with-libzip=${STAGING_LIBDIR}/.. \
+                --with-zlib=${STAGING_LIBDIR}/.. \
                 --with-iconv=${STAGING_LIBDIR}/.. \
                 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
@@ -81,6 +81,11 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \
 "
 PACKAGECONFIG_class-native = ""
 
+# For zip, select one or none.  oldzip uses a bundled library and is deprecated.
+#
+PACKAGECONFIG[newzip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
+PACKAGECONFIG[oldzip] = "--enable-zip --without-libzip,"
+
 PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \
                         --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
                         --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \
-- 
2.7.4

Re: [meta-oe][PATCH 1/1] php: zlib and zip support

[akuster808]

On 8/12/19 12:22 PM, Joe Slater wrote:
> Add back zlib support.  Define zip support but do not enable it.
>
> Signed-off-by: Joe Slater <joe.slater@windriver.com>
> ---
>  meta-oe/recipes-devtools/php/php.inc | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
> index 33bcf12..08173ea 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
> @@ -59,7 +59,7 @@ EXTRA_OECONF = "--enable-mbstring \
>                  --enable-fpm \
>                  --with-libdir=${baselib} \
>                  --with-gettext=${STAGING_LIBDIR}/.. \
> -                --with-libzip=${STAGING_LIBDIR}/.. \
> +                --with-zlib=${STAGING_LIBDIR}/.. \
>                  --with-iconv=${STAGING_LIBDIR}/.. \
>                  --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
>                  --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
> @@ -81,6 +81,11 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \
>  "
>  PACKAGECONFIG_class-native = ""
>  
> +# For zip, select one or none.  oldzip uses a bundled library and is deprecated.
> +#

How would I know which is old or new? is there a version ref we can
mention? is it a gplv2 or gplv3 thing?

-armin
> +PACKAGECONFIG[newzip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
> +PACKAGECONFIG[oldzip] = "--enable-zip --without-libzip,"
> +
>  PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \
>                          --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
>                          --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \

Re: [meta-oe][PATCH 1/1] php: zlib and zip support

[Slater, Joseph]

Maybe the names are confusing.  It's really use_libzip_zip vs use_bundled_zip.   Joe

-----Original Message-----
From: akuster808 <akuster808@gmail.com> 
Sent: Monday, August 12, 2019 12:34 PM
To: Slater, Joseph <joe.slater@windriver.com>; openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][PATCH 1/1] php: zlib and zip support



On 8/12/19 12:22 PM, Joe Slater wrote:
> Add back zlib support.  Define zip support but do not enable it.
>
> Signed-off-by: Joe Slater <joe.slater@windriver.com>
> ---
>  meta-oe/recipes-devtools/php/php.inc | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-devtools/php/php.inc 
> b/meta-oe/recipes-devtools/php/php.inc
> index 33bcf12..08173ea 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
> @@ -59,7 +59,7 @@ EXTRA_OECONF = "--enable-mbstring \
>                  --enable-fpm \
>                  --with-libdir=${baselib} \
>                  --with-gettext=${STAGING_LIBDIR}/.. \
> -                --with-libzip=${STAGING_LIBDIR}/.. \
> +                --with-zlib=${STAGING_LIBDIR}/.. \
>                  --with-iconv=${STAGING_LIBDIR}/.. \
>                  --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
>                  
> --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSI
> ON} \ @@ -81,6 +81,11 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \  "
>  PACKAGECONFIG_class-native = ""
>  
> +# For zip, select one or none.  oldzip uses a bundled library and is deprecated.
> +#

How would I know which is old or new? is there a version ref we can mention? is it a gplv2 or gplv3 thing?

-armin
> +PACKAGECONFIG[newzip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
> +PACKAGECONFIG[oldzip] = "--enable-zip --without-libzip,"
> +
>  PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \
>                          --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
>                          
> --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \

Re: [meta-oe][PATCH 1/1] php: zlib and zip support

[Khem Raj]

On 8/12/19 2:52 PM, Slater, Joseph wrote:
> Maybe the names are confusing.  It's really use_libzip_zip vs use_bundled_zip.   Joe
> 
> -----Original Message-----
> From: akuster808 <akuster808@gmail.com>
> Sent: Monday, August 12, 2019 12:34 PM
> To: Slater, Joseph <joe.slater@windriver.com>; openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH 1/1] php: zlib and zip support
> 
> 
> 
> On 8/12/19 12:22 PM, Joe Slater wrote:
>> Add back zlib support.  Define zip support but do not enable it.
>>
>> Signed-off-by: Joe Slater <joe.slater@windriver.com>
>> ---
>>   meta-oe/recipes-devtools/php/php.inc | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta-oe/recipes-devtools/php/php.inc
>> b/meta-oe/recipes-devtools/php/php.inc
>> index 33bcf12..08173ea 100644
>> --- a/meta-oe/recipes-devtools/php/php.inc
>> +++ b/meta-oe/recipes-devtools/php/php.inc
>> @@ -59,7 +59,7 @@ EXTRA_OECONF = "--enable-mbstring \
>>                   --enable-fpm \
>>                   --with-libdir=${baselib} \
>>                   --with-gettext=${STAGING_LIBDIR}/.. \
>> -                --with-libzip=${STAGING_LIBDIR}/.. \
>> +                --with-zlib=${STAGING_LIBDIR}/.. \
>>                   --with-iconv=${STAGING_LIBDIR}/.. \
>>                   --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
>>                   
>> --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSI
>> ON} \ @@ -81,6 +81,11 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \  "
>>   PACKAGECONFIG_class-native = ""
>>   
>> +# For zip, select one or none.  oldzip uses a bundled library and is deprecated.
>> +#
> 
> How would I know which is old or new? is there a version ref we can mention? is it a gplv2 or gplv3 thing?
> 
> -armin
>> +PACKAGECONFIG[newzip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
>> +PACKAGECONFIG[oldzip] = "--enable-zip --without-libzip,"
>> +

maybe it should be called bundled-libzip and system-libzip maybe for 
clarity. What happens if someone enables both packageconfigs?

>>   PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \
>>                           --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
>>                           
>> --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \
> 

Re: [meta-oe][PATCH 1/1] php: zlib and zip support

[Adrian Bunk]

On Mon, Aug 12, 2019 at 12:22:20PM -0700, Joe Slater wrote:
> Add back zlib support.  Define zip support but do not enable it.
>...
> +# For zip, select one or none.  oldzip uses a bundled library and is deprecated.
> +#
> +PACKAGECONFIG[newzip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
> +PACKAGECONFIG[oldzip] = "--enable-zip --without-libzip,"
>...

Any reason why this can't be PACKAGECONFIG[zip] for the external libzip only
without any option for the bundled library?

Bundled libraries are usually behind on security fixes,
and php is a software where this tends to matter.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [meta-oe][PATCH 1/1] php: zlib and zip support

[Slater, Joseph]

That's probably best.  The bundled way won't be supported at some future date, anyway.      Joe

-----Original Message-----
From: Adrian Bunk <bunk@stusta.de> 
Sent: Monday, August 12, 2019 9:50 PM
To: Slater, Joseph <joe.slater@windriver.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][PATCH 1/1] php: zlib and zip support

On Mon, Aug 12, 2019 at 12:22:20PM -0700, Joe Slater wrote:
> Add back zlib support.  Define zip support but do not enable it.
>...
> +# For zip, select one or none.  oldzip uses a bundled library and is deprecated.
> +#
> +PACKAGECONFIG[newzip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
> +PACKAGECONFIG[oldzip] = "--enable-zip --without-libzip,"
>...

Any reason why this can't be PACKAGECONFIG[zip] for the external libzip only without any option for the bundled library?

Bundled libraries are usually behind on security fixes, and php is a software where this tends to matter.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [meta-oe][PATCH 1/1] php: zlib and zip support

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1133 bytes --]



On 8/13/19 10:00 AM, Slater, Joseph wrote:
> That's probably best.  The bundled way won't be supported at some future date, anyway.      Joe
> 

I think so too. Would you send a v2 ?

> -----Original Message-----
> From: Adrian Bunk <bunk@stusta.de> 
> Sent: Monday, August 12, 2019 9:50 PM
> To: Slater, Joseph <joe.slater@windriver.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH 1/1] php: zlib and zip support
> 
> On Mon, Aug 12, 2019 at 12:22:20PM -0700, Joe Slater wrote:
>> Add back zlib support.  Define zip support but do not enable it.
>> ...
>> +# For zip, select one or none.  oldzip uses a bundled library and is deprecated.
>> +#
>> +PACKAGECONFIG[newzip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
>> +PACKAGECONFIG[oldzip] = "--enable-zip --without-libzip,"
>> ...
> 
> Any reason why this can't be PACKAGECONFIG[zip] for the external libzip only without any option for the bundled library?
> 
> Bundled libraries are usually behind on security fixes, and php is a software where this tends to matter.
> 
> cu
> Adrian
> 

[-- Attachment #2: pEpkey.asc --]
[-- Type: application/pgp-keys, Size: 2373 bytes --]