From 795758ca7bb9e634afa5028bea3e4b699ddd7939 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 8 Oct 2024 09:08:31 +0200
Subject: update to 1.2.1

---
 uuid-workaround.patch | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 uuid-workaround.patch

(limited to 'uuid-workaround.patch')

diff --git a/uuid-workaround.patch b/uuid-workaround.patch
deleted file mode 100644
index a41e21a..0000000
--- a/uuid-workaround.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up uuid-1.2.0/config.m4.orig uuid-1.2.0/config.m4
---- uuid-1.2.0/config.m4.orig	2020-10-06 12:50:46.000000000 +0200
-+++ uuid-1.2.0/config.m4	2024-09-30 13:55:26.600108993 +0200
-@@ -18,6 +18,7 @@ if test "$PHP_UUID" != "no"; then
-   PHP_CHECK_FUNC_LIB(uuid_variant, uuid)
-   PHP_CHECK_FUNC_LIB(uuid_generate_md5, uuid)
-   PHP_CHECK_FUNC_LIB(uuid_generate_sha1, uuid)
-+  PHP_CHECK_FUNC_LIB(uuid_time64, uuid)
- 
-   export OLD_CPPFLAGS="$CPPFLAGS"
-   export CPPFLAGS="$CPPFLAGS $INCLUDES -DHAVE_UUID"
-diff -up uuid-1.2.0/uuid.c.orig uuid-1.2.0/uuid.c
---- uuid-1.2.0/uuid.c.orig	2020-10-06 12:50:46.000000000 +0200
-+++ uuid-1.2.0/uuid.c	2024-09-30 13:56:33.329669413 +0200
-@@ -27,6 +27,15 @@
- 
- #ifdef HAVE_UUID
- 
-+#if defined(uuid_time)
-+/* workround with define uuid_time uuid_time64 */
-+/* Also see https://bugzilla.redhat.com/2315645 */
-+#undef uuid_time
-+#if !defined(HAVE_UUID_TIME64)
-+extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
-+#endif
-+#endif
-+
- #if PHP_VERSION_ID < 80000
- #define VALUE_ERROR(n,name,msg) php_error_docref(NULL, E_WARNING, "Argument #%d (%s) %s", n, name, msg); RETURN_FALSE
- #define RETURN_THROWS() return
-@@ -374,7 +383,11 @@ PHP_FUNCTION(uuid_time)
- 		VALUE_ERROR(1, "$uuid", "UUID DCE TIME expected");
- 	}
- 
-+#if defined(HAVE_UUID_TIME64)
-+	RETURN_LONG(uuid_time64(u, NULL));
-+#else
- 	RETURN_LONG(uuid_time(u, NULL));
-+#endif
- }
- /* }}} uuid_time */
- 
-- 
cgit