From 2c5e2333324366650673f90815d33ef0086b46ee Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 5 Jun 2005 13:13:05 +0000 Subject: Update samba package to 3.0.14a. Changes from 3.0.10 are huge, please see http://www.samba.org/samba/history/samba-3.0.14a.html in detail. pkgsrc changes: * replace ln command to ${LN}. * avoid use file for shell's variable. * remove trailing spaces. --- net/samba/Makefile | 15 +++++++-------- net/samba/PLIST | 9 ++++----- net/samba/distinfo | 9 ++++----- net/samba/options.mk | 10 +++++----- net/samba/patches/patch-ae | 13 ------------- 5 files changed, 20 insertions(+), 36 deletions(-) delete mode 100644 net/samba/patches/patch-ae (limited to 'net') diff --git a/net/samba/Makefile b/net/samba/Makefile index 588c8f9f95c..d0b57522935 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.142 2005/06/03 22:54:44 jlam Exp $ +# $NetBSD: Makefile,v 1.143 2005/06/05 13:13:05 taca Exp $ -DISTNAME= samba-3.0.10 -PKGREVISION= 2 +DISTNAME= samba-3.0.14a CATEGORIES= net MASTER_SITES= ftp://ftp.samba.org/pub/samba/old-versions/ \ ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \ @@ -110,7 +109,7 @@ post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh post-install: - -cd ${SAMBA_LIBDIR} && ln -s libsmbclient.so libsmbclient.so.0 + -cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so libsmbclient.so.0 for d in auth idmap pdb rpc; do \ ${RMDIR} ${SAMBA_LIBDIR}/$$d; \ done @@ -121,8 +120,8 @@ post-install: ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib .endif ${INSTALL_DATA_DIR} ${DOCDIR} - cd ${WRKSRC}/../docs/registry; for file in *.reg; do \ - ${INSTALL_DATA} $$file ${DOCDIR}/$$file; \ + cd ${WRKSRC}/../docs/registry; for f in *.reg; do \ + ${INSTALL_DATA} $${f} ${DOCDIR}/$${f}; \ done ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EGDIR}/adduser.sh @@ -140,8 +139,8 @@ post-install: ${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}; \ + 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) diff --git a/net/samba/PLIST b/net/samba/PLIST index 7a475cb9f75..240ea171f91 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.30 2005/05/03 15:47:57 wiz Exp $ +@comment $NetBSD: PLIST,v 1.31 2005/06/05 13:13:05 taca Exp $ bin/findsmb bin/net bin/nmblookup @@ -207,6 +207,7 @@ share/samba/swat/help/Samba-Guide/index.html share/samba/swat/help/Samba-Guide/ix01.html share/samba/swat/help/Samba-Guide/kerberos.html share/samba/swat/help/Samba-Guide/migration.html +share/samba/swat/help/Samba-Guide/nw4migration.html share/samba/swat/help/Samba-Guide/pr01.html share/samba/swat/help/Samba-Guide/pr02.html share/samba/swat/help/Samba-Guide/pr03.html @@ -304,6 +305,7 @@ share/samba/swat/help/Samba-HOWTO-Collection/install.html share/samba/swat/help/Samba-HOWTO-Collection/integrate-ms-networks.html share/samba/swat/help/Samba-HOWTO-Collection/introduction.html share/samba/swat/help/Samba-HOWTO-Collection/ix01.html +share/samba/swat/help/Samba-HOWTO-Collection/largefile.html share/samba/swat/help/Samba-HOWTO-Collection/locking.html share/samba/swat/help/Samba-HOWTO-Collection/migration.html share/samba/swat/help/Samba-HOWTO-Collection/msdfs.html @@ -315,6 +317,7 @@ share/samba/swat/help/Samba-HOWTO-Collection/pr02.html share/samba/swat/help/Samba-HOWTO-Collection/pr03.html share/samba/swat/help/Samba-HOWTO-Collection/printing.html share/samba/swat/help/Samba-HOWTO-Collection/problems.html +share/samba/swat/help/Samba-HOWTO-Collection/rights.html share/samba/swat/help/Samba-HOWTO-Collection/samba-bdc.html share/samba/swat/help/Samba-HOWTO-Collection/samba-pdc.html share/samba/swat/help/Samba-HOWTO-Collection/securing-samba.html @@ -565,14 +568,10 @@ share/samba/swat/using_samba/toc.html @dirrm share/samba/swat/lang @dirrm share/samba/swat/include @dirrm share/samba/swat/images -@exec ${MKDIR} %D/share/samba/swat/help/images -@dirrm share/samba/swat/help/images @dirrm share/samba/swat/help/Samba-HOWTO-Collection/images @dirrm share/samba/swat/help/Samba-HOWTO-Collection @dirrm share/samba/swat/help/Samba-Guide/images @dirrm share/samba/swat/help/Samba-Guide -@exec ${MKDIR} %D/share/samba/swat/help/Samba-Developers-Guide/images -@dirrm share/samba/swat/help/Samba-Developers-Guide/images @dirrm share/samba/swat/help/Samba-Developers-Guide @dirrm share/samba/swat/help @dirrm share/samba/swat diff --git a/net/samba/distinfo b/net/samba/distinfo index 1a9acbc4e80..5be85d7a360 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.42 2005/02/24 12:14:03 agc Exp $ +$NetBSD: distinfo,v 1.43 2005/06/05 13:13:05 taca Exp $ -SHA1 (samba-3.0.10.tar.gz) = 1cb80bbd9feb7da85aac64bd308a52c662b1cc8a -RMD160 (samba-3.0.10.tar.gz) = 8065b34b19f6c508ef283d2d54822f741f35ac38 -Size (samba-3.0.10.tar.gz) = 15176926 bytes +SHA1 (samba-3.0.14a.tar.gz) = 978ff392d575c717069c66e918f6bbbf815b84b1 +RMD160 (samba-3.0.14a.tar.gz) = 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f +Size (samba-3.0.14a.tar.gz) = 15605851 bytes SHA1 (patch-aa) = 20af8aaf492ee550254a007a05cdec20eb699c27 SHA1 (patch-ab) = c5f352a07774b8e2873c2ac3b3de3ba4cb12bf5e SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644 SHA1 (patch-ad) = 8a99e5f898eb3c466b07b5bbb9f0c7e28e385ea0 -SHA1 (patch-ae) = cf3a040f04142df534abe54b66156a48697b665d SHA1 (patch-af) = bc0cead8f8350001e5291443821e875bab540fc3 SHA1 (patch-ag) = cce908577cf4007bb00b15f6dd7eee7d549ac5b0 diff --git a/net/samba/options.mk b/net/samba/options.mk index 2018ee42f25..848578dc003 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2005/05/31 11:24:32 dillo Exp $ +# $NetBSD: options.mk,v 1.7 2005/06/05 13:13:05 taca Exp $ # Global and legacy options @@ -78,15 +78,15 @@ PLIST_SUBST+= SMBMOUNT="@comment " NSS_WINBIND.${OPSYS}?= libnss_winbind.so NSS_WINS.${OPSYS}?= libnss_wins.so -NSS_WINBIND.AIX= WINBIND -NSS_WINS.AIX= # empty +NSS_WINBIND.AIX= WINBIND +NSS_WINS.AIX= # empty NSS_WINBIND.IRIX= libns_winbind.so -NSS_WINS.IRIX= libns_wins.so +NSS_WINS.IRIX= libns_wins.so .if !empty(MACHINE_PLATFORM:MFreeBSD-5.*) NSS_WINBIND.FreeBSD= nss_winbind.so -NSS_WINS.FreeBSD= nss_wins.so +NSS_WINS.FreeBSD= nss_wins.so .endif NSS_WINBIND= ${NSS_WINBIND.${OPSYS}} diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae deleted file mode 100644 index b69f89737f2..00000000000 --- a/net/samba/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.6 2004/01/11 02:26:31 jlam Exp $ - ---- profile/profile.c.orig Sat Jun 7 13:57:36 2003 -+++ profile/profile.c -@@ -22,7 +22,7 @@ - #include "includes.h" - - #ifdef WITH_PROFILE --#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6)) -+#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH) - #endif /* WITH_PROFILE */ - - #ifdef WITH_PROFILE -- cgit v1.2.3