From nobody Sun Nov 12 19:23:16 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ST2XN5v2Pz50sq4; Sun, 12 Nov 2023 19:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ST2XN4rR2z3Rpv; Sun, 12 Nov 2023 19:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699816996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l53evIe+FK5iqx2gJWY4zTFoA4CRyuYjOrN8znXej+M=; b=dAwrmAKjsxzWMBONnkzfxp0i60yxdM5keiBAg5TvOehjIJgifw1cZ2mgAlKGASWljOJWIA l7u4JkU/2r1B6olESIP4M14PF568cUqjwZBEiYnZQHNUP46VBP42N8hQxoNXBJan5gAyM+ cMqB7s7T9w2hKoVpyVJWYqNC7YJp3Jk0pNvX5RsJj9J9G94DROhFm5SjxRj5evA/ZL/uQN 0OCTyIeYwxpUOkMejdhvInpNYBlf07bTmUu1KXC45+NpDcAhuQVvJDD1chrhDL6Ka0CwtJ GdR17s02rM53FsZkQJqKYedgzYWqLFH1qp+CQmi2chG1i2csvtIvhhKf76LiBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699816996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l53evIe+FK5iqx2gJWY4zTFoA4CRyuYjOrN8znXej+M=; b=K7wMCQRZo8DlSiKzCe/UJRruJ9Qvivvk79RcGG7nkM2BAJoE0DvgUzNVE/mj9Zz56uR7bL qFVAvHNIT7Bi8cr8kB/5ySpECIH1Ygn5Gi6ZEQ/Rw4ETeH18KuJNB/g4MnxoJ4HnEK/bGK +KTT0QZBi6iD8AkCZSk3AU0krTdHWG/h2cALlJqdOKzScQND7Z6C1BFcVnuFE1O9omoAOz zTN3JoL4OGzLG79QDuhxr/mv+2TDI3QKFAl5g1NE4LF3mpN36E6EkECh3c06e8ThG3XsYN /j+mkDQQj/nMN5djwdol2A4NNRstGYb+IhLGJL+q3XOPIZWlH0hg6Lxl4fKHiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699816996; a=rsa-sha256; cv=none; b=BBCIT/C3UxSEaC/1hIK+mXjOm5F2bulX/SFthUeNidFAsTKXIRNcym++K/SGZ6f1oCC7Pz QbgLSXFxDp+swWQI2NIdsUm5x0pt51mo4q+4GObuYQC+O4Ni2NQrvEtFpGlIbvKVWktVgU hMn4AzmK8nfIt9so4AllkQJaeGDQlZ3wvga3IxkNjhhJyL+jfB86PcVWNZqa0cZpxObkO+ lxP/bHIXFCQ9AuGfJiwoGUMEZCW0a6JszagXdAgYZX1gfL22TTpiVazhs8NimQXSIVs1Og T2h8bj/QEgPAHmv93+X4h36wzfPjagywmqBs6AFbAWAvoPqHI+nMdaF6ai7uOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ST2XN3XnVzbCt; Sun, 12 Nov 2023 19:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ACJNGqA058627; Sun, 12 Nov 2023 19:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ACJNG3L058624; Sun, 12 Nov 2023 19:23:16 GMT (envelope-from git) Date: Sun, 12 Nov 2023 19:23:16 GMT Message-Id: <202311121923.3ACJNG3L058624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: a5bd98809b0e - main - net/phpldapadmin: Fix runtime with php82 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5bd98809b0edbc0bb0e76e7d703e0f08efa515e Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5bd98809b0edbc0bb0e76e7d703e0f08efa515e commit a5bd98809b0edbc0bb0e76e7d703e0f08efa515e Author: Krzysztof AuthorDate: 2023-11-12 19:03:48 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-11-12 19:23:01 +0000 net/phpldapadmin: Fix runtime with php82 phpldapadmin needs some more patches to work correctly (without error/warning messages in webserver logs). PR: 274970 --- net/phpldapadmin/Makefile | 4 ++-- net/phpldapadmin/files/patch-lib_ds__ldap.php | 11 +++++++++++ net/phpldapadmin/files/patch-lib_xmlTemplates.php | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index 27e9f5036850..4b1908c6346b 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -1,12 +1,12 @@ PORTNAME= phpldapadmin DISTVERSION= 1.2.6.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} MAINTAINER= ports@bsdserwis.com COMMENT= PHP application to administer LDAP over the web -WWW= https://phpldapadmin.sourceforge.net/ +WWW= https://github.com/leenooks/phpLDAPadmin/wiki LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/net/phpldapadmin/files/patch-lib_ds__ldap.php b/net/phpldapadmin/files/patch-lib_ds__ldap.php new file mode 100644 index 000000000000..41dfc700729a --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_ds__ldap.php @@ -0,0 +1,11 @@ +--- lib/ds_ldap.php.orig 2023-04-01 13:46:16 UTC ++++ lib/ds_ldap.php +@@ -991,7 +991,7 @@ class ldap extends DS { + $return = $dn; + + foreach ($this->getBaseDN() as $base) { +- if (preg_match("/${base}$/i",$dn)) { ++ if (preg_match("/{$base}$/i",$dn)) { + $return = $base; + break; + } diff --git a/net/phpldapadmin/files/patch-lib_xmlTemplates.php b/net/phpldapadmin/files/patch-lib_xmlTemplates.php new file mode 100644 index 000000000000..26ee3c3f4215 --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_xmlTemplates.php @@ -0,0 +1,11 @@ +--- lib/xmlTemplates.php.orig 2023-04-01 13:46:16 UTC ++++ lib/xmlTemplates.php +@@ -122,7 +122,7 @@ abstract class xmlTemplates { + + # Ignore any files that are not the predefined custom files. + if ($_SESSION[APPCONFIG]->getValue('appearance','custom_templates_only') +- && ! preg_match("/^${custom_prefix}/",$file)) ++ && ! preg_match("/^{$custom_prefix}/",$file)) + continue; + + $filename = sprintf('%s/%s',$dir,$file);