summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Kay2020-10-13 17:48:08 +1100
committerRod Kay2020-10-13 17:48:08 +1100
commit2ad8ca9ea0a7dedcfec5cec5780814451b3ca006 (patch)
treec7057fb69bc12d04c88f604e13cef87619e66a03
parentd69f15f526ce47ba913adb6b5929488cf289af16 (diff)
downloadaur-2ad8ca9ea0a7dedcfec5cec5780814451b3ca006.tar.gz
Update to 20.0w version.
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD45
-rw-r--r--aws-net-acceptors.adb-patch21
-rw-r--r--aws-server-hotplug.adb-patch12
-rw-r--r--aws-server.adb-patch12
5 files changed, 86 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1ab85e1d00ae..d6069c4adf6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ada-web-server
pkgdesc = A complete embeddable Web application framework for Ada.
- pkgver = 2019
- pkgrel = 1
+ pkgver = 2020
+ pkgrel = 2
url = http://libre.adacore.com/tools/aws
arch = i686
arch = x86_64
@@ -10,10 +10,15 @@ pkgbase = ada-web-server
makedepends = gprbuild
makedepends = texlive-bin
depends = gcc-ada
- depends = asis
provides = aws
- source = http://mirrors.cdn.adacore.com/art/5cdf85a031e87aa2cdf16b19
- sha1sums = 110b3f623b4487874a714d3cf29aa945680766a6
+ source = https://community.download.adacore.com/v1/61134515bc9fc53a3ccc6c6f0097cb95e2b0722e?filename=aws-20.0w-20190801-155D3-src.tar.gz
+ source = aws-net-acceptors.adb-patch
+ source = aws-server.adb-patch
+ source = aws-server-hotplug.adb-patch
+ sha1sums = 61134515bc9fc53a3ccc6c6f0097cb95e2b0722e
+ sha1sums = e67c1264c9e4d03b5aa793edca97eb98b6fd813c
+ sha1sums = ad5d8f554910747598325bdf4d8171bc03b1c6f3
+ sha1sums = 01b054021747ba83f3e69e78b71b2a59c074bb06
pkgname = ada-web-server
diff --git a/PKGBUILD b/PKGBUILD
index cf55520e1652..0cebf204bbd0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Rod Kay <charlie5 on #ada at freenode.net>
pkgname=ada-web-server
-pkgver=2019
-pkgrel=1
+pkgver=2020
+pkgrel=2
pkgdesc="A complete embeddable Web application framework for Ada."
arch=(i686 x86_64)
@@ -10,35 +10,52 @@ url=http://libre.adacore.com/tools/aws
license=(GPL)
groups=(gcc-ada)
-depends=('gcc-ada' 'asis')
+depends=('gcc-ada')
makedepends=(gprbuild texlive-bin)
provides=(aws)
-source=('http://mirrors.cdn.adacore.com/art/5cdf85a031e87aa2cdf16b19')
-sha1sums=('110b3f623b4487874a714d3cf29aa945680766a6')
+source=('https://community.download.adacore.com/v1/61134515bc9fc53a3ccc6c6f0097cb95e2b0722e?filename=aws-20.0w-20190801-155D3-src.tar.gz'
+ 'aws-net-acceptors.adb-patch'
+ 'aws-server.adb-patch'
+ 'aws-server-hotplug.adb-patch')
+sha1sums=('61134515bc9fc53a3ccc6c6f0097cb95e2b0722e'
+ 'e67c1264c9e4d03b5aa793edca97eb98b6fd813c'
+ 'ad5d8f554910747598325bdf4d8171bc03b1c6f3'
+ '01b054021747ba83f3e69e78b71b2a59c074bb06')
-build()
+prepare()
{
- cd $srcdir/aws-2019-20190512-18AB9-src
+ cd $srcdir/aws-20.0w-20190801-155D3-src
+
+ patch -p1 < "$srcdir/aws-net-acceptors.adb-patch"
+ patch -p1 < "$srcdir/aws-server.adb-patch"
+ patch -p1 < "$srcdir/aws-server-hotplug.adb-patch"
+}
+
+build()
+{
+ cd $srcdir/aws-20.0w-20190801-155D3-src
+
+ export BUILD_MODE=prod
+ export LIBRARY_TYPE=static
+ export LIBADALANG_LIBRARY_TYPE=relocatable
+ export LANGKIT_SUPPORT_LIBRARY_TYPE=relocatable
+ export BUILD=relocatable
+
make setup
make build
cd docs
- make html
+ make SPHINXBUILD=sphinx-build2 html
}
package()
{
- cd $srcdir/aws-2019-20190512-18AB9-src
+ cd $srcdir/aws-20.0w-20190801-155D3-src
make DESTDIR="$pkgdir" install
-
- mkdir -p $pkgdir/usr/lib/gnat/manifests
- mv $pkgdir/usr/share/gpr/aws.gpr $pkgdir/usr/lib/gnat
- mv $pkgdir/usr/share/gpr/manifests/aws $pkgdir/usr/lib/gnat/manifests
- rm -fr $pkgdir/usr/share/gpr
}
diff --git a/aws-net-acceptors.adb-patch b/aws-net-acceptors.adb-patch
new file mode 100644
index 000000000000..4bbcb2bb10c8
--- /dev/null
+++ b/aws-net-acceptors.adb-patch
@@ -0,0 +1,21 @@
+--- aws-20.0w-20190801-155D3-src/src/core/aws-net-acceptors.adb 2019-07-31 10:33:51.000000000 +1000
++++ aws-20.0w-20190801-155D3-src-new/src/core/aws-net-acceptors.adb 2020-10-13 17:01:58.799122021 +1100
+@@ -507,7 +507,7 @@
+
+ procedure Add (S : not null access Socket_Type'Class) is
+ begin
+- Sockets.Append (S);
++ Sockets.Append (Socket_Access (S));
+ end Add;
+
+ -----------
+@@ -647,7 +647,7 @@
+ and then Acceptor.W_Signal /= null;
+
+ if Success then
+- Buffer.Append (S);
++ Buffer.Append (Socket_Access (S));
+ Acceptor.W_Signal.Send ((1 => Socket_Command));
+ end if;
+ end Add;
+
diff --git a/aws-server-hotplug.adb-patch b/aws-server-hotplug.adb-patch
new file mode 100644
index 000000000000..1b4c87f0640f
--- /dev/null
+++ b/aws-server-hotplug.adb-patch
@@ -0,0 +1,12 @@
+--- aws-20.0w-20190801-155D3-src/src/extended/aws-server-hotplug.adb 2019-07-31 10:33:51.000000000 +1000
++++ aws-20.0w-20190801-155D3-src-new/src/extended/aws-server-hotplug.adb 2020-10-13 16:56:42.419559066 +1100
+@@ -120,7 +120,7 @@
+ Line : String_Split.Slice_Set;
+ N : Natural := 0;
+ begin
+- Hotplug_Server.Start (Port, Web_Server, Host => Host);
++ Hotplug_Server.Start (Port, HTTP_Access (Web_Server), Host => Host);
+ AWS.Hotplug.Set_Mode (Web_Server.Filters, Register_Mode);
+
+ Text_IO.Open (File, Text_IO.In_File, Authorization_File);
+
diff --git a/aws-server.adb-patch b/aws-server.adb-patch
new file mode 100644
index 000000000000..094806bde53a
--- /dev/null
+++ b/aws-server.adb-patch
@@ -0,0 +1,12 @@
+--- aws-20.0w-20190801-155D3-src/src/core/aws-server.adb 2019-07-31 10:33:51.000000000 +1000
++++ aws-20.0w-20190801-155D3-src-new/src/core/aws-server.adb 2020-10-13 17:03:03.231072335 +1100
+@@ -898,7 +898,7 @@
+ begin
+ pragma Assert (Count > 0);
+
+- Table (Index).Sock := Socket;
++ Table (Index).Sock := Socket_Access (Socket);
+ Table (Index).Alive_Counter := 0;
+ Table (Index).Alive_Time_Stamp := Ada.Calendar.Clock;
+ Table (Index).Activity_Counter := Table (Index).Activity_Counter + 1;
+