Hi,
Well I'm not really the most skilled Ada developer, but I figured I'd
give this a shot anyway ;)
The attached patch allows me to build (and install) adasockets with
gnat-4.4 as currently in Debian testing. Basically, I did an apt-get
source followed by dpkg-buildpackage and analyzed the build logs. There
is just one compilation issue, although it appears multiple times in the
source:
<>: (style) "in" should be omitted
The only other change is to increment the gnat version in the debian
control file. I have no way to easily test the resulting packages though...
Regards,
Arno
diff -ur /tmp/adasockets-1.8.6/debian/control ./debian/control
--- /tmp/adasockets-1.8.6/debian/control 2010-01-05 22:10:46.222332959 +0100
+++ ./debian/control 2010-01-05 22:28:48.663140331 +0100
@@ -3,11 +3,11 @@
Section: devel
Priority: extra
Standards-Version: 3.8.0
-Build-Depends: gnat (>= 4.3), debhelper (>= 4.0.0), texinfo, texlive
+Build-Depends: gnat (>= 4.4), debhelper (>= 4.0.0), texinfo, texlive
Package: libadasockets-dev
Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 s390 sparc powerpc mips mipsel
-Depends: gnat-4.3, libadasockets1 (=${binary:Version})
+Depends: gnat-4.4, libadasockets1 (=${binary:Version})
Section: libdevel
Conflicts: adasockets, libadasockets0-dev
Replaces: adasockets, libadasockets0-dev
diff -ur /tmp/adasockets-1.8.6/examples/listener.adb ./examples/listener.adb
--- /tmp/adasockets-1.8.6/examples/listener.adb 2010-01-05 22:10:46.214333923 +0100
+++ ./examples/listener.adb 2010-01-05 22:15:49.084735882 +0100
@@ -50,7 +50,7 @@
-- then telnet localhost 5000
task type Echo is
- entry Start (FD : in Socket_FD);
+ entry Start (FD : Socket_FD);
end Echo;
function Rev (S : String) return String;
@@ -64,7 +64,7 @@
Sock : Socket_FD;
begin
select
- accept Start (FD : in Socket_FD) do
+ accept Start (FD : Socket_FD) do
Sock := FD;
end Start;
or
diff -ur /tmp/adasockets-1.8.6/examples/stream_listener.adb ./examples/stream_listener.adb
--- /tmp/adasockets-1.8.6/examples/stream_listener.adb 2010-01-05 22:10:46.214333923 +0100
+++ ./examples/stream_listener.adb 2010-01-05 22:21:36.067342769 +0100
@@ -50,7 +50,7 @@
-- then stream_sender localhost 5000
task type Echo is
- entry Start (FD : in Socket_FD);
+ entry Start (FD : Socket_FD);
end Echo;
----------
@@ -62,7 +62,7 @@
Stream : aliased Socket_Stream_Type;
begin
select
- accept Start (FD : in Socket_FD) do
+ accept Start (FD : Socket_FD) do
Sock := FD;
Initialize (Stream, Sock);
end Start;
diff -ur /tmp/adasockets-1.8.6/src/sockets.ads ./src/sockets.ads
--- /tmp/adasockets-1.8.6/src/sockets.ads 2010-01-05 22:10:46.214333923 +0100
+++ ./src/sockets.ads 2010-01-05 22:14:47.680931869 +0100
@@ -57,25 +57,25 @@
procedure Socket
(Sock : out Socket_FD;
- Domain : in Socket_Domain := PF_INET;
- Typ : in Socket_Type := SOCK_STREAM);
+ Domain : Socket_Domain := PF_INET;
+ Typ : Socket_Type := SOCK_STREAM);
-- Create a socket of the given mode
Connection_Refused : exception;
Socket_Error : exception;
procedure Connect
- (Socket : in Socket_FD;
- Host : in String;
- Port : in Positive);
+ (Socket : Socket_FD;
+ Host : String;
+ Port : Positive);
-- Connect a socket on a given host/port. Raise Connection_Refused if
-- the connection has not been accepted by the other end, or
-- Socket_Error (with a more precise exception message) for another error.
procedure Bind
- (Socket : in Socket_FD;
- Port : in Natural;
- Host : in String := "");
+ (Socket : Socket_FD;
+ Port : Natural;
+ Host : String := "");
-- Bind a socket on a given port. Using 0 for the port will tell the
-- OS to allocate a non-privileged free port. The port can be later
-- retrieved using Get_Sock_Port on the bound socket.
@@ -84,8 +84,8 @@
-- Socket_Error can be raised if the system refuses to bind the port.
procedure Listen
- (Socket : in Socket_FD;
- Queue_Size : in Positive := 5);
+ (Socket : Socket_FD;
+ Queue_Size : Positive := 5);
-- Create a socket's listen queue
type Socket_Level is (SOL_SOCKET, IPPROTO_IP);
@@ -95,35 +95,35 @@
IP_MULTICAST_LOOP, SO_SNDBUF, SO_RCVBUF);
procedure Getsockopt
- (Socket : in Socket_FD'Class;
- Level : in Socket_Level := SOL_SOCKET;
- Optname : in Socket_Option;
+ (Socket : Socket_FD'Class;
+ Level : Socket_Level := SOL_SOCKET;
+ Optname : Socket_Option;
Optval : out Integer);
-- Get a socket option
procedure Setsockopt
- (Socket : in Socket_FD'Class;
- Level : in Socket_Level := SOL_SOCKET;
- Optname : in Socket_Option;
- Optval : in Integer);
+ (Socket : Socket_FD'Class;
+ Level : Socket_Level := SOL_SOCKET;
+ Optname : Socket_Option;
+ Optval : Integer);
-- Set a socket option
generic
Level : Socket_Level;
Optname : Socket_Option;
type Opt_Type is private;
- procedure Customized_Setsockopt (Socket : in Socket_FD'Class;
- Optval : in Opt_Type);
+ procedure Customized_Setsockopt (Socket : Socket_FD'Class;
+ Optval : Opt_Type);
-- Low level control on setsockopt
- procedure Accept_Socket (Socket : in Socket_FD;
+ procedure Accept_Socket (Socket : Socket_FD;
New_Socket : out Socket_FD);
-- Accept a connection on a socket
Connection_Closed : exception;
- procedure Send (Socket : in Socket_FD;
- Data : in Ada.Streams.Stream_Element_Array);
+ procedure Send (Socket : Socket_FD;
+ Data : Ada.Streams.Stream_Element_Array);
-- Send data on a socket. Raise Connection_Closed if the socket
-- has been closed.
@@ -132,13 +132,13 @@
return Ada.Streams.Stream_Element_Array;
-- Receive data from a socket. May raise Connection_Closed
- procedure Receive (Socket : in Socket_FD'Class;
+ procedure Receive (Socket : Socket_FD'Class;
Data : out Ada.Streams.Stream_Element_Array);
-- Get data from a socket. Raise Connection_Closed if the socket has
-- been closed before the end of the array.
procedure Receive_Some
- (Socket : in Socket_FD'Class;
+ (Socket : Socket_FD'Class;
Data : out Ada.Streams.Stream_Element_Array;
Last : out Ada.Streams.Stream_Element_Offset);
-- Get some data from a socket. The index of the last element will
@@ -147,17 +147,17 @@
type Shutdown_Type is (Receive, Send, Both);
procedure Shutdown (Socket : in out Socket_FD;
- How : in Shutdown_Type := Both);
+ How : Shutdown_Type := Both);
-- Close a previously opened socket
procedure Socketpair
(Read_End : out Socket_FD;
Write_End : out Socket_FD;
- Domain : in Socket_Domain := PF_INET;
- Typ : in Socket_Type := SOCK_STREAM);
+ Domain : Socket_Domain := PF_INET;
+ Typ : Socket_Type := SOCK_STREAM);
-- Create a socketpair.
- function Get_FD (Socket : in Socket_FD)
+ function Get_FD (Socket : Socket_FD)
return Interfaces.C.int;
-- Get a socket's FD field
@@ -165,16 +165,16 @@
-- String-oriented subprograms --
---------------------------------
- procedure Put (Socket : in Socket_FD'Class;
- Str : in String);
+ procedure Put (Socket : Socket_FD'Class;
+ Str : String);
-- Send a string on the socket
- procedure New_Line (Socket : in Socket_FD'Class;
- Count : in Natural := 1);
+ procedure New_Line (Socket : Socket_FD'Class;
+ Count : Natural := 1);
-- Send CR/LF sequences on the socket
- procedure Put_Line (Socket : in Socket_FD'Class;
- Str : in String);
+ procedure Put_Line (Socket : Socket_FD'Class;
+ Str : String);
-- Send a string + CR/LF on the socket
function Get (Socket : Socket_FD'Class) return String;
@@ -195,7 +195,7 @@
-- Function form for the former procedure
procedure Set_Buffer (Socket : in out Socket_FD'Class;
- Length : in Positive := 1500);
+ Length : Positive := 1500);
-- Put socket in buffered mode. If the socket is already buffered,
-- the content of the previous buffer will be lost. The buffered mode
-- only affects read operation, through Get, Get_Char and Get_Line. Other
diff -ur /tmp/adasockets-1.8.6/src/sockets-multicast.ads ./src/sockets-multicast.ads
--- /tmp/adasockets-1.8.6/src/sockets-multicast.ads 2010-01-05 22:10:46.214333923 +0100
+++ ./src/sockets-multicast.ads 2010-01-05 22:16:58.920400817 +0100
@@ -68,16 +68,16 @@
-- to the local port Local_Port. Use 0 if you do not care about
-- the local port.
- procedure Send (Socket : in Multicast_Socket_FD;
- Data : in Ada.Streams.Stream_Element_Array);
+ procedure Send (Socket : Multicast_Socket_FD;
+ Data : Ada.Streams.Stream_Element_Array);
-- Send data over a multicast socket
private
procedure Socket
(Sock : out Multicast_Socket_FD;
- Domain : in Socket_Domain := PF_INET;
- Typ : in Socket_Type := SOCK_STREAM);
+ Domain : Socket_Domain := PF_INET;
+ Typ : Socket_Type := SOCK_STREAM);
pragma No_Return (Socket);
-- Do not call this one, it will raise Program_Error
diff -ur /tmp/adasockets-1.8.6/src/sockets-stream_io.ads ./src/sockets-stream_io.ads
--- /tmp/adasockets-1.8.6/src/sockets-stream_io.ads 2010-01-05 22:10:46.214333923 +0100
+++ ./src/sockets-stream_io.ads 2010-01-05 22:23:01.823160927 +0100
@@ -46,7 +46,7 @@
procedure Initialize
(Stream : in out Socket_Stream_Type;
- FD : in Socket_FD);
+ FD : Socket_FD);
-- Initialize must be called with an opened socket as parameter before
-- being used as a stream.
@@ -57,7 +57,7 @@
procedure Write
(Stream : in out Socket_Stream_Type;
- Item : in Ada.Streams.Stream_Element_Array);
+ Item : Ada.Streams.Stream_Element_Array);
private
diff -ur /tmp/adasockets-1.8.6/src/sockets-utils.ads ./src/sockets-utils.ads
--- /tmp/adasockets-1.8.6/src/sockets-utils.ads 2010-01-05 22:10:46.214333923 +0100
+++ ./src/sockets-utils.ads 2010-01-05 22:23:20.127153139 +0100
@@ -44,8 +44,8 @@
pragma Elaborate_Body;
- procedure Raise_With_Message (Message : in String;
- With_Errno : in Boolean := True);
+ procedure Raise_With_Message (Message : String;
+ With_Errno : Boolean := True);
pragma No_Return (Raise_With_Message);
-- Raise Socket_Error with an associated error message
