From nobody Sun Jun 26 05:28:48 2022 X-Original-To: dev-commits-ports-all@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 D3EAC8766A5; Sun, 26 Jun 2022 05:28:48 +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 4LVzt85YMQz3rB4; Sun, 26 Jun 2022 05:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656221328; 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=2zMPVMVxe3t9vJMDezqBqpRwXNtLeVYHoxrLNvIotWk=; b=pbJqmyixaBxlXi0uYnQ6rOWKaKqcALCTVyZ9usugsiSetdPLAscm8aK2Bzosbv9P2JeGt5 e2mET0XoCcEdnLxs3Q/lIoejwanKH3f8HWHld2CpCjcmCgdyOUQ4jShEo0zYIzBoS1DmxF rrn7nWpLesmMWWZfP446kWosNIdkrTPYEKootXMv6kZCpXcu+PBB+rj4SqYoWWh7m7JBNJ pdP+WbCN8Tv9bdz2PRXQG+DD9ft7ezD8bsL3QUyxDBNCX/hUc7sQa+LqP5+oRxEcuJzNNR QdQ12h51moQzRrKLkg5Qfm/movTVmNiKOyRqytdSZMvcfCLtdVrw+HkWib2HaQ== 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 9F03812324; Sun, 26 Jun 2022 05:28:48 +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 25Q5Sm17040137; Sun, 26 Jun 2022 05:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25Q5SmWk040136; Sun, 26 Jun 2022 05:28:48 GMT (envelope-from git) Date: Sun, 26 Jun 2022 05:28:48 GMT Message-Id: <202206260528.25Q5SmWk040136@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 4c01200128fa - main - sysutils/racktables: fix warnings with PHP 8.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c01200128fa6aaf6c866c01eaf98ac4fd505ba1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656221328; 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=2zMPVMVxe3t9vJMDezqBqpRwXNtLeVYHoxrLNvIotWk=; b=fYPCrIS8q6X03915n/T41p1jKsYpsK/ykSHsoZD5wsvFh2mIVH5+Eky5/OZYOCpD/2hXKN M73Wj95v8OSCB0SvecqP95Z/Tmj0F+xq04BSfgE/5Fmpfv2iUXH2DfjAaDlY8wpHxvzonz SnNNfa/hqL/2ZyYAaHdHLL28s26JsfqFltdSGSyDjA6QBsoB54nw92EyTLgfHJ/Nqp9gN4 IYi/n0S3Xc9hAUm5HhZjpHEBxNmoLqbreVC2/vhEQXAIf4+JYkmq23CC7zhTLTAmyefmvn RLR+b7O+tYZclb8As8NfcB5NmymoXm8XVIf/m+ZSzAwCqnVDj4iKC0jCEHedyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656221328; a=rsa-sha256; cv=none; b=YzP1KQvBy5szY2NyG1HnoKtqh61TevBT5cuWszbZT9zQ1ZAqH++zxu9vs4UYelymAKIlGf ZU7c65riyl1eALEX7DMpxKWo8KJ/+cmJLON+x5IZEpimpDwbZoCGIbcgk4Fb8bk5SBDXea Yji/eyM6+OxZp/eZZP0xTnVB+yqtdWuw4HetcISL+X2htzPq//43Lk2Hw6+FyNagA6HTYG lJ8kuqvi+do3PTJ+Mr3wa3xORD0WqTaLAnwy6uf11pjkEnrqAnhDM0oXWIMK2tX20TEulq S73a+gs5DRpENkJUWok7gHvjQwhahXiZ/ZNSH9B5rPrdZRiEtFZPSorZ59iLUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c01200128fa6aaf6c866c01eaf98ac4fd505ba1 commit 4c01200128fa6aaf6c866c01eaf98ac4fd505ba1 Author: Dirk Meyer AuthorDate: 2022-06-26 05:27:58 +0000 Commit: Dirk Meyer CommitDate: 2022-06-26 05:27:58 +0000 sysutils/racktables: fix warnings with PHP 8.0 --- sysutils/racktables/Makefile | 1 + sysutils/racktables/files/patch-database.php | 29 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/sysutils/racktables/Makefile b/sysutils/racktables/Makefile index 9de900c87f84..3ca31e95f571 100644 --- a/sysutils/racktables/Makefile +++ b/sysutils/racktables/Makefile @@ -2,6 +2,7 @@ PORTNAME= racktables DISTVERSION= 0.22.0 +PORTREVISION= 1 CATEGORIES?= sysutils www MASTER_SITES= SF/${PORTNAME}/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/sysutils/racktables/files/patch-database.php b/sysutils/racktables/files/patch-database.php new file mode 100644 index 000000000000..619ecd328870 --- /dev/null +++ b/sysutils/racktables/files/patch-database.php @@ -0,0 +1,29 @@ +--- wwwroot/inc/database.php.orig 2022-02-15 23:54:10 UTC ++++ wwwroot/inc/database.php +@@ -4853,7 +4853,7 @@ function commitAddFile ($name, $type, $contents, $comm + } + } + +-function commitReplaceFile ($file_id = 0, $contents) ++function commitReplaceFile ($file_id, $contents) + { + global $dbxlink; + $query = $dbxlink->prepare('UPDATE File SET mtime = NOW(), contents = ?, size = LENGTH(contents), thumbnail = NULL WHERE id = ?'); +@@ -5565,7 +5565,7 @@ function makeVlanListWhere ($db_field_name, $vlan_list + return $ret; + } + +-function upd8021QPort ($instance = 'desired', $object_id, $port_name, $port, $before) ++function upd8021QPort ($instance, $object_id, $port_name, $port, $before) + { + global $tablemap_8021q; + if (!array_key_exists ($instance, $tablemap_8021q)) +@@ -5638,7 +5638,7 @@ function upd8021QPort ($instance = 'desired', $object_ + return $changed ? 1 : 0; + } + +-function replace8021QPorts ($instance = 'desired', $object_id, $before, $changes) ++function replace8021QPorts ($instance, $object_id, $before, $changes) + { + $done = 0; + foreach ($changes as $pn => $port)