Index: Makefile =================================================================== RCS file: /cvs/ports/net/samba/Makefile,v retrieving revision 1.94 diff -u -r1.94 Makefile --- Makefile 25 Jul 2008 22:01:17 -0000 1.94 +++ Makefile 28 Nov 2008 10:54:31 -0000 @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.94 2008/07/25 22:01:17 brad Exp $ +# $OpenBSD: Makefile,v 1.97 2008/09/12 07:49:11 brad Exp $ COMMENT-main= SMB and CIFS client and server for UNIX -COMMENT-docs= documentation and examples for samba +COMMENT-docs= additional documentation and examples for Samba -DISTNAME= samba-3.0.31 +DISTNAME= samba-3.0.33 PKGNAME-main= ${DISTNAME} FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/} SHARED_LIBS= smbclient 1.0 \ @@ -41,7 +41,8 @@ SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --localstatedir="/var" \ +CONFIGURE_ARGS= --disable-fam \ + --localstatedir="/var" \ --sbindir="${PREFIX}/libexec" \ --with-configdir="${CONFDIR}" \ --with-libdir="${PREFIX}/lib/samba" \ @@ -68,7 +69,7 @@ .if ${FLAVOR:L:Mcups} CONFIGURE_ARGS+= --enable-cups LIB_DEPENDS+= cups::print/cups -WANTLIB+= ssl crypto m pthread z +WANTLIB+= ssl m pthread z .else CONFIGURE_ARGS+= --disable-cups .endif @@ -77,21 +78,22 @@ ERRORS+="Fatal: ldap and ads flavors conflict" .endif -.if ${FLAVOR:L:Mldap} -CONFIGURE_ARGS+= --with-ldap --without-ads +.if ${FLAVOR:L:Mldap} || ${FLAVOR:L:Mads} LIB_DEPENDS+= ldap,lber::databases/openldap BUILD_DEPENDS+= ::misc/libutf8 .else -CONFIGURE_ARGS+= --without-ldap --without-ads +CONFIGURE_ARGS+= --without-ldap .endif .if ${FLAVOR:L:Mads} -CONFIGURE_ARGS+= --with-ldap --with-krb5="${WRKDIR}/usr" --with-ads -LIB_DEPENDS+= ldap,lber::databases/openldap -BUILD_DEPENDS+= ::misc/libutf8 +CONFIGURE_ARGS+= --with-krb5="${WRKDIR}/usr" --with-ads WANTLIB+= asn1 com_err gssapi krb5 .else -CONFIGURE_ARGS+= --without-ldap --without-ads +CONFIGURE_ARGS+= --without-ads +.endif + +.if ${FLAVOR:L:Mads} || ${FLAVOR:L:Mcups} +WANTLIB+= crypto .endif PKG_ARCH-docs= * @@ -104,7 +106,6 @@ WRKDIST= ${WRKDIR}/${DISTNAME}/source SAMBA_DOCS=${WRKSRC}/../README \ - ${WRKSRC}/../docs/THANKS \ ${WRKSRC}/../docs/history \ ${WRKSRC}/../docs/registry/*.reg Index: distinfo =================================================================== RCS file: /cvs/ports/net/samba/distinfo,v retrieving revision 1.12 diff -u -r1.12 distinfo --- distinfo 25 Jul 2008 22:01:17 -0000 1.12 +++ distinfo 28 Nov 2008 10:54:31 -0000 @@ -1,5 +1,5 @@ -MD5 (samba-3.0.31.tar.gz) = Flq69FIscAMdmnb7tjjKBg== -RMD160 (samba-3.0.31.tar.gz) = 3CBRuqj3jzECbxfZ+awmrUuappE= -SHA1 (samba-3.0.31.tar.gz) = DxP89pBytANAwA6bz0rxNnDv/9M= -SHA256 (samba-3.0.31.tar.gz) = tE8LD9eaJbLmw/ODamFcXH1VrGXEYL1ovmOA7Herwo4= -SIZE (samba-3.0.31.tar.gz) = 20514191 +MD5 (samba-3.0.33.tar.gz) = A6IEmYhCfDzr5pB4zy0UfQ== +RMD160 (samba-3.0.33.tar.gz) = w5b529BS2Td8p/91VQFzhVyXkuI= +SHA1 (samba-3.0.33.tar.gz) = I1wV55akn8+AsVTWCIE6+Ofrsyk= +SHA256 (samba-3.0.33.tar.gz) = KFAEvftFIjWsisINM8CD7LMmoQ9u6BnatAMqtcZWOhY= +SIZE (samba-3.0.33.tar.gz) = 49393320 Index: files/README.OpenBSD =================================================================== RCS file: /cvs/ports/net/samba/files/README.OpenBSD,v retrieving revision 1.8 diff -u -r1.8 README.OpenBSD --- files/README.OpenBSD 3 Apr 2005 11:20:38 -0000 1.8 +++ files/README.OpenBSD 28 Nov 2008 10:54:31 -0000 @@ -1,22 +1,22 @@ Using samba package in an OpenBSD environment: -1. Edit ${SYSCONDIR}/samba/smb.conf to suit your needs. +1. Edit ${SYSCONFDIR}/samba/smb.conf to suit your needs. -2. Edit ${SYSCONDIR}/rc.conf.local: +2. Edit /etc/rc.conf.local: ... smbd_flags="-D" # for normal use: "-D" nmbd_flags="-D" # for normal use: "-D" ... -3. Edit ${SYSCONDIR}/rc.local: +3. Edit /etc/rc.local: echo -n 'starting local daemons:' ... - if [ -f ${SYSCONDIR}/samba/smb.conf ]; then - if [ X"${smbd_flags}" != X"NO" -a -x /usr/local/libexec/smbd ]; then - echo -n ' smbd'; /usr/local/libexec/smbd ${smbd_flags} + if [ -f ${SYSCONFDIR}/samba/smb.conf ]; then + if [ X"${smbd_flags}" != X"NO" -a -x ${LOCALBASE}/libexec/smbd ]; then + echo -n ' smbd'; ${LOCALBASE}/libexec/smbd ${smbd_flags} fi - if [ X"${nmbd_flags}" != X"NO" -a -x /usr/local/libexec/nmbd ]; then - echo -n ' nmbd'; /usr/local/libexec/nmbd ${nmbd_flags} + if [ X"${nmbd_flags}" != X"NO" -a -x ${LOCALBASE}/libexec/nmbd ]; then + echo -n ' nmbd'; ${LOCALBASE}/libexec/nmbd ${nmbd_flags} fi fi ... @@ -28,20 +28,18 @@ the clear. You can avoid this problem by using ssh forwarding to port 901. -4. add the following entry to ${SYSCONDIR}/inetd.conf: +4. add the following entry to /etc/inetd.conf: ... - swat stream tcp nowait.400 root /usr/local/libexec/swat swat + swat stream tcp nowait.400 root ${LOCALBASE}/libexec/swat swat ... -5. add the following entry to ${SYSCONDIR}/services: +5. add the following entry to /etc/services: ... swat 901/tcp # samba admin service ... Install the samba-docs package and see documentation files in -/usr/local/share/doc/samba and example config files in -/usr/local/share/examples/samba for more information. - - +${PREFIX}/share/doc/samba and example config files in +${PREFIX}/share/examples/samba for more information. Index: pkg/DESCR-docs =================================================================== RCS file: /cvs/ports/net/samba/pkg/DESCR-docs,v retrieving revision 1.1 diff -u -r1.1 DESCR-docs --- pkg/DESCR-docs 3 Apr 2005 11:20:38 -0000 1.1 +++ pkg/DESCR-docs 28 Nov 2008 10:54:31 -0000 @@ -1,2 +1,2 @@ -Samba documentation in HTML and PDF format. Also contains the online -help for SWAT. +Additional Samba documentation in HTML and PDF format. Also contains +the online help for SWAT. Index: pkg/MESSAGE-main =================================================================== RCS file: /cvs/ports/net/samba/pkg/MESSAGE-main,v retrieving revision 1.2 diff -u -r1.2 MESSAGE-main --- pkg/MESSAGE-main 4 Jun 2007 16:19:13 -0000 1.2 +++ pkg/MESSAGE-main 28 Nov 2008 10:54:31 -0000 @@ -1,7 +1,7 @@ To start the Samba server and naming service enter the following commands: -$ sudo ${LOCALBASE}/libexec/smbd # Start the Samba server component -$ sudo ${LOCALBASE}/libexec/nmbd # Start the Samba naming service +$ sudo ${PREFIX}/libexec/smbd # Start the Samba server component +$ sudo ${PREFIX}/libexec/nmbd # Start the Samba naming service 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 @@ -10,15 +10,15 @@ $ sudo smbpasswd -a To have Samba start whenever the machine boots, add the following lines to the -${SYSCONFDIR}/rc.local script: +/etc/rc.local script: -if [ -x ${LOCALBASE}/libexec/smbd ]; then +if [ -x ${PREFIX}/libexec/smbd ]; then echo -n ' smbd' - ${LOCALBASE}/libexec/smbd + ${PREFIX}/libexec/smbd fi -if [ -x ${LOCALBASE}/libexec/nmbd ]; then +if [ -x ${PREFIX}/libexec/nmbd ]; then echo -n ' nmbd' - ${LOCALBASE}/libexec/nmbd + ${PREFIX}/libexec/nmbd fi For more information and complete documentation, install the samba-docs package Index: pkg/PLIST-docs =================================================================== RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v retrieving revision 1.10 diff -u -r1.10 PLIST-docs --- pkg/PLIST-docs 25 Jul 2008 22:01:17 -0000 1.10 +++ pkg/PLIST-docs 28 Nov 2008 10:54:32 -0000 @@ -1,10 +1,8 @@ -@comment $OpenBSD: PLIST-docs,v 1.10 2008/07/25 22:01:17 brad Exp $ +@comment $OpenBSD: PLIST-docs,v 1.11 2008/09/12 07:49:11 brad Exp $ +@conflict samba-<=3.0.31p0 share/doc/samba/ share/doc/samba/NT4-Locking.reg share/doc/samba/NT4_PlainPassword.reg -share/doc/samba/README -share/doc/samba/README.OpenBSD -share/doc/samba/THANKS share/doc/samba/Win-2Kx-XPP-DeleteCachedProfiles.reg share/doc/samba/Win-2Kx-XPP-ForceLocalProfile.reg share/doc/samba/Win-NT-DeleteRoamingProfile.reg @@ -39,6 +37,8 @@ share/examples/samba/VFS/Makefile.in share/examples/samba/VFS/README share/examples/samba/VFS/autogen.sh +share/examples/samba/VFS/config.guess +share/examples/samba/VFS/config.sub share/examples/samba/VFS/configure.in share/examples/samba/VFS/install-sh share/examples/samba/VFS/shadow_copy_test.c Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v retrieving revision 1.7 diff -u -r1.7 PLIST-main --- pkg/PLIST-main 11 Jul 2008 11:40:33 -0000 1.7 +++ pkg/PLIST-main 28 Nov 2008 10:54:32 -0000 @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST-main,v 1.7 2008/07/11 11:40:33 brad Exp $ +@comment $OpenBSD: PLIST-main,v 1.8 2008/09/12 07:49:11 brad Exp $ +@conflict samba-docs-<=3.0.31p1 @pkgpath ${BASE_PKGPATH} @bin bin/eventlogadm bin/findsmb @@ -107,10 +108,10 @@ @man man/man8/vfs_shadow_copy.8 @man man/man8/vfs_xattr_tdb.8 @man man/man8/winbindd.8 +share/doc/samba/README +share/doc/samba/README.OpenBSD share/examples/samba/ @sample ${SYSCONFDIR}/samba/ -share/examples/samba/VFS/config.guess -share/examples/samba/VFS/config.sub share/examples/samba/smb.conf.default @sample ${SYSCONFDIR}/samba/smb.conf share/swat/