diff options
author | adam <adam@pkgsrc.org> | 2019-03-13 18:02:31 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2019-03-13 18:02:31 +0000 |
commit | bc0d4592e5e51690ae866c9302cefc57e39fdeec (patch) | |
tree | 40566b603e4e1724d0e8928f896823117050085e /net/samba4 | |
parent | 646ab0f546d6ec9ce2670cc978cd2ddfc323859b (diff) | |
download | pkgsrc-bc0d4592e5e51690ae866c9302cefc57e39fdeec.tar.gz |
py-twine: updated to 1.13.0
Twine is a utility for publishing Python packages on PyPI. It provides build
system independent uploads of source and binary distribution artifacts for both
new and existing projects.
Diffstat (limited to 'net/samba4')
-rw-r--r-- | net/samba4/Makefile | 7 | ||||
-rw-r--r-- | net/samba4/PLIST | 12 | ||||
-rw-r--r-- | net/samba4/distinfo | 12 | ||||
-rw-r--r-- | net/samba4/patches/patch-source3_auth_token_util.c | 53 |
4 files changed, 18 insertions, 66 deletions
diff --git a/net/samba4/Makefile b/net/samba4/Makefile index ec7f4c6d1b0..e66409a9502 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.60 2019/03/01 20:03:24 roy Exp $ +# $NetBSD: Makefile,v 1.61 2019/03/13 18:02:31 adam Exp $ -DISTNAME= samba-4.9.4 -PKGREVISION= 3 +DISTNAME= samba-4.9.5 CATEGORIES= net MASTER_SITES= http://download.samba.org/pub/samba/stable/ @@ -210,7 +209,7 @@ REPLACE_PYTHON+= buildtools/bin/waf REPLACE_PYTHON+= source4/setup/wscript_build REPLACE_PYTHON+= source4/scripting/bin/* -PYTHON_VERSIONS_ACCEPTED= 27 # as of 4.3.2 +PYTHON_VERSIONS_ACCEPTED= 27 PY_PATCHPLIST= yes .include "../../lang/python/application.mk" diff --git a/net/samba4/PLIST b/net/samba4/PLIST index cb4f400d850..05f4db476ef 100644 --- a/net/samba4/PLIST +++ b/net/samba4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2019/01/03 19:36:45 adam Exp $ +@comment $NetBSD: PLIST,v 1.20 2019/03/13 18:02:31 adam Exp $ bin/cifsdd bin/dbwrap_tool bin/findsmb @@ -226,6 +226,8 @@ lib/pkgconfig/samdb.pc lib/pkgconfig/smbclient.pc lib/pkgconfig/wbclient.pc ${PYSITELIB}/_ldb_text.py +${PYSITELIB}/_tdb_text.py +${PYSITELIB}/_tevent.so ${PYSITELIB}/ldb.so ${PYSITELIB}/samba/__init__.py ${PYSITELIB}/samba/_glue.so @@ -516,6 +518,8 @@ ${PYSITELIB}/samba/werror.so ${PYSITELIB}/samba/xattr.py ${PYSITELIB}/samba/xattr_native.so ${PYSITELIB}/samba/xattr_tdb.so +${PYSITELIB}/tdb.so +${PYSITELIB}/tevent.py lib/samba/auth/script.${SOEXT} lib/samba/bind9/dlz_bind9.${SOEXT} lib/samba/bind9/dlz_bind9_10.${SOEXT} @@ -659,7 +663,7 @@ lib/samba/private/libldb-cmdline-samba4.so lib/samba/private/libldb-key-value-samba4.so ${PLIST.64bit}lib/samba/private/libldb-mdb-int-samba4.so lib/samba/private/libldb.so.1 -lib/samba/private/libldb.so.1.4.3 +lib/samba/private/libldb.so.1.4.6 lib/samba/private/libldbsamba-samba4.so lib/samba/private/liblibcli-lsa3-samba4.so lib/samba/private/liblibcli-netlogon3-samba4.so @@ -682,7 +686,7 @@ lib/samba/private/libposix-eadb-samba4.so lib/samba/private/libprinting-migrate-samba4.so lib/samba/private/libprocess-model-samba4.so lib/samba/private/libpyldb-util.so.1 -lib/samba/private/libpyldb-util.so.1.4.3 +lib/samba/private/libpyldb-util.so.1.4.6 lib/samba/private/libregistry-samba4.so lib/samba/private/libreplace-samba4.so lib/samba/private/libroken-samba4.so.19 @@ -757,6 +761,7 @@ lib/samba/vfs/extd_audit.${SOEXT} lib/samba/vfs/fake_perms.${SOEXT} lib/samba/vfs/fruit.${SOEXT} lib/samba/vfs/full_audit.${SOEXT} +lib/samba/vfs/glusterfs_fuse.${SOEXT} lib/samba/vfs/linux_xfs_sgid.${SOEXT} lib/samba/vfs/media_harmony.${SOEXT} lib/samba/vfs/netatalk.${SOEXT} @@ -872,6 +877,7 @@ man/man8/vfs_fileid.8 man/man8/vfs_fruit.8 man/man8/vfs_full_audit.8 man/man8/vfs_glusterfs.8 +man/man8/vfs_glusterfs_fuse.8 man/man8/vfs_gpfs.8 man/man8/vfs_linux_xfs_sgid.8 man/man8/vfs_media_harmony.8 diff --git a/net/samba4/distinfo b/net/samba4/distinfo index 6ef870395ed..cba82cb7331 100644 --- a/net/samba4/distinfo +++ b/net/samba4/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.23 2019/03/01 20:03:24 roy Exp $ +$NetBSD: distinfo,v 1.24 2019/03/13 18:02:31 adam Exp $ -SHA1 (samba-4.9.4.tar.gz) = 7f8e15709e03e52d14bd9c85dd717366c106993f -RMD160 (samba-4.9.4.tar.gz) = d0a43b85b85906f860de12b0b0abb1fcc5643b7a -SHA512 (samba-4.9.4.tar.gz) = ecd9937caa12d409b9b4cf34982b1670346fa64c7ecd111b390e296771476e13eb7b868997bfe489f36b7bdc5c9fc3af42cd5ad276e9d85aaedfa8ac4cfc0617 -Size (samba-4.9.4.tar.gz) = 18053738 bytes +SHA1 (samba-4.9.5.tar.gz) = a79e3f75903daa46318cdf1f2c19efb615ec0920 +RMD160 (samba-4.9.5.tar.gz) = a29749fbfd2441ee5989fc26ed133308207b154c +SHA512 (samba-4.9.5.tar.gz) = 0ce49721dcd1b16148448bdf516c42f8fdeb3cb48e7fa8113fac508f8585251ead23d5b679f99eb7925e7a6fbedc2da75d339946b0cecb15698f3ea0cb542750 +Size (samba-4.9.5.tar.gz) = 18065757 bytes +SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 0f9ca14e3a77d7dfad06aa8c4d2de2f6cc3c0646 SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = 1469d23fd2094ce0ecf979df6ff8cfd69fae53a6 SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5 @@ -14,7 +15,6 @@ SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18 SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb -SHA1 (patch-source3_auth_token_util.c) = fbe67b501fa4325c9fb3e37c51bc424847f5e908 SHA1 (patch-source4_heimdal__build_roken.h) = ee535f8e7cc46a3487d95bc859438c476a88fe60 SHA1 (patch-source4_scripting_wsript_build) = bd4feddcaadf1c3d2d25eb7914e7b5843e4e9511 SHA1 (patch-source4_torture_local_nss__tests.c) = 8c878a8ed771ba996a7a325a1ad41bd13016c70c diff --git a/net/samba4/patches/patch-source3_auth_token_util.c b/net/samba4/patches/patch-source3_auth_token_util.c deleted file mode 100644 index d9a8d43c652..00000000000 --- a/net/samba4/patches/patch-source3_auth_token_util.c +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-source3_auth_token_util.c,v 1.1 2019/03/01 20:03:24 roy Exp $ - -Taken from https://bugzilla.samba.org/show_bug.cgi?id=13697 - -From 1e8931dfc24a2576a3b1fe9115c4ccbfefbbd298 Mon Sep 17 00:00:00 2001 -From: Stefan Metzmacher <metze@samba.org> -Date: Wed, 19 Dec 2018 09:38:33 +0100 -Subject: [PATCH] s3:auth: ignore create_builtin_guests() failing without a - valid idmap configuration - -This happens on standalone servers, where winbindd is automatically -started by init scripts if it's installed. But it's not really -used and may not have a valid idmap configuration ( -"idmap config * : range" has no default!) - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13697 - -Signed-off-by: Stefan Metzmacher <metze@samba.org> -Reviewed-by: Alexander Bokovoy <ab@samba.org> -(cherry picked from commit 865538fabaea33741f5fa542dbc3f2e08308c2c1) ---- - source3/auth/token_util.c | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c -index f5b0e6944335..ee38d6c9645b 100644 ---- source3/auth/token_util.c -+++ source3/auth/token_util.c -@@ -745,7 +745,23 @@ NTSTATUS finalize_local_nt_token(struct security_token *result, - status = create_builtin_guests(domain_sid); - unbecome_root(); - -- if (NT_STATUS_EQUAL(status, NT_STATUS_PROTOCOL_UNREACHABLE)) { -+ /* -+ * NT_STATUS_PROTOCOL_UNREACHABLE: -+ * => winbindd is not running. -+ * -+ * NT_STATUS_ACCESS_DENIED: -+ * => no idmap config at all -+ * and wbint_AllocateGid()/winbind_allocate_gid() -+ * failed. -+ * -+ * NT_STATUS_NO_SUCH_GROUP: -+ * => no idmap config at all and -+ * "tdbsam:map builtin = no" means -+ * wbint_Sids2UnixIDs() fails. -+ */ -+ if (NT_STATUS_EQUAL(status, NT_STATUS_PROTOCOL_UNREACHABLE) || -+ NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) || -+ NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_GROUP)) { - /* - * Add BUILTIN\Guests directly to token. - * But only if the token already indicates |