diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/ossp-uuid/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/ossp-uuid/files')
11 files changed, 0 insertions, 983 deletions
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch deleted file mode 100644 index 1f92cea3ae69..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Support dash-less args to from_string. -Author: Tim Retout <diocles@debian.org> -Bug-Debian: http://bugs.debian.org/635607 - -The module Data::GUID depends on Data::UUID supporting this behaviour. - ---- a/perl/uuid_compat.pm -+++ b/perl/uuid_compat.pm -@@ -93,7 +93,9 @@ - $uuid->import('str', - $str =~ /^0x/ - ? join '-', unpack('x2 a8 a4 a4 a4 a12', $str) -- : $str -+ : $str =~ /-/ -+ ? $str -+ : join '-', unpack('A8 A4 A4 A4 A12', $str) - ); - return $uuid->export('bin'); - } ---- a/perl/uuid_compat.ts -+++ b/perl/uuid_compat.ts -@@ -28,7 +28,7 @@ - ## uuid_compat.ts: Data::UUID Backward Compatibility Perl API (Perl test suite part) - ## - --use Test::More tests => 14; -+use Test::More tests => 16; - - BEGIN { - use_ok('Data::UUID'); -@@ -53,3 +53,5 @@ - ok($uuid8 = $ug->from_string("6ba7b811-9dad-11d1-80b4-00c04fd430c8")); - ok($ug->compare($uuid7, $uuid8) == 0); - -+ok($uuid9 = $ug->from_string("6ba7b8119dad11d180b400c04fd430c8")); -+ok($ug->compare($uuid7, $uuid9) == 0); diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch deleted file mode 100644 index 060a7540f1f9..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Marco Nenciarini <marco.nenciarini@devise.it> -Date: Tue, 2 Feb 2010 12:16:49 +0100 -Subject: [PATCH] Fix whatis entries - -Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages ---- - uuid++.pod | 2 +- - uuid.pod | 2 +- - uuid_cli.pod | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/uuid++.pod b/uuid++.pod -index 8b5a4b1..89c5efb 100644 ---- a/uuid++.pod -+++ b/uuid++.pod -@@ -31,7 +31,7 @@ - - =head1 NAME - --B<OSSP uuid> - B<Universally Unique Identifier> (C++ API) -+B<uuid++> - B<Universally Unique Identifier> (C++ API) - - =head1 VERSION - -diff --git a/uuid.pod b/uuid.pod -index 4ad3742..0179a46 100644 ---- a/uuid.pod -+++ b/uuid.pod -@@ -31,7 +31,7 @@ - - =head1 NAME - --B<OSSP uuid> - B<Universally Unique Identifier> -+B<uuid> - B<Universally Unique Identifier> - - =head1 VERSION - -diff --git a/uuid_cli.pod b/uuid_cli.pod -index ddec6bb..df9dc83 100644 ---- a/uuid_cli.pod -+++ b/uuid_cli.pod -@@ -31,7 +31,7 @@ - - =head1 NAME - --B<OSSP uuid> - B<Universally Unique Identifier Command-Line Tool> -+B<uuid> - B<Universally Unique Identifier Command-Line Tool> - - =head1 VERSION - --- diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-perl.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-perl.patch deleted file mode 100644 index a4fade8b088b..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-perl.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- tmp/uuid-1.6.2/perl/Makefile.PL 2007-01-01 18:13:18.000000000 +0000 -+++ uuid-1.6.2/perl/Makefile.PL 2011-01-07 11:54:23.521585547 +0000 -@@ -33,9 +33,9 @@ - use ExtUtils::MakeMaker; - - # determine source directory --my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } -- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) -- or die "no source directory found (where libuuid.la is located)"; -+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } -+ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) -+ or die "no source directory found (where libossp-uuid.la is located)"; - - # determine extra build options - my $compat = 0; -@@ -47,7 +47,7 @@ - VERSION_FROM => 'uuid.pm', - ABSTRACT_FROM => 'uuid.pod', - PREREQ_PM => {}, -- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], -+ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], - DEFINE => '', - INC => "-I. -I$srcdir", - PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch deleted file mode 100644 index 69c788bf1a05..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur uuid-1.6.2.orig/php/config.m4 uuid-1.6.2/php/config.m4 ---- uuid-1.6.2.orig/php/config.m4 2009-03-21 12:52:49.142847389 +0100 -+++ uuid-1.6.2/php/config.m4 2009-03-21 12:53:06.282809038 +0100 -@@ -33,10 +33,10 @@ - if test "$PHP_UUID" != "no"; then - PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) - AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) -- PHP_ADD_LIBPATH([..], ) -- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) -+ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) -- PHP_ADD_INCLUDE([..]) -+ PHP_ADD_INCLUDE([../uuid-1.6.2]) - PHP_SUBST(UUID_SHARED_LIBADD) -+ LDFLAGS="$LDFLAGS -L../uuid-1.6.2/.libs" - - dnl avoid linking conflict with a potentially existing uuid_create(3) in libc - AC_CHECK_FUNC(uuid_create,[ -diff -Naur uuid-1.6.2.orig/php/Makefile.local uuid-1.6.2/php/Makefile.local ---- uuid-1.6.2.orig/php/Makefile.local 2009-03-21 12:52:49.142847389 +0100 -+++ uuid-1.6.2/php/Makefile.local 2009-03-21 12:53:06.282809038 +0100 -@@ -42,7 +42,7 @@ - - test: build - @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; \ -- $(PHP) -q -d "safe_mode=0" -d "extension_dir=./" uuid.ts $$version -+ $(PHP) -q -d "safe_mode=0" -d "extension_dir=./modules/" uuid.ts $$version - - install: build - @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \ -diff -Naur uuid-1.6.2.orig/php/uuid.ts uuid-1.6.2/php/uuid.ts ---- uuid-1.6.2.orig/php/uuid.ts 2009-03-21 12:52:49.142847389 +0100 -+++ uuid-1.6.2/php/uuid.ts 2009-03-21 12:53:06.282809038 +0100 -@@ -36,7 +36,7 @@ - - print "++ loading DSO uuid.so (low-level API)\n"; - if (!extension_loaded('uuid')) { -- dl('modules/uuid.so'); -+ dl('uuid.so'); - } - - print "++ loading PHP uuid.php${php_version} (high-level API)\n"; - diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-r1.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-r1.patch deleted file mode 100644 index d24fcba721b5..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-r1.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- uuid-1.6.2.orig/Makefile.in 2009-03-21 12:52:49.142847389 +0100 -+++ uuid-1.6.2.orig/Makefile.in 2009-03-21 12:53:54.201971177 +0100 -@@ -62,13 +62,13 @@ - PHP = @PHP@ - PG_CONFIG = @PG_CONFIG@ - --LIB_NAME = libuuid.la -+LIB_NAME = libossp-uuid.la - LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo - --DCE_NAME = libuuid_dce.la -+DCE_NAME = libossp-uuid_dce.la - DCE_OBJS = uuid_dce.lo $(LIB_OBJS) - --CXX_NAME = libuuid++.la -+CXX_NAME = libossp-uuid++.la - CXX_OBJS = uuid++.lo $(LIB_OBJS) - - PRG_NAME = uuid -@@ -112,15 +112,15 @@ - @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< - - $(LIB_NAME): $(LIB_OBJS) -- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ -+ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ - -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` - - $(DCE_NAME): $(DCE_OBJS) -- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ -+ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ - -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` - - $(CXX_NAME): $(CXX_OBJS) -- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ -+ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ - -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` - - $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME) -@@ -253,7 +253,7 @@ - -@if [ ".$(WITH_CXX)" = .yes ]; then \ - $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \ - fi -- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/ -+ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/ - $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/ - -@if [ ".$(WITH_PERL)" = .yes ]; then \ - (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ ---- uuid-1.6.2.orig/uuid-config.in 2009-03-21 12:52:49.146166177 +0100 -+++ uuid-1.6.2.orig/uuid-config.in 2009-03-21 12:53:06.282809038 +0100 -@@ -121,7 +121,7 @@ - output_extra="$output_extra $uuid_ldflags" - ;; - --libs) -- output="$output -luuid" -+ output="$output -lossp-uuid" - output_extra="$output_extra $uuid_libs" - ;; - * ) ---- uuid-1.6.2.orig/uuid.pc.in 2009-03-21 12:52:49.146166177 +0100 -+++ uuid-1.6.2.orig/uuid.pc.in 2009-03-21 12:53:06.282809038 +0100 -@@ -36,7 +36,7 @@ - Description: Universally Unique Identifier (UUID) Library - Version: @UUID_VERSION_RAW@ - URL: http://www.ossp.org/pkg/lib/uuid/ --Cflags: -I${includedir} --Libs: -L${libdir} -luuid -+Cflags: -I${includedir}/ossp -+Libs: -L${libdir} -lossp-uuid - Libs.private: @LIBS@ - diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch deleted file mode 100644 index 0adc837ae163..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -urN uuid-1.6.2/configure uuid-1.6.2/configure ---- uuid-1.6.2/configure 2008-07-04 15:43:09.000000000 -0600 -+++ uuid-1.6.2/configure 2012-06-06 19:19:41.659880386 -0600 -@@ -14208,7 +14208,7 @@ - - - --for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h -+for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h netpacket/packet.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -diff -urN uuid-1.6.2/uuid.c uuid-1.6.2/uuid.c ---- uuid-1.6.2/uuid.c 2008-03-07 03:49:59.000000000 -0700 -+++ uuid-1.6.2/uuid.c 2012-06-06 15:50:30.060881473 -0600 -@@ -72,6 +72,8 @@ - /* IEEE 802 MAC address octet length */ - #define IEEE_MAC_OCTETS 6 - -+static unsigned char mac_unset[IEEE_MAC_OCTETS] = {BM_OCTET(1,0,0,0,0,0,0,0), 0x00, 0x00, 0x00, 0x00, 0x00}; -+ - /* UUID binary representation according to UUID standards */ - typedef struct { - uuid_uint32_t time_low; /* bits 0-31 of time field */ -@@ -967,7 +969,7 @@ - * GENERATE NODE - */ - -- if ((mode & UUID_MAKE_MC) || (uuid->mac[0] & BM_OCTET(1,0,0,0,0,0,0,0))) { -+ if ((mode & UUID_MAKE_MC) || !memcmp(uuid->mac, mac_unset, IEEE_MAC_OCTETS)) { - /* generate random IEEE 802 local multicast MAC address */ - if (prng_data(uuid->prng, (void *)&(uuid->obj.node), sizeof(uuid->obj.node)) != PRNG_RC_OK) - return UUID_RC_INT; -diff -urN uuid-1.6.2/uuid_mac.c uuid-1.6.2/uuid_mac.c ---- uuid-1.6.2/uuid_mac.c 2008-03-07 03:49:59.000000000 -0700 -+++ uuid-1.6.2/uuid_mac.c 2012-06-06 19:30:49.050879930 -0600 -@@ -76,6 +76,9 @@ - #ifdef HAVE_IFADDRS_H - #include <ifaddrs.h> - #endif -+#ifdef HAVE_NETPACKET_PACKET_H -+#include <netpacket/packet.h> -+#endif - - /* own headers (part (1/2) */ - #include "uuid_mac.h" -@@ -87,6 +90,10 @@ - #define TRUE (/*lint -save -e506*/ !FALSE /*lint -restore*/) - #endif - -+#if !defined(min) -+#define min(a,b) ((a) < (b) ? (a) : (b)) -+#endif -+ - /* return the Media Access Control (MAC) address of - the FIRST network interface card (NIC) */ - int mac_address(unsigned char *data_ptr, size_t data_len) -@@ -95,28 +102,41 @@ - if (data_ptr == NULL || data_len < MAC_LEN) - return FALSE; - --#if defined(HAVE_IFADDRS_H) && defined(HAVE_NET_IF_DL_H) && defined(HAVE_GETIFADDRS) -+#if defined(HAVE_IFADDRS_H) && (defined(HAVE_NET_IF_DL_H) || defined(HAVE_NETPACKET_PACKET_H)) && defined(HAVE_GETIFADDRS) - /* use getifaddrs(3) on BSD class platforms (xxxBSD, MacOS X, etc) */ - { - struct ifaddrs *ifap; - struct ifaddrs *ifap_head; -+#if defined(HAVE_NET_IF_DL_H) - const struct sockaddr_dl *sdl; - unsigned char *ucp; -- int i; -+#else -+ const struct sockaddr_ll *sll; -+#endif - - if (getifaddrs(&ifap_head) < 0) - return FALSE; - for (ifap = ifap_head; ifap != NULL; ifap = ifap->ifa_next) { -+#if defined(HAVE_NET_IF_DL_H) - if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_LINK) { - sdl = (const struct sockaddr_dl *)(void *)ifap->ifa_addr; - ucp = (unsigned char *)(sdl->sdl_data + sdl->sdl_nlen); - if (sdl->sdl_alen > 0) { -- for (i = 0; i < MAC_LEN && i < sdl->sdl_alen; i++, ucp++) -- data_ptr[i] = (unsigned char)(*ucp & 0xff); -+ memcpy(data_ptr, ucp, min(sdl->sdl_alen, MAC_LEN)); - freeifaddrs(ifap_head); - return TRUE; - } - } -+#else -+ if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_PACKET) { -+ sll = (const struct sockaddr_ll *)(void *)ifap->ifa_addr; -+ if (sll->sll_hatype == ARPHRD_ETHER) { -+ memcpy(data_ptr, sll->sll_addr, min(sll->sll_halen, MAC_LEN)); -+ freeifaddrs(ifap_head); -+ return TRUE; -+ } -+ } -+#endif - } - freeifaddrs(ifap_head); - } -diff -urN uuid-1.6.2/config.h.in uuid-1.6.2/config.h.in ---- uuid-1.6.2/config.h.in 2008-07-04 15:43:10.000000000 -0600 -+++ uuid-1.6.2/config.h.in 2012-06-06 21:59:03.370227352 -0600 -@@ -75,6 +75,9 @@ - /* Define to 1 if you have the <netinet/in.h> header file. */ - #undef HAVE_NETINET_IN_H - -+/* Define to 1 if you have the <netpacket/packet.h> header file. */ -+#undef HAVE_NETPACKET_PACKET_H -+ - /* Define to 1 if you have the <net/if_arp.h> header file. */ - #undef HAVE_NET_IF_ARP_H - diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch deleted file mode 100644 index c191e17df863..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up uuid-1.6.2/uuid.1.manfix uuid-1.6.2/uuid.1 ---- uuid-1.6.2/uuid.1.manfix 2013-05-30 15:56:38.630003125 +0200 -+++ uuid-1.6.2/uuid.1 2013-05-30 16:00:57.145127756 +0200 -@@ -238,6 +238,9 @@ value representation of a \s-1UUID\s0. E - .IP "\fB\-o\fR \fIfilename\fR" 3 - .IX Item "-o filename" - Write output to \fIfilename\fR instead of to \fIstdout\fR. -+.IP "\fB\-r\fR" 3 -+.IX Item "-r" -+This is equivalent to \fB-F BIN\fR. - .IP "\fB\-d\fR" 3 - .IX Item "-d" - Decode a given \s-1UUID\s0 (given as a command line argument or if the command diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch deleted file mode 100644 index d57e8939f154..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/php/uuid.c b/php/uuid.c -index b76b718..455611a 100644 ---- a/php/uuid.c -+++ b/php/uuid.c -@@ -496,7 +496,7 @@ PHP_FUNCTION(uuid_version) - } - - /* module function table */ --static function_entry uuid_functions[] = { -+static zend_function_entry uuid_functions[] = { - PHP_FE(uuid_create, NULL) - PHP_FE(uuid_destroy, NULL) - PHP_FE(uuid_clone, NULL) diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch deleted file mode 100644 index 0124003bc1fc..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch +++ /dev/null @@ -1,337 +0,0 @@ ---- uuid/php/uuid.c 2016-12-18 01:23:26.000000000 -0500 -+++ uuid/php/uuid.c 2016-12-18 01:23:43.564329483 -0500 -@@ -41,7 +41,13 @@ - } ctx_t; - - /* context implicit destruction */ -+#if PHP_VERSION_ID >= 70000 -+static void ctx_destructor(zend_resource *rsrc) -+#else -+typedef long zend_long; -+ - static void ctx_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) -+#endif - { - ctx_t *ctx = (ctx_t *)rsrc->ptr; - -@@ -120,16 +126,23 @@ - zval *z_ctx; - ctx_t *ctx; - uuid_rc_t rc; -+#if PHP_VERSION_ID >= 70000 -+ char *param_types = "z/"; -+#else -+ char *param_types = "z"; -+#endif - - /* parse parameters */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_ctx) == FAILURE) -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx) == FAILURE) - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID < 70000 - if (!PZVAL_IS_REF(z_ctx)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: parameter wasn't passed by reference"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#endif - - /* perform operation */ - if ((ctx = (ctx_t *)malloc(sizeof(ctx_t))) == NULL) -@@ -138,7 +151,12 @@ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: %s", uuid_error(rc)); - RETURN_LONG((long)rc); - } -+#if PHP_VERSION_ID >= 70000 -+ zval_dtor(z_ctx); -+ ZVAL_RES(z_ctx, zend_register_resource(ctx, ctx_id)); -+#else - ZEND_REGISTER_RESOURCE(z_ctx, ctx, ctx_id); -+#endif - - RETURN_LONG((long)rc); - } -@@ -158,7 +177,11 @@ - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID >= 70000 -+ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); -+#endif - if (ctx == NULL || ctx->uuid == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_destroy: invalid context"); - RETURN_LONG((long)UUID_RC_ARG); -@@ -185,21 +208,32 @@ - zval *z_clone; - ctx_t *clone; - uuid_rc_t rc; -+#if PHP_VERSION_ID >= 70000 -+ char *param_types = "rz/"; -+#else -+ char *param_types = "rz"; -+#endif - - /* parse parameters */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_clone) == FAILURE) -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_clone) == FAILURE) - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID >= 70000 -+ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); -+#endif - if (ctx == NULL || ctx->uuid == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: invalid context"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#if PHP_VERSION_ID < 70000 - if (!PZVAL_IS_REF(z_clone)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: clone parameter wasn't passed by reference"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#endif - - /* perform operation */ - if ((clone = (ctx_t *)malloc(sizeof(ctx_t))) == NULL) -@@ -208,7 +243,12 @@ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: %s", uuid_error(rc)); - RETURN_LONG((long)rc); - } -+#if PHP_VERSION_ID >= 70000 -+ zval_dtor(z_clone); -+ ZVAL_RES(z_clone, zend_register_resource(clone, ctx_id)); -+#else - ZEND_REGISTER_RESOURCE(z_clone, clone, ctx_id); -+#endif - - RETURN_LONG((long)rc); - } -@@ -230,7 +271,11 @@ - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID >= 70000 -+ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); -+#endif - if (ctx == NULL || ctx->uuid == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_load: invalid context"); - RETURN_LONG((long)UUID_RC_ARG); -@@ -254,7 +299,7 @@ - zval *z_ctx; - ctx_t *ctx; - uuid_rc_t rc; -- long z_mode; -+ zend_long z_mode; - unsigned long mode; - zval *z_ctx_ns; - ctx_t *ctx_ns; -@@ -266,7 +311,11 @@ - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID >= 70000 -+ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); -+#endif - if (ctx == NULL || ctx->uuid == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_make: invalid context"); - RETURN_LONG((long)UUID_RC_ARG); -@@ -281,7 +330,11 @@ - } - } - else if (ZEND_NUM_ARGS() == 4 && ((mode & UUID_MAKE_V3) || (mode & UUID_MAKE_V5))) { -+#if PHP_VERSION_ID >= 70000 -+ ctx_ns = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx_ns), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx_ns, ctx_t *, &z_ctx_ns, -1, ctx_name, ctx_id); -+#endif - if (ctx_ns == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_make: invalid namespace context"); - RETURN_LONG((long)UUID_RC_ARG); -@@ -314,21 +367,33 @@ - uuid_rc_t rc; - zval *z_result; - int result; -+#if PHP_VERSION_ID >= 70000 -+ char *param_types = "rz/"; -+#else -+ char *param_types = "rz"; -+#endif - - /* parse parameters */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_result) == FAILURE) -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_result) == FAILURE) - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID >= 70000 -+ zval_dtor(z_result); -+ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); -+#endif - if (ctx == NULL || ctx->uuid == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_isnil: invalid context"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#if PHP_VERSION_ID < 70000 - if (!PZVAL_IS_REF(z_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_isnil: result parameter wasn't passed by reference"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#endif - - /* perform operation */ - if ((rc = uuid_isnil(ctx->uuid, &result)) != UUID_RC_OK) { -@@ -353,26 +418,42 @@ - uuid_rc_t rc; - zval *z_result; - int result; -+#if PHP_VERSION_ID >= 70000 -+ char *param_types = "rrz/"; -+#else -+ char *param_types = "rrz"; -+#endif - - /* parse parameters */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrz", &z_ctx, &z_ctx2, &z_result) == FAILURE) -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_ctx2, &z_result) == FAILURE) - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID >= 70000 -+ zval_dtor(z_result); -+ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); -+#endif - if (ctx == NULL || ctx->uuid == NULL) { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context"); -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context from first parameter"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#if PHP_VERSION_ID >= 70000 -+ ctx2 = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx2), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx2, ctx_t *, &z_ctx2, -1, ctx_name, ctx_id); -+#endif -- if (ctx2 == NULL || ctx2->uuid) { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context"); -+ if (ctx2 == NULL || ctx2->uuid == NULL) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context from second parameter"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#if PHP_VERSION_ID < 70000 - if (!PZVAL_IS_REF(z_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: result parameter wasn't passed by reference"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#endif - - /* perform operation */ - if ((rc = uuid_compare(ctx->uuid, ctx2->uuid, &result)) != UUID_RC_OK) { -@@ -392,7 +473,7 @@ - { - zval *z_ctx; - ctx_t *ctx; -- long z_fmt; -+ zend_long z_fmt; - unsigned long fmt; - zval *z_data; - uuid_rc_t rc; -@@ -404,7 +485,11 @@ - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID >= 70000 -+ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); -+#endif - if (ctx == NULL || ctx->uuid == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_import: invalid context"); - RETURN_LONG((long)UUID_RC_ARG); -@@ -428,28 +513,40 @@ - { - zval *z_ctx; - ctx_t *ctx; -- long z_fmt; -+ zend_long z_fmt; - unsigned long fmt; - zval *z_data; - uuid_rc_t rc; - void *data_ptr; - size_t data_len; -+#if PHP_VERSION_ID >= 70000 -+ char *param_types = "rlz/"; -+#else -+ char *param_types = "rlz"; -+#endif - - /* parse parameters */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &z_ctx, &z_fmt, &z_data) == FAILURE) -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_fmt, &z_data) == FAILURE) - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID >= 70000 -+ zval_dtor(z_data); -+ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); -+#else - ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); -+#endif - if (ctx == NULL || ctx->uuid == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: invalid context"); - RETURN_LONG((long)UUID_RC_ARG); - } - fmt = (unsigned long)z_fmt; -+#if PHP_VERSION_ID < 70000 - if (!PZVAL_IS_REF(z_data)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: data parameter wasn't passed by reference"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#endif - - /* perform operation */ - data_ptr = NULL; -@@ -462,7 +559,11 @@ - data_len = strlen((char *)data_ptr); - else if (fmt == UUID_FMT_STR || fmt == UUID_FMT_TXT) - data_len--; /* PHP doesn't wish NUL-termination on strings */ -+#if PHP_VERSION_ID >= 70000 -+ ZVAL_STRINGL(z_data, data_ptr, data_len); -+#else - ZVAL_STRINGL(z_data, data_ptr, data_len, 1); -+#endif - free(data_ptr); - - RETURN_LONG((long)rc); -@@ -474,7 +575,7 @@ - return error string corresponding to error return code */ - ZEND_FUNCTION(uuid_error) - { -- int z_rc; -+ zend_long z_rc; - uuid_rc_t rc; - char *error; - -@@ -483,7 +584,11 @@ - rc = (uuid_rc_t)z_rc; - if ((error = uuid_error(rc)) == NULL) - RETURN_NULL(); -+#if PHP_VERSION_ID >= 70000 -+ RETURN_STRING(error); -+#else - RETURN_STRING(error, 1); -+#endif - } - - /* API FUNCTION: diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch deleted file mode 100644 index 1467207f51f5..000000000000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Marco Nenciarini <marco.nenciarini@devise.it> -Date: Wed, 27 Jan 2010 19:46:21 +0100 -Subject: [PATCH] uuid: preserve -m option status in -v option handling - -Bug: 531396 ---- - uuid_cli.c | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/uuid_cli.c b/uuid_cli.c -index d1b0b11..14a67fe 100644 ---- a/uuid_cli.c -+++ b/uuid_cli.c -@@ -140,11 +140,12 @@ int main(int argc, char *argv[]) - i = strtol(optarg, &p, 10); - if (*p != '\0') - usage("invalid argument to option 'v'"); -+ version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5); - switch (i) { -- case 1: version = UUID_MAKE_V1; break; -- case 3: version = UUID_MAKE_V3; break; -- case 4: version = UUID_MAKE_V4; break; -- case 5: version = UUID_MAKE_V5; break; -+ case 1: version |= UUID_MAKE_V1; break; -+ case 3: version |= UUID_MAKE_V3; break; -+ case 4: version |= UUID_MAKE_V4; break; -+ case 5: version |= UUID_MAKE_V5; break; - default: - usage("invalid version on option 'v'"); - break; -@@ -213,10 +214,10 @@ int main(int argc, char *argv[]) - } - else { - /* encoding */ -- if ( (version == UUID_MAKE_V1 && argc != 0) -- || (version == UUID_MAKE_V3 && argc != 2) -- || (version == UUID_MAKE_V4 && argc != 0) -- || (version == UUID_MAKE_V5 && argc != 2)) -+ if ( (version & UUID_MAKE_V1 && argc != 0) -+ || (version & UUID_MAKE_V3 && argc != 2) -+ || (version & UUID_MAKE_V4 && argc != 0) -+ || (version & UUID_MAKE_V5 && argc != 2)) - usage("invalid number of arguments"); - if ((rc = uuid_create(&uuid)) != UUID_RC_OK) - error(1, "uuid_create: %s", uuid_error(rc)); -@@ -232,7 +233,7 @@ int main(int argc, char *argv[]) - if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK) - error(1, "uuid_load: %s", uuid_error(rc)); - } -- if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) { -+ if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) { - if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK) - error(1, "uuid_create: %s", uuid_error(rc)); - if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) { --- diff --git a/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch b/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch deleted file mode 100644 index c00f560f1fd8..000000000000 --- a/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch +++ /dev/null @@ -1,226 +0,0 @@ -diff -up uuid-1.6.2/php/uuid.c.php54 uuid-1.6.2/php/uuid.c ---- uuid-1.6.2/php/uuid.c 2007-01-01 19:35:57.000000000 +0100 -+++ uuid-1.6.2/php/uuid.c 2012-11-06 16:05:03.354913764 +0100 -@@ -60,7 +60,7 @@ static int ctx_id; /* inte - #define ctx_name "UUID context" /* external name */ - - /* module initialization */ --PHP_MINIT_FUNCTION(uuid) -+ZEND_MINIT_FUNCTION(uuid) - { - /* register resource identifier */ - ctx_id = zend_register_list_destructors_ex( -@@ -91,13 +91,13 @@ PHP_MINIT_FUNCTION(uuid) - } - - /* module shutdown */ --PHP_MSHUTDOWN_FUNCTION(uuid) -+ZEND_MSHUTDOWN_FUNCTION(uuid) - { - return SUCCESS; - } - - /* module information */ --PHP_MINFO_FUNCTION(uuid) -+ZEND_MINFO_FUNCTION(uuid) - { - char version[32]; - -@@ -115,7 +115,7 @@ PHP_MINFO_FUNCTION(uuid) - proto rc uuid_create(ctx) - $rc = uuid_create(&$uuid); - create UUID context */ --PHP_FUNCTION(uuid_create) -+ZEND_FUNCTION(uuid_create) - { - zval *z_ctx; - ctx_t *ctx; -@@ -147,7 +147,7 @@ PHP_FUNCTION(uuid_create) - proto rc uuid_destroy(ctx) - $rc = uuid_destroy($uuid); - destroy UUID context */ --PHP_FUNCTION(uuid_destroy) -+ZEND_FUNCTION(uuid_destroy) - { - zval *z_ctx; - ctx_t *ctx; -@@ -178,7 +178,7 @@ PHP_FUNCTION(uuid_destroy) - proto rc uuid_clone(ctx, &ctx2) - $rc = uuid_clone($uuid, &$uuid); - clone UUID context */ --PHP_FUNCTION(uuid_clone) -+ZEND_FUNCTION(uuid_clone) - { - zval *z_ctx; - ctx_t *ctx; -@@ -217,7 +217,7 @@ PHP_FUNCTION(uuid_clone) - proto rc uuid_load(ctx, name) - $rc = uuid_name($uuid, $name); - load an existing UUID */ --PHP_FUNCTION(uuid_load) -+ZEND_FUNCTION(uuid_load) - { - zval *z_ctx; - ctx_t *ctx; -@@ -249,7 +249,7 @@ PHP_FUNCTION(uuid_load) - proto rc uuid_make(ctx, mode[, ..., ...]) - $rc = uuid_make($uuid, $mode[, ..., ...]); - make a new UUID */ --PHP_FUNCTION(uuid_make) -+ZEND_FUNCTION(uuid_make) - { - zval *z_ctx; - ctx_t *ctx; -@@ -307,7 +307,7 @@ PHP_FUNCTION(uuid_make) - proto rc uuid_isnil(ctx, result) - $rc = uuid_isnil($uuid, &$result); - compare UUID for being Nil UUID */ --PHP_FUNCTION(uuid_isnil) -+ZEND_FUNCTION(uuid_isnil) - { - zval *z_ctx; - ctx_t *ctx; -@@ -344,7 +344,7 @@ PHP_FUNCTION(uuid_isnil) - proto rc uuid_compare(ctx, ctx2, result) - $rc = uuid_compare($uuid, $uuid2, &$result); - compare two UUIDs */ --PHP_FUNCTION(uuid_compare) -+ZEND_FUNCTION(uuid_compare) - { - zval *z_ctx; - ctx_t *ctx; -@@ -388,7 +388,7 @@ PHP_FUNCTION(uuid_compare) - proto rc uuid_import(ctx, fmt, data) - $rc = uuid_import($ctx, $fmt, $data); - import UUID from variable */ --PHP_FUNCTION(uuid_import) -+ZEND_FUNCTION(uuid_import) - { - zval *z_ctx; - ctx_t *ctx; -@@ -424,7 +424,7 @@ PHP_FUNCTION(uuid_import) - proto rc uuid_export(ctx, fmt, data) - $rc = uuid_error($ctx, $fmt, &$data); - export UUID into variable */ --PHP_FUNCTION(uuid_export) -+ZEND_FUNCTION(uuid_export) - { - zval *z_ctx; - ctx_t *ctx; -@@ -472,7 +472,7 @@ PHP_FUNCTION(uuid_export) - proto rc uuid_error(ctx) - $error = uuid_error($rc); - return error string corresponding to error return code */ --PHP_FUNCTION(uuid_error) -+ZEND_FUNCTION(uuid_error) - { - int z_rc; - uuid_rc_t rc; -@@ -490,24 +490,79 @@ PHP_FUNCTION(uuid_error) - proto int uuid_version() - $version = uuid_version(); - return library version number */ --PHP_FUNCTION(uuid_version) -+ZEND_FUNCTION(uuid_version) - { - RETURN_LONG((long)uuid_version()); - } - -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_create, 0) -+ ZEND_ARG_INFO(1, ctx) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_destroy, 0) -+ ZEND_ARG_INFO(0, ctx) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_clone, 0) -+ ZEND_ARG_INFO(0, ctx) -+ ZEND_ARG_INFO(1, ctx2) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_load, 0) -+ ZEND_ARG_INFO(0, ctx) -+ ZEND_ARG_INFO(0, name) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_uuid_make, 0, 0, 2) -+ ZEND_ARG_INFO(0, ctx) -+ ZEND_ARG_INFO(0, mode) -+ ZEND_ARG_INFO(0, ctxns) -+ ZEND_ARG_INFO(0, url) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_isnil, 0) -+ ZEND_ARG_INFO(0, ctx) -+ ZEND_ARG_INFO(1, result) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_compare, 0) -+ ZEND_ARG_INFO(0, ctx) -+ ZEND_ARG_INFO(0, ctx2) -+ ZEND_ARG_INFO(1, result) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_import, 0) -+ ZEND_ARG_INFO(0, ctx) -+ ZEND_ARG_INFO(0, fmt) -+ ZEND_ARG_INFO(0, data) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_export, 0) -+ ZEND_ARG_INFO(0, ctx) -+ ZEND_ARG_INFO(0, fmt) -+ ZEND_ARG_INFO(1, data) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_error, 0) -+ ZEND_ARG_INFO(0, ctx) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO(arginfo_uuid_version, 0) -+ZEND_END_ARG_INFO() -+ - /* module function table */ --static function_entry uuid_functions[] = { -- PHP_FE(uuid_create, NULL) -- PHP_FE(uuid_destroy, NULL) -- PHP_FE(uuid_clone, NULL) -- PHP_FE(uuid_load, NULL) -- PHP_FE(uuid_make, NULL) -- PHP_FE(uuid_isnil, NULL) -- PHP_FE(uuid_compare, NULL) -- PHP_FE(uuid_import, NULL) -- PHP_FE(uuid_export, NULL) -- PHP_FE(uuid_error, NULL) -- PHP_FE(uuid_version, NULL) -+static zend_function_entry uuid_functions[] = { -+ ZEND_FE(uuid_create, arginfo_uuid_create) -+ ZEND_FE(uuid_destroy, NULL) -+ ZEND_FE(uuid_clone, arginfo_uuid_clone) -+ ZEND_FE(uuid_load, NULL) -+ ZEND_FE(uuid_make, NULL) -+ ZEND_FE(uuid_isnil, arginfo_uuid_isnil) -+ ZEND_FE(uuid_compare, arginfo_uuid_compare) -+ ZEND_FE(uuid_import, NULL) -+ ZEND_FE(uuid_export, arginfo_uuid_export) -+ ZEND_FE(uuid_error, NULL) -+ ZEND_FE(uuid_version, NULL) - { NULL, NULL, NULL } - }; - -@@ -516,11 +571,11 @@ zend_module_entry uuid_module_entry = { - STANDARD_MODULE_HEADER, - "uuid", - uuid_functions, -- PHP_MINIT(uuid), -- PHP_MSHUTDOWN(uuid), -+ ZEND_MINIT(uuid), -+ ZEND_MSHUTDOWN(uuid), - NULL, - NULL, -- PHP_MINFO(uuid), -+ ZEND_MINFO(uuid), - NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES - }; |