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.1. Major changes from version...
details: https://anonhg.NetBSD.org/pkgsrc/rev/843619b5c74a
branches: trunk
changeset: 466074:843619b5c74a
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Jan 11 02:26:30 2004 +0000
description:
Update net/samba to 3.0.1. Major changes from version 2.2.8anb6 include:
* Active Directory support. Samba is able to join a ADS realm as
a member server and authenticate using LDAP/Kerberos.
* Unicode support.
* New, more flexible authentication (passdb) system.
* A new "net" command that is similar to the "net" command in Windows.
* Samba now negotiates NT-style status32 codes on the wire, which
greatly improves error handling.
* Better Windows 2K/2K3/XP printing support.
* Loadable module support for passdb backends and character sets.
* More performant winbindd.
* Support for migrating from a Windows NT4 domain to a Samba domain
and maintaining user, group, and domain SIDs.
* Support for establishing trust relationships with Windows NT4 DCs.
* Initial support for a distributed Winbind architecture using an
LDAP directory for storing SID-to-uid/gid mappings.
* Major updates to the Samba documentation tree.
* Full support for client and server SMB signing to ensure
compatibility with default Windows 2K3 security settings.
* Improvement of ACL mapping features.
diffstat:
doc/CHANGES | 3 +-
net/samba/DESCR | 20 +-
net/samba/INSTALL | 24 -
net/samba/MESSAGE.smbpasswd | 19 -
net/samba/Makefile | 189 +++++++-----
net/samba/Makefile.common | 70 ----
net/samba/PLIST | 664 ++++++++++++++++++++-----------------------
net/samba/buildlink2.mk | 28 -
net/samba/distinfo | 24 +-
net/samba/files/adduser.sh | 5 +-
net/samba/files/deluser.sh | 2 +-
net/samba/files/nmbd.sh | 10 +-
net/samba/files/samba.sh | 10 +-
net/samba/files/smbd.sh | 10 +-
net/samba/files/winbindd.sh | 25 +
net/samba/patches/patch-aa | 24 +-
net/samba/patches/patch-ab | 69 +---
net/samba/patches/patch-ac | 24 +-
net/samba/patches/patch-ad | 82 +++-
net/samba/patches/patch-ae | 13 +
net/samba/patches/patch-af | 53 +++
net/samba/patches/patch-ag | 23 -
net/samba/patches/patch-ah | 13 -
net/samba/patches/patch-aj | 13 -
net/samba/patches/patch-al | 17 -
net/samba/patches/patch-ap | 57 ---
net/samba/patches/patch-aq | 56 ---
net/samba/patches/patch-ar | 16 -
net/samba/patches/patch-as | 16 -
29 files changed, 635 insertions(+), 944 deletions(-)
diffs (truncated from 1900 to 300 lines):
diff -r fd321a2ffe81 -r 843619b5c74a doc/CHANGES
--- a/doc/CHANGES Sun Jan 11 01:09:12 2004 +0000
+++ b/doc/CHANGES Sun Jan 11 02:26:30 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4423 2004/01/11 00:48:45 jlam Exp $
+$NetBSD: CHANGES,v 1.4424 2004/01/11 02:26:33 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -175,3 +175,4 @@
Removed kdelibs [wiz 2004-01-10]
Removed khostchooser [wiz 2004-01-10]
Added samba-2.2.8anb6 as net/samba2 [jlam 2004-01-10]
+ Updated samba to 3.0.1 [jlam 2004-01-11]
diff -r fd321a2ffe81 -r 843619b5c74a net/samba/DESCR
--- a/net/samba/DESCR Sun Jan 11 01:09:12 2004 +0000
+++ b/net/samba/DESCR Sun Jan 11 02:26:30 2004 +0000
@@ -1,13 +1,7 @@
-Samba is a suite of programs which work together to allow clients to
-access to a server's filespace and printers via the SMB (Server
-Message Block) protocol.
-
-In practice, this means that you can redirect disks and printers to
-Unix disks and printers from Lan Manager clients, Windows for
-Workgroups 3.11 clients, Windows NT clients, Linux clients and OS/2
-clients. There is also a generic Unix client program supplied as part
-of the suite which allows Unix users to use an ftp-like interface to
-access filespace and printers on any other SMB servers. This gives the
-capability for these operating systems to behave much like a LAN
-Server or Windows NT Server machine, only with added functionality and
-flexibility designed to make life easier for administrators.
+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 fd321a2ffe81 -r 843619b5c74a net/samba/INSTALL
--- a/net/samba/INSTALL Sun Jan 11 01:09:12 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.4 2002/02/05 05:14:46 jlam Exp $
-
-SAMBA_LOCKDIR="@SAMBA_LOCKDIR@"
-SAMBA_PRIVATE="@SAMBA_PRIVATE@"
-
-case ${STAGE} in
-POST-INSTALL)
- # Check for files in old "lock" directory.
- if [ -e /var/run/samba ]
- then
- ${CAT} << EOF
-===========================================================================
-
-The location of the Samba cache directory has moved to ${SAMBA_LOCKDIR}.
-If you have any files under /var/run/samba, please move them into
-${SAMBA_LOCKDIR} and restart the SMB and NMB servers.
-
-===========================================================================
-EOF
- fi
- ;;
-esac
diff -r fd321a2ffe81 -r 843619b5c74a net/samba/MESSAGE.smbpasswd
--- a/net/samba/MESSAGE.smbpasswd Sun Jan 11 01:09:12 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.smbpasswd,v 1.4 2003/09/12 06:04:14 jlam Exp $
-
- *===* SECURITY NOTES *===*
-
-The users' encrypted passwords are stored in
-
- ${SAMBA_PRIVATE}/smbpasswd
-
-with owner ${ROOT_USER}, group ${ROOT_GROUP}, and file mode 0600.
-These encrypted passwords are _PASSWORD_EQUIVALENT_ from the viewpoint of
-the SMB protocol. Do _NOT_ weaken the permissions of this file unless
-there is a very good reason.
-
-Please note that even if you pkg_delete ${PKGNAME}, the smbpasswd file
-will remain on the system. If you don't intend to use this package
-anymore, then it is _STRONGLY_ recommended that you remove the smbpasswd
-file manually.
-===========================================================================
diff -r fd321a2ffe81 -r 843619b5c74a net/samba/Makefile
--- a/net/samba/Makefile Sun Jan 11 01:09:12 2004 +0000
+++ b/net/samba/Makefile Sun Jan 11 02:26:30 2004 +0000
@@ -1,68 +1,104 @@
-# $NetBSD: Makefile,v 1.108 2004/01/11 00:33:03 jlam Exp $
+# $NetBSD: Makefile,v 1.109 2004/01/11 02:26:30 jlam Exp $
-.include "Makefile.common"
-PKGREVISION= 6
+DISTNAME= samba-3.0.1
+WRKSRC= ${WRKDIR}/${DISTNAME}/source
+CATEGORIES= net
+MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
+ ftp://ring.asahi-net.or.jp/pub/net/samba/ \
+ ftp://samba.anu.edu.au/pub/samba/ \
+ ftp://ftp.sunet.se/pub/unix/utilities/samba/
+COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6
+.for COUNTRY in ${COUNTRY_MIRRORS}
+MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/
+.endfor
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= kim%tac.nyc.ny.us@localhost
+MAINTAINER= jlam%NetBSD.org@localhost
HOMEPAGE= http://www.samba.org/
-COMMENT= SMB/CIFS protocol server suite for UNIX
+COMMENT= SMB/CIFS protocol server suite
+
+CONFLICTS+= winbind-[0-9]*
+
+PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
-USE_PKGINSTALL= yes
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+GNU_CONFIGURE= yes
+CONFIGURE_ENV+= PERL="${PERL5}"
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_SYSCONFSUBDIR?= samba
+PKG_SYSCONFVAR= samba
-USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
-CONFIGURE_ARGS+= --with-readline
+SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
+SAMBA_LIBDIR?= ${PREFIX}/lib/samba
+SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba
+SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log
+SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run
+SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
+SAMBA_VARDIR?= /var
+
+FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR}
+FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
+FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
+FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR}
+FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
+FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR}
-CONFIGURE_ARGS+= --with-ssl
-CONFIGURE_ARGS+= --with-sslinc=${SSLBASE}
-CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h
+CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
+CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
+CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR}
+CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
+CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
+CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR}
+CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR}
+
+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}
-REPLACE_PERL+= script/findsmb.in
+BUILDLINK_USE_BUILTIN.readline= no
+.include "../../devel/readline/buildlink3.mk"
+CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
-.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink3.mk"
-BUILD_DEFS+= USE_CUPS
+.if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS])
+. include "../../mk/krb5.buildlink3.mk"
+SAMBA_USE_LDAP= yes
+CONFIGURE_ARGS+= --with-ads
+CONFIGURE_ARGS+= --with-krb5=${KRB5BASE}
+.else
+CONFIGURE_ARGS+= --without-ads
+CONFIGURE_ARGS+= --without-krb5
+.endif
+BUILD_DEFS+= SAMBA_WITH_ADS
+
+.if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])
+. include "../../print/cups/buildlink3.mk"
CONFIGURE_ARGS+= --enable-cups
.endif
+BUILD_DEFS+= USE_CUPS
.if defined(USE_PAM)
-.include "../../security/PAM/buildlink3.mk"
-BUILD_DEFS+= USE_PAM
+. include "../../security/PAM/buildlink3.mk"
CONFIGURE_ARGS+= --with-pam
.endif
-
-.if defined(SAMBA_USE_LDAP) && ${SAMBA_USE_LDAP} == "YES"
-.include "../../databases/openldap/buildlink3.mk"
-BUILD_DEFS+= SAMBA_USE_LDAP
-CONFIGURE_ARGS+= --with-ldapsam
-PLIST_SUBST+= SAMBA_LDAP=""
-.else
-PLIST_SUBST+= SAMBA_LDAP="@comment "
-MESSAGE_SRC= ${.CURDIR}/MESSAGE.smbpasswd
-SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \
- ${ROOT_USER} ${ROOT_GROUP} 0600
-.endif
-
-# Microsoft DFS support
-CONFIGURE_ARGS+= --with-msdfs
+BUILD_DEFS+= USE_PAM
-MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
-MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP}
-MESSAGE_SUBST+= ROOT_USER=${ROOT_USER}
-
-DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
-EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE}
-
-CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
-SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE}
-SUPPORT_FILES_PERMS+= ${EXAMPLESDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
- ${ROOT_USER} ${ROOT_GROUP} 0555
-SUPPORT_FILES_PERMS+= ${EXAMPLESDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \
- ${ROOT_USER} ${ROOT_GROUP} 0555
-RCD_SCRIPTS= samba nmbd smbd
-OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
-OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
+.if defined(SAMBA_USE_LDAP) && !empty(SAMBA_USE_LDAP:M[yY][eE][sS])
+. include "../../databases/openldap/buildlink3.mk"
+CONFIGURE_ARGS+= --with-ldap
+. if defined(SAMBA_USE_LDAP_COMPAT) && \
+ !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS])
+CONFIGURE_ARGS+= --with-ldapsam
+. endif
+.else
+CONFIGURE_ARGS+= --without-ldap
+.endif
+BUILD_DEFS+= SAMBA_USE_LDAP
+BUILD_DEFS+= SAMBA_USE_LDAP_COMPAT
.if !defined(MKTEMP)
MKTEMP!= ${TYPE} mktemp 2>&1 | \
@@ -77,44 +113,37 @@
FILES_SUBST+= MKTEMP=${MKTEMP:Q}
FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
-# Remove irrelevant files for this package.
-post-extract:
- ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \
- ${XARGS} ${RM} -f
- ${RM} -r ${WRKDIR}/${DISTNAME}/docs/textdocs/outdated
- ${RM} -r ${WRKDIR}/${DISTNAME}/examples/VFS
- ${RM} -r ${WRKDIR}/${DISTNAME}/examples/appliance
- ${RM} -r ${WRKDIR}/${DISTNAME}/examples/autofs
- ${RM} -r ${WRKDIR}/${DISTNAME}/examples/dce-dfs
- ${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient
- ${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup
+DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+
+USE_PKGINSTALL= yes
+CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
+SUPPORT_FILES_PERMS= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
+ ${ROOT_USER} ${ROOT_GROUP} 0755
+SUPPORT_FILES_PERMS+= ${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \
+ ${ROOT_USER} ${ROOT_GROUP} 0755
+OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} \
+ ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
+OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700
+RCD_SCRIPTS= samba nmbd smbd winbindd
post-build:
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
post-install:
- # Install Samba documentation.
${INSTALL_DATA_DIR} ${DOCDIR}
- cd ${WRKDIR}/${DISTNAME}/docs; \
- for file in announce textdocs/* Registry/*.reg; do \
- ${INSTALL_DATA} $$file ${DOCDIR}; \
+ cd ${WRKSRC}/../docs/Registry; for file in *.reg; do \
+ ${INSTALL_DATA} $$file ${DOCDIR}/$$file; \
done
-
- # Install Samba examples.
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EXAMPLESDIR}/adduser.sh
- ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EXAMPLESDIR}/deluser.sh
- ${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
- ${CHMOD} -R ugo-w ${EXAMPLESDIR}
-
- ${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd \
- ${EXAMPLESDIR}/misc
- ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \
Home |
Main Index |
Thread Index |
Old Index