diff options
Diffstat (limited to 'www/aws/files')
| -rw-r--r-- | www/aws/files/aws.gpr.in | 59 | ||||
| -rw-r--r-- | www/aws/files/patch-aws.gpr | 61 | ||||
| -rw-r--r-- | www/aws/files/patch-include_include.gpr | 10 | ||||
| -rw-r--r-- | www/aws/files/patch-regtests_0043__check__mem_test.opt | 14 | ||||
| -rw-r--r-- | www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt | 14 | ||||
| -rw-r--r-- | www/aws/files/patch-src_core_aws-net.adb | 11 | ||||
| -rw-r--r-- | www/aws/files/patch-src_core_aws-server-http__utils.adb | 22 | ||||
| -rw-r--r-- | www/aws/files/patch-src_src.gpr | 20 | ||||
| -rw-r--r-- | www/aws/files/patch-ssl__crypto_lib.gpr | 10 | ||||
| -rw-r--r-- | www/aws/files/temparse.gpr.in | 33 |
10 files changed, 0 insertions, 254 deletions
diff --git a/www/aws/files/aws.gpr.in b/www/aws/files/aws.gpr.in deleted file mode 100644 index c24fdcbd69a7..000000000000 --- a/www/aws/files/aws.gpr.in +++ /dev/null @@ -1,59 +0,0 @@ -with "xmlada"; - -project AWS is - - type AWS_Kind_Type is ("static", "relocatable"); - AWS_Kind : AWS_Kind_Type := external ("LIBRARY_TYPE", "static"); - - for Library_Name use "aws"; - for Library_Kind use AWS_Kind; - case AWS_Kind is - when "relocatable" => - for Source_Dirs use ("../../include/aws.relocatable"); - for Library_Dir use "../../lib/aws.relocatable"; - for Library_Version use "libaws.so"; - when others => - for Source_Dirs use ("../../include/aws"); - for Library_Dir use "../../lib/aws"; - end case; - for Externally_Built use "true"; - - package Linker is - for Linker_Options use ("-L@PREFIX@/lib", "-Wl,-R,@PREFIX@/lib" - @SSL@ , "-lssl", "-lcrypto" - @TLS@ , "-L@PREFIX@/lib/gnutls3", "-Wl,-R,@PREFIX@/lib/gnutls3" - @TLS@ , "-lgnutls" - @LDP@ , "-lldap" - ); - end Linker; - - package Naming is - - @IP4@ for Implementation ("AWS.Net.Std") use "aws-net-std__gnat.adb"; - - @IP6@ for Implementation ("AWS.Net.Std") use "aws-net-std__ipv6.adb"; - - @STD@ for Implementation ("AWS.Net.SSL") use "aws-net-ssl__dummy.adb"; - @STD@ for Specification ("AWS.Net.SSL.Certificate.Impl") - @STD@ use "aws-net-ssl-certificate-impl__dummy.ads"; - @STD@ for Implementation ("AWS.Net.SSL.Certificate.Impl") - @STD@ use "aws-net-ssl-certificate-impl__dummy.adb"; - @STD@ for Specification ("SSL.Thin") use "ssl-thin__dummy.ads"; - - @SSL@ for Implementation ("AWS.Net.SSL") use "aws-net-ssl__openssl.adb"; - @SSL@ for Specification ("AWS.Net.SSL.Certificate.Impl") - @SSL@ use "aws-net-ssl-certificate-impl__openssl.ads"; - @SSL@ for Implementation ("AWS.Net.SSL.Certificate.Impl") - @SSL@ use "aws-net-ssl-certificate-impl__openssl.adb"; - @SSL@ for Specification ("SSL.Thin") use "ssl-thin__openssl.ads"; - - @TLS@ for Implementation ("AWS.Net.SSL") use "aws-net-ssl__gnutls.adb"; - @TLS@ for Specification ("AWS.Net.SSL.Certificate.Impl") - @TLS@ use "aws-net-ssl-certificate-impl__gnutls.ads"; - @TLS@ for Implementation ("AWS.Net.SSL.Certificate.Impl") - @TLS@ use "aws-net-ssl-certificate-impl__gnutls.adb"; - @TLS@ for Specification ("SSL.Thin") use "ssl-thin__gnutls.ads"; - - end Naming; - -end AWS; diff --git a/www/aws/files/patch-aws.gpr b/www/aws/files/patch-aws.gpr deleted file mode 100644 index 882e991d7911..000000000000 --- a/www/aws/files/patch-aws.gpr +++ /dev/null @@ -1,61 +0,0 @@ ---- aws.gpr.orig 2014-11-15 19:27:52 UTC -+++ aws.gpr -@@ -55,7 +56,7 @@ aggregate library project AWS is - Project'Library_Options & ("-lwldap32"); - when others => - for Library_Options use -- Project'Library_Options & ("-lldap"); -+ Project'Library_Options & ("-L@PREFIX@/lib", "-lldap"); - end case; - - when "Disabled" => -@@ -69,49 +70,4 @@ aggregate library project AWS is - - package Builder renames Shared.Builder; - -- ------------- -- -- Install -- -- ------------- -- -- package Install is -- -- examples -- -- for Artifacts ("share/examples/aws/images") -- use ("demos/runme/aws_*.png"); -- for Artifacts ("share/examples/aws/templates") -- use ("demos/web_mail/*html"); -- -- -- support files (templates) -- -- for Artifacts ("share/examples/aws/templates") -- use ("templates_parser/tools/templates.tads"); -- for Artifacts ("share/examples/aws/web_elements") -- use ("web_elements/menu_css", "web_elements/notebook", -- "web_elements/rounded_boxes", "web_elements/icons", -- "web_elements/javascripts", -- "web_elements/mime.types", "web_elements/readme.txt"); -- -- case Shared.S_Target is -- when "Windows_NT" => -- for Artifacts ("lib/aws") -- use (Shared.Target_Dir & "/common/win32/aws.coff"); -- when others => -- null; -- end case; -- -- -- documentations -- -- for Artifacts ("share/doc/aws") use ("docs/build/html"); -- for Artifacts ("share/doc/aws/pdf") use ("docs/build/latex/*.pdf"); -- for Artifacts ("share/doc/aws/templates_parser") -- use ("templates_parser/docs/build/html"); -- for Artifacts ("share/doc/aws/templates_parser/pdf") -- use ("templates_parser/docs/build/latex/*.pdf"); -- -- -- gps plug-ins -- -- for Artifacts ("share/gps/plug-ins") use ("gps/*.xml", "gps/aws.py"); -- -- end Install; -- - end AWS; diff --git a/www/aws/files/patch-include_include.gpr b/www/aws/files/patch-include_include.gpr deleted file mode 100644 index e5bce0c3081c..000000000000 --- a/www/aws/files/patch-include_include.gpr +++ /dev/null @@ -1,10 +0,0 @@ ---- include/include.gpr.orig 2015-06-22 10:52:10 UTC -+++ include/include.gpr -@@ -31,6 +31,7 @@ library project Include is - - for Library_Name use "aws_include"; - for Library_Kind use Shared.Library_Type; -+ for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@"); - for Leading_Library_Options use Shared.Leading_Library_Options; - - --------- diff --git a/www/aws/files/patch-regtests_0043__check__mem_test.opt b/www/aws/files/patch-regtests_0043__check__mem_test.opt deleted file mode 100644 index e229301688c1..000000000000 --- a/www/aws/files/patch-regtests_0043__check__mem_test.opt +++ /dev/null @@ -1,14 +0,0 @@ ---- regtests/0043_check_mem/test.opt.orig 2014-11-15 19:27:52 UTC -+++ regtests/0043_check_mem/test.opt -@@ -1,3 +1,11 @@ - !ssl DEAD - !xmlada DEAD -+x86-dragonfly DEAD "no gnatmem" -+x86-freebsd DEAD "no gnatmem" -+x86-openbsd DEAD "no gnatmem" -+x86-netbsd DEAD "no gnatmem" -+x86_64-dragonfly DEAD "no gnatmem" -+x86_64-freebsd DEAD "no gnatmem" -+x86_64-openbsd DEAD "no gnatmem" -+x86_64-netbsd DEAD "no gnatmem" - darwin DEAD "no gnatmem" diff --git a/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt b/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt deleted file mode 100644 index 42436535e6e7..000000000000 --- a/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt +++ /dev/null @@ -1,14 +0,0 @@ ---- regtests/0213_check_mem_nossl/test.opt.orig 2014-11-15 19:27:52 UTC -+++ regtests/0213_check_mem_nossl/test.opt -@@ -1,3 +1,11 @@ - !xmlada DEAD - !asis DEAD -+x86-dragonfly DEAD "no gnatmem" -+x86-freebsd DEAD "no gnatmem" -+x86-openbsd DEAD "no gnatmem" -+x86-netbsd DEAD "no gnatmem" -+x86_64-dragonfly DEAD "no gnatmem" -+x86_64-freebsd DEAD "no gnatmem" -+x86_64-openbsd DEAD "no gnatmem" -+x86_64-netbsd DEAD "no gnatmem" - darwin DEAD "no gnatmem" diff --git a/www/aws/files/patch-src_core_aws-net.adb b/www/aws/files/patch-src_core_aws-net.adb deleted file mode 100644 index 0d20c6c887bd..000000000000 --- a/www/aws/files/patch-src_core_aws-net.adb +++ /dev/null @@ -1,11 +0,0 @@ ---- src/core/aws-net.adb.orig 2015-06-22 10:52:10 UTC -+++ src/core/aws-net.adb -@@ -553,7 +553,7 @@ package body AWS.Net is - - -- to be shure that it is S1 and S2 connected together - -- exit when Peer_Addr (STC (S2)) = Local_Host -+ exit when Peer_Addr (STC (S2)) = Get_Addr (STC (S1)) - and then Peer_Port (STC (S2)) = Get_Port (STC (S1)) - and then Peer_Port (STC (S1)) = Get_Port (STC (S2)); - diff --git a/www/aws/files/patch-src_core_aws-server-http__utils.adb b/www/aws/files/patch-src_core_aws-server-http__utils.adb deleted file mode 100644 index 13c537f374ce..000000000000 --- a/www/aws/files/patch-src_core_aws-server-http__utils.adb +++ /dev/null @@ -1,22 +0,0 @@ -Current_Process_Id is not available on GCC 6.x - ---- src/core/aws-server-http_utils.adb.orig 2016-09-28 15:14:26 UTC -+++ src/core/aws-server-http_utils.adb -@@ -39,7 +39,6 @@ with Ada.Strings.Unbounded; - with Ada.Text_IO; - - with GNAT.MD5; --with GNAT.OS_Lib; - with GNAT.Regexp; - - with AWS.Attachments; -@@ -924,8 +923,7 @@ package body AWS.Server.HTTP_Utils is - - function Get_File_Upload_UID return String is - use GNAT; -- Pid : constant Natural := Integer'Max -- (0, OS_Lib.Pid_To_Integer (OS_Lib.Current_Process_Id)); -+ Pid : constant Natural := 0; - -- On OS where Current_Process_Id is not support -1 is returned. We - -- ensure that in this case the Pid is set to 0 in this case. - UID : Natural; diff --git a/www/aws/files/patch-src_src.gpr b/www/aws/files/patch-src_src.gpr deleted file mode 100644 index 7091cb6a81c2..000000000000 --- a/www/aws/files/patch-src_src.gpr +++ /dev/null @@ -1,20 +0,0 @@ ---- src/src.gpr.orig 2015-06-22 10:52:10 UTC -+++ src/src.gpr -@@ -68,7 +68,7 @@ library project Src is - when "Windows_NT" => - for Library_Options use ("-lwsock32", "-lws2_32"); - when others => -- null; -+ for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@"); - end case; - - case Shared.LDAP is -@@ -79,7 +79,7 @@ library project Src is - Project'Library_Options & ("-lwldap32"); - when others => - for Library_Options use -- Project'Library_Options & ("-lldap"); -+ Project'Library_Options & ("-L@PREFIX@/lib", "-lldap"); - end case; - - when "Disabled" => diff --git a/www/aws/files/patch-ssl__crypto_lib.gpr b/www/aws/files/patch-ssl__crypto_lib.gpr deleted file mode 100644 index 0738957a270c..000000000000 --- a/www/aws/files/patch-ssl__crypto_lib.gpr +++ /dev/null @@ -1,10 +0,0 @@ ---- ssl/crypto_lib.gpr.orig 2014-11-15 19:27:52 UTC -+++ ssl/crypto_lib.gpr -@@ -20,7 +20,6 @@ - - with "../.build/projects/aws_config"; - with "../.build/projects/aws_lib_shared"; --with "dl_lib"; - - project Crypto_Lib is - diff --git a/www/aws/files/temparse.gpr.in b/www/aws/files/temparse.gpr.in deleted file mode 100644 index 1ef48a5a5eed..000000000000 --- a/www/aws/files/temparse.gpr.in +++ /dev/null @@ -1,33 +0,0 @@ --- This is a workaround for the nasty habit gprlib has of using --- ${LOCALBASE}/lib/templates_parser as the OBJECT_DIR, dumping .lexch --- files there which is a build violation. By copying the prebuilt --- library and ali files over to the project object directory and using --- a custom gpr file restricts the libaws.lexch generation there. - -with "../shared"; - -project TemParse is - - for Library_Name use "templates_parser"; - for Library_Kind use Shared.Library_Type; - case Shared.Library_Type is - when "relocatable" => - for Library_Version use "libtemplates_parser.so"; - for Source_Dirs use ("@PREFIX@/include/templates_parser.relocatable"); - when others => - for Source_Dirs use ("@PREFIX@/include/templates_parser"); - end case; - for Object_Dir use "../" & Shared'Object_Dir & "/temparse"; - for Library_Dir use "../" & Shared'Library_Dir & "/temparse"; - for Externally_Built use "true"; - - package Naming is - -- for Specification ("Templates_Parser.Configuration") - -- use "templates_parser-configuration__aws.ads"; - for Implementation ("Templates_Parser.Input") - use "templates_parser-input__standalone.adb"; - for Implementation ("Templates_Parser_Tasking") - use "templates_parser_tasking__standard_tasking.adb"; - end Naming; - -end TemParse; |
