diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 0001-Fix-master-key-name-format.patch | 30 | ||||
-rw-r--r-- | PKGBUILD | 14 |
3 files changed, 45 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = nsz-git pkgdesc = Switch Homebrew compatible NSP/XCI compressor/decompressor - pkgver = 3.1.1.r25.g571147e - pkgrel = 4 + pkgver = 3.1.1 + pkgrel = 5 url = https://github.com/nicoboss/nsz arch = any license = MIT @@ -13,10 +13,12 @@ pkgbase = nsz-git depends = python-enlighten optdepends = python-pygame optdepends = python-kivy==1.11.1 - provides = nsz=3.1.1.r25.g571147e + provides = nsz=3.1.1 conflicts = nsz source = nsz-git::git+https://github.com/nicoboss/nsz.git + source = 0001-Fix-master-key-name-format.patch sha256sums = SKIP + sha256sums = 4f8f0b859cc698b3b856a3cd4ea102e87a4e9c13685767b39cbbfb862fd3f72f pkgname = nsz-git diff --git a/0001-Fix-master-key-name-format.patch b/0001-Fix-master-key-name-format.patch new file mode 100644 index 000000000000..9b10dae87308 --- /dev/null +++ b/0001-Fix-master-key-name-format.patch @@ -0,0 +1,30 @@ +From 9818b6071c6ba98b0a99cfe9829eb4ce951c630f Mon Sep 17 00:00:00 2001 +From: Michael Armbruster <michael@armbrust.me> +Date: Sat, 25 Apr 2020 11:24:28 +0200 +Subject: [PATCH] Fix master key name format + +--- + nsz/nut/Keys.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nsz/nut/Keys.py b/nsz/nut/Keys.py +index 59b2cd2..b348bd3 100644 +--- a/nsz/nut/Keys.py ++++ b/nsz/nut/Keys.py +@@ -107,10 +107,10 @@ def getKey(key): + return foundKey + + def getMasterKey(masterKeyIndex): +- return getKey('master_key_{0:02}'.format(masterKeyIndex)) ++ return getKey('master_key_{0:02x}'.format(masterKeyIndex)) + + def existsMasterKey(masterKeyIndex): +- return 'master_key_{0:02}'.format(masterKeyIndex) in keys ++ return 'master_key_{0:02x}'.format(masterKeyIndex) in keys + + def load(fileName): + try: +-- +2.26.1 + + @@ -1,8 +1,8 @@ # Maintainer: Michael Armbruster <michael at armbrust dot me> pkgname=nsz-git -pkgrel=4 -pkgver=3.1.1.r25.g571147e +pkgrel=5 +pkgver=3.1.1 pkgdesc='Switch Homebrew compatible NSP/XCI compressor/decompressor' conflicts=("${pkgname%-*}") provides=("${pkgname%-*}=$pkgver") @@ -12,14 +12,20 @@ license=('MIT') depends=('python>=3.6' 'python-pycryptodome>=3.9.0' 'python-zstandard' 'python-enlighten') optdepends=('python-pygame' 'python-kivy==1.11.1') makedepends=('git' 'python-setuptools') -source=("${pkgname}::git+https://github.com/nicoboss/${pkgname%-*}.git") -sha256sums=('SKIP') +source=("${pkgname}::git+https://github.com/nicoboss/${pkgname%-*}.git" + '0001-Fix-master-key-name-format.patch') +sha256sums=('SKIP' + '4f8f0b859cc698b3b856a3cd4ea102e87a4e9c13685767b39cbbfb862fd3f72f') pkgver() { cd "${pkgname}" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } +prepare() { + patch -d "${pkgname}" -Np1 -i "${srcdir}/0001-Fix-master-key-name-format.patch" +} + build() { cd "${pkgname}" python setup.py build |