diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-02 12:48:03 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-02 13:47:51 +0000 |
| commit | c266a4f31e4821af8a2f5665941c3709de016b56 (patch) | |
| tree | bb40b61f54b75a422ea21cae08abedbb55d26916 | |
| parent | cf63cf9a8af53d9d41f5664c4fd2c82aa6729a6d (diff) | |
| download | aports-c266a4f31e4821af8a2f5665941c3709de016b56.tar.bz2 aports-c266a4f31e4821af8a2f5665941c3709de016b56.tar.xz | |
main/samba: backport fix for python 3.8
fixes #11096
| -rw-r--r-- | main/samba/APKBUILD | 4 | ||||
| -rw-r--r-- | main/samba/python-3.8.patch | 41 |
2 files changed, 44 insertions, 1 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index 43462b0c5b..396a642203 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba pkgver=4.11.4 -pkgrel=0 +pkgrel=1 pkgdesc="Tools to access a server's filespace and printers via SMB" url="https://www.samba.org/" arch="all" @@ -85,6 +85,7 @@ source=" musl_rm_unistd_incl.patch add_missing___compar_fn_t.patch pidl.patch + python-3.8.patch $pkgname.initd $pkgname.confd $pkgname.logrotate @@ -587,6 +588,7 @@ c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049 5cda0a07089b99d99f33de74aae89a338954451167f72a9972cc437a7d06d92590c07386fd24e94c72ff34f1dd42494c5d7fcb48ca1823affa8168e83c239067 musl_rm_unistd_incl.patch bc2df70e327fea5dfbd923600225f1448815d842c37d6937dd74eab7f7699d7f52cd7a8e28a61233974649cf86661a0107dce5019d33b71205e4b41bac73f4e2 add_missing___compar_fn_t.patch 903d9327369cb1b7207955d317b2bba0cb5c30287d4040d3a235cae581479bc49d277cb18d1686cddd60e4430313712e25e0903e1e311265dea86993a2be6c6e pidl.patch +a8e31a4f568403fa6da3d3db5f71d01a5f1069bf8dbc50625932803a624724eaf85eae36a0d82efef433c5689db9f6f04671a09560746fdaee9d82c01c15b550 python-3.8.patch 96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44 samba.initd e2b49cb394e758447ca97de155a61b4276499983a0a5c00b44ae621c5559b759a766f8d1c8d3ee98ad5560f4064a847a7a20cfa2e14f85c061bec8b80fd649eb samba.confd 3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d samba.logrotate" diff --git a/main/samba/python-3.8.patch b/main/samba/python-3.8.patch new file mode 100644 index 0000000000..372f08a630 --- /dev/null +++ b/main/samba/python-3.8.patch @@ -0,0 +1,41 @@ +From c3a350c5b2e37af0074effdfc2e0bef8fa70fc8e Mon Sep 17 00:00:00 2001 +From: Torsten Fohrer <torsten.fohrer@sbe.de> +Date: Sun, 15 Dec 2019 16:58:40 +0100 +Subject: [PATCH] Avoiding bad call flags with python 3.8, using METH_NOARGS + instead of zero. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(C) SBE network solutions GmbH + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=14209 + +Signed-off-by: Torsten Fohrer <torsten.fohrer@sbe.de> +Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> +Reviewed-by: Ralph Boehme <slow@samba.org> + +Autobuild-User(master): Ralph Böhme <slow@samba.org> +Autobuild-Date(master): Wed Dec 18 14:33:58 UTC 2019 on sn-devel-184 + +(cherry picked from commit f0eb1e623f76d3dbd0c22f96cabebd1041c147df) +--- + source4/auth/gensec/pygensec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c +index b2c1e9c279a..c866180edb3 100644 +--- a/source4/auth/gensec/pygensec.c ++++ b/source4/auth/gensec/pygensec.c +@@ -678,7 +678,7 @@ static PyMethodDef py_gensec_security_methods[] = { + "S.have_feature()\n Return True if GENSEC negotiated a particular feature." }, + { "set_max_update_size", (PyCFunction)py_gensec_set_max_update_size, METH_VARARGS, + "S.set_max_update_size(max_size) \n Some mechs can fragment update packets, needs to be use before the mech is started." }, +- { "max_update_size", (PyCFunction)py_gensec_max_update_size, 0, ++ { "max_update_size", (PyCFunction)py_gensec_max_update_size, METH_NOARGS, + "S.max_update_size() \n Return the current max_update_size." }, + { "update", (PyCFunction)py_gensec_update, METH_VARARGS, + "S.update(blob_in) -> (finished, blob_out)\nPerform one step in a GENSEC dance. Repeat with new packets until finished is true or exception." }, +-- +2.20.1 + |