? samba/RELEASE Index: samba/Makefile =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/samba/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- samba/Makefile 4 Jul 2013 15:05:46 -0000 1.16 +++ samba/Makefile 5 Nov 2013 03:32:45 -0000 @@ -11,7 +11,7 @@ COMMENT= SMB/CIFS protocol server suite LICENSE= gnu-gpl-v3 -VERSION= 4.0.7 +VERSION= 4.1.0 CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* FILESDIR= ${PKGDIR}/../../net/samba/files @@ -57,7 +57,7 @@ CONFIGURE_SCRIPT= ${WRKSRC}/buildtools/bin/waf CONFIGURE_ARGS+= configure CONFIGURE_ARGS+= --prefix=$(PREFIX:Q) -#CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} #CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} #CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} CONFIGURE_ARGS+= --with-privatelibdir=${SAMBA_LIBDIR}/samba @@ -190,4 +190,5 @@ .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +#include "../../wip/talloc/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: samba/PLIST =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/samba/PLIST,v retrieving revision 1.10 diff -u -r1.10 PLIST --- samba/PLIST 4 Jul 2013 15:05:46 -0000 1.10 +++ samba/PLIST 5 Nov 2013 03:32:46 -0000 @@ -15,6 +15,10 @@ bin/net bin/nmblookup bin/nmblookup4 +bin/ntdbbackup +bin/ntdbdump +bin/ntdbrestore +bin/ntdbtool bin/ntlm_auth bin/oLschema2ldif bin/pdbedit @@ -118,6 +122,7 @@ include/smb2.h include/smb2_constants.h include/smb2_create_blob.h +include/smb2_lease.h include/smb2_signing.h include/smb_cli.h include/smb_cliraw.h @@ -185,7 +190,7 @@ lib/libndr-standard.so.0.0.1 lib/libndr.so lib/libndr.so.0 -lib/libndr.so.0.0.1 +lib/libndr.so.0.0.2 lib/libnetapi.so lib/libnetapi.so.0 lib/libnss_winbind.so @@ -216,7 +221,7 @@ lib/libsmbclient-raw.so.0.0.1 lib/libsmbclient.so lib/libsmbclient.so.0 -lib/libsmbclient.so.0.2.0 +lib/libsmbclient.so.0.2.1 lib/libsmbconf.so lib/libsmbconf.so.0 lib/libsmbldap.so @@ -256,6 +261,7 @@ lib/pkgconfig/wbclient.pc ${PYSITELIB}/_tevent.so ${PYSITELIB}/ldb.so +${PYSITELIB}/ntdb.so ${PYSITELIB}/samba/__init__.py ${PYSITELIB}/samba/_glue.so ${PYSITELIB}/samba/_ldb.so @@ -384,6 +390,7 @@ ${PYSITELIB}/samba/external/subunit/__init__.py ${PYSITELIB}/samba/external/subunit/chunked.py ${PYSITELIB}/samba/external/subunit/details.py +${PYSITELIB}/samba/external/subunit/filters.py ${PYSITELIB}/samba/external/subunit/iso8601.py ${PYSITELIB}/samba/external/subunit/progress_model.py ${PYSITELIB}/samba/external/subunit/run.py @@ -412,16 +419,35 @@ ${PYSITELIB}/samba/external/testtools/deferredruntest.py ${PYSITELIB}/samba/external/testtools/distutilscmd.py ${PYSITELIB}/samba/external/testtools/helpers.py -${PYSITELIB}/samba/external/testtools/matchers.py +${PYSITELIB}/samba/external/testtools/matchers/__init__.py +${PYSITELIB}/samba/external/testtools/matchers/_basic.py +${PYSITELIB}/samba/external/testtools/matchers/_datastructures.py +${PYSITELIB}/samba/external/testtools/matchers/_dict.py +${PYSITELIB}/samba/external/testtools/matchers/_doctest.py +${PYSITELIB}/samba/external/testtools/matchers/_exception.py +${PYSITELIB}/samba/external/testtools/matchers/_filesystem.py +${PYSITELIB}/samba/external/testtools/matchers/_higherorder.py +${PYSITELIB}/samba/external/testtools/matchers/_impl.py ${PYSITELIB}/samba/external/testtools/monkey.py ${PYSITELIB}/samba/external/testtools/run.py ${PYSITELIB}/samba/external/testtools/runtest.py +${PYSITELIB}/samba/external/testtools/tags.py ${PYSITELIB}/samba/external/testtools/testcase.py ${PYSITELIB}/samba/external/testtools/testresult/__init__.py ${PYSITELIB}/samba/external/testtools/testresult/doubles.py ${PYSITELIB}/samba/external/testtools/testresult/real.py ${PYSITELIB}/samba/external/testtools/tests/__init__.py ${PYSITELIB}/samba/external/testtools/tests/helpers.py +${PYSITELIB}/samba/external/testtools/tests/matchers/__init__.py +${PYSITELIB}/samba/external/testtools/tests/matchers/helpers.py +${PYSITELIB}/samba/external/testtools/tests/matchers/test_basic.py +${PYSITELIB}/samba/external/testtools/tests/matchers/test_datastructures.py +${PYSITELIB}/samba/external/testtools/tests/matchers/test_dict.py +${PYSITELIB}/samba/external/testtools/tests/matchers/test_doctest.py +${PYSITELIB}/samba/external/testtools/tests/matchers/test_exception.py +${PYSITELIB}/samba/external/testtools/tests/matchers/test_filesystem.py +${PYSITELIB}/samba/external/testtools/tests/matchers/test_higherorder.py +${PYSITELIB}/samba/external/testtools/tests/matchers/test_impl.py ${PYSITELIB}/samba/external/testtools/tests/test_compat.py ${PYSITELIB}/samba/external/testtools/tests/test_content.py ${PYSITELIB}/samba/external/testtools/tests/test_content_type.py @@ -429,11 +455,11 @@ ${PYSITELIB}/samba/external/testtools/tests/test_distutilscmd.py ${PYSITELIB}/samba/external/testtools/tests/test_fixturesupport.py ${PYSITELIB}/samba/external/testtools/tests/test_helpers.py -${PYSITELIB}/samba/external/testtools/tests/test_matchers.py ${PYSITELIB}/samba/external/testtools/tests/test_monkey.py ${PYSITELIB}/samba/external/testtools/tests/test_run.py ${PYSITELIB}/samba/external/testtools/tests/test_runtest.py ${PYSITELIB}/samba/external/testtools/tests/test_spinner.py +${PYSITELIB}/samba/external/testtools/tests/test_tags.py ${PYSITELIB}/samba/external/testtools/tests/test_testcase.py ${PYSITELIB}/samba/external/testtools/tests/test_testresult.py ${PYSITELIB}/samba/external/testtools/tests/test_testsuite.py @@ -563,6 +589,7 @@ lib/samba/gensec/krb5.so lib/samba/idmap/autorid.so lib/samba/idmap/hash.so +lib/samba/idmap/rfc2307.so lib/samba/idmap/rid.so lib/samba/idmap/tdb2.so lib/samba/ldb/acl.so @@ -683,8 +710,11 @@ lib/samba/libndr-samba4.so lib/samba/libnet_keytab.so lib/samba/libnetif.so +lib/samba/libnon_posix_acls.so lib/samba/libnpa_tstream.so lib/samba/libnss_info.so +lib/samba/libntdb.so.0 +lib/samba/libntdb.so.0.9 lib/samba/libntvfs.so lib/samba/libpac.so lib/samba/libpopt_samba3.so @@ -694,7 +724,7 @@ lib/samba/libpyldb-util.so.1 lib/samba/libpyldb-util.so.1.1.16 lib/samba/libpytalloc-util.so.2 -lib/samba/libpytalloc-util.so.2.0.7 +lib/samba/libpytalloc-util.so.2.0.8 lib/samba/libreplace.so lib/samba/libroken-samba4.so.19 lib/samba/libroken-samba4.so.19.0.1 @@ -718,15 +748,16 @@ lib/samba/libsmbregistry.so lib/samba/libsubunit.so lib/samba/libtalloc.so.2 -lib/samba/libtalloc.so.2.0.7 +lib/samba/libtalloc.so.2.0.8 lib/samba/libtdb-wrap.so lib/samba/libtdb.so.1 -lib/samba/libtdb.so.1.2.11 +lib/samba/libtdb.so.1.2.12 lib/samba/libtdb_compat.so lib/samba/libtevent.so.0 lib/samba/libtevent.so.0.9.18 lib/samba/libtrusts_util.so lib/samba/libutil_cmdline.so +lib/samba/libutil_ntdb.so lib/samba/libutil_reg.so lib/samba/libutil_setid.so lib/samba/libutil_tdb.so @@ -802,7 +833,6 @@ sbin/samba_spnupdate sbin/samba_upgradedns sbin/smbd -sbin/swat sbin/winbindd share/doc/samba/NT4-Locking.reg share/doc/samba/NT4_PlainPassword.reg @@ -850,17 +880,7 @@ share/perl5/Parse/Pidl/Wireshark/Conformance.pm share/perl5/Parse/Pidl/Wireshark/NDR.pm share/perl5/Parse/Yapp/Driver.pm -share/samba/codepages/de.msg -share/samba/codepages/en.msg -share/samba/codepages/fi.msg -share/samba/codepages/fr.msg -share/samba/codepages/it.msg -share/samba/codepages/ja.msg share/samba/codepages/lowcase.dat -share/samba/codepages/nl.msg -share/samba/codepages/pl.msg -share/samba/codepages/ru.msg -share/samba/codepages/tr.msg share/samba/codepages/upcase.dat share/samba/codepages/valid.dat share/samba/setup/DB_CONFIG @@ -953,38 +973,4 @@ share/samba/setup/slapd.conf share/samba/setup/spn_update_list share/samba/setup/ypServ30.ldif -share/samba/swat/help/welcome-no-samba-doc.html -share/samba/swat/help/welcome.html -share/samba/swat/images/globals.gif -share/samba/swat/images/home.gif -share/samba/swat/images/passwd.gif -share/samba/swat/images/printers.gif -share/samba/swat/images/samba.gif -share/samba/swat/images/shares.gif -share/samba/swat/images/status.gif -share/samba/swat/images/viewconfig.gif -share/samba/swat/images/wizard.gif -share/samba/swat/include/footer.html -share/samba/swat/include/header.html -share/samba/swat/lang/ja/help/welcome.html -share/samba/swat/lang/ru/help/welcome-no-samba-doc.html -share/samba/swat/lang/ru/help/welcome.html -share/samba/swat/lang/ru/images/globals.gif -share/samba/swat/lang/ru/images/home.gif -share/samba/swat/lang/ru/images/passwd.gif -share/samba/swat/lang/ru/images/printers.gif -share/samba/swat/lang/ru/images/shares.gif -share/samba/swat/lang/ru/images/status.gif -share/samba/swat/lang/ru/images/viewconfig.gif -share/samba/swat/lang/ru/images/wizard.gif -share/samba/swat/lang/ru/include/header.html -share/samba/swat/lang/tr/help/welcome.html -share/samba/swat/lang/tr/images/globals.gif -share/samba/swat/lang/tr/images/home.gif -share/samba/swat/lang/tr/images/passwd.gif -share/samba/swat/lang/tr/images/printers.gif -share/samba/swat/lang/tr/images/samba.gif -share/samba/swat/lang/tr/images/shares.gif -share/samba/swat/lang/tr/images/status.gif -share/samba/swat/lang/tr/images/viewconfig.gif @pkgdir etc/samba/private Index: samba/distinfo =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/samba/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- samba/distinfo 4 Jul 2013 15:05:47 -0000 1.7 +++ samba/distinfo 5 Nov 2013 03:32:46 -0000 @@ -1,6 +1,7 @@ $NetBSD$ -SHA1 (samba-4.0.7.tar.gz) = a40a57049cd34ee8720f864063b946e38ffa8d3e -RMD160 (samba-4.0.7.tar.gz) = 095b838859990f2520b29ba3b87ede5d561992fc -Size (samba-4.0.7.tar.gz) = 22078244 bytes +SHA1 (samba-4.1.0.tar.gz) = 8472f70a30baee330c4f023b0fc4088a856951c8 +RMD160 (samba-4.1.0.tar.gz) = 9d48264f021167cf1fb7fc94d241e33735f0cd4a +Size (samba-4.1.0.tar.gz) = 23149430 bytes SHA1 (patch-source4_scripting_wsript_build) = 91c99acc8cbadbd8d19400d466491c1da3e42527 +SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = c651014e5e703041a5bcf83f71a1d36c3f5f3309 Index: samba/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh =================================================================== RCS file: samba/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh diff -N samba/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ samba/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh 5 Nov 2013 03:32:46 -0000 @@ -0,0 +1,29 @@ +$NetBSD$ + +ERROR: [check-portability.awk] + +--- testprogs/blackbox/dbcheck-oldrelease.sh.orig 2013-09-27 19:35:31.000000000 +0900 ++++ testprogs/blackbox/dbcheck-oldrelease.sh 2013-11-02 11:59:48.000000000 +0900 +@@ -55,19 +55,19 @@ dbcheck_acl_reset_clean() { + } + + referenceprovision() { +- if [ x$RELEASE == x"release-4-0-0" ]; then ++ if [ x$RELEASE = x"release-4-0-0" ]; then + $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 + fi + } + + ldapcmp() { +- if [ x$RELEASE == x"release-4-0-0" ]; then ++ if [ x$RELEASE = x"release-4-0-0" ]; then + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord + fi + } + + ldapcmp_sd() { +- if [ x$RELEASE == x"release-4-0-0" ]; then ++ if [ x$RELEASE = x"release-4-0-0" ]; then + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --sd --skip-missing-dn + fi + }