From nobody@FreeBSD.org  Wed Jun 20 08:01:45 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B9381065674
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jun 2012 08:01:45 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 755578FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jun 2012 08:01:45 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q5K81jj0025387
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jun 2012 08:01:45 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q5K81jL5025386;
	Wed, 20 Jun 2012 08:01:45 GMT
	(envelope-from nobody)
Message-Id: <201206200801.q5K81jL5025386@red.freebsd.org>
Date: Wed, 20 Jun 2012 08:01:45 GMT
From: Valery Komarov <komarov@valerka.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER UPDATE] devel/php5-msgpack
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         169261
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] devel/php5-msgpack
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    scheidell
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 20 08:10:09 UTC 2012
>Closed-Date:    Mon Jun 25 11:08:47 UTC 2012
>Last-Modified:  Mon Jun 25 11:20:03 UTC 2012
>Originator:     Valery Komarov
>Release:        FreeBSD 9-STABLE amd64
>Organization:
>Environment:
>Description:
The official version of the code has been integrated into the MessagePack project. 
https://github.com/msgpack/msgpack/tree/master/php/

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/devel/php5-msgpack/Makefile php5-msgpack/Makefile
--- /usr/ports/devel/php5-msgpack/Makefile	2012-05-29 15:28:42.036505265 +0400
+++ php5-msgpack/Makefile	2012-06-20 12:00:47.264502804 +0400
@@ -6,20 +6,28 @@
 #
 
 PORTNAME=	msgpack
-PORTVERSION=	0.5.4
+PORTVERSION=	2012.05.05
 CATEGORIES=	devel
-MASTER_SITES=	http://php-msgpack.googlecode.com/files/
+MASTER_SITES=	https://github.com/${GITHUB_USER}/${GITHUB_REPO}/tarball/${GITVERSION}/
 PKGNAMEPREFIX=	php5-
-DISTNAME=	php-msgpack-0.5.3
+DISTNAME=	msgpack-msgpack-${GITVERSION}
+
+GITHUB_USER=	msgpack
+GITHUB_REPO=	msgpack
+GITVERSION=	980a652
+FETCH_ARGS=	-pRr
 
 MAINTAINER=	komarov@valerka.net
 COMMENT=	PHP extension for interfacing with MessagePack
 
-WRKSRC=		${WRKDIR}/php-msgpack
+WRKSRC=		${WRKDIR}/msgpack-msgpack-${GITVERSION}/php
 
 USE_PHP=	session
 USE_PHPIZE=	yes
 USE_PHPEXT=	yes
 PHP_MODNAME=	msgpack
 
+BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/session.so:${PORTSDIR}/www/php5-session
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
 .include <bsd.port.mk>
diff -ruN /usr/ports/devel/php5-msgpack/distinfo php5-msgpack/distinfo
--- /usr/ports/devel/php5-msgpack/distinfo	2012-01-08 05:49:13.000000000 +0400
+++ php5-msgpack/distinfo	2012-06-20 11:44:16.000503469 +0400
@@ -1,2 +1,2 @@
-SHA256 (php-msgpack-0.5.3.tar.gz) = 9eb0fb03b66bab5994607c7bc1f7aef9a738af173e6e4f65965a2c2ad8e6336c
-SIZE (php-msgpack-0.5.3.tar.gz) = 86591
+SHA256 (msgpack-msgpack-980a652.tar.gz) = 0a293eeb110fd24bd42bae5d35bab82a6bfc796ac62f793f47c14a2ce1da5b4d
+SIZE (msgpack-msgpack-980a652.tar.gz) = 224300
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack.c php5-msgpack/files/patch-msgpack.c
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack.c	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack.c	1970-01-01 03:00:00.000000000 +0300
@@ -1,72 +0,0 @@
---- ./msgpack.c.orig	2011-10-31 10:15:40.000000000 +0400
-+++ ./msgpack.c	2012-05-28 15:06:00.763502625 +0400
-@@ -141,11 +141,15 @@
- PS_SERIALIZER_ENCODE_FUNC(msgpack)
- {
-     smart_str buf = {0};
--    php_serialize_data_t var_hash;
-+    msgpack_serialize_data_t var_hash;
- 
-     PHP_VAR_SERIALIZE_INIT(var_hash);
- 
-+#if PHP_API_VERSION < 20100412
-     msgpack_serialize_zval(&buf, PS(http_session_vars), &var_hash TSRMLS_CC);
-+#else
-+    msgpack_serialize_zval(&buf, PS(http_session_vars), var_hash TSRMLS_CC);
-+#endif
- 
-     if (newlen)
-     {
-@@ -172,7 +176,7 @@
-     zval **value;
-     size_t off = 0;
-     msgpack_unpack_t mp;
--    php_unserialize_data_t var_hash;
-+    msgpack_unserialize_data_t var_hash;
- 
-     ALLOC_INIT_ZVAL(tmp);
- 
-@@ -181,7 +185,7 @@
-     msgpack_unserialize_var_init(&var_hash);
- 
-     mp.user.retval = (zval *)tmp;
--    mp.user.var_hash = (php_unserialize_data_t *)&var_hash;
-+    mp.user.var_hash = (msgpack_unserialize_data_t *)&var_hash;
- 
-     ret = template_execute(&mp, (char *)val, (size_t)vallen, &off);
- 
-@@ -224,11 +228,15 @@
- 
- PHP_MSGPACK_API void php_msgpack_serialize(smart_str *buf, zval *val TSRMLS_DC)
- {
--    php_serialize_data_t var_hash;
-+    msgpack_serialize_data_t var_hash;
- 
-     PHP_VAR_SERIALIZE_INIT(var_hash);
- 
-+#if PHP_API_VERSION < 20100412
-     msgpack_serialize_zval(buf, val, &var_hash TSRMLS_CC);
-+#else
-+    msgpack_serialize_zval(buf, val, var_hash TSRMLS_CC);
-+#endif
- 
-     PHP_VAR_SERIALIZE_DESTROY(var_hash);
- }
-@@ -239,7 +247,7 @@
-     int ret;
-     size_t off = 0;
-     msgpack_unpack_t mp;
--    php_unserialize_data_t var_hash;
-+    msgpack_unserialize_data_t var_hash;
- 
-     if (str_len <= 0)
-     {
-@@ -251,7 +259,7 @@
-     msgpack_unserialize_var_init(&var_hash);
- 
-     mp.user.retval = (zval *)return_value;
--    mp.user.var_hash = (php_unserialize_data_t *)&var_hash;
-+    mp.user.var_hash = (msgpack_unserialize_data_t *)&var_hash;
- 
-     ret = template_execute(&mp, str, (size_t)str_len, &off);
- 
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack__pack_template.h php5-msgpack/files/patch-msgpack__pack_template.h
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack__pack_template.h	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack__pack_template.h	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./msgpack/pack_template.h.orig	2011-10-06 05:03:16.000000000 +0400
-+++ ./msgpack/pack_template.h	2012-05-28 15:06:00.762504244 +0400
-@@ -728,7 +728,7 @@
- msgpack_pack_inline_func(_raw)(msgpack_pack_user x, size_t l)
- {
- 	if(l < 32) {
--		unsigned char d = 0xa0 | (uint8_t)l;
-+		unsigned char d = 0xa0 | l;
- 		msgpack_pack_append_buffer(x, &TAKE8_8(d), 1);
- 	} else if(l < 65536) {
- 		unsigned char buf[3];
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack__sysdep.h php5-msgpack/files/patch-msgpack__sysdep.h
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack__sysdep.h	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack__sysdep.h	1970-01-01 03:00:00.000000000 +0300
@@ -1,170 +0,0 @@
---- ./msgpack/sysdep.h.orig	2011-10-06 05:01:16.000000000 +0400
-+++ ./msgpack/sysdep.h	2012-05-28 15:06:00.762504244 +0400
-@@ -36,20 +36,20 @@
- #include <stdbool.h>
- #endif
- 
-+
- #ifdef _WIN32
--#define _msgpack_atomic_counter_header <windows.h>
- typedef long _msgpack_atomic_counter_t;
- #define _msgpack_sync_decr_and_fetch(ptr) InterlockedDecrement(ptr)
- #define _msgpack_sync_incr_and_fetch(ptr) InterlockedIncrement(ptr)
--#elif defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41)
--#define _msgpack_atomic_counter_header "gcc_atomic.h"
- #else
- typedef unsigned int _msgpack_atomic_counter_t;
- #define _msgpack_sync_decr_and_fetch(ptr) __sync_sub_and_fetch(ptr, 1)
- #define _msgpack_sync_incr_and_fetch(ptr) __sync_add_and_fetch(ptr, 1)
- #endif
- 
-+
- #ifdef _WIN32
-+#include <winsock2.h>
- 
- #ifdef __cplusplus
- /* numeric_limits<T>::min,max */
-@@ -70,45 +70,15 @@
- #define __LITTLE_ENDIAN__
- #elif __BYTE_ORDER == __BIG_ENDIAN
- #define __BIG_ENDIAN__
--#elif _WIN32
--#define __LITTLE_ENDIAN__
- #endif
- #endif
- 
--
- #ifdef __LITTLE_ENDIAN__
- 
--#ifdef _WIN32
--#  if defined(ntohs)
--#    define _msgpack_be16(x) ntohs(x)
--#  elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
--#    define _msgpack_be16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
--#  else
--#    define _msgpack_be16(x) ( \
--        ((((uint16_t)x) <<  8) ) | \
--        ((((uint16_t)x) >>  8) ) )
--#  endif
--#else
--#  define _msgpack_be16(x) ntohs(x)
--#endif
--
--#ifdef _WIN32
--#  if defined(ntohl)
--#    define _msgpack_be32(x) ntohl(x)
--#  elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
--#    define _msgpack_be32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
--#  else
--#    define _msgpack_be32(x) \
--        ( ((((uint32_t)x) << 24)               ) | \
--          ((((uint32_t)x) <<  8) & 0x00ff0000U ) | \
--          ((((uint32_t)x) >>  8) & 0x0000ff00U ) | \
--          ((((uint32_t)x) >> 24)               ) )
--#  endif
--#else
--#  define _msgpack_be32(x) ntohl(x)
--#endif
-+#define _msgpack_be16(x) ntohs(x)
-+#define _msgpack_be32(x) ntohl(x)
- 
--#if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400)
-+#if defined(_byteswap_uint64) || _MSC_VER >= 1400
- #  define _msgpack_be64(x) (_byteswap_uint64(x))
- #elif defined(bswap_64)
- #  define _msgpack_be64(x) bswap_64(x)
-@@ -116,79 +86,34 @@
- #  define _msgpack_be64(x) __DARWIN_OSSwapInt64(x)
- #else
- #define _msgpack_be64(x) \
--    ( ((((uint64_t)x) << 56)                         ) | \
--      ((((uint64_t)x) << 40) & 0x00ff000000000000ULL ) | \
--      ((((uint64_t)x) << 24) & 0x0000ff0000000000ULL ) | \
--      ((((uint64_t)x) <<  8) & 0x000000ff00000000ULL ) | \
--      ((((uint64_t)x) >>  8) & 0x00000000ff000000ULL ) | \
--      ((((uint64_t)x) >> 24) & 0x0000000000ff0000ULL ) | \
--      ((((uint64_t)x) >> 40) & 0x000000000000ff00ULL ) | \
--      ((((uint64_t)x) >> 56)                         ) )
-+	( ((((uint64_t)x) << 56) & 0xff00000000000000ULL ) | \
-+	  ((((uint64_t)x) << 40) & 0x00ff000000000000ULL ) | \
-+	  ((((uint64_t)x) << 24) & 0x0000ff0000000000ULL ) | \
-+	  ((((uint64_t)x) <<  8) & 0x000000ff00000000ULL ) | \
-+	  ((((uint64_t)x) >>  8) & 0x00000000ff000000ULL ) | \
-+	  ((((uint64_t)x) >> 24) & 0x0000000000ff0000ULL ) | \
-+	  ((((uint64_t)x) >> 40) & 0x000000000000ff00ULL ) | \
-+	  ((((uint64_t)x) >> 56) & 0x00000000000000ffULL ) )
- #endif
- 
--#define _msgpack_load16(cast, from) ((cast)( \
--        (((uint16_t)((uint8_t*)(from))[0]) << 8) | \
--        (((uint16_t)((uint8_t*)(from))[1])     ) ))
--
--#define _msgpack_load32(cast, from) ((cast)( \
--        (((uint32_t)((uint8_t*)(from))[0]) << 24) | \
--        (((uint32_t)((uint8_t*)(from))[1]) << 16) | \
--        (((uint32_t)((uint8_t*)(from))[2]) <<  8) | \
--        (((uint32_t)((uint8_t*)(from))[3])      ) ))
--
--#define _msgpack_load64(cast, from) ((cast)( \
--        (((uint64_t)((uint8_t*)(from))[0]) << 56) | \
--        (((uint64_t)((uint8_t*)(from))[1]) << 48) | \
--        (((uint64_t)((uint8_t*)(from))[2]) << 40) | \
--        (((uint64_t)((uint8_t*)(from))[3]) << 32) | \
--        (((uint64_t)((uint8_t*)(from))[4]) << 24) | \
--        (((uint64_t)((uint8_t*)(from))[5]) << 16) | \
--        (((uint64_t)((uint8_t*)(from))[6]) << 8)  | \
--        (((uint64_t)((uint8_t*)(from))[7])     )  ))
--
- #else
--
- #define _msgpack_be16(x) (x)
- #define _msgpack_be32(x) (x)
- #define _msgpack_be64(x) (x)
--
--#define _msgpack_load16(cast, from) ((cast)( \
--        (((uint16_t)((uint8_t*)from)[1]) << 8) | \
--        (((uint16_t)((uint8_t*)from)[0])     ) ))
--
--#define _msgpack_load32(cast, from) ((cast)( \
--        (((uint32_t)((uint8_t*)from)[3]) << 24) | \
--        (((uint32_t)((uint8_t*)from)[2]) << 16) | \
--        (((uint32_t)((uint8_t*)from)[1]) <<  8) | \
--        (((uint32_t)((uint8_t*)from)[0])      ) ))
--
--#define _msgpack_load64(cast, from) ((cast)( \
--        (((uint64_t)((uint8_t*)from)[7]) << 56) | \
--        (((uint64_t)((uint8_t*)from)[6]) << 48) | \
--        (((uint64_t)((uint8_t*)from)[5]) << 40) | \
--        (((uint64_t)((uint8_t*)from)[4]) << 32) | \
--        (((uint64_t)((uint8_t*)from)[3]) << 24) | \
--        (((uint64_t)((uint8_t*)from)[2]) << 16) | \
--        (((uint64_t)((uint8_t*)from)[1]) << 8)  | \
--        (((uint64_t)((uint8_t*)from)[0])     )  ))
- #endif
- 
- 
- #define _msgpack_store16(to, num) \
--    do { uint16_t val = _msgpack_be16(num); memcpy(to, &val, 2); } while(0)
-+	do { uint16_t val = _msgpack_be16(num); memcpy(to, &val, 2); } while(0);
- #define _msgpack_store32(to, num) \
--    do { uint32_t val = _msgpack_be32(num); memcpy(to, &val, 4); } while(0)
-+	do { uint32_t val = _msgpack_be32(num); memcpy(to, &val, 4); } while(0);
- #define _msgpack_store64(to, num) \
--    do { uint64_t val = _msgpack_be64(num); memcpy(to, &val, 8); } while(0)
-+	do { uint64_t val = _msgpack_be64(num); memcpy(to, &val, 8); } while(0);
- 
--/*
--#define _msgpack_load16(cast, from) \
--    ({ cast val; memcpy(&val, (char*)from, 2); _msgpack_be16(val); })
--#define _msgpack_load32(cast, from) \
--    ({ cast val; memcpy(&val, (char*)from, 4); _msgpack_be32(val); })
--#define _msgpack_load64(cast, from) \
--    ({ cast val; memcpy(&val, (char*)from, 8); _msgpack_be64(val); })
--*/
-+
-+#define _msgpack_load16(cast, from) ((cast)_msgpack_be16(*(uint16_t*)from))
-+#define _msgpack_load32(cast, from) ((cast)_msgpack_be32(*(uint32_t*)from))
-+#define _msgpack_load64(cast, from) ((cast)_msgpack_be64(*(uint64_t*)from))
- 
- 
- #endif /* msgpack/sysdep.h */
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack__version.h php5-msgpack/files/patch-msgpack__version.h
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack__version.h	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack__version.h	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./msgpack/version.h.orig	2011-10-06 05:01:43.000000000 +0400
-+++ ./msgpack/version.h	2012-05-28 15:06:00.763502625 +0400
-@@ -27,7 +27,7 @@
- int msgpack_version_major(void);
- int msgpack_version_minor(void);
- 
--#define MSGPACK_VERSION "0.5.7"
-+#define MSGPACK_VERSION "0.5.4"
- #define MSGPACK_VERSION_MAJOR 0
- #define MSGPACK_VERSION_MINOR 5
- 
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack_class.c php5-msgpack/files/patch-msgpack_class.c
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack_class.c	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack_class.c	1970-01-01 03:00:00.000000000 +0300
@@ -1,90 +0,0 @@
---- ./msgpack_class.c.orig	2011-11-01 05:15:37.000000000 +0400
-+++ ./msgpack_class.c	2012-05-28 15:06:00.763502625 +0400
-@@ -19,7 +19,7 @@
-     zval *retval;
-     long offset;
-     msgpack_unpack_t mp;
--    php_unserialize_data_t var_hash;
-+    msgpack_unserialize_data_t var_hash;
-     long php_only;
-     zend_bool finished;
-     int error;
-@@ -188,8 +188,10 @@
- static zend_object_value php_msgpack_base_new(zend_class_entry *ce TSRMLS_DC)
- {
-     zend_object_value retval;
--    zval *tmp;
-     php_msgpack_base_t *base;
-+#if PHP_API_VERSION < 20100412
-+    zval *tmp;
-+#endif
- 
-     base = emalloc(sizeof(php_msgpack_base_t));
- 
-@@ -201,9 +203,13 @@
-     base->object.ce = ce;
- #endif
- 
-+#if PHP_API_VERSION < 20100412
-     zend_hash_copy(
-         base->object.properties, &ce->default_properties,
-         (copy_ctor_func_t)zval_add_ref, (void *)&tmp, sizeof(zval *));
-+#else
-+    object_properties_init(&base->object, ce);
-+#endif
- 
-     retval.handle = zend_objects_store_put(
-         base, (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -233,8 +239,10 @@
-     zend_class_entry *ce TSRMLS_DC)
- {
-     zend_object_value retval;
--    zval *tmp;
-     php_msgpack_unpacker_t *unpacker;
-+#if PHP_API_VERSION < 20100412
-+    zval *tmp;
-+#endif
- 
-     unpacker = emalloc(sizeof(php_msgpack_unpacker_t));
- 
-@@ -246,9 +254,13 @@
-     unpacker->object.ce = ce;
- #endif
- 
-+#if PHP_API_VERSION < 20100412
-     zend_hash_copy(
-         unpacker->object.properties, &ce->default_properties,
-         (copy_ctor_func_t)zval_add_ref, (void *)&tmp, sizeof(zval *));
-+#else
-+    object_properties_init(&unpacker->object, ce);
-+#endif
- 
-     retval.handle = zend_objects_store_put(
-         unpacker, (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -410,7 +422,7 @@
-     msgpack_unserialize_var_init(&unpacker->var_hash);
- 
-     (&unpacker->mp)->user.var_hash =
--        (php_unserialize_data_t *)&unpacker->var_hash;
-+        (msgpack_unserialize_data_t *)&unpacker->var_hash;
- }
- 
- static ZEND_METHOD(msgpack_unpacker, __destruct)
-@@ -533,7 +545,7 @@
-         msgpack_unserialize_var_init(&unpacker->var_hash);
- 
-         (&unpacker->mp)->user.var_hash =
--            (php_unserialize_data_t *)&unpacker->var_hash;
-+            (msgpack_unserialize_data_t *)&unpacker->var_hash;
-     }
-     (&unpacker->mp)->user.retval = (zval *)unpacker->retval;
- 
-@@ -649,7 +661,7 @@
-     msgpack_unserialize_var_init(&unpacker->var_hash);
- 
-     (&unpacker->mp)->user.var_hash =
--        (php_unserialize_data_t *)&unpacker->var_hash;
-+        (msgpack_unserialize_data_t *)&unpacker->var_hash;
- }
- 
- void msgpack_init_class()
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack_pack.c php5-msgpack/files/patch-msgpack_pack.c
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack_pack.c	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack_pack.c	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./msgpack_pack.c.orig	2011-10-31 10:07:38.000000000 +0400
-+++ ./msgpack_pack.c	2012-05-28 15:06:00.764503031 +0400
-@@ -439,7 +439,7 @@
-             msgpack_pack_nil(buf);
-             msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_CUSTOM_OBJECT);
- 
--            msgpack_serialize_string(buf, ce->name, ce->name_length);
-+            msgpack_serialize_string(buf, (char *)ce->name, ce->name_length);
-             msgpack_pack_raw(buf, serialized_length);
-             msgpack_pack_raw_body(buf, serialized_data, serialized_length);
-         }
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack_pack.h php5-msgpack/files/patch-msgpack_pack.h
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack_pack.h	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack_pack.h	1970-01-01 03:00:00.000000000 +0300
@@ -1,17 +0,0 @@
---- ./msgpack_pack.h.orig	2011-07-27 09:50:36.000000000 +0400
-+++ ./msgpack_pack.h	2012-05-28 15:06:00.764503031 +0400
-@@ -2,7 +2,13 @@
- #ifndef MSGPACK_PACK_H
- #define MSGPACK_PACK_H
- 
--#include "ext/standard/php_smart_str.h"
-+#include "ext/standard/php_var.h"
-+
-+#if PHP_API_VERSION < 20100412
-+#define msgpack_serialize_data_t HashTable
-+#else
-+typedef HashTable* msgpack_serialize_data_t;
-+#endif
- 
- enum msgpack_serialize_type
- {
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack_unpack.c php5-msgpack/files/patch-msgpack_unpack.c
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack_unpack.c	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack_unpack.c	1970-01-01 03:00:00.000000000 +0300
@@ -1,55 +0,0 @@
---- ./msgpack_unpack.c.orig	2011-11-02 14:17:41.000000000 +0400
-+++ ./msgpack_unpack.c	2012-05-28 15:06:00.765503368 +0400
-@@ -54,7 +54,7 @@
-     MSGPACK_UNSERIALIZE_FINISH_ITEM(_unpack, 2);
- 
- inline static void msgpack_var_push(
--    php_unserialize_data_t *var_hashx, zval **rval)
-+    msgpack_unserialize_data_t *var_hashx, zval **rval)
- {
-     var_entries *var_hash, *prev = NULL;
- 
-@@ -91,7 +91,7 @@
- }
- 
- inline static int msgpack_var_access(
--    php_unserialize_data_t *var_hashx, long id, zval ***store)
-+    msgpack_unserialize_data_t *var_hashx, long id, zval ***store)
- {
-     var_entries *var_hash = var_hashx->first;
- 
-@@ -118,7 +118,7 @@
- }
- 
- inline static void msgpack_stack_push(
--    php_unserialize_data_t *var_hashx, zval **rval, zend_bool save)
-+    msgpack_unserialize_data_t *var_hashx, zval **rval, zend_bool save)
- {
-     var_entries *var_hash, *prev = NULL;
- 
-@@ -162,7 +162,7 @@
- }
- 
- inline static void msgpack_stack_pop(
--    php_unserialize_data_t *var_hashx, long count)
-+    msgpack_unserialize_data_t *var_hashx, long count)
- {
-     long i;
-     var_entries *var_hash = var_hashx->first_dtor;
-@@ -280,14 +280,14 @@
-     return ce;
- }
- 
--void msgpack_unserialize_var_init(php_unserialize_data_t *var_hashx)
-+void msgpack_unserialize_var_init(msgpack_unserialize_data_t *var_hashx)
- {
-     var_hashx->first = 0;
-     var_hashx->first_dtor = 0;
- }
- 
- void msgpack_unserialize_var_destroy(
--    php_unserialize_data_t *var_hashx, zend_bool err)
-+    msgpack_unserialize_data_t *var_hashx, zend_bool err)
- {
-     void *next;
-     long i;
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-msgpack_unpack.h php5-msgpack/files/patch-msgpack_unpack.h
--- /usr/ports/devel/php5-msgpack/files/patch-msgpack_unpack.h	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-msgpack_unpack.h	1970-01-01 03:00:00.000000000 +0300
@@ -1,25 +0,0 @@
---- ./msgpack_unpack.h.orig	2011-07-27 09:50:36.000000000 +0400
-+++ ./msgpack_unpack.h	2012-05-28 15:06:00.765503368 +0400
-@@ -16,17 +16,19 @@
-     MSGPACK_UNPACK_PARSE_ERROR = -1,
- } msgpack_unpack_return;
- 
-+typedef struct php_unserialize_data msgpack_unserialize_data_t;
-+
- typedef struct {
-     zval *retval;
-     long deps;
--    php_unserialize_data_t *var_hash;
-+    msgpack_unserialize_data_t *var_hash;
-     long stack[MSGPACK_EMBED_STACK_SIZE];
-     int type;
- } msgpack_unserialize_data;
- 
--void msgpack_unserialize_var_init(php_unserialize_data_t *var_hashx);
-+void msgpack_unserialize_var_init(msgpack_unserialize_data_t *var_hashx);
- void msgpack_unserialize_var_destroy(
--    php_unserialize_data_t *var_hashx, zend_bool err);
-+    msgpack_unserialize_data_t *var_hashx, zend_bool err);
- 
- void msgpack_unserialize_init(msgpack_unserialize_data *unpack);
- 
diff -ruN /usr/ports/devel/php5-msgpack/files/patch-php_msgpack.h php5-msgpack/files/patch-php_msgpack.h
--- /usr/ports/devel/php5-msgpack/files/patch-php_msgpack.h	2012-05-29 12:36:02.000000000 +0400
+++ php5-msgpack/files/patch-php_msgpack.h	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./php_msgpack.h.orig	2011-10-31 05:25:28.000000000 +0400
-+++ ./php_msgpack.h	2012-05-28 15:06:00.766503914 +0400
-@@ -2,7 +2,7 @@
- #ifndef PHP_MSGPACK_H
- #define PHP_MSGPACK_H
- 
--#define MSGPACK_EXTENSION_VERSION "0.5.3"
-+#define MSGPACK_EXTENSION_VERSION "0.5.4"
- 
- #include "ext/standard/php_smart_str.h"
- 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jun 20 08:10:22 UTC 2012 
Responsible-Changed-Why:  
scheidell@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169261 
State-Changed-From-To: open->feedback 
State-Changed-By: scheidell 
State-Changed-When: Wed Jun 20 08:12:20 UTC 2012 
State-Changed-Why:  
The ports auditors are going to ask me, so I need to ask you: 
-SHA256 (php-msgpack-0.5.3.tar.gz) = 9eb0fb03b66bab5994607c7bc1f7aef9a738af173e6e4f65965a2c2ad8e6336c 
-SIZE (php-msgpack-0.5.3.tar.gz) = 86591 
+SHA256 (msgpack-msgpack-980a652.tar.gz) = 0a293eeb110fd24bd42bae5d35bab82a6bfc796ac62f793f47c14a2ce1da5b4d 
+SIZE (msgpack-msgpack-980a652.tar.gz) = 224300 

HUGE size difference, and going from a normal versioning 0.5.3 to a date version, once you go back to normal versioning, you  
will need to do a PORTEPOCH. 

is there no other way to do this? 
Even to applying the patches from (msgpack-msgpack-980a652.tar.gz to php-msgpack-0.5.3.tar.gz and calling it 0.5.3.1 ? 

(if the patch is huge, I can host it at people.freebsd.org/~scheidell/huge_patch) 

So, they are going to ask me both questions. 
When a distribution file goes from 86K to 224K, they will want me to do a diff between the sources and look for obvious trojan  
code. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=169261 

From: Michael Scheidell <scheidell@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/169261: [MAINTAINER UPDATE] devel/php5-msgpack
Date: Wed, 20 Jun 2012 18:06:41 -0400 (EDT)

 --ELM1340230001-41672-0_
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain; charset="US-ASCII"
 
 Would you consider this alternate patch?
 the Master site works fine with http (didn't look like it needed https), 
 pav (portmgr) already put in USE_PHP_BUILD=yes, in a previous commit (so you don't need the run/build depends)
 This compiles just fine in tinderbox with php5 (5.4).
 
 other than that, its almost your patch (oh, I moved the GIT* vars down so that portlint -abt stopped complaining)
 
 if ok, I'll commit.
 
 -- 
 Michael Scheidell, CTO
 SECNAP Network Security Corporation
 http://people.freebsd.org/~scheidell
 
 ______________________________________________________________________
 This email has been scanned and certified safe by SpammerTrap(r). 
 For Information please see http://www.spammertrap.com/
 ______________________________________________________________________  
   
 --ELM1340230001-41672-0_
 Content-Transfer-Encoding: 7bit
 Content-Type: text/x-patch
 Content-Disposition: attachment; filename="msgpack.patch"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/php5-msgpack/Makefile,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile
 --- Makefile	10 Jun 2012 10:23:43 -0000	1.5
 +++ Makefile	20 Jun 2012 22:03:17 -0000
 @@ -6,16 +6,21 @@
  #
  
  PORTNAME=	msgpack
 -PORTVERSION=	0.5.4
 +PORTVERSION=	2012.05.05
  CATEGORIES=	devel
 -MASTER_SITES=	http://php-msgpack.googlecode.com/files/
 +MASTER_SITES=	http://github.com/${GITHUB_USER}/${GITHUB_REPO}/tarball/${GITVERSION}/
  PKGNAMEPREFIX=	php5-
 -DISTNAME=	php-msgpack-0.5.3
 +DISTNAME=	msgpack-msgpack-${GITVERSION}
  
  MAINTAINER=	komarov@valerka.net
  COMMENT=	PHP extension for interfacing with MessagePack
  
 -WRKSRC=		${WRKDIR}/php-msgpack
 +WRKSRC=		${WRKDIR}/msgpack-msgpack-${GITVERSION}/php
 +
 +GITHUB_USER=	msgpack
 +GITHUB_REPO=	msgpack
 +GITVERSION=	980a652
 +FETCH_ARGS=	-pRr
  
  USE_PHP=	session
  USE_PHP_BUILD=	yes
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/devel/php5-msgpack/distinfo,v
 retrieving revision 1.1
 diff -u -r1.1 distinfo
 --- distinfo	8 Jan 2012 01:49:13 -0000	1.1
 +++ distinfo	20 Jun 2012 22:03:17 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (php-msgpack-0.5.3.tar.gz) = 9eb0fb03b66bab5994607c7bc1f7aef9a738af173e6e4f65965a2c2ad8e6336c
 -SIZE (php-msgpack-0.5.3.tar.gz) = 86591
 +SHA256 (msgpack-msgpack-980a652.tar.gz) = 0a293eeb110fd24bd42bae5d35bab82a6bfc796ac62f793f47c14a2ce1da5b4d
 +SIZE (msgpack-msgpack-980a652.tar.gz) = 224300
 Index: files/patch-msgpack.c
 ===================================================================
 RCS file: files/patch-msgpack.c
 diff -N files/patch-msgpack.c
 --- files/patch-msgpack.c	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,72 +0,0 @@
 ---- ./msgpack.c.orig	2011-10-31 10:15:40.000000000 +0400
 -+++ ./msgpack.c	2012-05-28 15:06:00.763502625 +0400
 -@@ -141,11 +141,15 @@
 - PS_SERIALIZER_ENCODE_FUNC(msgpack)
 - {
 -     smart_str buf = {0};
 --    php_serialize_data_t var_hash;
 -+    msgpack_serialize_data_t var_hash;
 - 
 -     PHP_VAR_SERIALIZE_INIT(var_hash);
 - 
 -+#if PHP_API_VERSION < 20100412
 -     msgpack_serialize_zval(&buf, PS(http_session_vars), &var_hash TSRMLS_CC);
 -+#else
 -+    msgpack_serialize_zval(&buf, PS(http_session_vars), var_hash TSRMLS_CC);
 -+#endif
 - 
 -     if (newlen)
 -     {
 -@@ -172,7 +176,7 @@
 -     zval **value;
 -     size_t off = 0;
 -     msgpack_unpack_t mp;
 --    php_unserialize_data_t var_hash;
 -+    msgpack_unserialize_data_t var_hash;
 - 
 -     ALLOC_INIT_ZVAL(tmp);
 - 
 -@@ -181,7 +185,7 @@
 -     msgpack_unserialize_var_init(&var_hash);
 - 
 -     mp.user.retval = (zval *)tmp;
 --    mp.user.var_hash = (php_unserialize_data_t *)&var_hash;
 -+    mp.user.var_hash = (msgpack_unserialize_data_t *)&var_hash;
 - 
 -     ret = template_execute(&mp, (char *)val, (size_t)vallen, &off);
 - 
 -@@ -224,11 +228,15 @@
 - 
 - PHP_MSGPACK_API void php_msgpack_serialize(smart_str *buf, zval *val TSRMLS_DC)
 - {
 --    php_serialize_data_t var_hash;
 -+    msgpack_serialize_data_t var_hash;
 - 
 -     PHP_VAR_SERIALIZE_INIT(var_hash);
 - 
 -+#if PHP_API_VERSION < 20100412
 -     msgpack_serialize_zval(buf, val, &var_hash TSRMLS_CC);
 -+#else
 -+    msgpack_serialize_zval(buf, val, var_hash TSRMLS_CC);
 -+#endif
 - 
 -     PHP_VAR_SERIALIZE_DESTROY(var_hash);
 - }
 -@@ -239,7 +247,7 @@
 -     int ret;
 -     size_t off = 0;
 -     msgpack_unpack_t mp;
 --    php_unserialize_data_t var_hash;
 -+    msgpack_unserialize_data_t var_hash;
 - 
 -     if (str_len <= 0)
 -     {
 -@@ -251,7 +259,7 @@
 -     msgpack_unserialize_var_init(&var_hash);
 - 
 -     mp.user.retval = (zval *)return_value;
 --    mp.user.var_hash = (php_unserialize_data_t *)&var_hash;
 -+    mp.user.var_hash = (msgpack_unserialize_data_t *)&var_hash;
 - 
 -     ret = template_execute(&mp, str, (size_t)str_len, &off);
 - 
 Index: files/patch-msgpack__pack_template.h
 ===================================================================
 RCS file: files/patch-msgpack__pack_template.h
 diff -N files/patch-msgpack__pack_template.h
 --- files/patch-msgpack__pack_template.h	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- ./msgpack/pack_template.h.orig	2011-10-06 05:03:16.000000000 +0400
 -+++ ./msgpack/pack_template.h	2012-05-28 15:06:00.762504244 +0400
 -@@ -728,7 +728,7 @@
 - msgpack_pack_inline_func(_raw)(msgpack_pack_user x, size_t l)
 - {
 - 	if(l < 32) {
 --		unsigned char d = 0xa0 | (uint8_t)l;
 -+		unsigned char d = 0xa0 | l;
 - 		msgpack_pack_append_buffer(x, &TAKE8_8(d), 1);
 - 	} else if(l < 65536) {
 - 		unsigned char buf[3];
 Index: files/patch-msgpack__sysdep.h
 ===================================================================
 RCS file: files/patch-msgpack__sysdep.h
 diff -N files/patch-msgpack__sysdep.h
 --- files/patch-msgpack__sysdep.h	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,170 +0,0 @@
 ---- ./msgpack/sysdep.h.orig	2011-10-06 05:01:16.000000000 +0400
 -+++ ./msgpack/sysdep.h	2012-05-28 15:06:00.762504244 +0400
 -@@ -36,20 +36,20 @@
 - #include <stdbool.h>
 - #endif
 - 
 -+
 - #ifdef _WIN32
 --#define _msgpack_atomic_counter_header <windows.h>
 - typedef long _msgpack_atomic_counter_t;
 - #define _msgpack_sync_decr_and_fetch(ptr) InterlockedDecrement(ptr)
 - #define _msgpack_sync_incr_and_fetch(ptr) InterlockedIncrement(ptr)
 --#elif defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41)
 --#define _msgpack_atomic_counter_header "gcc_atomic.h"
 - #else
 - typedef unsigned int _msgpack_atomic_counter_t;
 - #define _msgpack_sync_decr_and_fetch(ptr) __sync_sub_and_fetch(ptr, 1)
 - #define _msgpack_sync_incr_and_fetch(ptr) __sync_add_and_fetch(ptr, 1)
 - #endif
 - 
 -+
 - #ifdef _WIN32
 -+#include <winsock2.h>
 - 
 - #ifdef __cplusplus
 - /* numeric_limits<T>::min,max */
 -@@ -70,45 +70,15 @@
 - #define __LITTLE_ENDIAN__
 - #elif __BYTE_ORDER == __BIG_ENDIAN
 - #define __BIG_ENDIAN__
 --#elif _WIN32
 --#define __LITTLE_ENDIAN__
 - #endif
 - #endif
 - 
 --
 - #ifdef __LITTLE_ENDIAN__
 - 
 --#ifdef _WIN32
 --#  if defined(ntohs)
 --#    define _msgpack_be16(x) ntohs(x)
 --#  elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
 --#    define _msgpack_be16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
 --#  else
 --#    define _msgpack_be16(x) ( \
 --        ((((uint16_t)x) <<  8) ) | \
 --        ((((uint16_t)x) >>  8) ) )
 --#  endif
 --#else
 --#  define _msgpack_be16(x) ntohs(x)
 --#endif
 --
 --#ifdef _WIN32
 --#  if defined(ntohl)
 --#    define _msgpack_be32(x) ntohl(x)
 --#  elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
 --#    define _msgpack_be32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
 --#  else
 --#    define _msgpack_be32(x) \
 --        ( ((((uint32_t)x) << 24)               ) | \
 --          ((((uint32_t)x) <<  8) & 0x00ff0000U ) | \
 --          ((((uint32_t)x) >>  8) & 0x0000ff00U ) | \
 --          ((((uint32_t)x) >> 24)               ) )
 --#  endif
 --#else
 --#  define _msgpack_be32(x) ntohl(x)
 --#endif
 -+#define _msgpack_be16(x) ntohs(x)
 -+#define _msgpack_be32(x) ntohl(x)
 - 
 --#if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400)
 -+#if defined(_byteswap_uint64) || _MSC_VER >= 1400
 - #  define _msgpack_be64(x) (_byteswap_uint64(x))
 - #elif defined(bswap_64)
 - #  define _msgpack_be64(x) bswap_64(x)
 -@@ -116,79 +86,34 @@
 - #  define _msgpack_be64(x) __DARWIN_OSSwapInt64(x)
 - #else
 - #define _msgpack_be64(x) \
 --    ( ((((uint64_t)x) << 56)                         ) | \
 --      ((((uint64_t)x) << 40) & 0x00ff000000000000ULL ) | \
 --      ((((uint64_t)x) << 24) & 0x0000ff0000000000ULL ) | \
 --      ((((uint64_t)x) <<  8) & 0x000000ff00000000ULL ) | \
 --      ((((uint64_t)x) >>  8) & 0x00000000ff000000ULL ) | \
 --      ((((uint64_t)x) >> 24) & 0x0000000000ff0000ULL ) | \
 --      ((((uint64_t)x) >> 40) & 0x000000000000ff00ULL ) | \
 --      ((((uint64_t)x) >> 56)                         ) )
 -+	( ((((uint64_t)x) << 56) & 0xff00000000000000ULL ) | \
 -+	  ((((uint64_t)x) << 40) & 0x00ff000000000000ULL ) | \
 -+	  ((((uint64_t)x) << 24) & 0x0000ff0000000000ULL ) | \
 -+	  ((((uint64_t)x) <<  8) & 0x000000ff00000000ULL ) | \
 -+	  ((((uint64_t)x) >>  8) & 0x00000000ff000000ULL ) | \
 -+	  ((((uint64_t)x) >> 24) & 0x0000000000ff0000ULL ) | \
 -+	  ((((uint64_t)x) >> 40) & 0x000000000000ff00ULL ) | \
 -+	  ((((uint64_t)x) >> 56) & 0x00000000000000ffULL ) )
 - #endif
 - 
 --#define _msgpack_load16(cast, from) ((cast)( \
 --        (((uint16_t)((uint8_t*)(from))[0]) << 8) | \
 --        (((uint16_t)((uint8_t*)(from))[1])     ) ))
 --
 --#define _msgpack_load32(cast, from) ((cast)( \
 --        (((uint32_t)((uint8_t*)(from))[0]) << 24) | \
 --        (((uint32_t)((uint8_t*)(from))[1]) << 16) | \
 --        (((uint32_t)((uint8_t*)(from))[2]) <<  8) | \
 --        (((uint32_t)((uint8_t*)(from))[3])      ) ))
 --
 --#define _msgpack_load64(cast, from) ((cast)( \
 --        (((uint64_t)((uint8_t*)(from))[0]) << 56) | \
 --        (((uint64_t)((uint8_t*)(from))[1]) << 48) | \
 --        (((uint64_t)((uint8_t*)(from))[2]) << 40) | \
 --        (((uint64_t)((uint8_t*)(from))[3]) << 32) | \
 --        (((uint64_t)((uint8_t*)(from))[4]) << 24) | \
 --        (((uint64_t)((uint8_t*)(from))[5]) << 16) | \
 --        (((uint64_t)((uint8_t*)(from))[6]) << 8)  | \
 --        (((uint64_t)((uint8_t*)(from))[7])     )  ))
 --
 - #else
 --
 - #define _msgpack_be16(x) (x)
 - #define _msgpack_be32(x) (x)
 - #define _msgpack_be64(x) (x)
 --
 --#define _msgpack_load16(cast, from) ((cast)( \
 --        (((uint16_t)((uint8_t*)from)[1]) << 8) | \
 --        (((uint16_t)((uint8_t*)from)[0])     ) ))
 --
 --#define _msgpack_load32(cast, from) ((cast)( \
 --        (((uint32_t)((uint8_t*)from)[3]) << 24) | \
 --        (((uint32_t)((uint8_t*)from)[2]) << 16) | \
 --        (((uint32_t)((uint8_t*)from)[1]) <<  8) | \
 --        (((uint32_t)((uint8_t*)from)[0])      ) ))
 --
 --#define _msgpack_load64(cast, from) ((cast)( \
 --        (((uint64_t)((uint8_t*)from)[7]) << 56) | \
 --        (((uint64_t)((uint8_t*)from)[6]) << 48) | \
 --        (((uint64_t)((uint8_t*)from)[5]) << 40) | \
 --        (((uint64_t)((uint8_t*)from)[4]) << 32) | \
 --        (((uint64_t)((uint8_t*)from)[3]) << 24) | \
 --        (((uint64_t)((uint8_t*)from)[2]) << 16) | \
 --        (((uint64_t)((uint8_t*)from)[1]) << 8)  | \
 --        (((uint64_t)((uint8_t*)from)[0])     )  ))
 - #endif
 - 
 - 
 - #define _msgpack_store16(to, num) \
 --    do { uint16_t val = _msgpack_be16(num); memcpy(to, &val, 2); } while(0)
 -+	do { uint16_t val = _msgpack_be16(num); memcpy(to, &val, 2); } while(0);
 - #define _msgpack_store32(to, num) \
 --    do { uint32_t val = _msgpack_be32(num); memcpy(to, &val, 4); } while(0)
 -+	do { uint32_t val = _msgpack_be32(num); memcpy(to, &val, 4); } while(0);
 - #define _msgpack_store64(to, num) \
 --    do { uint64_t val = _msgpack_be64(num); memcpy(to, &val, 8); } while(0)
 -+	do { uint64_t val = _msgpack_be64(num); memcpy(to, &val, 8); } while(0);
 - 
 --/*
 --#define _msgpack_load16(cast, from) \
 --    ({ cast val; memcpy(&val, (char*)from, 2); _msgpack_be16(val); })
 --#define _msgpack_load32(cast, from) \
 --    ({ cast val; memcpy(&val, (char*)from, 4); _msgpack_be32(val); })
 --#define _msgpack_load64(cast, from) \
 --    ({ cast val; memcpy(&val, (char*)from, 8); _msgpack_be64(val); })
 --*/
 -+
 -+#define _msgpack_load16(cast, from) ((cast)_msgpack_be16(*(uint16_t*)from))
 -+#define _msgpack_load32(cast, from) ((cast)_msgpack_be32(*(uint32_t*)from))
 -+#define _msgpack_load64(cast, from) ((cast)_msgpack_be64(*(uint64_t*)from))
 - 
 - 
 - #endif /* msgpack/sysdep.h */
 Index: files/patch-msgpack__version.h
 ===================================================================
 RCS file: files/patch-msgpack__version.h
 diff -N files/patch-msgpack__version.h
 --- files/patch-msgpack__version.h	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- ./msgpack/version.h.orig	2011-10-06 05:01:43.000000000 +0400
 -+++ ./msgpack/version.h	2012-05-28 15:06:00.763502625 +0400
 -@@ -27,7 +27,7 @@
 - int msgpack_version_major(void);
 - int msgpack_version_minor(void);
 - 
 --#define MSGPACK_VERSION "0.5.7"
 -+#define MSGPACK_VERSION "0.5.4"
 - #define MSGPACK_VERSION_MAJOR 0
 - #define MSGPACK_VERSION_MINOR 5
 - 
 Index: files/patch-msgpack_class.c
 ===================================================================
 RCS file: files/patch-msgpack_class.c
 diff -N files/patch-msgpack_class.c
 --- files/patch-msgpack_class.c	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,90 +0,0 @@
 ---- ./msgpack_class.c.orig	2011-11-01 05:15:37.000000000 +0400
 -+++ ./msgpack_class.c	2012-05-28 15:06:00.763502625 +0400
 -@@ -19,7 +19,7 @@
 -     zval *retval;
 -     long offset;
 -     msgpack_unpack_t mp;
 --    php_unserialize_data_t var_hash;
 -+    msgpack_unserialize_data_t var_hash;
 -     long php_only;
 -     zend_bool finished;
 -     int error;
 -@@ -188,8 +188,10 @@
 - static zend_object_value php_msgpack_base_new(zend_class_entry *ce TSRMLS_DC)
 - {
 -     zend_object_value retval;
 --    zval *tmp;
 -     php_msgpack_base_t *base;
 -+#if PHP_API_VERSION < 20100412
 -+    zval *tmp;
 -+#endif
 - 
 -     base = emalloc(sizeof(php_msgpack_base_t));
 - 
 -@@ -201,9 +203,13 @@
 -     base->object.ce = ce;
 - #endif
 - 
 -+#if PHP_API_VERSION < 20100412
 -     zend_hash_copy(
 -         base->object.properties, &ce->default_properties,
 -         (copy_ctor_func_t)zval_add_ref, (void *)&tmp, sizeof(zval *));
 -+#else
 -+    object_properties_init(&base->object, ce);
 -+#endif
 - 
 -     retval.handle = zend_objects_store_put(
 -         base, (zend_objects_store_dtor_t)zend_objects_destroy_object,
 -@@ -233,8 +239,10 @@
 -     zend_class_entry *ce TSRMLS_DC)
 - {
 -     zend_object_value retval;
 --    zval *tmp;
 -     php_msgpack_unpacker_t *unpacker;
 -+#if PHP_API_VERSION < 20100412
 -+    zval *tmp;
 -+#endif
 - 
 -     unpacker = emalloc(sizeof(php_msgpack_unpacker_t));
 - 
 -@@ -246,9 +254,13 @@
 -     unpacker->object.ce = ce;
 - #endif
 - 
 -+#if PHP_API_VERSION < 20100412
 -     zend_hash_copy(
 -         unpacker->object.properties, &ce->default_properties,
 -         (copy_ctor_func_t)zval_add_ref, (void *)&tmp, sizeof(zval *));
 -+#else
 -+    object_properties_init(&unpacker->object, ce);
 -+#endif
 - 
 -     retval.handle = zend_objects_store_put(
 -         unpacker, (zend_objects_store_dtor_t)zend_objects_destroy_object,
 -@@ -410,7 +422,7 @@
 -     msgpack_unserialize_var_init(&unpacker->var_hash);
 - 
 -     (&unpacker->mp)->user.var_hash =
 --        (php_unserialize_data_t *)&unpacker->var_hash;
 -+        (msgpack_unserialize_data_t *)&unpacker->var_hash;
 - }
 - 
 - static ZEND_METHOD(msgpack_unpacker, __destruct)
 -@@ -533,7 +545,7 @@
 -         msgpack_unserialize_var_init(&unpacker->var_hash);
 - 
 -         (&unpacker->mp)->user.var_hash =
 --            (php_unserialize_data_t *)&unpacker->var_hash;
 -+            (msgpack_unserialize_data_t *)&unpacker->var_hash;
 -     }
 -     (&unpacker->mp)->user.retval = (zval *)unpacker->retval;
 - 
 -@@ -649,7 +661,7 @@
 -     msgpack_unserialize_var_init(&unpacker->var_hash);
 - 
 -     (&unpacker->mp)->user.var_hash =
 --        (php_unserialize_data_t *)&unpacker->var_hash;
 -+        (msgpack_unserialize_data_t *)&unpacker->var_hash;
 - }
 - 
 - void msgpack_init_class()
 Index: files/patch-msgpack_pack.c
 ===================================================================
 RCS file: files/patch-msgpack_pack.c
 diff -N files/patch-msgpack_pack.c
 --- files/patch-msgpack_pack.c	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- ./msgpack_pack.c.orig	2011-10-31 10:07:38.000000000 +0400
 -+++ ./msgpack_pack.c	2012-05-28 15:06:00.764503031 +0400
 -@@ -439,7 +439,7 @@
 -             msgpack_pack_nil(buf);
 -             msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_CUSTOM_OBJECT);
 - 
 --            msgpack_serialize_string(buf, ce->name, ce->name_length);
 -+            msgpack_serialize_string(buf, (char *)ce->name, ce->name_length);
 -             msgpack_pack_raw(buf, serialized_length);
 -             msgpack_pack_raw_body(buf, serialized_data, serialized_length);
 -         }
 Index: files/patch-msgpack_pack.h
 ===================================================================
 RCS file: files/patch-msgpack_pack.h
 diff -N files/patch-msgpack_pack.h
 --- files/patch-msgpack_pack.h	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,17 +0,0 @@
 ---- ./msgpack_pack.h.orig	2011-07-27 09:50:36.000000000 +0400
 -+++ ./msgpack_pack.h	2012-05-28 15:06:00.764503031 +0400
 -@@ -2,7 +2,13 @@
 - #ifndef MSGPACK_PACK_H
 - #define MSGPACK_PACK_H
 - 
 --#include "ext/standard/php_smart_str.h"
 -+#include "ext/standard/php_var.h"
 -+
 -+#if PHP_API_VERSION < 20100412
 -+#define msgpack_serialize_data_t HashTable
 -+#else
 -+typedef HashTable* msgpack_serialize_data_t;
 -+#endif
 - 
 - enum msgpack_serialize_type
 - {
 Index: files/patch-msgpack_unpack.c
 ===================================================================
 RCS file: files/patch-msgpack_unpack.c
 diff -N files/patch-msgpack_unpack.c
 --- files/patch-msgpack_unpack.c	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,55 +0,0 @@
 ---- ./msgpack_unpack.c.orig	2011-11-02 14:17:41.000000000 +0400
 -+++ ./msgpack_unpack.c	2012-05-28 15:06:00.765503368 +0400
 -@@ -54,7 +54,7 @@
 -     MSGPACK_UNSERIALIZE_FINISH_ITEM(_unpack, 2);
 - 
 - inline static void msgpack_var_push(
 --    php_unserialize_data_t *var_hashx, zval **rval)
 -+    msgpack_unserialize_data_t *var_hashx, zval **rval)
 - {
 -     var_entries *var_hash, *prev = NULL;
 - 
 -@@ -91,7 +91,7 @@
 - }
 - 
 - inline static int msgpack_var_access(
 --    php_unserialize_data_t *var_hashx, long id, zval ***store)
 -+    msgpack_unserialize_data_t *var_hashx, long id, zval ***store)
 - {
 -     var_entries *var_hash = var_hashx->first;
 - 
 -@@ -118,7 +118,7 @@
 - }
 - 
 - inline static void msgpack_stack_push(
 --    php_unserialize_data_t *var_hashx, zval **rval, zend_bool save)
 -+    msgpack_unserialize_data_t *var_hashx, zval **rval, zend_bool save)
 - {
 -     var_entries *var_hash, *prev = NULL;
 - 
 -@@ -162,7 +162,7 @@
 - }
 - 
 - inline static void msgpack_stack_pop(
 --    php_unserialize_data_t *var_hashx, long count)
 -+    msgpack_unserialize_data_t *var_hashx, long count)
 - {
 -     long i;
 -     var_entries *var_hash = var_hashx->first_dtor;
 -@@ -280,14 +280,14 @@
 -     return ce;
 - }
 - 
 --void msgpack_unserialize_var_init(php_unserialize_data_t *var_hashx)
 -+void msgpack_unserialize_var_init(msgpack_unserialize_data_t *var_hashx)
 - {
 -     var_hashx->first = 0;
 -     var_hashx->first_dtor = 0;
 - }
 - 
 - void msgpack_unserialize_var_destroy(
 --    php_unserialize_data_t *var_hashx, zend_bool err)
 -+    msgpack_unserialize_data_t *var_hashx, zend_bool err)
 - {
 -     void *next;
 -     long i;
 Index: files/patch-msgpack_unpack.h
 ===================================================================
 RCS file: files/patch-msgpack_unpack.h
 diff -N files/patch-msgpack_unpack.h
 --- files/patch-msgpack_unpack.h	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,25 +0,0 @@
 ---- ./msgpack_unpack.h.orig	2011-07-27 09:50:36.000000000 +0400
 -+++ ./msgpack_unpack.h	2012-05-28 15:06:00.765503368 +0400
 -@@ -16,17 +16,19 @@
 -     MSGPACK_UNPACK_PARSE_ERROR = -1,
 - } msgpack_unpack_return;
 - 
 -+typedef struct php_unserialize_data msgpack_unserialize_data_t;
 -+
 - typedef struct {
 -     zval *retval;
 -     long deps;
 --    php_unserialize_data_t *var_hash;
 -+    msgpack_unserialize_data_t *var_hash;
 -     long stack[MSGPACK_EMBED_STACK_SIZE];
 -     int type;
 - } msgpack_unserialize_data;
 - 
 --void msgpack_unserialize_var_init(php_unserialize_data_t *var_hashx);
 -+void msgpack_unserialize_var_init(msgpack_unserialize_data_t *var_hashx);
 - void msgpack_unserialize_var_destroy(
 --    php_unserialize_data_t *var_hashx, zend_bool err);
 -+    msgpack_unserialize_data_t *var_hashx, zend_bool err);
 - 
 - void msgpack_unserialize_init(msgpack_unserialize_data *unpack);
 - 
 Index: files/patch-php_msgpack.h
 ===================================================================
 RCS file: files/patch-php_msgpack.h
 diff -N files/patch-php_msgpack.h
 --- files/patch-php_msgpack.h	29 May 2012 08:36:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- ./php_msgpack.h.orig	2011-10-31 05:25:28.000000000 +0400
 -+++ ./php_msgpack.h	2012-05-28 15:06:00.766503914 +0400
 -@@ -2,7 +2,7 @@
 - #ifndef PHP_MSGPACK_H
 - #define PHP_MSGPACK_H
 - 
 --#define MSGPACK_EXTENSION_VERSION "0.5.3"
 -+#define MSGPACK_EXTENSION_VERSION "0.5.4"
 - 
 - #include "ext/standard/php_smart_str.h"
 - 
 
 --ELM1340230001-41672-0_--

From: Michael Scheidell <scheidell@FreeBSD.org>
To: <bug-followup@FreeBSD.org>, <komarov@valerka.net>
Cc:  
Subject: Re: ports/169261: [MAINTAINER UPDATE] devel/php5-msgpack
Date: Sat, 23 Jun 2012 05:59:36 -0400

 --------------070504050800010905040109
 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Would you consider this alternate patch?
 the Master site works fine with http (didn't look like it needed https),
 pav (portmgr) already put in USE_PHP_BUILD=yes, in a previous commit (so 
 you don't need the run/build depends)
 This compiles just fine in tinderbox with php5 (5.4).
 
 other than that, its almost your patch (oh, I moved the GIT* vars down 
 so that portlint -abt stopped complaining)
 
 if ok, I'll commit.
 -- 
 Michael Scheidell, CTO
  >*| * SECNAP Network Security Corporation
 d: +1.561.948.2259
 w: http://people.freebsd.org/~scheidell
 
 --------------070504050800010905040109
 Content-Type: text/html; charset="ISO-8859-1"
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
   </head>
   <body bgcolor="#ffffff" text="#000000">
     Would you consider this alternate patch?<br>
     the Master site works fine with http (didn't look like it needed
     https), <br>
     pav (portmgr) already put in USE_PHP_BUILD=yes, in a previous commit
     (so you don't need the run/build depends)<br>
     This compiles just fine in tinderbox with php5 (5.4).<br>
     <br>
     other than that, its almost your patch (oh, I moved the GIT* vars
     down so that portlint -abt stopped complaining)<br>
     <br>
     if ok, I'll commit.<br>
     <div class="moz-signature">-- <br>
       Michael Scheidell, CTO<br>
       <font color="#999999">&gt;</font><font color="#cc0000"> <b>| </b></font>
       SECNAP Network Security Corporation<br>
       d: +1.561.948.2259<br>
       w: <a class="moz-txt-link-freetext" href="http://people.freebsd.org/~scheidell">http://people.freebsd.org/~scheidell</a>
     </div>
   </body>
 </html>
 
 --------------070504050800010905040109--

From: "Valery Komarov" <komarov@valerka.net>
To: "Michael Scheidell" <scheidell@FreeBSD.org>, <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/169261: [MAINTAINER UPDATE] devel/php5-msgpack
Date: Mon, 25 Jun 2012 14:59:52 +0400

 all ok, you can commit
 
 On Sat, 23 Jun 2012 05:59:36 -0400
   Michael Scheidell <scheidell@FreeBSD.org> wrote:
 > Would you consider this alternate patch?
 > the Master site works fine with http (didn't look like it needed 
 >https),
 > pav (portmgr) already put in USE_PHP_BUILD=yes, in a previous commit 
 >(so you don't need the run/build depends)
 > This compiles just fine in tinderbox with php5 (5.4).
 > 
 > other than that, its almost your patch (oh, I moved the GIT* vars 
 >down so that portlint -abt stopped complaining)
 > 
 > if ok, I'll commit.
 > -- 
 > Michael Scheidell, CTO
 > >*| * SECNAP Network Security Corporation
 > d: +1.561.948.2259
 > w: http://people.freebsd.org/~scheidell
State-Changed-From-To: feedback->closed 
State-Changed-By: scheidell 
State-Changed-When: Mon Jun 25 11:08:45 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169261 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/169261: commit references a PR
Date: Mon, 25 Jun 2012 11:11:26 +0000 (UTC)

 scheidell    2012-06-25 11:08:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/php5-msgpack   Makefile distinfo 
   Removed files:
     devel/php5-msgpack/files patch-msgpack.c 
                              patch-msgpack__pack_template.h 
                              patch-msgpack__sysdep.h 
                              patch-msgpack__version.h 
                              patch-msgpack_class.c 
                              patch-msgpack_pack.c 
                              patch-msgpack_pack.h 
                              patch-msgpack_unpack.c 
                              patch-msgpack_unpack.h 
                              patch-php_msgpack.h 
   Log:
   - Update to 2012.05.05
   - Official version of the code has been integrated into the MessagePack project
   
   PR:             ports/169261
   Submitted by:   Valery Komarov <komarov@valerka.net> (maintainer)
   Obtained from:  https://github.com/msgpack/msgpack/tree/master/php/
   
   Revision  Changes    Path
   1.6       +9 -4      ports/devel/php5-msgpack/Makefile
   1.2       +2 -2      ports/devel/php5-msgpack/distinfo
   1.2       +0 -72     ports/devel/php5-msgpack/files/patch-msgpack.c (dead)
   1.2       +0 -11     ports/devel/php5-msgpack/files/patch-msgpack__pack_template.h (dead)
   1.2       +0 -170    ports/devel/php5-msgpack/files/patch-msgpack__sysdep.h (dead)
   1.2       +0 -11     ports/devel/php5-msgpack/files/patch-msgpack__version.h (dead)
   1.2       +0 -90     ports/devel/php5-msgpack/files/patch-msgpack_class.c (dead)
   1.2       +0 -11     ports/devel/php5-msgpack/files/patch-msgpack_pack.c (dead)
   1.2       +0 -17     ports/devel/php5-msgpack/files/patch-msgpack_pack.h (dead)
   1.2       +0 -55     ports/devel/php5-msgpack/files/patch-msgpack_unpack.c (dead)
   1.2       +0 -25     ports/devel/php5-msgpack/files/patch-msgpack_unpack.h (dead)
   1.2       +0 -11     ports/devel/php5-msgpack/files/patch-php_msgpack.h (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
