update to pass-import-3.3

This commit is contained in:
sthen 2022-09-12 08:56:36 +00:00
parent a788ad0659
commit 6b7a3700f2
4 changed files with 44 additions and 17 deletions

View File

@ -1,7 +1,7 @@
COMMENT= importer for pass (passwordstore)
V= 3.2
DISTNAME= pass-import-$V
MODPY_EGG_VERSION= 3.3
DISTNAME= pass-import-${MODPY_EGG_VERSION}
CATEGORIES= security
@ -10,25 +10,24 @@ HOMEPAGE= https://github.com/roddhjav/pass-import
# GPLv3+
PERMIT_PACKAGE= Yes
MASTER_SITES= https://github.com/roddhjav/pass-import/releases/download/v$V/
MODULES= lang/python
MODPY_SETUPTOOLS= Yes
MODPY_SETUPTOOLS= Yes
MODPY_EGG_VERSION= $V
REVISION= 0
MODPY_PYTEST= Yes
# no tests in pypi distfile; no formatted manpages in github releases distfile
# dropping tests is better than a BDEP on pandoc + pypandoc...
MODPY_PI= Yes
NO_TEST= Yes
RUN_DEPENDS= security/password-store \
devel/py-magic${MODPY_FLAVOR} \
security/py-cryptography${MODPY_FLAVOR} \
security/py-pykeepass${MODPY_FLAVOR} \
security/py-zxcvbn${MODPY_FLAVOR} \
textproc/py-defusedxml${MODPY_FLAVOR}
# some import modules require additional dependencies;
# - gnome-keyring requires installing py3-secretstorage
# - aegis requires a version of py-cryptography with scrypt (which
# currently requires openssl 1.1.x)
# - aegis uses py-cryptography but requires it to be built against
# openssl with scrypt
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (pass-import-3.2.tar.gz) = 2UPfFNz+wGOmyIHDFc5lgT224QWxSpsBVqc9z35Sm3Y=
SIZE (pass-import-3.2.tar.gz) = 238460
SHA256 (pass-import-3.3.tar.gz) = 9Mx8W7ST0+iTb6anzEt0TWhRoM+1HcILLR0KbB6fPpw=
SIZE (pass-import-3.3.tar.gz) = 89623

View File

@ -1,7 +1,27 @@
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -17,7 +17,7 @@ with open('README.md') as file:
@@ -12,14 +12,17 @@ except ImportError:
PANDOC = False
from pathlib import Path
-from share import makedoc
+try:
+ from share import makedoc
+except ImportError:
+ PANDOC = False
from setuptools import setup
-makedoc()
if not PANDOC:
print("Warning: 'pypandoc' is required to generate the manual pages.")
else:
+ makedoc()
try:
for name in ['pass-import', 'pimport']:
pypandoc.convert_file(f"share/man/man1/{name}.md", 'man',
@@ -31,7 +34,7 @@ else:
share = Path(sys.prefix, 'share')
base = '/usr'
@ -10,9 +30,9 @@ Index: setup.py
base = '/usr/local'
lib = Path(base, 'lib', 'password-store', 'extensions')
@@ -53,7 +53,7 @@ setup(
]
},
@@ -47,7 +50,7 @@ if '--user' in sys.argv:
setup(
data_files=[
- (str(share / 'man' / 'man1'), [
+ (str(Path(sys.prefix) / 'man' / 'man1'), [

View File

@ -16,6 +16,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYC
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}__about__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}audit.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}auto.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}clean.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
@ -23,6 +24,7 @@ lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}detecter.${
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/audit.py
lib/python${MODPY_VERSION}/site-packages/pass_import/auto.py
lib/python${MODPY_VERSION}/site-packages/pass_import/clean.py
lib/python${MODPY_VERSION}/site-packages/pass_import/core.py
@ -84,6 +86,7 @@ lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}ke
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}lastpass.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}myki.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}networkmanager.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}nordpass.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}onepassword.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}padlock.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}passman.${MODPY_PYC_MAGIC_TAG}pyc
@ -93,7 +96,9 @@ lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}pa
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}pwsafe.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}revelation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}roboform.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}safeincloud.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}saferpass.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}sphinx.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}upm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/${MODPY_PYCACHE}zoho.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/aegis.py
@ -123,6 +128,7 @@ lib/python${MODPY_VERSION}/site-packages/pass_import/managers/keeper.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/lastpass.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/myki.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/networkmanager.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/nordpass.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/onepassword.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/padlock.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/passman.py
@ -132,7 +138,9 @@ lib/python${MODPY_VERSION}/site-packages/pass_import/managers/passwordstore.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/pwsafe.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/revelation.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/roboform.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/safeincloud.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/saferpass.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/sphinx.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/upm.py
lib/python${MODPY_VERSION}/site-packages/pass_import/managers/zoho.py
lib/python${MODPY_VERSION}/site-packages/pass_import/tools.py