diff --git a/INSTALL.d/Dockerfile b/INSTALL.d/Dockerfile index 8ce619f..87b9054 100644 --- a/INSTALL.d/Dockerfile +++ b/INSTALL.d/Dockerfile @@ -57,7 +57,6 @@ RUN set -xe && \ libfile-tail-perl \ libio-compress-perl \ libio-socket-ssl-perl \ - libio-socket-inet6-perl \ libio-tee-perl \ libhtml-parser-perl \ libjson-webtoken-perl \ diff --git a/INSTALL.d/INSTALL.AWS_EC2.txt b/INSTALL.d/INSTALL.AWS_EC2.txt index 813ad0a..6298498 100644 --- a/INSTALL.d/INSTALL.AWS_EC2.txt +++ b/INSTALL.d/INSTALL.AWS_EC2.txt @@ -72,7 +72,6 @@ perl-Dist-CheckConflicts \ perl-ExtUtils-Embed \ perl-File-Copy-Recursive \ perl-File-Tail \ -perl-IO-Socket-INET6 \ perl-IO-Socket-SSL \ perl-JSON \ perl-HTML-Parser \ diff --git a/INSTALL.d/INSTALL.ArchLinux.txt b/INSTALL.d/INSTALL.ArchLinux.txt index db09be9..aeae0eb 100644 --- a/INSTALL.d/INSTALL.ArchLinux.txt +++ b/INSTALL.d/INSTALL.ArchLinux.txt @@ -48,7 +48,6 @@ Commands to run: extra/perl-digest-hmac \ community/perl-dist-checkconflicts \ extra/perl-file-copy-recursive \ - extra/perl-io-socket-inet6 \ extra/perl-io-socket-ssl \ community/perl-io-tee \ community/perl-json \ diff --git a/INSTALL.d/INSTALL.Debian.txt b/INSTALL.d/INSTALL.Debian.txt index 45d6767..8341441 100644 --- a/INSTALL.d/INSTALL.Debian.txt +++ b/INSTALL.d/INSTALL.Debian.txt @@ -80,7 +80,6 @@ apt install -y \ libencode-imaputf7-perl \ libfile-copy-recursive-perl \ libfile-tail-perl \ - libio-socket-inet6-perl \ libio-socket-ssl-perl \ libio-tee-perl \ libhtml-parser-perl \ @@ -170,7 +169,6 @@ apt install \ libencode-imaputf7-perl \ libfile-copy-recursive-perl \ libfile-tail-perl \ - libio-socket-inet6-perl \ libio-socket-ssl-perl \ libio-tee-perl \ libhtml-parser-perl \ @@ -245,7 +243,6 @@ apt-get install \ libfile-copy-recursive-perl \ libfile-tail-perl \ libio-compress-perl \ - libio-socket-inet6-perl \ libio-socket-ssl-perl \ libio-tee-perl \ libmail-imapclient-perl \ diff --git a/INSTALL.d/INSTALL.Docker_build.txt b/INSTALL.d/INSTALL.Docker_build.txt index 9d332c5..8afba9b 100644 --- a/INSTALL.d/INSTALL.Docker_build.txt +++ b/INSTALL.d/INSTALL.Docker_build.txt @@ -70,7 +70,6 @@ RUN set -xe && \ libfile-tail-perl \ libio-compress-perl \ libio-socket-ssl-perl \ - libio-socket-inet6-perl \ libio-tee-perl \ libhtml-parser-perl \ libjson-webtoken-perl \ diff --git a/INSTALL.d/INSTALL.Ubuntu.txt b/INSTALL.d/INSTALL.Ubuntu.txt index 1c1ca43..c32742a 100644 --- a/INSTALL.d/INSTALL.Ubuntu.txt +++ b/INSTALL.d/INSTALL.Ubuntu.txt @@ -26,7 +26,6 @@ libencode-imaputf7-perl \ libfile-copy-recursive-perl \ libfile-tail-perl \ libio-compress-perl \ -libio-socket-inet6-perl \ libio-socket-ssl-perl \ libio-tee-perl \ libjson-webtoken-perl \ diff --git a/INSTALL.d/prerequisites_imapsync b/INSTALL.d/prerequisites_imapsync index 34be2dd..2ced19c 100755 --- a/INSTALL.d/prerequisites_imapsync +++ b/INSTALL.d/prerequisites_imapsync @@ -20,7 +20,6 @@ Encode::IMAPUTF7 File::Copy::Recursive File::Tail IO::Socket::INET -IO::Socket::INET6 IO::Socket::SSL IO::Tee JSON diff --git a/Makefile b/Makefile index 36a3919..bb857ef 100644 --- a/Makefile +++ b/Makefile @@ -716,7 +716,7 @@ $(BIN_NAME): imapsync imapsync ; \ } # Maybe add -M Test2::Event::Info Mail::IMAPClient \ - #-M Net::SSLeay -M IO::Socket -M IO::Socket::INET6 -M IO::Socket::SSL \ + #-M Net::SSLeay -M IO::Socket -M IO::Socket::SSL \ #-M Digest::MD5 -M Digest::HMAC_MD5 -M Term::ReadKey \ #-M Authen::NTLM -M HTML::Entities -M JSON::WebToken \ #-M Test2::Event -M Test2::Formatter -M Test2::Formatter::TAP \ diff --git a/imapsync b/imapsync index e3f3363..51b77cc 100755 --- a/imapsync +++ b/imapsync @@ -1001,7 +1001,6 @@ use File::stat ; use Getopt::Long ( ) ; use IO::File ; use IO::Socket qw( :crlf SOL_SOCKET SO_KEEPALIVE ) ; -use IO::Socket::INET6 ; use IO::Socket::SSL ; use IO::Tee ; use IPC::Open3 'open3' ; @@ -7075,7 +7074,6 @@ sub modulesversion 'HTML::Entities' => sub { $HTML::Entities::VERSION }, 'IO::Socket' => sub { $IO::Socket::VERSION }, 'IO::Socket::INET' => sub { $IO::Socket::INET::VERSION }, - 'IO::Socket::INET6' => sub { $IO::Socket::INET6::VERSION }, 'IO::Socket::IP' => sub { $IO::Socket::IP::VERSION }, 'IO::Socket::SSL' => sub { $IO::Socket::SSL::VERSION }, 'IO::Tee' => sub { $IO::Tee::VERSION }, @@ -7870,13 +7868,14 @@ sub tests_connect_socket skip( 'Tests avoided on CUILLERE/pcHPDV7-HP/macosx.polarhome.com/docker cannot do ipv6', 2 ) ; } - $socket = IO::Socket::INET6->new( - PeerAddr => 'ks6ipv6.lamiral.info', + $socket = IO::Socket::IP->new( + PeerHost => 'ks6ipv6.lamiral.info', PeerPort => 143, + V6Only => 1, ) ; - ok( $imap = connect_socket( $socket ), 'connect_socket: ks6ipv6.lamiral.info port 143 IO::Socket::INET6' ) ; + ok( $imap = connect_socket( $socket ), 'connect_socket: ks6ipv6.lamiral.info port 143 IO::Socket::IP' ) ; #$imap->Debug( 1 ) ; # myprint( $imap->capability( ) ) ; if ( $imap ) {