diff options
| -rw-r--r-- | net/samba/Makefile | 68 | ||||
| -rw-r--r-- | net/samba/files/md5 | 4 | ||||
| -rw-r--r-- | net/samba/files/patch-sum | 5 | ||||
| -rw-r--r-- | net/samba/files/samba.sh | 12 | ||||
| -rw-r--r-- | net/samba/patches/patch-aa | 22 | ||||
| -rw-r--r-- | net/samba/patches/patch-ab | 22 | ||||
| -rw-r--r-- | net/samba/pkg/PLIST | 102 |
7 files changed, 139 insertions, 96 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 63421cb12b9..39a6bb0fe24 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.28 1999/10/06 17:05:23 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.29 1999/11/16 21:01:04 jlam Exp $ -DISTNAME= samba-2.0.5a +DISTNAME= samba-2.0.6 WRKSRC= ${WRKDIR}/${DISTNAME}/source CATEGORIES= net MASTER_SITES= ftp://ftp.samba.org/pub/samba/ @@ -24,44 +24,42 @@ SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private MAKE_ENV+= ETCDIR=${SAMBA_ETCDIR} MAKE_ENV+= LOGDIR=${SAMBA_LOGDIR} -CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/swat \ - --with-lockdir=${SAMBA_LOCKDIR} \ - --with-privatedir=${SAMBA_PRIVATE} +CONFIGURE_ARGS= --with-swatdir=${PREFIX}/share/swat \ + --with-lockdir=${SAMBA_LOCKDIR} \ + --with-privatedir=${SAMBA_PRIVATE} -PLIST_SRC= ${WRKDIR}/.PLIST-src +PLIST_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} post-install: - ${MKDIR} ${PREFIX}/share/doc/samba/faq - ${MKDIR} ${PREFIX}/share/doc/samba/textdocs - for i in ${WRKDIR}/${DISTNAME}/docs/NT4_PlainPassword.reg \ - ${WRKDIR}/${DISTNAME}/docs/Win95_PlainPassword.reg \ - ${WRKDIR}/${DISTNAME}/docs/THANKS ; do \ - ${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba; \ + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/faq + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/textdocs + cd ${WRKDIR}/${DISTNAME}/docs; \ + for file in NT4-Locking.txt NT4_PlainPassword.reg \ + Win2000_PlainPassword.reg Win95_PlainPassword.reg \ + Win98_PlainPassword.reg Win9X-CacheHandling.reg \ + WindowsTerminalServer.reg THANKS announce ; do \ + ${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba; \ done - for i in ${WRKDIR}/${DISTNAME}/docs/faq/* ; do \ - ${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/faq; \ + for file in ${WRKDIR}/${DISTNAME}/docs/faq/*.html ; do \ + ${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba/faq; \ done - for i in ${WRKDIR}/${DISTNAME}/docs/textdocs/* ; do \ - ${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/textdocs; \ + for file in ${WRKDIR}/${DISTNAME}/docs/textdocs/* ; do \ + ${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba/textdocs; \ done - @${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ - ${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; \ - ${ECHO} 'smbd=${PREFIX}/sbin/smbd' >> ${STARTUP_SCRIPT}; \ - ${ECHO} 'nmbd=${PREFIX}/sbin/nmbd' >> ${STARTUP_SCRIPT}; \ - ${ECHO} 'if [ -f $$smbd ]; then' >> ${STARTUP_SCRIPT}; \ - ${ECHO} " ${ECHO} -n ' Samba'" >> ${STARTUP_SCRIPT}; \ - ${ECHO} ' $$smbd -D' >> ${STARTUP_SCRIPT}; \ - ${ECHO} ' $$nmbd -D' >> ${STARTUP_SCRIPT}; \ - ${ECHO} "fi" >> ${STARTUP_SCRIPT}; \ - ${CHMOD} 755 ${STARTUP_SCRIPT}; \ - ${CHOWN} ${BINOWN}:${BINGRP} ${STARTUP_SCRIPT}; - @if [ ! -f ${SAMPLE_CONFIG} ]; then \ - ${SED} -e 's:__LOGDIR__:${SAMBA_LOGDIR}:g' \ - -e 's:__ETCDIR__:${SAMBA_ETCDIR}:g' \ - -e 's:__PREFIX__:${PREFIX}:g' \ - ${FILESDIR}/smb.conf.sample \ - > ${SAMPLE_CONFIG} ; \ - fi + + ${SED} -e "s:__PREFIX__:${PREFIX}:g" \ + -e "s:__ECHO__:${ECHO}:g" \ + ${FILESDIR}/samba.sh \ + > ${WRKDIR}/samba.sh + ${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${STARTUP_SCRIPT} + + ${SED} -e 's:__LOGDIR__:${SAMBA_LOGDIR}:g' \ + -e 's:__ETCDIR__:${SAMBA_ETCDIR}:g' \ + -e 's:__PREFIX__:${PREFIX}:g' \ + ${FILESDIR}/smb.conf.sample \ + > ${WRKDIR}/smb.conf.sample + ${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${SAMPLE_CONFIG} + ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin if [ ! -d ${SAMBA_PRIVATE} ] ; then \ ${MKDIR} ${SAMBA_PRIVATE} ; \ @@ -73,7 +71,5 @@ post-install: > ${SAMBA_PRIVATE}/smbpasswd ; \ ${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd ; \ fi - ${SED} -e 's:__SAMBA_PRIVATE__:${SAMBA_PRIVATE}:g' ${PKGDIR}/PLIST \ - > ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" diff --git a/net/samba/files/md5 b/net/samba/files/md5 index a9bff4d9638..5f342bbf990 100644 --- a/net/samba/files/md5 +++ b/net/samba/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.11 1999/08/10 16:38:09 bouyer Exp $ +$NetBSD: md5,v 1.12 1999/11/16 21:01:05 jlam Exp $ -MD5 (samba-2.0.5a.tar.gz) = 497e5f98ed9b520b18e926ff2f7307ba +MD5 (samba-2.0.6.tar.gz) = 87b3a9a2de94fe44b804f32def38266d diff --git a/net/samba/files/patch-sum b/net/samba/files/patch-sum index 5f5d7044bdd..26037e873bb 100644 --- a/net/samba/files/patch-sum +++ b/net/samba/files/patch-sum @@ -1,3 +1,4 @@ -$NetBSD: patch-sum,v 1.2 1999/08/10 16:38:09 bouyer Exp $ +$NetBSD: patch-sum,v 1.3 1999/11/16 21:01:05 jlam Exp $ -MD5 (patch-aa) = fcaa48677643b782d79f3b48dd9442c1 +MD5 (patch-aa) = ec7d06cb6906d123898042ddc1023de6 +MD5 (patch-ab) = 7964a37dc354868db4734997be75b2f8 diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh new file mode 100644 index 00000000000..44e38beea81 --- /dev/null +++ b/net/samba/files/samba.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $NetBSD: samba.sh,v 1.1 1999/11/16 21:01:05 jlam Exp $ + +smbd=__PREFIX__/sbin/smbd +nmbd=__PREFIX__/sbin/nmbd + +if [ -f ${smbd} ]; then + __ECHO__ -n ' samba' + ${smbd} -D + ${nmbd} -D +fi diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa index 824b9c49f83..2d6a3b1d14b 100644 --- a/net/samba/patches/patch-aa +++ b/net/samba/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.8 1999/08/10 16:38:09 bouyer Exp $ +$NetBSD: patch-aa,v 1.9 1999/11/16 21:01:05 jlam Exp $ ---- Makefile.in.orig Tue Jul 20 21:24:31 1999 -+++ Makefile.in Sun Aug 8 21:31:11 1999 -@@ -26,8 +26,9 @@ +--- Makefile.in.orig Wed Nov 10 21:35:55 1999 ++++ Makefile.in Tue Nov 16 10:36:48 1999 +@@ -25,10 +25,11 @@ + BINDIR = @bindir@ # we don't use sbindir because we want full compatibility with # the previous releases of Samba -SBINDIR = @bindir@ @@ -14,7 +15,9 @@ $NetBSD: patch-aa,v 1.8 1999/08/10 16:38:09 bouyer Exp $ +LOGDIR?= $(BASEDIR)/log # The permissions to give the executables -@@ -37,10 +38,10 @@ + INSTALLPERMS = 0755 +@@ -36,12 +37,12 @@ + # 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 @@ -31,7 +34,9 @@ $NetBSD: patch-aa,v 1.8 1999/08/10 16:38:09 bouyer Exp $ +PASSWD_PROGRAM = /usr/bin/passwd # This is where smbpasswd et al go PRIVATEDIR = @privatedir@ -@@ -443,6 +444,6 @@ + +@@ -458,8 +459,8 @@ + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS) installbin: all installdirs - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS) @@ -40,7 +45,9 @@ $NetBSD: patch-aa,v 1.8 1999/08/10 16:38:09 bouyer Exp $ + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS) installscripts: installdirs -@@ -469,6 +470,6 @@ + @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS) +@@ -484,8 +485,8 @@ + @$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir) uninstallbin: - @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS) @@ -49,3 +56,4 @@ $NetBSD: patch-aa,v 1.8 1999/08/10 16:38:09 bouyer Exp $ + @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS) uninstallscripts: + @$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS) diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab new file mode 100644 index 00000000000..e094c34f4bd --- /dev/null +++ b/net/samba/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.7 1999/11/16 21:01:05 jlam Exp $ + +--- configure.orig Wed Oct 13 01:26:42 1999 ++++ configure Tue Nov 16 10:40:35 1999 +@@ -3478,7 +3478,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lreadline $LIBS" ++LIBS="-lreadline -ltermcap $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3484 "configure" + #include "confdefs.h" +@@ -3512,7 +3512,7 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lreadline $LIBS" ++ LIBS="-lreadline -ltermcap $LIBS" + + else + echo "$ac_t""no" 1>&6 diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST index d1c7b038331..5593c4c1471 100644 --- a/net/samba/pkg/PLIST +++ b/net/samba/pkg/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.12 1999/08/10 16:38:10 bouyer Exp $ -bin/mksmbpasswd.sh +@comment $NetBSD: PLIST,v 1.13 1999/11/16 21:01:05 jlam Exp $ bin/addtosmbpass bin/convert_smbpasswd bin/make_printerdef bin/make_smbcodepage +bin/mksmbpasswd.sh bin/nmblookup bin/rpcclient bin/smbclient @@ -12,6 +12,7 @@ bin/smbstatus bin/smbtar bin/testparm bin/testprns +etc/rc.d/samba.sh.sample lib/codepages/codepage.437 lib/codepages/codepage.737 lib/codepages/codepage.850 @@ -42,43 +43,21 @@ man/man8/smbmount.8 man/man8/smbpasswd.8 man/man8/smbumount.8 man/man8/swat.8 -share/swat/help/DOMAIN_MEMBER.html -share/swat/help/lmhosts.5.html -share/swat/help/make_smbcodepage.1.html -share/swat/help/nmbd.8.html -share/swat/help/nmblookup.1.html -share/swat/help/NT_Security.html -share/swat/help/samba.7.html -share/swat/help/smb.conf.5.html -share/swat/help/smbclient.1.html -share/swat/help/smbd.8.html -share/swat/help/smbpasswd.5.html -share/swat/help/smbpasswd.8.html -share/swat/help/smbrun.1.html -share/swat/help/smbsh.1.html -share/swat/help/smbstatus.1.html -share/swat/help/smbtar.1.html -share/swat/help/swat.8.html -share/swat/help/testparm.1.html -share/swat/help/testprns.1.html -share/swat/help/welcome.html -share/swat/images/globals.gif -share/swat/images/home.gif -share/swat/images/passwd.gif -share/swat/images/printers.gif -share/swat/images/samba.gif -share/swat/images/shares.gif -share/swat/images/status.gif -share/swat/images/viewconfig.gif -share/swat/include/footer.html -share/swat/include/header.html -sbin/smbd sbin/nmbd +sbin/smbd sbin/swat +share/doc/samba/NT4-Locking.txt +share/doc/samba/NT4_PlainPassword.reg +share/doc/samba/THANKS +share/doc/samba/Win2000_PlainPassword.reg +share/doc/samba/Win95_PlainPassword.reg +share/doc/samba/Win98_PlainPassword.reg +share/doc/samba/Win9X-CacheHandling.reg +share/doc/samba/WindowsTerminalServer.reg +share/doc/samba/announce share/doc/samba/faq/Samba-Server-FAQ-1.html share/doc/samba/faq/Samba-Server-FAQ-2.html share/doc/samba/faq/Samba-Server-FAQ.html -share/doc/samba/faq/Samba-Server-FAQ.sgml share/doc/samba/faq/Samba-meta-FAQ-1.html share/doc/samba/faq/Samba-meta-FAQ-2.html share/doc/samba/faq/Samba-meta-FAQ-3.html @@ -86,22 +65,18 @@ share/doc/samba/faq/Samba-meta-FAQ-4.html share/doc/samba/faq/Samba-meta-FAQ-5.html share/doc/samba/faq/Samba-meta-FAQ-6.html share/doc/samba/faq/Samba-meta-FAQ.html -share/doc/samba/faq/Samba-meta-FAQ.sgml -share/doc/samba/faq/Samba-meta-FAQ.txt share/doc/samba/faq/sambafaq-1.html share/doc/samba/faq/sambafaq-2.html share/doc/samba/faq/sambafaq-3.html share/doc/samba/faq/sambafaq-4.html share/doc/samba/faq/sambafaq-5.html share/doc/samba/faq/sambafaq.html -share/doc/samba/faq/sambafaq.sgml -share/doc/samba/faq/sambafaq.txt share/doc/samba/textdocs/Application_Serving.txt share/doc/samba/textdocs/BROWSING-Config.txt share/doc/samba/textdocs/BROWSING.txt share/doc/samba/textdocs/BUGS.txt -share/doc/samba/textdocs/CVS_ACCESS.txt share/doc/samba/textdocs/CRLF-LF-Conversions.txt +share/doc/samba/textdocs/CVS_ACCESS.txt share/doc/samba/textdocs/DHCP-Server-Configuration.txt share/doc/samba/textdocs/DIAGNOSIS.txt share/doc/samba/textdocs/DNIX.txt @@ -109,8 +84,8 @@ share/doc/samba/textdocs/DOMAIN.txt share/doc/samba/textdocs/DOMAIN_CONTROL.txt share/doc/samba/textdocs/DOMAIN_MEMBER.txt share/doc/samba/textdocs/ENCRYPTION.txt -share/doc/samba/textdocs/File-Cacheing.txt share/doc/samba/textdocs/Faxing.txt +share/doc/samba/textdocs/File-Cacheing.txt share/doc/samba/textdocs/GOTCHAS.txt share/doc/samba/textdocs/HINTS.txt share/doc/samba/textdocs/INSTALL.sambatar @@ -128,7 +103,6 @@ share/doc/samba/textdocs/Printing.txt share/doc/samba/textdocs/README.DCEDFS share/doc/samba/textdocs/README.jis share/doc/samba/textdocs/README.sambatar -share/doc/samba/textdocs/README.smbmount share/doc/samba/textdocs/Recent-FAQs.txt share/doc/samba/textdocs/RoutedNetworks.txt share/doc/samba/textdocs/SCO.txt @@ -145,18 +119,48 @@ share/doc/samba/textdocs/Win95.txt share/doc/samba/textdocs/WinNT.txt share/doc/samba/textdocs/cifsntdomain.txt share/doc/samba/textdocs/security_level.txt -share/doc/samba/NT4_PlainPassword.reg -share/doc/samba/Win95_PlainPassword.reg -share/doc/samba/THANKS -etc/rc.d/samba.sh.sample share/examples/smb.conf.sample -@dirrm share/doc/samba/faq +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/nmbd.8.html +share/swat/help/nmblookup.1.html +share/swat/help/samba.7.html +share/swat/help/smb.conf.5.html +share/swat/help/smbclient.1.html +share/swat/help/smbd.8.html +share/swat/help/smbmnt.8.html +share/swat/help/smbmount.8.html +share/swat/help/smbpasswd.5.html +share/swat/help/smbpasswd.8.html +share/swat/help/smbrun.1.html +share/swat/help/smbsh.1.html +share/swat/help/smbspool.8.html +share/swat/help/smbstatus.1.html +share/swat/help/smbtar.1.html +share/swat/help/swat.8.html +share/swat/help/testparm.1.html +share/swat/help/testprns.1.html +share/swat/help/welcome.html +share/swat/help/welcome.ja_JP.ujis.html +share/swat/images/globals.gif +share/swat/images/home.gif +share/swat/images/passwd.gif +share/swat/images/printers.gif +share/swat/images/samba.gif +share/swat/images/shares.gif +share/swat/images/status.gif +share/swat/images/viewconfig.gif +share/swat/include/footer.html +share/swat/include/header.html @dirrm share/doc/samba/textdocs +@dirrm share/doc/samba/faq @dirrm share/doc/samba -@dirrm share/swat/help @dirrm share/swat/images @dirrm share/swat/include +@dirrm share/swat/help @dirrm share/swat @dirrm lib/codepages -@exec mkdir -p __SAMBA_PRIVATE__ ; if [ ! -f __SAMBA_PRIVATE__/smbpasswd ] ; then chown -R root:wheel __SAMBA_PRIVATE__ ; cat /etc/passwd | %D/bin/mksmbpasswd.sh > __SAMBA_PRIVATE__/smbpasswd ; chmod 500 __SAMBA_PRIVATE__ ; chmod 600 __SAMBA_PRIVATE__/smbpasswd ; fi -@unexec echo "Warning: If you will *NOT* use this package anymore, please remove __SAMBA_PRIVATE__/smbpasswd manually." +@exec mkdir -p ${SAMBA_PRIVATE} ; if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then chown -R root:wheel ${SAMBA_PRIVATE} ; cat /etc/passwd | %D/bin/mksmbpasswd.sh > ${SAMBA_PRIVATE}/smbpasswd ; chmod 500 ${SAMBA_PRIVATE} ; chmod 600 ${SAMBA_PRIVATE}/smbpasswd ; fi +@unexec echo "Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/smbpasswd manually." |