From nobody Sun Dec 18 09:56:08 2022 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 4NZdWs0C1kz1H4Cf; Sun, 18 Dec 2022 09:56:09 +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 4NZdWr6c97z3LMB; Sun, 18 Dec 2022 09:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671357368; 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=dSDy/0VkLXFBMmkT5jSSGyTwuNUfq6toMRJJ5tPEZqs=; b=DkXEaC/uMN2HAR44v6OnIf68xngStnjf6f26uqdkV8v7DTHXJVka7+GFUeIumFqGFi9eVr 0mGUnLHLfb2LQh9RqL2+pSqkKP1POr6NpYz1pCtbI7TKRB/mjPJOvND6D6cqG4Hr4fHvsM VLheWwdfOO1oDfuIK8niFzWHWK+lZy3MAjr3+S96bY1TCN2ayjGB9+SMQfZ5UiOaIAriIr XHXdH71ClrG9FFAv8RPoX5qnFIFXbdupbFuWEFILlMfeVWB7uKx8qYvL/bQ+/cl++bI4CQ 0MyWaImKyJwqGKZGcD57BLoPDwsgjlN24APKaEfy4wIPfOnvVfuSJfiWj4C3AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671357368; 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=dSDy/0VkLXFBMmkT5jSSGyTwuNUfq6toMRJJ5tPEZqs=; b=XfHcCkYrMy2ue1OX8IRnD4SckW0tW+BuqQEuPtewosm7BaggeQHI+KHSdYr0ziG0/Tn21e p13gnbs81jXX+ksCrTV1RE6FblHCr7oAs30euEExEhHDSmb1i47uDSF1f0Y2KlrP2oWYkF Vmqld8+cbzkoCLOlg06ftYFb+RsJJtBcuS3gbpkHl+bFv8IdrTyS1kf8CzX1s4PXXXlnuo 2eN0bnJHzRRti7oBaeUc9UUzB0W6O7gPzKtlBleLLQtsrqFgutOta7UwhFwk7dL2efnC9G DvhKB+NpfEuaE93rguihYFpmO+tK+I2+4ajatXASa1XdWbQ+zcxkMhLEROrABg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671357368; a=rsa-sha256; cv=none; b=LHMmS1kegZ7X8w0JAT8TfIEZjXdq5heQy925MAg7s2fq89br27OxVnCxBLJsZ7w+slOgtg OB/nYV5UwbRsn1/BpjpPI/HRlEPDUHxYjNlioWEYwuzrVJLp/ilEPs4OzcYD6q518GlerM hAmEFHv4Z/6t2WWQBjwiYvalaB5rXostnpTFsV+nl4tV0O/KEyTLN9N2BDSMHncMMkPFlX O+/LV4PP6OQsiN2KnZaTc1crEje4lW9hM82FDRWav3nNMTbUvtI/ETHPkdxc8hNiBB/bg+ zzeBlIEA9gDTzoH6Zts7y3Uioz3hK+hbjceybhlbz6+scCNsrU9eU4bP6D7mPA== 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 4NZdWr5dsmz1R1l; Sun, 18 Dec 2022 09:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BI9u88F031787; Sun, 18 Dec 2022 09:56:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BI9u8EO031786; Sun, 18 Dec 2022 09:56:08 GMT (envelope-from git) Date: Sun, 18 Dec 2022 09:56:08 GMT Message-Id: <202212180956.2BI9u8EO031786@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 624cb5d4e912 - main - net/phpldapadmin: forgot to remove one file 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: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 624cb5d4e912fd46da6219063e2fdb0fb8a76241 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=624cb5d4e912fd46da6219063e2fdb0fb8a76241 commit 624cb5d4e912fd46da6219063e2fdb0fb8a76241 Author: Ronald Klop AuthorDate: 2022-12-18 09:34:57 +0000 Commit: Ronald Klop CommitDate: 2022-12-18 09:55:48 +0000 net/phpldapadmin: forgot to remove one file This file was in the review but not in the commit. Fixes patch so no need to inc portrevision: ===> Patching for phpldapadmin-php81-1.2.6.4 ===> Applying FreeBSD patches for phpldapadmin-php81-1.2.6.4 from /usr/ports/net/phpldapadmin/files Ignoring previously applied (or reversed) patch. 1 out of 1 hunks ignored--saving rejects to htdocs/collapse.php.rej ===> FAILED Applying FreeBSD patch-htdocs_collapse.php ===> FAILED to apply cleanly FreeBSD patch(es) patch-htdocs_collapse.php *** Error code 1 PR: 268349 Approved by: rene (mentor) Differential Revision: https://reviews.freebsd.org/D37700 --- net/phpldapadmin/files/patch-htdocs_collapse.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/net/phpldapadmin/files/patch-htdocs_collapse.php b/net/phpldapadmin/files/patch-htdocs_collapse.php deleted file mode 100644 index 19d45a350dae..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_collapse.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/collapse.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/collapse.php -@@ -19,7 +19,7 @@ $dn = get_request('dn','GET',true); - $tree = get_cached_item($app['server']->getIndex(),'tree'); - $entry = $tree->getEntry($dn); - $entry->close(); --set_cached_item($app['server']->getIndex(),'tree','null',$tree); -+set_cached_item($app['server']->getIndex(),$tree,'tree','null'); - - header(sprintf('Location:index.php?server_id=%s&junk=%s#%s%s', - $app['server']->getIndex(),random_junk(),htmlid($app['server']->getIndex(),$dn),app_session_param()));