summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/volume_key/APKBUILD9
-rw-r--r--user/volume_key/worst-python-hack-ever.patch20
2 files changed, 3 insertions, 26 deletions
diff --git a/user/volume_key/APKBUILD b/user/volume_key/APKBUILD
index 6b9a7c0c7..85ed4d482 100644
--- a/user/volume_key/APKBUILD
+++ b/user/volume_key/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=volume_key
-pkgver=0.3.10
+pkgver=0.3.11
pkgrel=0
pkgdesc="Storage volume encryption key management library"
url="https://pagure.io/volume_key"
@@ -13,9 +13,7 @@ makedepends="cryptsetup-dev glib-dev gpgme-dev nss-dev python3-dev
util-linux-dev"
checkdepends="nss-tools"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-$pkgname:py"
-source="https://releases.pagure.org/volume_key/volume_key-$pkgver.tar.xz
- worst-python-hack-ever.patch
- "
+source="https://releases.pagure.org/volume_key/volume_key-$pkgver.tar.xz"
build() {
cd "$builddir"
@@ -45,5 +43,4 @@ py() {
mv "$pkgdir"/usr/lib/python3.6 "$subpkgdir"/usr/lib/
}
-sha512sums="b050d333e021bc3721f5e72c1d2498adea3265afe7f702e1b1e859546755745ac70dcffc194739a4833d4b0b77168506f7fe90fde382d8aab4df2af7b635932b volume_key-0.3.10.tar.xz
-63f197e7d72e08110ad2fc13e2aa0cf50b5cbac91b10244778552adec8a2ee34255a795f90fbb50bb4ebb3404ce9bc5caf877c536f11396291ba6f71a0c07526 worst-python-hack-ever.patch"
+sha512sums="b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97 volume_key-0.3.11.tar.xz"
diff --git a/user/volume_key/worst-python-hack-ever.patch b/user/volume_key/worst-python-hack-ever.patch
deleted file mode 100644
index 1ecb334f4..000000000
--- a/user/volume_key/worst-python-hack-ever.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- volume_key-0.3.10/Makefile.in.old 2018-05-21 08:29:56.000000000 +0000
-+++ volume_key-0.3.10/Makefile.in 2018-07-14 09:27:05.430000000 +0000
-@@ -683,7 +683,7 @@
- $(libcryptsetup_CFLAGS) $(nss_CFLAGS)
-
- LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"'
--PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION)
-+PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION)m
- SUBDIRS = po
- dist_man_MANS = doc/volume_key.8
- lib_LTLIBRARIES = lib/libvolume_key.la
-@@ -713,7 +713,7 @@
- python__volume_key_la_SOURCES = python/volume_key_wrap.c
- python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS)
- python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS)
--python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \
-+python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION)m \
- $(glib_LIBS) $(nss_LIBS)
-
- src_volume_key_SOURCES = src/volume_key.c