Date: Sat, 2 Jul 2016 22:14:22 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417942 - in head/net/anet: . files Message-ID: <201607022214.u62MEMXr028307@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Jul 2 22:14:22 2016 New Revision: 417942 URL: https://svnweb.freebsd.org/changeset/ports/417942 Log: net/anet: Upgrade version 0.3.1 => 0.3.3 There is one failure in the testsuite; the cause is not immediately obvious. I'll try to follow up later. Failed : 1 Tests for IP sockets: Error callback handling - Receiver not restarted FAIL 0.027554000s Added: head/net/anet/files/ head/net/anet/files/patch-src_anet-sockets-inet.adb (contents, props changed) Modified: head/net/anet/Makefile head/net/anet/distinfo head/net/anet/pkg-plist Modified: head/net/anet/Makefile ============================================================================== --- head/net/anet/Makefile Sat Jul 2 20:01:22 2016 (r417941) +++ head/net/anet/Makefile Sat Jul 2 22:14:22 2016 (r417942) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= anet -PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTVERSION= 0.3.3 CATEGORIES= net MASTER_SITES= http://www.codelabs.ch/download/ DISTNAME= libanet-${PORTVERSION} @@ -22,24 +21,12 @@ MAKE_ARGS+= NUM_CPUS=${MAKE_JOBS_NUMBER} OPTIONS_DEFINE= TEST DOCS TEST_DESC= Run unit test suite before installation - -.include <bsd.port.options.mk> - -.if ${OPSYS} == DragonFly && ${ARCH} == i386 -IGNORE= will not build; atomics are not supported on DF i386 -.endif - -.if ${PORT_OPTIONS:MTEST} -BUILD_DEPENDS+= ${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven -ALL_TARGET+= tests -.endif - -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= asciidoc:textproc/asciidoc \ - source-highlight:textproc/source-highlight -ALL_TARGET+= doc -USES+= gmake -.endif +TEST_ALL_TARGET= tests +TEST_BUILD_DEPENDS= ${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven +DOCS_USES= gmake +DOCS_ALL_TARGET= doc +DOCS_BUILD_DEPENDS= asciidoc:textproc/asciidoc \ + source-highlight:textproc/source-highlight post-patch: @${REINPLACE_CMD} -e 's|dynamic|static|g' \ @@ -58,13 +45,13 @@ do-install: ${STAGEDIR}${PREFIX}/include/anet ${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] ${WRKSRC}/src/bsd/*.ad[bs] \ ${STAGEDIR}${PREFIX}/include/anet - ${INSTALL_DATA} ${WRKSRC}/lib/static/*.ali \ + ${INSTALL_DATA} ${WRKSRC}/lib/bsd/static/*.ali \ ${STAGEDIR}${PREFIX}/lib/anet - ${INSTALL_DATA} ${WRKSRC}/lib/static/*.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/bsd/static/*.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/gnat/anet.gpr ${STAGEDIR}${PREFIX}/lib/gnat -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> Modified: head/net/anet/distinfo ============================================================================== --- head/net/anet/distinfo Sat Jul 2 20:01:22 2016 (r417941) +++ head/net/anet/distinfo Sat Jul 2 22:14:22 2016 (r417942) @@ -1,2 +1,3 @@ -SHA256 (libanet-0.3.1.tar.bz2) = 6366f4cfe3be0e61e319d0dad2018f61eb0437b4d551587e10cc6b8ab276fb93 -SIZE (libanet-0.3.1.tar.bz2) = 49100 +TIMESTAMP = 1467439601 +SHA256 (libanet-0.3.3.tar.bz2) = 8ef101d47f549232b0276687235ac7767a2b50b6bde5f48ca21c20007e8ad20b +SIZE (libanet-0.3.3.tar.bz2) = 50553 Added: head/net/anet/files/patch-src_anet-sockets-inet.adb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/anet/files/patch-src_anet-sockets-inet.adb Sat Jul 2 22:14:22 2016 (r417942) @@ -0,0 +1,74 @@ +--- src/anet-sockets-inet.adb.orig 2016-06-29 10:26:01 UTC ++++ src/anet-sockets-inet.adb +@@ -52,7 +52,7 @@ package body Anet.Sockets.Inet is + Res : C.int; + Sock : Thin.Inet.Sockaddr_In_Type + (Family => Socket_Families.Family_Inet); +- Len : aliased C.int := Sock'Size / 8; ++ Len : aliased C.int := Thin.Inet.Sockaddr_In_Size; + begin + New_Socket.Sock_FD := -1; + +@@ -80,7 +80,7 @@ package body Anet.Sockets.Inet is + Res : C.int; + Sock : Thin.Inet.Sockaddr_In_Type + (Family => Socket_Families.Family_Inet6); +- Len : aliased C.int := Sock'Size / 8; ++ Len : aliased C.int := Thin.Inet.Sockaddr_In6_Size; + begin + New_Socket.Sock_FD := -1; + +@@ -129,7 +129,7 @@ package body Anet.Sockets.Inet is + (Result => Thin.C_Bind + (S => Socket.Sock_FD, + Name => Sockaddr'Address, +- Namelen => Sockaddr'Size / 8), ++ Namelen => Thin.Inet.Sockaddr_In_Size), + Message => "Unable to bind IPv4 socket to " & To_String + (Address => Address) & "," & Port'Img); + end Bind; +@@ -153,7 +153,7 @@ package body Anet.Sockets.Inet is + (Result => Thin.C_Bind + (S => Socket.Sock_FD, + Name => Sockaddr'Address, +- Namelen => Sockaddr'Size / 8), ++ Namelen => Thin.Inet.Sockaddr_In6_Size), + Message => "Unable to bind IPv6 socket to " & To_String + (Address => Address) & "," & Port'Img); + end Bind; +@@ -173,7 +173,7 @@ package body Anet.Sockets.Inet is + (Result => Thin.C_Connect + (S => Socket.Sock_FD, + Name => Dst'Address, +- Namelen => Dst'Size / 8), ++ Namelen => Thin.Inet.Sockaddr_In_Size), + Message => "Unable to connect socket to address " & To_String + (Address => Address) & " (" & Port'Img & " )"); + end Connect; +@@ -193,7 +193,7 @@ package body Anet.Sockets.Inet is + (Result => Thin.C_Connect + (S => Socket.Sock_FD, + Name => Dst'Address, +- Namelen => Dst'Size / 8), ++ Namelen => Thin.Inet.Sockaddr_In6_Size), + Message => "Unable to connect socket to address " & To_String + (Address => Address) & " (" & Port'Img & " )"); + end Connect; +@@ -432,7 +432,7 @@ package body Anet.Sockets.Inet is + Len => Item'Length, + Flags => 0, + To => Dst'Address, +- Tolen => Dst'Size / 8); ++ Tolen => Thin.Inet.Sockaddr_In_Size); + + Errno.Check_Or_Raise + (Result => C.int (Res), +@@ -464,7 +464,7 @@ package body Anet.Sockets.Inet is + Len => Item'Length, + Flags => 0, + To => Dst'Address, +- Tolen => Dst'Size / 8); ++ Tolen => Thin.Inet.Sockaddr_In6_Size); + + Errno.Check_Or_Raise + (Result => C.int (Res), Modified: head/net/anet/pkg-plist ============================================================================== --- head/net/anet/pkg-plist Sat Jul 2 20:01:22 2016 (r417941) +++ head/net/anet/pkg-plist Sat Jul 2 22:14:22 2016 (r417942) @@ -1,6 +1,8 @@ include/anet/anet-byte_swapping.adb include/anet/anet-byte_swapping.ads include/anet/anet-constants.ads +include/anet/anet-errno.adb +include/anet/anet-errno.ads include/anet/anet-ipv4.adb include/anet/anet-ipv4.ads include/anet/anet-net_ifaces.adb @@ -45,6 +47,7 @@ include/anet/anet.adb include/anet/anet.ads lib/anet/anet-byte_swapping.ali lib/anet/anet-constants.ali +lib/anet/anet-errno.ali lib/anet/anet-ipv4.ali lib/anet/anet-net_ifaces.ali lib/anet/anet-os.ali
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607022214.u62MEMXr028307>