diff options
Diffstat (limited to 'net/samba')
| -rw-r--r-- | net/samba/Makefile | 4 | ||||
| -rw-r--r-- | net/samba/distinfo | 2 | ||||
| -rw-r--r-- | net/samba/files/patch-aa | 203 | ||||
| -rw-r--r-- | net/samba/pkg-plist | 6 |
4 files changed, 71 insertions, 144 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index a4ef5711b79d..fde21d8a8b76 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -3,10 +3,10 @@ # Date created: 11th Feb 1995 # Whom: gpalmer # -# $Id: Makefile,v 1.10 1996/03/01 00:37:45 gpalmer Exp $ +# $Id: Makefile,v 1.11 1996/11/18 11:36:16 asami Exp $ # -DISTNAME= samba-1.9.15p8 +DISTNAME= samba-1.9.16p11 CATEGORIES= net MASTER_SITES= ftp://nimbus.anu.edu.au/pub/tridge/samba/ WRKSRC= ${WRKDIR}/${DISTNAME}/source diff --git a/net/samba/distinfo b/net/samba/distinfo index 88155d09fea2..aa807b13099d 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1 +1 @@ -MD5 (samba-1.9.15p8.tar.gz) = f1201d0d9ea2049fff6b16fc4c8996cd +MD5 (samba-1.9.16p11.tar.gz) = fb78238de10933d2ff8a604d0f793666 diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa index d9fc06b98ff0..d98338ea069a 100644 --- a/net/samba/files/patch-aa +++ b/net/samba/files/patch-aa @@ -1,138 +1,65 @@ -*** Makefile.orig Mon Jan 15 00:02:02 1996 ---- Makefile Wed Jul 24 11:23:26 1996 -*************** -*** 5,19 **** - - # The base manpages directory to put the man pages in - # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. -! MANDIR = /usr/local/man - - # The directories to put things in. If you use multiple - # architectures or share the samba binaries across NFS then - # you will probably want to change this layout. -! BASEDIR = /usr/local/samba -! BINDIR = $(BASEDIR)/bin -! LIBDIR = $(BASEDIR)/lib -! VARDIR = $(BASEDIR)/var - - # WARNING: If you are upgrading, make sure you put all the files - # in the right spot! The default positions have changed! ---- 5,19 ---- - - # The base manpages directory to put the man pages in - # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. -! MANDIR = ${PREFIX}/man - - # The directories to put things in. If you use multiple - # architectures or share the samba binaries across NFS then - # you will probably want to change this layout. -! BINDIR = $(PREFIX)/bin -! SBINDIR = $(PREFIX)/sbin -! ETCDIR = $(PREFIX)/etc -! LOGDIR = /var/log - - # WARNING: If you are upgrading, make sure you put all the files - # in the right spot! The default positions have changed! -*************** -*** 41,53 **** - # 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)) -! SMBLOGFILE = $(VARDIR)/log.smb -! NMBLOGFILE = $(VARDIR)/log.nmb -! CONFIGFILE = $(LIBDIR)/smb.conf -! LMHOSTSFILE = $(LIBDIR)/lmhosts - - # the directory where lock files go -! LOCKDIR = $(VARDIR)/locks - - # set this to the default group you want your machine to appear in - # for browsing. This can also be set in nmbd (see nmbd(8)) ---- 41,53 ---- - # 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)) -! SMBLOGFILE = $(LOGDIR)/smb -! NMBLOGFILE = $(LOGDIR)/nmb -! CONFIGFILE = $(ETCDIR)/smb.conf -! LMHOSTSFILE = $(ETCDIR)/lmhosts - - # the directory where lock files go -! LOCKDIR = /var/spool/lock - - # set this to the default group you want your machine to appear in - # for browsing. This can also be set in nmbd (see nmbd(8)) -*************** -*** 276,283 **** - # This is for FreeBSD - # contributed by kuku@acds.physik.rwth-aachen.de - # NOTE: You may need to add -DBSD44 if you have password problems -! # FLAGSM = -DFreeBSD -! # LIBSM = -lcrypt - - - # This is for NEXTSTEP Release 2.X ---- 276,283 ---- - # This is for FreeBSD - # contributed by kuku@acds.physik.rwth-aachen.de - # NOTE: You may need to add -DBSD44 if you have password problems -! FLAGSM = -DFreeBSD -DBSD44 -! LIBSM = -lcrypt - - - # This is for NEXTSTEP Release 2.X -*************** -*** 452,462 **** - CFLAGS = $(CFLAGS5) $(DCE_FLAGS) $(DES_FLAGS) $(PASSWD_FLAGS) $(VTP_FLAGS) - LIBS = $(LIBS1) $(LIBSM) $(DCE_LIBS) $(DES_LIB) - -! PROGS1 = smbd smbclient nmbd testparm testprns smbrun smbstatus smbpasswd - PROGS = $(PROGS1) nmblookup -! SCRIPTS = smbtar addtosmbpass - -! all : CHECK $(PROGS) - - CHECK : - @$(SHELL) $(srcdir)/checkos.sh $(FLAGSM) ---- 452,465 ---- - CFLAGS = $(CFLAGS5) $(DCE_FLAGS) $(DES_FLAGS) $(PASSWD_FLAGS) $(VTP_FLAGS) - LIBS = $(LIBS1) $(LIBSM) $(DCE_LIBS) $(DES_LIB) - -! PROGS1 = smbclient smbrun smbstatus smbpasswd - PROGS = $(PROGS1) nmblookup -! SCRIPTS = smbtar -! -! SPROGS = smbd nmbd testparm testprns -! SSCRIPTS = addtosmbpass - -! all : CHECK $(PROGS) $(SPROGS) - - CHECK : - @$(SHELL) $(srcdir)/checkos.sh $(FLAGSM) -*************** -*** 520,530 **** - install: installbin installman - - installbin: all -! @$(SHELL) $(srcdir)/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS) $(SCRIPTS) - - # revert to the previously installed version - revert: - @$(SHELL) $(srcdir)/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS) - - installman: - @$(SHELL) $(srcdir)/installman.sh $(MANDIR) ---- 523,535 ---- - install: installbin installman - - installbin: all -! @$(SHELL) $(srcdir)/installbin.sh $(INSTALLPERMS) $(PREFIX) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS) $(SCRIPTS) -! @$(SHELL) $(srcdir)/installbin.sh $(INSTALLPERMS) $(PREFIX) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS) $(SSCRIPTS) - - # revert to the previously installed version - revert: - @$(SHELL) $(srcdir)/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS) -+ @$(SHELL) $(srcdir)/revert.sh $(SBINDIR) $(SPROGS) $(SSCRIPTS) - - installman: - @$(SHELL) $(srcdir)/installman.sh $(MANDIR) +--- Makefile.orig Sat Feb 22 19:26:39 1997 ++++ Makefile Tue Mar 4 11:16:34 1997 +@@ -5,16 +5,16 @@ + + # The base manpages directory to put the man pages in + # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. +-MANDIR = /usr/local/man ++MANDIR = $(PREFIX)/man + + # The directories to put things in. If you use multiple + # architectures or share the samba binaries across NFS then + # you will probably want to change this layout. +-BASEDIR = /usr/local/samba ++BASEDIR = $(PREFIX) + BINDIR = $(BASEDIR)/bin +-SBINDIR = $(BASEDIR)/bin +-LIBDIR = $(BASEDIR)/lib +-VARDIR = $(BASEDIR)/var ++SBINDIR = $(BASEDIR)/sbin ++ETCDIR = $(BASEDIR)/etc ++LOGDIR = /var/log + + # The permissions to give the executables + INSTALLPERMS = 0755 +@@ -42,13 +42,13 @@ + # 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)) +-SMBLOGFILE = $(VARDIR)/log.smb +-NMBLOGFILE = $(VARDIR)/log.nmb +-CONFIGFILE = $(LIBDIR)/smb.conf +-LMHOSTSFILE = $(LIBDIR)/lmhosts ++SMBLOGFILE = $(LOGDIR)/smb ++NMBLOGFILE = $(LOGDIR)/nmb ++CONFIGFILE = $(ETCDIR)/smb.conf ++LMHOSTSFILE = $(ETCDIR)/lmhosts + + # the directory where lock files go +-LOCKDIR = $(VARDIR)/locks ++LOCKDIR = /var/spool/lock + + # set this to the default group you want your machine to appear in + # for browsing. This can also be set in nmbd (see nmbd(8)) +@@ -329,8 +329,8 @@ + # This is for FreeBSD + # contributed by kuku@acds.physik.rwth-aachen.de + # NOTE: You may need to add -DBSD44 if you have password problems +-# FLAGSM = -DFreeBSD +-# LIBSM = -lcrypt ++FLAGSM = -DFreeBSD -DBSD44 ++LIBSM = -lcrypt + + + # This is for NEXTSTEP Release 2.X +@@ -624,8 +624,8 @@ + install: installbin installman installscripts + + installbin: all +- @$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS) +- @$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS) ++ @$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS) ++ @$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS) + + installscripts: + @$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS) diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist index d06ee62a3445..de46d4fb6b6c 100644 --- a/net/samba/pkg-plist +++ b/net/samba/pkg-plist @@ -4,11 +4,11 @@ bin/smbstatus bin/smbpasswd bin/nmblookup bin/smbtar -sbin/addtosmbpass +bin/addtosmbpass +bin/testparm +bin/testprns sbin/smbd sbin/nmbd -sbin/testparm -sbin/testprns man/man1/smbstatus.1.gz man/man1/smbclient.1.gz man/man1/smbrun.1.gz |