From nobody Thu Dec 23 14:52:58 2021 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 DBEB118FFE9E; Thu, 23 Dec 2021 14:52:58 +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 4JKY8V38x8z4tkd; Thu, 23 Dec 2021 14:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4D1BC12A0D; Thu, 23 Dec 2021 14:52:58 +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 1BNEqwma003667; Thu, 23 Dec 2021 14:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BNEqwPl003666; Thu, 23 Dec 2021 14:52:58 GMT (envelope-from git) Date: Thu, 23 Dec 2021 14:52:58 GMT Message-Id: <202112231452.1BNEqwPl003666@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexander Leidinger Subject: git: 85fc17bba80b - main - security/bastillion: update to 3.12.00 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: netchild X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85fc17bba80bb26d659c469a8ec5bd3b780d85b0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640271178; 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=e9/Zjc4/TXYklYecfj5ghfZYCYEvcEWpKEvOvc3pdfM=; b=dcuB72w+dO4BTcKtmhkKczayimrGaNfE03z9MIIVYvaEc1GGEnxVC7f+U6CLkfBlTZzWlM 5vPFOkacLnDUGZnAAkaIHcQ1SJGlcxnjkmrnZGOXZ4kBVoFBS1+UjSGoUTYJjJ2QiDRS0c 8bNid0AGcs3mc6NXjO7WEk67+KwgDJJXmXiV6T1PKYy5BnWouxwmkLGRKH2WpBIFEz9XZq FF8RYk9tPdgVrZ9X9mXG1PWfdUVKASjRPRU7byp1fMfS3RTFOBRlHbMh4M1Mn0f8LyoVNE gTqQ6sOWNI1krC5b5S88weecLIJBkBv20b0dNm04HOy0bUdpK5TdeICh5xqSPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640271178; a=rsa-sha256; cv=none; b=dqtbazb0Nf3lyQmjNBcO50Kk93QJpKShOJSMXnLQ4tXme9gz3qRTFLJ9dBX7IkYnExOyWh VWfiWVnTopX6O4hI+CaFYvfAxXL50QYLhCNYAgrpEdlJUrQATW2MtjQE/66WBkCBEwfQgu M++waIx6tpLw+WxFWpiFusCwJlIv0ZRFEmuJcQrQ6ug7h4WbPNMfGCTrjkMjGFDPsqfLHh NDCoA9yd2WA/L2Jwsjwms2jShTQ22UCubo4XD4ZznXtp4E6iB/5h6/+gV6P9CIjATtpqGQ AuzhPW+J4DDqIoHH8a87p8+vfEboQvOC/bR9Fiav6Zk/l2sf4zHwOJsY1ndakg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=85fc17bba80bb26d659c469a8ec5bd3b780d85b0 commit 85fc17bba80bb26d659c469a8ec5bd3b780d85b0 Author: Alexander Leidinger AuthorDate: 2021-12-23 14:50:09 +0000 Commit: Alexander Leidinger CommitDate: 2021-12-23 14:52:55 +0000 security/bastillion: update to 3.12.00 This update contains an incompatible DB change, please read UPDATING *before* updating. --- UPDATING | 11 +++ security/bastillion/Makefile | 2 +- security/bastillion/distinfo | 6 +- security/bastillion/files/pkg-message.in | 12 ++++ security/bastillion/pkg-plist | 116 ++++++++++++++++++++++--------- 5 files changed, 110 insertions(+), 37 deletions(-) diff --git a/UPDATING b/UPDATING index 22c7045e387f..bdfe77255cd9 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20211223: + AFFECTS: users of security/bastillion + AUTHOR: netchild@FreeBSD.org + + This update contains an incompatible DB change. Either recreate your + DB (rm /usr/local/jetty_bastillion/bastillion/WEB-INF/classes/keydb/bastillion.* + and restart) by hand, or export the old DB while the old version is + installed and import the data into a new DB. See + https://github.com/bastillion-io/Bastillion/issues/405 + for details. + 20211220: AFFECTS: users of devel/notcurses AUTHOR: nickblack@linux.com diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile index a32b87e39179..8be20720b61d 100644 --- a/security/bastillion/Makefile +++ b/security/bastillion/Makefile @@ -2,7 +2,7 @@ PORTNAME= bastillion DISTVERSIONPREFIX= jetty-v -DISTVERSION= 3.11_01 +DISTVERSION= 3.12_00 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-upgrade-3.08.00.jar PORTREVISION= 0 diff --git a/security/bastillion/distinfo b/security/bastillion/distinfo index 565346732d6c..d14e00567684 100644 --- a/security/bastillion/distinfo +++ b/security/bastillion/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1639726206 -SHA256 (bastillion-jetty-v3.11_01.tar.gz) = 7ffec5373b6698ebedfa1228b6f0caea482e313cb2bdb9758b5607765c4626b9 -SIZE (bastillion-jetty-v3.11_01.tar.gz) = 19785024 +TIMESTAMP = 1640073876 +SHA256 (bastillion-jetty-v3.12_00.tar.gz) = 312084367414a18ab9febb3d2e338a8cce2849dfb9e28709831febf2f30e0bb0 +SIZE (bastillion-jetty-v3.12_00.tar.gz) = 20364656 SHA256 (bastillion-upgrade-3.08.00.jar) = 8d18adc90d258b9a9de5e5865c9f632c563d0557ad9458b9f1082ede15ed074b SIZE (bastillion-upgrade-3.08.00.jar) = 3557485 diff --git a/security/bastillion/files/pkg-message.in b/security/bastillion/files/pkg-message.in index 6a26a0f95ae1..59c81da651e0 100644 --- a/security/bastillion/files/pkg-message.in +++ b/security/bastillion/files/pkg-message.in @@ -25,4 +25,16 @@ as someone else than admin, you forgot to upgrade it): java -jar %%PREFIX%%/jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties EOT } +{ + type: upgrade + maximum_version: "3.12.00" + message: <