php-pecl-graphdat: 1.0.4

3 files changed, 46 insertions, 214 deletions

diff --git a/REFLECTION b/REFLECTION
new file mode 100644
index 0000000..11e6c98
--- /dev/null
+++ b/REFLECTION
@@ -0,0 +1,42 @@
+Extension [ <persistent> extension #92 graphdat version 1.0.4 ] {
+
+  - INI {
+    Entry [ graphdat.socketFile <PERDIR,SYSTEM> ]
+      Current = '/tmp/gd.agent.sock'
+    }
+    Entry [ graphdat.socketPort <PERDIR,SYSTEM> ]
+      Current = '26873'
+    }
+    Entry [ graphdat.debug <PERDIR,SYSTEM> ]
+      Current = 'false'
+    }
+    Entry [ graphdat.enable_joomla <PERDIR,SYSTEM> ]
+      Current = 'false'
+    }
+    Entry [ graphdat.enable_drupal <PERDIR,SYSTEM> ]
+      Current = 'false'
+    }
+    Entry [ graphdat.enable_magento <PERDIR,SYSTEM> ]
+      Current = 'false'
+    }
+    Entry [ graphdat.enable_cakephp <PERDIR,SYSTEM> ]
+      Current = 'false'
+    }
+  }
+
+  - Functions {
+    Function [ <internal:graphdat> function graphdat_begin ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> $name ]
+      }
+    }
+    Function [ <internal:graphdat> function graphdat_end ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> $name ]
+      }
+    }
+  }
+}
+
diff --git a/graphdat-pr5.patch b/graphdat-pr5.patch
deleted file mode 100644
index 1640635..0000000
--- a/graphdat-pr5.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 138bb73a32d8b19feeb9032225caed686f66674b Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Fri, 19 Sep 2014 08:14:40 +0200
-Subject: [PATCH 1/6] add --with-libmsgpack to use system library
-
----
- config.m4    | 47 +++++++++++++++++++++++++++++++++++++----------
- graphdat.c   |  2 +-
- src/timers.h |  2 +-
- 3 files changed, 39 insertions(+), 12 deletions(-)
-
-diff --git a/config.m4 b/config.m4
-index d6b6ac0..435475c 100644
---- a/config.m4
-+++ b/config.m4
-@@ -4,6 +4,9 @@ dnl config.m4 for extension graphdat
- PHP_ARG_ENABLE(graphdat, whether to enable Graphdat support,
- 			  [  --enable-graphdat           Enable Graphdat support])
- 
-+PHP_ARG_WITH(libmsgpack, whether to use system msgpack,
-+			  [  --with-libmsgpack           Use system msgpack], no, no)
-+
- if test "$PHP_GRAPHDAT" != "no"; then
-   dnl # --with-graphdat -> add include path
- 
-@@ -14,21 +17,45 @@ if test "$PHP_GRAPHDAT" != "no"; then
-     src/drupal7.c \
-     src/joomla.c \
-     src/magento.c \
--    src/msgpack/objectc.c \
--    src/msgpack/unpack.c \
--    src/msgpack/version.c \
--    src/msgpack/vrefbuffer.c \
--    src/msgpack/zone.c \
-     src/sockets.c \
-     src/timers.c \
-     src/wordpress.c \
-     src/zendplugin.c"
- 
--  PHP_NEW_EXTENSION(graphdat, $graphdat_sources, $ext_shared)
--  
-+  if test "$PHP_LIBMSGPACK" != "no"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    AC_MSG_CHECKING(msgpack version)
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists msgpack; then
-+      LIBMSGPACK_INCLUDE=`$PKG_CONFIG msgpack --cflags`
-+      LIBMSGPACK_LIBRARY=`$PKG_CONFIG msgpack --libs`
-+      LIBMSGPACK_VERSION=`$PKG_CONFIG msgpack --modversion`
-+    fi
-+
-+    if test -z "$LIBMSGPACK_VERSION"; then
-+      AC_MSG_RESULT(msgpack.pc not found)
-+      AC_CHECK_HEADERS([msgpack.h])
-+      PHP_CHECK_LIBRARY(msgpack, msgpack_version,
-+        [PHP_ADD_LIBRARY(msgpack, 1, GRAPHDAT_SHARED_LIBADD)],
-+        [AC_MSG_ERROR(msgpack library not found)])
-+    else
-+      AC_MSG_RESULT($LIBMSGPACK_VERSION)
-+      PHP_EVAL_INCLINE($LIBMSGPACK_INCLUDE)
-+      PHP_EVAL_LIBLINE($LIBMSGPACK_LIBRARY, GRAPHDAT_SHARED_LIBADD)
-+    fi
-+    PHP_NEW_EXTENSION(graphdat, $graphdat_sources, $ext_shared)
-+    PHP_SUBST(GRAPHDAT_SHARED_LIBADD)
-+  else
-+    graphdat_sources="$graphdat_sources \
-+      src/msgpack/objectc.c \
-+      src/msgpack/unpack.c \
-+      src/msgpack/version.c \
-+      src/msgpack/vrefbuffer.c \
-+      src/msgpack/zone.c"
-+    PHP_NEW_EXTENSION(graphdat, $graphdat_sources, $ext_shared)
-+    PHP_ADD_INCLUDE($ext_srcdir/src/msgpack)
-+    PHP_ADD_BUILD_DIR($ext_builddir/src/msgpack)
-+  fi
-+
-   PHP_ADD_INCLUDE($ext_srcdir/src)
--  PHP_ADD_INCLUDE($ext_srcdir/src/msgpack)
-   PHP_ADD_BUILD_DIR($ext_builddir/src)
--  PHP_ADD_BUILD_DIR($ext_builddir/src/msgpack)
--
- fi
-diff --git a/graphdat.c b/graphdat.c
-index 735d1cb..a2fd714 100644
---- a/graphdat.c
-+++ b/graphdat.c
-@@ -32,7 +32,7 @@
- #include "ext/standard/info.h"
- #include "php_graphdat.h"
- #include "sockets.h"
--#include "msgpack.h"
-+#include <msgpack.h>
- #include "ext/standard/base64.h"
- #include "timers.h"
- #include <string.h>
-diff --git a/src/timers.h b/src/timers.h
-index 384cb5a..0db6020 100644
---- a/src/timers.h
-+++ b/src/timers.h
-@@ -8,7 +8,7 @@
- 
- #include <stddef.h>
- #include <sys/time.h>
--#include "msgpack.h"
-+#include <msgpack.h>
- 
- #ifndef graphdat_sdk_php_timers_h
- #define graphdat_sdk_php_timers_h
-
-From 149a1182a7e503e6a81262b40fad9aeec628e652 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Fri, 19 Sep 2014 08:20:00 +0200
-Subject: [PATCH 2/6] report msgpack version
-
----
- graphdat.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/graphdat.c b/graphdat.c
-index a2fd714..131d238 100644
---- a/graphdat.c
-+++ b/graphdat.c
-@@ -228,6 +228,8 @@ PHP_MINFO_FUNCTION(graphdat)
- {
-   php_info_print_table_start();
-   php_info_print_table_header(2, "graphdat", "enabled");
-+  php_info_print_table_header(2, "msgpack headers version", MSGPACK_VERSION);
-+  php_info_print_table_header(2, "msgpack library version", msgpack_version());
-   php_info_print_table_end();
- 
-   DISPLAY_INI_ENTRIES();
-
-From a93473a771a5c4556da1aa52e471200e2f7e9e9f Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Fri, 19 Sep 2014 08:22:24 +0200
-Subject: [PATCH 3/6] fix version in reflection + report version in phpinfo
-
----
- graphdat.c     | 3 ++-
- package2.xml   | 1 +
- php_graphdat.h | 2 ++
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/graphdat.c b/graphdat.c
-index 131d238..ef721cd 100644
---- a/graphdat.c
-+++ b/graphdat.c
-@@ -86,7 +86,7 @@ zend_module_entry graphdat_module_entry = {
-   PHP_RSHUTDOWN(graphdat),  /* Replace with NULL if there's nothing to do at request end */
-   PHP_MINFO(graphdat),
- #if ZEND_MODULE_API_NO >= 20010901
--  "0.1", /* Replace with version number for your extension */
-+  PHP_GRAPHDAT_VERSION,
- #endif
-   STANDARD_MODULE_PROPERTIES
- };
-@@ -228,6 +228,7 @@ PHP_MINFO_FUNCTION(graphdat)
- {
-   php_info_print_table_start();
-   php_info_print_table_header(2, "graphdat", "enabled");
-+  php_info_print_table_header(2, "graphdat extension version", PHP_GRAPHDAT_VERSION);
-   php_info_print_table_header(2, "msgpack headers version", MSGPACK_VERSION);
-   php_info_print_table_header(2, "msgpack library version", msgpack_version());
-   php_info_print_table_end();
-diff --git a/php_graphdat.h b/php_graphdat.h
-index ae735f4..8a4e3df 100644
---- a/php_graphdat.h
-+++ b/php_graphdat.h
-@@ -21,6 +21,8 @@
- #ifndef PHP_GRAPHDAT_H
- #define PHP_GRAPHDAT_H
- 
-+#define PHP_GRAPHDAT_VERSION "1.0.3"
-+
- #include <sys/time.h>
- #include "timers.h"
- 
-
-From 9947c97b544d32607226cab5e812c92c1bf9d7fe Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Fri, 19 Sep 2014 08:36:23 +0200
-Subject: [PATCH 6/6] add arginfo for reflection
-
----
- graphdat.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/graphdat.c b/graphdat.c
-index ef721cd..812cb85 100644
---- a/graphdat.c
-+++ b/graphdat.c
-@@ -61,12 +61,16 @@ ZEND_DECLARE_MODULE_GLOBALS(graphdat)
- /* True global resources - no need for thread safety here */
- static int le_graphdat;
- 
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_graphdat_name, 0, 0, 1)
-+    ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+
- /*
-  * Every user visible function must have an entry in graphdat_functions[].
-  */
- const zend_function_entry graphdat_functions[] = {
--    PHP_FE(graphdat_begin, NULL)
--    PHP_FE(graphdat_end, NULL)
-+    PHP_FE(graphdat_begin, arginfo_graphdat_name)
-+    PHP_FE(graphdat_end,   arginfo_graphdat_name)
-     PHP_FE_END  /* Must be the last line in graphdat_functions[] */
- };
- 
diff --git a/php-pecl-graphdat.spec b/php-pecl-graphdat.spec
index 55317e6..44ef99a 100644
--- a/php-pecl-graphdat.spec
+++ b/php-pecl-graphdat.spec
@@ -26,7 +26,7 @@
 
 Summary:       Troubleshoot application and server performance
 Name:          %{?scl_prefix}php-pecl-graphdat
-Version:       1.0.3
+Version:       1.0.4
 Release:       1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 # https://github.com/alphashack/graphdat-sdk-php/issues/6
 License:       ASL 2.0
@@ -34,9 +34,6 @@ Group:         Development/Languages
 URL:           http://pecl.php.net/package/%{pecl_name}
 Source:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-# https://github.com/alphashack/graphdat-sdk-php/pull/5
-Patch0:        %{pecl_name}-pr5.patch
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: %{?scl_prefix}php-devel
 BuildRequires: %{?scl_prefix}php-pear
@@ -102,7 +99,6 @@ sed -e 's/role="test"/role="src"/' \
 
 mv %{pecl_name}-%{version} NTS
 cd NTS
-%patch0 -p1 -b .pr5
 
 %if %{with_msgpack}
 # use system library
@@ -226,6 +222,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 06 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-1
+- Update to 1.0.4
+
 * Fri Sep 19 2014 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
 - initial package, version 1.0.3 (stable)
 - open https://github.com/alphashack/graphdat-sdk-php/pull/5