--- adasockets-1.8.6.orig/configure +++ adasockets-1.8.6/configure @@ -2428,7 +2428,7 @@ # # Package description # -LIBVERSIONINFO=1:0:0 +LIBVERSIONINFO=2:0:0 # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then --- adasockets-1.8.6.orig/configure.ac +++ adasockets-1.8.6/configure.ac @@ -5,7 +5,7 @@ # # Package description # -LIBVERSIONINFO=1:0:0 +LIBVERSIONINFO=2:0:0 AC_SUBST(LIBVERSIONINFO) AM_PROG_LIBTOOL # --- adasockets-1.8.6.orig/doc/Makefile.in +++ adasockets-1.8.6/doc/Makefile.in @@ -189,7 +189,7 @@ --subblock=exc=excname,excdesc \ --template=${srcdir}/adadoc -CLEANFILES = *.defs ${adasockets_TEXINFOS} +CLEANFILES = *.defs all: all-am .SUFFIXES: @@ -536,8 +536,8 @@ list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ - install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ + echo " install-info '$(DESTDIR)$(infodir)/$$relfile'";\ + install-info "$(DESTDIR)$(infodir)/$$relfile" || :;\ done; \ else : ; fi install-man: --- adasockets-1.8.6.orig/doc/adasockets.texi +++ adasockets-1.8.6/doc/adasockets.texi @@ -3,16 +3,12 @@ @settitle AdaSockets reference manual @setchapternewpage odd - @include version.texi -@ifinfo -@format -START-INFO-DIR-ENTRY +@dircategory Libraries +@direntry * adasockets: (adasockets). AdaSockets reference manual -END-INFO-DIR-ENTRY -@end format -@end ifinfo +@end direntry @ifinfo Copyright @copyright{} 2002-2007 Samuel Tardieu @@ -335,7 +331,7 @@ @item Thomas Quinot (@email{thomas@@cuivre.fr.eu.org}) @item Preben Randhol (@email{randhol@@pvv.org}) @item Maxim Reznik (@email{max1@@mbank.com.ua}) -@item Joel Sherrill (@email{joel.sherrill@oarcorp.com}) +@item Joel Sherrill (@email{joel.sherrill@@oarcorp.com}) @item Samuel Tardieu (@email{sam@@rfc1149.net}) @end itemize --- adasockets-1.8.6.orig/doc/version.texi +++ adasockets-1.8.6/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 4 November 2007 -@set UPDATED-MONTH November 2007 +@set UPDATED 5 February 2010 +@set UPDATED-MONTH February 2010 @set EDITION 1.8.6 @set VERSION 1.8.6 --- adasockets-1.8.6.orig/examples/stream_listener.adb +++ adasockets-1.8.6/examples/stream_listener.adb @@ -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; --- adasockets-1.8.6.orig/examples/listener.adb +++ adasockets-1.8.6/examples/listener.adb @@ -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 --- adasockets-1.8.6.orig/debian/libadasockets-dev.links +++ adasockets-1.8.6/debian/libadasockets-dev.links @@ -0,0 +1 @@ +usr/share/doc/libadasockets2 usr/share/doc/libadasockets-dev --- adasockets-1.8.6.orig/debian/changelog +++ adasockets-1.8.6/debian/changelog @@ -0,0 +1,346 @@ +adasockets (1.8.6-3) unstable; urgency=low + + * Bump gnat version to 4.4. + * ALI version changes from 1 to 2. + * New library package, name is libadasockets2. + * New soname libadasockets.so.2. + * New shared library file name libadasockets.so.2.0.0. + * Modified soname in configure/configure.ac. + (Closes: #562872). + * Change architecture to any (to match gnat-4.4). + (Closes: #568433, #542409). + * Bump standards version to 3.8.4. + * Add ${misc:Depends} to Depends. + * Bump debian/compat to 6 and build-depends on debhelper. + * Add dpkg (>= 1.15.4) | install-info to -dev package depends. + * Patch assorted source files for "(style) "in" should be omitted" + errors. Patch provided by Arno Schuring -- thank you. + * Modified Makefile.in to not provide info...dir.gz file. + + -- Phil Brooke Sat, 06 Feb 2010 16:22:05 +0000 + +adasockets (1.8.6-2) unstable; urgency=low + + * Bump gnat version to 4.3. + * Add mips and mipsel architectures. + * Depend on texlive instead of tetex-bin. + * Bump standards version to 3.8.0. + + -- Phil Brooke Fri, 18 Jul 2008 07:31:54 +0100 + +adasockets (1.8.6-1) unstable; urgency=low + + * New upstream release. + * Very minor fix to adasockets.texi (added `@' to email address). + * Added @dircategory (Ada libraries) to adasockets.texi. + * Info file installed using dh_installinfo now. + * DH_COMPAT removed from rules, added debian/compat. + * Bumped standards version to 3.7.3. + * No longer ignore distclean errors. Also removed the dependency in + the clean target (closes: #449088). + * Change substvar to use binary:Version, not Source-Version. + * Changed Debian copyright file encoding to UTF-8. + * Modified src/Makefile.am to make sure that SONAME stays as .1 + (thanks Neil Williams). + * Delete doc/adasockets.info in debian/rules clean target: this is + ignored when building source. Avoids spurious changes being recorded. + + -- Phil Brooke Thu, 20 Dec 2007 21:48:26 +0000 + +adasockets (1.8.4.7-5) unstable; urgency=low + + * Two suggestions from Ludovic Brenta (thanks!): + * Corrected CFLAGS in adasockets-config.in. + * debian/control: added depends on gnat-4.1 for + libadasockets-dev. + + -- Phil Brooke Thu, 14 Dec 2006 19:33:22 +0000 + +adasockets (1.8.4.7-4) unstable; urgency=medium + + * Corrected architecture for new gnat -- it's not `any'. + * Changed build-depends to include version >= 4.1 on gnat. + * Modified doc/Makefile.in to stop it removing some .texi sources on + clean. Removed nasty hack using `orig' directory and replaced by + previous fix to doc/Makefile.in. Also use `dpkg-buildpackage + -idoc/adasockets.info' + * Added tetex-bin to build-depends: needed to make .ps and .pdf + documents. + * Documentation directory reorganised. + * Assorted suggestions from Ludovic Brenta (thanks!): + * libadasockets-dev: .ads and .adb files are now in + /usr/share/ada/adainclude/adasockets. + * libadasockets-dev: .ali files are now in + /usr/lib/ada/adalib/adasockets. + * adasockets-config.in also modified. Will not remove this file + as requested by bug 383434 because it might be useful to users still. + * Added Debian-specific GNAT project file named + /usr/share/ada/adainclude/adasockets.gpr. Examples directory + has new Makefile and .gpr file. + * No longer need to explicitly handle .ali file permissions, + letting dh_fixperms deal with them. + * The example files are now excluded from compression by dh_compress. + closes: #383429. + * GNAT 4.1 has a new ABI. + * New library package, name is libadasockets1; + new soname libadasockets.so.1; + new shared library file name libadasockets.so.1.0.0. + * -dev package is renamed: it conflicts with and replaces + libadasockets0-dev. + * Associated changes within debian/ directory. + * Modified configure.ac/configure for LIBVERSIONINFO. + * Closes: #383430. + + -- Phil Brooke Mon, 2 Oct 2006 12:35:45 +0100 + +adasockets (1.8.4.7-3) unstable; urgency=medium + + * Fixed FTBFS by changing (build-)depends to gnat (closes: #377986). + * Change to newer gnat means that architecture can be `any'. + * Bumped standards-version to 3.7.2. + + -- Phil Brooke Wed, 26 Jul 2006 18:58:59 +0000 + +adasockets (1.8.4.7-2) unstable; urgency=low + + * Changed build-depends for GNU/kFreeBSD (closes: #345058). + * Bumped DH_COMPAT and debhelper version to 4. + * Bumped standards-version to 3.6.2. + + -- Phil Brooke Tue, 17 Jan 2006 14:37:03 +0000 + +adasockets (1.8.4.7-1) unstable; urgency=low + + * New upstream release. + * Refreshed the debian/orig directory. + * Fixed synopsis in package descriptions. + + -- Phil Brooke Sat, 8 Jan 2005 19:25:44 +0000 + +adasockets (1.8.4.4-1) unstable; urgency=low + + * New upstream release. + * Refreshed the debian/orig directory. + * Added texinfo package to build depends so that `makeinfo' is available + (closes: #253703). + + -- Phil Brooke Sat, 26 Jun 2004 16:31:30 +0100 + +adasockets (1.8.4.3-1) unstable; urgency=low + + * New upstream release. + * Refreshed the debian/orig directory. + + -- Phil Brooke Mon, 28 Mar 2004 12:34:32 +0000 + +adasockets (1.8.4.2-1) unstable; urgency=low + + * New upstream release. + * Refreshed the debian/orig directory. + + -- Phil Brooke Thu, 15 Jan 2004 12:54:49 +0000 + +adasockets (1.8.3-1) unstable; urgency=low + + * New upstream release. + * Refreshed the debian/orig directory. + * Modified support/adacompiler so that if doesn't try to move a file + onto itself. + + -- Phil Brooke Wed, 13 Dec 2003 20:38:00 +0000 + +adasockets (1.8.2-1) unstable; urgency=low + + * New upstream release. + * Moved from GNAT 3.14 to GNAT 3.15. + * Moved the `orig' hack directory (see revision 1.6-1) to within the + debian/ directory. + + -- Phil Brooke Mon, 17 Nov 2003 10:52:37 +0000 + +adasockets (1.7-2) unstable; urgency=low + + * Modified debian/rules to set the .ali files to read-only. This is + to stop gnatmake trying to rebuild the .ali and .o files in a + local directory when they're used. + + -- Phil Brooke Mon, 25 Aug 2003 16:14:24 +0100 + +adasockets (1.7-1) unstable; urgency=low + + * New upstream release. + * libadasockets0-dev package now in section libdevel. + * Working around dpkg-source's objections to doc/adasockets.pdf being + regenerated. + + -- Phil Brooke Wed, 6 Aug 2003 23:26:07 +0100 + +adasockets (1.6-1) unstable; urgency=low + + * New upstream release + * Update to standards version 3.5.9.0. + * Move info directory to FHS-compliant location. + * Added shlibs and shlibsdep calls. + * Tweaked upstream README to indicate a different order when calling + gnatmake. + * Added configure as dependency for clean target in debian/rules. + Otherwise we don't always have the needed makefile. + * Added hack (the orig directory) to fix a problem with essential + upstream files being deleted during distclean. + + -- Phil Brooke Fri, 28 Mar 2003 22:51:06 +0000 + +adasockets (1.2-1) unstable; urgency=low + + * New upstream release. + * New maintainer (closes: #154104). + * Changed libadasockets0 section: was devel, is now libs + (closes: #157053). + + -- Phil Brooke Wed, 28 Aug 2002 21:34:17 +0100 + +adasockets (1.0-1) unstable; urgency=low + + * New upstream version. + * Install no manpage in /usr/man. Closes: #138078. + + -- Samuel Tardieu Thu, 14 Mar 2002 19:13:47 +0100 + +adasockets (0.1.19-3) unstable; urgency=low + + * Recompile for GNAT 3.14p. + + -- Samuel Tardieu Sat, 2 Feb 2002 20:37:30 +0100 + +adasockets (0.1.19-2) unstable; urgency=low + + * Use debhelper instead of yada. + + -- Samuel Tardieu Fri, 14 Dec 2001 19:53:17 +0100 + +adasockets (0.1.19-1) unstable; urgency=low + + * New upstream version. + + -- Samuel Tardieu Fri, 26 Oct 2001 18:49:03 +0200 + +adasockets (0.1.15-1) unstable; urgency=low + + * New upstream version. + + -- Samuel Tardieu Mon, 24 Sep 2001 18:16:32 +0200 + +adasockets (0.1.14-1) unstable; urgency=low + + * New upstream version. + + -- Samuel Tardieu Tue, 24 Jul 2001 11:37:40 +0200 + +adasockets (0.1.13-2) unstable; urgency=low + + * GNAT is no longer Architecture: any, so this package has to follow. + Closes: #100291. + + -- Samuel Tardieu Sat, 9 Jun 2001 18:12:53 +0200 + +adasockets (0.1.13-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Tardieu Tue, 13 Mar 2001 21:03:19 +0100 + +adasockets (0.1.11-1) unstable; urgency=low + + * New upstream release. + * Remove spurious symlink. Closes: #71064. + + -- Samuel Tardieu Fri, 27 Oct 2000 18:40:00 +0200 + +adasockets (0.1.10-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Tardieu Wed, 13 Sep 2000 14:06:48 +0200 + +adasockets (0.1.9-2) unstable; urgency=low + + * Add Build-Depends line. Closes: #70066. + + -- Samuel Tardieu Wed, 30 Aug 2000 12:25:51 +0200 + +adasockets (0.1.9-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Tardieu Thu, 3 Aug 2000 16:23:13 +0200 + +adasockets (0.1.8-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Tardieu Mon, 22 May 2000 18:50:03 +0200 + +adasockets (0.1.6-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Tardieu Sat, 8 Jan 2000 16:39:32 +0100 + +adasockets (0.1.4-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Tardieu Tue, 14 Dec 1999 15:20:03 +0100 + +adasockets (0.1.3-6) unstable; urgency=low + + * Recompile for GNAT 3.12p. + + -- Samuel Tardieu Tue, 14 Dec 1999 15:19:58 +0100 + +adasockets (0.1.3-5) unstable; urgency=low + + * Apply patch from Tristan Gingold. + + -- Samuel Tardieu Thu, 1 Jul 1999 19:37:30 +0200 + +adasockets (0.1.3-4) unstable; urgency=low + + * Previous description was empty. Fix it. + + -- Samuel Tardieu Tue, 27 Apr 1999 21:23:09 +0200 + +adasockets (0.1.3-3) unstable; urgency=low + + * Include examples. + * Recompiled using YADA. + + -- Samuel Tardieu Tue, 27 Apr 1999 21:04:51 +0200 + +adasockets (0.1.3-2) unstable; urgency=low + + * Recompiled for GNAT 3.11p-9. + + -- Samuel Tardieu Wed, 24 Feb 1999 13:13:02 +0100 + +adasockets (0.1.3-1) unstable; urgency=low + + * New upstream release. + + * Compiled for GNAT 3.11p. + + * Switched to dh-make. + + -- Samuel Tardieu Wed, 27 Jan 1999 11:28:57 +0100 + +adasockets (0.1.2-2) unstable; urgency=low + + * Reword description. + + -- Samuel Tardieu Fri, 9 Oct 1998 10:51:35 +0200 + +adasockets (0.1.2-1) unstable; urgency=low + + * Initial Release. + + -- Samuel Tardieu Thu, 24 Sep 1998 13:17:57 +0200 --- adasockets-1.8.6.orig/debian/rules +++ adasockets-1.8.6/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +configure: configure-stamp +configure-stamp: + dh_testdir + ./configure --prefix=/usr + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + # And now do a few bits of restoring and tidying.... + rm -f doc/stamp-vti src/b~split.adb src/b~split.ads src/sockets-constants.ads support/adacompiler + rm -f doc/adasockets.info + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) DESTDIR=`pwd`/debian/libadasockets-dev install + dh_installdocs -plibadasockets2 README + rm -rf debian/libadasockets-dev/usr/man + dh_installman -plibadasockets-dev man/adasockets-config.1 + dh_installexamples -plibadasockets-dev examples/*.adb debian/Makefile debian/examples.gpr + dh_installchangelogs -plibadasockets2 NEWS + dh_movefiles --sourcedir=debian/libadasockets-dev + mv debian/libadasockets-dev/usr/share/doc/libadasockets-dev \ + debian/libadasockets-dev/usr/share/doc/libadasockets2 + # Debian Ada policy directories. + mv `pwd`/debian/libadasockets-dev/usr/lib/adasockets/*.ads `pwd`/debian/libadasockets-dev/usr/share/ada/adainclude/adasockets + mv `pwd`/debian/libadasockets-dev/usr/lib/adasockets/*.adb `pwd`/debian/libadasockets-dev/usr/share/ada/adainclude/adasockets + mv `pwd`/debian/libadasockets-dev/usr/lib/adasockets/*.ali `pwd`/debian/libadasockets-dev/usr/lib/ada/adalib/adasockets + rmdir `pwd`/debian/libadasockets-dev/usr/lib/adasockets + # All documentation out of the adasockets directory. + mv `pwd`/debian/libadasockets-dev/usr/share/doc/adasockets/* `pwd`/debian/libadasockets-dev/usr/share/doc/libadasockets2 + rmdir `pwd`/debian/libadasockets-dev/usr/share/doc/adasockets + # Debian specific gpr file. + cp -f debian/adasockets.gpr `pwd`/debian/libadasockets-dev/usr/share/ada/adainclude + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot +# dh_installdebconf +# dh_installdocs +# dh_installexamples +# dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installman +# dh_installcron + rm `pwd`/debian/libadasockets-dev/usr/share/info/adasockets.info + dh_installinfo `pwd`/doc/adasockets.info +# dh_undocumented +# dh_installchangelogs + dh_strip + dh_link + dh_compress -X.adb -X.ads + dh_fixperms + dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build install +# (Uncomment this next line if you have such packages.) +# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- adasockets-1.8.6.orig/debian/compat +++ adasockets-1.8.6/debian/compat @@ -0,0 +1 @@ +6 --- adasockets-1.8.6.orig/debian/libadasockets-dev.dirs +++ adasockets-1.8.6/debian/libadasockets-dev.dirs @@ -0,0 +1,2 @@ +usr/share/ada/adainclude/adasockets +usr/lib/ada/adalib/adasockets --- adasockets-1.8.6.orig/debian/adasockets.gpr +++ adasockets-1.8.6/debian/adasockets.gpr @@ -0,0 +1,13 @@ +project Adasockets is + Version := "2"; + for Library_Dir use "/usr/lib"; + for Library_Name use "adasockets"; + for Library_Kind use "relocatable"; + for Library_Version use "libadasockets.so." & Version; + for Source_Dirs use ("/usr/share/ada/adainclude/adasockets"); + for Object_Dir use "/usr/lib/ada/adalib/adasockets"; + Linker_Switches := "-ladasockets"; + package Linker is + for Default_Switches ("Ada") use (Linker_Switches); + end Linker; +end Adasockets; --- adasockets-1.8.6.orig/debian/control +++ adasockets-1.8.6/debian/control @@ -0,0 +1,31 @@ +Source: adasockets +Maintainer: Phil Brooke +Section: devel +Priority: extra +Standards-Version: 3.8.4 +Build-Depends: gnat-4.4, debhelper (>= 6.0.0), texinfo, texlive + +Package: libadasockets-dev +Architecture: any +Depends: gnat-4.4, libadasockets2 (=${binary:Version}), ${misc:Depends}, dpkg (>= 1.15.4) | install-info +Section: libdevel +Conflicts: adasockets, libadasockets0-dev +Replaces: adasockets, libadasockets0-dev +Description: bindings for socket services in Ada + This package provides a binding for socket services to be used with GNAT + (the GNU Ada compiler). One can use it to write clients and servers that + will talk with programs written in Ada or any other programming language. + . + This package provides the Ada programmer with headers and libraries used + to build Ada programs that use sockets services. + +Package: libadasockets2 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Section: libs +Description: bindings for socket services in Ada + This package provides a binding for socket services to be used with GNAT + (the GNU Ada compiler). One can use it to write clients and servers that + will talk with programs written in Ada or any other programming language. + . + This package contains the library needed to execute Ada program using sockets. --- adasockets-1.8.6.orig/debian/Makefile +++ adasockets-1.8.6/debian/Makefile @@ -0,0 +1,23 @@ +# By default, compile all of the demo programs: + +EXAMPLES=listener multi stream_listener stream_sender tcpreplay value + +all: $(EXAMPLES) + +$(EXAMPLES): FORCE + gnatmake -Pexamples + + +# "FORCE" just forces the depending rule to always be run. +# In particular, we always want to invoke gnatmake, which then checks to see if +# anything needs recompiling. + +FORCE: + + +clean: + rm -f $(EXAMPLES) *.o *.ali + + +# An alternative is to use commands of the form +# gnatmake `adasockets-config --cflags` $example -largs `adasockets-config --libs` \ No newline at end of file --- adasockets-1.8.6.orig/debian/examples.gpr +++ adasockets-1.8.6/debian/examples.gpr @@ -0,0 +1,9 @@ +with "adasockets"; +project Examples is + for Main use ("listener", + "multi", + "stream_listener", + "stream_sender", + "tcprelay", + "value"); +end Examples; --- adasockets-1.8.6.orig/debian/libadasockets2.files +++ adasockets-1.8.6/debian/libadasockets2.files @@ -0,0 +1 @@ +usr/lib/libadasockets.so.* --- adasockets-1.8.6.orig/debian/copyright +++ adasockets-1.8.6/debian/copyright @@ -0,0 +1,4 @@ +Copyright (c) 1999-2001 Ecole Nationale Supérieure des Télécommunications + +AdaSockets is released under the GNU General Public License, as found in +/usr/share/common-licenses/GPL. --- adasockets-1.8.6.orig/src/Makefile.in +++ adasockets-1.8.6/src/Makefile.in @@ -200,7 +200,7 @@ libadasockets_la_SOURCES = $(ADA_SRCS) libadasockets_la_LDFLAGS = -version-info $(LIBVERSIONINFO) libadasockets_la_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) \ - -o libadasockets.la + -o libadasockets.la -version-info $(LIBVERSIONINFO) ADA_SRCS = \ sockets-constants.ads \ --- adasockets-1.8.6.orig/src/Makefile.am +++ adasockets-1.8.6/src/Makefile.am @@ -6,7 +6,7 @@ libadasockets_la_SOURCES = $(ADA_SRCS) libadasockets_la_LDFLAGS = -version-info $(LIBVERSIONINFO) libadasockets_la_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) \ - -o libadasockets.la + -o libadasockets.la -version-info $(LIBVERSIONINFO) ADA_SRCS = \ sockets-constants.ads \ --- adasockets-1.8.6.orig/src/sockets-multicast.ads +++ adasockets-1.8.6/src/sockets-multicast.ads @@ -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 --- adasockets-1.8.6.orig/src/sockets-stream_io.ads +++ adasockets-1.8.6/src/sockets-stream_io.ads @@ -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 --- adasockets-1.8.6.orig/src/adasockets-config.in +++ adasockets-1.8.6/src/adasockets-config.in @@ -4,13 +4,10 @@ # AdaSockets. # -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ VERSION=@VERSION@ -CFLAGS="-I$libdir/adasockets -L$libdir/adasockets" -LIBS="-L$prefix/lib -ladasockets" +CFLAGS="-aI/usr/share/ada/adainclude/adasockets -aO/usr/lib/ada/adalib/adasockets" +LIBS="-ladasockets" case "x$1" in x--version) --- adasockets-1.8.6.orig/src/sockets.ads +++ adasockets-1.8.6/src/sockets.ads @@ -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 --- adasockets-1.8.6.orig/src/sockets-utils.ads +++ adasockets-1.8.6/src/sockets-utils.ads @@ -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