CVS commit: pkgsrc/devel/php-libawl

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Dec 11 14:14:13 UTC 2025

Modified Files:
        pkgsrc/devel/php-libawl: Makefile distinfo
Added Files:
        pkgsrc/devel/php-libawl/patches: patch-inc_AWLUtilities.php.in

Log Message:
Pull upstream fix for issue #29
<https://gitlab.com/davical-project/awl/-/issues/29>

Remove patch leftovers

Pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/php-libawl/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/php-libawl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/php-libawl/patches/patch-inc_AWLUtilities.php.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/php-libawl/Makefile
diff -u pkgsrc/devel/php-libawl/Makefile:1.21 pkgsrc/devel/php-libawl/Makefile:1.22
--- pkgsrc/devel/php-libawl/Makefile:1.21       Sat Feb  8 03:41:13 2025
+++ pkgsrc/devel/php-libawl/Makefile    Thu Dec 11 14:14:12 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2025/02/08 03:41:13 taca Exp $
+# $NetBSD: Makefile,v 1.22 2025/12/11 14:14:12 hauke Exp $
 #
 
 LIBAWL_VERSION=        0.65
 DISTNAME=      libawl-${LIBAWL_VERSION}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=davical-project/}
 GITLAB_PROJECT=        awl
@@ -31,13 +31,14 @@ do-install:
        for f in *; do                                          \
                ${INSTALL_DATA} "$$f"                           \
                    ${DESTDIR}${PREFIX}/${LIBAWLDIR}/dba;       \
-       done;
+       done
 
        cd ${WRKSRC}/inc;                                       \
+       rm *.orig;                                              \
        for f in *; do                                          \
                ${INSTALL_DATA} "$$f"                           \
                    ${DESTDIR}${PREFIX}/${LIBAWLDIR}/inc;       \
-       done;
+       done
 
 .include "../../devel/php-libawl/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/php-libawl/distinfo
diff -u pkgsrc/devel/php-libawl/distinfo:1.19 pkgsrc/devel/php-libawl/distinfo:1.20
--- pkgsrc/devel/php-libawl/distinfo:1.19       Tue Jul  9 13:55:38 2024
+++ pkgsrc/devel/php-libawl/distinfo    Thu Dec 11 14:14:12 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.19 2024/07/09 13:55:38 hauke Exp $
+$NetBSD: distinfo,v 1.20 2025/12/11 14:14:12 hauke Exp $
 
 BLAKE2s (libawl-0.65-a3b9ae16.tar.gz) = 0566455c63bff2ec8c27cf29a4fa5c49fda45691355edfa01b7889b909a1bd03
 SHA512 (libawl-0.65-a3b9ae16.tar.gz) = b4ee45623f21951b65507c2e8b5d081c906f0410f23a8a1d0c1a83f3dd70d786156c496d0664cca8f1ca5c3f45da25b651b939d0f6c06153b2a4fe45dec16125
 Size (libawl-0.65-a3b9ae16.tar.gz) = 606857 bytes
 SHA1 (patch-Makefile) = 288ef49b4af863f560bc6ec7754527a0b306bf9a
+SHA1 (patch-inc_AWLUtilities.php.in) = 78c71ac9028fe31db924dd4fb51e651db675fb2a

Added files:

Index: pkgsrc/devel/php-libawl/patches/patch-inc_AWLUtilities.php.in
diff -u /dev/null pkgsrc/devel/php-libawl/patches/patch-inc_AWLUtilities.php.in:1.1
--- /dev/null   Thu Dec 11 14:14:13 2025
+++ pkgsrc/devel/php-libawl/patches/patch-inc_AWLUtilities.php.in       Thu Dec 11 14:14:12 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-inc_AWLUtilities.php.in,v 1.1 2025/12/11 14:14:12 hauke Exp $
+
+Pull fix for issue #39 from trunk
+<https://gitlab.com/davical-project/awl/-/merge_requests/39>:
+Perform null check on timezone_identifiers_list_cache in AWLUtilities
+
+--- inc/AWLUtilities.php.in.orig       2025-12-11 13:29:54.383427587 +0000
++++ inc/AWLUtilities.php.in
+@@ -623,8 +623,7 @@ if ( !function_exists("force_utf8") ) {
+ }
+ 
+ 
+-$timezone_identifiers_list_cache = timezone_identifiers_list();
+-$timezone_identifiers_list_cache = isset($timezone_identifiers_list_cache) ? $timezone_identifiers_list_cache : [];
++$timezone_identifiers_list_cache = timezone_identifiers_list() ?: [];
+ 
+ /**
+ * Try and extract something like "Pacific/Auckland" or "America/Indiana/Indianapolis" if possible.
+@@ -632,7 +631,11 @@ $timezone_identifiers_list_cache = isset
+ function olson_from_tzstring( $tzstring ) {
+   global $c, $timezone_identifiers_list_cache;
+ 
++  if ( !isset($timezone_identifiers_list_cache) ) {
++      $timezone_identifiers_list_cache = timezone_identifiers_list() ?: [];
++  }
+   if ( in_array($tzstring,$timezone_identifiers_list_cache) ) return $tzstring;
++
+   if ( preg_match( '{((Antarctica|America|Africa|Atlantic|Asia|Australia|Indian|Europe|Pacific)/(([^/]+)/)?[^/]+)$}', $tzstring, $matches ) ) {
+ //    dbg_error_log( 'INFO', 'Found timezone "%s" from string "%s"', $matches[1], $tzstring );
+     return $matches[1];