1
Backported from http://fex.rus.uni-stuttgart.de:8080/download/fexget to avoid perl warning
4
@@ -30,7 +30,7 @@ our $SH;
5
our ($fexhome,$idf,$tmpdir,$windoof,$useragent);
7
our $bs = 2**16; # blocksize for tcp-reading and writing file
8
-our $version = 20150120;
9
+our $version = 20150121;
10
our $CTYPE = 'ISO-8859-1';
11
our $fexsend = $ENV{FEXSEND} || 'fexsend';
13
@@ -157,48 +157,7 @@ if ($opt_H) {
17
-# set SSL/TLS options
18
-$SSL{SSL_verify_mode} = $ENV{SSLVERIFY} if defined($ENV{SSLVERIFY});
28
- $SSL{$opt} = $ENV{$env} if defined($ENV{$env});
31
-if ($SSL{SSL_verify_mode}) {
33
- unless ($SSL{SSL_ca_path} or $SSL{SSL_ca_file}) {
34
- die "$0: \$SSLVERIFYMODE, but not valid \$SSLCAPATH or \$SSLCAFILE\n";
36
-} elsif (defined($SSL{SSL_verify_mode})) {
37
- # user has set SSLVERIFY=0 !
40
- $SSL{SSL_verify_mode} = 1 if $SSL{SSL_ca_path} or $SSL{SSL_ca_file};
45
- return if $SSL{SSL_ca_file} or $SSL{SSL_ca_path};
46
- foreach (qw(/etc/ssl/certs/ca-certificates.crt)) {
48
- $SSL{SSL_ca_file} = $_;
52
- foreach (qw(/etc/ssl/certs /etc/pki/tls/certs)) {
54
- $SSL{SSL_ca_path} = $_;
61
my $ffl = "$tmpdir/fexget"; # F*EX files list (cache)
63
--- a/htdocs/download/fexget
64
+++ b/htdocs/download/fexget
65
@@ -30,7 +30,7 @@ our $SH;
66
our ($fexhome,$idf,$tmpdir,$windoof,$useragent);
68
our $bs = 2**16; # blocksize for tcp-reading and writing file
69
-our $version = 20150120;
70
+our $version = 20150121;
71
our $CTYPE = 'ISO-8859-1';
72
our $fexsend = $ENV{FEXSEND} || 'fexsend';
74
@@ -157,48 +157,7 @@ if ($opt_H) {
78
-# set SSL/TLS options
79
-$SSL{SSL_verify_mode} = $ENV{SSLVERIFY} if defined($ENV{SSLVERIFY});
89
- $SSL{$opt} = $ENV{$env} if defined($ENV{$env});
92
-if ($SSL{SSL_verify_mode}) {
94
- unless ($SSL{SSL_ca_path} or $SSL{SSL_ca_file}) {
95
- die "$0: \$SSLVERIFYMODE, but not valid \$SSLCAPATH or \$SSLCAFILE\n";
97
-} elsif (defined($SSL{SSL_verify_mode})) {
98
- # user has set SSLVERIFY=0 !
101
- $SSL{SSL_verify_mode} = 1 if $SSL{SSL_ca_path} or $SSL{SSL_ca_file};
106
- return if $SSL{SSL_ca_file} or $SSL{SSL_ca_path};
107
- foreach (qw(/etc/ssl/certs/ca-certificates.crt)) {
109
- $SSL{SSL_ca_file} = $_;
113
- foreach (qw(/etc/ssl/certs /etc/pki/tls/certs)) {
115
- $SSL{SSL_ca_path} = $_;
122
my $ffl = "$tmpdir/fexget"; # F*EX files list (cache)