Update to version 2023.

7 files changed, 22 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db45a74d2bd4..18dc052a0d0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ada-web-server
 	pkgdesc = A complete embeddable web application framework for Ada.
-	pkgver = 2022
-	pkgrel = 3
+	pkgver = 2023
+	pkgrel = 1
 	url = http://libre.adacore.com/tools/aws
 	arch = i686
 	arch = x86_64
@@ -12,21 +12,13 @@ pkgbase = ada-web-server
 	makedepends = texlive-core
 	makedepends = texlive-latexextra
 	makedepends = python-sphinx
+	depends = gnatcoll-core
 	depends = openssl
+	depends = python
 	provides = aws
-	source = aws.tar.gz::https://github.com/AdaCore/aws/archive/refs/tags/v22.0.0.tar.gz
-	source = templates-parser.tar.gz::https://github.com/AdaCore/templates-parser/archive/refs/tags/v22.0.0.tar.gz
-	source = patch-aws-client-http_utils.ads
-	source = patch-templates_parser.adb
-	source = patch-aws-dispatchers-callback.ads
-	source = patch-aws-net-acceptors.ads
-	source = patch-aws-net-websocket-registry.adb
-	sha256sums = 52abc9aee16975840da7754767f3f27b6bfcc88e4437f9befed9cfe76504d10c
-	sha256sums = 1e217260bf3b26809fc5d09f9a0ec22c2b0ed412600c0fea2291f02c30328941
-	sha256sums = 1a32395e200e0518e64ec3584ad081a72ffda03d8bb97ed8060c29979fb60c0a
-	sha256sums = 419f17b9e037b582bedb67c76869a564b80f5a62f0269724d7d7da64be5b6c63
-	sha256sums = 9413fff6b28b57531b606a224115f3f6de21ebc5c5c7cf9703e1d29ee81d279d
-	sha256sums = 71e302a87fc1581c54e4246d38d8956e7bdcf3107fb9855300e676e59e68ab38
-	sha256sums = 8165dc74693ed40162d1426309cd4a304f1fd213ec35915ed21662ccaec39587
+	source = aws.tar.gz::https://github.com/AdaCore/aws/archive/refs/tags/v23.0.0.tar.gz
+	source = templates-parser.tar.gz::https://github.com/AdaCore/templates-parser/archive/refs/tags/v23.0.0.tar.gz
+	sha256sums = c63cec91ddf6ac55382f27e31ccd2dc17aabd7c713a70e39e2dab257a77d832c
+	sha256sums = 0fb0094fba45bd28bf2093394207e9f312d99a9d27a741b7ffd1b1a21c2c0285
 
 pkgname = ada-web-server
diff --git a/PKGBUILD b/PKGBUILD
index ba3a2597e9d1..1f0032cefa86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Rod Kay   <rodakay5 at gmail dot com>
 
 pkgname=ada-web-server
-pkgver=2022
-pkgrel=3
+pkgver=2023
+pkgrel=1
 pkgdesc="A complete embeddable web application framework for Ada."
 
 arch=(i686 x86_64)
@@ -10,48 +10,29 @@ url=http://libre.adacore.com/tools/aws
 license=(GPL)
 groups=(gcc-ada)
 
-depends=(openssl)
+depends=(gnatcoll-core openssl python)
 makedepends=(gprbuild texlive-bin texlive-core texlive-latexextra python-sphinx)
 
 provides=(aws)
 
-source=(aws.tar.gz::https://github.com/AdaCore/aws/archive/refs/tags/v22.0.0.tar.gz
-        templates-parser.tar.gz::https://github.com/AdaCore/templates-parser/archive/refs/tags/v22.0.0.tar.gz
-        patch-aws-client-http_utils.ads
-        patch-templates_parser.adb
-        patch-aws-dispatchers-callback.ads
-        patch-aws-net-acceptors.ads
-        patch-aws-net-websocket-registry.adb)
-
-sha256sums=(52abc9aee16975840da7754767f3f27b6bfcc88e4437f9befed9cfe76504d10c
-            1e217260bf3b26809fc5d09f9a0ec22c2b0ed412600c0fea2291f02c30328941
-            1a32395e200e0518e64ec3584ad081a72ffda03d8bb97ed8060c29979fb60c0a
-            419f17b9e037b582bedb67c76869a564b80f5a62f0269724d7d7da64be5b6c63
-            9413fff6b28b57531b606a224115f3f6de21ebc5c5c7cf9703e1d29ee81d279d
-            71e302a87fc1581c54e4246d38d8956e7bdcf3107fb9855300e676e59e68ab38
-            8165dc74693ed40162d1426309cd4a304f1fd213ec35915ed21662ccaec39587)
+source=(aws.tar.gz::https://github.com/AdaCore/aws/archive/refs/tags/v23.0.0.tar.gz
+        templates-parser.tar.gz::https://github.com/AdaCore/templates-parser/archive/refs/tags/v23.0.0.tar.gz)
 
+sha256sums=(c63cec91ddf6ac55382f27e31ccd2dc17aabd7c713a70e39e2dab257a77d832c
+            0fb0094fba45bd28bf2093394207e9f312d99a9d27a741b7ffd1b1a21c2c0285)
 
 prepare()
 {
-    cd $srcdir/aws-22.0.0
+    cd $srcdir/aws-23.0.0
 
     rmdir templates_parser
-    ln -s "$srcdir/templates-parser-22.0.0" templates_parser
-
-    patch -p0 -i ../patch-aws-client-http_utils.ads
-    patch -p0 -i ../patch-aws-dispatchers-callback.ads
-    patch -p0 -i ../patch-aws-net-acceptors.ads
-    patch -p0 -i ../patch-aws-net-websocket-registry.adb
-
-    cd $srcdir/templates-parser-22.0.0
-    patch -p0 -i ../patch-templates_parser.adb
+    ln -s "$srcdir/templates-parser-23.0.0" templates_parser
 }
 
 
 build() 
 {
-    cd "$srcdir/aws-22.0.0/templates_parser"
+    cd "$srcdir/aws-23.0.0/templates_parser"
 
     PRJ_BUILD=Release make DEBUG=false prefix=/usr setup 
     PRJ_BUILD=Release make DEBUG=false build
@@ -60,23 +41,21 @@ build()
     mkdir -p build
     make -j1 html latexpdf
 
-
-    cd $srcdir/aws-22.0.0
-
+    cd $srcdir/aws-23.0.0
     PRJ_BUILD=Release DEBUG=false make -j1 prefix=/usr SOCKET=openssl setup
     PRJ_BUILD=Release DEBUG=false make -j1 build
 
-    cd $srcdir/aws-22.0.0/docs
+    cd $srcdir/aws-23.0.0/docs
     make -j1 html latexpdf
 }
 
 
 package() 
 {
-    cd $srcdir/aws-22.0.0/templates_parser
+    cd $srcdir/aws-23.0.0/templates_parser
     make -j1 DEBUG=false DESTDIR="$pkgdir" install
 
-    cd $srcdir/aws-22.0.0
+    cd $srcdir/aws-23.0.0
     make -j1 DESTDIR="$pkgdir" install
 
 
diff --git a/patch-aws-client-http_utils.ads b/patch-aws-client-http_utils.ads
deleted file mode 100644
index 7eca5ee99a2d..000000000000
--- a/patch-aws-client-http_utils.ads
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/core/aws-client-http_utils.ads	2021-10-07 03:24:29.000000000 +1100
-+++ ./src/core/aws-client-http_utils.ads-new	2022-05-17 16:11:07.161195573 +1000
-@@ -29,7 +29,6 @@
- 
- pragma Ada_2012;
- 
--with AWS.Client;
- with AWS.Response;
- with AWS.Status;
- 
diff --git a/patch-aws-dispatchers-callback.ads b/patch-aws-dispatchers-callback.ads
deleted file mode 100644
index a1a02167d9d6..000000000000
--- a/patch-aws-dispatchers-callback.ads
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/core/aws-dispatchers-callback.ads	2021-10-07 03:24:29.000000000 +1100
-+++ ./src/core/aws-dispatchers-callback.ads-new	2022-05-17 16:23:24.691206335 +1000
-@@ -31,7 +31,6 @@
- 
- --  Dispatch on a Callback procedure
- 
--with AWS.Dispatchers;
- with AWS.Response;
- with AWS.Status;
- 
diff --git a/patch-aws-net-acceptors.ads b/patch-aws-net-acceptors.ads
deleted file mode 100644
index 65eb2894ea8b..000000000000
--- a/patch-aws-net-acceptors.ads
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/core/aws-net-acceptors.ads	2021-10-07 03:24:29.000000000 +1100
-+++ ./src/core/aws-net-acceptors.ads-new	2022-05-17 16:34:31.371215958 +1000
-@@ -33,7 +33,6 @@
- 
- with Ada.Containers.Doubly_Linked_Lists;
- 
--with AWS.Net;
- with AWS.Net.Generic_Sets;
- with AWS.Utils;
- 
diff --git a/patch-aws-net-websocket-registry.adb b/patch-aws-net-websocket-registry.adb
deleted file mode 100644
index 044d1ef987c4..000000000000
--- a/patch-aws-net-websocket-registry.adb
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/core/aws-net-websocket-registry.adb	2021-10-07 03:24:29.000000000 +1100
-+++ ./src/core/aws-net-websocket-registry.adb-new	2022-05-17 16:39:54.204553977 +1000
-@@ -46,7 +46,6 @@
- with AWS.Net.Memory;
- with AWS.Net.Poll_Events;
- with AWS.Net.Std;
--with AWS.Net.WebSocket;
- with AWS.Utils;
- 
- package body AWS.Net.WebSocket.Registry is
diff --git a/patch-templates_parser.adb b/patch-templates_parser.adb
deleted file mode 100644
index e28d8dd86862..000000000000
--- a/patch-templates_parser.adb
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/templates_parser.adb	2020-10-31 04:35:33.000000000 +1100
-+++ ./src/templates_parser.adb-new	2022-05-17 16:14:23.327865165 +1000
-@@ -2079,7 +2079,6 @@
-                                         Strings.Both);
-                      First, Last : Natural;
-                      Next_Last   : Natural;
--                     pragma Unreferenced (Next_Last);
-                   begin
-                      if Is_Number (Ind_Str) then
-                         Ind := Natural'Value (Ind_Str);