Date: Mon, 7 Feb 2005 04:33:12 +0100 From: "Timur I. Bakeyev" <timur@gnu.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/77187: MAINTAINER: Update for net/samba3 to 3.0.11 Message-ID: <1107747192.0@timur.home.bat.ru> Resent-Message-ID: <200502070340.j173eFkq078080@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77187
>Category: ports
>Synopsis: MAINTAINER: Update for net/samba3 to 3.0.11
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 07 03:40:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Timur I. Bakeyev
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD 5.3-STABLE #1: Sun Dec 26 01:32:44 CET 2004
root@timur.home.bat.ru:/usr/src/sys/i386/compile/COMMON
>Description:
This is an update of net/samba3 port to the latest stable version 3.0.11.
>How-To-Repeat:
-
>Fix:
Please, remove following files from the port:
files/patch-lib_module.c
files/patch-aj
files/patch-lib_util_str.c
files/patch-rpcclient_cmd_reg.c
files/patch-smbd_quotas.c
Patch is here:
--- samba3.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/samba3/Makefile,v
retrieving revision 1.133
diff -u -r1.133 Makefile
--- Makefile 15 Jan 2005 05:12:24 -0000 1.133
+++ Makefile 7 Feb 2005 02:59:45 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION= 3.0.10
+PORTVERSION?= 3.0.11
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= net
@@ -43,7 +43,7 @@
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \
--localstatedir=${VARDIR} \
@@ -205,13 +205,6 @@
CONFIGURE_ARGS+= --with-included-popt
.endif
-.if defined(WITH_MULTIBYTE)
-# Based on patch from miraclelinux.com.
-# http://www.miraclelinux.com/english/technet/samba30/index.html
-PLIST_SUB+= MULTIBYTE=""
-.else
-PLIST_SUB+= MULTIBYTE="@comment "
-.endif
# !SAMBA_SUBPORT
.endif
@@ -281,7 +274,7 @@
SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
SAMBA_SPOOL=${SAMBA_SPOOL}
-pre-everything::
+pre-configure::
@${ECHO_MSG} ""
@${ECHO_MSG} "!!! Due to a bug in the deinstall procedure in port versions prior to 3.0.9,"
@${ECHO_MSG} "!!! you should BACK UP YOUR VALUABLE ${SAMBA_LOCKDIR}/windbindd_* FILES"
@@ -296,12 +289,15 @@
@${ECHO_MSG} "===> -------------------------------------------"
post-patch:
- @${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
+ @${RM} -rf ${WRKDIR}/${DISTNAME}/examples/LDAP/smbldap-tools-*
@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
@${RM} -rf ${WRKDIR}/${DISTNAME}/swat/lang
+ @${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
+ @${FIND} ${WRKDIR}/${DISTNAME} -type d | ${XARGS} ${CHMOD} 0755
+ @${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} 0644
pre-install:
- @${FIND} ${SAMBA_LIBDIR} -type f | ${SORT} | ${SED} -e 's|^${PREFIX}||; s|^/||' >> ${WRKDIR}/.PLIST.exclude
+ -@${FIND} ${SAMBA_LIBDIR} -type f 2>/dev/null | ${SORT} | ${SED} -e 's|^${PREFIX}||; s|^/||' >> ${WRKDIR}/.PLIST.exclude
post-install:
.for sect in 1 5 7 8
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/samba3/distinfo,v
retrieving revision 1.61
diff -u -r1.61 distinfo
--- distinfo 21 Dec 2004 12:24:03 -0000 1.61
+++ distinfo 4 Feb 2005 22:36:26 -0000
@@ -1,2 +1,2 @@
-MD5 (samba-3.0.10.tar.gz) = b19fd86d3c11a1b43f75a5988cd9ceeb
-SIZE (samba-3.0.10.tar.gz) = 15176926
+MD5 (samba-3.0.11.tar.gz) = 217e489646a474b4fb69d5802c14bc6e
+SIZE (samba-3.0.11.tar.gz) = 15372539
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/net/samba3/pkg-message,v
retrieving revision 1.2
diff -u -r1.2 pkg-message
--- pkg-message 18 May 2004 14:52:47 -0000 1.2
+++ pkg-message 7 Feb 2005 03:16:39 -0000
@@ -1,21 +1,5 @@
******************************************************************************
-Starting from Samba 3.0.3 this port doesn't create 'smbpasswd' file
-automatically. Users are encouraged to use 'tdbsam' backend instead:
-
- [global]
- passdb backend = tdbsam, smbpasswd
-
-You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam',
-see the Samba-HOWTO-Collection.
-
-You still can create 'smbpasswd' file with the supplied 'make_smbpasswd'
-script:
-
- cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd
- chmod 600 smbpasswd
-
-But the usage of it is deprecated.
-------------------------------------------------------------------------------
NOTICE: *.tdb files have been moved from /var/run/samba/ to /var/db/samba/!
NOTICE: Please, move them manually, if necessary, at least winbind_*.tdb.
******************************************************************************
+For additional hints and directions, please, look into the README.FreeBSD file.
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/samba3/pkg-plist,v
retrieving revision 1.58
diff -u -r1.58 pkg-plist
--- pkg-plist 21 Dec 2004 12:24:03 -0000 1.58
+++ pkg-plist 30 Jan 2005 04:11:45 -0000
@@ -37,7 +37,6 @@
%%EXAMPLESDIR%%/LDAP/README
%%EXAMPLESDIR%%/LDAP/convertSambaAccount
%%EXAMPLESDIR%%/LDAP/get_next_oid
-%%EXAMPLESDIR%%/LDAP/ldapsync.pl
%%EXAMPLESDIR%%/LDAP/samba-nds.schema
%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds4.x
%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x
@@ -45,39 +44,6 @@
%%EXAMPLESDIR%%/LDAP/samba.schema
%%EXAMPLESDIR%%/LDAP/samba.schema.at.IBM-DS
%%EXAMPLESDIR%%/LDAP/samba.schema.oc.IBM-DS
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/CONTRIBUTORS
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/COPYING
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/ChangeLog
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/FILES
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/INFRASTRUCTURE
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/INSTALL
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/Makefile
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/README
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/TODO
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/README
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/ldappass.cgi
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/Makefile
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.h
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/md4.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/smbdes.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupadd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupdel.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupmod.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupshow.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-groups.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-passwd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-populate.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-tools.spec
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-useradd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-userdel.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usermod.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usershow.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_conf.pm
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_tools.pm
%%EXAMPLESDIR%%/README
%%EXAMPLESDIR%%/VFS/Makefile.in
%%EXAMPLESDIR%%/VFS/README
@@ -96,7 +62,6 @@
%%EXAMPLESDIR%%/dce-dfs/smb.conf
%%EXAMPLESDIR%%/genlogon/genlogon.pl
%%EXAMPLESDIR%%/misc/extra_smbstatus
-%%EXAMPLESDIR%%/misc/modify_samba_config.pl
%%EXAMPLESDIR%%/misc/swat.pl
%%EXAMPLESDIR%%/misc/wall.perl
%%EXAMPLESDIR%%/nss/nss_winbind.c
@@ -109,8 +74,8 @@
%%EXAMPLESDIR%%/pdb/README
%%EXAMPLESDIR%%/pdb/mysql/mysql.dump
%%EXAMPLESDIR%%/pdb/mysql/smb.conf
-%%EXAMPLESDIR%%/pdb/pdb_test.c
%%EXAMPLESDIR%%/pdb/sambapdb.dtd
+%%EXAMPLESDIR%%/pdb/test.c
%%EXAMPLESDIR%%/printer-accounting/README
%%EXAMPLESDIR%%/printer-accounting/acct-all
%%EXAMPLESDIR%%/printer-accounting/acct-sum
@@ -123,6 +88,13 @@
%%EXAMPLESDIR%%/printing/smbprint
%%EXAMPLESDIR%%/printing/smbprint.sysv
%%EXAMPLESDIR%%/scripts/backtrace
+%%EXAMPLESDIR%%/scripts/perl/modify_samba_config.pl
+%%EXAMPLESDIR%%/scripts/perl/smbaddprinter.pl
+%%EXAMPLESDIR%%/scripts/perl/smbdelprinter
+%%EXAMPLESDIR%%/scripts/python/SambaConfig.py
+%%EXAMPLESDIR%%/scripts/python/generate_parm_table.py
+%%EXAMPLESDIR%%/scripts/python/modify_samba_config.py
+%%EXAMPLESDIR%%/scripts/python/smbparm.py
%%EXAMPLESDIR%%/smb.conf.default
%%EXAMPLESDIR%%/svr4-startup/README
%%EXAMPLESDIR%%/svr4-startup/samba.server
@@ -144,6 +116,8 @@
@dirrm %%EXAMPLESDIR%%/validchars
@dirrm %%EXAMPLESDIR%%/tridge
@dirrm %%EXAMPLESDIR%%/svr4-startup
+@dirrm %%EXAMPLESDIR%%/scripts/perl
+@dirrm %%EXAMPLESDIR%%/scripts/python
@dirrm %%EXAMPLESDIR%%/scripts
@dirrm %%EXAMPLESDIR%%/printing
@dirrm %%EXAMPLESDIR%%/printer-accounting
@@ -158,9 +132,6 @@
@dirrm %%EXAMPLESDIR%%/auth/crackcheck
@dirrm %%EXAMPLESDIR%%/auth
@dirrm %%EXAMPLESDIR%%/VFS
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools
@dirrm %%EXAMPLESDIR%%/LDAP
@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -375,6 +346,7 @@
share/swat/help/Samba-HOWTO-Collection/pr03.html
share/swat/help/Samba-HOWTO-Collection/printing.html
share/swat/help/Samba-HOWTO-Collection/problems.html
+share/swat/help/Samba-HOWTO-Collection/rights.html
share/swat/help/Samba-HOWTO-Collection/samba-bdc.html
share/swat/help/Samba-HOWTO-Collection/samba-pdc.html
share/swat/help/Samba-HOWTO-Collection/securing-samba.html
Index: files/README.FreeBSD
===================================================================
RCS file: /home/ncvs/ports/net/samba3/files/README.FreeBSD,v
retrieving revision 1.6
diff -u -r1.6 README.FreeBSD
--- files/README.FreeBSD 1 Sep 2004 16:23:29 -0000 1.6
+++ files/README.FreeBSD 7 Feb 2005 03:16:03 -0000
@@ -1,21 +1,35 @@
-If you want to use samba ports,
+If you want to run this samba port:
1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit
it.
2. Put string 'samba_enable="YES"' into your /etc/rc.conf.
3. Type '/usr/local/etc/rc.d/samba.sh start' or reboot.
+This port doesn't create 'smbpasswd' file automatically anymore. Users
+are encouraged to use 'tdbsam' backend instead:
+
+ [global]
+ passdb backend = tdbsam, smbpasswd
+
+You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam',
+see the Samba-HOWTO-Collection.
+
+You still can create 'smbpasswd' file with the supplied 'make_smbpasswd'
+script:
+
+ cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd
+ chmod 600 smbpasswd
+
+But the usage of it is deprecated.
+
See document files in /usr/local/share/doc/samba and example config files in
/usr/local/share/examples/samba for details.
-FreeBSD Samba ports for localization and encrypt passwords support are no
-longer provided because these supports have been integrated into the
-original distribution since 1.9.18. If you're Western European or Japanese
-Windows users, please set "client code page" parameter in smb.conf (1.9.18
-does not support Chinese Windows. If you want to use Chinese samba, please
-use chinese/samba port). See smb.conf.sample for details. If you want to
-use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
-yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for
-authentication.
+This port doesn't come anymore with the IDEALX Samba LDAP management tools.
+They are a separate port now, net/smbldap-tools. Please, install it, if you
+are going to use Samba LDAP back end.
+
+Japanese users, please, take a look onto japanese/samba3 port instead -
+it comes with additional multibyte characters support.
FreeBSD Samba3 port maintainer: Timur Bakeyev <timur@gnu.org>
Index: files/patch-configure.in
===================================================================
RCS file: /home/ncvs/ports/net/samba3/files/patch-configure.in,v
retrieving revision 1.9
diff -u -r1.9 patch-configure.in
--- files/patch-configure.in 21 Dec 2004 12:24:03 -0000 1.9
+++ files/patch-configure.in 4 Feb 2005 22:56:21 -0000
@@ -37,21 +37,3 @@
# Assume non-shared by default and override below
BLDSHARED="false"
-@@ -3939,7 +3953,7 @@
- AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
- ACL_LIBS="$ACL_LIBS -lpacl"
- ;;
-- *freebsd5*)
-+ *freebsd[[5-9]]*)
- AC_MSG_RESULT(Using FreeBSD posix ACLs)
- AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available])
- AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
-@@ -4258,7 +4272,7 @@
- *linux*)
- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
- ;;
-- *freebsd5*)
-+ *freebsd[[5-9]]*)
- # FreeBSD winbind client is implemented as a wrapper around
- # the Linux version.
- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
--- samba3.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1107747192.0>