Update to Samba 3.0.21b.

requested by and ok brad@
This commit is contained in:
mbalmer 2006-02-02 09:40:43 +00:00
parent 30f05c8f3e
commit 9d1bd157c2
11 changed files with 152 additions and 52 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.63 2006/01/14 14:06:45 mbalmer Exp $
# $OpenBSD: Makefile,v 1.64 2006/02/02 09:40:43 mbalmer Exp $
COMMENT= "SMB and CIFS client and server for UNIX"
COMMENT-docs= "documentation and examples for samba"
DISTNAME= samba-3.0.20b
PKGNAME= ${DISTNAME}p2
DISTNAME= samba-3.0.21b
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
SHARED_LIBS= smbclient 0.1
SHARED_LIBS= smbclient 0.2 \
msrpc 0.1
CATEGORIES= net
@ -30,10 +30,12 @@ MODULES= converters/libiconv
LIB_DEPENDS= popt::devel/popt
MAKE_FLAGS= PASSWD_PROGRAM="/usr/bin/passwd" \
LIBsmbclient_VERSION=${LIBsmbclient_VERSION}
LIBsmbclient_VERSION=${LIBsmbclient_VERSION} \
LIBmsrpc_VERSION=${LIBmsrpc_VERSION}
FAKE_FLAGS= DESTDIR="${DESTDIR}" \
LIBsmbclient_VERSION=${LIBsmbclient_VERSION}
LIBsmbclient_VERSION=${LIBsmbclient_VERSION} \
LIBmsrpc_VERSION=${LIBmsrpc_VERSION}
CONFDIR= ${SYSCONFDIR}/samba
SAMBA_LOGDIR= /var/log
SUBST_VARS= CONFDIR LOCALBASE SYSCONFDIR
@ -123,8 +125,9 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \
${PREFIX}/bin/mksmbpasswd
@chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/smbpasswd
#@rm ${PREFIX}/lib/libsmbclient.so.${LIBsmbclient_VERSION}
@ln -s samba/libsmbclient.so.${LIBsmbclient_VERSION} \
${PREFIX}/lib/libsmbclient.so.${LIBsmbclient_VERSION}
@ln -s samba/libmsrpc.so.${LIBmsrpc_VERSION} \
${PREFIX}/lib/libmsrpc.so.${LIBmsrpc_VERSION}
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (samba-3.0.20b.tar.gz) = 39c0cae08fe0224cb003aa0af97d3050
RMD160 (samba-3.0.20b.tar.gz) = c7fe6cf7e3cae6835efd631f9c7d8b97c8253370
SHA1 (samba-3.0.20b.tar.gz) = e46fa8465dd70c670d84d697e408e70cbc18bb56
SIZE (samba-3.0.20b.tar.gz) = 17165513
MD5 (samba-3.0.21b.tar.gz) = bb73dffb33f4a39386ef9f3e07ae28ff
RMD160 (samba-3.0.21b.tar.gz) = 883f855523e2a079cd7295df6647b3cb9b56c23a
SHA1 (samba-3.0.21b.tar.gz) = 349324617a091d13102b97fe8dd37c3632ebe2ed
SIZE (samba-3.0.21b.tar.gz) = 17539079

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2006/01/03 21:21:52 steven Exp $
--- Makefile.in.orig Wed Oct 12 19:03:23 2005
+++ Makefile.in Tue Jan 3 18:26:33 2006
@@ -93,9 +93,10 @@ LOCKDIR = @lockdir@
$OpenBSD: patch-Makefile_in,v 1.5 2006/02/02 09:40:43 mbalmer Exp $
--- Makefile.in.orig Mon Jan 30 19:38:49 2006
+++ Makefile.in Tue Jan 31 11:27:13 2006
@@ -94,11 +94,13 @@ LOCKDIR = @lockdir@
# the directory where pid files go
PIDDIR = @piddir@
@ -11,9 +11,22 @@ $OpenBSD: patch-Makefile_in,v 1.4 2006/01/03 21:21:52 steven Exp $
+LIBSMBCLIENT=bin/libsmbclient.a \
+ @LIBSMBCLIENT_SHARED@.$(LIBsmbclient_VERSION)
LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@
LIBSMBSHAREMODES_MAJOR=0
@@ -992,11 +993,10 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bi
-LIBMSRPC=bin/libmsrpc.a @LIBMSRPC_SHARED@
+LIBMSRPC=bin/libmsrpc.a \
+ @LIBMSRPC_SHARED@.$(LIBmsrpc_VERSION)
LIBMSRPC_MAJOR=0
LIBMSRPC_MINOR=1
@@ -782,7 +784,7 @@ wins : SHOWFLAGS @WINBIND_WINS_NSS@
modules: SHOWFLAGS proto_exists $(MODULES)
-cac: SHOWFLAGS bin/libmsrpc.@SHLIBEXT@ bin/libmsrpc.a
+cac: SHOWFLAGS bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION) bin/libmsrpc.a
everything: all libsmbclient debug2html smbfilter talloctort modules torture eventlogadm \
$(EVERYTHING_PROGS)
@@ -1051,11 +1053,10 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bi
$(KRB5LIBS) $(LDAP_LIBS) \
@SONAMEFLAG@`basename $@`
@ -27,12 +40,33 @@ $OpenBSD: patch-Makefile_in,v 1.4 2006/01/03 21:21:52 steven Exp $
bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient non-shared library $@
@@ -1364,7 +1364,7 @@ installswat: installdirs installmsg
@@ -1071,10 +1072,9 @@ bin/libsmbsharemodes.a: $(LIBSMBSHAREMOD
@echo Linking libsmbsharemodes non-shared library $@
@-$(AR) -rc $@ $(LIBSMBSHAREMODES_PICOBJS)
-bin/libmsrpc.@SHLIBEXT@: $(CAC_PICOBJS)
+bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION): $(CAC_PICOBJS)
@echo Linking libmsrpc shared library $@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
- @SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS)
bin/libmsrpc.a: $(CAC_PICOBJS)
@echo Linking libmsrpc non-shared library $@
@@ -1441,14 +1441,14 @@ installswat: installdirs installmsg
installclientlib: installdirs libsmbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(LIBDIR)
- -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
+ -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@.$(LIBsmbclient_VERSION) $(DESTDIR)$(LIBDIR)
-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
- -$(INSTALLLIBCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
+ -$(INSTALLLIBCMD_SH) bin/libsmbclient.@SHLIBEXT@.$(LIBsmbclient_VERSION) $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
installlibmsrpc: installdirs libmsrpc
@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(LIBDIR)
- -$(INSTALLLIBCMD_SH) bin/libmsrpc.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
+ -$(INSTALLLIBCMD_SH) bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION) $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
-$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.8 2005/11/03 15:10:20 mbalmer Exp $
--- configure.in.orig Tue Nov 1 22:37:43 2005
+++ configure.in Tue Nov 1 22:40:03 2005
@@ -1422,6 +1422,7 @@ if test "$enable_shared" = "yes"; then
$OpenBSD: patch-configure_in,v 1.9 2006/02/02 09:40:43 mbalmer Exp $
--- configure.in.orig Mon Jan 30 15:45:07 2006
+++ configure.in Tue Jan 31 10:01:18 2006
@@ -1449,6 +1449,7 @@ if test "$enable_shared" = "yes"; then
DYNEXP="-Wl,-Bdynamic"
SONAMEFLAG="-Wl,-soname,"
PICFLAGS="-fPIC"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_smbrun_c,v 1.1 2005/05/27 04:54:40 sturm Exp $
--- lib/smbrun.c.orig Thu May 26 14:43:30 2005
+++ lib/smbrun.c Thu May 26 14:43:54 2005
@@ -172,7 +172,7 @@ int smbrun(char *cmd, int *outfd)
$OpenBSD: patch-lib_smbrun_c,v 1.2 2006/02/02 09:40:43 mbalmer Exp $
--- lib/smbrun.c.orig Tue Oct 18 04:45:00 2005
+++ lib/smbrun.c Wed Dec 21 10:25:13 2005
@@ -172,7 +172,7 @@ int smbrun(const char *cmd, int *outfd)
}
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_smbrun_c,v 1.1 2005/05/27 04:54:40 sturm Exp $
/* not reached */
exit(82);
@@ -293,7 +293,7 @@ int smbrunsecret(char *cmd, char *secret
@@ -299,7 +299,7 @@ int smbrunsecret(const char *cmd, const
}
#endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-smbd_chgpasswd_c,v 1.1 2005/05/27 04:54:40 sturm Exp $
--- smbd/chgpasswd.c.orig Thu May 26 14:42:51 2005
+++ smbd/chgpasswd.c Thu May 26 14:43:09 2005
@@ -218,7 +218,7 @@ static int dochild(int master, const cha
$OpenBSD: patch-smbd_chgpasswd_c,v 1.2 2006/02/02 09:40:43 mbalmer Exp $
--- smbd/chgpasswd.c.orig Wed Jan 25 00:46:32 2006
+++ smbd/chgpasswd.c Tue Jan 31 10:01:07 2006
@@ -222,7 +222,7 @@ static int dochild(int master, const cha
passwordprogram));
/* execl() password-change application */

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-smbd_utmp_c,v 1.3 2005/11/03 15:10:20 mbalmer Exp $
$OpenBSD: patch-smbd_utmp_c,v 1.4 2006/02/02 09:40:43 mbalmer Exp $
--- smbd/utmp.c.orig Fri Feb 25 18:59:26 2005
+++ smbd/utmp.c Wed Jun 15 19:36:32 2005
@@ -245,6 +245,7 @@ static void uw_pathname(pstring fname, c

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-web_swat_c,v 1.3 2005/11/03 15:10:20 mbalmer Exp $
$OpenBSD: patch-web_swat_c,v 1.4 2006/02/02 09:40:43 mbalmer Exp $
--- web/swat.c.orig Thu Sep 29 23:52:45 2005
+++ web/swat.c Tue Oct 4 09:16:29 2005
@@ -136,8 +136,10 @@ static int include_html(const char *fnam

View File

@ -1,8 +1,11 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/03 21:21:52 steven Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2006/02/02 09:40:43 mbalmer Exp $
@lib lib/libmsrpc.so.${LIBmsrpc_VERSION}
@lib lib/libsmbclient.so.${LIBsmbclient_VERSION}
lib/samba/auth/script.so
lib/samba/charset/
lib/samba/charset/CP437.so
lib/samba/charset/CP850.so
@lib lib/samba/libmsrpc.so.${LIBmsrpc_VERSION}
@lib lib/samba/libsmbclient.so.${LIBsmbclient_VERSION}
lib/samba/vfs/
lib/samba/vfs/audit.so

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.24 2006/01/14 14:06:45 mbalmer Exp $
@comment $OpenBSD: PLIST,v 1.25 2006/02/02 09:40:43 mbalmer Exp $
bin/eventlogadm
bin/findsmb
bin/mksmbpasswd
bin/net
@ -11,6 +12,7 @@ bin/smbcacls
bin/smbclient
bin/smbcontrol
bin/smbcquotas
bin/smbget
bin/smbpasswd
bin/smbspool
bin/smbstatus
@ -20,6 +22,7 @@ bin/tdbbackup
bin/tdbdump
bin/tdbtool
bin/testparm
include/libmsrpc.h
include/libsmbclient.h
lib/samba/
lib/samba/auth/
@ -40,7 +43,6 @@ lib/samba/valid.dat
libexec/nmbd
libexec/smbd
libexec/swat
@man man/man1/editreg.1
@man man/man1/findsmb.1
@man man/man1/log2pcap.1
@man man/man1/nmblookup.1
@ -52,24 +54,22 @@ libexec/swat
@man man/man1/smbcontrol.1
@man man/man1/smbcquotas.1
@man man/man1/smbget.1
@man man/man1/smbsh.1
@man man/man1/smbstatus.1
@man man/man1/smbtar.1
@man man/man1/smbtree.1
@man man/man1/testparm.1
@man man/man1/testprns.1
@man man/man1/vfstest.1
@man man/man1/wbinfo.1
@man man/man5/lmhosts.5
@man man/man5/smb.conf.5
@man man/man5/smbgetrc.5
@man man/man5/smbpasswd.5
@man man/man7/libsmbclient.7
@man man/man7/pam_winbind.7
@man man/man7/samba.7
@man man/man8/libsmbclient.8
@man man/man8/mount.cifs.8
@man man/man8/net.8
@man man/man8/nmbd.8
@man man/man8/pam_winbind.8
@man man/man8/pdbedit.8
@man man/man8/smbd.8
@man man/man8/smbmnt.8
@ -82,7 +82,6 @@ libexec/swat
@man man/man8/tdbdump.8
@man man/man8/umount.cifs.8
@man man/man8/winbindd.8
share/examples/samba/
share/examples/samba/smb.conf.default
@sample ${SYSCONFDIR}/samba/
@sample ${SYSCONFDIR}/samba/smb.conf

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.4 2005/11/03 15:10:20 mbalmer Exp $
@comment $OpenBSD: PLIST-docs,v 1.5 2006/02/02 09:40:43 mbalmer Exp $
share/doc/samba/
share/doc/samba/NT4-Locking.reg
share/doc/samba/NT4_PlainPassword.reg
@ -14,7 +14,6 @@ share/doc/samba/Win98_PlainPassword.reg
share/doc/samba/Win9X-CacheHandling.reg
share/doc/samba/WinME_PlainPassword.reg
share/doc/samba/WinXP_PlainPassword.reg
share/doc/samba/WinXP_SignOrSeal.reg
share/doc/samba/WindowsTerminalServer.reg
share/doc/samba/history
share/doc/samba/htmldocs/
@ -106,6 +105,52 @@ share/examples/samba/autofs/auto.smb
share/examples/samba/dce-dfs/
share/examples/samba/dce-dfs/README
share/examples/samba/dce-dfs/smb.conf
share/examples/samba/libmsrpc/
share/examples/samba/libmsrpc/cacusermgr/
share/examples/samba/libmsrpc/cacusermgr/Makefile
share/examples/samba/libmsrpc/cacusermgr/cacusermgr.c
share/examples/samba/libmsrpc/cacusermgr/cacusermgr.h
share/examples/samba/libmsrpc/cacusermgr/mgr_group.c
share/examples/samba/libmsrpc/cacusermgr/mgr_user.c
share/examples/samba/libmsrpc/cacusermgr/util.c
share/examples/samba/libmsrpc/test/
share/examples/samba/libmsrpc/test/Makefile
share/examples/samba/libmsrpc/test/README
share/examples/samba/libmsrpc/test/lsa/
share/examples/samba/libmsrpc/test/lsa/ear.c
share/examples/samba/libmsrpc/test/lsa/lsaenum.c
share/examples/samba/libmsrpc/test/lsa/lsaenumprivs.c
share/examples/samba/libmsrpc/test/lsa/lsapol.c
share/examples/samba/libmsrpc/test/lsa/lsapriv.c
share/examples/samba/libmsrpc/test/lsa/lsaq.c
share/examples/samba/libmsrpc/test/lsa/lsatrust.c
share/examples/samba/libmsrpc/test/reg/
share/examples/samba/libmsrpc/test/reg/regdelete.c
share/examples/samba/libmsrpc/test/reg/regkey.c
share/examples/samba/libmsrpc/test/reg/regkeycreate.c
share/examples/samba/libmsrpc/test/reg/regkeyenum.c
share/examples/samba/libmsrpc/test/reg/regopen.c
share/examples/samba/libmsrpc/test/reg/regopenkey.c
share/examples/samba/libmsrpc/test/reg/regqueryval.c
share/examples/samba/libmsrpc/test/reg/regsetval.c
share/examples/samba/libmsrpc/test/reg/regvalenum.c
share/examples/samba/libmsrpc/test/reg/security.c
share/examples/samba/libmsrpc/test/reg/shutdown.c
share/examples/samba/libmsrpc/test/sam/
share/examples/samba/libmsrpc/test/sam/adduser.c
share/examples/samba/libmsrpc/test/sam/disable.c
share/examples/samba/libmsrpc/test/sam/dominfo.c
share/examples/samba/libmsrpc/test/sam/enable.c
share/examples/samba/libmsrpc/test/sam/samenum.c
share/examples/samba/libmsrpc/test/sam/samgroup.c
share/examples/samba/libmsrpc/test/sam/samlookup.c
share/examples/samba/libmsrpc/test/sam/samuser.c
share/examples/samba/libmsrpc/test/smbc_test/
share/examples/samba/libmsrpc/test/smbc_test/smbc.c
share/examples/samba/libmsrpc/test/svcctl/
share/examples/samba/libmsrpc/test/svcctl/svc.c
share/examples/samba/libmsrpc/test/test_util.c
share/examples/samba/libmsrpc/test/test_util.h
share/examples/samba/libsmbclient/
share/examples/samba/libsmbclient/Makefile
share/examples/samba/libsmbclient/README
@ -113,6 +158,9 @@ share/examples/samba/libsmbclient/get_auth_data_fn.h
share/examples/samba/libsmbclient/smbwrapper/
share/examples/samba/libsmbclient/smbwrapper/Makefile
share/examples/samba/libsmbclient/smbwrapper/README
share/examples/samba/libsmbclient/smbwrapper/bsd-strlcat.c
share/examples/samba/libsmbclient/smbwrapper/bsd-strlcpy.c
share/examples/samba/libsmbclient/smbwrapper/bsd-strlfunc.h
share/examples/samba/libsmbclient/smbwrapper/opendir_smbsh.c
share/examples/samba/libsmbclient/smbwrapper/select.c
share/examples/samba/libsmbclient/smbwrapper/smbsh.c
@ -124,9 +172,12 @@ share/examples/samba/libsmbclient/smbwrapper/wrapper.c
share/examples/samba/libsmbclient/smbwrapper/wrapper.h
share/examples/samba/libsmbclient/testacl.c
share/examples/samba/libsmbclient/testbrowse.c
share/examples/samba/libsmbclient/testbrowse2.c
share/examples/samba/libsmbclient/testchmod.c
share/examples/samba/libsmbclient/testread.c
share/examples/samba/libsmbclient/testsmbc.c
share/examples/samba/libsmbclient/teststat.c
share/examples/samba/libsmbclient/teststat2.c
share/examples/samba/libsmbclient/testutime.c
share/examples/samba/libsmbclient/tree.c
share/examples/samba/logon/
@ -157,6 +208,16 @@ share/examples/samba/pdb/mysql/mysql.dump
share/examples/samba/pdb/mysql/smb.conf
share/examples/samba/pdb/sambapdb.dtd
share/examples/samba/pdb/test.c
share/examples/samba/perfcounter/
share/examples/samba/perfcounter/Makefile
share/examples/samba/perfcounter/perf.h
share/examples/samba/perfcounter/perf_writer.c
share/examples/samba/perfcounter/perf_writer_cpu.c
share/examples/samba/perfcounter/perf_writer_disk.c
share/examples/samba/perfcounter/perf_writer_mem.c
share/examples/samba/perfcounter/perf_writer_process.c
share/examples/samba/perfcounter/perf_writer_util.c
share/examples/samba/perfcounter/perfcountd.init
share/examples/samba/printer-accounting/
share/examples/samba/printer-accounting/README
share/examples/samba/printer-accounting/acct-all
@ -177,6 +238,8 @@ share/examples/samba/scripts/debugging/linux/backtrace
share/examples/samba/scripts/debugging/solaris/
share/examples/samba/scripts/debugging/solaris/README
share/examples/samba/scripts/debugging/solaris/solaris-oops.sh
share/examples/samba/scripts/eventlog/
share/examples/samba/scripts/eventlog/parselog.pl
share/examples/samba/scripts/printing/
share/examples/samba/scripts/printing/cups/
share/examples/samba/scripts/printing/cups/smbaddprinter.pl
@ -416,10 +479,9 @@ share/swat/help/Samba3-HOWTO/unicode.html
share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
share/swat/help/Samba3-HOWTO/winbind.html
share/swat/help/manpages/
share/swat/help/manpages/editreg.1.html
share/swat/help/manpages/findsmb.1.html
share/swat/help/manpages/index.html
share/swat/help/manpages/libsmbclient.8.html
share/swat/help/manpages/libsmbclient.7.html
share/swat/help/manpages/lmhosts.5.html
share/swat/help/manpages/log2pcap.1.html
share/swat/help/manpages/mount.cifs.8.html
@ -427,7 +489,7 @@ share/swat/help/manpages/net.8.html
share/swat/help/manpages/nmbd.8.html
share/swat/help/manpages/nmblookup.1.html
share/swat/help/manpages/ntlm_auth.1.html
share/swat/help/manpages/pam_winbind.8.html
share/swat/help/manpages/pam_winbind.7.html
share/swat/help/manpages/pdbedit.8.html
share/swat/help/manpages/profiles.1.html
share/swat/help/manpages/rpcclient.1.html
@ -454,7 +516,6 @@ share/swat/help/manpages/swat.8.html
share/swat/help/manpages/tdbbackup.8.html
share/swat/help/manpages/tdbdump.8.html
share/swat/help/manpages/testparm.1.html
share/swat/help/manpages/testprns.1.html
share/swat/help/manpages/umount.cifs.8.html
share/swat/help/manpages/vfstest.1.html
share/swat/help/manpages/wbinfo.1.html