[libwww-dict-leo-org-perl] 01/06: New upstream version 2.01
gregor herrmann
gregoa at debian.org
Tue Sep 19 19:36:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to annotated tag debian/2.01-1
in repository libwww-dict-leo-org-perl.
commit e06ed2d93369f95142d11b932a345f6be53cf3e5
Author: gregor herrmann <gregoa at debian.org>
Date: Tue Sep 19 21:28:24 2017 +0200
New upstream version 2.01
---
Changelog | 4 ++++
META.json | 5 ++---
META.yml | 19 +++++++++----------
Org.pm | 20 +++++++++++---------
README | 4 ++--
leo | 12 +++++++-----
6 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/Changelog b/Changelog
index 5af88aa..f95782d 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+2.01:
+
+dict.leo.org now forces SSL via Cloudflare, we follow suit.
+
2.00:
Fixed rt.cpan.org#119714 rt.cpan.org#120563 and https://github.com/TLINDEN/leo/pull/1:
diff --git a/META.json b/META.json
index 4645741..c3e7fdd 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
"unknown"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150005",
+ "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.130880",
"license" : [
"unknown"
],
@@ -40,6 +40,5 @@
}
},
"release_status" : "stable",
- "version" : "2.00",
- "x_serialization_backend" : "JSON::PP version 2.27300"
+ "version" : "2.01"
}
diff --git a/META.yml b/META.yml
index 31862d3..c50e924 100644
--- a/META.yml
+++ b/META.yml
@@ -3,24 +3,23 @@ abstract: unknown
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 7.0401, CPAN::Meta::Converter version 2.150005'
+generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.130880'
license: unknown
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: '1.4'
+ version: 1.4
name: WWW-Dict-Leo-Org
no_index:
directory:
- t
- inc
requires:
- Carp::Heavy: '0'
- IO::Socket: '0'
- MIME::Base64: '0'
- XML::Simple: '0'
-version: '2.00'
-x_serialization_backend: 'CPAN::Meta::YAML version 0.016'
+ Carp::Heavy: 0
+ IO::Socket: 0
+ MIME::Base64: 0
+ XML::Simple: 0
+version: 2.01
diff --git a/Org.pm b/Org.pm
index bffdb53..a2ff04e 100644
--- a/Org.pm
+++ b/Org.pm
@@ -7,14 +7,14 @@
# or service marks of their respective holders.
package WWW::Dict::Leo::Org;
-$WWW::Dict::Leo::Org::VERSION = "2.00";
+$WWW::Dict::Leo::Org::VERSION = "2.01";
use strict;
use warnings;
use English '-no_match_vars';
use Carp::Heavy;
use Carp;
-use IO::Socket;
+use IO::Socket::SSL;
use MIME::Base64;
use XML::Simple;
use Encode;
@@ -27,7 +27,7 @@ sub new {
my %settings = (
"-Host" => "dict.leo.org",
- "-Port" => 80,
+ "-Port" => 443,
"-UserAgent" => "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0",
"-Proxy" => "",
"-ProxyUser" => "",
@@ -148,10 +148,11 @@ sub translate {
$url = "/dictQuery/m-vocab/$lang{speak}/query.xml";
}
- my $conn = new IO::Socket::INET(
- Proto => "tcp",
+ my $conn = new IO::Socket::SSL(
+ #Proto => "tcp",
PeerAddr => $ip,
- PeerPort => $port,
+ PeerPort => $port,
+ SSL_verify_mode => SSL_VERIFY_NONE
) or die "Unable to connect to $ip:$port: $!\n";
$conn->autoflush(1);
@@ -293,9 +294,9 @@ sub form {
}
sub debug {
- my($this, $msg) = @_;
+ my($this, @msg) = @_;
if ($this->{"-Debug"}) {
- print STDERR "%DEBUG: $msg\n";
+ print STDERR "%DEBUG: " . join(" ", @msg) . "\n";
}
}
@@ -393,6 +394,7 @@ Valid country codes:
en english
es spanish
+ fr french
ru russian
pt portuguese
pl polish
@@ -493,6 +495,6 @@ Please don't forget to add debugging output!
=head1 VERSION
- 2.00
+ 2.01
=cut
diff --git a/README b/README
index 5a0b552..6769b7f 100644
--- a/README
+++ b/README
@@ -37,10 +37,10 @@ HISTORY
COPYRIGHT
WWW::Dict::Leo::Org + leo
- Copyright (c) 2007-2016 by Thomas v.D. <tlinden at cpan.org>
+ Copyright (c) 2007-2017 by Thomas v.D. <tlinden at cpan.org>
http://dict.leo.org/
- Copyright (c) 1995-2016 LEO Dictionary Team.
+ Copyright (c) 1995-2017 LEO Dictionary Team.
The search results returned by leo are based on the work of the people
at LEO.org. Thanks for the great work.
diff --git a/leo b/leo
index d633c3c..6c98d0b 100755
--- a/leo
+++ b/leo
@@ -13,7 +13,7 @@
# All other brand and product names are trademarks, registered trademarks
# or service marks of their respective holders.
-#use lib qw(blib/lib);
+use lib qw(blib/lib);
use utf8;
@@ -33,7 +33,7 @@ my $default_c = "\033[0m"; # reset default terminal color
my $bold_c = "\033[0;34m"; # blue color
my $copy_c = "\033[0;35m"; # copyright message color (green)
-my $version = "2.00";
+my $version = "2.01";
my $config = $ENV{HOME} . "/.leo";
my $cache = $ENV{HOME} . "/.leo-CACHE.db";
@@ -344,6 +344,7 @@ Supported <countrycode>s are:
en english
es spanish
+fr french
ru russian
pt portuguese
pl polish
@@ -449,6 +450,7 @@ Valid country codes:
en english
es spanish
+fr french
ru russian
pt portuguese
pl polish
@@ -643,9 +645,9 @@ to me, thanks.
=head1 COPYRIGHT
-B<leo> copyleft 2000-2016 Thomas v.D.. All rights reserved.
+B<leo> copyleft 2000-2017 Thomas v.D.. All rights reserved.
-http://dict.leo.org/ copyright (c) 1995-2016 LEO Dictionary Team.
+http://dict.leo.org/ copyright (c) 1995-2017 LEO Dictionary Team.
The search results returned by B<leo> are based on the work
@@ -668,6 +670,6 @@ browser, what is not prohibited. At least not today.
=head1 VERSION
-This is the manpage for B<leo> version B<1.43>.
+This is the manpage for B<leo> version B<2.01>.
=cut
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libwww-dict-leo-org-perl.git
More information about the Pkg-perl-cvs-commits
mailing list