Merge pull request #1913 from alihanozturk/master

perl-LWP-Protocol-https:fix, python-six:fix

programming/language/perl/perl-LWP-Protocol-https/files/certs.patch

@@ -1,39 +1,39 @@
- +--- Makefile.PL.old	2016-01-04 11:31:52.349484123 +0800
-++++ Makefile.PL	2016-01-04 11:32:07.432992090 +0800
-+@@ -15,7 +15,6 @@
-+ 	'LWP::UserAgent' => '6.06',
-+ 	'Net::HTTPS' => 6,
-+ 	'IO::Socket::SSL' => "1.54",
-+-	'Mozilla::CA' => "20110101",
-+     },
-+     META_MERGE => {
-+ 	resources => {
-+--- lib/LWP/Protocol/https.pm.old	2016-01-04 11:33:19.003810886 +0800
-++++ lib/LWP/Protocol/https.pm	2016-01-04 11:34:42.358079461 +0800
-+@@ -25,25 +25,7 @@
-+     }
-+     if ($ssl_opts{SSL_verify_mode}) {
-+ 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
-+-	    eval {
-+-		require Mozilla::CA;
-+-	    };
-+-	    if ($@) {
-+-		if ($@ =! /^Can't locate Mozilla\/CA\.pm/) {
-+-		    $@ = <<'EOT';
-+-Can't verify SSL peers without knowing which Certificate Authorities to trust
-+-
-+-This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE
-+-environment variable or by installing the Mozilla::CA module.
-+-
-+-To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME
-+-environment variable to 0.  If you do this you can't be sure that you
-+-communicate with the expected peer.
-+-EOT
-+-		}
-+-		die $@;
-+-	    }
-+-	    $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
-++	    $ssl_opts{SSL_ca_file} = '/etc/ssl/certs/ca-certificates.crt';
-+ 	}
-+     }
-+     $self->{ssl_opts} = \%ssl_opts;
+--- Makefile.PL.old	2016-01-04 11:31:52.349484123 +0800
++++ Makefile.PL	2016-01-04 11:32:07.432992090 +0800
+@@ -15,7 +15,6 @@
+ 	'LWP::UserAgent' => '6.06',
+ 	'Net::HTTPS' => 6,
+ 	'IO::Socket::SSL' => "1.54",
+-	'Mozilla::CA' => "20110101",
+     },
+     META_MERGE => {
+ 	resources => {
+--- lib/LWP/Protocol/https.pm.old	2016-01-04 11:33:19.003810886 +0800
++++ lib/LWP/Protocol/https.pm	2016-01-04 11:34:42.358079461 +0800
+@@ -25,25 +25,7 @@
+     }
+     if ($ssl_opts{SSL_verify_mode}) {
+ 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+-	    eval {
+-		require Mozilla::CA;
+-	    };
+-	    if ($@) {
+-		if ($@ =! /^Can't locate Mozilla\/CA\.pm/) {
+-		    $@ = <<'EOT';
+-Can't verify SSL peers without knowing which Certificate Authorities to trust
+-
+-This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE
+-environment variable or by installing the Mozilla::CA module.
+-
+-To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME
+-environment variable to 0.  If you do this you can't be sure that you
+-communicate with the expected peer.
+-EOT
+-		}
+-		die $@;
+-	    }
+-	    $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
++	    $ssl_opts{SSL_ca_file} = '/etc/ssl/certs/ca-certificates.crt';
+ 	}
+     }
+     $self->{ssl_opts} = \%ssl_opts;

programming/language/perl/perl-LWP-Protocol-https/pspec.xml

@@ -18,6 +18,7 @@
             <Dependency>perl</Dependency>
             <Dependency>perl-IO-Socket-SSL</Dependency>
             <Dependency>perl-NET-HTTP</Dependency>
+            <Dependency>perl-libwww</Dependency>
             <Dependency>perl-Mozilla-CA</Dependency>
         </BuildDependencies>
         <Patches>
@@ -29,6 +30,11 @@
         <Name>perl-LWP-Protocol-https</Name>
         <RuntimeDependencies>
             <Dependency>perl</Dependency>
+            <Dependency>ca-certificates</Dependency>
+            <Dependency>perl-libwww</Dependency>
+            <Dependency>perl-IO-Socket-SSL</Dependency>
+            <Dependency>perl-NET-HTTP</Dependency>
+            <Dependency>perl-Mozilla-CA</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>

programming/language/python/python-six/actions.py

@@ -12,6 +12,3 @@ def build():
 
 def install():
     pythonmodules.install()
-
-    pisitools.removeDir("/usr/lib/*/site-packages/six-1.9.0*egg-info*")
-    pisitools.remove("/usr/lib/*/site-packages/*egg-info*")

programming/language/python/python-six/pspec.xml

@@ -20,7 +20,7 @@
     <Package>
         <Name>python-six</Name>
         <RuntimeDependencies>
-            <Dependency>python-devel</Dependency>
+            <Dependency>python</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
@@ -31,7 +31,7 @@
 
     <History>
         <Update release="3">
-            <Date>2016-06-09</Date>
+            <Date>2016-06-10</Date>
             <Version>1.9.0</Version>
             <Comment>Release Bump</Comment>
             <Name>Pisi Linux Community</Name>