[arch-commits] Commit in livestreamer/repos/community-staging-any (3 files)

[Daniel Wallace]

    Date: Wednesday, March 19, 2014 @ 04:45:15
  Author: dwallace
Revision: 107752

archrelease: copy trunk to community-staging-any

Added:
  livestreamer/repos/community-staging-any/PKGBUILD
    (from rev 107751, livestreamer/trunk/PKGBUILD)
  livestreamer/repos/community-staging-any/ca-certs.diff
    (from rev 107751, livestreamer/trunk/ca-certs.diff)
Deleted:
  livestreamer/repos/community-staging-any/PKGBUILD

---------------+
 PKGBUILD      |   53 ++++++++++++++++++++++++++++++-----------------------
 ca-certs.diff |   17 +++++++++++++++++
 2 files changed, 47 insertions(+), 23 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-19 03:44:54 UTC (rev 107751)
+++ PKGBUILD	2014-03-19 03:45:15 UTC (rev 107752)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Christopher Rosell <chrippa at tanuki.se>
-pkgname=livestreamer
-pkgver=1.7.5
-pkgrel=2
-pkgdesc='CLI program that launches streams from various streaming services in a custom video player'
-arch=('any')
-url='https://github.com/chrippa/livestreamer'
-license=('BSD')
-depends=('python-requests' 'rtmpdump' 'python-setuptools')
-provides=('livestreamer')
-conflicts=('livestreamer-git')
-options=(!emptydirs)
-source=(http://pypi.python.org/packages/source/l/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('7f8308a3efdb7c951eda2f5d1b3e738f2fe280e145d4c624b7cd70b1071967a4')
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:

Copied: livestreamer/repos/community-staging-any/PKGBUILD (from rev 107751, livestreamer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-03-19 03:45:15 UTC (rev 107752)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Christopher Rosell <chrippa at tanuki.se>
+pkgname=livestreamer
+pkgver=1.7.5
+pkgrel=4
+pkgdesc='CLI program that launches streams from various streaming services in a custom video player'
+arch=('any')
+url='https://github.com/chrippa/livestreamer'
+license=('BSD')
+depends=('python-requests' 'rtmpdump' 'python-setuptools')
+provides=('livestreamer')
+conflicts=('livestreamer-git')
+options=(!emptydirs)
+source=(http://pypi.python.org/packages/source/l/$pkgname/$pkgname-$pkgver.tar.gz
+        # https://github.com/chrippa/livestreamer/issues/255
+        ca-certs.diff)
+sha256sums=('7f8308a3efdb7c951eda2f5d1b3e738f2fe280e145d4c624b7cd70b1071967a4'
+            'b8f3008444c74b844be3368c662628f9cc048589abf5387d2f0116bf8f6f6c22')
+
+prepare(){
+  patch -Np1 -d "$srcdir/$pkgname-$pkgver/" -i "$srcdir/ca-certs.diff"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:

Copied: livestreamer/repos/community-staging-any/ca-certs.diff (from rev 107751, livestreamer/trunk/ca-certs.diff)
===================================================================
--- ca-certs.diff	                        (rev 0)
+++ ca-certs.diff	2014-03-19 03:45:15 UTC (rev 107752)
@@ -0,0 +1,17 @@
+diff --git a/src/livestreamer/utils.py b/src/livestreamer/utils.py
+index 34e881b..16a4495 100644
+--- a/src/livestreamer/utils.py
++++ b/src/livestreamer/utils.py
+@@ -30,10 +30,10 @@ def urlget(url, *args, **kwargs):
+     try:
+         if session:
+             res = session.request(method, url, timeout=timeout, data=data,
+-                                  *args, **kwargs)
++                                   verify=False, *args, **kwargs)
+         else:
+             res = requests.request(method, url, timeout=timeout, data=data,
+-                                   *args, **kwargs)
++                                   verify=False, *args, **kwargs)
+ 
+         res.raise_for_status()
+     except (requests.exceptions.RequestException, IOError) as rerr: