samba: update to 4.7.7
This commit is contained in:
parent
4082f8c890
commit
b4728b9e08
|
@ -1,3 +1,3 @@
|
|||
163d01ae33948fc1e2e384b28f4c6cdc kerberos_keytab.c.patch
|
||||
b23b1a37fa9a0c6881b2ee9cbba169a1 fix-build-without-ads.patch
|
||||
1869ebd29f3e277b405e3e4cd9423ccf samba
|
||||
0253021a45c479cec1e135b004a0177a samba-4.7.6.tar.gz
|
||||
e22d9447b9f5eabfcc61b8f9050b99ba samba-4.7.7.tar.gz
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/b9evrZxZriAzIQJV7t37RPJB0N0Q9YXckS3pNZtkAdHJ5GWNT/zBPf8dZyeoiuhZWNnLgl3oqUXEJG0o8LSwgM=
|
||||
SHA256 (Pkgfile) = 6dd6e260dd6fc679dc1a6d6fa05bc18a0ac3c585e0dd2e478eec79d82f02c294
|
||||
RWSE3ohX2g5d/bHYO2+7XT5oJKunccFeg1Y1BMmJouvb/UdjBG2Qt0n7j9MXbH3mPSsCrH2X1blSRePTsH0pHPl4pEkFN3Mc3go=
|
||||
SHA256 (Pkgfile) = 2af8bfb8e0938768a91137339bfbd53a186265795661c843557110560f91e892
|
||||
SHA256 (.footprint) = 3021111df1970c6210fbef3eab58f15d222c1f2c3affaae8122b958dc144ad5e
|
||||
SHA256 (samba-4.7.6.tar.gz) = 1eede30fc8ef6504e24602fb72b00baa0a7b73b59f16d25cb0771dc8c7c57d6e
|
||||
SHA256 (kerberos_keytab.c.patch) = 39cb889128d1e6ee07af4c75da765957893e7d1f151376308b3005cb85266a75
|
||||
SHA256 (samba-4.7.7.tar.gz) = 29fad16fa70c1342c300d28d1b474b04c01a2a650149e94cace36fcbace80131
|
||||
SHA256 (fix-build-without-ads.patch) = ad64ac4119ef3caa06313730428b60f15ea2d413803a2ea9a1929b0c5dd9b2d3
|
||||
SHA256 (samba) = 75bccea892422b5aebe8d2f9ce9b9c42ddc3cbdeccfd16f3161c07c1eb3feff0
|
||||
|
|
|
@ -4,16 +4,17 @@
|
|||
# Depends on: e2fsprogs libarchive tdb tevent libcap libaio popt
|
||||
|
||||
name=samba
|
||||
version=4.7.6
|
||||
version=4.7.7
|
||||
release=1
|
||||
source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
|
||||
kerberos_keytab.c.patch samba)
|
||||
fix-build-without-ads.patch \
|
||||
samba)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
|
||||
# revert patch because it breaks build without ads
|
||||
patch -p1 -R -i $SRC/kerberos_keytab.c.patch
|
||||
# https://bugzilla.samba.org/show_bug.cgi?id=13273
|
||||
patch -p1 -i $SRC/fix-build-without-ads.patch
|
||||
|
||||
./configure --enable-fhs \
|
||||
--prefix=/usr \
|
||||
|
|
37
samba/fix-build-without-ads.patch
Normal file
37
samba/fix-build-without-ads.patch
Normal file
|
@ -0,0 +1,37 @@
|
|||
From 23e45c107fb1dbc28333916b8d5fe3fbe628d137 Mon Sep 17 00:00:00 2001
|
||||
From: Volker Lendecke <vl@samba.org>
|
||||
Date: Sat, 3 Feb 2018 07:07:24 +0100
|
||||
Subject: [PATCH] libads: Fix the build --without-ads
|
||||
|
||||
Signed-off-by: Volker Lendecke <vl@samba.org>
|
||||
Reviewed-by: David Disseldorp <ddiss@samba.org>
|
||||
|
||||
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
|
||||
Autobuild-Date(master): Tue Feb 6 02:47:44 CET 2018 on sn-devel-144
|
||||
|
||||
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13273
|
||||
|
||||
(cherry picked from commit 859698d29b547217356851094ed8188236e717b6)
|
||||
---
|
||||
source3/libads/kerberos_keytab.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
|
||||
index ffd100c..37ac7ba 100644
|
||||
--- a/source3/libads/kerberos_keytab.c
|
||||
+++ b/source3/libads/kerberos_keytab.c
|
||||
@@ -640,7 +640,11 @@ int ads_keytab_list(const char *keytab_name)
|
||||
}
|
||||
|
||||
if (keytab_name == NULL) {
|
||||
+#ifdef HAVE_ADS
|
||||
ret = ads_keytab_open(context, &keytab);
|
||||
+#else
|
||||
+ ret = ENOENT;
|
||||
+#endif
|
||||
} else {
|
||||
ret = smb_krb5_kt_open(context, keytab_name, False, &keytab);
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
X-Git-Url: https://git.samba.org/samba.git/?p=samba.git;a=blobdiff_plain;f=source3%2Flibads%2Fkerberos_keytab.c;h=ffd100c5636b273b0a76e059dc76f1d93133f290;hp=ff12ec04af689b3f27de563138045824a64ca0f4;hb=aba1e9199ddb18c229bf0def46a7caf333d2d618;hpb=73d3e642f8c71177bc8f42afb6724a7f93ef5472
|
||||
|
||||
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
|
||||
index ff12ec0..ffd100c 100644
|
||||
--- a/source3/libads/kerberos_keytab.c
|
||||
+++ b/source3/libads/kerberos_keytab.c
|
||||
@@ -639,7 +639,11 @@ int ads_keytab_list(const char *keytab_name)
|
||||
return ret;
|
||||
}
|
||||
|
||||
- ret = smb_krb5_kt_open(context, keytab_name, False, &keytab);
|
||||
+ if (keytab_name == NULL) {
|
||||
+ ret = ads_keytab_open(context, &keytab);
|
||||
+ } else {
|
||||
+ ret = smb_krb5_kt_open(context, keytab_name, False, &keytab);
|
||||
+ }
|
||||
if (ret) {
|
||||
DEBUG(1, ("smb_krb5_kt_open failed (%s)\n",
|
||||
error_message(ret)));
|
Loading…
Reference in New Issue
Block a user