Changes 3.6.16: * BUG 9881: Link dbwrap_tool and dbwrap_torture against libtevent. * BUG 9722: Properly handle Oplock breaks in compound requests. * BUG 9822: Fix crash bug during Win8 sync. * BUG 9927: errno gets overwritten in call to check_parent_exists(). * BUG 8997: Change libreplace GPL source to LGPL. * BUG 9900: is_printer_published GUID retrieval. * BUG 9941: Fix a bug of drvupgrade of smbcontrol. * BUG 9868: Don't know how to make LIBNDR_PREG_OBJ. * BUG 9688: Remove "experimental" label on "max protocol=SMB2" parameter. * BUG 9881: Check for system libtevent.diff -r1.234 -r1.235 pkgsrc/net/samba/Makefile
(adam)
@@ -1,26 +1,25 @@ | @@ -1,26 +1,25 @@ | |||
1 | # $NetBSD: Makefile,v 1.234 2013/06/12 12:35:35 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.235 2013/07/03 20:00:47 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= samba-${VERSION} | 3 | DISTNAME= samba-${VERSION} | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= net | 4 | CATEGORIES= net | |
6 | MASTER_SITES= ${SAMBA_MIRRORS:=stable/} | 5 | MASTER_SITES= ${SAMBA_MIRRORS:=stable/} | |
7 | 6 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://www.samba.org/ | 8 | HOMEPAGE= http://www.samba.org/ | |
10 | COMMENT= SMB/CIFS protocol server suite | 9 | COMMENT= SMB/CIFS protocol server suite | |
11 | LICENSE= gnu-gpl-v3 | 10 | LICENSE= gnu-gpl-v3 | |
12 | 11 | |||
13 | VERSION= 3.6.15 | 12 | VERSION= 3.6.16 | |
14 | CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]* | 13 | CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]* | |
15 | 14 | |||
16 | FILESDIR= ${PKGDIR}/../../net/samba/files | 15 | FILESDIR= ${PKGDIR}/../../net/samba/files | |
17 | DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR | 16 | DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR | |
18 | MESSAGE_SRC= ${PKGDIR}/../../net/samba/MESSAGE | 17 | MESSAGE_SRC= ${PKGDIR}/../../net/samba/MESSAGE | |
19 | WRKSRC= ${WRKDIR}/${DISTNAME}/source3 | 18 | WRKSRC= ${WRKDIR}/${DISTNAME}/source3 | |
20 | BUILD_DEFS+= VARBASE | 19 | BUILD_DEFS+= VARBASE | |
21 | 20 | |||
22 | .include "../../mk/bsd.prefs.mk" | 21 | .include "../../mk/bsd.prefs.mk" | |
23 | 22 | |||
24 | PKG_SYSCONFSUBDIR= samba | 23 | PKG_SYSCONFSUBDIR= samba | |
25 | SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} | 24 | SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} | |
26 | SAMBA_LIBDIR?= ${PREFIX}/lib | 25 | SAMBA_LIBDIR?= ${PREFIX}/lib |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.53 2013/04/30 20:08:10 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.54 2013/07/03 20:00:47 adam Exp $ | |
2 | bin/eventlogadm | 2 | bin/eventlogadm | |
3 | bin/findsmb | 3 | bin/findsmb | |
4 | bin/net | 4 | bin/net | |
5 | bin/nmblookup | 5 | bin/nmblookup | |
6 | bin/ntlm_auth | 6 | bin/ntlm_auth | |
7 | bin/pdbedit | 7 | bin/pdbedit | |
8 | bin/profiles | 8 | bin/profiles | |
9 | bin/rpcclient | 9 | bin/rpcclient | |
10 | bin/sharesec | 10 | bin/sharesec | |
11 | bin/smbcacls | 11 | bin/smbcacls | |
12 | bin/smbclient | 12 | bin/smbclient | |
13 | bin/smbcontrol | 13 | bin/smbcontrol | |
14 | bin/smbcquotas | 14 | bin/smbcquotas | |
@@ -16,39 +16,44 @@ bin/smbget | @@ -16,39 +16,44 @@ bin/smbget | |||
16 | bin/smbpasswd | 16 | bin/smbpasswd | |
17 | bin/smbspool | 17 | bin/smbspool | |
18 | bin/smbstatus | 18 | bin/smbstatus | |
19 | bin/smbta-util | 19 | bin/smbta-util | |
20 | bin/smbtar | 20 | bin/smbtar | |
21 | bin/smbtree | 21 | bin/smbtree | |
22 | bin/testparm | 22 | bin/testparm | |
23 | ${PLIST.winbind}bin/wbinfo | 23 | ${PLIST.winbind}bin/wbinfo | |
24 | include/libsmbclient.h | 24 | include/libsmbclient.h | |
25 | include/netapi.h | 25 | include/netapi.h | |
26 | include/smb_share_modes.h | 26 | include/smb_share_modes.h | |
27 | include/talloc.h | 27 | include/talloc.h | |
28 | ${PLIST.winbind}include/wbclient.h | 28 | ${PLIST.winbind}include/wbclient.h | |
29 | include/tevent.h | |||
30 | include/tevent_internal.h | |||
29 | lib/libnetapi.${LIBEXT} | 31 | lib/libnetapi.${LIBEXT} | |
30 | lib/libnetapi.${LIBEXT}.0 | 32 | lib/libnetapi.${LIBEXT}.0 | |
31 | lib/libsmbclient.${LIBEXT} | 33 | lib/libsmbclient.${LIBEXT} | |
32 | lib/libsmbclient.${LIBEXT}.0 | 34 | lib/libsmbclient.${LIBEXT}.0 | |
33 | lib/libsmbsharemodes.${LIBEXT} | 35 | lib/libsmbsharemodes.${LIBEXT} | |
34 | lib/libsmbsharemodes.${LIBEXT}.0 | 36 | lib/libsmbsharemodes.${LIBEXT}.0 | |
35 | lib/libtalloc.${LIBEXT} | 37 | lib/libtalloc.${LIBEXT} | |
36 | lib/libtalloc.${LIBEXT}.2 | 38 | lib/libtalloc.${LIBEXT}.2 | |
37 | lib/libtalloc.${LIBEXT}.2.0.5 | 39 | lib/libtalloc.${LIBEXT}.2.0.5 | |
38 | ${PLIST.winbind}lib/libwbclient.${LIBEXT} | 40 | ${PLIST.winbind}lib/libwbclient.${LIBEXT} | |
39 | ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0 | 41 | ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0 | |
40 | ${PLIST.winbind}${NSS_WINBIND} | 42 | ${PLIST.winbind}${NSS_WINBIND} | |
41 | ${PLIST.winbind}${NSS_WINS} | 43 | ${PLIST.winbind}${NSS_WINS} | |
44 | lib/libtevent.${LIBEXT} | |||
45 | lib/libtevent.${LIBEXT}.0 | |||
46 | lib/libtevent.${LIBEXT}.0.9.11 | |||
42 | lib/samba/auth/script.${LIBEXT} | 47 | lib/samba/auth/script.${LIBEXT} | |
43 | lib/samba/charset/CP437.${LIBEXT} | 48 | lib/samba/charset/CP437.${LIBEXT} | |
44 | lib/samba/charset/CP850.${LIBEXT} | 49 | lib/samba/charset/CP850.${LIBEXT} | |
45 | ${PLIST.macosx}lib/samba/charset/macosxfs.${LIBEXT} | 50 | ${PLIST.macosx}lib/samba/charset/macosxfs.${LIBEXT} | |
46 | lib/samba/de.msg | 51 | lib/samba/de.msg | |
47 | lib/samba/en.msg | 52 | lib/samba/en.msg | |
48 | lib/samba/fi.msg | 53 | lib/samba/fi.msg | |
49 | lib/samba/fr.msg | 54 | lib/samba/fr.msg | |
50 | lib/samba/idmap/autorid.${LIBEXT} | 55 | lib/samba/idmap/autorid.${LIBEXT} | |
51 | lib/samba/it.msg | 56 | lib/samba/it.msg | |
52 | lib/samba/ja.msg | 57 | lib/samba/ja.msg | |
53 | lib/samba/lowcase.dat | 58 | lib/samba/lowcase.dat | |
54 | lib/samba/nl.msg | 59 | lib/samba/nl.msg |
@@ -1,32 +1,32 @@ | @@ -1,32 +1,32 @@ | |||
1 | $NetBSD: distinfo,v 1.90 2013/05/09 07:36:14 adam Exp $ | 1 | $NetBSD: distinfo,v 1.91 2013/07/03 20:00:47 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (samba-3.6.15.tar.gz) = 59d528427eaf401cf387205f1fb9806dae282e55 | 3 | SHA1 (samba-3.6.16.tar.gz) = 6d17b6b1c5f2d9fe7f6a98786f7d61f65fa7859a | |
4 | RMD160 (samba-3.6.15.tar.gz) = aa8235076d5ed1142847f464c8f5cfcd5cf94d7e | 4 | RMD160 (samba-3.6.16.tar.gz) = e5e26a43d435a1bd2a8b91be762eef3380b3a794 | |
5 | Size (samba-3.6.15.tar.gz) = 34111211 bytes | 5 | Size (samba-3.6.16.tar.gz) = 34108738 bytes | |
6 | SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e | 6 | SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e | |
7 | SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 | 7 | SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 | |
8 | SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032 | 8 | SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032 | |
9 | SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 | 9 | SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 | |
10 | SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 | 10 | SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 | |
11 | SHA1 (patch-af) = c76fa31b80d2a0686fe2c42ab6e860d794b4f111 | 11 | SHA1 (patch-af) = c76fa31b80d2a0686fe2c42ab6e860d794b4f111 | |
12 | SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c | 12 | SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c | |
13 | SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2 | 13 | SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2 | |
14 | SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386 | 14 | SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386 | |
15 | SHA1 (patch-aj) = c83d02c15bcb359809c4558885a706cd5c1a686b | 15 | SHA1 (patch-aj) = c83d02c15bcb359809c4558885a706cd5c1a686b | |
16 | SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3 | 16 | SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3 | |
17 | SHA1 (patch-am) = c4054a6923c2a599f3c9e56a06dbde2b8fc59335 | 17 | SHA1 (patch-am) = c4054a6923c2a599f3c9e56a06dbde2b8fc59335 | |
18 | SHA1 (patch-an) = a9b31b791d979a1062006bbe55375aaab69210a1 | 18 | SHA1 (patch-an) = a9b31b791d979a1062006bbe55375aaab69210a1 | |
19 | SHA1 (patch-ao) = bc31d3003bdaad141652daff2e0b6b3cafcee8c1 | 19 | SHA1 (patch-ao) = bc31d3003bdaad141652daff2e0b6b3cafcee8c1 | |
20 | SHA1 (patch-aq) = c3d1a3045364bebaa6c90967837907bd1de0964b | 20 | SHA1 (patch-aq) = c3d1a3045364bebaa6c90967837907bd1de0964b | |
21 | SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a | 21 | SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a | |
22 | SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61 | 22 | SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61 | |
23 | SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b | 23 | SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b | |
24 | SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84 | 24 | SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84 | |
25 | SHA1 (patch-av) = fccde3e48f2b3de3b1adfaa488a67c57696d1a83 | 25 | SHA1 (patch-av) = fccde3e48f2b3de3b1adfaa488a67c57696d1a83 | |
26 | SHA1 (patch-aw) = 36cb31313cdbd1e4670f33924371df5ed3390420 | 26 | SHA1 (patch-aw) = 36cb31313cdbd1e4670f33924371df5ed3390420 | |
27 | SHA1 (patch-ba) = 87799a62831b45e6cde8c36fbafbc08596411f98 | 27 | SHA1 (patch-ba) = 87799a62831b45e6cde8c36fbafbc08596411f98 | |
28 | SHA1 (patch-bb) = 6283ffa8781d0c069f81e80704a018028e6b2b50 | 28 | SHA1 (patch-bb) = 6283ffa8781d0c069f81e80704a018028e6b2b50 | |
29 | SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea | 29 | SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea | |
30 | SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47 | 30 | SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47 | |
31 | SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa | 31 | SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa | |
32 | SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973 | 32 | SHA1 (patch-bf) = 19932332d11ce447293b061cd47506fef3d01853 |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-bf,v 1.5 2011/12/16 11:05:24 asau Exp $ | 1 | $NetBSD: patch-bf,v 1.6 2013/07/03 20:00:48 adam Exp $ | |
2 | 2 | |||
3 | --- Makefile.in.orig 2011-08-03 18:24:05.000000000 +0000 | 3 | --- Makefile.in.orig 2013-06-19 07:35:24.000000000 +0000 | |
4 | +++ Makefile.in | 4 | +++ Makefile.in | |
5 | @@ -2552,7 +2552,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(B | 5 | @@ -2864,7 +2864,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(B | |
6 | bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT) | 6 | bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBWBCLIENT) | |
7 | @echo "Linking shared library $@" | 7 | @echo "Linking shared library $@" | |
8 | @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \ | 8 | @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \ | |
9 | - $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@` | 9 | - $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@` | |
10 | + $(LIBS) $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@` | 10 | + $(LIBS) $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@` | |
11 | 11 | |||
12 | ########## | 12 | ########## | |
13 | # Plugins: | 13 | # Plugins: |