diff options
| author | Timur I. Bakeyev <timur@FreeBSD.org> | 2016-07-12 21:36:22 +0000 |
|---|---|---|
| committer | Timur I. Bakeyev <timur@FreeBSD.org> | 2016-07-12 21:36:22 +0000 |
| commit | 362844ef4d4d79efe49c449db5f573c6468668e4 (patch) | |
| tree | 5627d97068548a1333cf342966eefcd3992eb9d1 /net/samba44 | |
| parent | 71d6753c35fed1b2f93ce562a520bea387eb23dc (diff) | |
Notes
Diffstat (limited to 'net/samba44')
| -rw-r--r-- | net/samba44/Makefile | 8 | ||||
| -rw-r--r-- | net/samba44/distinfo | 5 | ||||
| -rw-r--r-- | net/samba44/files/patch-source3_client_smbspool_krb5_wrapper.c | 11 | ||||
| -rw-r--r-- | net/samba44/pkg-plist | 9 |
4 files changed, 14 insertions, 19 deletions
diff --git a/net/samba44/Makefile b/net/samba44/Makefile index 9bcb6dc5ee4b..5a52db22958d 100644 --- a/net/samba44/Makefile +++ b/net/samba44/Makefile @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}44 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -19,7 +19,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* samba43-4 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.4.3 +SAMBA4_VERSION= 4.4.5 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -90,6 +90,10 @@ BUILD_DEPENDS+= p5-Parse-Pidl>=4.3.1:devel/p5-Parse-Pidl BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " +# +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0.1.11:devel/py-iso8601 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0.1.11:devel/py-iso8601 +PLIST_SUB+= PY_ISO8601="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.6:devel/talloc RUN_DEPENDS+= talloc>=2.1.6:devel/talloc diff --git a/net/samba44/distinfo b/net/samba44/distinfo index 41e89d2658d3..69d31dd105ca 100644 --- a/net/samba44/distinfo +++ b/net/samba44/distinfo @@ -1,2 +1,3 @@ -SHA256 (samba-4.4.3.tar.gz) = 031e6ada6d15deae6850845eed41497af32207fb679d6c6c74f19acc99d437ba -SIZE (samba-4.4.3.tar.gz) = 20705861 +TIMESTAMP = 1468271289 +SHA256 (samba-4.4.5.tar.gz) = b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd +SIZE (samba-4.4.5.tar.gz) = 20715838 diff --git a/net/samba44/files/patch-source3_client_smbspool_krb5_wrapper.c b/net/samba44/files/patch-source3_client_smbspool_krb5_wrapper.c deleted file mode 100644 index 4cc0fe1622a2..000000000000 --- a/net/samba44/files/patch-source3_client_smbspool_krb5_wrapper.c +++ /dev/null @@ -1,11 +0,0 @@ ---- source3/client/smbspool_krb5_wrapper.c.orig 2016-04-21 00:26:35.874203000 +0000 -+++ source3/client/smbspool_krb5_wrapper.c 2016-04-21 00:47:23.148722000 +0000 -@@ -195,7 +195,7 @@ - * Make sure we do not have LD_PRELOAD or other security relevant - * environment variables set. - */ -- clearenv(); -+ environ = NULL; - - CUPS_SMB_DEBUG("Setting KRB5CCNAME to '%s'", gen_cc); - setenv("KRB5CCNAME", gen_cc, 1); diff --git a/net/samba44/pkg-plist b/net/samba44/pkg-plist index 7b57f3a6377a..349a129d0449 100644 --- a/net/samba44/pkg-plist +++ b/net/samba44/pkg-plist @@ -608,6 +608,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py @@ -625,10 +626,10 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py %%PYTHON_SITELIBDIR%%/samba/tests/xattr.py -%%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/__init__.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/iso8601.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/test_iso8601.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/__init__.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/iso8601.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/test_iso8601.py %%PYTHON_SITELIBDIR%%/samba/upgrade.py %%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py %%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py |