pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update net/samba to 3.0.21a. Changes since version 3....



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5765d5ac05dc
branches:  trunk
changeset: 505341:5765d5ac05dc
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 02 22:33:36 2006 +0000

description:
Update net/samba to 3.0.21a.  Changes since version 3.0.20b include:

Bugfixes:
  o Address a bug in the oplock code which may cause clients to stall
    when multiple users are accessing a share concurrently
  o Missing groups in a user's token when logging in via kerberos
  o Incompatibilities with newer MS Windows hotfixes and
    embedded OS platforms
  o Portability and crash bugs.
  o Performance issues in winbindd.

Additions:
  o Complete NTLMv2 support by consolidating authentication
    mechanism used at the CIFS and RPC layers.
  o The capability to manage Unix services using the Win32
    Service Control API.
  o The capability to view external Unix log files via the
    Microsoft Event Viewer.
  o New libmsrpc share library for application developers.
  o Rewrite of CIFS oplock implementation.
  o Performance Counter external daemon.
  o Winbindd auto-detection query methods when communicating with
    a domain controller.
  o The ability to enumerate long share names in libsmbclient
    applications.

diffstat:

 doc/CHANGES                |   3 +-
 net/samba/Makefile         |  35 +++++++++++++++++++++++-----
 net/samba/Makefile.mirrors |  17 ++++++++-----
 net/samba/Makefile.patches |  12 +---------
 net/samba/PLIST            |  27 ++++++++++++----------
 net/samba/distinfo         |  54 +++++++++++++++++----------------------------
 net/samba/patches/patch-am |   6 ++--
 net/samba/patches/patch-at |  28 +++++++++++-----------
 net/samba/patches/patch-au |  10 ++++----
 net/samba/patches/patch-av |   6 ++--
 net/samba/patches/patch-ba |  26 +++++++++++-----------
 net/samba/patches/patch-bd |  10 ++++----
 net/samba/patches/patch-bf |   6 ++--
 net/samba/patches/patch-bh |  22 +++++++++++++++---
 net/samba/patches/patch-bi |   6 ++--
 net/samba/patches/patch-bk |   6 ++--
 net/samba/patches/patch-bo |   6 ++--
 net/samba/patches/patch-bp |   6 ++--
 net/samba/patches/patch-br |   6 ++--
 net/samba/patches/patch-bs |  18 +++++++-------
 net/samba/patches/patch-bt |  14 +++++-----
 net/samba/patches/patch-bu |  10 ++++----
 net/samba/patches/patch-bw |  18 +++++++-------
 net/samba/patches/patch-ca |  13 -----------
 net/samba/patches/patch-cb |  22 ------------------
 net/samba/patches/patch-cc |  22 ------------------
 26 files changed, 186 insertions(+), 223 deletions(-)

diffs (truncated from 1022 to 300 lines):

diff -r 087d3b5d946b -r 5765d5ac05dc doc/CHANGES
--- a/doc/CHANGES       Mon Jan 02 22:30:52 2006 +0000
+++ b/doc/CHANGES       Mon Jan 02 22:33:36 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.12310 2006/01/02 21:50:43 veego Exp $
+$NetBSD: CHANGES,v 1.12311 2006/01/02 22:33:37 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -34,3 +34,4 @@
        Updated www/neon to 0.25.4 [epg 2006-01-02]
        Updated devel/subversion to 1.3.0 [epg 2006-01-02]
        Updated databases/p5-perl-ldap to 0.33 [veego 2006-01-02]
+       Updated net/samba to 3.0.21a [jlam 2006-01-02]
diff -r 087d3b5d946b -r 5765d5ac05dc net/samba/Makefile
--- a/net/samba/Makefile        Mon Jan 02 22:30:52 2006 +0000
+++ b/net/samba/Makefile        Mon Jan 02 22:33:36 2006 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.155 2005/12/29 06:22:02 jlam Exp $
+# $NetBSD: Makefile,v 1.156 2006/01/02 22:33:36 jlam Exp $
 
 .include "Makefile.mirrors"
 
-DISTNAME=              samba-3.0.20b
-PKGNAME=               samba-3.0.20.2
-PKGREVISION=           3
+DISTNAME=              samba-3.0.21a
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
 DIST_SUBDIR=           ${DISTNAME}
@@ -100,18 +98,41 @@
 OWN_DIRS_PERMS=                ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700
 RCD_SCRIPTS+=          samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
 
+# Get the shared library major and minors for the installed shared
+# libraries.  We'll need these to create the versioned symlinks for
+# the shared libraries because samba Makefile doesn't do it on its
+# own.
+#
+.for LIB in LIBSMBCLIENT LIBMSRPC
+.  for NUM in MAJOR MINOR
+${LIB}_${NUM}_cmd=     ${AWK} -F= '/^${LIB}_${NUM}/ { print $$2; }'    \
+                               ${WRKSRC}/Makefile.in
+${LIB}_${NUM}=         ${${LIB}_${NUM}_cmd:sh}
+PLIST_SUBST+=          ${LIB}_${NUM}=${${LIB}_${NUM}}
+.  endfor
+.endfor
+
+install-samba-lib-symlinks:
+       cd ${SAMBA_LIBDIR} && ${LN} -s libmsrpc.so                      \
+               libmsrpc.so.${LIBMSRPC_MAJOR}
+       cd ${SAMBA_LIBDIR} && ${LN} -s libmsrpc.so                      \
+               libmsrpc.so.${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
+       cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so                  \
+               libsmbclient.so.${LIBSMBCLIENT_MAJOR}
+       cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so                  \
+               libsmbclient.so.${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
+
 post-build:
        @${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh
        @${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
 
-post-install:
+post-install: install-samba-lib-symlinks
        ${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/include
        ${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/images
        ${RMDIR} ${PREFIX}/share/samba/swat/lang/tr/include
-       for d in auth idmap pdb rpc; do                                 \
+       for d in idmap pdb rpc; do                                      \
                ${RMDIR} ${SAMBA_LIBDIR}/$$d;                           \
        done
-       -cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so libsmbclient.so.0
        ${INSTALL_DATA_DIR} ${DOCDIR}
        cd ${WRKSRC}/../docs/registry; for f in *.reg; do               \
                ${INSTALL_DATA} $${f} ${DOCDIR}/$${f};                  \
diff -r 087d3b5d946b -r 5765d5ac05dc net/samba/Makefile.mirrors
--- a/net/samba/Makefile.mirrors        Mon Jan 02 22:30:52 2006 +0000
+++ b/net/samba/Makefile.mirrors        Mon Jan 02 22:33:36 2006 +0000
@@ -1,39 +1,42 @@
-# $NetBSD: Makefile.mirrors,v 1.1 2005/11/14 08:05:27 jlam Exp $
+# $NetBSD: Makefile.mirrors,v 1.2 2006/01/02 22:33:36 jlam Exp $
 #
 # This Makefile fragment contains the mirror sites for fetching Samba.
 
 ###
-### This list was last updated on 20051024 from:
+### This list was last updated on 20060102 from:
 ###    http://www.samba.org/samba/download/ftp_mirrors.html
 ###
 SAMBA_MIRRORS= \
        ftp://ftp.samba.org/pub/samba/ \
+       ftp://ftp.planetmirror.com/pub/samba/ \
        ftp://gd.tuwien.ac.at/infosys/servers/samba/ \
        ftp://ftp.easynet.be/samba/ \
        ftp://ftp.pucpr.br/samba/ \
        ftp://ca.samba.org/ \
+       ftp://ftp.linuxforum.net/ftp.samba.org/ \
        ftp://mirror.kn.vutbr.cz/pub/MIRRORS/samba/ \
        ftp://mirrors.dotsrc.org/samba/ \
        ftp://fi.samba.org/pub/samba/ \
+       ftp://de3.samba.org/pub/samba/ \
        ftp://de.samba.org/samba.org/ \
        ftp://ftp.ntua.gr/pub/net/samba/ \
+       ftp://ftp.heanet.ie/pub/samba/ \
        ftp://ie.samba.org/mirrors/ftp.samba.org/pub/samba/ \
-       ftp://ftp.heanet.ie/pub/samba/ \
        ftp://ftp.ring.gr.jp/pub/net/samba/ \
+       ftp://ftp.samba.gr.jp/pub/samba/ \
        ftp://ftp.bit.nl/mirror/samba/ \
        ftp://www.bibsyst.no/pub/samba/ \
+       ftp://pl.samba.org/pub/unix/net/samba/ \
        ftp://giswitch.sggw.waw.pl/pub/unix/samba/ \
-       ftp://pl.samba.org/pub/unix/net/samba/ \
        ftp://ftp.citkit.ru/pub/samba/ \
        ftp://ru.samba.org/pub/samba/ \
        ftp://ru2.samba.org// \
        ftp://ftp.chg.ru/packages/samba/ \
-       ftp://cs.samba.org/pub/samba/ \
        ftp://ftp.oss.eznetsols.org/samba/ \
        ftp://ftp.k2.net/mirrors/samba/ \
        ftp://se.samba.org/pub/samba/ \
+       ftp://ftp.ulak.net.tr/samba/ \
        ftp://us1.samba.org/pub/samba/ \
        ftp://us5.samba.org/pub/samba-ftp/ \
        ftp://us2.samba.org/pub/samba/ \
-       ftp://us4.samba.org/pub/samba/ \
-       ftp://sunsite.org.uk/package/samba/
+       ftp://us4.samba.org/pub/samba/
diff -r 087d3b5d946b -r 5765d5ac05dc net/samba/Makefile.patches
--- a/net/samba/Makefile.patches        Mon Jan 02 22:30:52 2006 +0000
+++ b/net/samba/Makefile.patches        Mon Jan 02 22:33:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.1 2005/11/14 08:05:27 jlam Exp $
+# $NetBSD: Makefile.patches,v 1.2 2006/01/02 22:33:36 jlam Exp $
 #
 # This Makefile fragment describes the recommended patches for the
 # currently packaged version of Samba.  All recommended patches for
@@ -11,13 +11,3 @@
 # they are added to ${PATCH_SITES}.
 #
 PATCH_SITES=   http://www.samba.org/samba/patches/
-PATCHFILES=    # empty
-
-PATCHFILES+=   print_lprm.patch
-PATCH_DIST_STRIP.print_lprm.patch=     -p2
-
-PATCHFILES+=   quota.patch
-PATCH_DIST_STRIP.quota.patch=           -p2
-
-PATCHFILES+=   bug3201_wbinfo.patch
-PATCH_DIST_STRIP.bug3201_wbinfo.patch=  -p0
diff -r 087d3b5d946b -r 5765d5ac05dc net/samba/PLIST
--- a/net/samba/PLIST   Mon Jan 02 22:30:52 2006 +0000
+++ b/net/samba/PLIST   Mon Jan 02 22:33:36 2006 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.32 2005/11/14 08:05:27 jlam Exp $
+@comment $NetBSD: PLIST,v 1.33 2006/01/02 22:33:36 jlam Exp $
+bin/eventlogadm
 bin/findsmb
 bin/net
 bin/nmblookup
@@ -10,6 +11,7 @@
 bin/smbclient
 bin/smbcontrol
 bin/smbcquotas
+bin/smbget
 ${SMBMOUNT}bin/smbmnt
 ${SMBMOUNT}bin/smbmount
 bin/smbpasswd
@@ -23,9 +25,11 @@
 bin/tdbtool
 bin/testparm
 ${WINBIND}bin/wbinfo
+include/libmsrpc.h
 include/libsmbclient.h
 ${NSS_WINBIND}
 ${NSS_WINS}
+lib/samba/auth/script.so
 lib/samba/charset/CP437.so
 lib/samba/charset/CP850.so
 lib/samba/de.msg
@@ -33,8 +37,12 @@
 lib/samba/fr.msg
 lib/samba/it.msg
 lib/samba/ja.msg
+lib/samba/libmsrpc.so
+lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}
+lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
 lib/samba/libsmbclient.so
-lib/samba/libsmbclient.so.0
+lib/samba/libsmbclient.so.${LIBSMBCLIENT_MAJOR}
+lib/samba/libsmbclient.so.${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
 lib/samba/lowcase.dat
 lib/samba/nl.msg
 lib/samba/pl.msg
@@ -55,7 +63,6 @@
 ${PAM_SMBPASS}
 ${PAM_WINBIND}
 ${CUPS}libexec/cups/backend/smb
-man/man1/editreg.1
 man/man1/findsmb.1
 man/man1/log2pcap.1
 man/man1/nmblookup.1
@@ -67,12 +74,10 @@
 man/man1/smbcontrol.1
 man/man1/smbcquotas.1
 man/man1/smbget.1
-man/man1/smbsh.1
 man/man1/smbstatus.1
 man/man1/smbtar.1
 man/man1/smbtree.1
 man/man1/testparm.1
-man/man1/testprns.1
 man/man1/vfstest.1
 man/man1/wbinfo.1
 man/man5/lmhosts.5
@@ -80,11 +85,11 @@
 man/man5/smbgetrc.5
 man/man5/smbpasswd.5
 man/man7/samba.7
-man/man8/libsmbclient.8
+man/man7/libsmbclient.7
+man/man7/pam_winbind.7
 man/man8/mount.cifs.8
 man/man8/net.8
 man/man8/nmbd.8
-man/man8/pam_winbind.8
 man/man8/pdbedit.8
 man/man8/smbd.8
 man/man8/smbmnt.8
@@ -113,7 +118,6 @@
 share/doc/samba/Win9X-CacheHandling.reg
 share/doc/samba/WinME_PlainPassword.reg
 share/doc/samba/WinXP_PlainPassword.reg
-share/doc/samba/WinXP_SignOrSeal.reg
 share/doc/samba/WindowsTerminalServer.reg
 share/examples/rc.d/nmbd
 share/examples/rc.d/samba
@@ -334,10 +338,9 @@
 share/samba/swat/help/Samba3-HOWTO/unicode.html
 share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
 share/samba/swat/help/Samba3-HOWTO/winbind.html
-share/samba/swat/help/manpages/editreg.1.html
 share/samba/swat/help/manpages/findsmb.1.html
 share/samba/swat/help/manpages/index.html
-share/samba/swat/help/manpages/libsmbclient.8.html
+share/samba/swat/help/manpages/libsmbclient.7.html
 share/samba/swat/help/manpages/lmhosts.5.html
 share/samba/swat/help/manpages/log2pcap.1.html
 share/samba/swat/help/manpages/mount.cifs.8.html
@@ -345,7 +348,7 @@
 share/samba/swat/help/manpages/nmbd.8.html
 share/samba/swat/help/manpages/nmblookup.1.html
 share/samba/swat/help/manpages/ntlm_auth.1.html
-share/samba/swat/help/manpages/pam_winbind.8.html
+share/samba/swat/help/manpages/pam_winbind.7.html
 share/samba/swat/help/manpages/pdbedit.8.html
 share/samba/swat/help/manpages/profiles.1.html
 share/samba/swat/help/manpages/rpcclient.1.html
@@ -372,7 +375,6 @@
 share/samba/swat/help/manpages/tdbbackup.8.html
 share/samba/swat/help/manpages/tdbdump.8.html
 share/samba/swat/help/manpages/testparm.1.html
-share/samba/swat/help/manpages/testprns.1.html
 share/samba/swat/help/manpages/umount.cifs.8.html
 share/samba/swat/help/manpages/vfstest.1.html
 share/samba/swat/help/manpages/wbinfo.1.html
@@ -586,4 +588,5 @@
 @dirrm share/doc/samba
 @dirrm lib/samba/vfs
 @dirrm lib/samba/charset
+@dirrm lib/samba/auth
 @dirrm lib/samba
diff -r 087d3b5d946b -r 5765d5ac05dc net/samba/distinfo
--- a/net/samba/distinfo        Mon Jan 02 22:30:52 2006 +0000
+++ b/net/samba/distinfo        Mon Jan 02 22:33:36 2006 +0000
@@ -1,17 +1,8 @@
-$NetBSD: distinfo,v 1.46 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: distinfo,v 1.47 2006/01/02 22:33:36 jlam Exp $
 
-SHA1 (samba-3.0.20b/samba-3.0.20b.tar.gz) = e46fa8465dd70c670d84d697e408e70cbc18bb56
-RMD160 (samba-3.0.20b/samba-3.0.20b.tar.gz) = c7fe6cf7e3cae6835efd631f9c7d8b97c8253370
-Size (samba-3.0.20b/samba-3.0.20b.tar.gz) = 17165513 bytes
-SHA1 (samba-3.0.20b/print_lprm.patch) = 9610e7cc3ba475f7963a010a965e62299b37561f
-RMD160 (samba-3.0.20b/print_lprm.patch) = 8bfaad7118e58ceeb7a691279b3642ea870c3568
-Size (samba-3.0.20b/print_lprm.patch) = 12526 bytes
-SHA1 (samba-3.0.20b/quota.patch) = a6fbe1de5133f5292d29121e1d450347db26612a
-RMD160 (samba-3.0.20b/quota.patch) = d9c3616a9d552e5d5d84f61d05451d945cc20a3f
-Size (samba-3.0.20b/quota.patch) = 491 bytes
-SHA1 (samba-3.0.20b/bug3201_wbinfo.patch) = 0fa3d3547d35a725cc2483a3c8ab64dab0b9b8c5
-RMD160 (samba-3.0.20b/bug3201_wbinfo.patch) = 2253d4ebfc7c162e0cf4b991c854c999b7b99316
-Size (samba-3.0.20b/bug3201_wbinfo.patch) = 566 bytes
+SHA1 (samba-3.0.21a/samba-3.0.21a.tar.gz) = c8d339801f2f1c60a4bb652aee85da6a0eb5d224
+RMD160 (samba-3.0.21a/samba-3.0.21a.tar.gz) = 0daede1526cacd631654a82b33af48ffb4789ce4
+Size (samba-3.0.21a/samba-3.0.21a.tar.gz) = 17524018 bytes
 SHA1 (patch-ab) = 43e97366a460b0aa19667719f7235c9eb2a58022
 SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
 SHA1 (patch-ad) = dd1f36ce1ccabaf3b4efb1d61a8af1f4d3d1857a
@@ -23,39 +14,36 @@
 SHA1 (patch-aj) = c9e406113cdfc21c06483796a7008eb98a7d49fe



Home | Main Index | Thread Index | Old Index