Fixed SVN 1.9 support

3 files changed, 135 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 803f4f997cb7..e729ef7bff69 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Jan  4 02:17:12 UTC 2016
+# Sun Apr 10 21:09:57 UTC 2016
 pkgbase = php-svn
 	pkgdesc = PHP PECL extension to provide bindings for the Subversion revision control system
 	pkgver = 1.0.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://pecl.php.net/package/svn
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 444bfea3eac3..3b134aa5f257 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='php-svn'
 pkgver='1.0.2'
-pkgrel='3'
+pkgrel='4'
 pkgdesc='PHP PECL extension to provide bindings for the Subversion revision control system'
 arch=('i686' 'x86_64')
 url='https://pecl.php.net/package/svn'
@@ -13,9 +13,11 @@ sha256sums=('ca0ea834e745a1aae65b456800bb5c5cfd7c4eceff281f7a8e317d30726e48cd')
 
 build() {
     cd "$srcdir/svn-$pkgver"
+    patch -p1 < ../../support-subversion-1.9.x.patch.txt
     phpize
     ./configure \
-    --prefix=/usr
+    --prefix=/usr \
+    --with-php-config=/usr/bin/php-config56
     make
     echo 'extension=svn.so' > svn.ini
 }
diff --git a/support-subversion-1.9.x.patch.txt b/support-subversion-1.9.x.patch.txt
new file mode 100644
index 000000000000..0d922bb4b6de
--- /dev/null
+++ b/support-subversion-1.9.x.patch.txt
@@ -0,0 +1,129 @@
+--- svn-1.0.2/svn.c.orig	2016-03-18 01:26:42.445815819 +0000
++++ svn-1.0.2/svn.c	2016-03-18 08:09:45.861130251 +0000
+@@ -856,6 +856,14 @@
+ }
+ /* }}} */
+ 
++static int compare_keys(const void *a, const void *b) /* {{{ */
++{
++	Bucket *f = *((Bucket **) a);
++	Bucket *s = *((Bucket **) b);
++
++	return strcmp(f->arKey, s->arKey);
++}
++/* }}} */
+ 
+ /* {{{ proto array svn_ls(string repository_url [, int revision [, bool recurse [, bool peg]]])
+ 	Returns a list of a directory in a working copy or repository, optionally at revision_no. */
+@@ -868,8 +876,6 @@
+ 	svn_error_t *err;
+ 	svn_opt_revision_t revision = { 0 };
+ 	apr_hash_t *dirents;
+-	apr_array_header_t *array;
+-	int i;
+ 	apr_pool_t *subpool;
+ 	svn_opt_revision_t peg_revision;
+ 	const char *true_path;
+@@ -916,14 +922,11 @@
+ 		goto cleanup;
+ 	}
+ 
+-	array = svn_sort__hash (dirents, svn_sort_compare_items_as_paths, subpool);
+ 	array_init(return_value);
+ 
+-	for (i = 0; i < array->nelts; ++i)
+-	{
++	for (apr_hash_index_t *hi = apr_hash_first(subpool, dirents); hi; hi = apr_hash_next(hi)) {
+ 		const char *utf8_entryname;
+ 		svn_dirent_t *dirent;
+-		svn_sort__item_t *item;
+ 		apr_time_t now = apr_time_now();
+ 		apr_time_exp_t exp_time;
+ 		apr_status_t apr_err;
+@@ -932,9 +935,8 @@
+ 		const char   *utf8_timestr;
+ 		zval 	*row;
+ 
+-		item = &APR_ARRAY_IDX (array, i, svn_sort__item_t);
+-		utf8_entryname = item->key;
+-		dirent = apr_hash_get (dirents, utf8_entryname, item->klen);
++		svn_utf_cstring_to_utf8 (&utf8_entryname, apr_hash_this_key(hi), subpool);
++		dirent = apr_hash_this_val(hi);
+ 
+ 		/* svn_time_to_human_cstring gives us something *way* too long
+ 		to use for this, so we have to roll our own.  We include
+@@ -972,12 +974,24 @@
+ 		add_assoc_zval(return_value, (char *)utf8_entryname, row);
+ 	}
+ 
++	zend_hash_sort(Z_ARRVAL_P(return_value), zend_qsort, compare_keys, 0);
++
+ cleanup:
+ 	svn_pool_destroy(subpool);
+ 
+ }
+ /* }}} */
+ 
++
++static int compare_keys_as_paths(const void *a, const void *b)  /* {{{ */
++{
++	Bucket *f = *((Bucket **) a);
++	Bucket *s = *((Bucket **) b);
++
++	return svn_sort_compare_paths(&(f->arKey), &(s->arKey));
++}
++/* }}} */
++
+ static svn_error_t *
+ php_svn_log_receiver (	void *ibaton,
+ 				apr_hash_t *changed_paths,
+@@ -989,8 +1003,6 @@
+ {
+ 	struct php_svn_log_receiver_baton *baton = (struct php_svn_log_receiver_baton*) ibaton;
+ 	zval  *row, *paths;
+-	apr_array_header_t *sorted_paths;
+-	int i;
+ 	TSRMLS_FETCH();
+ 
+ 	if (rev == 0) {
+@@ -1017,23 +1029,19 @@
+ 		MAKE_STD_ZVAL(paths);
+ 		array_init(paths);
+ 
+-		sorted_paths = svn_sort__hash(changed_paths, svn_sort_compare_items_as_paths, pool);
+-
+-		for (i = 0; i < sorted_paths->nelts; i++)
+-		{
+-			svn_sort__item_t *item;
++		for (apr_hash_index_t *hi = apr_hash_first(pool, changed_paths); hi; hi = apr_hash_next(hi)) {
+ 			svn_log_changed_path_t *log_item;
+ 			zval *zpaths;
+ 			const char *path;
+ 
+ 			MAKE_STD_ZVAL(zpaths);
+ 			array_init(zpaths);
+-			item = &(APR_ARRAY_IDX (sorted_paths, i, svn_sort__item_t));
+-			path = item->key;
+-			log_item = apr_hash_get (changed_paths, item->key, item->klen);
++
++			path = apr_hash_this_key(hi);
++			log_item = apr_hash_this_val(hi);
+ 
+ 			add_assoc_stringl(zpaths, "action", &(log_item->action), 1,1);
+-			add_assoc_string(zpaths, "path", (char *) item->key, 1);
++			add_assoc_string(zpaths, "path", path, 1);
+ 
+ 			if (log_item->copyfrom_path
+ 					&& SVN_IS_VALID_REVNUM (log_item->copyfrom_rev)) {
+@@ -1043,8 +1051,10 @@
+ 
+ 			}
+ 
+-			add_next_index_zval(paths,zpaths);
++			add_assoc_zval(paths, path, zpaths);
+ 		}
++
++		zend_hash_sort(Z_ARRVAL_P(paths), zend_qsort, compare_keys_as_paths, 1);
+ 		add_assoc_zval(row,"paths",paths);
+ 	}
+