ports/165524: [PATCH] devel/pecl-svn: unbreak with svn 1.7 and other fixes
Martin Matuska
mm at FreeBSD.org
Tue Feb 28 09:20:08 UTC 2012
>Number: 165524
>Category: ports
>Synopsis: [PATCH] devel/pecl-svn: unbreak with svn 1.7 and other fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 28 09:20:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 9.0-STABLE FreeBSD 9.0-STABLE #26 r232157M: Tue Feb 28 09:16:48 CET
>Description:
Add patch for vendor issues:
#22100 segfault on shutdown when using multiple repositories
#15505 warning on errors
#59976 svn build fails on PHP5.4
#60583 compile failing due to missing definition of svn_version_t in newer
releases of libsvn
Unbreak build with subversion 1.7
Minor Makefile fixes.
Port maintainer (miwi at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- pecl-svn-1.0.1_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/pecl-svn/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 16 Oct 2011 14:31:45 -0000 1.23
+++ Makefile 28 Feb 2012 09:16:38 -0000
@@ -7,22 +7,20 @@
PORTNAME= svn
PORTVERSION= 1.0.1
-PORTREVISION= 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 at FreeBSD.org
COMMENT= A PECL extension to the libsvn library
-LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion16
+LICENSE= PHP301
-CONFLICTS_BUILD=subversion-1.7.[0-9]*
+LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion16
-LICENSE= PHP301
USE_PHP= yes
USE_PHPEXT= yes
Index: files/patch-svn.c
===================================================================
RCS file: /home/pcvs/ports/devel/pecl-svn/files/patch-svn.c,v
retrieving revision 1.1
diff -u -r1.1 patch-svn.c
--- files/patch-svn.c 21 Aug 2009 13:37:46 -0000 1.1
+++ files/patch-svn.c 28 Feb 2012 09:16:38 -0000
@@ -1,5 +1,5 @@
---- ./svn.c.orig 2009-08-21 08:38:26.000000000 -0400
-+++ ./svn.c 2009-08-21 08:38:33.000000000 -0400
+--- 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"
@@ -8,3 +8,53 @@
#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);
+ }
+
--- pecl-svn-1.0.1_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list