aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorKevin Bowling <kbowling@FreeBSD.org>2020-01-19 20:45:42 +0000
committerKevin Bowling <kbowling@FreeBSD.org>2020-01-19 20:45:42 +0000
commitdf01c9783559aa24a34c94e3afb92f5730802d6a (patch)
tree276a19da3a957f040ac1c1b6b43c14afc608f587 /net
parent21d0ccb34bd0e38b849d2cd62e7a0021d6432bf8 (diff)
downloadports-df01c9783559aa24a34c94e3afb92f5730802d6a.tar.gz
ports-df01c9783559aa24a34c94e3afb92f5730802d6a.zip
net/nsscache: Update to 0.39
The big change here is a move to Python 3 upstream and in the port. Approved by: krion (mentor) Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D23269
Notes
Notes: svn path=/head/; revision=523592
Diffstat (limited to 'net')
-rw-r--r--net/nsscache/Makefile15
-rw-r--r--net/nsscache/distinfo6
-rw-r--r--net/nsscache/files/patch-nsscache.conf8
-rw-r--r--net/nsscache/files/patch-setup.py17
4 files changed, 26 insertions, 20 deletions
diff --git a/net/nsscache/Makefile b/net/nsscache/Makefile
index f7081b8ed197..87d30dac0168 100644
--- a/net/nsscache/Makefile
+++ b/net/nsscache/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nsscache
-PORTVERSION= 0.37
+PORTVERSION= 0.39
DISTVERSIONPREFIX= version/
CATEGORIES= net python
@@ -12,12 +12,16 @@ COMMENT= Python utility to create a local cache of directory services
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${PY_FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mox>0:devel/py-mox@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mox3>0:devel/py-mox3@${PY_FLAVOR}
-USES= python:2.7
+USES= python:3.4+
USE_PYTHON= autoplist distutils
USE_GITHUB= yes
GH_ACCOUNT= google
@@ -39,6 +43,7 @@ post-install:
@${MKDIR} ${STAGEDIR}/var/db/nsscache
do-test:
- ${PYTHON_CMD} ${WRKSRC}/runtests.py
+ cd ${WRKSRC} && ${PYTHON_CMD} setup.py test
+
.include <bsd.port.mk>
diff --git a/net/nsscache/distinfo b/net/nsscache/distinfo
index 88ae75ce3810..8d707888b2ca 100644
--- a/net/nsscache/distinfo
+++ b/net/nsscache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545713850
-SHA256 (google-nsscache-version-0.37_GH0.tar.gz) = fab735cabb6ea6e46ce2c52e2c9ea9c2938057fa9e3992b3509f31cf5948fff4
-SIZE (google-nsscache-version-0.37_GH0.tar.gz) = 122932
+TIMESTAMP = 1579460924
+SHA256 (google-nsscache-version-0.39_GH0.tar.gz) = 3eb0b2a4c163d2c2fd3748e23fc6296f253d9be0a74a1fe9c0fe3191f4c2638d
+SIZE (google-nsscache-version-0.39_GH0.tar.gz) = 127896
diff --git a/net/nsscache/files/patch-nsscache.conf b/net/nsscache/files/patch-nsscache.conf
index ef8110487cd8..6aa7d1209955 100644
--- a/net/nsscache/files/patch-nsscache.conf
+++ b/net/nsscache/files/patch-nsscache.conf
@@ -1,5 +1,5 @@
---- nsscache.conf.orig 2016-01-16 19:03:07.000000000 -0700
-+++ nsscache.conf 2016-02-28 23:28:01.441959000 -0700
+--- nsscache.conf.orig 2019-11-11 16:27:27 UTC
++++ nsscache.conf
@@ -2,7 +2,7 @@
#
# nsscache loads a config file from the environment variable NSSCACHE_CONFIG
@@ -9,7 +9,7 @@
#
# Commented values are overrideable defaults, uncommented values
# require you to set them.
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ cache = files
maps = passwd, group, shadow, netgroup, automount
# Directory to store our update/modify timestamps
@@ -18,7 +18,7 @@
# Lockfile to use for update/repair operations
#lockfile = /var/run/nsscache
-@@ -113,7 +113,7 @@
+@@ -139,7 +139,7 @@ ldap_filter = (objectclass=posixAccount)
# Directory to store nssdb databases. Current libnss_db code requires
# the path below
diff --git a/net/nsscache/files/patch-setup.py b/net/nsscache/files/patch-setup.py
index 7b8bfda09cd3..48d6c6b8b26f 100644
--- a/net/nsscache/files/patch-setup.py
+++ b/net/nsscache/files/patch-setup.py
@@ -1,9 +1,10 @@
---- setup.py.orig 2014-10-21 10:32:31 UTC
+--- setup.py.orig 2019-11-11 16:27:27 UTC
+++ setup.py
-@@ -48,5 +48,4 @@ as LDAP.''',
- 'nss_cache.util',
- 'nss_cache.update',
- 'nss_cache.sources'],
-- scripts=['nsscache'],
-- data_files=[('/etc', ['nsscache.conf'])])
-+ scripts=['nsscache'])
+@@ -46,7 +46,6 @@ as LDAP.""",
+ 'nss_cache.update', 'nss_cache.sources'
+ ],
+ scripts=['nsscache'],
+- data_files=[('/etc', ['nsscache.conf'])],
+ python_requires='~=3.4',
+ setup_requires=['pytest-runner'],
+ tests_require=['pytest', 'mox3', 'pytest-cov', 'python-coveralls'],