From 77746f2ac32095e84cd3bcb95c282cbb5d7aed53 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 27 Jan 2012 16:26:42 +0100
Subject: libzip 0.10 with patch from spot

---
 libzip-php.patch | 68 --------------------------------------------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 libzip-php.patch

(limited to 'libzip-php.patch')

diff --git a/libzip-php.patch b/libzip-php.patch
deleted file mode 100644
index ca9cf7c..0000000
--- a/libzip-php.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ru libzip-0.10.orig/lib/zip_fclose.c libzip-0.10/lib/zip_fclose.c
---- libzip-0.10.orig/lib/zip_fclose.c	2010-03-08 13:27:48.000000000 +0100
-+++ libzip-0.10/lib/zip_fclose.c	2011-07-03 11:07:22.000000000 +0200
-@@ -47,7 +47,7 @@
-     if (zf->src)
- 	zip_source_free(zf->src);
- 
--    for (i=0; i<zf->za->nfile; i++) {
-+    if (zf->za) for (i=0; i<zf->za->nfile; i++) {
- 	if (zf->za->file[i] == zf) {
- 	    zf->za->file[i] = zf->za->file[zf->za->nfile-1];
- 	    zf->za->nfile--;
-Seulement dans libzip-0.10/lib: zip_fclose.c~
-diff -ru libzip-0.10.orig/lib/zip.h libzip-0.10/lib/zip.h
---- libzip-0.10.orig/lib/zip.h	2011-03-04 18:17:43.000000000 +0100
-+++ libzip-0.10/lib/zip.h	2011-07-03 11:38:39.000000000 +0200
-@@ -59,6 +59,7 @@
- #define ZIP_CREATE           1
- #define ZIP_EXCL             2
- #define ZIP_CHECKCONS        4
-+#define ZIP_OVERWRITE        8
- 
- 
- /* flags for zip_name_locate, zip_fopen, zip_stat, ... */
-Seulement dans libzip-0.10/lib: zip.h~
-diff -ru libzip-0.10.orig/lib/zip_name_locate.c libzip-0.10/lib/zip_name_locate.c
---- libzip-0.10.orig/lib/zip_name_locate.c	2011-02-13 16:06:21.000000000 +0100
-+++ libzip-0.10/lib/zip_name_locate.c	2011-07-03 14:24:44.000000000 +0200
-@@ -91,6 +91,7 @@
- 	    return i;
-     }
- 
--    _zip_error_set(error, ZIP_ER_NOENT, 0);
-+/* Look for an entry should not raise an error  */
-+/*    _zip_error_set(error, ZIP_ER_NOENT, 0);*/
-     return -1;
- }
-Seulement dans libzip-0.10/lib: zip_name_locate.c~
-diff -ru libzip-0.10.orig/lib/zip_open.c libzip-0.10/lib/zip_open.c
---- libzip-0.10.orig/lib/zip_open.c	2011-03-16 12:18:44.000000000 +0100
-+++ libzip-0.10/lib/zip_open.c	2011-07-03 11:19:41.000000000 +0200
-@@ -62,9 +62,15 @@
- {
-     FILE *fp;
-     
-+    if (flags & ZIP_OVERWRITE) {
-+	return _zip_allocate_new(fn, zep);
-+    }
-+
-     switch (_zip_file_exists(fn, flags, zep)) {
-     case -1:
--	return NULL;
-+	if (!(flags & ZIP_OVERWRITE)) {
-+		return NULL;
-+	}
-     case 0:
- 	return _zip_allocate_new(fn, zep);
-     default:
-@@ -482,7 +488,7 @@
-     }
-     
-     if (stat(fn, &st) != 0) {
--	if (flags & ZIP_CREATE)
-+	if (flags & ZIP_CREATE || flags & ZIP_OVERWRITE)
- 	    return 0;
- 	else {
- 	    set_error(zep, NULL, ZIP_ER_OPEN);
-Seulement dans libzip-0.10/lib: zip_open.c~
-- 
cgit