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.20.2 from samba-3.0.20b. Reco...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f31e270d0beb
branches: trunk
changeset: 503106:f31e270d0beb
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Nov 14 08:05:27 2005 +0000
description:
Update net/samba to 3.0.20.2 from samba-3.0.20b. Recommended patches
for samba-3.0.20b that are applied as part of this update include:
http://www.samba.org/samba/patches/print_lprm.patch
http://www.samba.org/samba/patches/quota.patch
http://www.samba.org/samba/patches/bug3201_wbinfo.patch
This fixes PRs pkg/31352 and pkg/31991. Important changes that were
made as part of porting this Samba release to pkgsrc include the
following:
* The new release model for Samba includes distributing patches for
urgent bug fixes that will be included in the next release of Samba,
and are available at http://www.samba.org/samba/patches/. Since
these patches are rather generically named, we download all DISTFILES
and PATCHFILES for Samba into a ${DISTNAME}-specific directory.
* The default configuration for the samba package no longer builds the
"winbind" portions of samba, which are really only useful when
attempting to unify logons between Unix and Microsoft Windows. When
the "winbind" option is specified, we also build the RID and AD idmap
backends, which allow sharing UIDs/GIDs across Unix machines.
* New package options have been added to the build: "mysql", "pgsql",
and "xml" allow adding optional support for experimental passdb
storage backends, and "winbind" allows for optionally building the
winbindd daemon and associated plugins.
* Two new smb.conf options were added -- "passwd expand gecos" and
"state directory". The first describes whether "&" in the GECOS
field of a passwd db entry is expanded to the login name. The
second describes the location where the persistent-state database
files are stored.
* Luke Mewburn contributed code to allow nss_winbind.so to work properly
on supported NetBSD systems. The FreeBSD NSS winbind code should
probably be replaced with a suitably tweaked version of the NetBSD
code since the latter is much more complete in the functions that are
provided, but I'll leave that to freebsd-pkg-people.
* Samba dumps all of its files into "lock directory", but some of them
need to persist across reboots. We make a distinction between these
files and the temporary files that are re-created by the Samba
daemons when they are restarted -- the former are now stored in a
"state directory" and the latter are stored in the "lock directory".
This is modeled after the Debian patch to Samba located in:
packaging/Debian/debian-unstable/patches/fhs.patch
The "lock directory" default has been moved to ${VARBASE}/run/samba
to emphasize the temporary status of the files stored in that
directory.
* Samba persists in using PAM_AUTHTOK_RECOVER_ERR, when there is almost
universal agreement that PAM_AUTHTOK_RECOVERY_ERR is the right
constant to use. Even the Linux-PAM distribution ensures that
PAM_AUTHTOK_RECOVERY_ERR is correctly defined. To work around this,
we define PAM_AUTHTOK_RECOVER_ERR appropriately in all the places
where it is used.
* The configure script checks for OpenSSL's libcrypto.so by looking
for the symbol "des_set_key". However, libcrypto.so might not
contain that symbol because the DES functions might come from a
separate library, e.g. libdes.so. In this case, the configure script
will think that libcrypto.so is not available, when it actually may
be. Instead, look for EVP_des_cbc, which is always provided by
libcrypto.so.
* Add some missing $(PASSDB_LIBS) references to the Makefile to fix
compilation problems if the experimental passdb backends are statically
compiled into the Samba suite programs.
* Fix compilation problems in sam/idmap_rid.c and sam/idmap_ad.c if the
"rid" and "ad" idmap backends are statically compiled into winbindd.
Changes between version 3.0.14a and 3.0.20b include:
o Reporting files as read-only instead of returning the correct error
code of "access denied"
o File system quota support defects
o Crash bugs caused by incompatibilities on 64-bit systems.
o User Manager interoperability problems.
o Support for several new Win32 rpc pipes.
o New 'net rpc service' tool for managing Win32 services.
o Capability to set the owner on new files and directory based on the
parent's ownership.
o Experimental, asynchronous IO file serving support.
o Support for Microsoft Print Migrator.
o New Winbind IDmap plugin (ad) for retrieving uid and gid from AD
servers which maintain the SFU user and group attributes.
o Rewritten support for POSIX pathnames when utilizing the Linux CIFS
fs client.
o New asynchronous winbindd.
o New Windows NT registry file I/O library.
o New user right (SeTakeOwnershipPrivilege) added.
o New "net share migrate" options.
diffstat:
doc/CHANGES | 3 +-
net/samba/DESCR | 14 +-
net/samba/MESSAGE | 10 +
net/samba/Makefile | 86 +--
net/samba/Makefile.mirrors | 39 ++
net/samba/Makefile.patches | 23 +
net/samba/PLIST | 845 ++++++++++++++++++++++---------------------
net/samba/distinfo | 72 +++-
net/samba/files/nmbd.sh | 15 +-
net/samba/files/samba.sh | 16 +-
net/samba/files/smbd.sh | 19 +-
net/samba/files/winbindd.sh | 17 +-
net/samba/options.mk | 196 ++++++++-
net/samba/patches/patch-aa | 35 -
net/samba/patches/patch-ab | 12 +-
net/samba/patches/patch-ac | 4 +-
net/samba/patches/patch-ad | 52 +--
net/samba/patches/patch-ae | 15 +
net/samba/patches/patch-af | 29 +-
net/samba/patches/patch-ag | 49 +--
net/samba/patches/patch-ah | 16 +
net/samba/patches/patch-ai | 23 +
net/samba/patches/patch-aj | 16 +
net/samba/patches/patch-ak | 13 +
net/samba/patches/patch-al | 22 +
net/samba/patches/patch-am | 22 +
net/samba/patches/patch-at | 256 +++++++++++-
net/samba/patches/patch-au | 135 +++++-
net/samba/patches/patch-av | 13 +
net/samba/patches/patch-aw | 13 +
net/samba/patches/patch-ax | 13 +
net/samba/patches/patch-ay | 31 +
net/samba/patches/patch-ba | 86 ++++
net/samba/patches/patch-bb | 13 +
net/samba/patches/patch-bc | 13 +
net/samba/patches/patch-bd | 13 +
net/samba/patches/patch-be | 22 +
net/samba/patches/patch-bf | 13 +
net/samba/patches/patch-bg | 49 ++
net/samba/patches/patch-bh | 20 +
net/samba/patches/patch-bi | 17 +
net/samba/patches/patch-bj | 13 +
net/samba/patches/patch-bk | 13 +
net/samba/patches/patch-bl | 22 +
net/samba/patches/patch-bm | 17 +
net/samba/patches/patch-bn | 11 +
net/samba/patches/patch-bo | 15 +
net/samba/patches/patch-bp | 14 +
net/samba/patches/patch-bq | 17 +
net/samba/patches/patch-br | 31 +
net/samba/patches/patch-bs | 68 +++
net/samba/patches/patch-bt | 30 +
net/samba/patches/patch-bu | 33 +
net/samba/patches/patch-bv | 51 ++
net/samba/patches/patch-bw | 34 +
net/samba/patches/patch-bx | 21 +
net/samba/patches/patch-by | 410 +++++++++++++++++++++
net/samba/patches/patch-bz | 47 ++
net/samba/patches/patch-ca | 13 +
net/samba/patches/patch-cb | 22 +
net/samba/patches/patch-cc | 22 +
61 files changed, 2502 insertions(+), 772 deletions(-)
diffs (truncated from 3866 to 300 lines):
diff -r 56c9adee287b -r f31e270d0beb doc/CHANGES
--- a/doc/CHANGES Mon Nov 14 08:05:06 2005 +0000
+++ b/doc/CHANGES Mon Nov 14 08:05:27 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11929 2005/11/14 06:06:20 minskim Exp $
+$NetBSD: CHANGES,v 1.11930 2005/11/14 08:05:30 jlam Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -5216,3 +5216,4 @@
Added databases/py-mssql version 0.7.3 [minskim 2005-11-14]
Updated pkgtools/pkglint to 4.41 [rillig 2005-11-14]
Updated fonts/adobe-cmaps to 20051109 [minskim 2005-11-14]
+ Updated net/samba to 3.0.20.2 [jlam 2005-11-14]
diff -r 56c9adee287b -r f31e270d0beb net/samba/DESCR
--- a/net/samba/DESCR Mon Nov 14 08:05:06 2005 +0000
+++ b/net/samba/DESCR Mon Nov 14 08:05:27 2005 +0000
@@ -1,7 +1,7 @@
-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 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.
diff -r 56c9adee287b -r f31e270d0beb net/samba/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba/MESSAGE Mon Nov 14 08:05:27 2005 +0000
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.4 2005/11/14 08:05:27 jlam Exp $
+
+When upgrading a Samba installation and "lock directory" has been set
+to a non-default value in the configuration files, then "state directory"
+needs to be set appropriately and/or the files located in the lock
+directory should be moved to the state directory. Please read the
+documentation on "state directory" in the smb.conf(5) manual page for
+more information.
+===========================================================================
diff -r 56c9adee287b -r f31e270d0beb net/samba/Makefile
--- a/net/samba/Makefile Mon Nov 14 08:05:06 2005 +0000
+++ b/net/samba/Makefile Mon Nov 14 08:05:27 2005 +0000
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.146 2005/08/19 18:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.147 2005/11/14 08:05:27 jlam Exp $
-DISTNAME= samba-3.0.14a
-PKGREVISION= 1
+.include "Makefile.mirrors"
+
+DISTNAME= samba-3.0.20b
+PKGNAME= samba-3.0.20.2
CATEGORIES= net
-MASTER_SITES= ftp://ftp.samba.org/pub/samba/old-versions/ \
- ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \
- ftp://samba.anu.edu.au/pub/samba/old-versions/ \
- ftp://ftp.sunet.se/pub/unix/utilities/samba/old-versions/
-COUNTRY_MIRRORS= au1 ca fi fr it pl ru sg se us1 us6
-.for COUNTRY in ${COUNTRY_MIRRORS}
-MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/old-versions/
-.endfor
+MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
+DIST_SUBDIR= ${DISTNAME}
+
+.include "Makefile.patches"
MAINTAINER= jlam%NetBSD.org@localhost
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite
-CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
+CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \
+ winbind-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -30,10 +29,11 @@
SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_LIBDIR?= ${PREFIX}/lib/samba
-SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba
+SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/run/samba
SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log
SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run
SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
+SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba
SAMBA_VARDIR?= ${VARBASE}
FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR}
@@ -41,6 +41,7 @@
FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR}
FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
+FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR}
FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR}
CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
@@ -49,11 +50,11 @@
CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR}
CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
+CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR}
CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR}
CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat
CONFIGURE_ARGS+= --with-libsmbclient
-CONFIGURE_ARGS+= --with-winbind
.include "../../converters/libiconv/buildlink3.mk"
CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
@@ -64,6 +65,16 @@
.include "options.mk"
+# Only Linux supports smbmount for mounting a Samba share into the
+# filesystem.
+#
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+= --with-smbmount
+PLIST_SUBST+= SMBMOUNT=
+.else
+PLIST_SUBST+= SMBMOUNT="@comment "
+.endif
+
# mktemp is useful for the replacement adduser script, but don't require
# a full dependency since it's not actually needed by samba.
#
@@ -77,49 +88,28 @@
FILES_SUBST+= MKTEMP=${MKTEMP:Q}
FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
-.if !empty(NSS_WINBIND)
-PLIST_SUBST+= NSS_WINBIND=lib/${NSS_WINBIND}
-.else
-PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module"
-.endif
-.if !empty(NSS_WINS)
-PLIST_SUBST+= NSS_WINS=lib/${NSS_WINS}
-.else
-PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module"
-.endif
-
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
USE_PKGINSTALL= yes
CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
-CONF_FILES_PERMS= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
- ${ROOT_USER} ${ROOT_GROUP} 0755
-CONF_FILES_PERMS+= ${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \
- ${ROOT_USER} ${ROOT_GROUP} 0755
MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
-OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
+OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700
-RCD_SCRIPTS= samba nmbd smbd winbindd
-
-INSTALL_LIBRARY= \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
post-build:
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
post-install:
- -cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so libsmbclient.so.0
+ ${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 \
${RMDIR} ${SAMBA_LIBDIR}/$$d; \
done
-.if !empty(NSS_WINBIND)
- ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib
-.endif
-.if !empty(NSS_WINS)
- ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib
-.endif
+ -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}; \
@@ -133,19 +123,5 @@
cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${EGDIR}
cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${EGDIR}
cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${EGDIR}
-.if !empty(PKG_OPTIONS:Mpam)
- ${INSTALL_DATA_DIR} ${PAM_INSTMODULEDIR}
- ${INSTALL_LIBRARY} ${WRKSRC}/bin/pam_smbpass.so ${PAM_INSTMODULEDIR}
- ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so ${PAM_INSTMODULEDIR}
- ${INSTALL_DATA} ${WRKSRC}/pam_smbpass/README \
- ${DOCDIR}/README.pam_smbpass
- ${INSTALL_DATA_DIR} ${EGDIR}/pam_smbpass
- cd ${WRKSRC}/pam_smbpass/samples; for f in [a-z]*; do \
- ${INSTALL_DATA} $${f} ${EGDIR}/pam_smbpass/$${f}; \
- done
-.endif
-.if !empty(PKG_OPTIONS:Mcups)
- cd ${PREFIX}/libexec/cups/backend && ${LN} -s ../../../bin/smbspool smb
-.endif
.include "../../mk/bsd.pkg.mk"
diff -r 56c9adee287b -r f31e270d0beb net/samba/Makefile.mirrors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba/Makefile.mirrors Mon Nov 14 08:05:27 2005 +0000
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile.mirrors,v 1.1 2005/11/14 08:05:27 jlam Exp $
+#
+# This Makefile fragment contains the mirror sites for fetching Samba.
+
+###
+### This list was last updated on 20051024 from:
+### http://www.samba.org/samba/download/ftp_mirrors.html
+###
+SAMBA_MIRRORS= \
+ ftp://ftp.samba.org/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://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://ftp.ntua.gr/pub/net/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.bit.nl/mirror/samba/ \
+ ftp://www.bibsyst.no/pub/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://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/
diff -r 56c9adee287b -r f31e270d0beb net/samba/Makefile.patches
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba/Makefile.patches Mon Nov 14 08:05:27 2005 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.patches,v 1.1 2005/11/14 08:05:27 jlam Exp $
+#
+# This Makefile fragment describes the recommended patches for the
+# currently packaged version of Samba. All recommended patches for
+# particular release of Samba are also integrated into the next release
+# of Samba, so upon updating to the latest release of Samba, the
+# PATCHFILES variable should be empty.
+#
+
+# The PATCHFILES are listed in chronological order according to the time
+# 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 56c9adee287b -r f31e270d0beb net/samba/PLIST
--- a/net/samba/PLIST Mon Nov 14 08:05:06 2005 +0000
+++ b/net/samba/PLIST Mon Nov 14 08:05:27 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2005/06/05 13:13:05 taca Exp $
+@comment $NetBSD: PLIST,v 1.32 2005/11/14 08:05:27 jlam Exp $
bin/findsmb
bin/net
bin/nmblookup
@@ -22,8 +22,7 @@
bin/tdbdump
bin/tdbtool
bin/testparm
-bin/testprns
-bin/wbinfo
+${WINBIND}bin/wbinfo
include/libsmbclient.h
${NSS_WINBIND}
${NSS_WINS}
@@ -34,7 +33,6 @@
Home |
Main Index |
Thread Index |
Old Index