cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to samba 3.6.0, from Ian McWilliam / Stefan Rinkes

Browse Source 
tweaks/testing from me and nigel@
This commit is contained in:
sthen 2011-09-26 09:32:12 +00:00
parent 7ebe31eae6
commit 49ee02f207
10 changed files with 117 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
net/samba/Makefile
View File

@ -1,20 +1,19 @@
# $OpenBSD: Makefile,v 1.150 2011/09/16 11:13:40 espie Exp $
# $OpenBSD: Makefile,v 1.151 2011/09/26 09:32:12 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= additional documentation and examples for Samba
DISTNAME= samba-3.5.11
DISTNAME= samba-3.6.0
PKGNAME-main= ${DISTNAME}
REVISION-main= 1
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
FULLPKGPATH-docs= net/samba,-docs
SHARED_LIBS= smbclient 2.0 \
smbsharemodes 0.0 \
netapi 0.0 \
wbclient 0.0
SHARED_LIBS= smbclient 3.0 \
smbsharemodes 1.0 \
netapi 1.0 \
wbclient 1.0
CATEGORIES= net
@ -28,7 +27,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c execinfo ncurses popt pthread readline talloc tdb z
WANTLIB= c execinfo ncurses popt pthread readline talloc tdb>=3.0 z
MASTER_SITES= http://download.samba.org/samba/ftp/ \
http://us2.samba.org/samba/ftp/ \
@ -37,7 +36,7 @@ MASTER_SITES= http://download.samba.org/samba/ftp/ \
MODULES= converters/libiconv
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS}
LIB_DEPENDS= databases/tdb>=1.2 \
LIB_DEPENDS= databases/tdb>=1.2.7 \
devel/popt \
devel/libexecinfo \
devel/libtalloc
@ -55,7 +54,7 @@ SUBST_VARS= CONFDIR
USE_GMAKE= Yes
USE_GROFF= Yes
SEPARATE_BUILD= simple
#SEPARATE_BUILD= simple
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.63
@ -74,11 +73,11 @@ CONFIGURE_ARGS= --disable-fam \
--with-syslog \
--with-utmp \
--with-winbind \
--with-pthreads \
--with-wbclient \
--enable-avahi=no \
--enable-external-libtdb=yes \
--enable-external-libtalloc=yes
--enable-external-libtalloc=yes \
--enable-pthreadpool
# Uncomment to enable debugging symbols.
#CONFIGURE_ARGS+= --enable-debug
@ -86,14 +85,14 @@ CONFIGURE_ARGS= --disable-fam \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FLAVORS= cups ldap ads
FLAVORS= cups ldap ads
FLAVOR?=
MULTI_PACKAGES= -main -docs
.if ${FLAVOR:L:Mcups}
LIB_DEPENDS+= print/cups
WANTLIB+= asn1 crypto gssapi krb5 m ssl z cups
WANTLIB+= asn1 crypto gssapi krb5 m ssl z cups
.else
CONFIGURE_ARGS+= --disable-cups
.endif
@ -106,11 +105,11 @@ ERRORS+= "Fatal: ldap and ads flavors conflict"
LIB_DEPENDS+= databases/openldap
WANTLIB += ldap lber
.else
CONFIGURE_ARGS+= --without-ldap
CONFIGURE_ARGS+= --without-ldap
.endif
.if ${FLAVOR:L:Mads}
CONFIGURE_ARGS+= --with-krb5="${WRKDIR}/usr"
CONFIGURE_ARGS+= --with-krb5="${WRKDIR}/usr"
# Merged build cruft needs loads of work. Disable until ready.
#SEPERATE_BUILD= simple
@ -134,14 +133,14 @@ NO_REGRESS= Yes
#REGRESS_TARGET= test
#.ifmake regress
#CONFIGURE_ARGS+= --enable-socket-wrapper \
# --enable-nss-wrapper
# --enable-nss-wrapper
#.endif
WRKDIST= ${WRKDIR}/${DISTNAME}/source3
SAMBA_DOCS= ${WRKSRC}/../README \
${WRKSRC}/../docs/history \
${WRKSRC}/../docs/registry/*.reg
${WRKSRC}/../docs/history \
${WRKSRC}/../docs/registry/*.reg
SAMPLE_CONFIG= ${PREFIX}/share/examples/samba/smb.conf.default

10
net/samba/distinfo
View File

@ -1,5 +1,5 @@
MD5 (samba-3.5.11.tar.gz) = gbvRYEjGykC66oxZEm7jhQ==
RMD160 (samba-3.5.11.tar.gz) = s+4eBE6d9Bew3K+VSmoTfbdCy6M=
SHA1 (samba-3.5.11.tar.gz) = CAGHGrahH32OuL8y/wuHiW0mNEE=
SHA256 (samba-3.5.11.tar.gz) = +6W3vO2ZoGURSNdPQAMaw8o/x4aeKZi8hb9vs92xZZc=
SIZE (samba-3.5.11.tar.gz) = 30752782
MD5 (samba-3.6.0.tar.gz) = 4pfg6nkjx96NfB2P0OwKBQ==
RMD160 (samba-3.6.0.tar.gz) = jheABGZEO9ZSnCMS7uyKz6sdf2M=
SHA1 (samba-3.6.0.tar.gz) = yH4kgddV86fyK65E7y8iymS50XM=
SHA256 (samba-3.6.0.tar.gz) = 4cFFaeR4V1iDjneFK8HpWMFUBRRs+s5WjCXFcmgC9T8=
SIZE (samba-3.6.0.tar.gz) = 28990069

17
net/samba/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.16 2011/03/15 13:49:44 sthen Exp $
--- Makefile.in.orig Sun Mar 6 18:48:05 2011
+++ Makefile.in Tue Mar 8 16:00:11 2011
$OpenBSD: patch-Makefile_in,v 1.17 2011/09/26 09:32:12 sthen Exp $
--- Makefile.in.orig Tue Aug 9 13:17:47 2011
+++ Makefile.in Mon Sep 12 17:40:48 2011
@@ -28,7 +28,7 @@ SHLD=@SHLD@
LIB_PATH_VAR=@LIB_PATH_VAR@
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.16 2011/03/15 13:49:44 sthen Exp $
DSO_EXPORTS=@DSO_EXPORTS@
SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
@@ -1477,11 +1477,7 @@ COMPILE = $(COMPILE_CC)
@@ -1674,11 +1674,7 @@ COMPILE = $(COMPILE_CC)
echo "Checking $*.c with '$(CC_CHECKER)'";\
$(CHECK_CC); \
fi
@ -23,12 +23,3 @@ $OpenBSD: patch-Makefile_in,v 1.16 2011/03/15 13:49:44 sthen Exp $
@BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@
PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
@@ -2541,7 +2537,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
- @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
+ @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) $(PTHREAD_LDFLAGS) \
@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)

47
net/samba/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.20 2011/08/22 10:03:25 giovanni Exp $
--- configure.in.orig Thu Aug 4 04:24:05 2011
+++ configure.in Sun Aug 14 10:44:16 2011
@@ -1582,8 +1582,7 @@ DSO_EXPORTS=""
$OpenBSD: patch-configure_in,v 1.21 2011/09/26 09:32:12 sthen Exp $
--- configure.in.orig Tue Aug 9 13:17:47 2011
+++ configure.in Mon Sep 12 17:40:48 2011
@@ -1638,8 +1638,7 @@ DSO_EXPORTS=""
;;
*openbsd*) BLDSHARED="true"
LDSHFLAGS="-shared"
@ -11,42 +11,3 @@ $OpenBSD: patch-configure_in,v 1.20 2011/08/22 10:03:25 giovanni Exp $
PICFLAG="-fPIC"
AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
@@ -1729,38 +1728,6 @@ if test x"$BLDSHARED" = x"true" ; then
fi
AC_MSG_RESULT($BLDSHARED)
-
-saved_before_as_needed_ldflags="$LDFLAGS"
-for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
- saved_ldflags="$LDFLAGS"
- AC_MSG_CHECKING([if $flags works])
- LDFLAGS="$flags $saved_ldflags"
- AC_TRY_LINK([],[],
- [AC_MSG_RESULT([yes])
- LD_AS_NEEDED_FLAG=$flags
- ld_as_needed_flag_found=yes],
- AC_MSG_RESULT([no]))
- LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
- test x"$ld_as_needed_flag_found" = xyes && break
-done
-
-# check if we have to disable LD_AS_NEEDED_FLAG:
-# On some systems for a veriety of reasons linking with
-# -Wl,--as-needed -lreadline -lncurses fails
-# we have to retest, if these combination is detected before.
-# Bugzilla #7209
-
-if test x$ac_cv_lib_readline_rl_callback_handler_install = xyes ; then
- if test x$ld_as_needed_flag_found = xyes ; then
- AC_MSG_CHECKING([if $LD_AS_NEEDED_FLAG works with readline])
- # try if check no fails
- save_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK([], [rl_callback_handler_install();], [AC_MSG_RESULT([yes])],[ AC_MSG_RESULT([no]); LDFLAGS="$saved_before_as_needed_ldflags"])
- LIBS="$save_LIBS"
- fi
-fi
-
# for historical reasons almost all linkers don't complain about unresolved

9
net/samba/patches/patch-nsswitch_wbinfo_c
View File

@ -1,11 +1,10 @@
# $OpenBSD: patch-nsswitch_wbinfo_c,v 1.1 2010/04/26 17:31:57 sthen Exp $
--- ../nsswitch/wbinfo.c.orig Tue Mar 2 17:18:23 2010
+++ ../nsswitch/wbinfo.c Tue Mar 2 17:18:44 2010
@@ -26,9 +26,6 @@
--- ../nsswitch/wbinfo.c.orig Mon Sep 12 17:43:50 2011
+++ ../nsswitch/wbinfo.c Mon Sep 12 17:43:57 2011
@@ -27,9 +27,6 @@
#include "libwbclient/wbclient.h"
#include "lib/popt/popt.h"
#include "../libcli/auth/libcli_auth.h"
-#if !(_SAMBA_VERSION_) < 4
-#if (_SAMBA_BUILD_) >= 4
-#include "lib/cmdline/popt_common.h"
-#endif

8
net/samba/patches/patch-smbd_utmp_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-smbd_utmp_c,v 1.6 2010/04/26 17:31:57 sthen Exp $
--- 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,
$OpenBSD: patch-smbd_utmp_c,v 1.7 2011/09/26 09:32:12 sthen Exp $
--- smbd/utmp.c.orig Tue Aug 9 13:17:47 2011
+++ smbd/utmp.c Mon Sep 12 17:40:48 2011
@@ -253,14 +253,58 @@ static char *uw_pathname(TALLOC_CTX *ctx,
}
#ifndef HAVE_PUTUTLINE

8
net/samba/patches/patch-web_swat_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-web_swat_c,v 1.7 2011/07/29 08:13:51 giovanni Exp $
--- web/swat.c.orig Mon Jul 25 06:04:44 2011
+++ web/swat.c Thu Jul 28 20:12:15 2011
@@ -224,8 +224,10 @@ static int include_html(const char *fname)
$OpenBSD: patch-web_swat_c,v 1.8 2011/09/26 09:32:12 sthen Exp $
--- web/swat.c.orig Tue Aug 9 13:17:47 2011
+++ web/swat.c Mon Sep 12 17:40:48 2011
@@ -243,8 +243,10 @@ static int include_html(const char *fname)
fd = web_open(fname, O_RDONLY, 0);
if (fd == -1) {

77
net/samba/pkg/PLIST-docs
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-docs,v 1.15 2010/04/26 17:31:57 sthen Exp $
@conflict samba-<=3.5.0
@comment $OpenBSD: PLIST-docs,v 1.16 2011/09/26 09:32:12 sthen Exp $
@conflict samba-<3.6.0
@pkgpath net/samba,-docs,ads
@pkgpath net/samba,-docs,cups
@pkgpath net/samba,-docs,cups,ads
@ -34,9 +34,9 @@ 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
share/examples/samba/LDAP/samba.ldif
share/examples/samba/LDAP/samba.schema
share/examples/samba/LDAP/samba.schema.at.IBM-DS
share/examples/samba/LDAP/samba.schema.oc.IBM-DS
@ -65,6 +65,7 @@ share/examples/samba/dce-dfs/README
share/examples/samba/dce-dfs/smb.conf
share/examples/samba/libsmbclient/
share/examples/samba/libsmbclient/Makefile
share/examples/samba/libsmbclient/Makefile.internal
share/examples/samba/libsmbclient/Makefile.internal.in
share/examples/samba/libsmbclient/README
share/examples/samba/libsmbclient/get_auth_data_fn.h
@ -125,8 +126,8 @@ share/examples/samba/nss/
share/examples/samba/nss/nss_winbind.c
share/examples/samba/nss/nss_winbind.h
share/examples/samba/nss/wbtest.c
share/examples/samba/pam_winbind/
share/examples/samba/pam_winbind/pam_winbind.conf
@comment share/examples/samba/pam_winbind/
@comment share/examples/samba/pam_winbind/pam_winbind.conf
share/examples/samba/pcap2nbench/
share/examples/samba/pcap2nbench/COPYING
share/examples/samba/pcap2nbench/Makefile
@ -179,19 +180,19 @@ share/examples/samba/printing/readme.prtpub
share/examples/samba/printing/smbprint
share/examples/samba/printing/smbprint.sysv
share/examples/samba/scripts/
share/examples/samba/scripts/debugging/
share/examples/samba/scripts/debugging/linux/
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
@comment share/examples/samba/scripts/debugging/
@comment share/examples/samba/scripts/debugging/linux/
@comment share/examples/samba/scripts/debugging/linux/backtrace
@comment share/examples/samba/scripts/debugging/solaris/
@comment share/examples/samba/scripts/debugging/solaris/README
@comment 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/idmap/
share/examples/samba/scripts/idmap/README
share/examples/samba/scripts/idmap/idmap_nis.sh
share/examples/samba/scripts/mount/
share/examples/samba/scripts/mount/mount.smbfs
@comment share/examples/samba/scripts/mount/
@comment 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
@ -227,61 +228,62 @@ share/examples/samba/validchars/validchr.com
share/locale/
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/pam_winbind.mo
@comment share/locale/ar/LC_MESSAGES/pam_winbind.mo
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/pam_winbind.mo
@comment share/locale/cs/LC_MESSAGES/pam_winbind.mo
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/pam_winbind.mo
@comment share/locale/da/LC_MESSAGES/pam_winbind.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/net.mo
@comment share/locale/de/LC_MESSAGES/pam_winbind.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/pam_winbind.mo
@comment share/locale/es/LC_MESSAGES/pam_winbind.mo
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/pam_winbind.mo
@comment share/locale/fi/LC_MESSAGES/pam_winbind.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/pam_winbind.mo
@comment share/locale/fr/LC_MESSAGES/pam_winbind.mo
share/locale/hu/
share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/pam_winbind.mo
@comment share/locale/hu/LC_MESSAGES/pam_winbind.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/pam_winbind.mo
@comment share/locale/it/LC_MESSAGES/pam_winbind.mo
share/locale/ja/
share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/pam_winbind.mo
@comment share/locale/ja/LC_MESSAGES/pam_winbind.mo
share/locale/ko/
share/locale/ko/LC_MESSAGES/
share/locale/ko/LC_MESSAGES/pam_winbind.mo
@comment share/locale/ko/LC_MESSAGES/pam_winbind.mo
share/locale/nb/
share/locale/nb/LC_MESSAGES/
share/locale/nb/LC_MESSAGES/pam_winbind.mo
@comment share/locale/nb/LC_MESSAGES/pam_winbind.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/pam_winbind.mo
@comment share/locale/nl/LC_MESSAGES/pam_winbind.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/pam_winbind.mo
@comment 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
@comment 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
@comment share/locale/ru/LC_MESSAGES/pam_winbind.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/pam_winbind.mo
@comment 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
@comment 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
@comment share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
share/swat/help/Samba3-ByExample/
share/swat/help/Samba3-ByExample/Big500users.html
share/swat/help/Samba3-ByExample/DMSMig.html
@ -381,7 +383,7 @@ share/swat/help/Samba3-HOWTO/locking.html
share/swat/help/Samba3-HOWTO/migration.html
share/swat/help/Samba3-HOWTO/msdfs.html
share/swat/help/Samba3-HOWTO/optional.html
share/swat/help/Samba3-HOWTO/pam.html
@comment share/swat/help/Samba3-HOWTO/pam.html
share/swat/help/Samba3-HOWTO/passdb.html
share/swat/help/Samba3-HOWTO/pr01.html
share/swat/help/Samba3-HOWTO/pr02.html
@ -399,11 +401,11 @@ 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/cifs.upcall.8.html
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_autorid.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
@ -421,13 +423,12 @@ 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
share/swat/help/manpages/mount.cifs.8.html
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.conf.5.html
@comment share/swat/help/manpages/pam_winbind.8.html
@comment share/swat/help/manpages/pam_winbind.conf.5.html
share/swat/help/manpages/pdbedit.8.html
share/swat/help/manpages/profiles.1.html
share/swat/help/manpages/rpcclient.1.html
@ -445,6 +446,7 @@ 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/smbta-util.8.html
share/swat/help/manpages/smbtar.1.html
share/swat/help/manpages/smbtree.1.html
share/swat/help/manpages/swat.8.html
@ -452,7 +454,6 @@ 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
@ -460,6 +461,7 @@ 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_crossrename.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
@ -480,6 +482,7 @@ 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_time_audit.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

40
net/samba/pkg/PLIST-main
View File

@ -1,14 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.17 2011/09/13 10:54:15 sthen Exp $
@conflict samba-docs-<=3.5.0
@comment $OpenBSD: PLIST-main,v 1.18 2011/09/26 09:32:12 sthen Exp $
@conflict samba-docs-<3.6.0
@pkgpath ${BASE_PKGPATH}
@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 bin/net
@bin bin/nmblookup
@ -25,6 +19,7 @@ bin/mksmbpasswd
@bin bin/smbpasswd
@bin bin/smbspool
@bin bin/smbstatus
@bin bin/smbta-util
bin/smbtar
@bin bin/smbtree
@bin bin/testparm
@ -32,7 +27,6 @@ bin/smbtar
include/libsmbclient.h
include/netapi.h
include/smb_share_modes.h
include/wbc_async.h
include/wbclient.h
@lib lib/libnetapi.so.${LIBnetapi_VERSION}
@lib lib/libsmbclient.so.${LIBsmbclient_VERSION}
@ -50,6 +44,7 @@ lib/samba/fi.msg
lib/samba/fr.msg
lib/samba/gpext/
lib/samba/idmap/
lib/samba/idmap/autorid.so
lib/samba/it.msg
lib/samba/ja.msg
lib/samba/libnetapi.so
@ -66,7 +61,6 @@ 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
@ -77,11 +71,13 @@ lib/samba/vfs/acl_xattr.so
lib/samba/vfs/audit.so
lib/samba/vfs/cap.so
lib/samba/vfs/catia.so
lib/samba/vfs/crossrename.so
lib/samba/vfs/default_quota.so
lib/samba/vfs/expand_msdfs.so
lib/samba/vfs/extd_audit.so
lib/samba/vfs/fake_perms.so
lib/samba/vfs/full_audit.so
lib/samba/vfs/linux_xfs_sgid.so
lib/samba/vfs/netatalk.so
lib/samba/vfs/preopen.so
lib/samba/vfs/readahead.so
@ -93,6 +89,7 @@ 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/time_audit.so
lib/samba/vfs/xattr_tdb.so
@bin libexec/nmbd
@bin libexec/smbd
@ -133,6 +130,7 @@ lib/samba/vfs/xattr_tdb.so
@man man/man8/eventlogadm.8
@man man/man8/idmap_ad.8
@man man/man8/idmap_adex.8
@man man/man8/idmap_autorid.8
@man man/man8/idmap_hash.8
@man man/man8/idmap_ldap.8
@man man/man8/idmap_nss.8
@ -147,6 +145,7 @@ lib/samba/vfs/xattr_tdb.so
@man man/man8/smbd.8
@man man/man8/smbpasswd.8
@man man/man8/smbspool.8
@man man/man8/smbta-util.8
@man man/man8/swat.8
@man man/man8/tdbbackup.8
@man man/man8/tdbdump.8
@ -159,6 +158,7 @@ lib/samba/vfs/xattr_tdb.so
@man man/man8/vfs_cap.8
@man man/man8/vfs_catia.8
@man man/man8/vfs_commit.8
@man man/man8/vfs_crossrename.8
@man man/man8/vfs_default_quota.8
@man man/man8/vfs_dirsort.8
@man man/man8/vfs_extd_audit.8
@ -179,6 +179,7 @@ lib/samba/vfs/xattr_tdb.so
@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_time_audit.8
@man man/man8/vfs_xattr_tdb.8
@man man/man8/winbindd.8
share/doc/pkg-readmes/${FULLPKGNAME}
@ -186,9 +187,26 @@ share/doc/samba/
share/doc/samba/README
share/examples/samba/
@sample ${SYSCONFDIR}/samba/
share/examples/samba/ad-bench/
share/examples/samba/ad-bench/README
share/examples/samba/ad-bench/ad-bench.sh
share/examples/samba/ad-bench/settings.sh
share/examples/samba/ad-bench/test_utils.sh
share/examples/samba/ad-bench/time_group.sh
share/examples/samba/ad-bench/time_join.sh
share/examples/samba/ad-bench/time_kinit.sh
share/examples/samba/ad-bench/time_ldap.sh
share/examples/samba/ad-bench/time_user.sh
share/examples/samba/ad-bench/utils.sh
share/examples/samba/bind9-patches/
share/examples/samba/bind9-patches/0001-leave-the-question-section-in-update-responses.patch
share/examples/samba/bind9-patches/0002-prevent-a-valgrind-uninitialised-memory-warning.patch
share/examples/samba/bind9-patches/0003-don-t-compress-TSIG-names.patch
share/examples/samba/bind9-patches/0004-If-tkey-gssapi-initialisation-fails-then-heck-for-th.patch
share/examples/samba/bind9-patches/0005-windows-doesn-t-return-valid-GSSAPI-sequence-numbers.patch
share/examples/samba/bind9-patches/README
share/examples/samba/smb.conf.default
@sample ${SYSCONFDIR}/samba/smb.conf
@comment share/locale/de/LC_MESSAGES/pam_winbind.mo
share/swat/
share/swat/help/
share/swat/help/welcome-no-samba-doc.html

9
net/samba/pkg/README-main
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.6 2011/06/03 10:21:54 sthen Exp $
$OpenBSD: README-main,v 1.7 2011/09/26 09:32:12 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -53,9 +53,10 @@ $ sudo pdbedit -a -u <username>
or the old way if for smbpasswd
$ sudo smbpasswd -a <username>
An EXPERIMENTAL implementation of the SMB2 protocol has been added.
SMB2 can be enabled by setting "max protocol = smb2". SMB2 is a new
implementation of the SMB protocol used by Windows Vista and higher.
Samba contains an implementation of the SMB2 protocol. It is
disabled by default.SMB2 can be enabled by setting
"max protocol = smb2". SMB2 is a new implementation of the SMB
protocol used by Windows Vista and higher.
To use Samba as a PDC the values of openfiles-max in /etc/login.conf
and kern.maxfiles should be increased to 16384.