diff options
| author | kim <kim@pkgsrc.org> | 1998-08-09 16:14:08 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 1998-08-09 16:14:08 +0000 |
| commit | b93a4daed27240d6cab9bd821e4751bbbf0b0aea (patch) | |
| tree | db11d238bab933b6909ed1be013f90f66e57d100 | |
| parent | 1953a75942f9d25c9336d4dad27cf289705d30f5 (diff) | |
| download | pkgsrc-b93a4daed27240d6cab9bd821e4751bbbf0b0aea.tar.gz | |
The password file for samba cannot generally be share between machines,
so place it in /etc/samba/private. Other machine dependent files (e.g.
the printer defs) go now into /etc/samba by default.
| -rw-r--r-- | net/samba/Makefile | 7 | ||||
| -rw-r--r-- | net/samba/patches/patch-aa | 22 |
2 files changed, 17 insertions, 12 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 3d591033bfd..5e98896a95d 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/06/22 12:58:34 agc Exp $ +# $NetBSD: Makefile,v 1.12 1998/08/09 16:14:08 kim Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp # @@ -14,7 +14,10 @@ STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/samba.sh.sample SAMPLE_CONFIG= ${PREFIX}/etc/smb.conf.sample SAMBA_SPOOL= /var/spool/samba SAMBA_LOGDIR= /var/log -SAMBA_PRIVATE= ${PREFIX}/private +SAMBA_ETCDIR?= /etc/samba +SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private + +MAKE_ENV+= ETCDIR=${SAMBA_ETCDIR} PRIVDIR=${SAMBA_PRIVATE} .include "../../mk/bsd.prefs.mk" diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa index 573e23a355a..48a7daaeaed 100644 --- a/net/samba/patches/patch-aa +++ b/net/samba/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.4 1998/08/07 11:10:53 agc Exp $ +$NetBSD: patch-aa,v 1.5 1998/08/09 16:14:08 kim Exp $ ---- Makefile.orig Mon Jun 1 08:29:04 1998 -+++ Makefile Wed Jun 17 14:57:00 1998 +--- Makefile.orig Mon Jun 1 02:29:04 1998 ++++ Makefile Sun Aug 2 14:52:27 1998 @@ -5,11 +5,11 @@ ########################################################################### @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 11:10:53 agc Exp $ # The directories to put things in. If you use multiple # architectures or share the samba binaries across NFS then -@@ -18,9 +18,10 @@ +@@ -18,9 +18,11 @@ # normally only applies to nmbd and smbd # SBINDIR implies a secure binary directory BINDIR = $(BASEDIR)/bin @@ -24,12 +24,13 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 11:10:53 agc Exp $ +SBINDIR = $(BASEDIR)/sbin LIBDIR = $(BASEDIR)/lib -VARDIR = $(BASEDIR)/var -+ETCDIR = $(BASEDIR)/etc ++ETCDIR?= $(BASEDIR)/etc +LOGDIR = /var/log ++PRIVDIR?= $(BASEDIR)/private # The permissions to give the executables INSTALLPERMS = 0755 -@@ -45,17 +46,17 @@ +@@ -45,17 +47,17 @@ # set these to where to find various files # These can be overridden by command line switches (see smbd(8)) # or in smb.conf (see smb.conf(5)) @@ -44,7 +45,8 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 11:10:53 agc Exp $ +LMHOSTSFILE = $(ETCDIR)/lmhosts +DRIVERFILE = $(ETCDIR)/printers.def SMB_PASSWD = $(BINDIR)/smbpasswd - SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd +-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd ++SMB_PASSWD_FILE = $(PRIVDIR)/smbpasswd WEB_ROOT = $(BASEDIR) # the directory where lock files go @@ -53,7 +55,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 11:10:53 agc Exp $ # The directory where code page definition files go CODEPAGEDIR = $(LIBDIR)/codepages -@@ -352,10 +353,10 @@ +@@ -352,10 +354,10 @@ # LIBSM = @@ -67,7 +69,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 11:10:53 agc Exp $ # This is for NetBSD 1.3 # contributed by sean@fuzzymagic.com -@@ -824,8 +825,8 @@ +@@ -824,8 +826,8 @@ install: installbin installman installscripts installcp installbin: all @@ -78,7 +80,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 11:10:53 agc Exp $ installscripts: @$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS) -@@ -847,8 +848,8 @@ +@@ -847,8 +849,8 @@ @$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir) uninstallbin: |