sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 3.0.11.

Browse source 
PR:		ports/77187
Submitted by:	maintainer
This commit is contained in:
Jun Kuriyama 2005-02-07 05:15:17 +00:00
parent 91025526aa
commit 22f2d61c80
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=128204
11 changed files with 46 additions and 176 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/samba3/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= samba
PORTVERSION= 3.0.10
PORTVERSION?= 3.0.11
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= net
@ -43,7 +43,7 @@ SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf
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 @@ LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
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 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
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 @@ pre-fetch:
@${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}/examples -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

4
net/samba3/distinfo
View file

@ -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

34
net/samba3/files/README.FreeBSD
View file

@ -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>

15
net/samba3/files/patch-aj
View file

@ -1,15 +0,0 @@
--- include/local.h.orig Fri Jul 6 03:01:26 2001
+++ include/local.h Tue Oct 16 17:20:36 2001
@@ -176,10 +176,10 @@
* Default passwd chat script.
*/
-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
/* Minimum length of allowed password when changing UNIX password. */
-#define MINPASSWDLENGTH 5
+#define MINPASSWDLENGTH 6
/* maximum ID number used for session control. This cannot be larger
than 62*62 for the current code */

18
net/samba3/files/patch-configure.in
View file

@ -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 \

15
net/samba3/files/patch-lib_module.c
View file

@ -1,15 +0,0 @@
--- lib/module.c.orig Sun Nov 21 00:14:24 2004
+++ lib/module.c Sun Nov 21 00:38:36 2004
@@ -40,9 +40,11 @@
*/
handle = sys_dlopen(module_name, RTLD_LAZY);
+ /* This call should reset any possible non-fatal errors that
+ occured since last call to dl* functions */
+ error = sys_dlerror();
if(!handle) {
int level = is_probe ? 3 : 0;
- error = sys_dlerror();
DEBUG(level, ("Error loading module '%s': %s\n", module_name, error ? error : ""));
return NT_STATUS_UNSUCCESSFUL;
}

23
net/samba3/files/patch-lib_util_str.c
View file

@ -1,23 +0,0 @@
--- lib/util_str.c.orig Wed Dec 15 15:33:12 2004
+++ lib/util_str.c Fri Dec 17 02:15:34 2004
@@ -2008,10 +2008,16 @@
{
int bits = 0;
int char_count = 0;
- size_t out_cnt = 0;
- size_t len = data.length;
- size_t output_len = data.length * 2;
- char *result = SMB_MALLOC(output_len); /* get us plenty of space */
+ size_t out_cnt, len, output_len;
+ char *result;
+
+ if (!data.length || !data.data)
+ return NULL;
+
+ out_cnt = 0;
+ len = data.length;
+ output_len = data.length * 2;
+ result = SMB_MALLOC(output_len); /* get us plenty of space */
while (len-- && out_cnt < (data.length * 2) - 5) {
int c = (unsigned char) *(data.data++);

15
net/samba3/files/patch-rpcclient_cmd_reg.c
View file

@ -1,15 +0,0 @@
--- rpcclient/cmd_reg.c.orig Sun Apr 4 09:37:28 2004
+++ rpcclient/cmd_reg.c Thu May 20 14:18:36 2004
@@ -905,7 +905,11 @@
int opt;
*msg = 0;
- optind = 0; /* TODO: test if this hack works on other systems too --simo */
+#ifdef HAVE_OPTRESET
+ optreset = optind = 1;
+#else
+ optind = 0;
+#endif
while ((opt = getopt(argc, argv, "m:t:rf")) != EOF)
{

10
net/samba3/files/patch-smbd_quotas.c
View file

@ -1,10 +0,0 @@
--- smbd/quotas.c.orig Wed Sep 1 17:43:45 2004
+++ smbd/quotas.c Wed Sep 1 17:44:32 2004
@@ -938,7 +938,6 @@
#include <rpc/rpc.h>
#include <rpc/types.h>
#include <rpcsvc/rquota.h>
-#include <rpc/nettype.h>
#include <rpc/xdr.h>
static int quotastat;

18
net/samba3/pkg-message
View file

@ -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.

50
net/samba3/pkg-plist
View file

@ -37,7 +37,6 @@ sbin/swat
%%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 @@ sbin/swat
%%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 @@ sbin/swat
%%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 @@ sbin/swat
%%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 @@ sbin/swat
%%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 @@ sbin/swat
@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 @@ sbin/swat
@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/pr02.html
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