Mon Mar 3 08:15:10 2014 UTC ()
Replace log dir in the default sample config file correctly.

Bump PKGREVISION.


(obache)
diff -r1.244 -r1.245 pkgsrc/net/samba/Makefile
diff -r1.96 -r1.97 pkgsrc/net/samba/distinfo
diff -r1.28 -r1.29 pkgsrc/net/samba/patches/patch-ab
cvs diff -r1.244 -r1.245 pkgsrc/net/samba/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba/Makefile 2014/03/03 08:05:07 1.244
+++ pkgsrc/net/samba/Makefile 2014/03/03 08:15:10 1.245
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.244 2014/03/03 08:05:07 obache Exp $ 1# $NetBSD: Makefile,v 1.245 2014/03/03 08:15:10 obache Exp $
2 2
3DISTNAME= samba-${VERSION} 3DISTNAME= samba-${VERSION}
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${SAMBA_MIRRORS:=stable/} 6MASTER_SITES= ${SAMBA_MIRRORS:=stable/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.samba.org/ 9HOMEPAGE= http://www.samba.org/
10COMMENT= SMB/CIFS protocol server suite 10COMMENT= SMB/CIFS protocol server suite
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13VERSION= 3.6.22 13VERSION= 3.6.22
14CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]* 14CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
15 15
16FILESDIR= ${PKGDIR}/../../net/samba/files 16FILESDIR= ${PKGDIR}/../../net/samba/files
17DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR 17DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR
@@ -98,26 +98,32 @@ DOCDIR= share/doc/${PKGBASE} @@ -98,26 +98,32 @@ DOCDIR= share/doc/${PKGBASE}
98EGDIR= share/examples/${PKGBASE} 98EGDIR= share/examples/${PKGBASE}
99CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf 99CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
100MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR} 100MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
101OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR} 101OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
102OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 102OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
103RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} 103RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
104 104
105SUBST_CLASSES+= paths 105SUBST_CLASSES+= paths
106SUBST_MESSAGE.paths= Fixing paths. 106SUBST_MESSAGE.paths= Fixing paths.
107SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh 107SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
108SUBST_STAGE.paths= post-patch 108SUBST_STAGE.paths= post-patch
109SUBST_VARS.paths+= AWK CAT MKTEMP RM PWD_MKDB SH 109SUBST_VARS.paths+= AWK CAT MKTEMP RM PWD_MKDB SH
110 110
 111SUBST_CLASSES+= def-cfg
 112SUBST_MESSAGE.def-cfg= Fixing default config files
 113SUBST_FILES.def-cfg= ${WRKDIR}/${DISTNAME}/examples/smb.conf.default
 114SUBST_STAGE.def-cfg= post-configure
 115SUBST_VARS.def-cfg= SAMBA_LOGDIR
 116
111post-extract: 117post-extract:
112 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} 118 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
113 for n in tdbbackup.8 tdbdump.8 tdbtool.8; do \ 119 for n in tdbbackup.8 tdbdump.8 tdbtool.8; do \
114 ${RM} ${WRKSRC}/../docs/manpages/$$n; \ 120 ${RM} ${WRKSRC}/../docs/manpages/$$n; \
115 ${RM} ${WRKSRC}/../docs/htmldocs/manpages/$$n.html; \ 121 ${RM} ${WRKSRC}/../docs/htmldocs/manpages/$$n.html; \
116 done 122 done
117 123
118post-install: 124post-install:
119 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js 125 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js
120 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/include 126 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/include
121 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/images 127 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/images
122 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/js 128 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/js
123 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include 129 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include
cvs diff -r1.96 -r1.97 pkgsrc/net/samba/distinfo (expand / switch to unified diff)

--- pkgsrc/net/samba/distinfo 2013/12/09 10:44:22 1.96
+++ pkgsrc/net/samba/distinfo 2014/03/03 08:15:10 1.97
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.96 2013/12/09 10:44:22 taca Exp $ 1$NetBSD: distinfo,v 1.97 2014/03/03 08:15:10 obache Exp $
2 2
3SHA1 (samba-3.6.22.tar.gz) = e4ce4a273cc264b01d928f1bb59f0dc38dd65f9b 3SHA1 (samba-3.6.22.tar.gz) = e4ce4a273cc264b01d928f1bb59f0dc38dd65f9b
4RMD160 (samba-3.6.22.tar.gz) = 66063045f4c3232764528ce7571dd336591001e4 4RMD160 (samba-3.6.22.tar.gz) = 66063045f4c3232764528ce7571dd336591001e4
5Size (samba-3.6.22.tar.gz) = 34122131 bytes 5Size (samba-3.6.22.tar.gz) = 34122131 bytes
6SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e 6SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
7SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 7SHA1 (patch-ab) = eb680f72ab0118e57d1b322aba869ac798b27e17
8SHA1 (patch-ac) = 25edbd616199b7dcb41f87aa1374d0bdf19cafec 8SHA1 (patch-ac) = 25edbd616199b7dcb41f87aa1374d0bdf19cafec
9SHA1 (patch-ad) = 750b0c08d9975a257bec09088cb38414a1299070 9SHA1 (patch-ad) = 750b0c08d9975a257bec09088cb38414a1299070
10SHA1 (patch-ae) = de70580b293f4b964bc39b95c6a27511faaf088a 10SHA1 (patch-ae) = de70580b293f4b964bc39b95c6a27511faaf088a
11SHA1 (patch-af) = 433379f00214ef066043c6c6763cab41a39f3e18 11SHA1 (patch-af) = 433379f00214ef066043c6c6763cab41a39f3e18
12SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c 12SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c
13SHA1 (patch-ah) = d4dc5c01fae6b72fb8902b32c0c5b668a918ce49 13SHA1 (patch-ah) = d4dc5c01fae6b72fb8902b32c0c5b668a918ce49
14SHA1 (patch-ai) = 2161f55d4f1ffe13fa24387349bb9ac71dae5521 14SHA1 (patch-ai) = 2161f55d4f1ffe13fa24387349bb9ac71dae5521
15SHA1 (patch-aj) = bb9ad5a44922eb067d1d84cd9ea444b671297e5c 15SHA1 (patch-aj) = bb9ad5a44922eb067d1d84cd9ea444b671297e5c
16SHA1 (patch-ak) = 0c4e6c9f80e3ae5ecc71054ffacf39eba5c2d439 16SHA1 (patch-ak) = 0c4e6c9f80e3ae5ecc71054ffacf39eba5c2d439
17SHA1 (patch-am) = c4054a6923c2a599f3c9e56a06dbde2b8fc59335 17SHA1 (patch-am) = c4054a6923c2a599f3c9e56a06dbde2b8fc59335
18SHA1 (patch-an) = d486b7a05ebaaeb494f8c66d11ad2012053713f8 18SHA1 (patch-an) = d486b7a05ebaaeb494f8c66d11ad2012053713f8
19SHA1 (patch-ao) = 688f4180eb728363a1e616320464a6410f1ffced 19SHA1 (patch-ao) = 688f4180eb728363a1e616320464a6410f1ffced
20SHA1 (patch-aq) = 1eef65b3a798b3f80cc71f5d1f43b54c11782c0f 20SHA1 (patch-aq) = 1eef65b3a798b3f80cc71f5d1f43b54c11782c0f
cvs diff -r1.28 -r1.29 pkgsrc/net/samba/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/samba/patches/patch-ab 2011/12/16 11:05:24 1.28
+++ pkgsrc/net/samba/patches/patch-ab 2014/03/03 08:15:10 1.29
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-ab,v 1.28 2011/12/16 11:05:24 asau Exp $ 1$NetBSD: patch-ab,v 1.29 2014/03/03 08:15:10 obache Exp $
2 2
3--- ../examples/smb.conf.default.orig 2010-01-14 10:12:10.000000000 +0000 3--- ../examples/smb.conf.default.orig 2010-01-14 10:12:10.000000000 +0000
4+++ ../examples/smb.conf.default 4+++ ../examples/smb.conf.default
5@@ -26,7 +26,7 @@ 5@@ -26,7 +26,7 @@
6 workgroup = MYGROUP 6 workgroup = MYGROUP
7  7
8 # server string is the equivalent of the NT Description field 8 # server string is the equivalent of the NT Description field
9- server string = Samba Server 9- server string = Samba Server
10+ server string = Samba %v (%h) 10+ server string = Samba %v (%h)
11  11
12 # Security mode. Defines in which mode Samba will operate. Possible  12 # Security mode. Defines in which mode Samba will operate. Possible
13 # values are share, user, server, domain and ads. Most people will want  13 # values are share, user, server, domain and ads. Most people will want
14@@ -63,10 +63,10 @@ 14@@ -63,10 +63,10 @@
15  15
16 # this tells Samba to use a separate log file for each machine 16 # this tells Samba to use a separate log file for each machine
17 # that connects 17 # that connects
18- log file = /usr/local/samba/var/log.%m 18- log file = /usr/local/samba/var/log.%m
19+; log file = @VARBASE@/log/log.%m 19+; log file = @SAMBA_LOGDIR@/log.%m
20  20
21 # Put a capping on the size of the log files (in Kb). 21 # Put a capping on the size of the log files (in Kb).
22- max log size = 50 22- max log size = 50
23+; max log size = 50 23+; max log size = 50
24  24
25 # Use password server option only with security = server 25 # Use password server option only with security = server
26 # The argument list may include: 26 # The argument list may include:
27@@ -145,7 +145,7 @@ 27@@ -145,7 +145,7 @@
28  28
29 # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names 29 # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
30 # via DNS nslookups. The default is NO. 30 # via DNS nslookups. The default is NO.
31- dns proxy = no  31- dns proxy = no
32+; dns proxy = no  32+; dns proxy = no