packages: php/php.spec, php/system-libzip.patch (NEW) - use system libzip i...

Mon Sep 26 23:33:13 CEST 2011

Author: glen                         Date: Mon Sep 26 21:33:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system libzip in zip extension

---- Files affected:
packages/php:
   php.spec (1.953 -> 1.954) , system-libzip.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.953 packages/php/php.spec:1.954

--- packages/php/php.spec:1.953	Thu Sep 22 09:20:51 2011
+++ packages/php/php.spec	Mon Sep 26 23:33:08 2011
@@ -110,7 +110,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel	4
+%define		rel	5
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -195,6 +195,8 @@
 Patch62:	mcrypt-libs.patch
 Patch63:	%{name}-mysql-nowarning.patch
 Patch64:	%{name}-m4.patch
+# http://spot.fedorapeople.org/php-5.3.6-libzip.patch
+Patch65:	system-libzip.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -209,6 +211,7 @@
 #BuildRequires:	fcgi-devel
 #BuildRequires:	flex
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
+BuildRequires:	libzip-devel >= 0.10-3
 BuildRequires:	mysql-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
@@ -1791,6 +1794,7 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.zip.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	libzip >= 0.10-3
 Provides:	php(zip)
 Obsoletes:	php-pecl-zip
 
@@ -1887,6 +1891,7 @@
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
+%patch65 -p1
 %{__rm} -r sapi/litespeed
 gzip -dc %{SOURCE15} | tar xf - -C sapi/
 
@@ -2134,6 +2139,7 @@
 	--with-xsl=shared \
 	--with-zlib=shared \
 	--with-zlib-dir=shared,/usr \
+	--with-libzip \
 	--enable-zip=shared,/usr \
 
 	# save for debug
@@ -3211,6 +3217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.954  2011/09/26 21:33:08  glen
+- use system libzip in zip extension
+
 Revision 1.953  2011/09/22 07:20:51  glen
 - fix libphp_common.la path in libphp5.la
 

================================================================
Index: packages/php/system-libzip.patch
diff -u /dev/null packages/php/system-libzip.patch:1.1
--- /dev/null	Mon Sep 26 23:33:13 2011
+++ packages/php/system-libzip.patch	Mon Sep 26 23:33:08 2011
@@ -0,0 +1,79 @@
+
+https://bugzilla.redhat.com/show_bug.cgi?id=551513
+https://bugs.php.net/bug.php?id=39388
+http://spot.fedorapeople.org/php-5.3.6-libzip.patch
+
+diff -up php-5.3.6/ext/zip/config.m4.libzip php-5.3.6/ext/zip/config.m4
+--- php-5.3.6/ext/zip/config.m4.libzip	2008-08-08 05:47:15.000000000 -0400
++++ php-5.3.6/ext/zip/config.m4	2011-07-20 15:21:05.759490602 -0400
+@@ -15,6 +15,9 @@ PHP_ARG_WITH(pcre-dir, pcre install pref
+ 
+ if test "$PHP_ZIP" != "no"; then
+ 
++  PHP_ARG_WITH(libzip, libzip,
++  [  --with-libzip[=DIR]     Use libzip], no, no)
++
+   if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
+     if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
+       PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+@@ -71,7 +74,43 @@ yes
+   ])
+   CPPFLAGS=$old_CPPFLAGS
+ 
+-  PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
++  if test "$PHP_LIBZIP" != "no"; then
++    if test -r $PHP_LIBZIP/include/zip.h; then
++      LIBZIP_DIR=$PHP_LIBZIP
++    else
++      AC_MSG_CHECKING(for libzip in default path)
++      for i in /usr/local /usr; do
++        if test -r $i/include/zip.h; then
++          LIBZIP_DIR=$i
++          AC_MSG_RESULT(found in $i)
++          break
++        fi
++      done
++    fi
++
++    if test -z "$LIBZIP_DIR"; then
++      AC_MSG_RESULT(not found)
++      AC_MSG_ERROR(Please reinstall the libzip distribution)
++    fi
++
++    dnl Could not think of a simple way to check libzip for overwrite support
++    PHP_CHECK_LIBRARY(zip, zip_open,
++    [
++      PHP_ADD_INCLUDE($LIBZIP_DIR/include)
++      PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_DIR/$PHP_LIBDIR, LIBZIP_SHARED_LIBADD)
++      AC_DEFINE(HAVE_LIBZIP,1,[ ])
++    ], [
++      AC_MSG_ERROR(could not find usable libzip)
++    ], [
++      -L$LIBZIP_DIR/$PHP_LIBDIR
++    ])
++
++    AC_DEFINE(HAVE_ZIP,1,[ ])
++    PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared)
++    PHP_SUBST(LIBZIP_SHARED_LIBADD)
++    PHP_SUBST(ZIP_SHARED_LIBADD)
++  else
++    PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
+                          lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c  \
+                          lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \
+                          lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \
+@@ -91,10 +130,11 @@ yes
+                          lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \
+                          lib/zip_error_clear.c lib/zip_file_error_clear.c"
+ 
+-  AC_DEFINE(HAVE_ZIP,1,[ ])
+-  PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
+-  PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
+-  PHP_SUBST(ZIP_SHARED_LIBADD)
++    AC_DEFINE(HAVE_ZIP,1,[ ])
++    PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
++    PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
++    PHP_SUBST(ZIP_SHARED_LIBADD)
++  fi
+ 
+   dnl so we always include the known-good working hack.
+   PHP_ADD_MAKEFILE_FRAGMENT
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.953&r2=1.954&f=u

