summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Paul Mulders <justinkb@gmail.com> 2018-02-08 00:55:00 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2018-02-12 17:32:17 +0100
commitde4ebda091cc853fc2b1865a882946dd84639f6f (patch)
tree21b1698bbbf11b59e0fb0d8d43d369c00025f0ec
parent2aefd6702ce71cdaa9db4288be0f557277ee62b6 (diff)
downloadnet-de4ebda091cc853fc2b1865a882946dd84639f6f.tar.gz
net-de4ebda091cc853fc2b1865a882946dd84639f6f.tar.xz
samba: 4.7.4 -> 4.7.5
Change-Id: Iec417eae3d4a5152dd2f4db54a8140fccece8921 Reviewed-on: https://galileo.mailstation.de/gerrit/11450 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/net-fs/samba/files/fix-building-4.7.4-without-ADS.patch5
-rw-r--r--packages/net-fs/samba/samba-4.7.5.exheres-0 (renamed from packages/net-fs/samba/samba-4.7.4.exheres-0)0
2 files changed, 1 insertions, 4 deletions
diff --git a/packages/net-fs/samba/files/fix-building-4.7.4-without-ADS.patch b/packages/net-fs/samba/files/fix-building-4.7.4-without-ADS.patch
index d9dbbaf..10b8752 100644
--- a/packages/net-fs/samba/files/fix-building-4.7.4-without-ADS.patch
+++ b/packages/net-fs/samba/files/fix-building-4.7.4-without-ADS.patch
@@ -1,8 +1,5 @@
Source: Paul Mulders (justinkb@gmail.com), me
-Upstream: not interested, since (paraphrasing) the use case is rare and
- the code is slated to be removed eventually anyway. Someone suggested
- a patch with inferior logic here:
- https://lists.samba.org/archive/samba-technical/2017-December/124629.html
+Upstream: fixed in master, https://github.com/samba-team/samba/commit/859698d29b547217356851094ed8188236e717b6
Reason: fix compilation with ADS disabled, broken by https://github.com/samba-team/samba/commit/3048ae318fc8b4d1b7663826972306372430a463#diff-ac13fc0161d7d7033f21b441b9aae9d7
--- a/source3/libads/kerberos_keytab.c 2018-01-25 00:49:54.597611725 +0100
diff --git a/packages/net-fs/samba/samba-4.7.4.exheres-0 b/packages/net-fs/samba/samba-4.7.5.exheres-0
index 0b68d90..0b68d90 100644
--- a/packages/net-fs/samba/samba-4.7.4.exheres-0
+++ b/packages/net-fs/samba/samba-4.7.5.exheres-0