summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--cryptodome-typing.patch39
3 files changed, 8 insertions, 56 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7774541dc0f2..a8bd967e8ec3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = python-miio
pkgdesc = Python library & console tool for controlling Xiaomi smart appliances
- pkgver = 0.3.1
+ pkgver = 0.3.2
pkgrel = 1
url = https://github.com/rytilahti/python-miio
arch = any
license = GPL3
depends = python>=3.4
- depends = python-android-backup-tools-git
+ depends = python-android-backup-tools
depends = python-attrs
depends = python-click
depends = python-construct
@@ -15,10 +15,8 @@ pkgbase = python-miio
depends = python-pretty-cron
depends = python-pytz
depends = python-zeroconf
- source = https://github.com/rytilahti/python-miio/archive/0.3.1.tar.gz
- source = cryptodome-typing.patch
- sha512sums = 324ecc5fa3d049c3d59529755575ed1d179193631b28eb0999c28c62ead85c6cf1604d35c97a186bd3521bb05cc72fdf9352c6aa527ed064404a7a3c3183a7ba
- sha512sums = c3c402edba82a70a7a91d3250e4fed1ed4f1316ab7e785663994c8722107703461fda0ac55f33935d52be453498f3118d6d0c2bcfd4ee21415f867643a9c115c
+ source = https://github.com/rytilahti/python-miio/archive/0.3.2.tar.gz
+ sha512sums = 9c84b6b431c3e0a6a8873fd1fe00d04604dfbb870fc25044a07dff5cfa1e2c32dcfc66ce18e8a1537173271d4985ea5f01037f3ccc7c9d7259bceda037472a95
pkgname = python-miio
diff --git a/PKGBUILD b/PKGBUILD
index 7435deb14482..5cdd9e71a198 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,15 @@
# Maintainer: Patrick Lühne <patrick-arch@luehne.de>
pkgname=python-miio
-pkgver=0.3.1
+pkgver=0.3.2
pkgrel=1
pkgdesc="Python library & console tool for controlling Xiaomi smart appliances"
url="https://github.com/rytilahti/python-miio"
arch=('any')
license=('GPL3')
-depends=('python>=3.4' 'python-android-backup-tools-git' 'python-attrs' 'python-click' 'python-construct' 'python-cryptography' 'python-pycryptodomex' 'python-pretty-cron' 'python-pytz' 'python-zeroconf')
-source=("https://github.com/rytilahti/${pkgname}/archive/${pkgver}.tar.gz"
- 'cryptodome-typing.patch')
-sha512sums=('324ecc5fa3d049c3d59529755575ed1d179193631b28eb0999c28c62ead85c6cf1604d35c97a186bd3521bb05cc72fdf9352c6aa527ed064404a7a3c3183a7ba'
- 'c3c402edba82a70a7a91d3250e4fed1ed4f1316ab7e785663994c8722107703461fda0ac55f33935d52be453498f3118d6d0c2bcfd4ee21415f867643a9c115c')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i ../../cryptodome-typing.patch
-}
+depends=('python>=3.4' 'python-android-backup-tools' 'python-attrs' 'python-click' 'python-construct' 'python-cryptography' 'python-pycryptodomex' 'python-pretty-cron' 'python-pytz' 'python-zeroconf')
+source=("https://github.com/rytilahti/${pkgname}/archive/${pkgver}.tar.gz")
+sha512sums=('9c84b6b431c3e0a6a8873fd1fe00d04604dfbb870fc25044a07dff5cfa1e2c32dcfc66ce18e8a1537173271d4985ea5f01037f3ccc7c9d7259bceda037472a95')
build() {
cd ${pkgname}-${pkgver}
diff --git a/cryptodome-typing.patch b/cryptodome-typing.patch
deleted file mode 100644
index 806156ed29a7..000000000000
--- a/cryptodome-typing.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ura package.orig/miio/extract_tokens.py package.new/miio/extract_tokens.py
---- package.orig/miio/extract_tokens.py 2017-11-18 19:21:38.466287415 +0100
-+++ package.new/miio/extract_tokens.py 2017-11-18 19:19:14.968581127 +0100
-@@ -2,7 +2,7 @@
- import click
- import tempfile
- import sqlite3
--from Crypto.Cipher import AES
-+from Cryptodome.Cipher import AES
- from pprint import pformat as pf
- import attr
- from android_backup import AndroidBackup
-diff -ura package.orig/requirements.txt package.new/requirements.txt
---- package.orig/requirements.txt 2017-11-02 08:22:30.000000000 +0100
-+++ package.new/requirements.txt 2017-11-18 22:14:06.909084310 +0100
-@@ -3,7 +3,7 @@
- pretty_cron
- construct
- zeroconf
--pycrypto # for miio-extract-tokens
-+pycryptodomex # for miio-extract-tokens
- attrs
- typing # for py3.4 support
- pytz # for tz offset in vacuum
-diff -ura package.orig/setup.py package.new/setup.py
---- package.orig/setup.py 2017-11-02 08:22:30.000000000 +0100
-+++ package.new/setup.py 2017-11-18 22:13:56.895913715 +0100
-@@ -30,9 +30,9 @@
- 'click',
- 'cryptography',
- 'pretty_cron',
-- 'typing',
-+ 'typing; python_version < "3.5"',
- 'zeroconf',
-- 'pycrypto',
-+ 'pycryptodomex',
- 'attrs',
- 'android_backup',
- 'pytz'],