aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/samba-devel/Makefile7
-rw-r--r--net/samba-devel/distinfo2
-rw-r--r--net/samba-devel/files/patch-aa18
-rw-r--r--net/samba-devel/files/patch-ab32
-rw-r--r--net/samba-devel/pkg-plist186
-rw-r--r--net/samba/Makefile7
-rw-r--r--net/samba/distinfo2
-rw-r--r--net/samba/files/patch-aa18
-rw-r--r--net/samba/files/patch-ab32
-rw-r--r--net/samba/pkg-plist186
-rw-r--r--net/samba3/Makefile7
-rw-r--r--net/samba3/distinfo2
-rw-r--r--net/samba3/files/patch-aa18
-rw-r--r--net/samba3/files/patch-ab32
-rw-r--r--net/samba3/pkg-plist186
15 files changed, 648 insertions, 87 deletions
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index c70a7a372206..84e9c9b41bc4 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION= 2.0.6
+PORTVERSION= 2.0.7
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
@@ -32,6 +32,7 @@ SAMPLE_CONFIG= ${SAMBA_CONFDIR}/smb.conf.default
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
+ --with-sambabook=${PREFIX}/share/swat/using_samba \
--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
@@ -95,7 +96,9 @@ post-install:
for i in faq htmldocs textdocs yodldocs ; do \
${MKDIR} ${PREFIX}/share/doc/samba/$$i ; \
for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do \
- ${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
+ if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
+ ${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
+ fi; \
done \
done
${MKDIR} ${PREFIX}/share/doc/samba
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index 1935d498bef5..37cb33745240 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.6.tar.gz) = 87b3a9a2de94fe44b804f32def38266d
+MD5 (samba-2.0.7.tar.gz) = b5e61ea655d476072fd0365785fea2d0
diff --git a/net/samba-devel/files/patch-aa b/net/samba-devel/files/patch-aa
index 3c705946b562..3633f55c7b8f 100644
--- a/net/samba-devel/files/patch-aa
+++ b/net/samba-devel/files/patch-aa
@@ -1,17 +1,15 @@
---- Makefile.in.orig Wed Jul 21 03:24:31 1999
-+++ Makefile.in Fri Oct 15 12:04:52 1999
-@@ -23,9 +23,7 @@
-
- BASEDIR= @prefix@
+--- Makefile.in.orig Wed Apr 26 02:06:11 2000
++++ Makefile.in Thu Apr 27 11:08:08 2000
+@@ -25,7 +25,7 @@
BINDIR = @bindir@
--# we don't use sbindir because we want full compatibility with
--# the previous releases of Samba
+ # we don't use sbindir because we want full compatibility with
+ # the previous releases of Samba
-SBINDIR = @bindir@
+SBINDIR = @sbindir@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
-@@ -36,12 +34,13 @@
+@@ -37,12 +37,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))
@@ -28,7 +26,7 @@
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-@@ -53,6 +52,9 @@
+@@ -54,6 +55,9 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -38,7 +36,7 @@
# The directory where code page definition files go
CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -70,7 +72,7 @@
+@@ -71,7 +75,7 @@
PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
diff --git a/net/samba-devel/files/patch-ab b/net/samba-devel/files/patch-ab
index b3d798c9f601..40158831ba75 100644
--- a/net/samba-devel/files/patch-ab
+++ b/net/samba-devel/files/patch-ab
@@ -1,6 +1,6 @@
---- param/loadparm.c.orig Fri Jan 15 22:35:00 1999
-+++ param/loadparm.c Fri Jan 15 22:33:18 1999
-@@ -104,6 +104,7 @@
+--- param/loadparm.c.orig Wed Apr 26 02:07:00 2000
++++ param/loadparm.c Thu Apr 27 11:12:03 2000
+@@ -105,6 +105,7 @@
{
char *szPrintcapname;
char *szLockDir;
@@ -8,28 +8,28 @@
char *szRootdir;
char *szDefaultService;
char *szDfree;
-@@ -747,6 +748,8 @@
- {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
- {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+@@ -820,6 +821,8 @@
+ {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+ {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+ {"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
+ {"pidfile directory",P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
- {"default service", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, 0},
- {"default", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, 0},
- {"message command", P_STRING, P_GLOBAL, &Globals.szMsgCommand, NULL, NULL, 0},
-@@ -824,6 +827,7 @@
+ #ifdef WITH_UTMP
+ {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+ {"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+@@ -911,6 +914,7 @@
string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
string_set(&Globals.szDriverFile, DRIVERFILE);
string_set(&Globals.szLockDir, LOCKDIR);
+ string_set(&Globals.szPidDir, PIDFILEDIR);
string_set(&Globals.szRootdir, "/");
- string_set(&Globals.szSmbrun, SMBRUN);
- string_set(&Globals.szSocketAddress, "0.0.0.0");
-@@ -1100,6 +1104,7 @@
+ #ifdef WITH_UTMP
+ string_set(&Globals.szUtmpDir, "");
+@@ -1185,6 +1189,7 @@
FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
+FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
- FN_GLOBAL_STRING(lp_rootdir,&Globals.szRootdir)
- FN_GLOBAL_STRING(lp_defaultservice,&Globals.szDefaultService)
- FN_GLOBAL_STRING(lp_msg_command,&Globals.szMsgCommand)
+ #ifdef WITH_UTMP
+ FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
+ FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 0e4477dd2ead..e8e28f5a9c23 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -9,6 +9,7 @@ bin/testparm
bin/testprns
bin/make_smbpasswd
bin/make_smbcodepage
+bin/make_unicodemap
bin/make_printerdef
bin/rpcclient
bin/smbspool
@@ -65,6 +66,7 @@ etc/rc.d/samba.sh.sample
etc/smb.conf.default
etc/codepages/codepage.437
etc/codepages/codepage.737
+etc/codepages/codepage.775
etc/codepages/codepage.850
etc/codepages/codepage.852
etc/codepages/codepage.861
@@ -73,10 +75,27 @@ etc/codepages/codepage.932
etc/codepages/codepage.936
etc/codepages/codepage.949
etc/codepages/codepage.950
+etc/codepages/codepage.1251
+etc/codepages/unicode_map.437
+etc/codepages/unicode_map.737
+etc/codepages/unicode_map.850
+etc/codepages/unicode_map.852
+etc/codepages/unicode_map.861
+etc/codepages/unicode_map.866
+etc/codepages/unicode_map.932
+etc/codepages/unicode_map.936
+etc/codepages/unicode_map.949
+etc/codepages/unicode_map.950
+etc/codepages/unicode_map.ISO8859-1
+etc/codepages/unicode_map.ISO8859-2
+etc/codepages/unicode_map.ISO8859-5
+etc/codepages/unicode_map.ISO8859-7
+etc/codepages/unicode_map.KOI8-R
@dirrm etc/codepages
share/doc/samba/COPYING
share/doc/samba/Manifest
share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/NT4-Locking.reg
share/doc/samba/README
share/doc/samba/README.FreeBSD
share/doc/samba/README.swat
@@ -116,6 +135,7 @@ share/doc/samba/htmldocs/DOMAIN_MEMBER.html
share/doc/samba/htmldocs/NT_Security.html
share/doc/samba/htmldocs/lmhosts.5.html
share/doc/samba/htmldocs/make_smbcodepage.1.html
+share/doc/samba/htmldocs/make_unicodemap.1.html
share/doc/samba/htmldocs/nmbd.8.html
share/doc/samba/htmldocs/nmblookup.1.html
share/doc/samba/htmldocs/samba.7.html
@@ -135,6 +155,8 @@ share/doc/samba/htmldocs/swat.8.html
share/doc/samba/htmldocs/testparm.1.html
share/doc/samba/htmldocs/testprns.1.html
share/doc/samba/htmldocs/wfw_slip.htm
+share/doc/samba/textdocs/smbmount.txt
+share/doc/samba/textdocs/NT-Guest-Access.txt
share/doc/samba/textdocs/Application_Serving.txt
share/doc/samba/textdocs/BROWSING-Config.txt
share/doc/samba/textdocs/BROWSING.txt
@@ -187,6 +209,7 @@ share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
share/doc/samba/yodldocs/NT_Security.yo
share/doc/samba/yodldocs/lmhosts.5.yo
share/doc/samba/yodldocs/make_smbcodepage.1.yo
+share/doc/samba/yodldocs/make_unicodemap.1.yo
share/doc/samba/yodldocs/nmbd.8.yo
share/doc/samba/yodldocs/nmblookup.1.yo
share/doc/samba/yodldocs/samba.7.yo
@@ -215,6 +238,7 @@ share/swat/help/DOMAIN_MEMBER.html
share/swat/help/NT_Security.html
share/swat/help/lmhosts.5.html
share/swat/help/make_smbcodepage.1.html
+share/swat/help/make_unicodemap.1.html
share/swat/help/nmbd.8.html
share/swat/help/nmblookup.1.html
share/swat/help/samba.7.html
@@ -244,9 +268,171 @@ share/swat/images/status.gif
share/swat/images/viewconfig.gif
share/swat/include/footer.html
share/swat/include/header.html
+share/swat/using_samba/appa_01.html
+share/swat/using_samba/appa_02.html
+share/swat/using_samba/appa_03.html
+share/swat/using_samba/appa_04.html
+share/swat/using_samba/appa_05.html
+share/swat/using_samba/appb_01.html
+share/swat/using_samba/appb_02.html
+share/swat/using_samba/appb_03.html
+share/swat/using_samba/appc_01.html
+share/swat/using_samba/appd_01.html
+share/swat/using_samba/appe_01.html
+share/swat/using_samba/appf_01.html
+share/swat/using_samba/ch01_01.html
+share/swat/using_samba/ch01_02.html
+share/swat/using_samba/ch01_03.html
+share/swat/using_samba/ch01_04.html
+share/swat/using_samba/ch01_05.html
+share/swat/using_samba/ch01_06.html
+share/swat/using_samba/ch01_07.html
+share/swat/using_samba/ch01_08.html
+share/swat/using_samba/ch02_01.html
+share/swat/using_samba/ch02_02.html
+share/swat/using_samba/ch02_03.html
+share/swat/using_samba/ch02_04.html
+share/swat/using_samba/ch02_05.html
+share/swat/using_samba/ch02_06.html
+share/swat/using_samba/ch03_01.html
+share/swat/using_samba/ch03_02.html
+share/swat/using_samba/ch03_03.html
+share/swat/using_samba/ch04_01.html
+share/swat/using_samba/ch04_02.html
+share/swat/using_samba/ch04_03.html
+share/swat/using_samba/ch04_04.html
+share/swat/using_samba/ch04_05.html
+share/swat/using_samba/ch04_06.html
+share/swat/using_samba/ch04_07.html
+share/swat/using_samba/ch04_08.html
+share/swat/using_samba/ch05_01.html
+share/swat/using_samba/ch05_02.html
+share/swat/using_samba/ch05_03.html
+share/swat/using_samba/ch05_04.html
+share/swat/using_samba/ch05_05.html
+share/swat/using_samba/ch06_01.html
+share/swat/using_samba/ch06_02.html
+share/swat/using_samba/ch06_03.html
+share/swat/using_samba/ch06_04.html
+share/swat/using_samba/ch06_05.html
+share/swat/using_samba/ch06_06.html
+share/swat/using_samba/ch07_01.html
+share/swat/using_samba/ch07_02.html
+share/swat/using_samba/ch07_03.html
+share/swat/using_samba/ch08_01.html
+share/swat/using_samba/ch08_02.html
+share/swat/using_samba/ch08_03.html
+share/swat/using_samba/ch08_04.html
+share/swat/using_samba/ch08_05.html
+share/swat/using_samba/ch08_06.html
+share/swat/using_samba/ch08_07.html
+share/swat/using_samba/ch09_01.html
+share/swat/using_samba/ch09_02.html
+share/swat/using_samba/ch09_03.html
+share/swat/using_samba/index.html
+share/swat/using_samba/inx.html
+share/swat/using_samba/licenseinfo.html
+share/swat/using_samba/this_edition.html
+share/swat/using_samba/figs/sam.0101.gif
+share/swat/using_samba/figs/sam.0102.gif
+share/swat/using_samba/figs/sam.0103.gif
+share/swat/using_samba/figs/sam.0104.gif
+share/swat/using_samba/figs/sam.0105.gif
+share/swat/using_samba/figs/sam.0106.gif
+share/swat/using_samba/figs/sam.0107.gif
+share/swat/using_samba/figs/sam.0108.gif
+share/swat/using_samba/figs/sam.0109.gif
+share/swat/using_samba/figs/sam.0110.gif
+share/swat/using_samba/figs/sam.0111.gif
+share/swat/using_samba/figs/sam.0112.gif
+share/swat/using_samba/figs/sam.0113.gif
+share/swat/using_samba/figs/sam.0114.gif
+share/swat/using_samba/figs/sam.0201.gif
+share/swat/using_samba/figs/sam.0202.gif
+share/swat/using_samba/figs/sam.0203.gif
+share/swat/using_samba/figs/sam.0204.gif
+share/swat/using_samba/figs/sam.0301.gif
+share/swat/using_samba/figs/sam.0302.gif
+share/swat/using_samba/figs/sam.0303.gif
+share/swat/using_samba/figs/sam.0304.gif
+share/swat/using_samba/figs/sam.0305.gif
+share/swat/using_samba/figs/sam.0306.gif
+share/swat/using_samba/figs/sam.0307.gif
+share/swat/using_samba/figs/sam.0308.gif
+share/swat/using_samba/figs/sam.0309.gif
+share/swat/using_samba/figs/sam.0310.gif
+share/swat/using_samba/figs/sam.0311.gif
+share/swat/using_samba/figs/sam.0312.gif
+share/swat/using_samba/figs/sam.0313.gif
+share/swat/using_samba/figs/sam.0314.gif
+share/swat/using_samba/figs/sam.0315.gif
+share/swat/using_samba/figs/sam.0316.gif
+share/swat/using_samba/figs/sam.0317.gif
+share/swat/using_samba/figs/sam.0318.gif
+share/swat/using_samba/figs/sam.0319.gif
+share/swat/using_samba/figs/sam.0320.gif
+share/swat/using_samba/figs/sam.0321.gif
+share/swat/using_samba/figs/sam.0322.gif
+share/swat/using_samba/figs/sam.0323.gif
+share/swat/using_samba/figs/sam.0324.gif
+share/swat/using_samba/figs/sam.0325.gif
+share/swat/using_samba/figs/sam.0326.gif
+share/swat/using_samba/figs/sam.0327.gif
+share/swat/using_samba/figs/sam.0328.gif
+share/swat/using_samba/figs/sam.0401.gif
+share/swat/using_samba/figs/sam.0402.gif
+share/swat/using_samba/figs/sam.0403.gif
+share/swat/using_samba/figs/sam.0404.gif
+share/swat/using_samba/figs/sam.0405.gif
+share/swat/using_samba/figs/sam.0406.gif
+share/swat/using_samba/figs/sam.0407.gif
+share/swat/using_samba/figs/sam.0501.gif
+share/swat/using_samba/figs/sam.0502.gif
+share/swat/using_samba/figs/sam.0503.gif
+share/swat/using_samba/figs/sam.0504.gif
+share/swat/using_samba/figs/sam.0505.gif
+share/swat/using_samba/figs/sam.0506.gif
+share/swat/using_samba/figs/sam.0507.gif
+share/swat/using_samba/figs/sam.0508.gif
+share/swat/using_samba/figs/sam.0601.gif
+share/swat/using_samba/figs/sam.0602.gif
+share/swat/using_samba/figs/sam.0603.gif
+share/swat/using_samba/figs/sam.0604.gif
+share/swat/using_samba/figs/sam.0605.gif
+share/swat/using_samba/figs/sam.0606.gif
+share/swat/using_samba/figs/sam.0701.gif
+share/swat/using_samba/figs/sam.0702.gif
+share/swat/using_samba/figs/sam.0703.gif
+share/swat/using_samba/figs/sam.0704.gif
+share/swat/using_samba/figs/sam.0705.gif
+share/swat/using_samba/figs/sam.0706.gif
+share/swat/using_samba/figs/sam.0707.gif
+share/swat/using_samba/figs/sam.0708.gif
+share/swat/using_samba/figs/sam.0709.gif
+share/swat/using_samba/figs/sam.0801.gif
+share/swat/using_samba/figs/sam.0802.gif
+share/swat/using_samba/figs/sam.0803.gif
+share/swat/using_samba/figs/sam.0804.gif
+share/swat/using_samba/figs/sam.0805.gif
+share/swat/using_samba/figs/sam.0901.gif
+share/swat/using_samba/figs/sam.0902.gif
+share/swat/using_samba/figs/sam.0903.gif
+share/swat/using_samba/figs/sam.0904.gif
+share/swat/using_samba/figs/sam.0905.gif
+share/swat/using_samba/figs/sam.aa01.gif
+share/swat/using_samba/figs/sam.ab01.gif
+share/swat/using_samba/figs/sam.ab02.gif
+share/swat/using_samba/gifs/index.gif
+share/swat/using_samba/gifs/samba.s.gif
+share/swat/using_samba/gifs/txthome.gif
+share/swat/using_samba/gifs/txtnexta.gif
+share/swat/using_samba/gifs/txtpreva.gif
@dirrm share/swat/help
@dirrm share/swat/images
@dirrm share/swat/include
+@dirrm share/swat/using_samba/figs
+@dirrm share/swat/using_samba/gifs
+@dirrm share/swat/using_samba
@dirrm share/swat
@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ; cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
@exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba
diff --git a/net/samba/Makefile b/net/samba/Makefile
index c70a7a372206..84e9c9b41bc4 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION= 2.0.6
+PORTVERSION= 2.0.7
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
@@ -32,6 +32,7 @@ SAMPLE_CONFIG= ${SAMBA_CONFDIR}/smb.conf.default
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
+ --with-sambabook=${PREFIX}/share/swat/using_samba \
--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
@@ -95,7 +96,9 @@ post-install:
for i in faq htmldocs textdocs yodldocs ; do \
${MKDIR} ${PREFIX}/share/doc/samba/$$i ; \
for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do \
- ${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
+ if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
+ ${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
+ fi; \
done \
done
${MKDIR} ${PREFIX}/share/doc/samba
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 1935d498bef5..37cb33745240 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.6.tar.gz) = 87b3a9a2de94fe44b804f32def38266d
+MD5 (samba-2.0.7.tar.gz) = b5e61ea655d476072fd0365785fea2d0
diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index 3c705946b562..3633f55c7b8f 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,17 +1,15 @@
---- Makefile.in.orig Wed Jul 21 03:24:31 1999
-+++ Makefile.in Fri Oct 15 12:04:52 1999
-@@ -23,9 +23,7 @@
-
- BASEDIR= @prefix@
+--- Makefile.in.orig Wed Apr 26 02:06:11 2000
++++ Makefile.in Thu Apr 27 11:08:08 2000
+@@ -25,7 +25,7 @@
BINDIR = @bindir@
--# we don't use sbindir because we want full compatibility with
--# the previous releases of Samba
+ # we don't use sbindir because we want full compatibility with
+ # the previous releases of Samba
-SBINDIR = @bindir@
+SBINDIR = @sbindir@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
-@@ -36,12 +34,13 @@
+@@ -37,12 +37,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))
@@ -28,7 +26,7 @@
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-@@ -53,6 +52,9 @@
+@@ -54,6 +55,9 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -38,7 +36,7 @@
# The directory where code page definition files go
CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -70,7 +72,7 @@
+@@ -71,7 +75,7 @@
PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
diff --git a/net/samba/files/patch-ab b/net/samba/files/patch-ab
index b3d798c9f601..40158831ba75 100644
--- a/net/samba/files/patch-ab
+++ b/net/samba/files/patch-ab
@@ -1,6 +1,6 @@
---- param/loadparm.c.orig Fri Jan 15 22:35:00 1999
-+++ param/loadparm.c Fri Jan 15 22:33:18 1999
-@@ -104,6 +104,7 @@
+--- param/loadparm.c.orig Wed Apr 26 02:07:00 2000
++++ param/loadparm.c Thu Apr 27 11:12:03 2000
+@@ -105,6 +105,7 @@
{
char *szPrintcapname;
char *szLockDir;
@@ -8,28 +8,28 @@
char *szRootdir;
char *szDefaultService;
char *szDfree;
-@@ -747,6 +748,8 @@
- {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
- {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+@@ -820,6 +821,8 @@
+ {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+ {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+ {"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
+ {"pidfile directory",P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
- {"default service", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, 0},
- {"default", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, 0},
- {"message command", P_STRING, P_GLOBAL, &Globals.szMsgCommand, NULL, NULL, 0},
-@@ -824,6 +827,7 @@
+ #ifdef WITH_UTMP
+ {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+ {"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+@@ -911,6 +914,7 @@
string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
string_set(&Globals.szDriverFile, DRIVERFILE);
string_set(&Globals.szLockDir, LOCKDIR);
+ string_set(&Globals.szPidDir, PIDFILEDIR);
string_set(&Globals.szRootdir, "/");
- string_set(&Globals.szSmbrun, SMBRUN);
- string_set(&Globals.szSocketAddress, "0.0.0.0");
-@@ -1100,6 +1104,7 @@
+ #ifdef WITH_UTMP
+ string_set(&Globals.szUtmpDir, "");
+@@ -1185,6 +1189,7 @@
FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
+FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
- FN_GLOBAL_STRING(lp_rootdir,&Globals.szRootdir)
- FN_GLOBAL_STRING(lp_defaultservice,&Globals.szDefaultService)
- FN_GLOBAL_STRING(lp_msg_command,&Globals.szMsgCommand)
+ #ifdef WITH_UTMP
+ FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
+ FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)
diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist
index 0e4477dd2ead..e8e28f5a9c23 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -9,6 +9,7 @@ bin/testparm
bin/testprns
bin/make_smbpasswd
bin/make_smbcodepage
+bin/make_unicodemap
bin/make_printerdef
bin/rpcclient
bin/smbspool
@@ -65,6 +66,7 @@ etc/rc.d/samba.sh.sample
etc/smb.conf.default
etc/codepages/codepage.437
etc/codepages/codepage.737
+etc/codepages/codepage.775
etc/codepages/codepage.850
etc/codepages/codepage.852
etc/codepages/codepage.861
@@ -73,10 +75,27 @@ etc/codepages/codepage.932
etc/codepages/codepage.936
etc/codepages/codepage.949
etc/codepages/codepage.950
+etc/codepages/codepage.1251
+etc/codepages/unicode_map.437
+etc/codepages/unicode_map.737
+etc/codepages/unicode_map.850
+etc/codepages/unicode_map.852
+etc/codepages/unicode_map.861
+etc/codepages/unicode_map.866
+etc/codepages/unicode_map.932
+etc/codepages/unicode_map.936
+etc/codepages/unicode_map.949
+etc/codepages/unicode_map.950
+etc/codepages/unicode_map.ISO8859-1
+etc/codepages/unicode_map.ISO8859-2
+etc/codepages/unicode_map.ISO8859-5
+etc/codepages/unicode_map.ISO8859-7
+etc/codepages/unicode_map.KOI8-R
@dirrm etc/codepages
share/doc/samba/COPYING
share/doc/samba/Manifest
share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/NT4-Locking.reg
share/doc/samba/README
share/doc/samba/README.FreeBSD
share/doc/samba/README.swat
@@ -116,6 +135,7 @@ share/doc/samba/htmldocs/DOMAIN_MEMBER.html
share/doc/samba/htmldocs/NT_Security.html
share/doc/samba/htmldocs/lmhosts.5.html
share/doc/samba/htmldocs/make_smbcodepage.1.html
+share/doc/samba/htmldocs/make_unicodemap.1.html
share/doc/samba/htmldocs/nmbd.8.html
share/doc/samba/htmldocs/nmblookup.1.html
share/doc/samba/htmldocs/samba.7.html
@@ -135,6 +155,8 @@ share/doc/samba/htmldocs/swat.8.html
share/doc/samba/htmldocs/testparm.1.html
share/doc/samba/htmldocs/testprns.1.html
share/doc/samba/htmldocs/wfw_slip.htm
+share/doc/samba/textdocs/smbmount.txt
+share/doc/samba/textdocs/NT-Guest-Access.txt
share/doc/samba/textdocs/Application_Serving.txt
share/doc/samba/textdocs/BROWSING-Config.txt
share/doc/samba/textdocs/BROWSING.txt
@@ -187,6 +209,7 @@ share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
share/doc/samba/yodldocs/NT_Security.yo
share/doc/samba/yodldocs/lmhosts.5.yo
share/doc/samba/yodldocs/make_smbcodepage.1.yo
+share/doc/samba/yodldocs/make_unicodemap.1.yo
share/doc/samba/yodldocs/nmbd.8.yo
share/doc/samba/yodldocs/nmblookup.1.yo
share/doc/samba/yodldocs/samba.7.yo
@@ -215,6 +238,7 @@ share/swat/help/DOMAIN_MEMBER.html
share/swat/help/NT_Security.html
share/swat/help/lmhosts.5.html
share/swat/help/make_smbcodepage.1.html
+share/swat/help/make_unicodemap.1.html
share/swat/help/nmbd.8.html
share/swat/help/nmblookup.1.html
share/swat/help/samba.7.html
@@ -244,9 +268,171 @@ share/swat/images/status.gif
share/swat/images/viewconfig.gif
share/swat/include/footer.html
share/swat/include/header.html
+share/swat/using_samba/appa_01.html
+share/swat/using_samba/appa_02.html
+share/swat/using_samba/appa_03.html
+share/swat/using_samba/appa_04.html
+share/swat/using_samba/appa_05.html
+share/swat/using_samba/appb_01.html
+share/swat/using_samba/appb_02.html
+share/swat/using_samba/appb_03.html
+share/swat/using_samba/appc_01.html
+share/swat/using_samba/appd_01.html
+share/swat/using_samba/appe_01.html
+share/swat/using_samba/appf_01.html
+share/swat/using_samba/ch01_01.html
+share/swat/using_samba/ch01_02.html
+share/swat/using_samba/ch01_03.html
+share/swat/using_samba/ch01_04.html
+share/swat/using_samba/ch01_05.html
+share/swat/using_samba/ch01_06.html
+share/swat/using_samba/ch01_07.html
+share/swat/using_samba/ch01_08.html
+share/swat/using_samba/ch02_01.html
+share/swat/using_samba/ch02_02.html
+share/swat/using_samba/ch02_03.html
+share/swat/using_samba/ch02_04.html
+share/swat/using_samba/ch02_05.html
+share/swat/using_samba/ch02_06.html
+share/swat/using_samba/ch03_01.html
+share/swat/using_samba/ch03_02.html
+share/swat/using_samba/ch03_03.html
+share/swat/using_samba/ch04_01.html
+share/swat/using_samba/ch04_02.html
+share/swat/using_samba/ch04_03.html
+share/swat/using_samba/ch04_04.html
+share/swat/using_samba/ch04_05.html
+share/swat/using_samba/ch04_06.html
+share/swat/using_samba/ch04_07.html
+share/swat/using_samba/ch04_08.html
+share/swat/using_samba/ch05_01.html
+share/swat/using_samba/ch05_02.html
+share/swat/using_samba/ch05_03.html
+share/swat/using_samba/ch05_04.html
+share/swat/using_samba/ch05_05.html
+share/swat/using_samba/ch06_01.html
+share/swat/using_samba/ch06_02.html
+share/swat/using_samba/ch06_03.html
+share/swat/using_samba/ch06_04.html
+share/swat/using_samba/ch06_05.html
+share/swat/using_samba/ch06_06.html
+share/swat/using_samba/ch07_01.html
+share/swat/using_samba/ch07_02.html
+share/swat/using_samba/ch07_03.html
+share/swat/using_samba/ch08_01.html
+share/swat/using_samba/ch08_02.html
+share/swat/using_samba/ch08_03.html
+share/swat/using_samba/ch08_04.html
+share/swat/using_samba/ch08_05.html
+share/swat/using_samba/ch08_06.html
+share/swat/using_samba/ch08_07.html
+share/swat/using_samba/ch09_01.html
+share/swat/using_samba/ch09_02.html
+share/swat/using_samba/ch09_03.html
+share/swat/using_samba/index.html
+share/swat/using_samba/inx.html
+share/swat/using_samba/licenseinfo.html
+share/swat/using_samba/this_edition.html
+share/swat/using_samba/figs/sam.0101.gif
+share/swat/using_samba/figs/sam.0102.gif
+share/swat/using_samba/figs/sam.0103.gif
+share/swat/using_samba/figs/sam.0104.gif
+share/swat/using_samba/figs/sam.0105.gif
+share/swat/using_samba/figs/sam.0106.gif
+share/swat/using_samba/figs/sam.0107.gif
+share/swat/using_samba/figs/sam.0108.gif
+share/swat/using_samba/figs/sam.0109.gif
+share/swat/using_samba/figs/sam.0110.gif
+share/swat/using_samba/figs/sam.0111.gif
+share/swat/using_samba/figs/sam.0112.gif
+share/swat/using_samba/figs/sam.0113.gif
+share/swat/using_samba/figs/sam.0114.gif
+share/swat/using_samba/figs/sam.0201.gif
+share/swat/using_samba/figs/sam.0202.gif
+share/swat/using_samba/figs/sam.0203.gif
+share/swat/using_samba/figs/sam.0204.gif
+share/swat/using_samba/figs/sam.0301.gif
+share/swat/using_samba/figs/sam.0302.gif
+share/swat/using_samba/figs/sam.0303.gif
+share/swat/using_samba/figs/sam.0304.gif
+share/swat/using_samba/figs/sam.0305.gif
+share/swat/using_samba/figs/sam.0306.gif
+share/swat/using_samba/figs/sam.0307.gif
+share/swat/using_samba/figs/sam.0308.gif
+share/swat/using_samba/figs/sam.0309.gif
+share/swat/using_samba/figs/sam.0310.gif
+share/swat/using_samba/figs/sam.0311.gif
+share/swat/using_samba/figs/sam.0312.gif
+share/swat/using_samba/figs/sam.0313.gif
+share/swat/using_samba/figs/sam.0314.gif
+share/swat/using_samba/figs/sam.0315.gif
+share/swat/using_samba/figs/sam.0316.gif
+share/swat/using_samba/figs/sam.0317.gif
+share/swat/using_samba/figs/sam.0318.gif
+share/swat/using_samba/figs/sam.0319.gif
+share/swat/using_samba/figs/sam.0320.gif
+share/swat/using_samba/figs/sam.0321.gif
+share/swat/using_samba/figs/sam.0322.gif
+share/swat/using_samba/figs/sam.0323.gif
+share/swat/using_samba/figs/sam.0324.gif
+share/swat/using_samba/figs/sam.0325.gif
+share/swat/using_samba/figs/sam.0326.gif
+share/swat/using_samba/figs/sam.0327.gif
+share/swat/using_samba/figs/sam.0328.gif
+share/swat/using_samba/figs/sam.0401.gif
+share/swat/using_samba/figs/sam.0402.gif
+share/swat/using_samba/figs/sam.0403.gif
+share/swat/using_samba/figs/sam.0404.gif
+share/swat/using_samba/figs/sam.0405.gif
+share/swat/using_samba/figs/sam.0406.gif
+share/swat/using_samba/figs/sam.0407.gif
+share/swat/using_samba/figs/sam.0501.gif
+share/swat/using_samba/figs/sam.0502.gif
+share/swat/using_samba/figs/sam.0503.gif
+share/swat/using_samba/figs/sam.0504.gif
+share/swat/using_samba/figs/sam.0505.gif
+share/swat/using_samba/figs/sam.0506.gif
+share/swat/using_samba/figs/sam.0507.gif
+share/swat/using_samba/figs/sam.0508.gif
+share/swat/using_samba/figs/sam.0601.gif
+share/swat/using_samba/figs/sam.0602.gif
+share/swat/using_samba/figs/sam.0603.gif
+share/swat/using_samba/figs/sam.0604.gif
+share/swat/using_samba/figs/sam.0605.gif
+share/swat/using_samba/figs/sam.0606.gif
+share/swat/using_samba/figs/sam.0701.gif
+share/swat/using_samba/figs/sam.0702.gif
+share/swat/using_samba/figs/sam.0703.gif
+share/swat/using_samba/figs/sam.0704.gif
+share/swat/using_samba/figs/sam.0705.gif
+share/swat/using_samba/figs/sam.0706.gif
+share/swat/using_samba/figs/sam.0707.gif
+share/swat/using_samba/figs/sam.0708.gif
+share/swat/using_samba/figs/sam.0709.gif
+share/swat/using_samba/figs/sam.0801.gif
+share/swat/using_samba/figs/sam.0802.gif
+share/swat/using_samba/figs/sam.0803.gif
+share/swat/using_samba/figs/sam.0804.gif
+share/swat/using_samba/figs/sam.0805.gif
+share/swat/using_samba/figs/sam.0901.gif
+share/swat/using_samba/figs/sam.0902.gif
+share/swat/using_samba/figs/sam.0903.gif
+share/swat/using_samba/figs/sam.0904.gif
+share/swat/using_samba/figs/sam.0905.gif
+share/swat/using_samba/figs/sam.aa01.gif
+share/swat/using_samba/figs/sam.ab01.gif
+share/swat/using_samba/figs/sam.ab02.gif
+share/swat/using_samba/gifs/index.gif
+share/swat/using_samba/gifs/samba.s.gif
+share/swat/using_samba/gifs/txthome.gif
+share/swat/using_samba/gifs/txtnexta.gif
+share/swat/using_samba/gifs/txtpreva.gif
@dirrm share/swat/help
@dirrm share/swat/images
@dirrm share/swat/include
+@dirrm share/swat/using_samba/figs
+@dirrm share/swat/using_samba/gifs
+@dirrm share/swat/using_samba
@dirrm share/swat
@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ; cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
@exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index c70a7a372206..84e9c9b41bc4 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION= 2.0.6
+PORTVERSION= 2.0.7
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
@@ -32,6 +32,7 @@ SAMPLE_CONFIG= ${SAMBA_CONFDIR}/smb.conf.default
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
+ --with-sambabook=${PREFIX}/share/swat/using_samba \
--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
@@ -95,7 +96,9 @@ post-install:
for i in faq htmldocs textdocs yodldocs ; do \
${MKDIR} ${PREFIX}/share/doc/samba/$$i ; \
for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do \
- ${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
+ if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
+ ${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
+ fi; \
done \
done
${MKDIR} ${PREFIX}/share/doc/samba
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 1935d498bef5..37cb33745240 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.6.tar.gz) = 87b3a9a2de94fe44b804f32def38266d
+MD5 (samba-2.0.7.tar.gz) = b5e61ea655d476072fd0365785fea2d0
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index 3c705946b562..3633f55c7b8f 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,17 +1,15 @@
---- Makefile.in.orig Wed Jul 21 03:24:31 1999
-+++ Makefile.in Fri Oct 15 12:04:52 1999
-@@ -23,9 +23,7 @@
-
- BASEDIR= @prefix@
+--- Makefile.in.orig Wed Apr 26 02:06:11 2000
++++ Makefile.in Thu Apr 27 11:08:08 2000
+@@ -25,7 +25,7 @@
BINDIR = @bindir@
--# we don't use sbindir because we want full compatibility with
--# the previous releases of Samba
+ # we don't use sbindir because we want full compatibility with
+ # the previous releases of Samba
-SBINDIR = @bindir@
+SBINDIR = @sbindir@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
-@@ -36,12 +34,13 @@
+@@ -37,12 +37,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))
@@ -28,7 +26,7 @@
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-@@ -53,6 +52,9 @@
+@@ -54,6 +55,9 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -38,7 +36,7 @@
# The directory where code page definition files go
CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -70,7 +72,7 @@
+@@ -71,7 +75,7 @@
PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
diff --git a/net/samba3/files/patch-ab b/net/samba3/files/patch-ab
index b3d798c9f601..40158831ba75 100644
--- a/net/samba3/files/patch-ab
+++ b/net/samba3/files/patch-ab
@@ -1,6 +1,6 @@
---- param/loadparm.c.orig Fri Jan 15 22:35:00 1999
-+++ param/loadparm.c Fri Jan 15 22:33:18 1999
-@@ -104,6 +104,7 @@
+--- param/loadparm.c.orig Wed Apr 26 02:07:00 2000
++++ param/loadparm.c Thu Apr 27 11:12:03 2000
+@@ -105,6 +105,7 @@
{
char *szPrintcapname;
char *szLockDir;
@@ -8,28 +8,28 @@
char *szRootdir;
char *szDefaultService;
char *szDfree;
-@@ -747,6 +748,8 @@
- {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
- {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+@@ -820,6 +821,8 @@
+ {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+ {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+ {"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
+ {"pidfile directory",P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
- {"default service", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, 0},
- {"default", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, 0},
- {"message command", P_STRING, P_GLOBAL, &Globals.szMsgCommand, NULL, NULL, 0},
-@@ -824,6 +827,7 @@
+ #ifdef WITH_UTMP
+ {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+ {"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+@@ -911,6 +914,7 @@
string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
string_set(&Globals.szDriverFile, DRIVERFILE);
string_set(&Globals.szLockDir, LOCKDIR);
+ string_set(&Globals.szPidDir, PIDFILEDIR);
string_set(&Globals.szRootdir, "/");
- string_set(&Globals.szSmbrun, SMBRUN);
- string_set(&Globals.szSocketAddress, "0.0.0.0");
-@@ -1100,6 +1104,7 @@
+ #ifdef WITH_UTMP
+ string_set(&Globals.szUtmpDir, "");
+@@ -1185,6 +1189,7 @@
FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
+FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
- FN_GLOBAL_STRING(lp_rootdir,&Globals.szRootdir)
- FN_GLOBAL_STRING(lp_defaultservice,&Globals.szDefaultService)
- FN_GLOBAL_STRING(lp_msg_command,&Globals.szMsgCommand)
+ #ifdef WITH_UTMP
+ FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
+ FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 0e4477dd2ead..e8e28f5a9c23 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -9,6 +9,7 @@ bin/testparm
bin/testprns
bin/make_smbpasswd
bin/make_smbcodepage
+bin/make_unicodemap
bin/make_printerdef
bin/rpcclient
bin/smbspool
@@ -65,6 +66,7 @@ etc/rc.d/samba.sh.sample
etc/smb.conf.default
etc/codepages/codepage.437
etc/codepages/codepage.737
+etc/codepages/codepage.775
etc/codepages/codepage.850
etc/codepages/codepage.852
etc/codepages/codepage.861
@@ -73,10 +75,27 @@ etc/codepages/codepage.932
etc/codepages/codepage.936
etc/codepages/codepage.949
etc/codepages/codepage.950
+etc/codepages/codepage.1251
+etc/codepages/unicode_map.437
+etc/codepages/unicode_map.737
+etc/codepages/unicode_map.850
+etc/codepages/unicode_map.852
+etc/codepages/unicode_map.861
+etc/codepages/unicode_map.866
+etc/codepages/unicode_map.932
+etc/codepages/unicode_map.936
+etc/codepages/unicode_map.949
+etc/codepages/unicode_map.950
+etc/codepages/unicode_map.ISO8859-1
+etc/codepages/unicode_map.ISO8859-2
+etc/codepages/unicode_map.ISO8859-5
+etc/codepages/unicode_map.ISO8859-7
+etc/codepages/unicode_map.KOI8-R
@dirrm etc/codepages
share/doc/samba/COPYING
share/doc/samba/Manifest
share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/NT4-Locking.reg
share/doc/samba/README
share/doc/samba/README.FreeBSD
share/doc/samba/README.swat
@@ -116,6 +135,7 @@ share/doc/samba/htmldocs/DOMAIN_MEMBER.html
share/doc/samba/htmldocs/NT_Security.html
share/doc/samba/htmldocs/lmhosts.5.html
share/doc/samba/htmldocs/make_smbcodepage.1.html
+share/doc/samba/htmldocs/make_unicodemap.1.html
share/doc/samba/htmldocs/nmbd.8.html
share/doc/samba/htmldocs/nmblookup.1.html
share/doc/samba/htmldocs/samba.7.html
@@ -135,6 +155,8 @@ share/doc/samba/htmldocs/swat.8.html
share/doc/samba/htmldocs/testparm.1.html
share/doc/samba/htmldocs/testprns.1.html
share/doc/samba/htmldocs/wfw_slip.htm
+share/doc/samba/textdocs/smbmount.txt
+share/doc/samba/textdocs/NT-Guest-Access.txt
share/doc/samba/textdocs/Application_Serving.txt
share/doc/samba/textdocs/BROWSING-Config.txt
share/doc/samba/textdocs/BROWSING.txt
@@ -187,6 +209,7 @@ share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
share/doc/samba/yodldocs/NT_Security.yo
share/doc/samba/yodldocs/lmhosts.5.yo
share/doc/samba/yodldocs/make_smbcodepage.1.yo
+share/doc/samba/yodldocs/make_unicodemap.1.yo
share/doc/samba/yodldocs/nmbd.8.yo
share/doc/samba/yodldocs/nmblookup.1.yo
share/doc/samba/yodldocs/samba.7.yo
@@ -215,6 +238,7 @@ share/swat/help/DOMAIN_MEMBER.html
share/swat/help/NT_Security.html
share/swat/help/lmhosts.5.html
share/swat/help/make_smbcodepage.1.html
+share/swat/help/make_unicodemap.1.html
share/swat/help/nmbd.8.html
share/swat/help/nmblookup.1.html
share/swat/help/samba.7.html
@@ -244,9 +268,171 @@ share/swat/images/status.gif
share/swat/images/viewconfig.gif
share/swat/include/footer.html
share/swat/include/header.html
+share/swat/using_samba/appa_01.html
+share/swat/using_samba/appa_02.html
+share/swat/using_samba/appa_03.html
+share/swat/using_samba/appa_04.html
+share/swat/using_samba/appa_05.html
+share/swat/using_samba/appb_01.html
+share/swat/using_samba/appb_02.html
+share/swat/using_samba/appb_03.html
+share/swat/using_samba/appc_01.html
+share/swat/using_samba/appd_01.html
+share/swat/using_samba/appe_01.html
+share/swat/using_samba/appf_01.html
+share/swat/using_samba/ch01_01.html
+share/swat/using_samba/ch01_02.html
+share/swat/using_samba/ch01_03.html
+share/swat/using_samba/ch01_04.html
+share/swat/using_samba/ch01_05.html
+share/swat/using_samba/ch01_06.html
+share/swat/using_samba/ch01_07.html
+share/swat/using_samba/ch01_08.html
+share/swat/using_samba/ch02_01.html
+share/swat/using_samba/ch02_02.html
+share/swat/using_samba/ch02_03.html
+share/swat/using_samba/ch02_04.html
+share/swat/using_samba/ch02_05.html
+share/swat/using_samba/ch02_06.html
+share/swat/using_samba/ch03_01.html
+share/swat/using_samba/ch03_02.html
+share/swat/using_samba/ch03_03.html
+share/swat/using_samba/ch04_01.html
+share/swat/using_samba/ch04_02.html
+share/swat/using_samba/ch04_03.html
+share/swat/using_samba/ch04_04.html
+share/swat/using_samba/ch04_05.html
+share/swat/using_samba/ch04_06.html
+share/swat/using_samba/ch04_07.html
+share/swat/using_samba/ch04_08.html
+share/swat/using_samba/ch05_01.html
+share/swat/using_samba/ch05_02.html
+share/swat/using_samba/ch05_03.html
+share/swat/using_samba/ch05_04.html
+share/swat/using_samba/ch05_05.html
+share/swat/using_samba/ch06_01.html
+share/swat/using_samba/ch06_02.html
+share/swat/using_samba/ch06_03.html
+share/swat/using_samba/ch06_04.html
+share/swat/using_samba/ch06_05.html
+share/swat/using_samba/ch06_06.html
+share/swat/using_samba/ch07_01.html
+share/swat/using_samba/ch07_02.html
+share/swat/using_samba/ch07_03.html
+share/swat/using_samba/ch08_01.html
+share/swat/using_samba/ch08_02.html
+share/swat/using_samba/ch08_03.html
+share/swat/using_samba/ch08_04.html
+share/swat/using_samba/ch08_05.html
+share/swat/using_samba/ch08_06.html
+share/swat/using_samba/ch08_07.html
+share/swat/using_samba/ch09_01.html
+share/swat/using_samba/ch09_02.html
+share/swat/using_samba/ch09_03.html
+share/swat/using_samba/index.html
+share/swat/using_samba/inx.html
+share/swat/using_samba/licenseinfo.html
+share/swat/using_samba/this_edition.html
+share/swat/using_samba/figs/sam.0101.gif
+share/swat/using_samba/figs/sam.0102.gif
+share/swat/using_samba/figs/sam.0103.gif
+share/swat/using_samba/figs/sam.0104.gif
+share/swat/using_samba/figs/sam.0105.gif
+share/swat/using_samba/figs/sam.0106.gif
+share/swat/using_samba/figs/sam.0107.gif
+share/swat/using_samba/figs/sam.0108.gif
+share/swat/using_samba/figs/sam.0109.gif
+share/swat/using_samba/figs/sam.0110.gif
+share/swat/using_samba/figs/sam.0111.gif
+share/swat/using_samba/figs/sam.0112.gif
+share/swat/using_samba/figs/sam.0113.gif
+share/swat/using_samba/figs/sam.0114.gif
+share/swat/using_samba/figs/sam.0201.gif
+share/swat/using_samba/figs/sam.0202.gif
+share/swat/using_samba/figs/sam.0203.gif
+share/swat/using_samba/figs/sam.0204.gif
+share/swat/using_samba/figs/sam.0301.gif
+share/swat/using_samba/figs/sam.0302.gif
+share/swat/using_samba/figs/sam.0303.gif
+share/swat/using_samba/figs/sam.0304.gif
+share/swat/using_samba/figs/sam.0305.gif
+share/swat/using_samba/figs/sam.0306.gif
+share/swat/using_samba/figs/sam.0307.gif
+share/swat/using_samba/figs/sam.0308.gif
+share/swat/using_samba/figs/sam.0309.gif
+share/swat/using_samba/figs/sam.0310.gif
+share/swat/using_samba/figs/sam.0311.gif
+share/swat/using_samba/figs/sam.0312.gif
+share/swat/using_samba/figs/sam.0313.gif
+share/swat/using_samba/figs/sam.0314.gif
+share/swat/using_samba/figs/sam.0315.gif
+share/swat/using_samba/figs/sam.0316.gif
+share/swat/using_samba/figs/sam.0317.gif
+share/swat/using_samba/figs/sam.0318.gif
+share/swat/using_samba/figs/sam.0319.gif
+share/swat/using_samba/figs/sam.0320.gif
+share/swat/using_samba/figs/sam.0321.gif
+share/swat/using_samba/figs/sam.0322.gif
+share/swat/using_samba/figs/sam.0323.gif
+share/swat/using_samba/figs/sam.0324.gif
+share/swat/using_samba/figs/sam.0325.gif
+share/swat/using_samba/figs/sam.0326.gif
+share/swat/using_samba/figs/sam.0327.gif
+share/swat/using_samba/figs/sam.0328.gif
+share/swat/using_samba/figs/sam.0401.gif
+share/swat/using_samba/figs/sam.0402.gif
+share/swat/using_samba/figs/sam.0403.gif
+share/swat/using_samba/figs/sam.0404.gif
+share/swat/using_samba/figs/sam.0405.gif
+share/swat/using_samba/figs/sam.0406.gif
+share/swat/using_samba/figs/sam.0407.gif
+share/swat/using_samba/figs/sam.0501.gif
+share/swat/using_samba/figs/sam.0502.gif
+share/swat/using_samba/figs/sam.0503.gif
+share/swat/using_samba/figs/sam.0504.gif
+share/swat/using_samba/figs/sam.0505.gif
+share/swat/using_samba/figs/sam.0506.gif
+share/swat/using_samba/figs/sam.0507.gif
+share/swat/using_samba/figs/sam.0508.gif
+share/swat/using_samba/figs/sam.0601.gif
+share/swat/using_samba/figs/sam.0602.gif
+share/swat/using_samba/figs/sam.0603.gif
+share/swat/using_samba/figs/sam.0604.gif
+share/swat/using_samba/figs/sam.0605.gif
+share/swat/using_samba/figs/sam.0606.gif
+share/swat/using_samba/figs/sam.0701.gif
+share/swat/using_samba/figs/sam.0702.gif
+share/swat/using_samba/figs/sam.0703.gif
+share/swat/using_samba/figs/sam.0704.gif
+share/swat/using_samba/figs/sam.0705.gif
+share/swat/using_samba/figs/sam.0706.gif
+share/swat/using_samba/figs/sam.0707.gif
+share/swat/using_samba/figs/sam.0708.gif
+share/swat/using_samba/figs/sam.0709.gif
+share/swat/using_samba/figs/sam.0801.gif
+share/swat/using_samba/figs/sam.0802.gif
+share/swat/using_samba/figs/sam.0803.gif
+share/swat/using_samba/figs/sam.0804.gif
+share/swat/using_samba/figs/sam.0805.gif
+share/swat/using_samba/figs/sam.0901.gif
+share/swat/using_samba/figs/sam.0902.gif
+share/swat/using_samba/figs/sam.0903.gif
+share/swat/using_samba/figs/sam.0904.gif
+share/swat/using_samba/figs/sam.0905.gif
+share/swat/using_samba/figs/sam.aa01.gif
+share/swat/using_samba/figs/sam.ab01.gif
+share/swat/using_samba/figs/sam.ab02.gif
+share/swat/using_samba/gifs/index.gif
+share/swat/using_samba/gifs/samba.s.gif
+share/swat/using_samba/gifs/txthome.gif
+share/swat/using_samba/gifs/txtnexta.gif
+share/swat/using_samba/gifs/txtpreva.gif
@dirrm share/swat/help
@dirrm share/swat/images
@dirrm share/swat/include
+@dirrm share/swat/using_samba/figs
+@dirrm share/swat/using_samba/gifs
+@dirrm share/swat/using_samba
@dirrm share/swat
@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ; cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
@exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba
generated by cgit (git 2.34.1) at 2024-12-25 01:47:17 +0800