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.1nb1. Changes from version 3....
details: https://anonhg.NetBSD.org/pkgsrc/rev/22ec29f96abd
branches: trunk
changeset: 466127:22ec29f96abd
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Jan 12 03:33:04 2004 +0000
description:
Update net/samba to 3.0.1nb1. Changes from version 3.0.1 include:
* Building and installing the PAM modules if USE_PAM is defined.
* Installing the NSS loadable modules.
* Making the samba rc.d script run the winbindd script, too.
diffstat:
doc/CHANGES | 3 ++-
net/samba/Makefile | 30 +++++++++++++++++++++++++-----
net/samba/PLIST | 4 +++-
net/samba/PLIST.pam | 9 +++++++++
net/samba/files/samba.sh | 4 ++--
5 files changed, 41 insertions(+), 9 deletions(-)
diffs (147 lines):
diff -r a1c5ff0cdb19 -r 22ec29f96abd doc/CHANGES
--- a/doc/CHANGES Mon Jan 12 03:16:32 2004 +0000
+++ b/doc/CHANGES Mon Jan 12 03:33:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4429 2004/01/11 23:07:58 grant Exp $
+$NetBSD: CHANGES,v 1.4430 2004/01/12 03:33:38 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -184,3 +184,4 @@
Moved tcsh-standalone to standalone-tcsh [grant 2004-01-11]
Moved bash2-static to static-bash2 [grant 2004-01-11]
Moved ast-ksh-static to static-ast-ksh [grant 2004-01-11]
+ Updated samba to 3.0.1nb1 [jlam 2004-01-12]
diff -r a1c5ff0cdb19 -r 22ec29f96abd net/samba/Makefile
--- a/net/samba/Makefile Mon Jan 12 03:16:32 2004 +0000
+++ b/net/samba/Makefile Mon Jan 12 03:33:04 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2004/01/11 02:26:30 jlam Exp $
+# $NetBSD: Makefile,v 1.110 2004/01/12 03:33:04 jlam Exp $
DISTNAME= samba-3.0.1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/source
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
@@ -17,13 +18,14 @@
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite
-CONFLICTS+= winbind-[0-9]*
+CONFLICTS+= pam-smbpass-[0-9]* winbind-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PERL="${PERL5}"
+PLIST_SRC= ${PKGDIR}/PLIST
.include "../../mk/bsd.prefs.mk"
@@ -82,8 +84,10 @@
BUILD_DEFS+= USE_CUPS
.if defined(USE_PAM)
-. include "../../security/PAM/buildlink3.mk"
+. include "../../security/PAM/module.mk"
CONFIGURE_ARGS+= --with-pam
+CONFIGURE_ARGS+= --with-pam_smbpass
+PLIST_SRC+= ${PKGDIR}/PLIST.pam
.endif
BUILD_DEFS+= USE_PAM
@@ -122,17 +126,22 @@
${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}
+MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
+OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
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}
+
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_DATA_DIR} ${DOCDIR}
+ ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/libnss_winbind.so ${PREFIX}/lib
+ ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/libnss_wins.so ${PREFIX}/lib
cd ${WRKSRC}/../docs/Registry; for file in *.reg; do \
${INSTALL_DATA} $$file ${DOCDIR}/$$file; \
done
@@ -145,5 +154,16 @@
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 defined(USE_PAM)
+ ${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 file in [a-z]*; do \
+ ${INSTALL_DATA} $${file} ${EGDIR}/pam_smbpass/$${file}; \
+ done
+.endif
.include "../../mk/bsd.pkg.mk"
diff -r a1c5ff0cdb19 -r 22ec29f96abd net/samba/PLIST
--- a/net/samba/PLIST Mon Jan 12 03:16:32 2004 +0000
+++ b/net/samba/PLIST Mon Jan 12 03:33:04 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/01/11 02:26:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/01/12 03:33:04 jlam Exp $
bin/findsmb
bin/net
bin/nmblookup
@@ -25,6 +25,8 @@
etc/rc.d/smbd
etc/rc.d/winbindd
include/libsmbclient.h
+lib/libnss_winbind.so
+lib/libnss_wins.so
lib/libsmbclient.a
lib/libsmbclient.so
lib/samba/charset/CP437.so
diff -r a1c5ff0cdb19 -r 22ec29f96abd net/samba/PLIST.pam
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba/PLIST.pam Mon Jan 12 03:33:04 2004 +0000
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST.pam,v 1.1 2004/01/12 03:33:04 jlam Exp $
+lib/security/pam_smbpass.so
+lib/security/pam_winbind.so
+share/doc/samba/README.pam_smbpass
+share/examples/samba/pam_smbpass/kdc-pdc
+share/examples/samba/pam_smbpass/password-mature
+share/examples/samba/pam_smbpass/password-migration
+share/examples/samba/pam_smbpass/password-sync
+@dirrm share/examples/samba/pam_smbpass
diff -r a1c5ff0cdb19 -r 22ec29f96abd net/samba/files/samba.sh
--- a/net/samba/files/samba.sh Mon Jan 12 03:16:32 2004 +0000
+++ b/net/samba/files/samba.sh Mon Jan 12 03:33:04 2004 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: samba.sh,v 1.14 2004/01/11 02:26:31 jlam Exp $
+# $NetBSD: samba.sh,v 1.15 2004/01/12 03:33:04 jlam Exp $
#
# KEYWORD: nostart
@@ -36,7 +36,7 @@
done
}
-COMMAND_LIST="nmbd smbd"
+COMMAND_LIST="nmbd smbd winbindd"
name="samba"
start_cmd="forward_commands"
Home |
Main Index |
Thread Index |
Old Index