aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/samba-devel/Makefile8
-rw-r--r--net/samba-devel/distinfo2
-rw-r--r--net/samba-devel/files/patch-aa41
-rw-r--r--net/samba-devel/pkg-plist9
-rw-r--r--net/samba/Makefile8
-rw-r--r--net/samba/distinfo2
-rw-r--r--net/samba/files/patch-aa41
-rw-r--r--net/samba/pkg-plist9
-rw-r--r--net/samba3/Makefile8
-rw-r--r--net/samba3/distinfo2
-rw-r--r--net/samba3/files/patch-aa41
-rw-r--r--net/samba3/pkg-plist9
12 files changed, 117 insertions, 63 deletions
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index fde21d8a8b76..1e91839d46fe 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -3,12 +3,12 @@
# Date created: 11th Feb 1995
# Whom: gpalmer
#
-# $Id: Makefile,v 1.11 1996/11/18 11:36:16 asami Exp $
+# $Id: Makefile,v 1.12 1997/03/05 01:35:15 pst Exp $
#
-DISTNAME= samba-1.9.16p11
+DISTNAME= samba-1.9.17p2
CATEGORIES= net
-MASTER_SITES= ftp://nimbus.anu.edu.au/pub/tridge/samba/
+MASTER_SITES= ftp://samba.anu.edu.au/pub/samba/
WRKSRC= ${WRKDIR}/${DISTNAME}/source
MAINTAINER= gpalmer@FreeBSD.ORG
@@ -16,7 +16,7 @@ MAINTAINER= gpalmer@FreeBSD.ORG
MAN1= smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
MAN5= smb.conf.5
MAN7= samba.7
-MAN8= smbd.8 nmbd.8
+MAN8= smbd.8 nmbd.8 smbpasswd.8
pre-install:
@${MKDIR} /usr/local/samba
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index aa807b13099d..d89f0c7fae14 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.16p11.tar.gz) = fb78238de10933d2ff8a604d0f793666
+MD5 (samba-1.9.17p2.tar.gz) = 27ac28ccf084268ba5c8c0b3a0ed12e4
diff --git a/net/samba-devel/files/patch-aa b/net/samba-devel/files/patch-aa
index d98338ea069a..63286ab75b50 100644
--- a/net/samba-devel/files/patch-aa
+++ b/net/samba-devel/files/patch-aa
@@ -1,6 +1,11 @@
---- Makefile.orig Sat Feb 22 19:26:39 1997
-+++ Makefile Tue Mar 4 11:16:34 1997
-@@ -5,16 +5,16 @@
+--- Makefile.orig Fri Sep 26 05:44:18 1997
++++ Makefile Fri Sep 26 18:41:40 1997
+@@ -5,11 +5,11 @@
+ ###########################################################################
+
+ # The base directory for all samba files
+-BASEDIR = /usr/local/samba
++BASEDIR = $(PREFIX)
# The base manpages directory to put the man pages in
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
@@ -9,9 +14,9 @@
# 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)
+@@ -18,9 +18,9 @@
+ # normally only applies to nmbd and smbd
+ # SBINDIR implies a secure binary directory
BINDIR = $(BASEDIR)/bin
-SBINDIR = $(BASEDIR)/bin
-LIBDIR = $(BASEDIR)/lib
@@ -22,7 +27,7 @@
# The permissions to give the executables
INSTALLPERMS = 0755
-@@ -42,13 +42,13 @@
+@@ -48,13 +48,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))
@@ -41,18 +46,19 @@
# 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 @@
+@@ -385,9 +385,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
+-# NOTE: You may need to add -DBSD44 if you have password problems
+-# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
-# LIBSM = -lcrypt
-+FLAGSM = -DFreeBSD -DBSD44
++FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
+LIBSM = -lcrypt
# This is for NEXTSTEP Release 2.X
-@@ -624,8 +624,8 @@
+@@ -687,8 +686,8 @@
install: installbin installman installscripts
installbin: all
@@ -63,3 +69,14 @@
installscripts:
@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+@@ -707,8 +706,8 @@
+ @$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
+
+ uninstallbin:
+- @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+- @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++ @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++ @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+
+ uninstallscripts:
+ @$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index de46d4fb6b6c..38682ae06839 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -1,17 +1,17 @@
+bin/addtosmbpass
+bin/nmblookup
bin/smbclient
+bin/smbpasswd
bin/smbrun
bin/smbstatus
-bin/smbpasswd
-bin/nmblookup
bin/smbtar
-bin/addtosmbpass
bin/testparm
bin/testprns
sbin/smbd
sbin/nmbd
-man/man1/smbstatus.1.gz
man/man1/smbclient.1.gz
man/man1/smbrun.1.gz
+man/man1/smbstatus.1.gz
man/man1/smbtar.1.gz
man/man1/testparm.1.gz
man/man1/testprns.1.gz
@@ -19,3 +19,4 @@ man/man5/smb.conf.5.gz
man/man7/samba.7.gz
man/man8/smbd.8.gz
man/man8/nmbd.8.gz
+man/man8/smbpasswd.8.gz
diff --git a/net/samba/Makefile b/net/samba/Makefile
index fde21d8a8b76..1e91839d46fe 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -3,12 +3,12 @@
# Date created: 11th Feb 1995
# Whom: gpalmer
#
-# $Id: Makefile,v 1.11 1996/11/18 11:36:16 asami Exp $
+# $Id: Makefile,v 1.12 1997/03/05 01:35:15 pst Exp $
#
-DISTNAME= samba-1.9.16p11
+DISTNAME= samba-1.9.17p2
CATEGORIES= net
-MASTER_SITES= ftp://nimbus.anu.edu.au/pub/tridge/samba/
+MASTER_SITES= ftp://samba.anu.edu.au/pub/samba/
WRKSRC= ${WRKDIR}/${DISTNAME}/source
MAINTAINER= gpalmer@FreeBSD.ORG
@@ -16,7 +16,7 @@ MAINTAINER= gpalmer@FreeBSD.ORG
MAN1= smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
MAN5= smb.conf.5
MAN7= samba.7
-MAN8= smbd.8 nmbd.8
+MAN8= smbd.8 nmbd.8 smbpasswd.8
pre-install:
@${MKDIR} /usr/local/samba
diff --git a/net/samba/distinfo b/net/samba/distinfo
index aa807b13099d..d89f0c7fae14 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.16p11.tar.gz) = fb78238de10933d2ff8a604d0f793666
+MD5 (samba-1.9.17p2.tar.gz) = 27ac28ccf084268ba5c8c0b3a0ed12e4
diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index d98338ea069a..63286ab75b50 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,6 +1,11 @@
---- Makefile.orig Sat Feb 22 19:26:39 1997
-+++ Makefile Tue Mar 4 11:16:34 1997
-@@ -5,16 +5,16 @@
+--- Makefile.orig Fri Sep 26 05:44:18 1997
++++ Makefile Fri Sep 26 18:41:40 1997
+@@ -5,11 +5,11 @@
+ ###########################################################################
+
+ # The base directory for all samba files
+-BASEDIR = /usr/local/samba
++BASEDIR = $(PREFIX)
# The base manpages directory to put the man pages in
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
@@ -9,9 +14,9 @@
# 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)
+@@ -18,9 +18,9 @@
+ # normally only applies to nmbd and smbd
+ # SBINDIR implies a secure binary directory
BINDIR = $(BASEDIR)/bin
-SBINDIR = $(BASEDIR)/bin
-LIBDIR = $(BASEDIR)/lib
@@ -22,7 +27,7 @@
# The permissions to give the executables
INSTALLPERMS = 0755
-@@ -42,13 +42,13 @@
+@@ -48,13 +48,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))
@@ -41,18 +46,19 @@
# 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 @@
+@@ -385,9 +385,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
+-# NOTE: You may need to add -DBSD44 if you have password problems
+-# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
-# LIBSM = -lcrypt
-+FLAGSM = -DFreeBSD -DBSD44
++FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
+LIBSM = -lcrypt
# This is for NEXTSTEP Release 2.X
-@@ -624,8 +624,8 @@
+@@ -687,8 +686,8 @@
install: installbin installman installscripts
installbin: all
@@ -63,3 +69,14 @@
installscripts:
@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+@@ -707,8 +706,8 @@
+ @$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
+
+ uninstallbin:
+- @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+- @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++ @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++ @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+
+ uninstallscripts:
+ @$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist
index de46d4fb6b6c..38682ae06839 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -1,17 +1,17 @@
+bin/addtosmbpass
+bin/nmblookup
bin/smbclient
+bin/smbpasswd
bin/smbrun
bin/smbstatus
-bin/smbpasswd
-bin/nmblookup
bin/smbtar
-bin/addtosmbpass
bin/testparm
bin/testprns
sbin/smbd
sbin/nmbd
-man/man1/smbstatus.1.gz
man/man1/smbclient.1.gz
man/man1/smbrun.1.gz
+man/man1/smbstatus.1.gz
man/man1/smbtar.1.gz
man/man1/testparm.1.gz
man/man1/testprns.1.gz
@@ -19,3 +19,4 @@ man/man5/smb.conf.5.gz
man/man7/samba.7.gz
man/man8/smbd.8.gz
man/man8/nmbd.8.gz
+man/man8/smbpasswd.8.gz
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index fde21d8a8b76..1e91839d46fe 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -3,12 +3,12 @@
# Date created: 11th Feb 1995
# Whom: gpalmer
#
-# $Id: Makefile,v 1.11 1996/11/18 11:36:16 asami Exp $
+# $Id: Makefile,v 1.12 1997/03/05 01:35:15 pst Exp $
#
-DISTNAME= samba-1.9.16p11
+DISTNAME= samba-1.9.17p2
CATEGORIES= net
-MASTER_SITES= ftp://nimbus.anu.edu.au/pub/tridge/samba/
+MASTER_SITES= ftp://samba.anu.edu.au/pub/samba/
WRKSRC= ${WRKDIR}/${DISTNAME}/source
MAINTAINER= gpalmer@FreeBSD.ORG
@@ -16,7 +16,7 @@ MAINTAINER= gpalmer@FreeBSD.ORG
MAN1= smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
MAN5= smb.conf.5
MAN7= samba.7
-MAN8= smbd.8 nmbd.8
+MAN8= smbd.8 nmbd.8 smbpasswd.8
pre-install:
@${MKDIR} /usr/local/samba
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index aa807b13099d..d89f0c7fae14 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.16p11.tar.gz) = fb78238de10933d2ff8a604d0f793666
+MD5 (samba-1.9.17p2.tar.gz) = 27ac28ccf084268ba5c8c0b3a0ed12e4
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index d98338ea069a..63286ab75b50 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,6 +1,11 @@
---- Makefile.orig Sat Feb 22 19:26:39 1997
-+++ Makefile Tue Mar 4 11:16:34 1997
-@@ -5,16 +5,16 @@
+--- Makefile.orig Fri Sep 26 05:44:18 1997
++++ Makefile Fri Sep 26 18:41:40 1997
+@@ -5,11 +5,11 @@
+ ###########################################################################
+
+ # The base directory for all samba files
+-BASEDIR = /usr/local/samba
++BASEDIR = $(PREFIX)
# The base manpages directory to put the man pages in
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
@@ -9,9 +14,9 @@
# 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)
+@@ -18,9 +18,9 @@
+ # normally only applies to nmbd and smbd
+ # SBINDIR implies a secure binary directory
BINDIR = $(BASEDIR)/bin
-SBINDIR = $(BASEDIR)/bin
-LIBDIR = $(BASEDIR)/lib
@@ -22,7 +27,7 @@
# The permissions to give the executables
INSTALLPERMS = 0755
-@@ -42,13 +42,13 @@
+@@ -48,13 +48,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))
@@ -41,18 +46,19 @@
# 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 @@
+@@ -385,9 +385,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
+-# NOTE: You may need to add -DBSD44 if you have password problems
+-# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
-# LIBSM = -lcrypt
-+FLAGSM = -DFreeBSD -DBSD44
++FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
+LIBSM = -lcrypt
# This is for NEXTSTEP Release 2.X
-@@ -624,8 +624,8 @@
+@@ -687,8 +686,8 @@
install: installbin installman installscripts
installbin: all
@@ -63,3 +69,14 @@
installscripts:
@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+@@ -707,8 +706,8 @@
+ @$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
+
+ uninstallbin:
+- @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+- @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++ @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++ @$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+
+ uninstallscripts:
+ @$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index de46d4fb6b6c..38682ae06839 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -1,17 +1,17 @@
+bin/addtosmbpass
+bin/nmblookup
bin/smbclient
+bin/smbpasswd
bin/smbrun
bin/smbstatus
-bin/smbpasswd
-bin/nmblookup
bin/smbtar
-bin/addtosmbpass
bin/testparm
bin/testprns
sbin/smbd
sbin/nmbd
-man/man1/smbstatus.1.gz
man/man1/smbclient.1.gz
man/man1/smbrun.1.gz
+man/man1/smbstatus.1.gz
man/man1/smbtar.1.gz
man/man1/testparm.1.gz
man/man1/testprns.1.gz
@@ -19,3 +19,4 @@ man/man5/smb.conf.5.gz
man/man7/samba.7.gz
man/man8/smbd.8.gz
man/man8/nmbd.8.gz
+man/man8/smbpasswd.8.gz