[arch-commits] Commit in python2-httplib2/trunk (COPYING PKGBUILD)

[Alexander Rødseth]

    Date: Wednesday, September 11, 2013 @ 16:41:00
  Author: arodseth
Revision: 97051

upgpkg: python2-httplib2 0.8-2

Modified:
  python2-httplib2/trunk/PKGBUILD
Deleted:
  python2-httplib2/trunk/COPYING

----------+
 COPYING  |   24 ------------------------
 PKGBUILD |   18 ++++++++++++------
 2 files changed, 12 insertions(+), 30 deletions(-)

Deleted: COPYING
===================================================================
--- COPYING	2013-09-11 14:06:02 UTC (rev 97050)
+++ COPYING	2013-09-11 14:41:00 UTC (rev 97051)
@@ -1,24 +0,0 @@
-Httplib2 Software License
-
-Copyright (c) 2006 by Joe Gregorio
-
-Permission is hereby granted, free of charge, to any person 
-obtaining a copy of this software and associated documentation 
-files (the "Software"), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, 
-publish, distribute, sublicense, and/or sell copies of the Software, 
-and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be 
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-11 14:06:02 UTC (rev 97050)
+++ PKGBUILD	2013-09-11 14:41:00 UTC (rev 97051)
@@ -5,11 +5,12 @@
 # Contributor: Nicolas Quienot <niQo at aur>
 # Contributor: Jesse Young <jesse.young at gmail.com>
 
+# TODO: Change pkgbase from python2-httplib2 to python-httplib2
 pkgbase=python2-httplib2
 pkgname=(python-httplib2 python2-httplib2)
 _pkgbasename=httplib2
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Comprehensive HTTP client library, supporting many features'
 url='http://code.google.com/p/httplib2/'
 license=('MIT')
@@ -18,13 +19,18 @@
 provides=('httplib2')
 replaces=('httplib2')
 source=("http://httplib2.googlecode.com/files/$_pkgbasename-$pkgver.tar.gz"
-        'COPYING')
+        'security.patch::http://httplib2.googlecode.com/issues/attachment?aid=2820000000&name=ssl_hostname.diff&token=6H5KCc5DdiALaB413U9cqHZPgMI%3A1378908484674')
 sha256sums=('af689bc3cb10a95721eb0d0cf806202a699e7799dacd3497f63b48b2ba429c3f'
-            '76b9c89dc4c620837d81f3880903142932f258814a0e2634355bc2ceac21f406')
+            'd29fa108291a24f0708f04867f0479247ecbdd1fcf1617588b6650038d95554a')
 
 prepare() {
-  cd "$srcdir"
+  # patch, ref https://bugs.archlinux.org/task/36839
+  cd "$_pkgbasename-$pkgver"
+  patch -p1 -i "$srcdir/security.patch"
+  tail -24 README > LICENSE
+  cd ..
 
+  # prepare one build directory for each package
   cp -a "$_pkgbasename-$pkgver" "${pkgname[0]}-$pkgver"
   cp -a "$_pkgbasename-$pkgver" "${pkgname[1]}-$pkgver"
 }
@@ -34,7 +40,7 @@
 
   cd "$srcdir/$pkgname-$pkgver"
   python setup.py install --root="$pkgdir"
-  install -Dm644 "$srcdir/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_python2-httplib2() {
@@ -42,7 +48,7 @@
 
   cd "$srcdir/$pkgname-$pkgver"
   python2 setup.py install --root="$pkgdir"
-  install -Dm644 "$srcdir/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: