commit 66ef344812fb7b1e4d357af48a3f8195fe46080e Author: Juergen Daubert <jue@jue.li> Date: Thu Jan 4 13:54:49 2018 +0100 samba: update to 4.7.4 diff --git a/samba/.footprint b/samba/.footprint index 28cb868b9..0070cdf15 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -285,8 +285,8 @@ lrwxrwxrwx root/root usr/lib/samba/libkrb5-samba4.so.26 -> libkrb5-samba4.so.26. -rwxr-xr-x root/root usr/lib/samba/libkrb5-samba4.so.26.0.0 -rwxr-xr-x root/root usr/lib/samba/libkrb5samba-samba4.so -rwxr-xr-x root/root usr/lib/samba/libldb-cmdline-samba4.so -lrwxrwxrwx root/root usr/lib/samba/libldb.so.1 -> libldb.so.1.2.2 --rwxr-xr-x root/root usr/lib/samba/libldb.so.1.2.2 +lrwxrwxrwx root/root usr/lib/samba/libldb.so.1 -> libldb.so.1.2.3 +-rwxr-xr-x root/root usr/lib/samba/libldb.so.1.2.3 -rwxr-xr-x root/root usr/lib/samba/libldbsamba-samba4.so -rwxr-xr-x root/root usr/lib/samba/liblibcli-lsa3-samba4.so -rwxr-xr-x root/root usr/lib/samba/liblibcli-netlogon3-samba4.so diff --git a/samba/.md5sum b/samba/.md5sum index 4827789b2..2c2282437 100644 --- a/samba/.md5sum +++ b/samba/.md5sum @@ -1,2 +1,3 @@ +163d01ae33948fc1e2e384b28f4c6cdc kerberos_keytab.c.patch 1869ebd29f3e277b405e3e4cd9423ccf samba -5da8a195094c44a60eb7eb7cf96d6a49 samba-4.7.3.tar.gz +427e7feb988603c51f01c97803305fed samba-4.7.4.tar.gz diff --git a/samba/.signature b/samba/.signature index a8c4d06c5..168d76cdc 100644 --- a/samba/.signature +++ b/samba/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YaXBL1DdgjuyXMS5JEijxKoqLnBiKe/hHYaSXKKchtN7aS/ihxn0ABrMXaGSuncUBr47X6k9aKJPrQpzB9q2gQ= -SHA256 (Pkgfile) = 66a57ee4026a8b5b94eb6177f602f3c826081e4a8e045814e8765a719af39201 -SHA256 (.footprint) = 84edbc95dd9f518680c3fcb409338459d9c8783d9660d280b9297423c9e07bab -SHA256 (samba-4.7.3.tar.gz) = 06e4152ca1cb803f005e92eb6baedb6cc874998b44ee37c2a7819e77a55bfd2c +RWSE3ohX2g5d/cEwkm/Q9JrS6jlOZGohQHeQhbdBj3WWCk7oQLG4q5FnGLv1eh4ooUYx48CxtzM/jfa8o7wCsCnR66EiVq9SBwk= +SHA256 (Pkgfile) = 70061a94673d0296e79a49b5c0ca854512976a32e7f41ab50d94b544df1c8a6d +SHA256 (.footprint) = 3021111df1970c6210fbef3eab58f15d222c1f2c3affaae8122b958dc144ad5e +SHA256 (samba-4.7.4.tar.gz) = fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247 +SHA256 (kerberos_keytab.c.patch) = 39cb889128d1e6ee07af4c75da765957893e7d1f151376308b3005cb85266a75 SHA256 (samba) = 75bccea892422b5aebe8d2f9ce9b9c42ddc3cbdeccfd16f3161c07c1eb3feff0 diff --git a/samba/Pkgfile b/samba/Pkgfile index dde45693d..c009553dc 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -4,14 +4,17 @@ # Depends on: e2fsprogs libarchive tdb tevent libcap libaio popt name=samba -version=4.7.3 +version=4.7.4 release=1 source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ - samba) + kerberos_keytab.c.patch samba) build () { cd $name-$version + # revert patch because it breaks build without ads + patch -p1 -R -i $SRC/kerberos_keytab.c.patch + ./configure --enable-fhs \ --prefix=/usr \ --libexecdir=/usr/lib \ diff --git a/samba/kerberos_keytab.c.patch b/samba/kerberos_keytab.c.patch new file mode 100644 index 000000000..8c15f6eaf --- /dev/null +++ b/samba/kerberos_keytab.c.patch @@ -0,0 +1,19 @@ +X-Git-Url: https://git.samba.org/samba.git/?p=samba.git;a=blobdiff_plain;f=source3%2Fli... + +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)));