pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/samba Update samba to 3.0.26a.
details: https://anonhg.NetBSD.org/pkgsrc/rev/05d19d0817e0
branches: trunk
changeset: 534622:05d19d0817e0
user: taca <taca%pkgsrc.org@localhost>
date: Sun Oct 28 07:28:45 2007 +0000
description:
Update samba to 3.0.26a.
pkgsrc change: Add support for DESTDIR.
Changes from 3.0.24 are huge, please refer WHATSNEW.txt.
<http://viewcvs.samba.org/cgi-bin/viewcvs.cgi/branches/SAMBA_3_0_26/WHATSNEW.txt?rev=22651&view=markup>
diffstat:
net/samba/Makefile | 55 +-
net/samba/Makefile.patches | 27 +-
net/samba/PLIST | 60 +-
net/samba/distinfo | 88 +-
net/samba/options.mk | 19 +-
net/samba/patches/patch-ag | 10 +-
net/samba/patches/patch-ai | 23 -
net/samba/patches/patch-aj | 16 -
net/samba/patches/patch-al | 22 -
net/samba/patches/patch-am | 22 -
net/samba/patches/patch-at | 18468 +------------------------------------------
net/samba/patches/patch-au | 61 +-
net/samba/patches/patch-av | 6 +-
net/samba/patches/patch-ay | 12 +-
net/samba/patches/patch-ba | 84 +-
net/samba/patches/patch-bb | 13 -
net/samba/patches/patch-bc | 6 +-
net/samba/patches/patch-bd | 19 +-
net/samba/patches/patch-be | 22 +-
net/samba/patches/patch-bf | 13 -
net/samba/patches/patch-bh | 8 +-
net/samba/patches/patch-bi | 14 +-
net/samba/patches/patch-bj | 13 -
net/samba/patches/patch-bk | 13 -
net/samba/patches/patch-bo | 8 +-
net/samba/patches/patch-bp | 6 +-
net/samba/patches/patch-br | 6 +-
net/samba/patches/patch-bs | 20 +-
net/samba/patches/patch-bt | 12 +-
net/samba/patches/patch-bu | 29 +-
net/samba/patches/patch-bw | 14 +-
net/samba/patches/patch-bx | 21 -
net/samba/patches/patch-by | 410 -
net/samba/patches/patch-bz | 47 -
net/samba/patches/patch-ca | 6 +-
net/samba/patches/patch-ce | 13 +
net/samba/patches/patch-cf | 13 +
net/samba/patches/patch-cg | 13 +
net/samba/patches/patch-ch | 22 +
39 files changed, 430 insertions(+), 19304 deletions(-)
diffs (truncated from 20492 to 300 lines):
diff -r a134fa3bc37d -r 05d19d0817e0 net/samba/Makefile
--- a/net/samba/Makefile Sun Oct 28 05:58:48 2007 +0000
+++ b/net/samba/Makefile Sun Oct 28 07:28:45 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.174 2007/09/25 10:03:53 hira Exp $
+# $NetBSD: Makefile,v 1.175 2007/10/28 07:28:45 taca Exp $
.include "Makefile.mirrors"
DISTNAME= samba-${VERSION}
-PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
@@ -13,15 +12,17 @@
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite
-VERSION= 3.0.24
+VERSION= 3.0.26a
CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \
winbind-[0-9]*
MAKE_JOBS_SAFE= NO
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/${DISTNAME}/source
GNU_CONFIGURE= yes
+BUILD_DEFS+= VARBASE
.include "../../mk/bsd.prefs.mk"
@@ -96,10 +97,12 @@
FILES_SUBST+= MKTEMP=${MKTEMP:Q}
FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
-DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+DOCDIR= share/doc/${PKGBASE}
+EGDIR= share/examples/${PKGBASE}
-CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
+INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
+
+CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700
@@ -139,7 +142,7 @@
install-samba-lib-symlinks:
.for l in ${SMBLIBS}
for v in ${SMBVERSION.${l}}; do \
- (cd ${SAMBA_LIBDIR} && rm -f lib${l}.so.$$v && \
+ (cd ${DESTDIR}${SAMBA_LIBDIR} && rm -f lib${l}.so.$$v && \
ln -s lib${l}.so lib${l}.so.$$v); \
done
.endfor
@@ -148,30 +151,28 @@
${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
post-install: install-samba-lib-symlinks
- ${RMDIR} ${PREFIX}/share/samba/swat/js
- ${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/include
- ${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/images
- ${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/js
- ${RMDIR} ${PREFIX}/share/samba/swat/lang/tr/include
- ${RMDIR} ${PREFIX}/share/samba/swat/lang/tr/js
+ ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js
+ ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/include
+ ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/images
+ ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/js
+ ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include
+ ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/js
for d in idmap pdb rpc; do \
- ${RMDIR} ${SAMBA_LIBDIR}/$$d; \
+ ${RMDIR} ${DESTDIR}${SAMBA_LIBDIR}/$$d; \
done
- ${INSTALL_DATA_DIR} ${DOCDIR}
cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do \
- ${INSTALL_DATA} $${f} ${DOCDIR}/$${f}; \
+ ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
done
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EGDIR}/adduser.sh
- ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EGDIR}/deluser.sh
+ ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh
+ ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh
cd ${WRKDIR}/${DISTNAME}/examples; \
- ${INSTALL_DATA} LDAP/samba.schema ${EGDIR}; \
- ${INSTALL_DATA} smb.conf.default ${EGDIR}
- cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpasswd.sh ${EGDIR}
- cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${EGDIR}
- cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${EGDIR}
- cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${EGDIR}
- ${CHMOD} -x ${PREFIX}/include/libmsrpc.h \
- ${PREFIX}/include/libsmbclient.h
+ ${INSTALL_DATA} LDAP/samba.schema ${DESTDIR}${PREFIX}/${EGDIR}; \
+ ${INSTALL_DATA} smb.conf.default ${DESTDIR}${PREFIX}/${EGDIR}
+ cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
+ cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${DESTDIR}${PREFIX}/${EGDIR}
+ cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
+ cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
+ ${CHMOD} -x ${DESTDIR}${PREFIX}/include/libmsrpc.h \
+ ${DESTDIR}${PREFIX}/include/libsmbclient.h
.include "../../mk/bsd.pkg.mk"
diff -r a134fa3bc37d -r 05d19d0817e0 net/samba/Makefile.patches
--- a/net/samba/Makefile.patches Sun Oct 28 05:58:48 2007 +0000
+++ b/net/samba/Makefile.patches Sun Oct 28 07:28:45 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.4 2007/05/19 17:55:13 tron Exp $
+# $NetBSD: Makefile.patches,v 1.5 2007/10/28 07:28:45 taca Exp $
#
# This Makefile fragment describes the recommended patches for the
# currently packaged version of Samba. All recommended patches for
@@ -7,23 +7,16 @@
# PATCHFILES variable should be empty.
#
+# Currently, no patch is needed.
+#
# 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/patches-${VERSION}/
-PATCHFILES= share_security_ntlmv2.diff \
- spoolss.diff \
- vista_backup_acl.diff \
- variable_os_expansion.diff \
- dfs_referral.diff \
- directory_delete.diff
-PATCH_DIST_STRIP= -p2
+#PATCH_SITES= http://www.samba.org/samba/patches/patches-${VERSION}/
+#PATCHFILES=
+#PATCH_DIST_STRIP= -p2
-.for CVE_PATCH in samba-3.0.24-CVE-2007-2444.patch \
- samba-3.0.24-CVE-2007-2446.patch \
- samba-3.0.24-CVE-2007-2447.patch
-PATCHFILES+= ${CVE_PATCH}
-SITES.${CVE_PATCH}= http://www.samba.org/samba/ftp/patches/security/
-.endfor
-
-PATCH_DIST_STRIP.samba-3.0.24-CVE-2007-2447.patch= -p1
+#.for p in
+#PATCHFILES+= ${p}
+#SITES.${CVE_PATCH}= http://www.samba.org/samba/ftp/patches/security/
+#.endfor
diff -r a134fa3bc37d -r 05d19d0817e0 net/samba/PLIST
--- a/net/samba/PLIST Sun Oct 28 05:58:48 2007 +0000
+++ b/net/samba/PLIST Sun Oct 28 07:28:45 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2007/05/22 12:41:04 tron Exp $
+@comment $NetBSD: PLIST,v 1.37 2007/10/28 07:28:46 taca Exp $
bin/eventlogadm
bin/findsmb
bin/net
@@ -34,9 +34,11 @@
lib/samba/charset/CP850.so
lib/samba/de.msg
lib/samba/en.msg
+lib/samba/fi.msg
lib/samba/fr.msg
lib/samba/it.msg
lib/samba/ja.msg
+lib/samba/libsmbsharemodes.so
lib/samba/libmsrpc.so
lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}
lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
@@ -57,6 +59,7 @@
lib/samba/vfs/fake_perms.so
lib/samba/vfs/full_audit.so
lib/samba/vfs/netatalk.so
+lib/samba/vfs/readahead.so
lib/samba/vfs/readonly.so
lib/samba/vfs/recycle.so
lib/samba/vfs/shadow_copy.so
@@ -87,20 +90,44 @@
man/man7/samba.7
man/man7/libsmbclient.7
man/man7/pam_winbind.7
+man/man8/eventlogadm.8
+man/man8/idmap_ad.8
+man/man8/idmap_ldap.8
+man/man8/idmap_nss.8
+man/man8/idmap_rid.8
+man/man8/idmap_tdb.8
man/man8/mount.cifs.8
man/man8/net.8
man/man8/nmbd.8
man/man8/pdbedit.8
man/man8/smbd.8
-man/man8/smbmnt.8
-man/man8/smbmount.8
+${SMBMOUNT}man/man8/smbmnt.8
+${SMBMOUNT}man/man8/smbmount.8
man/man8/smbpasswd.8
man/man8/smbspool.8
-man/man8/smbumount.8
+${SMBMOUNT}man/man8/smbumount.8
man/man8/swat.8
man/man8/tdbbackup.8
man/man8/tdbdump.8
+man/man8/tdbtool.8
man/man8/umount.cifs.8
+man/man8/vfs_audit.8
+man/man8/vfs_cacheprime.8
+man/man8/vfs_cap.8
+man/man8/vfs_catia.8
+man/man8/vfs_commit.8
+man/man8/vfs_default_quota.8
+man/man8/vfs_extd_audit.8
+man/man8/vfs_fake_perms.8
+man/man8/vfs_full_audit.8
+man/man8/vfs_gpfs.8
+man/man8/vfs_netatalk.8
+man/man8/vfs_notify_fam.8
+man/man8/vfs_prealloc.8
+man/man8/vfs_readahead.8
+man/man8/vfs_readonly.8
+man/man8/vfs_recycle.8
+man/man8/vfs_shadow_copy.8
man/man8/winbindd.8
${SMBMOUNT}sbin/mount.cifs
sbin/nmbd
@@ -214,6 +241,7 @@
share/samba/swat/help/Samba3-Developers-Guide/modules.html
share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html
share/samba/swat/help/Samba3-Developers-Guide/parsing.html
+share/samba/swat/help/Samba3-Developers-Guide/pr01.html
share/samba/swat/help/Samba3-Developers-Guide/pt01.html
share/samba/swat/help/Samba3-Developers-Guide/pt02.html
share/samba/swat/help/Samba3-Developers-Guide/pt03.html
@@ -341,7 +369,13 @@
share/samba/swat/help/Samba3-HOWTO/unicode.html
share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
share/samba/swat/help/Samba3-HOWTO/winbind.html
+share/samba/swat/help/manpages/eventlogadm.8.html
share/samba/swat/help/manpages/findsmb.1.html
+share/samba/swat/help/manpages/idmap_ad.8.html
+share/samba/swat/help/manpages/idmap_ldap.8.html
+share/samba/swat/help/manpages/idmap_nss.8.html
+share/samba/swat/help/manpages/idmap_rid.8.html
+share/samba/swat/help/manpages/idmap_tdb.8.html
share/samba/swat/help/manpages/index.html
share/samba/swat/help/manpages/libsmbclient.7.html
share/samba/swat/help/manpages/lmhosts.5.html
@@ -377,9 +411,27 @@
share/samba/swat/help/manpages/swat.8.html
share/samba/swat/help/manpages/tdbbackup.8.html
share/samba/swat/help/manpages/tdbdump.8.html
+share/samba/swat/help/manpages/tdbtool.8.html
share/samba/swat/help/manpages/testparm.1.html
share/samba/swat/help/manpages/umount.cifs.8.html
share/samba/swat/help/manpages/vfstest.1.html
+share/samba/swat/help/manpages/vfs_audit.8.html
+share/samba/swat/help/manpages/vfs_cacheprime.8.html
+share/samba/swat/help/manpages/vfs_cap.8.html
+share/samba/swat/help/manpages/vfs_catia.8.html
+share/samba/swat/help/manpages/vfs_commit.8.html
+share/samba/swat/help/manpages/vfs_default_quota.8.html
+share/samba/swat/help/manpages/vfs_extd_audit.8.html
+share/samba/swat/help/manpages/vfs_fake_perms.8.html
+share/samba/swat/help/manpages/vfs_full_audit.8.html
+share/samba/swat/help/manpages/vfs_gpfs.8.html
+share/samba/swat/help/manpages/vfs_netatalk.8.html
+share/samba/swat/help/manpages/vfs_notify_fam.8.html
+share/samba/swat/help/manpages/vfs_prealloc.8.html
+share/samba/swat/help/manpages/vfs_readahead.8.html
+share/samba/swat/help/manpages/vfs_readonly.8.html
+share/samba/swat/help/manpages/vfs_recycle.8.html
+share/samba/swat/help/manpages/vfs_shadow_copy.8.html
share/samba/swat/help/manpages/wbinfo.1.html
share/samba/swat/help/manpages/winbindd.8.html
share/samba/swat/help/welcome-no-samba-doc.html
diff -r a134fa3bc37d -r 05d19d0817e0 net/samba/distinfo
--- a/net/samba/distinfo Sun Oct 28 05:58:48 2007 +0000
+++ b/net/samba/distinfo Sun Oct 28 07:28:45 2007 +0000
@@ -1,75 +1,41 @@
-$NetBSD: distinfo,v 1.54 2007/05/19 17:55:13 tron Exp $
+$NetBSD: distinfo,v 1.55 2007/10/28 07:28:46 taca Exp $
-SHA1 (dfs_referral.diff) = 26d395028e2f7ae59d115a277864ef791bfc14b9
-RMD160 (dfs_referral.diff) = 4dcc1bf7eaf1452d9fb02884448dc88fb5ddeed3
-Size (dfs_referral.diff) = 615 bytes
-SHA1 (directory_delete.diff) = ace447241ee40e495bb2fd065996d624c0ca615c
-RMD160 (directory_delete.diff) = 0cc49ade7403b22937d858e1fe7e9357d49f6be3
-Size (directory_delete.diff) = 2218 bytes
-SHA1 (samba-3.0.24-CVE-2007-2444.patch) = 0f94ecb0233a31b42896a36a4855e21bc49cb450
-RMD160 (samba-3.0.24-CVE-2007-2444.patch) = 2bd5ed0106441097fe50bab91a34257584e16950
-Size (samba-3.0.24-CVE-2007-2444.patch) = 3026 bytes
-SHA1 (samba-3.0.24-CVE-2007-2446.patch) = 31b76c825f932df351e85d4df48b219ce83b13ac
-RMD160 (samba-3.0.24-CVE-2007-2446.patch) = d9cba3b72dac65de0add57d56d97c2d68d7ea9bb
-Size (samba-3.0.24-CVE-2007-2446.patch) = 8426 bytes
-SHA1 (samba-3.0.24-CVE-2007-2447.patch) = 15e4061e4883c195101078bbcf772be9c23d75e2
-RMD160 (samba-3.0.24-CVE-2007-2447.patch) = 96af89d98f71bda674e92e57c0afb867dbda9252
-Size (samba-3.0.24-CVE-2007-2447.patch) = 6234 bytes
-SHA1 (samba-3.0.24.tar.gz) = 216020b58abca191b8146f76f98a8bda3508fcd3
-RMD160 (samba-3.0.24.tar.gz) = f208dca645d07a195169e005a50fb4c4879254eb
Home |
Main Index |
Thread Index |
Old Index