Attachment #122344 for bug #165524

View | Details | Raw Unified | Return to bug 165524
Collapse All | Expand All





PORTNAME=	svn
PORTVERSION=	1.0.1
PORTREVISION=	2
CATEGORIES=	devel pear
MASTER_SITES=	http://pecl.php.net/get/
PKGNAMEPREFIX=	pecl-
DISTNAME=	svn-${PORTVERSION}
EXTRACT_SUFX=	.tgz
DIST_SUBDIR=	PECL

MAINTAINER=	miwi@FreeBSD.org
COMMENT=	A PECL extension to the libsvn library

LICENSE=	PHP301

LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion16

LICENSE=	PHP301
USE_PHP=	yes
USE_PHPEXT=	yes





--- svn.c.orig	2010-12-09 04:30:16.000000000 +0100
+++ svn.c	2012-02-28 09:46:50.877059221 +0100
@@ -34,6 +34,7 @@
 
 #include "apr_version.h"

 #include "svn_sorts.h"
 #include "svn_config.h"
 #include "svn_auth.h"
@@ -43,6 +44,7 @@
 #include "svn_utf.h"
 #include "svn_time.h"
 #include "svn_props.h"
+#include "svn_version.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(svn)
 
@@ -96,7 +98,13 @@
 static ZEND_RSRC_DTOR_FUNC(php_svn_repos_dtor)
 {
 	struct php_svn_repos *r = rsrc->ptr;
-	svn_pool_destroy(r->pool);
+	/*
+	 * If root pool doesn't exist, then this resource's pool was already
+	 * destroyed
+	 */
+	if (SVN_G(pool)) {
+		svn_pool_destroy(r->pool);
+	}
 	efree(r);
 }
 
@@ -123,7 +131,7 @@
 
 #define SVN_STATIC_ME(name) ZEND_FENTRY(name, ZEND_FN(svn_ ## name), NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
 /** Fixme = this list needs padding out... */
-static function_entry svn_methods[] = {
+static zend_function_entry svn_methods[] = {
 	SVN_STATIC_ME(cat)
 	SVN_STATIC_ME(checkout)
 	SVN_STATIC_ME(log)
@@ -134,7 +142,7 @@
 
 
 /* {{{ svn_functions[] */
-function_entry svn_functions[] = {
+zend_function_entry svn_functions[] = {
 	PHP_FE(svn_checkout,		NULL)
 	PHP_FE(svn_cat,			NULL)
 	PHP_FE(svn_ls,			NULL)
@@ -270,7 +278,7 @@
 
 	smart_str_appendl(&s, "\n", 1);
 	smart_str_0(&s);
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, s.c);
+	php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", s.c);
 	smart_str_free(&s);
 }
 

Return to bug 165524

Lines 7-28 Link Here

(-)Makefile (-5 / +3 lines)
7		7
8	PORTNAME= svn	8	PORTNAME= svn
9	PORTVERSION= 1.0.1	9	PORTVERSION= 1.0.1
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= devel pear	11	CATEGORIES= devel pear
12	MASTER_SITES= http://pecl.php.net/get/	12	MASTER_SITES= http://pecl.php.net/get/
13	PKGNAMEPREFIX= pecl-	13	PKGNAMEPREFIX= pecl-
14	DISTNAME= svn-${PORTVERSION}
15	EXTRACT_SUFX= .tgz	14	EXTRACT_SUFX= .tgz
16	DIST_SUBDIR= PECL	15	DIST_SUBDIR= PECL
17		16
18	MAINTAINER= miwi@FreeBSD.org	17	MAINTAINER= miwi@FreeBSD.org
19	COMMENT= A PECL extension to the libsvn library	18	COMMENT= A PECL extension to the libsvn library
20		19
21	LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion16	20	LICENSE= PHP301
22		21
23	CONFLICTS_BUILD=subversion-1.7.[0-9]*	22	LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion16
24		23
25	LICENSE= PHP301
26	USE_PHP= yes	24	USE_PHP= yes
27	USE_PHPEXT= yes	25	USE_PHPEXT= yes
28		26

Lines 1-5 Link Here

(-)files/patch-svn.c (-2 / +52 lines)
1	--- ./svn.c.orig 2009-08-21 08:38:26.000000000 -0400	1	--- svn.c.orig 2010-12-09 04:30:16.000000000 +0100
2	+++ ./svn.c 2009-08-21 08:38:33.000000000 -0400	2	+++ svn.c 2012-02-28 09:46:50.877059221 +0100
3	@@ -34,6 +34,7 @@	3	@@ -34,6 +34,7 @@
4		4
5	#include "apr_version.h"	5	#include "apr_version.h"
Lines 8-10 Link Here
8	#include "svn_sorts.h"	8	#include "svn_sorts.h"
9	#include "svn_config.h"	9	#include "svn_config.h"
10	#include "svn_auth.h"	10	#include "svn_auth.h"
		11	@@ -43,6 +44,7 @@
		12	#include "svn_utf.h"
		13	#include "svn_time.h"
		14	#include "svn_props.h"
		15	+#include "svn_version.h"
		16
		17	ZEND_DECLARE_MODULE_GLOBALS(svn)
		18
		19	@@ -96,7 +98,13 @@
		20	static ZEND_RSRC_DTOR_FUNC(php_svn_repos_dtor)
		21	{
		22	struct php_svn_repos *r = rsrc->ptr;
		23	- svn_pool_destroy(r->pool);
		24	+ /*
		25	+ * If root pool doesn't exist, then this resource's pool was already
		26	+ * destroyed
		27	+ */
		28	+ if (SVN_G(pool)) {
		29	+ svn_pool_destroy(r->pool);
		30	+ }
		31	efree(r);
		32	}
		33
		34	@@ -123,7 +131,7 @@
		35
		36	#define SVN_STATIC_ME(name) ZEND_FENTRY(name, ZEND_FN(svn_ ## name), NULL, ZEND_ACC_PUBLIC \| ZEND_ACC_STATIC)
		37	/** Fixme = this list needs padding out... */
		38	-static function_entry svn_methods[] = {
		39	+static zend_function_entry svn_methods[] = {
		40	SVN_STATIC_ME(cat)
		41	SVN_STATIC_ME(checkout)
		42	SVN_STATIC_ME(log)
		43	@@ -134,7 +142,7 @@
		44
		45
		46	/* {{{ svn_functions[] */
		47	-function_entry svn_functions[] = {
		48	+zend_function_entry svn_functions[] = {
		49	PHP_FE(svn_checkout, NULL)
		50	PHP_FE(svn_cat, NULL)
		51	PHP_FE(svn_ls, NULL)
		52	@@ -270,7 +278,7 @@
		53
		54	smart_str_appendl(&s, "\n", 1);
		55	smart_str_0(&s);
		56	- php_error_docref(NULL TSRMLS_CC, E_WARNING, s.c);
		57	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", s.c);
		58	smart_str_free(&s);
		59	}
		60