From 7113961cbd139bd0c2122a92cc41331dbabf45a8 Mon Sep 17 00:00:00 2001
From: Thomas Jensen <boxes@thomasjensen.com>
Date: Tue, 20 Sep 2022 22:12:05 +0200
Subject: [PATCH] v2.2.0

---
 Makefile              | 6 +++---
 boxes-pkg.openwrt     | 4 ++--
 boxes.portable.nuspec | 2 +-
 cyclonedx-sbom.json   | 4 ++--
 doc/boxes.1.in        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 26878ead..334f3faf 100644
--- a/Makefile
+++ b/Makefile
@@ -16,14 +16,14 @@
 # The following line (GLOBALCONF) is the only line you should need to edit!
 GLOBALCONF = /usr/share/boxes
 GIT_STATUS = $(shell git describe --dirty --always 2>/dev/null || echo "n/a")
-BVERSION   = 2.1.1
+BVERSION   = 2.2.0
 
 ALL_FILES  = LICENSE README.md boxes-config
 DOC_FILES  = doc/boxes.1 doc/boxes.el
 PKG_NAME   = boxes-$(BVERSION)
 OUT_DIR    = out
 
-WIN_PCRE2_VERSION      = 10.36
+WIN_PCRE2_VERSION      = 10.40
 WIN_PCRE2_DIR          = vendor/pcre2-$(WIN_PCRE2_VERSION)
 WIN_FLEX_BISON_VERSION = 2.5.24
 WIN_FLEX_BISON_DIR     = vendor/flex_bison_$(WIN_FLEX_BISON_VERSION)
@@ -51,7 +51,7 @@ win32.debug: infomsg replaceinfos
 
 win32.prereq:
 	# download components
-	curl -LO https://ftp.pcre.org/pub/pcre/pcre2-$(WIN_PCRE2_VERSION).tar.gz
+	curl -LO https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$(WIN_PCRE2_VERSION)/pcre2-$(WIN_PCRE2_VERSION).tar.gz
 	curl -LO https://downloads.sourceforge.net/project/winflexbison/win_flex_bison-$(WIN_FLEX_BISON_VERSION).zip
 	curl -LO https://cmocka.org/files/$(WIN_CMOCKA_VERSION:%.0=%)/cmocka-$(WIN_CMOCKA_VERSION)-mingw.zip
 	# unpack components
diff --git a/boxes-pkg.openwrt b/boxes-pkg.openwrt
index 48292f4a..567133db 100644
--- a/boxes-pkg.openwrt
+++ b/boxes-pkg.openwrt
@@ -29,12 +29,12 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=boxes
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(PKG_NAME)-$(PKG_VERSION).$(PKG_RELEASE)
 
 
-PKG_SOURCE:=v2.1.1.tar.gz
+PKG_SOURCE:=v2.2.0.tar.gz
 PKG_SOURCE_URL:=https://github.com/ascii-boxes/boxes/archive/refs/tags/
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/boxes.portable.nuspec b/boxes.portable.nuspec
index 103bee05..c2eaf3ec 100644
--- a/boxes.portable.nuspec
+++ b/boxes.portable.nuspec
@@ -68,7 +68,7 @@ Details on where boxes looks for configuration files can be found
         <licenseUrl>https://raw.githubusercontent.com/ascii-boxes/boxes/v2.2.0/LICENSE</licenseUrl>
         <language>en</language>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <releaseNotes>https://boxes.thomasjensen.com/202x/xx/boxes-v2.2.0-released.html</releaseNotes>
+        <releaseNotes>https://boxes.thomasjensen.com/2022/09/boxes-v2.2.0-released.html</releaseNotes>
         <projectSourceUrl>https://github.com/ascii-boxes/boxes</projectSourceUrl>
         <packageSourceUrl>https://github.com/ascii-boxes/boxes/blob/master/boxes.portable.nuspec</packageSourceUrl>
         <docsUrl>https://boxes.thomasjensen.com/</docsUrl>
diff --git a/cyclonedx-sbom.json b/cyclonedx-sbom.json
index 0b5bd8d4..0c6879a3 100644
--- a/cyclonedx-sbom.json
+++ b/cyclonedx-sbom.json
@@ -8,7 +8,7 @@
             "type": "application",
             "author": "Thomas Jensen and the boxes contributors",
             "name": "boxes",
-            "version": "2.1.1",
+            "version": "2.2.0",
             "description": "Command Line ASCII Boxes Unlimited!",
             "licenses": [
                 {
@@ -70,7 +70,7 @@
             "type": "library",
             "author": "Philip Hazel",
             "name": "PCRE2",
-            "version": "10.36",
+            "version": "10.40",
             "description": "PCRE2 - Perl-compatible regular expressions (revised API)",
             "licenses": [
                 {
diff --git a/doc/boxes.1.in b/doc/boxes.1.in
index 51e30d09..6283daff 100644
--- a/doc/boxes.1.in
+++ b/doc/boxes.1.in
@@ -1,4 +1,4 @@
-.\" @(#)boxes.1 2.1.1 06/14/2021
+.\" @(#)boxes.1 2.2.0 09/20/2022
 .\"
 .TH boxes 1 "June 14 2021"
 .UC 4