Giovanni Bechis wrote:
Stuart Henderson wrote:
- build fails if tdb is installed (which hampers my testing
as the machine I'd run it on has fdm installed)
Now it builds with tdb too:
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV = CPPFLAGS+="-I${LOCALBASE}/include" \
With diff attached too.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.107
diff -u -p -r1.107 Makefile
--- Makefile 11 Oct 2009 19:45:46 -0000 1.107
+++ Makefile 6 Nov 2009 09:08:27 -0000
@@ -1,119 +1,161 @@
# $OpenBSD: Makefile,v 1.107 2009/10/11 19:45:46 sthen Exp $
-COMMENT-main= SMB and CIFS client and server for UNIX
-COMMENT-docs= additional documentation and examples for Samba
+COMMENT-main = SMB and CIFS client and server for UNIX
+COMMENT-docs = additional documentation and examples for Samba
-DISTNAME= samba-3.0.37
-PKGNAME-main= ${DISTNAME}
-FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
-SHARED_LIBS= smbclient 1.0 \
- msrpc 1.0
+DISTNAME = samba-3.4.3
+PKGNAME-main = ${DISTNAME}
+FULLPKGNAME-docs = ${DISTNAME:S/-/-docs-/}
+SHARED_LIBS = smbclient 2.0 \
+ smbsharemodes 0.0 \
+ talloc 0.0 \
+ tdb 0.0 \
+ netapi 0.0 \
+ addns 0.0 \
+ wbclient 0.0
+
+CATEGORIES = net
+
+HOMEPAGE = http://www.samba.org/
+
+# GPLv3+
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
-CATEGORIES= net
+WANTLIB = c ncurses readline z
-HOMEPAGE= http://www.samba.org/
-
-# GPLv2+
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-
-WANTLIB= c ncurses readline
-
-MASTER_SITES= http://download.samba.org/samba/ftp/ \
+MASTER_SITES = http://download.samba.org/samba/ftp/ \
http://us2.samba.org/samba/ftp/ \
http://us2.samba.org/samba/ftp/old-versions/
-MODULES= converters/libiconv
+MODULES = converters/libiconv
-LIB_DEPENDS= popt::devel/popt
+LIB_DEPENDS = popt::devel/popt \
+ execinfo::devel/libexecinfo
-MAKE_FLAGS= PASSWD_PROGRAM="/usr/bin/passwd" \
- LIBsmbclient_VERSION=${LIBsmbclient_VERSION} \
- LIBmsrpc_VERSION=${LIBmsrpc_VERSION}
-
-CONFDIR= ${SYSCONFDIR}/samba
-SAMBA_LOGDIR= /var/log
-SUBST_VARS= CONFDIR
-
-SEPARATE_BUILD= concurrent
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --disable-fam \
- --localstatedir="/var" \
- --sbindir="${PREFIX}/libexec" \
- --with-configdir="${CONFDIR}" \
- --with-libdir="${PREFIX}/lib/samba" \
- --with-lockdir="/var/spool/samba" \
- --with-piddir="/var/run" \
- --with-logfilebase="${SAMBA_LOGDIR}" \
- --with-privatedir="${CONFDIR}" \
- --with-libsmbclient \
- --with-swatdir="${PREFIX}/share/swat" \
- --with-ssl \
- --with-sslinc="/usr/include/ssl" \
- --with-ssllib="/usr/lib" \
- --with-syslog \
- --with-utmp
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -Wl,--export-dynamic"
+MAKE_FLAGS = PASSWD_PROGRAM="/usr/bin/passwd"
-FLAVORS= cups ldap ads
+CONFDIR = ${SYSCONFDIR}/samba
+SAMBA_LOGDIR = /var/log/samba
+SUBST_VARS = CONFDIR
+
+USE_GMAKE = yes
+SEPARATE_BUILD = simple
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-fam \
+ --localstatedir="/var" \
+ --libdir="${PREFIX}/lib/samba" \
+ --sbindir="${PREFIX}/libexec" \
+ --with-configdir="${CONFDIR}" \
+ --with-modulesdir="${PREFIX}/lib/samba" \
+ --with-lockdir="/var/spool/samba" \
+ --with-piddir="/var/run" \
+ --with-logfilebase="${SAMBA_LOGDIR}" \
+ --with-privatedir="${CONFDIR}" \
+ --with-libsmbclient \
+ --with-swatdir="${PREFIX}/share/swat" \
+ --with-syslog \
+ --with-utmp \
+ --with-winbind \
+ --with-pthreads \
+ --with-wbclient \
+ --enable-avahi=no
+
+# Uncomment to enable debugging symbols.
+#CONFIGURE_ARGS += --enable-debug
+
+CONFIGURE_ENV = CPPFLAGS+="-I${LOCALBASE}/include" \
+ LDFLAGS+="-L${LOCALBASE}/lib -Wl,--export-dynamic" \
+ LIBsmbclient_VERSION="${LIBsmbclient_VERSION}" \
+ LIBsmbsharemodes_VERSION="${LIBsmbsharemodes_VERSION}" \
+ LIBtalloc_VERSION="${LIBtalloc_VERSION}" \
+ LIBtdb_VERSION="${LIBtdb_VERSION}" \
+ LIBnetapi_VERSION="${LIBnetapi_VERSION}" \
+ LIBaddns_VERSION="${LIBaddns_VERSION}" \
+ LIBwbclient_VERSION="${LIBwbclient_VERSION}"
+
+FLAVORS = cups ldap ads
FLAVOR?=
-MULTI_PACKAGES= -main -docs
+MULTI_PACKAGES= -main -docs
.if ${FLAVOR:L:Mcups}
-LIB_DEPENDS+= cups::print/cups
-WANTLIB += asn1 crypto gcrypt gnutls gpg-error gssapi intl krb5
-WANTLIB += m pthread z
+LIB_DEPENDS += cups::print/cups
+WANTLIB += asn1 crypto gcrypt gnutls gpg-error gssapi intl krb5
+WANTLIB += m pthread z
.else
-CONFIGURE_ARGS+= --disable-cups
+CONFIGURE_ARGS += --disable-cups
.endif
.if ${FLAVOR:L:Mldap} && ${FLAVOR:L:Mads}
-ERRORS+="Fatal: ldap and ads flavors conflict"
+ERRORS += "Fatal: ldap and ads flavors conflict"
.endif
.if ${FLAVOR:L:Mldap} || ${FLAVOR:L:Mads}
-LIB_DEPENDS+= ldap,lber::databases/openldap
-BUILD_DEPENDS+= ::misc/libutf8
+LIB_DEPENDS += ldap,lber::databases/openldap
+BUILD_DEPENDS += ::misc/libutf8
.else
-CONFIGURE_ARGS+= --without-ldap
+CONFIGURE_ARGS += --without-ldap
.endif
.if ${FLAVOR:L:Mads}
-CONFIGURE_ARGS+= --with-krb5="${WRKDIR}/usr"
-WANTLIB+= asn1 com_err gssapi krb5
+CONFIGURE_ARGS += --with-krb5="${WRKDIR}/usr"
+
+# Merged build cruft needs loads of work. Disable until ready.
+#SEPERATE_BUILD = simple
+#CONFIGURE_ARGS += --enable-merged-build
+#MODULES += lang/python
+#MODPY_RUNDEP = No
+
+WANTLIB += asn1 com_err gssapi krb5
.else
-CONFIGURE_ARGS+= --without-ads
+CONFIGURE_ARGS += --without-ads
.endif
-.if ${FLAVOR:L:Mads}
-WANTLIB+= crypto
+.if ${FLAVOR:L:Mads} || ${FLAVOR:L:Mcups}
+WANTLIB += crypto
.endif
-PKG_ARCH-docs= *
-LIB_DEPENDS-docs=
-WANTLIB-docs=
-RUN_DEPENDS-docs=
+PKG_ARCH-docs = *
+LIB_DEPENDS-docs =
+WANTLIB-docs =
+RUN_DEPENDS-docs =
+
+REGRESS_TARGET = torture
-NO_REGRESS= Yes
+WRKDIST = ${WRKDIR}/${DISTNAME}/source3
-WRKDIST= ${WRKDIR}/${DISTNAME}/source
+SAMBA_DOCS = ${WRKSRC}/../README \
+ ${WRKSRC}/../docs/history \
+ ${WRKSRC}/../docs/registry/*.reg
-SAMBA_DOCS=${WRKSRC}/../README \
- ${WRKSRC}/../docs/history \
- ${WRKSRC}/../docs/registry/*.reg
+SAMPLE_CONFIG = ${PREFIX}/share/examples/samba/smb.conf.default
-SAMPLE_CONFIG= ${PREFIX}/share/examples/samba/smb.conf.default
+SAMBA_MANPAGES = ${WRKSRC}/../docs/manpages
+
+pre-fetch:
+ @echo ${PKGPATH}
pre-configure:
- @${SUBST_CMD} ${WRKSRC}/../docs/manpages/swat.8
+ @${SUBST_CMD} ${SAMBA_MANPAGES}/swat.8
+# Samba's man pages kill OpenBSD's groff/nroff/man implementation.
+# This workaround will be needed until the new usr.bin/mandoc is
+# finished and enabled.
post-extract:
@cp ${FILESDIR}/krb5-config ${WRKDIR}/bin
@chmod a+x ${WRKDIR}/bin/krb5-config
+ @for file in ${SAMBA_MANPAGES}/*; do \
+ if [ -f $$file ]; then \
+ cp $$file $$file.crap; \
+ sed -e 's:\\FC::g' -e 's:\\F\[\]::g' -e 's:\.\\\":\ \\\":g' \
+ -e 's:SH-xref:Sx:g' -e 's:\\m\[\]::g' -e 's:toupper:tu:g' \
+ -e 's:\.\.\\\":\\\":g' -e 's:^.tu :\\":g' -e's:\\m\[blue\]::g' \
+ -e's:\\m\[\]::g' $$file.crap > $$file; \
+ fi; \
+ done
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/pdf
@@ -145,8 +187,16 @@ post-install:
@chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/smbpasswd
@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}
+ @ln -s samba/libsmbsharemodes.so.${LIBsmbsharemodes_VERSION} \
+ ${PREFIX}/lib/libsmbsharemodes.so.${LIBsmbsharemodes_VERSION}
+ @ln -s samba/libtalloc.so.${LIBtalloc_VERSION} \
+ ${PREFIX}/lib/libtalloc.so.${LIBtalloc_VERSION}
+ @ln -s samba/libtdb.so.${LIBtdb_VERSION} \
+ ${PREFIX}/lib/libtdb.so.${LIBtdb_VERSION}
+ @ln -s samba/libnetapi.so.${LIBnetapi_VERSION} \
+ ${PREFIX}/lib/libnetapi.so.${LIBnetapi_VERSION}
+ @ln -s samba/libwbclient.so.${LIBwbclient_VERSION} \
+ ${PREFIX}/lib/libwbclient.so.${LIBwbclient_VERSION}
@rmdir ${WRKINST}${SYSCONFDIR}/samba
@rmdir ${WRKINST}/var/spool/samba
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 11 Oct 2009 19:45:46 -0000 1.16
+++ distinfo 6 Nov 2009 09:08:27 -0000
@@ -1,5 +1,5 @@
-MD5 (samba-3.0.37.tar.gz) = Ee0r/vQJC9VzaxlLQ/ZyiQ==
-RMD160 (samba-3.0.37.tar.gz) = Brdq4icp4QyD1q9C0DsDrWnkkQM=
-SHA1 (samba-3.0.37.tar.gz) = Xsa8ZVizx5n3R+tJ+7oBnV7fDL0=
-SHA256 (samba-3.0.37.tar.gz) = u2fA4T1My9hLkgDIc5OT/dmzFFtarSFpNNxnDw/OomY=
-SIZE (samba-3.0.37.tar.gz) = 23416703
+MD5 (samba-3.4.3.tar.gz) = MiN5aAwSBX9XaFZSo1prBQ==
+RMD160 (samba-3.4.3.tar.gz) = UXWEizbfBOUryboXMCvDBC1JM4M=
+SHA1 (samba-3.4.3.tar.gz) = ytJExTNOaitGFykQlEqJmoLz70o=
+SHA256 (samba-3.4.3.tar.gz) = IL7e6dxyswgbNvdgz7vLR6bIgXz/q33EYTGxCVhazv8=
+SIZE (samba-3.4.3.tar.gz) = 34989194
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-Makefile_in
--- patches/patch-Makefile_in 11 Oct 2009 19:45:46 -0000 1.12
+++ patches/patch-Makefile_in 6 Nov 2009 09:08:27 -0000
@@ -1,78 +1,25 @@
$OpenBSD: patch-Makefile_in,v 1.12 2009/10/11 19:45:46 sthen Exp $
---- Makefile.in.orig Wed Sep 30 08:21:56 2009
-+++ Makefile.in Sat Oct 10 20:04:44 2009
-@@ -109,11 +109,13 @@ LOCKDIR = @lockdir@
- # the directory where pid files go
- PIDDIR = @piddir@
+--- Makefile.in.orig Thu Oct 29 07:47:16 2009
++++ Makefile.in Thu Nov 5 13:54:03 2009
+@@ -28,7 +28,7 @@ sh...@shld@
+ lib_path_v...@lib_path_var@
+
+ ## Dynamic shared libraries build settings
+-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed
's/@shlib...@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
++DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed
's/@shlib...@\(.[0-9]\{1,\}\)\{0,1\}\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
+ dso_expor...@dso_exports@
+ SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
+
+@@ -1335,11 +1335,7 @@ COMPILE = $(COMPILE_CC)
+ echo "Checking $*.c with '$(CC_CHECKER)'";\
+ $(CHECK_CC); \
+ fi
+- @echo Compiling $*.c
+- @$(COMPILE) && exit 0;\
+- echo "The following command failed:" 1>&2;\
+- echo "$(subst ",\",$(COMPILE_CC))" 1>&2;\
+- $(COMPILE_CC) >/dev/null 2>&1
++ $(COMPILE)
+ @BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@
--LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
-+LIBSMBCLIENT=bin/libsmbclient.a \
-+ @libsmbclient_sha...@.$(LIBsmbclient_VERSION)
- LIBSMBCLIENT_MAJOR=0
- LIBSMBCLIENT_MINOR=1
-
--LIBMSRPC=bin/libmsrpc.a @LIBMSRPC_SHARED@
-+LIBMSRPC=bin/libmsrpc.a \
-+ @libmsrpc_sha...@.$(LIBmsrpc_VERSION)
- LIBMSRPC_MAJOR=0
- LIBMSRPC_MINOR=1
-
-@@ -125,12 +127,12 @@ LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
- LIBADDNS_MAJOR=0
- LIBADDNS_MINOR=1
-
--FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS)
-+FLAGS1 = @SAMBA_CPPFLAGS@ $(CFLAGS) @FLAGS1@
- FLAGS2 =
- FLAGS3 =
- FLAGS4 =
- FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
--FLAGS = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
-+FLAGS = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3 $(CPPFLAGS)
-
- PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
-DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
- PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\"
-@@ -1159,11 +1161,10 @@ bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
- @echo Linking libaddns non-shared library $@
- @-$(AR) -rc $@ $(LIBADDNS_OBJ)
-
--bin/libsmbclie...@shlibext@: proto_exists $(LIBSMBCLIENT_OBJ)
-+bin/libsmbclie...@shlibext@.$(LIBsmbclient_VERSION): proto_exists
$(LIBSMBCLIENT_OBJ)
- @echo Linking libsmbclient shared library $@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
-- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-- @sonamef...@`basename $...@`.$(LIBSMBCLIENT_MAJOR)
-+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-
- bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
- @echo Linking libsmbclient non-shared library $@
-@@ -1179,10 +1180,9 @@ bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODE
- @echo Linking libsmbsharemodes non-shared library $@
- @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ)
-
--bin/libmsr...@shlibext@: proto_exists $(CAC_OBJ)
-+bin/libmsr...@shlibext@.$(LIBmsrpc_VERSION): proto_exists $(CAC_OBJ)
- @echo Linking libmsrpc shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS) \
-- @sonamef...@`basename $...@`.$(LIBMSRPC_MAJOR)
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS)
-
- bin/libmsrpc.a: proto_exists $(CAC_OBJ)
- @echo Linking libmsrpc non-shared library $@
-@@ -1633,14 +1633,14 @@ installswat: installdirs installmsg
-
- installclientlib: installdirs libsmbclient
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
-- -$(INSTALLLIBCMD_SH) bin/libsmbclie...@shlibext@ $(DESTDIR)$(LIBDIR)
-+ -$(INSTALLLIBCMD_SH)
bin/libsmbclie...@shlibext@.$(LIBsmbclient_VERSION) $(DESTDIR)$(LIBDIR)
- -$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
- -$(INSTALLCMD) $(srcdir)/include/libsmbclient.h
$(DESTDIR)${prefix}/include
-
- installlibmsrpc: installdirs libmsrpc
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
-- -$(INSTALLLIBCMD_SH) bin/libmsr...@shlibext@ $(DESTDIR)$(LIBDIR)
-+ -$(INSTALLLIBCMD_SH) bin/libmsr...@shlibext@.$(LIBmsrpc_VERSION)
$(DESTDIR)$(LIBDIR)
- -$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR)
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
- -$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
+ PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
Index: patches/patch-WHATSNEW_txt
===================================================================
RCS file: patches/patch-WHATSNEW_txt
diff -N patches/patch-WHATSNEW_txt
--- patches/patch-WHATSNEW_txt 11 Jul 2008 11:40:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-WHATSNEW_txt,v 1.2 2008/07/11 11:40:33 brad Exp $
---- ../WHATSNEW.txt.orig Fri Feb 4 05:13:54 2005
-+++ ../WHATSNEW.txt Sun Feb 6 11:33:01 2005
-@@ -8,6 +8,9 @@
- bug-fixes. Please read the following important changes in this
- release.
-
-+The OpenBSD port of Samba installs the mksmbpasswd.sh script as
-+mksmbpasswd.
-+
- Common bugs fixed in 3.0.11 include:
-
- o Crash in smbd when using CUPS printing.
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 6 Nov 2009 09:08:27 -0000
@@ -0,0 +1,66 @@
+$OpenBSD$
+--- configure.orig Thu Oct 29 09:18:27 2009
++++ configure Thu Nov 5 18:51:35 2009
+@@ -73735,7 +73735,7 @@ LIBTALLOC_TARGET=
+ INSTALL_LIBTALLOC=
+ UNINSTALL_LIBTALLOC=
+
+-LIBTALLOC_SOVER=1
++LIBTALLOC_SOVER="${LIBtalloc_VERSION}"
+
+
+
+@@ -73839,7 +73839,7 @@ LIBTDB_TARGET=
+ INSTALL_LIBTDB=
+ UNINSTALL_LIBTDB=
+
+-LIBTDB_SOVER=1
++LIBTDB_SOVER="${LIBtdb_VERSION}"
+
+
+
+@@ -73930,7 +73930,7 @@ LIBNETAPI_TARGET=
+ INSTALL_LIBNETAPI=
+ UNINSTALL_LIBNETAPI=
+
+-LIBNETAPI_SOVER=0
++LIBNETAPI_SOVER="${LIBnetapi_VERSION}"
+
+
+
+@@ -74021,7 +74021,7 @@ LIBSMBCLIENT_TARGET=
+ INSTALL_LIBSMBCLIENT=
+ UNINSTALL_LIBSMBCLIENT=
+
+-LIBSMBCLIENT_SOVER=0
++LIBSMBCLIENT_SOVER="${LIBsmbclient_VERSION}"
+
+
+
+@@ -74112,7 +74112,7 @@ LIBSMBSHAREMODES_TARGET=
+ INSTALL_LIBSMBSHAREMODES=
+ UNINSTALL_LIBSMBSHAREMODES=
+
+-LIBSMBSHAREMODES_SOVER=0
++LIBSMBSHAREMODES_SOVER="${LIBsmbsharemodes_VERSION}"
+
+
+
+@@ -74203,7 +74203,7 @@ LIBADDNS_TARGET=
+ INSTALL_LIBADDNS=
+ UNINSTALL_LIBADDNS=
+
+-LIBADDNS_SOVER=0
++LIBADDNS_SOVER="${LIBaddns_VERSION}"
+
+
+
+@@ -78705,7 +78705,7 @@ else
+
+ LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
+ LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
+- LIBWBCLIENT_SOVER=0
++ LIBWBCLIENT_SOVER="${LIBwbclient_VERSION}"
+ if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a
x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
+ NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
+ ## Only worry about libwbclient if we have shared
Index: patches/patch-docs_manpages_swat_8
===================================================================
RCS file: patches/patch-docs_manpages_swat_8
diff -N patches/patch-docs_manpages_swat_8
--- patches/patch-docs_manpages_swat_8 11 Oct 2009 19:45:46 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-$OpenBSD: patch-docs_manpages_swat_8,v 1.7 2009/10/11 19:45:46 sthen Exp $
---- ../docs/manpages/swat.8.orig Wed Sep 30 08:28:45 2009
-+++ ../docs/manpages/swat.8 Sat Oct 10 20:14:20 2009
-@@ -261,49 +261,6 @@ will be appended (e\&.g\&. log\&.smbclient, log\&.smbd
- .RS 4
- Print a summary of command line options\&.
- .RE
--.SH "INSTALLATION"
--.PP
--Swat is included as binary package with most distributions\&. The package
manager in this case takes care of the installation and configuration\&. This
section is only for those who have compiled swat from scratch\&.
--.PP
--After you compile SWAT you need to run
--\FCmake install \F[]
--to install the
--\FCswat\F[]
--binary and the various help files and images\&. A default install would put
these in:
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/sbin/swat
--.RE
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/swat/images/*
--.RE
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/swat/help/*
--.sp
--.RE
- .SS "Inetd Installation"
- .PP
- You need to edit your
-@@ -331,7 +288,7 @@ In
- \FC/etc/inetd\&.conf\F[]
- you should add a line like this:
- .PP
--\FCswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\F[]
-+\FCswat stream tcp nowait\&.400 root ${PREFIX}/libexec/swat swat\F[]
- .PP
- Once you have edited
- \FC/etc/services\F[]
-@@ -357,14 +314,12 @@ This file must contain suitable startup information fo
- This file must contain a mapping of service name (e\&.g\&., swat) to service
port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
- .RE
- .PP
--\FC/usr/local/samba/lib/smb\&.conf\F[]
-+\FC${SYSCONFDIR}/samba/smb\&.conf\F[]
- .RS 4
- This is the default location of the
- \fBsmb.conf\fR(5)
--server configuration file that swat edits\&. Other common places that systems
install this file are
--\FC /usr/samba/lib/smb\&.conf\F[]
--and
--\FC/etc/smb\&.conf \F[]\&. This file describes all the services the server is
to make available to clients\&.
-+server configuration file that swat edits\&.
-+This file describes all the services the server is to make available to
clients\&.
- .RE
- .SH "WARNINGS"
- .PP
Index: patches/patch-lib_iconv.c
===================================================================
RCS file: patches/patch-lib_iconv.c
diff -N patches/patch-lib_iconv.c
--- patches/patch-lib_iconv.c 11 Jul 2008 11:40:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_iconv.c,v 1.2 2008/07/11 11:40:33 brad Exp $
---- lib/iconv.c.orig Wed May 28 08:41:11 2008
-+++ lib/iconv.c Thu Jul 3 04:19:09 2008
-@@ -137,7 +137,7 @@ static size_t sys_iconv(void *cd,
- char **outbuf, size_t *outbytesleft)
- {
- size_t ret = iconv((iconv_t)cd,
-- (char **)inbuf, inbytesleft,
-+ inbuf, inbytesleft,
- outbuf, outbytesleft);
- if (ret == (size_t)-1) {
- int saved_errno = errno;
Index: patches/patch-lib_replace_repdir_getdirentries_c
===================================================================
RCS file: patches/patch-lib_replace_repdir_getdirentries_c
diff -N patches/patch-lib_replace_repdir_getdirentries_c
--- patches/patch-lib_replace_repdir_getdirentries_c 14 Dec 2007 08:53:27
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_replace_repdir_getdirentries_c,v 1.1 2007/12/14 08:53:27
mbalmer Exp $
---- lib/replace/repdir_getdirentries.c.orig Thu Mar 1 05:54:23 2007
-+++ lib/replace/repdir_getdirentries.c Thu Dec 13 22:17:06 2007
-@@ -129,11 +129,6 @@ long telldir(DIR *dir)
- d->ofs = 0;
- d->nbytes = 0;
- }
-- /* this relies on seekpos always being a multiple of
-- DIR_BUF_SIZE. Is that always true on BSD systems? */
-- if (d->seekpos & (DIR_BUF_SIZE-1)) {
-- abort();
-- }
- return d->seekpos + d->ofs;
- }
-
Index: patches/patch-lib_smbrun_c
===================================================================
RCS file: patches/patch-lib_smbrun_c
diff -N patches/patch-lib_smbrun_c
--- patches/patch-lib_smbrun_c 28 May 2007 20:03:01 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-lib_smbrun_c,v 1.5 2007/05/28 20:03:01 mbalmer Exp $
---- lib/smbrun.c.orig Fri May 11 04:32:55 2007
-+++ lib/smbrun.c Thu May 17 10:22:53 2007
-@@ -178,7 +178,7 @@ static int smbrun_internal(const char *cmd, int *outfd
- if (!newcmd) {
- exit(82);
- }
-- execl("/bin/sh","sh","-c",newcmd,NULL);
-+ execl("/bin/sh","sh","-c",newcmd,(void *)NULL);
- }
-
- /* not reached */
-@@ -324,7 +324,7 @@ int smbrunsecret(const char *cmd, const char *secret)
- }
- #endif
-
-- execl("/bin/sh", "sh", "-c", cmd, NULL);
-+ execl("/bin/sh", "sh", "-c", cmd, (void *)NULL);
-
- /* not reached */
- exit(82);
Index: patches/patch-libads_kerberos_keytab_c
===================================================================
RCS file: patches/patch-libads_kerberos_keytab_c
diff -N patches/patch-libads_kerberos_keytab_c
--- patches/patch-libads_kerberos_keytab_c 13 May 2008 11:34:12 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-libads_kerberos_keytab_c,v 1.1 2008/05/13 11:34:12 dlg Exp $
---- libads/kerberos_keytab.c.orig Thu Nov 15 13:15:03 2007
-+++ libads/kerberos_keytab.c Mon May 12 13:38:30 2008
-@@ -246,7 +246,7 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char *
- return -1;
- }
-
--#ifdef HAVE_WRFILE_KEYTAB /* MIT */
-+#if 0 && defined(HAVE_WRFILE_KEYTAB) /* MIT */
- keytab_name[0] = 'W';
- keytab_name[1] = 'R';
- ret = krb5_kt_default_name(context, (char *) &keytab_name[2],
MAX_KEYTAB_NAME_LEN - 4);
-@@ -394,7 +394,7 @@ int ads_keytab_flush(ADS_STRUCT *ads)
- DEBUG(1,("ads_keytab_flush: could not krb5_init_context:
%s\n",error_message(ret)));
- return ret;
- }
--#ifdef HAVE_WRFILE_KEYTAB
-+#if 0 && defined(HAVE_WRFILE_KEYTAB)
- keytab_name[0] = 'W';
- keytab_name[1] = 'R';
- ret = krb5_kt_default_name(context, (char *) &keytab_name[2],
MAX_KEYTAB_NAME_LEN - 4);
Index: patches/patch-passdb_pdb_nds_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-passdb_pdb_nds_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-passdb_pdb_nds_c
--- patches/patch-passdb_pdb_nds_c 3 Apr 2005 11:20:38 -0000 1.1
+++ patches/patch-passdb_pdb_nds_c 6 Nov 2009 09:08:27 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-passdb_pdb_nds_c,v 1.1 2005/04/03 11:20:38 mbalmer Exp $
---- passdb/pdb_nds.c.orig Thu Mar 31 14:46:05 2005
-+++ passdb/pdb_nds.c Thu Mar 31 14:47:10 2005
-@@ -23,7 +23,11 @@
+$OpenBSD$
+--- passdb/pdb_nds.c.orig Tue Apr 28 16:46:16 2009
++++ passdb/pdb_nds.c Wed Jun 3 21:13:32 2009
+@@ -22,7 +22,11 @@
#include <lber.h>
#include <ldap.h>
Index: patches/patch-smbd_chgpasswd_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-smbd_chgpasswd_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-smbd_chgpasswd_c
--- patches/patch-smbd_chgpasswd_c 11 Jul 2008 11:40:33 -0000 1.4
+++ patches/patch-smbd_chgpasswd_c 6 Nov 2009 09:08:27 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-smbd_chgpasswd_c,v 1.4 2008/07/11 11:40:33 brad Exp $
---- smbd/chgpasswd.c.orig Wed May 28 08:41:11 2008
-+++ smbd/chgpasswd.c Thu Jul 3 05:06:29 2008
-@@ -228,7 +228,7 @@ static int dochild(int master, const char *slavedev, c
+$OpenBSD$
+--- smbd/chgpasswd.c.orig Fri Jul 3 21:21:14 2009
++++ smbd/chgpasswd.c Tue Jul 7 12:01:24 2009
+@@ -231,7 +231,7 @@ static int dochild(int master, const char *slavedev, c
passwordprogram));
/* execl() password-change application */
Index: patches/patch-smbd_utmp_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-smbd_utmp_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-smbd_utmp_c
--- patches/patch-smbd_utmp_c 6 Apr 2007 14:20:35 -0000 1.5
+++ patches/patch-smbd_utmp_c 6 Nov 2009 09:08:27 -0000
@@ -1,64 +1,64 @@
-$OpenBSD: patch-smbd_utmp_c,v 1.5 2007/04/06 14:20:35 ajacoutot Exp $
---- smbd/utmp.c.orig Fri Feb 25 18:59:26 2005
-+++ smbd/utmp.c Fri Apr 6 14:46:58 2007
-@@ -245,6 +245,7 @@ static void uw_pathname(pstring fname, const char *uw_
+$OpenBSD$
+--- smbd/utmp.c.orig Tue Apr 28 16:46:16 2009
++++ smbd/utmp.c Wed Jun 3 21:37:53 2009
+@@ -251,14 +251,58 @@ static char *uw_pathname(TALLOC_CTX *ctx,
}
#ifndef HAVE_PUTUTLINE
+#include <ttyent.h>
-
++
/****************************************************************************
Update utmp file directly. No subroutine interface: probably a BSD system.
-@@ -252,8 +253,50 @@ static void uw_pathname(pstring fname, const char *uw_
+ ****************************************************************************/
- static void pututline_my(pstring uname, struct utmp *u, BOOL claim)
+ static void pututline_my(const char *uname, struct utmp *u, bool claim)
{
- DEBUG(1,("pututline_my: not yet implemented\n"));
- /* BSD implementor: may want to consider (or not) adjusting "lastlog" */
-+ int fd, topslot;
-+ struct utmp ubuf;
-+
-+ if ((fd = open(uname, O_RDWR, 0)) < 0)
-+ return;
-+
-+ if (!setttyent())
-+ return;
-+
-+ for (topslot = 0; getttyent() != (struct ttyent *)NULL; )
-+ topslot++;
-+
-+ if (!endttyent())
-+ return;
-+
-+ (void) lseek(fd, (off_t)(topslot * sizeof(struct utmp)), SEEK_SET);
-+
-+ DEBUG(1,("pututline(%s, %s, %d); topslot=%d\n",
-+ u->ut_line, u->ut_name, claim, topslot));
++ int fd, topslot;
++ struct utmp ubuf;
+
-+ while (1) {
-+ if (read(fd, &ubuf, sizeof(ubuf)) == sizeof(ubuf)) {
-+ if ((claim && !ubuf.ut_name[0]) ||
-+ (!claim && ubuf.ut_name[0] &&
-+ !strncmp(ubuf.ut_line, u->ut_line, UT_LINESIZE))) {
-+ (void) lseek(fd, -(off_t)sizeof(struct utmp),
-+ SEEK_CUR);
-+ break;
-+ }
-+ topslot++;
-+ } else {
-+ (void) lseek(fd, (off_t)(topslot *
-+ sizeof(struct utmp)), SEEK_SET);
-+ break;
-+ }
-+ }
++ if ((fd = open(uname, O_RDWR, 0)) < 0)
++ return;
+
-+ if (!claim) {
-+ memset((char *)&u->ut_name, '\0', sizeof(u->ut_name));
-+ memset((char *)&u->ut_host, '\0', sizeof(u->ut_host));
-+ }
-+ (void) write(fd, u, sizeof(struct utmp));
++ if (!setttyent())
++ return;
+
-+ (void) close(fd);
++ for (topslot = 0; getttyent() != (struct ttyent *)NULL; )
++ topslot++;
++
++ if (!endttyent())
++ return;
++
++ (void) lseek(fd, (off_t)(topslot * sizeof(struct utmp)), SEEK_SET);
++
++ DEBUG(1,("pututline(%s, %s, %d); topslot=%d\n",
++ u->ut_line, u->ut_name, claim, topslot));
++
++ while (1) {
++ if (read(fd, &ubuf, sizeof(ubuf)) == sizeof(ubuf)) {
++ if ((claim && !ubuf.ut_name[0]) ||
++ (!claim && ubuf.ut_name[0] &&
++ !strncmp(ubuf.ut_line, u->ut_line, UT_LINESIZE))) {
++ (void) lseek(fd, -(off_t)sizeof(struct utmp),
++ SEEK_CUR);
++ break;
++ }
++ topslot++;
++ } else {
++ (void) lseek(fd, (off_t)(topslot *
++ sizeof(struct utmp)), SEEK_SET);
++ break;
++ }
++ }
++
++ if (!claim) {
++ memset((char *)&u->ut_name, '\0', sizeof(u->ut_name));
++ memset((char *)&u->ut_host, '\0', sizeof(u->ut_host));
++ }
++ (void) write(fd, u, sizeof(struct utmp));
++
++ (void) close(fd);
}
#endif /* HAVE_PUTUTLINE */
Index: patches/patch-web_startstop_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-web_startstop_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-web_startstop_c
--- patches/patch-web_startstop_c 3 Oct 2006 14:07:10 -0000 1.2
+++ patches/patch-web_startstop_c 6 Nov 2009 09:08:27 -0000
@@ -1,30 +1,30 @@
-$OpenBSD: patch-web_startstop_c,v 1.2 2006/10/03 14:07:10 mbalmer Exp $
---- web/startstop.c.orig Thu Apr 20 04:29:28 2006
-+++ web/startstop.c Mon Oct 2 18:38:41 2006
-@@ -38,7 +38,7 @@ void start_smbd(void)
-
- become_daemon(True, False);
-
-- execl(binfile, binfile, "-D", NULL);
-+ execl(binfile, binfile, "-D", (void *)NULL);
-
+$OpenBSD$
+--- web/startstop.c.orig Wed Jun 3 21:20:01 2009
++++ web/startstop.c Wed Jun 3 21:21:18 2009
+@@ -37,7 +37,7 @@ void start_smbd(void)
+
+ if (asprintf(&binfile, "%s/smbd", get_dyn_SBINDIR()) > 0) {
+ become_daemon(true, false);
+- execl(binfile, binfile, "-D", NULL);
++ execl(binfile, binfile, "-D", (void *)NULL);
+ }
exit(0);
}
-@@ -58,7 +58,7 @@ void start_nmbd(void)
-
- become_daemon(True, False);
-
-- execl(binfile, binfile, "-D", NULL);
-+ execl(binfile, binfile, "-D", (void *)NULL);
+@@ -57,7 +57,7 @@ void start_nmbd(void)
+ if (asprintf(&binfile, "%s/nmbd", get_dyn_SBINDIR()) > 0) {
+ become_daemon(true, false);
+- execl(binfile, binfile, "-D", NULL);
++ execl(binfile, binfile, "-D", (void *)NULL);
+ }
exit(0);
}
-@@ -78,7 +78,7 @@ void start_winbindd(void)
-
- become_daemon(True, False);
-
-- execl(binfile, binfile, NULL);
-+ execl(binfile, binfile, (void *)NULL);
+@@ -77,7 +77,7 @@ void start_winbindd(void)
+ if (asprintf(&binfile, "%s/winbindd", get_dyn_SBINDIR()) > 0) {
+ become_daemon(true, false);
+- execl(binfile, binfile, NULL);
++ execl(binfile, binfile, (void *)NULL);
+ }
exit(0);
}
Index: patches/patch-web_swat_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-web_swat_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-web_swat_c
--- patches/patch-web_swat_c 6 Apr 2007 14:20:35 -0000 1.5
+++ patches/patch-web_swat_c 6 Nov 2009 09:08:27 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-web_swat_c,v 1.5 2007/04/06 14:20:35 ajacoutot Exp $
---- web/swat.c.orig Sun Feb 4 19:59:21 2007
-+++ web/swat.c Fri Apr 6 14:46:58 2007
-@@ -136,8 +136,10 @@ static int include_html(const char *fname)
+$OpenBSD$
+--- web/swat.c.orig Tue Apr 28 16:46:16 2009
++++ web/swat.c Wed Jun 3 21:13:32 2009
+@@ -150,8 +150,10 @@ static int include_html(const char *fname)
fd = web_open(fname, O_RDONLY, 0);
if (fd == -1) {
Index: pkg/MESSAGE-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/MESSAGE-main,v
retrieving revision 1.3
diff -u -p -r1.3 MESSAGE-main
--- pkg/MESSAGE-main 30 Aug 2008 17:02:26 -0000 1.3
+++ pkg/MESSAGE-main 6 Nov 2009 09:08:27 -0000
@@ -5,8 +5,10 @@ $ sudo ${PREFIX}/libexec/nmbd # Start th
The configuration file, found at ${CONFDIR}/smb.conf can be used right
away for simple configurations. Local users must be added to the Samba user
-database using the smbpasswd utility in order to use the Samba server.
+database using the pdbedit utility in order to use the Samba server.
+$ sudo pdbedit -a -u <username>
+or
$ sudo smbpasswd -a <username>
To have Samba start whenever the machine boots, add the following lines to the
@@ -14,12 +16,29 @@ To have Samba start whenever the machine
if [ -x ${PREFIX}/libexec/smbd ]; then
echo -n ' smbd'
- ${PREFIX}/libexec/smbd
+ ${PREFIX}/libexec/smbd -D
fi
if [ -x ${PREFIX}/libexec/nmbd ]; then
echo -n ' nmbd'
- ${PREFIX}/libexec/nmbd
+ ${PREFIX}/libexec/nmbd -D
fi
For more information and complete documentation, install the samba-docs package
and check the ${LOCALBASE}/share/doc/samba directory.
+
+Winbind on OpenBSD does not support local user logins as there
+is no nsswitch support.
+
+Winbind support is included for external systems like Dovecot or
+Squid that are able to use it to authenticate users.
+
+!!! ATTENTION !!!
+The default passdb backend has been changed to 'tdbsam'! That breaks
+existing setups using the 'smbpasswd' backend without explicit
+declaration! Please use 'passdb backend = smbpasswd' if you would like
+to stick to the 'smbpasswd' backend or convert your smbpasswd entries
+using e.g. 'pdbedit -i smbpasswd -e tdbsam'.
+
+The 'tdbsam' backend is much more flexible concerning per user settings
+like 'profile path' or 'home directory' and there are some commands which
+do not work with the 'smbpasswd' backend at all.
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PFRAG.shared-main,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.shared-main
--- pkg/PFRAG.shared-main 28 May 2007 20:03:01 -0000 1.2
+++ pkg/PFRAG.shared-main 6 Nov 2009 09:08:27 -0000
@@ -1,14 +1,24 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2007/05/28 20:03:01 mbalmer Exp $
-...@lib lib/libmsrpc.so.${LIBmsrpc_VERSION}
+...@lib lib/libnetapi.so.${LIBnetapi_VERSION}
@lib lib/libsmbclient.so.${LIBsmbclient_VERSION}
+...@lib lib/libsmbsharemodes.so.${LIBsmbsharemodes_VERSION}
+...@lib lib/libtalloc.so.${LIBtalloc_VERSION}
+...@lib lib/libtdb.so.${LIBtdb_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/samba/libnetapi.so
+...@lib lib/samba/libnetapi.so.${LIBnetapi_VERSION}
+lib/samba/libsmbclient.so
@lib lib/samba/libsmbclient.so.${LIBsmbclient_VERSION}
lib/samba/libsmbsharemodes.so
-lib/samba/vfs/
+...@lib lib/samba/libsmbsharemodes.so.${LIBsmbsharemodes_VERSION}
+lib/samba/libtalloc.so
+...@lib lib/samba/libtalloc.so.${LIBtalloc_VERSION}
+lib/samba/libtdb.so
+...@lib lib/samba/libtdb.so.${LIBtdb_VERSION}
+lib/samba/vfs/acl_tdb.so
+lib/samba/vfs/acl_xattr.so
lib/samba/vfs/audit.so
lib/samba/vfs/cap.so
lib/samba/vfs/default_quota.so
@@ -17,7 +27,13 @@ lib/samba/vfs/extd_audit.so
lib/samba/vfs/fake_perms.so
lib/samba/vfs/full_audit.so
lib/samba/vfs/netatalk.so
+lib/samba/vfs/preopen.so
lib/samba/vfs/readahead.so
lib/samba/vfs/readonly.so
lib/samba/vfs/recycle.so
lib/samba/vfs/shadow_copy.so
+lib/samba/vfs/shadow_copy2.so
+lib/samba/vfs/smb_traffic_analyzer.so
+lib/samba/vfs/streams_depot.so
+lib/samba/vfs/streams_xattr.so
+lib/samba/vfs/xattr_tdb.so
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-docs
--- pkg/PLIST-docs 14 May 2009 17:05:46 -0000 1.13
+++ pkg/PLIST-docs 6 Nov 2009 09:08:28 -0000
@@ -1,5 +1,5 @@
-...@comment $OpenBSD: PLIST-docs,v 1.13 2009/05/14 17:05:46 giovanni Exp $
-...@conflict samba-<=3.0.31p0
+...@comment $OpenBSD: PLIST-docs,v 1.12 2008/12/07 03:52:56 brad Exp $
+...@conflict samba-<=3.3.4
share/doc/samba/
share/doc/samba/NT4-Locking.reg
share/doc/samba/NT4_PlainPassword.reg
@@ -25,7 +25,9 @@ share/examples/samba/LDAP/
share/examples/samba/LDAP/README
share/examples/samba/LDAP/convertSambaAccount
share/examples/samba/LDAP/get_next_oid
+share/examples/samba/LDAP/ol-schema-migrate.pl
share/examples/samba/LDAP/samba-nds.schema
+share/examples/samba/LDAP/samba-schema-FDS.ldif
share/examples/samba/LDAP/samba-schema-netscapeds4.x
share/examples/samba/LDAP/samba-schema-netscapeds5.x
share/examples/samba/LDAP/samba-schema.IBMSecureWay
@@ -55,54 +57,9 @@ 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/Makefile.internal.in
share/examples/samba/libsmbclient/README
share/examples/samba/libsmbclient/get_auth_data_fn.h
share/examples/samba/libsmbclient/smbwrapper/
@@ -125,14 +82,21 @@ share/examples/samba/libsmbclient/smbwra
share/examples/samba/libsmbclient/smbwrapper/wrapper.h
share/examples/samba/libsmbclient/testacl.c
share/examples/samba/libsmbclient/testacl2.c
+share/examples/samba/libsmbclient/testacl3.c
share/examples/samba/libsmbclient/testbrowse.c
share/examples/samba/libsmbclient/testbrowse2.c
share/examples/samba/libsmbclient/testchmod.c
+share/examples/samba/libsmbclient/testctx.c
+share/examples/samba/libsmbclient/testfstatvfs.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/teststat3.c
+share/examples/samba/libsmbclient/teststatvfs.c
+share/examples/samba/libsmbclient/testtruncate.c
share/examples/samba/libsmbclient/testutime.c
+share/examples/samba/libsmbclient/testwrite.c
share/examples/samba/libsmbclient/tree.c
share/examples/samba/logon/
share/examples/samba/logon/genlogon/
@@ -217,6 +181,8 @@ share/examples/samba/scripts/debugging/s
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/mount/
+share/examples/samba/scripts/mount/mount.smbfs
share/examples/samba/scripts/printing/
share/examples/samba/scripts/printing/cups/
share/examples/samba/scripts/printing/cups/smbaddprinter.pl
@@ -230,6 +196,9 @@ share/examples/samba/scripts/shares/pyth
share/examples/samba/scripts/shares/python/generate_parm_table.py
share/examples/samba/scripts/shares/python/modify_samba_config.py
share/examples/samba/scripts/shares/python/smbparm.py
+share/examples/samba/scripts/users_and_groups/
+share/examples/samba/scripts/users_and_groups/adduserstogroups.pl
+share/examples/samba/scripts/users_and_groups/createdomobj.pl
share/examples/samba/scripts/wins_hook/
share/examples/samba/scripts/wins_hook/README
share/examples/samba/scripts/wins_hook/dns_update
@@ -246,6 +215,63 @@ share/examples/samba/validchars/nwdos70.
share/examples/samba/validchars/readme
share/examples/samba/validchars/validchr.c
share/examples/samba/validchars/validchr.com
+share/locale/
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
+share/locale/ar/LC_MESSAGES/pam_winbind.mo
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
+share/locale/cs/LC_MESSAGES/pam_winbind.mo
+share/locale/da/
+share/locale/da/LC_MESSAGES/
+share/locale/da/LC_MESSAGES/pam_winbind.mo
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/es/
+share/locale/es/LC_MESSAGES/
+share/locale/es/LC_MESSAGES/pam_winbind.mo
+share/locale/fi/
+share/locale/fi/LC_MESSAGES/
+share/locale/fi/LC_MESSAGES/pam_winbind.mo
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
+share/locale/fr/LC_MESSAGES/pam_winbind.mo
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
+share/locale/hu/LC_MESSAGES/pam_winbind.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
+share/locale/it/LC_MESSAGES/pam_winbind.mo
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
+share/locale/ja/LC_MESSAGES/pam_winbind.mo
+share/locale/ko/
+share/locale/ko/LC_MESSAGES/
+share/locale/ko/LC_MESSAGES/pam_winbind.mo
+share/locale/nb/
+share/locale/nb/LC_MESSAGES/
+share/locale/nb/LC_MESSAGES/pam_winbind.mo
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
+share/locale/nl/LC_MESSAGES/pam_winbind.mo
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
+share/locale/pl/LC_MESSAGES/pam_winbind.mo
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
+share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
+share/locale/ru/LC_MESSAGES/pam_winbind.mo
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
+share/locale/sv/LC_MESSAGES/pam_winbind.mo
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
+share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
+share/locale/zh_TW/
+share/locale/zh_TW/LC_MESSAGES/
+share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
share/swat/help/Samba3-ByExample/
share/swat/help/Samba3-ByExample/2000users.html
share/swat/help/Samba3-ByExample/Big500users.html
@@ -451,6 +477,7 @@ share/swat/help/Samba3-HOWTO/samba-bdc.h
share/swat/help/Samba3-HOWTO/samba-pdc.html
share/swat/help/Samba3-HOWTO/securing-samba.html
share/swat/help/Samba3-HOWTO/speed.html
+share/swat/help/Samba3-HOWTO/tdb.html
share/swat/help/Samba3-HOWTO/troubleshooting.html
share/swat/help/Samba3-HOWTO/type.html
share/swat/help/Samba3-HOWTO/unicode.html
@@ -461,11 +488,21 @@ share/swat/help/manpages/cifs.upcall.8.h
share/swat/help/manpages/eventlogadm.8.html
share/swat/help/manpages/findsmb.1.html
share/swat/help/manpages/idmap_ad.8.html
+share/swat/help/manpages/idmap_adex.8.html
+share/swat/help/manpages/idmap_hash.8.html
share/swat/help/manpages/idmap_ldap.8.html
share/swat/help/manpages/idmap_nss.8.html
share/swat/help/manpages/idmap_rid.8.html
share/swat/help/manpages/idmap_tdb.8.html
+share/swat/help/manpages/idmap_tdb2.8.html
share/swat/help/manpages/index.html
+share/swat/help/manpages/ldb.3.html
+share/swat/help/manpages/ldbadd.1.html
+share/swat/help/manpages/ldbdel.1.html
+share/swat/help/manpages/ldbedit.1.html
+share/swat/help/manpages/ldbmodify.1.html
+share/swat/help/manpages/ldbrename.1.html
+share/swat/help/manpages/ldbsearch.1.html
share/swat/help/manpages/libsmbclient.7.html
share/swat/help/manpages/lmhosts.5.html
share/swat/help/manpages/log2pcap.1.html
@@ -474,11 +511,12 @@ 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.7.html
+share/swat/help/manpages/pam_winbind.8.html
share/swat/help/manpages/pdbedit.8.html
share/swat/help/manpages/profiles.1.html
share/swat/help/manpages/rpcclient.1.html
share/swat/help/manpages/samba.7.html
+share/swat/help/manpages/sharesec.1.html
share/swat/help/manpages/smb.conf.5.html
share/swat/help/manpages/smbcacls.1.html
share/swat/help/manpages/smbclient.1.html
@@ -487,41 +525,48 @@ share/swat/help/manpages/smbcquotas.1.ht
share/swat/help/manpages/smbd.8.html
share/swat/help/manpages/smbget.1.html
share/swat/help/manpages/smbgetrc.5.html
-share/swat/help/manpages/smbmnt.8.html
-share/swat/help/manpages/smbmount.8.html
share/swat/help/manpages/smbpasswd.5.html
share/swat/help/manpages/smbpasswd.8.html
share/swat/help/manpages/smbspool.8.html
share/swat/help/manpages/smbstatus.1.html
share/swat/help/manpages/smbtar.1.html
share/swat/help/manpages/smbtree.1.html
-share/swat/help/manpages/smbumount.8.html
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/tdbtool.8.html
share/swat/help/manpages/testparm.1.html
share/swat/help/manpages/umount.cifs.8.html
+share/swat/help/manpages/vfs_acl_tdb.8.html
+share/swat/help/manpages/vfs_acl_xattr.8.html
share/swat/help/manpages/vfs_audit.8.html
share/swat/help/manpages/vfs_cacheprime.8.html
share/swat/help/manpages/vfs_cap.8.html
share/swat/help/manpages/vfs_catia.8.html
share/swat/help/manpages/vfs_commit.8.html
share/swat/help/manpages/vfs_default_quota.8.html
+share/swat/help/manpages/vfs_dirsort.8.html
share/swat/help/manpages/vfs_extd_audit.8.html
share/swat/help/manpages/vfs_fake_perms.8.html
+share/swat/help/manpages/vfs_fileid.8.html
share/swat/help/manpages/vfs_full_audit.8.html
share/swat/help/manpages/vfs_gpfs.8.html
share/swat/help/manpages/vfs_netatalk.8.html
share/swat/help/manpages/vfs_notify_fam.8.html
share/swat/help/manpages/vfs_prealloc.8.html
+share/swat/help/manpages/vfs_preopen.8.html
share/swat/help/manpages/vfs_readahead.8.html
share/swat/help/manpages/vfs_readonly.8.html
share/swat/help/manpages/vfs_recycle.8.html
share/swat/help/manpages/vfs_shadow_copy.8.html
+share/swat/help/manpages/vfs_shadow_copy2.8.html
+share/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
+share/swat/help/manpages/vfs_streams_depot.8.html
+share/swat/help/manpages/vfs_streams_xattr.8.html
share/swat/help/manpages/vfs_xattr_tdb.8.html
share/swat/help/manpages/vfstest.1.html
share/swat/help/manpages/wbinfo.1.html
+share/swat/help/manpages/winbind_krb5_locator.7.html
share/swat/help/manpages/winbindd.8.html
share/swat/help/welcome.html
@comment share/swat/js/
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 11 Oct 2009 19:45:46 -0000 1.10
+++ pkg/PLIST-main 6 Nov 2009 09:08:28 -0000
@@ -1,58 +1,86 @@
@comment $OpenBSD: PLIST-main,v 1.10 2009/10/11 19:45:46 sthen Exp $
-...@conflict samba-docs-<=3.0.31p1
+...@conflict samba-docs-<=3.3.4
@pkgpath ${BASE_PKGPATH}
-bin/eventlogadm
+...@bin bin/eventlogadm
bin/findsmb
+...@bin bin/ldbadd
+...@bin bin/ldbdel
+...@bin bin/ldbedit
+...@bin bin/ldbmodify
+...@bin bin/ldbrename
+...@bin bin/ldbsearch
bin/mksmbpasswd
-bin/net
-bin/nmblookup
-bin/ntlm_auth
-bin/pdbedit
-bin/profiles
-bin/rpcclient
-bin/smbcacls
-bin/smbclient
-bin/smbcontrol
-bin/smbcquotas
-bin/smbget
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
+...@bin bin/net
+...@bin bin/nmblookup
+...@bin bin/ntlm_auth
+...@bin bin/pdbedit
+...@bin bin/profiles
+...@bin bin/rpcclient
+...@bin bin/sharesec
+...@bin bin/smbcacls
+...@bin bin/smbclient
+...@bin bin/smbcontrol
+...@bin bin/smbcquotas
+...@bin bin/smbget
+...@bin bin/smbpasswd
+...@bin bin/smbspool
+...@bin bin/smbstatus
bin/smbtar
-bin/smbtree
-bin/tdbbackup
-bin/tdbdump
-bin/tdbtool
-bin/testparm
-include/libmsrpc.h
+...@bin bin/smbtree
+...@bin bin/tdbbackup
+...@bin bin/tdbdump
+...@bin bin/tdbtool
+...@bin bin/testparm
+...@bin bin/wbinfo
include/libsmbclient.h
+include/netapi.h
+include/smb_share_modes.h
+include/talloc.h
+include/tdb.h
+include/wbclient.h
+...@lib lib/libwbclient.so.${LIBwbclient_VERSION}
lib/samba/
lib/samba/auth/
+lib/samba/charset/
lib/samba/de.msg
lib/samba/en.msg
lib/samba/fi.msg
lib/samba/fr.msg
+lib/samba/gpext/
lib/samba/idmap/
lib/samba/it.msg
lib/samba/ja.msg
+lib/samba/libwbclient.so
+...@lib lib/samba/libwbclient.so.${LIBwbclient_VERSION}
lib/samba/lowcase.dat
lib/samba/nl.msg
lib/samba/nss_info/
lib/samba/pdb/
+lib/samba/perfcount/
lib/samba/pl.msg
lib/samba/rpc/
+lib/samba/ru.msg
lib/samba/tr.msg
lib/samba/upcase.dat
lib/samba/valid.dat
-libexec/nmbd
-libexec/smbd
-libexec/swat
+lib/samba/vfs/
+...@bin libexec/nmbd
+...@bin libexec/smbd
+...@bin libexec/swat
+...@bin libexec/winbindd
@man man/man1/findsmb.1
+...@man man/man1/ldbadd.1
+...@man man/man1/ldbdel.1
+...@man man/man1/ldbedit.1
+...@man man/man1/ldbmodify.1
+...@man man/man1/ldbrename.1
+...@man man/man1/ldbsearch.1
@man man/man1/log2pcap.1
@man man/man1/nmblookup.1
@man man/man1/ntlm_auth.1
@man man/man1/profiles.1
@man man/man1/rpcclient.1
+...@man man/man1/sharesec.1
@man man/man1/smbcacls.1
@man man/man1/smbclient.1
@man man/man1/smbcontrol.1
@@ -69,17 +97,21 @@ libexec/swat
@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/man7/winbind_krb5_locator.7
@man man/man8/eventlogadm.8
@man man/man8/idmap_ad.8
+...@man man/man8/idmap_adex.8
+...@man man/man8/idmap_hash.8
@man man/man8/idmap_ldap.8
@man man/man8/idmap_nss.8
@man man/man8/idmap_rid.8
@man man/man8/idmap_tdb.8
+...@man man/man8/idmap_tdb2.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/smbpasswd.8
@@ -89,23 +121,32 @@ libexec/swat
@man man/man8/tdbdump.8
@man man/man8/tdbtool.8
@man man/man8/umount.cifs.8
+...@man man/man8/vfs_acl_tdb.8
+...@man man/man8/vfs_acl_xattr.8
@man man/man8/vfs_audit.8
@man man/man8/vfs_cacheprime.8
@man man/man8/vfs_cap.8
@man man/man8/vfs_catia.8
@man man/man8/vfs_commit.8
@man man/man8/vfs_default_quota.8
+...@man man/man8/vfs_dirsort.8
@man man/man8/vfs_extd_audit.8
@man man/man8/vfs_fake_perms.8
+...@man man/man8/vfs_fileid.8
@man man/man8/vfs_full_audit.8
@man man/man8/vfs_gpfs.8
@man man/man8/vfs_netatalk.8
@man man/man8/vfs_notify_fam.8
@man man/man8/vfs_prealloc.8
+...@man man/man8/vfs_preopen.8
@man man/man8/vfs_readahead.8
@man man/man8/vfs_readonly.8
@man man/man8/vfs_recycle.8
@man man/man8/vfs_shadow_copy.8
+...@man man/man8/vfs_shadow_copy2.8
+...@man man/man8/vfs_smb_traffic_analyzer.8
+...@man man/man8/vfs_streams_depot.8
+...@man man/man8/vfs_streams_xattr.8
@man man/man8/vfs_xattr_tdb.8
@man man/man8/winbindd.8
share/doc/samba/README
@@ -114,6 +155,7 @@ share/examples/samba/
@sample ${SYSCONFDIR}/samba/
share/examples/samba/smb.conf.default
@sample ${SYSCONFDIR}/samba/smb.conf
+share/locale/de/LC_MESSAGES/pam_winbind.mo
share/swat/
share/swat/help/
share/swat/help/welcome-no-samba-doc.html
@@ -130,5 +172,6 @@ share/swat/images/wizard.gif
share/swat/include/
share/swat/include/footer.html
share/swat/include/header.html
+...@sample /var/log/samba/
@sample /var/spool/samba/
%%SHARED%%
