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 version 3.0.22. Changes from vers...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6880d63a2a81
branches: trunk
changeset: 510615:6880d63a2a81
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Apr 01 04:55:35 2006 +0000
description:
Update net/samba to version 3.0.22. Changes from version 3.0.21a include:
* Fix CAN-2006-1059 -- samba<3.0.22 exposes the clear text of the
server's machine account credentials in the winbind log files when
the log level is set to 5 or higher.
* Append "-pkgsrc" to the Samba version string so as to distinguish
the official version from the pkgsrc version, which has the
modifications for "state directory" and "passwd expand gecos".
* Modify package so that we automatically determine the name of the
nsswitch modules that are installed by samba with the winbind
option. We extract this information by invoking the config.status
script to get the value that the configure script determined.
o Access checks when deleting printer driver meta-data.
o Several non-default combinations schannel and SPNEGO support.
o Password changes with NT4 and Win2k pre-SP4 clients.
o High load issues on IRIX caused by a bug when interfacing
with kernel oplocks.
o Server crashes in smbd.
o Compile issues on 64-bit platforms.
o Crash bugs on big-endian systems.
o Packaging fixes for RHEL/Fedora, Solaris, & Debian.
o Over 30 bugzilla reports closed.
diffstat:
doc/CHANGES | 3 +-
net/samba/DESCR | 13 ++++-----
net/samba/Makefile | 5 +--
net/samba/Makefile.mirrors | 15 +++++-----
net/samba/PLIST | 3 +-
net/samba/distinfo | 33 ++++++++++++-----------
net/samba/options.mk | 64 ++++++++++++++++++---------------------------
net/samba/patches/patch-am | 6 ++--
net/samba/patches/patch-at | 32 +++++++++++++++-------
net/samba/patches/patch-au | 22 ++++++++++++---
net/samba/patches/patch-ba | 20 +++++++-------
net/samba/patches/patch-be | 8 ++--
net/samba/patches/patch-bf | 6 ++--
net/samba/patches/patch-bi | 6 ++--
net/samba/patches/patch-bo | 6 ++--
net/samba/patches/patch-bp | 6 ++--
net/samba/patches/patch-bs | 8 ++--
net/samba/patches/patch-bu | 8 ++--
net/samba/patches/patch-bw | 14 +++++-----
net/samba/patches/patch-ca | 11 +++++++
20 files changed, 156 insertions(+), 133 deletions(-)
diffs (truncated from 698 to 300 lines):
diff -r 29f817fb3709 -r 6880d63a2a81 doc/CHANGES
--- a/doc/CHANGES Fri Mar 31 23:56:28 2006 +0000
+++ b/doc/CHANGES Sat Apr 01 04:55:35 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.13396 2006/03/31 22:25:00 adrianp Exp $
+$NetBSD: CHANGES,v 1.13397 2006/04/01 04:55:44 jlam Exp $
Changes to the packages collection and infrastructure in 2006:
@@ -1796,3 +1796,4 @@
Added net/pear-Net_Sieve version 1.1.1 [adrianp 2006-03-31]
Added mail/ingo version 1.1 [adrianp 2006-03-31]
Added time/kronolith version 2.1 [adrianp 2006-03-31]
+ Updated net/samba to 3.0.22 [jlam 2006-04-01]
diff -r 29f817fb3709 -r 6880d63a2a81 net/samba/DESCR
--- a/net/samba/DESCR Fri Mar 31 23:56:28 2006 +0000
+++ b/net/samba/DESCR Sat Apr 01 04:55:35 2006 +0000
@@ -1,7 +1,6 @@
-Samba is a suite of applications that speak the Server Message Block
-(SMB) protocol. Samba allows a UNIX machine to perform client-server
-networking for file and printer sharing with Microsoft Windows systems
-using their native network protocol and to appear as another Windows
-system on the network from the perspective of a Windows client. The
-Samba suite also includes client tools that allow users to access folders
-and printers that Windows systems and Samba servers offer on the network.
+Samba provides file and print services for Microsoft Windows clients.
+These services may be hosted off any TCP/IP-enabled platform. The
+Samba project includes not only an impressive feature set in file and
+print serving capabilities, but has been extended to include client
+functionality, utilities to ease migration to Samba, tools to aid
+interoperability with Microsoft Windows, and administration tools.
diff -r 29f817fb3709 -r 6880d63a2a81 net/samba/Makefile
--- a/net/samba/Makefile Fri Mar 31 23:56:28 2006 +0000
+++ b/net/samba/Makefile Sat Apr 01 04:55:35 2006 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.158 2006/01/08 18:35:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.159 2006/04/01 04:55:35 jlam Exp $
.include "Makefile.mirrors"
-DISTNAME= samba-3.0.21a
-PKGREVISION= 1
+DISTNAME= samba-3.0.22
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
DIST_SUBDIR= ${DISTNAME}
diff -r 29f817fb3709 -r 6880d63a2a81 net/samba/Makefile.mirrors
--- a/net/samba/Makefile.mirrors Fri Mar 31 23:56:28 2006 +0000
+++ b/net/samba/Makefile.mirrors Sat Apr 01 04:55:35 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.mirrors,v 1.2 2006/01/02 22:33:36 jlam Exp $
+# $NetBSD: Makefile.mirrors,v 1.3 2006/04/01 04:55:35 jlam Exp $
#
# This Makefile fragment contains the mirror sites for fetching Samba.
###
-### This list was last updated on 20060102 from:
+### This list was last updated on 20060401 from:
### http://www.samba.org/samba/download/ftp_mirrors.html
###
SAMBA_MIRRORS= \
@@ -12,21 +12,21 @@
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/ \
+ http://mirrors.uol.com.br/pub/samba/ \
+ ftp://ftp.uni-sofia.bg/samba/ \
ftp://mirror.kn.vutbr.cz/pub/MIRRORS/samba/ \
ftp://mirrors.dotsrc.org/samba/ \
ftp://fi.samba.org/pub/samba/ \
+ ftp://de.samba.org/samba.org/ \
ftp://de3.samba.org/pub/samba/ \
- ftp://de.samba.org/samba.org/ \
ftp://ftp.ntua.gr/pub/net/samba/ \
+ ftp://ftp.hkmirror.org/pub/samba/sambaftp/ \
ftp://ftp.heanet.ie/pub/samba/ \
- ftp://ie.samba.org/mirrors/ftp.samba.org/pub/samba/ \
ftp://ftp.ring.gr.jp/pub/net/samba/ \
ftp://ftp.samba.gr.jp/pub/samba/ \
+ ftp://ftp.linux.edu.lv/mirrors/ftp.samba.org// \
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://ftp.citkit.ru/pub/samba/ \
ftp://ru.samba.org/pub/samba/ \
@@ -35,7 +35,6 @@
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/ \
diff -r 29f817fb3709 -r 6880d63a2a81 net/samba/PLIST
--- a/net/samba/PLIST Fri Mar 31 23:56:28 2006 +0000
+++ b/net/samba/PLIST Sat Apr 01 04:55:35 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2006/01/02 22:33:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.34 2006/04/01 04:55:35 jlam Exp $
bin/eventlogadm
bin/findsmb
bin/net
@@ -542,6 +542,7 @@
share/samba/swat/help/using_samba/samba2_s.gif
share/samba/swat/help/using_samba/samba2_xs.gif
share/samba/swat/help/using_samba/toc.html
+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
diff -r 29f817fb3709 -r 6880d63a2a81 net/samba/distinfo
--- a/net/samba/distinfo Fri Mar 31 23:56:28 2006 +0000
+++ b/net/samba/distinfo Sat Apr 01 04:55:35 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: distinfo,v 1.48 2006/04/01 04:55:35 jlam Exp $
-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 (samba-3.0.22/samba-3.0.22.tar.gz) = 76eba872b3e8f647e16d0d8d129e02848a7989d7
+RMD160 (samba-3.0.22/samba-3.0.22.tar.gz) = b41cffc999c524c1650d2dd3fbd063dc79741091
+Size (samba-3.0.22/samba-3.0.22.tar.gz) = 17542657 bytes
SHA1 (patch-ab) = 43e97366a460b0aa19667719f7235c9eb2a58022
SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
SHA1 (patch-ad) = dd1f36ce1ccabaf3b4efb1d61a8af1f4d3d1857a
@@ -14,36 +14,37 @@
SHA1 (patch-aj) = c9e406113cdfc21c06483796a7008eb98a7d49fe
SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
SHA1 (patch-al) = 9962f9ad7a495f4be4bcf1ec9e42ca51a2c417b8
-SHA1 (patch-am) = d2f0b7798bbcf25e887cca8ef9bbd4146aa5d409
-SHA1 (patch-at) = 38d85d8c35569902c257532e076ea9ad2fc5c6d4
-SHA1 (patch-au) = 4b6d26f871263c81792de8132b5beb1008f1805c
+SHA1 (patch-am) = 9dbc7124f2f7d4d29dfb3d5d6617735f99da4694
+SHA1 (patch-at) = bff50b53aedffbd352cc52ba49059b5c8010c140
+SHA1 (patch-au) = a061330dece8a9c49a02cf312b0fd39596b4baf2
SHA1 (patch-av) = cb1c699eecce8aea8454308be6a4ab3f6b767b06
SHA1 (patch-aw) = 374b1660d31ed54b85e68b49e25d80c2c54961be
SHA1 (patch-ax) = 778ff50316524d06d0c609b0aa8c6dfb48914a8e
SHA1 (patch-ay) = 054ba0c228a546af7f020a79b707e5fff0b21ff7
-SHA1 (patch-ba) = c6cfc30753b29a749b14cb3d3d95595e9e2e8c11
+SHA1 (patch-ba) = e3695b8a9adad853528a69c2566af0384e01c015
SHA1 (patch-bb) = 7a51028a9b5d81e4491b09b62851378e16425a99
SHA1 (patch-bc) = a2c94726ca3eb7be9468becdc0c8ac69fc47fae6
SHA1 (patch-bd) = 039eda1d77456fbddbcb0a11007dcaebda78fbc9
-SHA1 (patch-be) = abd72608a8f62ef1caa276b0f016f68458bb7078
-SHA1 (patch-bf) = 66cf695f028d204063c89156bf380deffe703c10
+SHA1 (patch-be) = 5ff0032c79e603a47a222891c709531bb5e9a488
+SHA1 (patch-bf) = 47c85a4a8d636b82ab57a29677beea4f876be746
SHA1 (patch-bg) = c247e4d269d71f992f061a6fbc56b22579d08a09
SHA1 (patch-bh) = 79f301fd1f8cd3d72d8106de6d0d315711d13219
-SHA1 (patch-bi) = 732a7fbc1c981e32554646e557da6299582b0021
+SHA1 (patch-bi) = 11312e7c3e843902e92c488d4ddb5f8eaac63a5a
SHA1 (patch-bj) = 0dd428bc8301762d32661861c83f7067bde39ae1
SHA1 (patch-bk) = 452346a8b031264a9a3e0f9b72ebe42c5e17134f
SHA1 (patch-bl) = 5f29a953dd9cadea8a27526778cc2257ccf3fd7c
SHA1 (patch-bm) = dba69070a9201f77b95f254ee4d9a0e8557894db
SHA1 (patch-bn) = c3a10f18dbcaa71775e7c290d0ac7d98288ba2f0
-SHA1 (patch-bo) = dce02333957386001a1fd841a5851453dcd4860b
-SHA1 (patch-bp) = 5708ce5a71c31b3cdab3b786a94eafbdfc31c46f
+SHA1 (patch-bo) = 2da80baec42437c61d97f44068c0d6cdeefaa877
+SHA1 (patch-bp) = 7e59df8e4f262f594d6278a5d7a4e56f551711c9
SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b
SHA1 (patch-br) = fc289614054ca1eb39f5ba834c81d2adec2e2217
-SHA1 (patch-bs) = be0fd34166886b2e8ce735c859ac019580ec6400
+SHA1 (patch-bs) = d49fca0b9722bd3a84339a151c6178ebd5ea5feb
SHA1 (patch-bt) = f11307c2519126ec1ae776af7ccd5ef6be378060
-SHA1 (patch-bu) = 5d02e06c0a1234bf451ac977c6a66b1677a49c2c
+SHA1 (patch-bu) = b31be3d6f1acbbb343f3d9afe66a1e43a55014f7
SHA1 (patch-bv) = 2e594d4ed4a98105b1a1311042f14e5f960aa067
-SHA1 (patch-bw) = 04b0d59e6a59ae04faa81663f032baaa54393fca
+SHA1 (patch-bw) = d3b03e1de353091dec5986e0da3d8f3d2981510f
SHA1 (patch-bx) = b46172b1e7e4937039b894eff7caf6dff5cbba62
SHA1 (patch-by) = adc269c07d06108fe77afbb65d5eb309fc4d6d67
SHA1 (patch-bz) = 143ff731caced00aa6ba589a1d83581a7449b853
+SHA1 (patch-ca) = 4863e5d3dbf01c92443464e9a3b01720859aca05
diff -r 29f817fb3709 -r 6880d63a2a81 net/samba/options.mk
--- a/net/samba/options.mk Fri Mar 31 23:56:28 2006 +0000
+++ b/net/samba/options.mk Sat Apr 01 04:55:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2005/12/05 23:55:15 rillig Exp $
+# $NetBSD: options.mk,v 1.13 2006/04/01 04:55:35 jlam Exp $
# Recommended package options for various setups:
#
@@ -129,33 +129,9 @@
WINBINDD_RCD_SCRIPT= winbindd
PLIST_SUBST+= WINBIND=
-# Determine the proper name for the winbind and WINS NSS modules.
-#
-# XXX We should really be trawling the generated Makefiles or config.*
-# XXX files to find this out dynamically.
-#
-NSS_WINBIND.${OPSYS}?= # empty
-NSS_WINBIND.AIX= WINBIND
-NSS_WINBIND.IRIX= libns_winbind.so
-NSS_WINBIND.Linux= libnss_winbind.so
-NSS_WINBIND.SunOS= libnss_winbind.so
-. if !empty(MACHINE_PLATFORM:MFreeBSD-[5-9].*)
-NSS_WINBIND.FreeBSD= nss_winbind.so
-. endif
-. if !empty(MACHINE_PLATFORM:MNetBSD-[3-9].*)
-NSS_WINBIND.NetBSD= nss_winbind.so
-. endif
-NSS_WINBIND= ${NSS_WINBIND.${OPSYS}}
-
-NSS_WINS.${OPSYS}?= # empty
-NSS_WINS.IRIX= libns_wins.so
-NSS_WINS.Linux= libnss_wins.so
-NSS_WINS.SunOS= libnss_wins.so
-NSS_WINS= ${NSS_WINS.${OPSYS}}
-
# Install the PAM winbind module if we're also building with PAM support.
. if empty(PKG_OPTIONS:Mpam)
-PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module"
+PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module"
. else
PLIST_SUBST+= PAM_WINBIND=lib/security/pam_winbind.so
@@ -166,26 +142,38 @@
. endif
# Install the NSS winbind module if it exists.
-. if empty(NSS_WINBIND)
-PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module"
-. else
-PLIST_SUBST+= NSS_WINBIND=lib/${NSS_WINBIND}
+PLIST_SUBST+= NSS_WINBIND=${NSS_WINBIND:Q}
+NSS_WINBIND= ${NSS_WINBIND_cmd:sh}
+NSS_WINBIND_cmd= \
+ ${TEST} -x ${WRKSRC}/config.status || \
+ { ${ECHO} "@comment no NSS winbind module" ; exit 0; }; \
+ cd ${WRKDIR} && ${ECHO} @WINBIND_NSS@ | \
+ ${WRKSRC}/config.status --file=-:- | \
+ ${AWK} '/^$$/ { print "@comment no NSS winbind module"; exit 0; } \
+ { sub(".*/", "lib/"); print; }' && \
+ ${RM} -f config.log
post-install: samba-nss-winbind-install
samba-nss-winbind-install:
- ${INSTALL_LIB} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib
-. endif
+ lib=${WRKSRC:Q}/nsswitch/${NSS_WINBIND:T:Q}; \
+ ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${PREFIX:Q}/lib
# Install the NSS WINS module if it exists.
-. if empty(NSS_WINS)
-PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module"
-. else
-PLIST_SUBST+= NSS_WINS=lib/${NSS_WINS}
+PLIST_SUBST+= NSS_WINS=${NSS_WINS:Q}
+NSS_WINS= ${NSS_WINS_cmd:sh}
+NSS_WINS_cmd= \
+ ${TEST} -x ${WRKSRC}/config.status || \
+ { ${ECHO} "@comment no NSS WINS module" ; exit 0; }; \
+ cd ${WRKDIR} && ${ECHO} @WINBIND_WINS_NSS@ | \
+ ${WRKSRC}/config.status --file=-:- | \
+ ${AWK} '/^$$/ { print "@comment no NSS WINS module"; exit 0; } \
+ { sub(".*/", "lib/"); print; }' && \
+ ${RM} -f config.log
post-install: samba-nss-wins-install
samba-nss-wins-install:
- ${INSTALL_LIB} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib
-. endif
+ lib=${WRKSRC:Q}/nsswitch/${NSS_WINS:T:Q}; \
+ ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${PREFIX:Q}/lib
.else
CONFIGURE_ARGS+= --without-winbind
PLIST_SUBST+= WINBIND="@comment "
diff -r 29f817fb3709 -r 6880d63a2a81 net/samba/patches/patch-am
--- a/net/samba/patches/patch-am Fri Mar 31 23:56:28 2006 +0000
+++ b/net/samba/patches/patch-am Sat Apr 01 04:55:35 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.6 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-am,v 1.7 2006/04/01 04:55:35 jlam Exp $
---- sam/idmap_rid.c.orig 2005-10-17 22:45:04.000000000 -0400
+--- sam/idmap_rid.c.orig 2006-01-24 18:46:38.000000000 -0500
+++ sam/idmap_rid.c
@@ -24,8 +24,6 @@
#undef DBGC_CLASS
@@ -18,5 +18,5 @@
-NTSTATUS init_module(void)
+NTSTATUS idmap_rid_init(void)
{
- return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "idmap_rid", &rid_methods);
return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "rid", &rid_methods);
+ }
diff -r 29f817fb3709 -r 6880d63a2a81 net/samba/patches/patch-at
--- a/net/samba/patches/patch-at Fri Mar 31 23:56:28 2006 +0000
+++ b/net/samba/patches/patch-at Sat Apr 01 04:55:35 2006 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-at,v 1.5 2006/04/01 04:55:35 jlam Exp $
Home |
Main Index |
Thread Index |
Old Index