Thu Oct 9 17:48:01 2008 UTC ()
Don't leak build user in install scripts. Bump revision.


(joerg)
diff -r1.184 -r1.185 pkgsrc/net/samba/Makefile
cvs diff -r1.184 -r1.185 pkgsrc/net/samba/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba/Makefile 2008/08/30 12:18:38 1.184
+++ pkgsrc/net/samba/Makefile 2008/10/09 17:48:01 1.185
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.184 2008/08/30 12:18:38 tron Exp $ 1# $NetBSD: Makefile,v 1.185 2008/10/09 17:48:01 joerg Exp $
2 2
3.include "Makefile.mirrors" 3.include "Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
 6PKGREVISION= 1
6CATEGORIES= net 7CATEGORIES= net
7MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} 8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
8 9
9.include "Makefile.patches" 10.include "Makefile.patches"
10 11
11MAINTAINER= jlam@pkgsrc.org 12MAINTAINER= jlam@pkgsrc.org
12HOMEPAGE= http://www.samba.org/ 13HOMEPAGE= http://www.samba.org/
13COMMENT= SMB/CIFS protocol server suite 14COMMENT= SMB/CIFS protocol server suite
14 15
15VERSION= 3.0.32 16VERSION= 3.0.32
16CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \ 17CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \
17 winbind-[0-9]* 18 winbind-[0-9]*
18MAKE_JOBS_SAFE= NO 19MAKE_JOBS_SAFE= NO
@@ -92,27 +93,27 @@ PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \ @@ -92,27 +93,27 @@ PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
92MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} 93MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q}
93.endif 94.endif
94FILES_SUBST+= MKTEMP=${MKTEMP:Q} 95FILES_SUBST+= MKTEMP=${MKTEMP:Q}
95FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} 96FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
96 97
97DOCDIR= share/doc/${PKGBASE} 98DOCDIR= share/doc/${PKGBASE}
98EGDIR= share/examples/${PKGBASE} 99EGDIR= share/examples/${PKGBASE}
99 100
100INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 101INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
101 102
102CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf 103CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
103MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR} 104MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
104OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR} 105OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
105OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700 106OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
106RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} 107RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
107 108
108SUBST_CLASSES+= paths 109SUBST_CLASSES+= paths
109SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh 110SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
110SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' -e 's,@CAT@,${CAT},g' 111SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' -e 's,@CAT@,${CAT},g'
111SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' -e 's,@RM@,${RM},g' 112SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' -e 's,@RM@,${RM},g'
112SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' -e 's,@SH@,${SH},g' 113SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' -e 's,@SH@,${SH},g'
113SUBST_STAGE.paths= post-patch 114SUBST_STAGE.paths= post-patch
114 115
115# Get the shared library major and minors for the installed shared 116# Get the shared library major and minors for the installed shared
116# libraries. We'll need these to create the versioned symlinks for 117# libraries. We'll need these to create the versioned symlinks for
117# the shared libraries because samba Makefile doesn't do it on its 118# the shared libraries because samba Makefile doesn't do it on its
118# own. 119# own.