[arch-commits] Commit in ubuntu-sso-client/repos/community-any (4 files)
Balló György
bgyorgy at nymeria.archlinux.org
Mon May 20 21:27:58 UTC 2013
Date: Monday, May 20, 2013 @ 23:27:57
Author: bgyorgy
Revision: 91298
archrelease: copy trunk to community-any
Added:
ubuntu-sso-client/repos/community-any/PKGBUILD
(from rev 91297, ubuntu-sso-client/trunk/PKGBUILD)
ubuntu-sso-client/repos/community-any/oauthlib-0.3.8.patch
(from rev 91297, ubuntu-sso-client/trunk/oauthlib-0.3.8.patch)
Deleted:
ubuntu-sso-client/repos/community-any/PKGBUILD
ubuntu-sso-client/repos/community-any/oauthlib-0.3.8.patch
----------------------+
PKGBUILD | 80 ++++++++++++++++++++++++-------------------------
oauthlib-0.3.8.patch | 53 ++++++++++++++++++++++++--------
2 files changed, 80 insertions(+), 53 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-20 21:27:51 UTC (rev 91297)
+++ PKGBUILD 2013-05-20 21:27:57 UTC (rev 91298)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=ubuntu-sso-client
-pkgver=4.2.0
-pkgrel=1
-pkgdesc="Desktop service to allow applications to sign into Ubuntu services via SSO"
-arch=('any')
-url="https://launchpad.net/ubuntu-sso-client"
-license=('GPL')
-depends=('python2-dbus' 'python2-pyqt' 'python2-dirspec' 'python2-httplib2' 'python2-oauthlib' 'python2-pyopenssl' 'python2-imaging' 'twisted' 'gnome-keyring' 'gsettings-desktop-schemas')
-makedepends=('python2-distutils-extra')
-replaces=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt')
-provides=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt')
-source=(https://launchpad.net/$pkgname/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
- oauthlib-0.3.8.patch)
-md5sums=('1e80d1702ee69cf63242aafaa2c0cc00'
- 'dfe190f84a8468cff995595fa38a6370')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Python2 fix
- sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
-
- # Fix error with oautlib>=0.3.8
- patch -Np1 -i "$srcdir/oauthlib-0.3.8.patch"
-
- python2 setup.py build
-}
-
-package() {
-
- cd "$srcdir/$pkgname-$pkgver"
-
- python2 setup.py install --root=$pkgdir/ --optimize=1
-
- # Remove unneeded files
- rm "$pkgdir"/usr/share/ubuntu-sso-client/*.ttf
-}
Copied: ubuntu-sso-client/repos/community-any/PKGBUILD (from rev 91297, ubuntu-sso-client/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-05-20 21:27:57 UTC (rev 91298)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=ubuntu-sso-client
+pkgver=4.2.0
+pkgrel=2
+pkgdesc="Desktop service to allow applications to sign into Ubuntu services via SSO"
+arch=('any')
+url="https://launchpad.net/ubuntu-sso-client"
+license=('GPL')
+depends=('python2-dbus' 'python2-pyqt' 'python2-dirspec' 'python2-httplib2' 'python2-oauthlib' 'python2-pyopenssl' 'python2-imaging' 'twisted' 'gnome-keyring' 'gsettings-desktop-schemas')
+makedepends=('python2-distutils-extra')
+replaces=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt')
+provides=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt')
+source=(https://launchpad.net/$pkgname/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+ oauthlib-0.3.8.patch)
+md5sums=('1e80d1702ee69cf63242aafaa2c0cc00'
+ '7eb0cf5ea1318ef5916b49f3c610aacd')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Python2 fix
+ sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
+
+ # Fix error with oautlib>=0.3.8
+ patch -Np0 -i "$srcdir/oauthlib-0.3.8.patch"
+
+ python2 setup.py build
+}
+
+package() {
+
+ cd "$srcdir/$pkgname-$pkgver"
+
+ python2 setup.py install --root=$pkgdir/ --optimize=1
+
+ # Remove unneeded files
+ rm "$pkgdir"/usr/share/ubuntu-sso-client/*.ttf
+}
Deleted: oauthlib-0.3.8.patch
===================================================================
--- oauthlib-0.3.8.patch 2013-05-20 21:27:51 UTC (rev 91297)
+++ oauthlib-0.3.8.patch 2013-05-20 21:27:57 UTC (rev 91298)
@@ -1,13 +0,0 @@
-diff -Naur ubuntu-sso-client-4.2.0.orig/ubuntu_sso/utils/webclient/common.py ubuntu-sso-client-4.2.0/ubuntu_sso/utils/webclient/common.py
---- ubuntu-sso-client-4.2.0.orig/ubuntu_sso/utils/webclient/common.py 2013-04-02 00:10:25.870644798 +0000
-+++ ubuntu-sso-client-4.2.0/ubuntu_sso/utils/webclient/common.py 2013-04-02 00:12:54.226165669 +0000
-@@ -158,8 +158,7 @@
- timestamp=str(timestamp))
-
- url, signed_headers, body = oauth_client.sign(
-- uri, method, parameters if parameters is not None else {},
-- {'Content-Type': 'application/x-www-form-urlencoded'})
-+ uri, method)
-
- return url, signed_headers, body
-
Copied: ubuntu-sso-client/repos/community-any/oauthlib-0.3.8.patch (from rev 91297, ubuntu-sso-client/trunk/oauthlib-0.3.8.patch)
===================================================================
--- oauthlib-0.3.8.patch (rev 0)
+++ oauthlib-0.3.8.patch 2013-05-20 21:27:57 UTC (rev 91298)
@@ -0,0 +1,40 @@
+=== modified file 'ubuntu_sso/utils/webclient/common.py'
+--- ubuntu_sso/utils/webclient/common.py 2013-02-19 22:12:47 +0000
++++ ubuntu_sso/utils/webclient/common.py 2013-04-12 20:11:22 +0000
+@@ -157,9 +157,12 @@
+ else SIGNATURE_TYPE_AUTH_HEADER),
+ timestamp=str(timestamp))
+
+- url, signed_headers, body = oauth_client.sign(
+- uri, method, parameters if parameters is not None else {},
+- {'Content-Type': 'application/x-www-form-urlencoded'})
++ try:
++ url, signed_headers, body = oauth_client.sign(
++ uri, method, parameters if parameters is not None else {},
++ {'Content-Type': 'application/x-www-form-urlencoded'})
++ except ValueError:
++ url, signed_headers, body = oauth_client.sign(uri, method)
+
+ return url, signed_headers, body
+
+
+=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
+--- ubuntu_sso/utils/webclient/tests/test_webclient.py 2013-02-19 22:12:47 +0000
++++ ubuntu_sso/utils/webclient/tests/test_webclient.py 2013-04-12 20:11:22 +0000
+@@ -794,15 +794,6 @@
+
+ self.assert_headers_correct(signed_headers)
+ self.assertEqual(url, self.sample_url)
+- if params is not None:
+- for param, value in params.items():
+- self.assertIn(param, body)
+- actual = body[param]
+- self.assertEqual(value, actual)
+-
+- def test_build_oauth_request_with_params(self):
+- """Check that the oauth request are properly with params."""
+- self.test_build_oauth_request(params=self.sample_params)
+
+ @defer.inlineCallbacks
+ def test_build_signed_iri(self, params=None):
+
More information about the arch-commits
mailing list