aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2020-02-01 16:58:35 +0100
committerLeo <thinkabit.ukim@gmail.com>2020-02-01 18:59:57 +0100
commit344eb226cb92941951e8769f60301f2630727293 (patch)
tree0d65078f2829bb388cccd60def367196b1fd39cc
parent1544b5a9ae1f3f75a4a51a75bcd1046e837b839a (diff)
downloadaports-344eb226cb92941951e8769f60301f2630727293.tar.bz2
aports-344eb226cb92941951e8769f60301f2630727293.tar.xz
main/samba: upgrade to 4.11.6
-rw-r--r--main/samba/APKBUILD6
-rw-r--r--main/samba/python-3.8.patch41
2 files changed, 2 insertions, 45 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 660ee4126d..8bd6f599ae 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
-pkgver=4.11.5
+pkgver=4.11.6
pkgrel=0
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="https://www.samba.org/"
@@ -85,7 +85,6 @@ source="
musl_rm_unistd_incl.patch
add_missing___compar_fn_t.patch
pidl.patch
- python-3.8.patch
$pkgname.initd
$pkgname.confd
$pkgname.logrotate
@@ -582,7 +581,7 @@ libs() {
"$pkgdir"/usr
}
-sha512sums="b81edc4563e87c0d4fd7b3ed659def80980c961d0b9cf09be42f0a1334f823f8cf3cd5d57315451c0b7af2489a5fa1af8410cd65f6dc521aad0c5aa7014327c6 samba-4.11.5.tar.gz
+sha512sums="3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2 samba-4.11.6.tar.gz
c48f4533a9612c8534ddcf8531a50a31cc39da0b55a42fa5a4e2a36aa964a79a594215cd0edabd0bea837d493eca3f53341987d5aa4f10d370bf10123b957d1e bind-9.14.patch
0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b getpwent_r.patch
a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe88c6767d785d5c37e2e9f18a4f9a24f2ee1f5d9650320c556 musl_uintptr.patch
@@ -592,7 +591,6 @@ 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
deleted file mode 100644
index 372f08a630..0000000000
--- a/main/samba/python-3.8.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
-