Hello community, here is the log from the commit of package perl-Socket6 for openSUSE:Factory checked in at 2018-01-25 12:35:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Socket6 (Old) and /work/SRC/openSUSE:Factory/.perl-Socket6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Socket6" Thu Jan 25 12:35:28 2018 rev:24 rq:568404 version:0.28 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Socket6/perl-Socket6.changes 2013-12-19 13:35:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Socket6.new/perl-Socket6.changes 2018-01-25 12:35:30.852742751 +0100 @@ -1,0 +2,18 @@ +Sat Dec 23 07:00:12 UTC 2017 - [email protected] + +- updated to 0.28 + * aclocal.m4 (IPv6_CHECK_INET_NTOP): inet_ntop(3) may returns + IPv4-compatible IPv6 address. [cpan #113950] +- includes fix from 0.27 + * t/use.t: We still support an environment where AF_INET6 is + not defined +- includes changes from 0.26 + * Makefile.PL: Make Socket6 buildable on Android. [cpan #98181] + * system inet_ntop broken in darwin. [cpan #113005] + * gailookup.pl.in: Add -r option to do reverse lookup + * gailookup.pl.in: Add awareness of AI_ALL and AI_V4MAPPED + * gailookup.pl.in: Add -P option to ease to specify port number +- cleanup spec file with spec-cleaner +- split tests into %check section + +------------------------------------------------------------------- Old: ---- Socket6-0.25.tar.gz New: ---- Socket6-0.28.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Socket6.spec ++++++ --- /var/tmp/diff_new_pack.a7CBpC/_old 2018-01-25 12:35:31.688703726 +0100 +++ /var/tmp/diff_new_pack.a7CBpC/_new 2018-01-25 12:35:31.692703539 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Socket6 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,41 +16,41 @@ # +%define cpan_name Socket6 Name: perl-Socket6 -Version: 0.25 +Version: 0.28 Release: 0 -%define cpan_name Socket6 Summary: IPv6 Sockets (Perl Module) License: BSD-3-Clause Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Socket6/ Source: http://www.cpan.org/authors/id/U/UM/UMEMOTO/%{cpan_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl-macros +%{perl_requires} %description The IPv6 related part of the C socket.h defines and structure manipulators. %prep -%setup -n Socket6-%{version} +%setup -q -n Socket6-%{version} %build perl Makefile.PL make %{?_smp_mflags} -make test + +%check +make %{?_smp_mflags} test %install -make DESTDIR=$RPM_BUILD_ROOT install_vendor +make DESTDIR=%{buildroot} install_vendor %perl_process_packlist %files -%defattr(-,root,root) %{perl_vendorarch}/auto/Socket6 %{perl_vendorarch}/Socket6.pm -%doc %{_mandir}/man3/Socket6.3pm.gz +%{_mandir}/man3/Socket6.3pm%{ext_man} %doc MANIFEST README ChangeLog %changelog ++++++ Socket6-0.25.tar.gz -> Socket6-0.28.tar.gz ++++++ ++++ 9760 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/ChangeLog new/Socket6-0.28/ChangeLog --- old/Socket6-0.25/ChangeLog 2013-12-08 18:23:06.000000000 +0100 +++ new/Socket6-0.28/ChangeLog 2016-07-11 07:43:27.000000000 +0200 @@ -1,3 +1,43 @@ +2016-07-11 Hajimu UMEMOTO <[email protected]> + + * Socket6.pm: Bump version number to 0.28. + + * aclocal.m4 (IPv6_CHECK_INET_NTOP): inet_ntop(3) may returns + IPv4-compatible IPv6 address. [cpan #113950] + + Submitted by: Andrew Galante <spock128 [...] gmail.com> + +2016-03-23 Hajimu UMEMOTO <[email protected]> + + * Socket6.pm: Bump version number to 0.27. + +2016-03-22 Hajimu UMEMOTO <[email protected]> + + * t/use.t: We still supports an environment where AF_INET6 is not + defined. + +2016-03-17 Hajimu UMEMOTO <[email protected]> + + * Socket6.pm: Bump version number to 0.26. + + * Makefile.PL: Make Socket6 buildable on Android. [cpan #98181] + + Submitted by: fraserbn [...] gmail.com + + * system inet_ntop broken in darwin. [cpan #113005] + + Submitted by: RURBAN [...] cpan.org + +2015-12-05 Hajimu UMEMOTO <[email protected]> + + * gailookup.pl.in: Add -r option to do reverse lookup. + +2015-11-25 Hajimu UMEMOTO <[email protected]> + + * gailookup.pl.in: Add awareness of AI_ALL and AI_V4MAPPED. + + * gailookup.pl.in: Add -P option to ease to specify port number. + 2013-12-09 Hajimu UMEMOTO <[email protected]> * Socket6.pm: Bump version number to 0.25. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/META.json new/Socket6-0.28/META.json --- old/Socket6-0.25/META.json 2013-12-08 18:25:29.000000000 +0100 +++ new/Socket6-0.28/META.json 2016-07-11 07:45:49.000000000 +0200 @@ -4,7 +4,7 @@ "unknown" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630", + "generated_by" : "ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001", "license" : [ "unknown" ], @@ -35,5 +35,5 @@ } }, "release_status" : "stable", - "version" : "0.25" + "version" : "0.28" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/META.yml new/Socket6-0.28/META.yml --- old/Socket6-0.25/META.yml 2013-12-08 18:25:29.000000000 +0100 +++ new/Socket6-0.28/META.yml 2016-07-11 07:45:49.000000000 +0200 @@ -3,19 +3,19 @@ author: - unknown build_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' configure_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630' +generated_by: 'ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Socket6 no_index: directory: - t - inc requires: {} -version: 0.25 +version: '0.28' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/Makefile.PL new/Socket6-0.28/Makefile.PL --- old/Socket6-0.25/Makefile.PL 2013-12-08 18:21:56.000000000 +0100 +++ new/Socket6-0.28/Makefile.PL 2016-04-11 05:27:34.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2013 Hajimu UMEMOTO <[email protected]>. +# Copyright (C) 2000-2016 Hajimu UMEMOTO <[email protected]>. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $Id: Makefile.PL,v 1.12 2013/12/08 17:21:56 ume Exp $ +# $Id: Makefile.PL 659 2016-03-17 06:20:36Z ume $ use Config; use ExtUtils::MakeMaker; @@ -33,8 +33,22 @@ if ($^O eq 'MSWin32') { configure_mswin32(); } else { + local $ENV{TMPDIR} = $ENV{TMPDIR}; my $path_perl = ($^X =~ m!^/!o) ? $^X : `which $^X`; - my $cmd = "CC='$Config{cc}' CFLAGS='$Config{ccflags}' ./configure"; + my $cmd = "CC='$Config{cc}' CFLAGS='$Config{ccflags}'"; + if ($^O eq 'android') { + # Work around a bug in Android's sh: + # http://stackoverflow.com/questions/15283220/android-shell-eof + $ENV{TMPDIR} ||= File::Spec->tmpdir(); + + # /bin/sh doesn't exist on Android, point it to the right + # location for sh + $cmd .= " CONFIG_SHELL='$Config{sh}'"; + + # Call './configure' as 'sh ./configure' + $cmd .= " $Config{sh}"; + } + $cmd .= " ./configure"; $cmd .= " --with-perl=$path_perl" if ($path_perl); system($cmd); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/README new/Socket6-0.28/README --- old/Socket6-0.25/README 2013-12-07 20:24:21.000000000 +0100 +++ new/Socket6-0.28/README 2016-04-11 05:27:34.000000000 +0200 @@ -1,6 +1,6 @@ Socket6 -$Id: README,v 1.12 2013/12/07 19:24:21 ume Exp $ +$Id: README 659 2016-03-17 06:20:36Z ume $ 1. Abstract @@ -30,7 +30,7 @@ 5. Copyright -Copyright (C) 2000-2013 Hajimu UMEMOTO <[email protected]>. +Copyright (C) 2000-2016 Hajimu UMEMOTO <[email protected]>. All rights reserved. Socket6.pm and Socket6.xs are based on perl5.005_55-v6-19990721 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/Socket6.pm new/Socket6-0.28/Socket6.pm --- old/Socket6-0.25/Socket6.pm 2013-12-08 18:23:56.000000000 +0100 +++ new/Socket6-0.28/Socket6.pm 2016-07-11 07:44:01.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2013 Hajimu UMEMOTO <[email protected]>. +# Copyright (C) 2000-2016 Hajimu UMEMOTO <[email protected]>. # All rights reserved. # # This module is based on perl5.005_55-v6-19990721 written by KAME @@ -31,13 +31,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $Id: Socket6.pm,v 1.51 2013/12/08 17:23:56 ume Exp $ +# $Id: Socket6.pm 683 2016-07-11 05:45:26Z ume $ package Socket6; use strict; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $AUTOLOAD); -$VERSION = "0.25"; +$VERSION = "0.28"; =head1 NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/Socket6.xs new/Socket6-0.28/Socket6.xs --- old/Socket6-0.25/Socket6.xs 2008-08-16 18:47:00.000000000 +0200 +++ new/Socket6-0.28/Socket6.xs 2016-04-11 05:27:34.000000000 +0200 @@ -1,8 +1,8 @@ /* * Socket6.xs - * $Id: Socket6.xs,v 1.29 2008/08/16 16:47:00 ume Exp $ + * $Id: Socket6.xs 662 2016-03-22 16:03:49Z ume $ * - * Copyright (C) 2000-2008 Hajimu UMEMOTO <[email protected]>. + * Copyright (C) 2000-2016 Hajimu UMEMOTO <[email protected]>. * All rights reserved. * * This moduled is besed on perl5.005_55-v6-19990721 written by KAME @@ -81,6 +81,10 @@ #include "config.h" +#if defined(HAVE_INET_NTOP) && !defined(CAN_INET_NTOP) +#undef HAVE_INET_NTOP +#endif + #ifndef HAVE_GETADDRINFO #include "getaddrinfo.c" #define NI_MAXHOST 1025 @@ -540,7 +544,7 @@ addrlen, alen); } - Copy( address, &addr, sizeof addr, char ); + Copy( address, &addr, alen, char ); addr_str[0] = 0; inet_ntop(af, &addr, addr_str, sizeof addr_str); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/config.h.in new/Socket6-0.28/config.h.in --- old/Socket6-0.25/config.h.in 2005-08-27 18:31:37.000000000 +0200 +++ new/Socket6-0.28/config.h.in 2016-04-11 05:27:34.000000000 +0200 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.in by autoheader. */ +/* Do we have a working inet_ntop? */ +#undef CAN_INET_NTOP + /* Define to 1 if you have the `getaddrinfo' function. */ #undef HAVE_GETADDRINFO @@ -45,5 +48,8 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/config.pl.in new/Socket6-0.28/config.pl.in --- old/Socket6-0.25/config.pl.in 2000-03-19 18:52:34.000000000 +0100 +++ new/Socket6-0.28/config.pl.in 2016-04-11 05:27:34.000000000 +0200 @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $Id: config.pl.in,v 1.4 2000/03/19 17:52:34 ume Exp $ +# $Id: config.pl.in 48 2000-03-19 17:52:34Z ume $ $cc = '@CC@'; $libs = '@INET6LIBS@'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/configure.in new/Socket6-0.28/configure.in --- old/Socket6-0.25/configure.in 2005-08-27 18:38:00.000000000 +0200 +++ new/Socket6-0.28/configure.in 2016-04-11 05:27:34.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2005 Hajimu UMEMOTO <[email protected]>. +# Copyright (C) 2000-2016 Hajimu UMEMOTO <[email protected]>. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $Id: configure.in,v 1.19 2005/08/27 16:38:00 ume Exp $ +# $Id: configure.in 659 2016-03-17 06:20:36Z ume $ AC_PREREQ(2.57) AC_INIT(Socket6.pm) @@ -63,6 +63,7 @@ INET6LIBS="-L$ipv6_cv_dir/lib -linet6" fi +IPv6_CHECK_INET_NTOP() IPv6_CHECK_SA_LEN() IPv6_CHECK_SIN6_SCOPE_ID() IPv6_CHECK_SOCKLEN_T() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/gai.h new/Socket6-0.28/gai.h --- old/Socket6-0.25/gai.h 2005-08-27 18:33:10.000000000 +0200 +++ new/Socket6-0.28/gai.h 2016-04-11 05:27:34.000000000 +0200 @@ -1,6 +1,6 @@ /* * Mar 8, 2000 by Hajimu UMEMOTO <[email protected]> - * $Id: gai.h,v 1.10 2005/08/27 16:33:10 ume Exp $ + * $Id: gai.h 125 2005-08-27 16:33:10Z ume $ * * This module is besed on ssh-1.2.27-IPv6-1.5 written by * KIKUCHI Takahiro <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/gailookup.pl.in new/Socket6-0.28/gailookup.pl.in --- old/Socket6-0.25/gailookup.pl.in 2005-10-11 08:57:21.000000000 +0200 +++ new/Socket6-0.28/gailookup.pl.in 2016-04-11 05:27:34.000000000 +0200 @@ -1,6 +1,6 @@ #! @PERLPATH@ -;# Copyright (C) 2000-2005 Hajimu UMEMOTO <[email protected]>. +;# Copyright (C) 2000-2015 Hajimu UMEMOTO <[email protected]>. ;# All rights reserved. ;# ;# Copyright (C)2000 Hideaki YOSHIFUJI <[email protected]> @@ -30,7 +30,7 @@ ;# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ;# SUCH DAMAGE. -;# $Id: gailookup.pl.in,v 1.12 2005/10/11 06:57:21 ume Exp $ +;# $Id: gailookup.pl.in 652 2015-12-05 04:40:07Z ume $ use Getopt::Std; use Socket; @@ -40,21 +40,24 @@ my $inet6 = defined(eval 'PF_INET6'); my %opt; -getopts(($inet6 ? 'achpsnNqS46' : 'chpsnNqS4'), \%opt); +getopts(($inet6 ? 'aAchpsmnNP:qrS46' : 'AchpsmnNP:qrS4'), \%opt); if ($opt{'h'}){ - print STDERR ("Usage: $0 [-h | [-a] [-c] [-n] [-N] [-p] [-q] [-s] [-S] [-4" . + print STDERR ("Usage: $0 [-h | [-a] [-A] [-c] [-m] [-n] [-N] [-p] [-P serv] [-q] [-r] [-s] [-S] [-4" . ($inet6 && "|-6") . "] [host [serv]]]\n" . "-h : help\n" . "-a : AI_ADDRCONFIG flag\n" . + "-A : AI_ALL flag\n" . "-c : AI_CANONNAME flag\n" . + "-m : AI_V4MAPPED flag\n" . "-n : AI_NUMERICHOST flag\n" . "-N : AI_NUMERICSERV flag\n" . "-p : AI_PASSIVE flag\n" . "-q : only show IP address\n" . + "-r : do reverse lookup\n" . "-s : NI_WITHSCOPEID flag\n" . "-S : suppress scopeid\n" . - ($inet6 ? "-4|-6: PF_INET | PF_INET6" : "-4 : PF_INET") . + ($inet6 ? "-4|-6: PF_INET | PF_INET6" : "-4 : PF_INET") . "\n"); exit(4); } @@ -64,12 +67,16 @@ die("Too many arguments\n") if (@ARGV); die("Either -4 or -6, not both should be specified\n") if ($opt{'4'} && $opt{'6'}); +$serv = $opt{'P'} if ($opt{'P'}); + my $af = PF_UNSPEC; $af = PF_INET if ($opt{'4'}); $af = PF_INET6 if ($inet6 && $opt{'6'}); my $flags = 0; eval('$flags |= AI_ADDRCONFIG') if ($opt{'a'}); +eval('$flags |= AI_ALL') if ($opt{'A'}); +eval('$flags |= AI_V4MAPPED') if ($opt{'m'}); $flags |= AI_PASSIVE if ($opt{'p'}); $flags |= AI_NUMERICHOST if ($opt{'n'}); $flags |= AI_NUMERICSERV if ($opt{'N'}); @@ -97,7 +104,11 @@ print("$addr"); } else { print("family=$family, socktype=$socktype, protocol=$protocol, addr=$addr, port=$port"); - print(" canonname=$canonname") if ($opt{'c'}); + print(", canonname=$canonname") if ($opt{'c'}); + if ($opt{'r'}) { + my($addr, $port) = getnameinfo($sin); + print(", rev=$addr"); + } } print("\n"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/getaddrinfo.c new/Socket6-0.28/getaddrinfo.c --- old/Socket6-0.25/getaddrinfo.c 2005-08-27 18:33:10.000000000 +0200 +++ new/Socket6-0.28/getaddrinfo.c 2016-04-11 05:27:34.000000000 +0200 @@ -1,6 +1,6 @@ /* * Mar 8, 2000 by Hajimu UMEMOTO <[email protected]> - * $Id: getaddrinfo.c,v 1.13 2005/08/27 16:33:10 ume Exp $ + * $Id: getaddrinfo.c 125 2005-08-27 16:33:10Z ume $ * * This module is besed on ssh-1.2.27-IPv6-1.5 written by * KIKUCHI Takahiro <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/getnameinfo.c new/Socket6-0.28/getnameinfo.c --- old/Socket6-0.25/getnameinfo.c 2004-01-04 11:13:44.000000000 +0100 +++ new/Socket6-0.28/getnameinfo.c 2016-04-11 05:27:34.000000000 +0200 @@ -1,6 +1,6 @@ /* * Mar 8, 2000 by Hajimu UMEMOTO <[email protected]> - * $Id: getnameinfo.c,v 1.8 2004/01/04 10:13:44 ume Exp $ + * $Id: getnameinfo.c 99 2004-01-04 10:13:44Z ume $ * * This module is besed on ssh-1.2.27-IPv6-1.5 written by * KIKUCHI Takahiro <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/inet_ntop.c new/Socket6-0.28/inet_ntop.c --- old/Socket6-0.25/inet_ntop.c 2004-02-19 16:03:35.000000000 +0100 +++ new/Socket6-0.28/inet_ntop.c 2016-04-11 05:27:34.000000000 +0200 @@ -13,6 +13,8 @@ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * $Id: inet_ntop.c 663 2016-03-22 16:08:54Z ume $ */ @@ -24,6 +26,12 @@ * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ +#ifdef HAVE_SOCKLEN_T +#define SOCKLEN_T socklen_t +#else +#define SOCKLEN_T size_t +#endif + static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size); @@ -41,14 +49,14 @@ * Paul Vixie, 1996. */ const char * -inet_ntop(int af, const void *src, char *dst, size_t size) +inet_ntop(int af, const void *src, char *dst, SOCKLEN_T size) { switch (af) { case AF_INET: - return (inet_ntop4(src, dst, size)); + return (inet_ntop4(src, dst, (size_t)size)); #ifdef AF_INET6 case AF_INET6: - return (inet_ntop6(src, dst, size)); + return (inet_ntop6(src, dst, (size_t)size)); #endif default: errno = EAFNOSUPPORT; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/inet_pton.c new/Socket6-0.28/inet_pton.c --- old/Socket6-0.25/inet_pton.c 2004-02-19 16:03:08.000000000 +0100 +++ new/Socket6-0.28/inet_pton.c 2016-04-11 05:27:34.000000000 +0200 @@ -13,6 +13,8 @@ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * $Id: inet_pton.c 663 2016-03-22 16:08:54Z ume $ */ #define NS_INT16SZ 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Socket6-0.25/t/use.t new/Socket6-0.28/t/use.t --- old/Socket6-0.25/t/use.t 2013-12-07 19:29:38.000000000 +0100 +++ new/Socket6-0.28/t/use.t 2016-04-11 05:27:34.000000000 +0200 @@ -27,12 +27,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $Id: use.t,v 1.3 2013/12/07 18:29:38 ume Exp $ +# $Id: use.t 662 2016-03-22 16:03:49Z ume $ use strict; use Test; -use Socket qw(AF_INET SOCK_STREAM); -BEGIN { plan tests => 3 } +eval 'use Socket qw(AF_INET AF_INET6 SOCK_STREAM)'; +if ($@) { + use Socket qw(AF_INET SOCK_STREAM); +} +BEGIN { plan tests => 9 } use Socket6; ok(1); my @tmp = getaddrinfo("localhost", "", AF_INET, SOCK_STREAM, 0, 0); @@ -44,5 +47,25 @@ if ($addr eq "127.0.0.1" && $port eq "0") { ok(3); } -exit; -__END__ + +my $af_inet6 = eval('AF_INET6'); +my $unless_inet6 = !defined($af_inet6) ? 'Skip if not defined AF_INET6' : ''; + +skip($unless_inet6, + sub { inet_ntop($af_inet6, inet_pton($af_inet6, "::")), "::" }); + +# this fails under darwin +skip($unless_inet6, + sub { inet_ntop($af_inet6, inet_pton($af_inet6, "::21")), "::21" }) + or print "# ", unpack("H*", inet_pton($af_inet6, "::21")), "\n"; + +skip($unless_inet6, + sub { inet_ntop($af_inet6, inet_pton($af_inet6, "43::")), "43::" }); +skip($unless_inet6, + sub { inet_ntop($af_inet6, inet_pton($af_inet6, "1:2:3:4:5:6:7::")), + "1:2:3:4:5:6:7:0" }); +skip($unless_inet6, + sub { inet_ntop($af_inet6, inet_pton($af_inet6, "1::8")), "1::8" }); +skip($unless_inet6, + sub { inet_ntop($af_inet6, inet_pton($af_inet6, "FF00::FFFF")), + "ff00::ffff" });
