landgraf pushed to aws (master). "New release (3.2.0)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 26 12:27:54 UTC 2015
From fe2d4cc1beed29a479fb9b33d1c13d6ee6f515ce Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov at redhat.com>
Date: Tue, 26 May 2015 14:27:19 +0200
Subject: New release (3.2.0)
diff --git a/.gitignore b/.gitignore
index 4a73823..ea076ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/aws-gpl-2.11.0-src.tgz
/aws-gpl-3.1.0-src.tgz
/aws-manpages.tar.gz
+/aws-gpl-3.2.0-git20150523-src.tgz
diff --git a/aws-3.1.0-atomic_Input_Limit.patch b/aws-3.1.0-atomic_Input_Limit.patch
deleted file mode 100644
index 01d6e92..0000000
--- a/aws-3.1.0-atomic_Input_Limit.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/core/aws-net-buffered.adb 2013-03-19 14:26:18.000000000 +0100
-+++ src/core/aws-net-buffered.adb 2015-04-30 03:29:30.641692000 +0200
-@@ -36,7 +36,7 @@
- CRLF : constant Stream_Element_Array :=
- Translator.To_Stream_Element_Array (ASCII.CR & ASCII.LF);
-
-- Input_Limit : Stream_Element_Offset := AWS.Default.Input_Line_Size_Limit;
-+ Input_Limit : Positive := AWS.Default.Input_Line_Size_Limit;
- pragma Atomic (Input_Limit);
-
- procedure Read (Socket : Socket_Type'Class);
-@@ -82,7 +82,7 @@
-
- function Get_Input_Limit return Stream_Element_Offset is
- begin
-- return Input_Limit;
-+ return Stream_Element_Offset (Input_Limit);
- end Get_Input_Limit;
-
- --------------
-@@ -302,7 +302,7 @@
- if Wait then
- Append (Buffer, C.Buffer (C.First .. C.Last));
-
-- if Size (Buffer) > Input_Limit then
-+ if Size (Buffer) > Stream_Element_Offset (Input_Limit) then
- raise Data_Overflow with
- "Size" & Stream_Element_Offset'Image (Size (Buffer));
- end if;
-@@ -364,7 +364,7 @@
-
- procedure Set_Input_Limit (Limit : Positive) is
- begin
-- Input_Limit := Stream_Element_Offset (Limit);
-+ Input_Limit := Limit;
- end Set_Input_Limit;
-
- --------------
diff --git a/aws-3.1.0-remove_bundled_static.patch b/aws-3.1.0-remove_bundled_static.patch
deleted file mode 100644
index b38f6c1..0000000
--- a/aws-3.1.0-remove_bundled_static.patch
+++ /dev/null
@@ -1,532 +0,0 @@
-diff --git a/include/include.gpr b/include/include.gpr
-index 83580ba..a2f8fe2 100644
---- a/include/include.gpr
-+++ b/include/include.gpr
-@@ -18,7 +18,7 @@
-
- with "../shared";
-
--with "zlib/zlib";
-+with "zlib_ada";
-
- library project Include is
-
-diff --git a/makefile b/makefile
-index ed32287..2ea9622 100644
---- a/makefile
-+++ b/makefile
-@@ -29,7 +29,7 @@ include makefile.conf
- include makefile.checks
- # consistency checks
-
--LIBRARY_TYPE = static
-+LIBRARY_TYPE = relocatable
-
- ifeq (${PRJ_TARGET}, Windows_NT)
- EXEEXT = .exe
-@@ -90,7 +90,7 @@ force:
- #############################################################################
- # Configuration for GNAT Projet Files
-
--MODULES = config win32 include ssl src tools docs gps regtests \
-+MODULES = config win32 include ssl src tools docs regtests \
- web_elements demos
-
- MODULES_SETUP = ${MODULES:%=%_setup}
-@@ -208,12 +208,9 @@ GPROPTS = -XPRJ_BUILD=$(PRJ_BUILD) -XPRJ_SOCKLIB=$(PRJ_SOCKLIB) \
- # build
-
- build-native:
-- $(GPRBUILD) -p $(GPROPTS) -XLIBRARY_TYPE=static tools/tools.gpr
- ifeq (${ENABLE_SHARED}, true)
- $(GPRBUILD) -p $(GPROPTS) -XLIBRARY_TYPE=relocatable src/src.gpr
- endif
-- $(GPRBUILD) -p $(GPROPTS) -XLIBRARY_TYPE=static gps/gps_support.gpr
-- ${MAKE} -C gps $(GALL_OPTIONS) after-build
-
- build-cross:
- $(GPRBUILD) -p --target=$(TARGET) $(GPROPTS) \
-@@ -364,10 +361,8 @@ gen_setup:
- echo "PROCESSORS=$(PROCESSORS)" >> makefile.setup
- echo "TARGET=$(TARGET)" >> makefile.setup
-
--setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
-+setup: gen_setup setup_dir setup_modules setup_config $(GEXT_MODULE)
-
--setup_tp:
-- $(MAKE) -C templates_parser setup $(GALL_OPTIONS)
-
- install_clean:
- $(RM) -fr $(DESTDIR)$(I_INC)/$(TARGET)
-diff --git a/shared.gpr b/shared.gpr
-index 8811f5a..b44dab3 100644
---- a/shared.gpr
-+++ b/shared.gpr
-@@ -46,7 +46,7 @@ abstract project Shared is
- --------------------------
-
- type Library_Kind is ("relocatable", "static");
-- Library_Type : Library_Kind := external ("LIBRARY_TYPE", "static");
-+ Library_Type : Library_Kind := external ("LIBRARY_TYPE", "relocatable");
-
- ---------------------
- -- Target to build --
-diff --git a/src/src.gpr b/src/src.gpr
-index 80bd2fa..9baa7a0 100644
---- a/src/src.gpr
-+++ b/src/src.gpr
-@@ -21,13 +21,14 @@ with "../.build/projects/aws_xmlada";
- with "../shared";
- with "../include/include";
- with "../ssl/ssl";
-+with "templates_parser";
-
- library project Src is
-
- for Languages use ("Ada", "Project file", "makefile");
-
- for Source_Dirs use
-- ("core", "extended", "../templates_parser/src", "../config/src",
-+ ("core", "extended", "../config/src",
- "../config/ssl", "../" & Shared.Target_Dir & "/setup/src", ".");
-
- -- XMLAda Installed, add xsrc and soap directories
-@@ -35,7 +36,7 @@ library project Src is
- case Shared.XMLAda is
- when "Installed" =>
- for Source_Dirs use project'Source_Dirs &
-- ("xsrc", "soap", "../templates_parser/xsrc");
-+ ("xsrc", "soap");
- when "Disabled" =>
- null;
- end case;
-@@ -123,17 +124,6 @@ library project Src is
- for Implementation_Suffix ("makefile") use ".txt";
- for Implementation_Exceptions ("makefile") use ("makefile");
-
-- -- Templates Parser
--
-- for Specification ("Templates_Parser.Configuration")
-- use "templates_parser-configuration__aws.ads";
--
-- for Implementation ("Templates_Parser.Input")
-- use "templates_parser-input__aws.adb";
--
-- for Implementation ("Templates_Parser_Tasking")
-- use "templates_parser_tasking__standard_tasking.adb";
--
- -- SOCKLIB
-
- case Shared.SOCKLIB is
-diff --git a/tools/tools.gpr b/tools/tools.gpr
-index 72bf979..d41c56e 100644
---- a/tools/tools.gpr
-+++ b/tools/tools.gpr
-@@ -27,11 +27,11 @@ project Tools is
- for Languages use ("Ada", "Project file", "makefile");
-
- for Source_Dirs use
-- (".", "../templates_parser/tools",
-+ (".",
- "../" & Shared.Target_Dir & "/setup/tsrc");
-
-- for Main use ("awsres.adb", "aws_password.adb", "templates2ada.adb",
-- "webxref.adb", "templatespp.adb");
-+ for Main use ("awsres.adb", "aws_password.adb",
-+ "webxref.adb");
-
- case Shared.XMLAda is
- when "Installed" =>
-diff --git a/include/makefile b/include/makefile
-index 0d064b4..a3ee260 100644
---- a/include/makefile
-+++ b/include/makefile
-@@ -22,11 +22,9 @@ setup:
-
- install:
- $(CP) *.ad? $(DESTDIR)$(I_CPN)
-- -$(CP) ../$(BDIR)/static/lib/include/* $(DESTDIR)$(I_LIB)/static
- ifeq (${ENABLE_SHARED}, true)
- -$(CP) ../$(BDIR)/relocatable/lib/include/* $(DESTDIR)$(I_LIB)/relocatable
- endif
-- ${MAKE} -C zlib install $(GALL_OPTIONS)
-
- check:
- $(GNAT) check -files=filenames.check -rules -from=../aws.checks
-diff --git a/src/makefile b/src/makefile
-index ab1bd85..1ce3ff1 100644
---- a/src/makefile
-+++ b/src/makefile
-@@ -22,7 +22,6 @@ setup:
-
- install:
- $(CP) core/*.ad[sb] extended/*.ad[sb] $(DESTDIR)$(I_INC)
-- $(CP) ../$(BDIR)/static/lib/src/* $(DESTDIR)$(I_LIB)/static
- ifeq (${ENABLE_SHARED}, true)
- $(CP) ../$(BDIR)/relocatable/lib/src/* $(DESTDIR)$(I_LIB)/relocatable
- endif
-diff --git a/ssl/makefile b/ssl/makefile
-index a9c8ce6..654278d 100644
---- a/ssl/makefile
-+++ b/ssl/makefile
-@@ -25,7 +25,6 @@ setup:
-
- install:
- $(CP) *.ad[sb] $(DESTDIR)$(I_INC)
-- $(CP) ../$(BDIR)/static/lib/ssl/* $(DESTDIR)$(I_LIB)/static
- ifeq (${ENABLE_SHARED}, true)
- $(CP) ../$(BDIR)/relocatable/lib/ssl/* $(DESTDIR)$(I_LIB)/relocatable
- endif
-diff --git a/docs/makefile b/docs/makefile
-index db6ca2c..1137680 100644
---- a/docs/makefile
-+++ b/docs/makefile
-@@ -114,7 +114,6 @@ APIFILES = ../src/core/aws.ads.texi \
- build_doc: $(APIFILES) aws_docs sg_docs
- echo ""
- echo AWS Documentation built with success.
-- ${MAKE} -C ../templates_parser doc
-
- aws_docs: aws.texi aws.pdf aws.html aws.txt aws.info
-
-@@ -205,14 +204,10 @@ aws.texi: gen_texi check_texi
- install:
- -if [ -f aws.pdf ]; then \
- $(CP) aws.pdf $(DESTDIR)$(I_DOC); \
-- $(CP) ../templates_parser/docs/templates_parser.pdf $(DESTDIR)$(I_DOC); \
- fi;
- -$(CP) aws.html $(DESTDIR)$(I_DOC)
- -$(CP) aws.txt $(DESTDIR)$(I_DOC)
- -$(CP) aws*.info* $(DESTDIR)$(I_DOC)
-- -$(CP) ../templates_parser/docs/templates_parser.html $(DESTDIR)$(I_DOC)
-- -$(CP) ../templates_parser/docs/templates_parser.txt $(DESTDIR)$(I_DOC)
-- -$(CP) ../templates_parser/docs/templates_parser.info* $(DESTDIR)$(I_DOC)
-
- clean:
- -$(GNAT) clean -XLIBRARY_TYPE=static -Pdocs
-diff --git a/makefile b/makefile
-index 2ea9622..d6fcc2e 100644
---- a/makefile
-+++ b/makefile
-@@ -390,10 +390,6 @@ endif
- $(MKDIR) -p $(DESTDIR)$(I_WEL)
-
- install: install_dirs $(MODULES_INSTALL)
-- $(CP) templates_parser/src/t*.ad[sb] $(DESTDIR)$(I_INC)
--ifeq ($(XMLADA),true)
-- $(CP) templates_parser/xsrc/*.ad[sb] $(DESTDIR)$(I_INC)
--endif
- $(CP) templates_parser/tools/templates.tads $(DESTDIR)$(I_TPL)
- $(CP) $(CONFADC) $(DESTDIR)$(I_LIB)/static
- $(CP) $(CONFGPR) $(DESTDIR)$(I_AGP)
-diff --git a/makefile b/makefile
-index d6fcc2e..6ac09af 100644
---- a/makefile
-+++ b/makefile
-@@ -390,7 +390,6 @@ endif
- $(MKDIR) -p $(DESTDIR)$(I_WEL)
-
- install: install_dirs $(MODULES_INSTALL)
-- $(CP) templates_parser/tools/templates.tads $(DESTDIR)$(I_TPL)
- $(CP) $(CONFADC) $(DESTDIR)$(I_LIB)/static
- $(CP) $(CONFGPR) $(DESTDIR)$(I_AGP)
- $(CP) $(PRJDIR)/aws_xmlada.gpr $(DESTDIR)$(I_AGP)
-diff --git a/makefile.conf b/makefile.conf
-index ae6f820..89a4034 100644
---- a/makefile.conf
-+++ b/makefile.conf
-@@ -30,16 +30,14 @@ TARGET = $(shell gcc -dumpmachine)
- #
- # ENABLE_SHARED = [true|false]
- #
--ENABLE_SHARED=$(shell $(GNAT) make -c -q -p \
-- -XTARGET=$(TARGET) -XPRJ_TARGET=$(PRJ_TARGET) \
-- -Pconfig/setup/test_shared 2>/dev/null && echo "true")
-+ENABLE_SHARED=true
-
- ##############################################################################
- # Specify the default library type to setup for the installed AWS project.
- #
- # DEFAULT_LIBRARY_TYPE = [static|relocatable]
- #
--DEFAULT_LIBRARY_TYPE = static
-+DEFAULT_LIBRARY_TYPE = relocatable
-
- ##############################################################################
- # XMLADA optional, needed if you want to build SOAP's AWS support. Set XMLADA
-@@ -49,9 +47,7 @@ DEFAULT_LIBRARY_TYPE = static
- #
- # XMLADA = [true/false]
- #
--XMLADA = $(shell $(GNAT) make -c -q -p \
-- -XTARGET=$(TARGET) -XPRJ_TARGET=$(PRJ_TARGET) \
-- -Pconfig/setup/test_xmlada 2>/dev/null && echo "true")
-+XMLADA = true
-
- ##############################################################################
- # ASIS optional, needed if you want to build ada2wsdl tool. This tool can be
-@@ -63,9 +59,7 @@ XMLADA = $(shell $(GNAT) make -c -q -p \
- #
- # ASIS = [true|false]
- #
--ASIS = $(shell $(GNAT) make -c -q -p \
-- -XTARGET=$(TARGET) -XPRJ_TARGET=$(PRJ_TARGET) \
-- -Pconfig/setup/test_asis 2>/dev/null && echo "true")
-+ASIS = false
-
- ##############################################################################
- # Zlib mandatory, check if zlib is already installed and recent enought,
-@@ -73,11 +67,7 @@ ASIS = $(shell $(GNAT) make -c -q -p \
- #
- # ZLIB = [true|false]
- #
--ZLIB = $(shell $(GNAT) make -q -p \
-- -XTARGET=$(TARGET) -XPRJ_TARGET=$(PRJ_TARGET) \
-- -Pconfig/setup/test_zlib 2>/dev/null \
-- && .build/$(TARGET)/setup/zobj/mzlib \
-- && echo "true")
-+ZLIB = true
-
- ##############################################################################
- # IPv6, optional. If you want to use IPv6 sockets just uncomment the IPv6
-@@ -85,7 +75,7 @@ ZLIB = $(shell $(GNAT) make -q -p \
- #
- # IPv6 = [true|false]
- #
--IPv6 = false
-+IPv6 = true
-
- ##############################################################################
- # AWS supports SSL (Secure Socket Layer). To build AWS's with SSL support
-@@ -94,7 +84,7 @@ IPv6 = false
- #
- # SOCKET = [std|openssl|gnutls]
- #
--SOCKET = std
-+SOCKET = gnutls
-
- ##############################################################################
- # AWS provides a binding to the LDAP API. This binding will use the standard
-@@ -104,7 +94,7 @@ SOCKET = std
- #
- # LDAP = [true|false]
- #
--LDAP = false
-+LDAP = true
-
- ##############################################################################
- # To activate the debug mode just uncomment the variable below. This will
-@@ -112,7 +102,7 @@ LDAP = false
- #
- # DEBUG = [true|false]
- #
--DEBUG = false
-+DEBUG = true
-
- ##############################################################################
- # Number of parallel compilations to do.
-diff --git a/shared.gpr b/shared.gpr
-index b44dab3..932605d 100644
---- a/shared.gpr
-+++ b/shared.gpr
-@@ -116,7 +116,7 @@ abstract project Shared is
- -- Options used for all Ada units in both Debug and Release modes
-
- Common_Options :=
-- ("-gnat05", "-gnatwcfijkmRuv", "-gnaty3abBcefhiIklmnoprstx", "-Wall")
-+ ("-gnat05")
- & Global_Options;
- -- Common options used for the Debug and Release modes
-
-diff --git a/shared.gpr b/shared.gpr
-index 932605d..c2c2878 100644
---- a/shared.gpr
-+++ b/shared.gpr
-@@ -121,7 +121,7 @@ abstract project Shared is
- -- Common options used for the Debug and Release modes
-
- Debug_Options :=
-- ("-g", "-gnata", "-gnatVa", "-gnatQ", "-gnato", "-gnatwe", "-gnatyO");
-+ ("-g", "-gnata", "-gnatVa", "-gnatQ", "-gnato", "-gnatyO");
-
- Release_Options :=
- ("-O2", "-gnatn");
-diff --git a/makefile b/makefile
-index 6ac09af..f10b8a2 100644
---- a/makefile
-+++ b/makefile
-@@ -208,6 +208,7 @@ GPROPTS = -XPRJ_BUILD=$(PRJ_BUILD) -XPRJ_SOCKLIB=$(PRJ_SOCKLIB) \
- # build
-
- build-native:
-+ $(GPRBUILD) -p $(GPROPTS) -XLIBRARY_TYPE=relocatable tools/tools.gpr
- ifeq (${ENABLE_SHARED}, true)
- $(GPRBUILD) -p $(GPROPTS) -XLIBRARY_TYPE=relocatable src/src.gpr
- endif
-diff --git a/tools/makefile b/tools/makefile
-index 76da859..1ba2153 100644
---- a/tools/makefile
-+++ b/tools/makefile
-@@ -48,16 +48,16 @@ setup: setup_dir $(GEN)
-
- install:
- ifneq ($(PRJ_TARGET),vxworks)
-- -$(CP) ../$(BDIR)/static/tools/awsres${EXEEXT} $(DESTDIR)$(I_BIN)
-- -$(CP) ../$(BDIR)/static/tools/aws_password${EXEEXT} $(DESTDIR)$(I_BIN)
-- -$(CP) ../$(BDIR)/static/tools/templates2ada${EXEEXT} $(DESTDIR)$(I_BIN)
-- -$(CP) ../$(BDIR)/static/tools/templatespp${EXEEXT} $(DESTDIR)$(I_BIN)
-- -$(CP) ../$(BDIR)/static/tools/webxref${EXEEXT} $(DESTDIR)$(I_BIN)
-+ -$(CP) ../$(BDIR)/relocatable/tools/awsres${EXEEXT} $(DESTDIR)$(I_BIN)
-+ -$(CP) ../$(BDIR)/relocatable/tools/aws_password${EXEEXT} $(DESTDIR)$(I_BIN)
-+ -$(CP) ../$(BDIR)/relocatable/tools/templates2ada${EXEEXT} $(DESTDIR)$(I_BIN)
-+ -$(CP) ../$(BDIR)/relocatable/tools/templatespp${EXEEXT} $(DESTDIR)$(I_BIN)
-+ -$(CP) ../$(BDIR)/relocatable/tools/webxref${EXEEXT} $(DESTDIR)$(I_BIN)
- ifeq ($(XMLADA),true)
-- $(CP) ../$(BDIR)/static/tools/wsdl2aws${EXEEXT} $(DESTDIR)$(I_BIN)
-+ $(CP) ../$(BDIR)/relocatable/tools/wsdl2aws${EXEEXT} $(DESTDIR)$(I_BIN)
- endif
- ifeq (${ASIS},true)
-- $(CP) ../$(BDIR)/static/tools/ada2wsdl${EXEEXT} $(DESTDIR)$(I_BIN)
-+ $(CP) ../$(BDIR)/relocatable/tools/ada2wsdl${EXEEXT} $(DESTDIR)$(I_BIN)
- endif
- endif
-
-diff --git a/config/projects/aws.gpr b/config/projects/aws.gpr
-index 492c567..967eeac 100644
---- a/config/projects/aws.gpr
-+++ b/config/projects/aws.gpr
-@@ -25,12 +25,13 @@ with "aws/aws_ssl_error_lib";
- with "aws/aws_dl_lib";
- with "aws/aws_shared";
- with "aws/aws_config";
-+with "directories";
-
- library project AWS is
-
-- for Source_Dirs use ("../../include/aws");
-+ for Source_Dirs use ( Directories.Includedir & "/aws");
-
-- for Library_Dir use "aws/" & AWS_Shared'Library_Dir;
-+ for Library_Dir use AWS_Shared'Library_Dir;
- for Library_Name use "aws";
- for Library_Kind use AWS_Shared.Library_Type;
- for Externally_Built use "true";
-diff --git a/include/include.gpr b/include/include.gpr
-index a2f8fe2..8c40d6e 100644
---- a/include/include.gpr
-+++ b/include/include.gpr
-@@ -31,6 +31,8 @@ library project Include is
-
- for Library_Name use "aws_include";
- for Library_Kind use Shared.Library_Type;
-+ for Library_Version use "lib" & Project'Library_Name & ".so." & "3.1.0";
-+
-
- ---------
- -- Ide --
-diff --git a/src/src.gpr b/src/src.gpr
-index 9baa7a0..2002f7e 100644
---- a/src/src.gpr
-+++ b/src/src.gpr
-@@ -96,6 +96,8 @@ library project Src is
-
- for Library_Name use "aws";
- for Library_Kind use Shared.Library_Type;
-+ for Library_Version use "lib" & Project'Library_Name & ".so." & "3.1.0";
-+
-
- ---------
- -- Ide --
-diff --git a/ssl/ssl.gpr b/ssl/ssl.gpr
-index dd9bb0d..3684a2a 100644
---- a/ssl/ssl.gpr
-+++ b/ssl/ssl.gpr
-@@ -41,6 +41,8 @@ library project SSL is
-
- for Library_Name use "aws_ssl";
- for Library_Kind use Shared.Library_Type;
-+ for Library_Version use "lib" & Project'Library_Name & ".so." & "3.1.0";
-+
-
- ---------
- -- Ide --
-diff --git a/config/projects/aws_shared.gpr b/config/projects/aws_shared.gpr
-index 6c41fa5..3423d25 100644
---- a/config/projects/aws_shared.gpr
-+++ b/config/projects/aws_shared.gpr
-@@ -17,6 +17,7 @@
- ------------------------------------------------------------------------------
-
- with "aws_config";
-+with "directories";
-
- abstract project AWS_Shared is
-
-@@ -26,7 +27,7 @@ abstract project AWS_Shared is
- Library_Type : Library_Kind :=
- external ("LIBRARY_TYPE", AWS_Config.Default_Library_Type);
-
-- for Library_Dir use "../../aws/" & Library_Type;
-+ for Library_Dir use Directories.LibDir & "/aws/" & Library_Type;
-
- ------------
- -- Naming --
-diff --git a/config/projects/aws_components.gpr b/config/projects/aws_components.gpr
-index 0ea4532..77bb56c 100644
---- a/config/projects/aws_components.gpr
-+++ b/config/projects/aws_components.gpr
-@@ -18,9 +18,10 @@
-
- with "aws_shared";
- with "aws_libz";
-+with "directories";
-
- library project AWS_Components is
-- for Source_Dirs use ("../../../include/aws/components");
-+ for Source_Dirs use ( Directories.Includedir & "/aws/components");
- for Library_Dir use AWS_Shared'Library_Dir;
- for Library_Name use "aws_include";
- for Library_Kind use AWS_Shared.Library_Type;
-diff --git a/config/projects/aws_components.gpr b/config/projects/aws_components.gpr
-index 77bb56c..153f54c 100644
---- a/config/projects/aws_components.gpr
-+++ b/config/projects/aws_components.gpr
-@@ -17,7 +17,7 @@
- ------------------------------------------------------------------------------
-
- with "aws_shared";
--with "aws_libz";
-+with "zlib_ada";
- with "directories";
-
- library project AWS_Components is
-diff --git a/config/projects/aws_shared.gpr b/config/projects/aws_shared.gpr
-index 3423d25..f7d671f 100644
---- a/config/projects/aws_shared.gpr
-+++ b/config/projects/aws_shared.gpr
-@@ -17,6 +17,7 @@
- ------------------------------------------------------------------------------
-
- with "aws_config";
-+with "templates_parser";
- with "directories";
-
- abstract project AWS_Shared is
-@@ -35,17 +36,6 @@ abstract project AWS_Shared is
-
- package Naming is
-
-- -- Templates Parser
--
-- for Specification ("Templates_Parser.Configuration")
-- use "templates_parser-configuration__aws.ads";
--
-- for Implementation ("Templates_Parser.Input")
-- use "templates_parser-input__aws.adb";
--
-- for Implementation ("Templates_Parser_Tasking")
-- use "templates_parser_tasking__standard_tasking.adb";
--
- -- SOCKLIB
-
- case AWS_Config.SOCKLIB is
diff --git a/aws-3.2.0-config.patch b/aws-3.2.0-config.patch
new file mode 100644
index 0000000..7bc6bed
--- /dev/null
+++ b/aws-3.2.0-config.patch
@@ -0,0 +1,31 @@
+diff --git a/makefile.conf b/makefile.conf
+index 5f3de31..8aa3c01 100644
+--- a/makefile.conf
++++ b/makefile.conf
+@@ -98,7 +98,7 @@ IPv6 = false
+ #
+ # SOCKET = [std|openssl|gnutls]
+ #
+-SOCKET = std
++SOCKET = gnutls
+
+ ##############################################################################
+ # AWS provides a binding to the LDAP API. This binding will use the standard
+@@ -108,7 +108,7 @@ SOCKET = std
+ #
+ # LDAP = [true|false]
+ #
+-LDAP = false
++LDAP = true
+
+ ##############################################################################
+ # To activate the debug mode just uncomment the variable below. This will
+@@ -116,7 +116,7 @@ LDAP = false
+ #
+ # DEBUG = [true|false]
+ #
+-DEBUG = false
++DEBUG = true
+
+ ##############################################################################
+ # Number of parallel compilations to do.
diff --git a/aws-3.2.0-remove_bundled.patch b/aws-3.2.0-remove_bundled.patch
new file mode 100644
index 0000000..7ad88ed
--- /dev/null
+++ b/aws-3.2.0-remove_bundled.patch
@@ -0,0 +1,289 @@
+diff --git a/makefile b/makefile
+index f041de6..bcf7739 100644
+--- a/makefile
++++ b/makefile
+@@ -69,7 +69,6 @@ build-doc:
+ echo ""
+ echo "=== Build doc"
+ ${MAKE} -C docs html latexpdf
+- ${MAKE} -C templates_parser/docs html latexpdf
+
+ run_regtests:
+ echo ""
+@@ -344,7 +343,5 @@ gen_setup:
+ echo "TARGET=$(TARGET)" >> makefile.setup
+ echo "GSOAP=false" >> makefile.setup
+
+-setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
++setup: gen_setup setup_dir setup_modules setup_config $(GEXT_MODULE)
+
+-setup_tp:
+- $(MAKE) -C templates_parser setup $(GALL_OPTIONS)
+diff --git a/aws.gpr b/aws.gpr
+index dc43545..1bc35e2 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -17,7 +17,7 @@
+ ------------------------------------------------------------------------------
+
+ with "shared";
+-with "include/zlib/zlib.gpr";
++with "zlib_ada";
+
+ aggregate library project AWS is
+
+diff --git a/aws.gpr b/aws.gpr
+index 1bc35e2..5c0e430 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -23,14 +23,6 @@ aggregate library project AWS is
+
+ for Project_Files use ("include/include.gpr", "src/src.gpr", "ssl/ssl.gpr");
+
+- case ZLib.Zlib_Activated is
+- when "Yes" =>
+- for Project_Files
+- use Project'Project_Files & ("include/zlib/zlib.gpr");
+- when "No" =>
+- null;
+- end case;
+-
+ for Library_Name use "aws";
+ for Library_Kind use Shared.Library_Type;
+ for Library_Dir use Shared'Library_Dir & "/aws";
+diff --git a/include/include.gpr b/include/include.gpr
+index c885f15..3a04e87 100644
+--- a/include/include.gpr
++++ b/include/include.gpr
+@@ -18,7 +18,7 @@
+
+ with "../shared";
+
+-with "zlib/zlib";
++with "zlib_ada";
+
+ library project Include is
+
+diff --git a/src/src.gpr b/src/src.gpr
+index b952590..a2180e4 100644
+--- a/src/src.gpr
++++ b/src/src.gpr
+@@ -27,7 +27,7 @@ library project Src is
+ for Languages use ("Ada", "Project file", "makefile");
+
+ for Source_Dirs use
+- ("core", "extended", "../templates_parser/src", "../config/src",
++ ("core", "extended", "../config/src",
+ "../config/ssl", "../" & Shared.Target_Dir & "/setup/src", ".");
+
+ -- XMLAda Installed, add xsrc and soap directories
+@@ -35,7 +35,7 @@ library project Src is
+ case Shared.XMLAda is
+ when "Installed" =>
+ for Source_Dirs use project'Source_Dirs &
+- ("xsrc", "soap", "../templates_parser/xsrc");
++ ("xsrc", "soap");
+ when "Disabled" =>
+ null;
+ end case;
+@@ -124,17 +124,6 @@ library project Src is
+ for Implementation_Suffix ("makefile") use ".txt";
+ for Implementation_Exceptions ("makefile") use ("makefile");
+
+- -- Templates Parser
+-
+- for Specification ("Templates_Parser.Configuration")
+- use "templates_parser-configuration__aws.ads";
+-
+- for Implementation ("Templates_Parser.Input")
+- use "templates_parser-input__aws.adb";
+-
+- for Implementation ("Templates_Parser_Tasking")
+- use "templates_parser_tasking__standard_tasking.adb";
+-
+ -- SOCKLIB
+
+ case Shared.SOCKLIB is
+diff --git a/tools/tools.gpr b/tools/tools.gpr
+index bd56b9f..45fd418 100644
+--- a/tools/tools.gpr
++++ b/tools/tools.gpr
+@@ -25,10 +25,10 @@ project Tools is
+
+ for Languages use ("Ada", "Project file");
+
+- for Source_Dirs use (".", "../templates_parser/tools");
++ for Source_Dirs use ("." );
+
+- for Main use ("awsres.adb", "aws_password.adb", "templates2ada.adb",
+- "webxref.adb", "templatespp.adb");
++ for Main use ("awsres.adb", "aws_password.adb",
++ "webxref.adb");
+
+ case Shared.XMLAda is
+ when "Installed" =>
+diff --git a/tools/tools.gpr b/tools/tools.gpr
+index 45fd418..4ea006b 100644
+--- a/tools/tools.gpr
++++ b/tools/tools.gpr
+@@ -20,6 +20,7 @@ with "../.build/projects/aws_asis";
+ with "../shared.gpr";
+ with "../aws";
+ with "../win32/win32";
++with "templates_parser";
+
+ project Tools is
+
+diff --git a/src/src.gpr b/src/src.gpr
+index a2180e4..7d85237 100644
+--- a/src/src.gpr
++++ b/src/src.gpr
+@@ -21,6 +21,7 @@ with "../.build/projects/aws_xmlada";
+ with "../shared";
+ with "../include/include";
+ with "../ssl/ssl";
++with "templates_parser";
+
+ library project Src is
+
+diff --git a/makefile b/makefile
+index bcf7739..0ff33aa 100644
+--- a/makefile
++++ b/makefile
+@@ -179,7 +179,7 @@ GPR_SHARED = -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
+ # build
+
+ build-native:
+- $(GPRBUILD) -p $(GPROPTS) $(GPR_STATIC) tools/tools.gpr
++ $(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) tools/tools.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ $(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) aws.gpr
+ endif
+diff --git a/aws.gpr b/aws.gpr
+index 5c0e430..7fb8bb9 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -26,6 +26,7 @@ aggregate library project AWS is
+ for Library_Name use "aws";
+ for Library_Kind use Shared.Library_Type;
+ for Library_Dir use Shared'Library_Dir & "/aws";
++ for Library_Options use ("-L", "-lzlib_ada", "-ltemplates_parser");
+
+ case Shared.Library_Type is
+ when "static" =>
+diff --git a/aws.gpr b/aws.gpr
+index 7fb8bb9..bda8d41 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -18,6 +18,8 @@
+
+ with "shared";
+ with "zlib_ada";
++with "templates_parser";
++with "xmlada";
+
+ aggregate library project AWS is
+
+diff --git a/tools/tools.gpr b/tools/tools.gpr
+index 4ea006b..0e95abc 100644
+--- a/tools/tools.gpr
++++ b/tools/tools.gpr
+@@ -72,7 +72,7 @@ project Tools is
+
+ package Binder is
+ for Default_Switches ("Ada")
+- use Shared.Builder'Default_Switches ("Ada") & ("-static");
++ use Shared.Builder'Default_Switches ("Ada") & ("-shared");
+ end Binder;
+
+ -------------
+diff --git a/makefile b/makefile
+index 0ff33aa..99102e3 100644
+--- a/makefile
++++ b/makefile
+@@ -61,7 +61,7 @@ ALL_OPTIONS = $(MAKE_OPT) SOCKET="$(SOCKET)" XMLADA="$(XMLADA)" \
+ GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
+ prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
+ SOEXT="$(SOEXT)" BUILD_DOC_SCRIPT="false" GNAT="$(GNAT)" \
+- T2A="../../$(BDIR)/static/tools/templates2ada" \
++ T2A="../../$(BDIR)/static/relocatable/templates2ada" \
+ LIBRARY_TYPE="$(LIBRARY_TYPE)" PYTHON="$(PYTHON)" \
+ TARGET="$(TARGET)" IS_CROSS=$(IS_CROSS) GPRINSTALL="$(GPRINSTALL)"
+
+@@ -240,7 +240,7 @@ install-native: install-clean
+ $(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+ -XLIBRARY_TYPE=$(DEFAULT_LIBRARY_TYPE) aws.gpr
+ $(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+- -XLIBRARY_TYPE=static --mode=usage \
++ -XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
+ --install-name=aws tools/tools.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ $(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+diff --git a/makefile b/makefile
+index 99102e3..ed81e04 100644
+--- a/makefile
++++ b/makefile
+@@ -242,11 +242,6 @@ install-native: install-clean
+ $(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+ -XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
+ --install-name=aws tools/tools.gpr
+-ifeq (${ENABLE_SHARED}, true)
+- $(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+- -XLIBRARY_TYPE=$(OTHER_LIBRARY_TYPE) \
+- --build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
+-endif
+
+ install-cross: install-clean
+ $(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+diff --git a/aws.gpr b/aws.gpr
+index 5b9c255..aaee268 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -30,6 +30,7 @@ aggregate library project AWS is
+ for Library_Kind use Shared.Library_Type;
+ for Library_Dir use Shared'Library_Dir & "/aws";
+ for Library_Options use ("-L", "-lzlib_ada", "-ltemplates_parser");
++ for Library_Version use "lib" & Project'Library_Name & "-3.2.0.so";
+
+ case Shared.Library_Type is
+ when "static" =>
+diff --git a/aws.gpr b/aws.gpr
+index cbf80f6..479ab03 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -20,6 +20,7 @@ with "shared";
+ with "zlib_ada";
+ with "templates_parser";
+ with "xmlada";
++with "directories";
+
+ aggregate library project AWS is
+
+@@ -72,6 +73,7 @@ aggregate library project AWS is
+ package Install is
+ -- examples
+
++ for Lib_Subdir use Directories.Lib & "/aws/";
+ for Artifacts ("share/examples/aws/images")
+ use ("demos/runme/aws_*.png");
+ for Artifacts ("share/examples/aws/templates")
+diff --git a/makefile b/makefile
+index ed81e04..1c32df0 100644
+--- a/makefile
++++ b/makefile
+@@ -146,6 +146,7 @@ endif
+ # Install directories
+
+ I_INC = $(TPREFIX)/include/aws
++I_LIB ?= ${TPREFIX}/lib
+
+ GALL_OPTIONS := $(ALL_OPTIONS) \
+ PRJ_BUILD="$(PRJ_BUILD)" \
+@@ -238,6 +239,7 @@ endif
+
+ install-native: install-clean
+ $(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
++ --link-lib-subdir=${I_LIB} --lib-subdir=${I_LIB}/aws/ \
+ -XLIBRARY_TYPE=$(DEFAULT_LIBRARY_TYPE) aws.gpr
+ $(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+ -XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
diff --git a/aws.spec b/aws.spec
index 62ad370..27a7d3a 100644
--- a/aws.spec
+++ b/aws.spec
@@ -1,8 +1,10 @@
%undefine _hardened_build
%global with_gnutls 1
+%global with_gps 0
+%global git_release git20150523
Name: aws
-Version: 3.1.0
-Release: 13%{?dist}
+Version: 3.2.0
+Release: 1.%{git_release}%{?dist}
Summary: Ada Web Server
Group: System Environment/Libraries
@@ -10,20 +12,22 @@ License: GPLv3+ with exceptions and GPLv2+
URL: http://libre.adacore.com/tools/aws
## Direct download does't work
## http://libre.adacore.com/libre/download/
-Source0: %{name}-gpl-%{version}-src.tgz
+Source0: %{name}-gpl-%{version}-%{git_release}-src.tgz
Source1: %{name}-manpages.tar.gz
-Patch0: %{name}-%{version}-remove_bundled_static.patch
-# Fix to make Input_Limit atomic on 32-bit platforms as Stream_Element_Offset
-# is now a 64-bit type, backported from 3.2.0:
-Patch1: aws-3.1.0-atomic_Input_Limit.patch
+Patch0: %{name}-%{version}-remove_bundled.patch
+Patch1: %{name}-%{version}-config.patch
BuildRequires: fedora-gnat-project-common >= 3
BuildRequires: gcc-gnat libgcrypt-devel
-BuildRequires: gprbuild xmlada-devel
+BuildRequires: gprbuild >= 2014
+BuildRequires: xmlada-devel
%if %{with_gnutls}
BuildRequires: gnutls-devel
%endif
BuildRequires: zlib-ada-devel chrpath
BuildRequires: templates_parser-devel openldap-devel
+BuildRequires: python-sphinx
+## gprinstall uses it
+BuildRequires: fedora-gnat-project-common >= 3
# gcc-gnat only available on these:
ExclusiveArch: %GPRbuild_arches
@@ -74,7 +78,7 @@ Documentation can be found in -doc subpackage
%setup -q -n %{name}-gpl-%{version}-src
tar -xvf %{SOURCE1}
%patch0 -p1
-%patch1
+%patch1 -p1
rm -rf templates_parser
rm -rf include/zlib*
@@ -82,21 +86,21 @@ rm -rf include/zlib*
%build
make setup DEFAULT_LIBRARY_TYPE=relocatable ENABLE_SHARED=true GPRBUILD="gprbuild %GPRbuild_optflags"
make LIBRARY_TYPE=relocatable GPRBUILD="gprbuild %GPRbuild_optflags"
+make build-doc
%install
make install DESTDIR=%{buildroot} I_GPR="%_GNAT_project_dir" \
-I_LIB=%{_libdir}/%{name} I_INC=%{_includedir}/%{name} \
-I_AGP=%{_GNAT_project_dir}/%{name} prefix=%{_prefix}
+I_LIB=%{buildroot}%{_libdir} prefix=%{_prefix}
##install_man_pages:
mkdir -p %{buildroot}/%{_mandir}/man1/
for i in `ls *.1`; do gzip -c $i >> %{buildroot}/%{_mandir}/man1/$i.gz; done
mv %{buildroot}%{_datadir}/examples %{buildroot}%{_docdir}/%{name}/
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/relocatable/lib%{name}*.so.%{version}
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/relocatable/lib%{name}*.so
-cd %{buildroot}/%{_libdir}/ && ln -s %{name}/relocatable/lib%{name}*.so.%{version} .
-cd %{buildroot}/%{_libdir}/ && ln -s %{name}/relocatable/lib%{name}*.so .
-rm -rf %{buildroot}/%{_libdir}/%{name}/static
+cd %{buildroot}/%{_libdir} && ln -s aws/lib%{name}-%{version}.so .
+%if %{with_gps} != 1
+## GPS is not packaged
+rm -rf %{buildroot}/%{_datadir}/gps
+%endif
%post -p /sbin/ldconfig
@@ -105,23 +109,19 @@ rm -rf %{buildroot}/%{_libdir}/%{name}/static
%files
%doc COPYING3
-%exclude %{_docdir}/%{name}/examples
-%exclude %{_docdir}/%{name}/%{name}*
%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/relocatable
-%{_libdir}/lib%{name}*.so.%{version}
-%{_libdir}/%{name}/relocatable/lib%{name}*.so.%{version}
+%{_libdir}/lib%{name}-%{version}.so
+%{_libdir}/%{name}/lib%{name}-%{version}.so
%files devel
-%doc INSTALL CHANGE_e3bb65 demos
-%{_docdir}/%{name}/examples
+%doc INSTALL demos
%_GNAT_project_dir/%{name}*
+%_GNAT_project_dir/manifests/%{name}
%{_includedir}/%{name}
-%{_libdir}/%{name}/relocatable/*.ali
-%{_libdir}/lib%{name}*.so
-%{_libdir}/%{name}/relocatable/lib%{name}*.so
-%{_libdir}/%{name}/relocatable/gnat.adc
+%{_libdir}/%{name}/*.ali
+%{_libdir}/lib%{name}.so
+%{_libdir}/%{name}/lib%{name}.so
%files tools
%{_bindir}/*
@@ -129,7 +129,8 @@ rm -rf %{buildroot}/%{_libdir}/%{name}/static
%files doc
-%{_docdir}/%{name}/%{name}*
+%exclude %{_docdir}/%{name}/examples
+%{_docdir}/%{name}/*
%changelog
diff --git a/sources b/sources
index f429855..97992c6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f7e47638767d4f9edb72f12915a9e11e aws-gpl-3.1.0-src.tgz
+3436b317531712e6691a35d4a2462c92 aws-gpl-3.2.0-git20150523-src.tgz
f007a1a9c73f629f48e551b6cad102c0 aws-manpages.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/aws.git/commit/?h=master&id=fe2d4cc1beed29a479fb9b33d1c13d6ee6f515ce
More information about the scm-commits
mailing list