Date: Tue, 9 Jul 2013 15:30:00 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322565 - in head/net/samba4: . files Message-ID: <201307091530.r69FU0GR039152@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Tue Jul 9 15:30:00 2013 New Revision: 322565 URL: http://svnweb.freebsd.org/changeset/ports/322565 Log: Update port to the latest 4.0.7 version. Main binary samba4 was renamed back to samba. Deleted: head/net/samba4/files/patch-lib__socket__interfaces.c head/net/samba4/files/patch-nsswitch__wscript_build head/net/samba4/files/patch-source4__lib__cmdline__wscript_build head/net/samba4/files/patch-source4__libcli__resolve__dns_ex.c head/net/samba4/files/patch-source4__smbd__wscript_build Modified: head/net/samba4/Makefile head/net/samba4/distinfo head/net/samba4/files/patch-nsswitch__winbind_nss_freebsd.c head/net/samba4/files/patch-nsswitch__wins_freebsd.c head/net/samba4/files/samba4.in head/net/samba4/pkg-plist Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Tue Jul 9 15:29:23 2013 (r322564) +++ head/net/samba4/Makefile Tue Jul 9 15:30:00 2013 (r322565) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_PORTNAME} PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba/stable samba/rc @@ -20,7 +20,7 @@ MAKE_JOBS_SAFE= yes SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.0.4 +SAMBA4_VERSION= 4.0.7 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -100,8 +100,8 @@ BUILD_DEPENDS+= talloc>=2.0.8:${PORTSDI RUN_DEPENDS+= talloc>=2.0.8:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent -BUILD_DEPENDS+= tevent>=0.9.17:${PORTSDIR}/devel/tevent -RUN_DEPENDS+= tevent>=0.9.17:${PORTSDIR}/devel/tevent +BUILD_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent +RUN_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb @@ -271,15 +271,14 @@ CONFIGURE_ARGS+= --with-dnsupdate CONFIGURE_ARGS+= --without-dnsupdate .endif -.if 0 +# https://bugzilla.samba.org/show_bug.cgi?id=9545 .if ${PORT_OPTIONS:MFAM_SUPPORT} USE_FAM= yes -CONFIGURE_ARGS+= --enable-fam +CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam SAMBA4_MODULES+= vfs_notify_fam .else -CONFIGURE_ARGS+= --disable-fam -.endif +CONFIGURE_ARGS+= --without-fam .endif .if ${PORT_OPTIONS:MLDAP} Modified: head/net/samba4/distinfo ============================================================================== --- head/net/samba4/distinfo Tue Jul 9 15:29:23 2013 (r322564) +++ head/net/samba4/distinfo Tue Jul 9 15:30:00 2013 (r322565) @@ -1,2 +1,2 @@ -SHA256 (samba-4.0.4.tar.gz) = 20a84280155543892ce939e70482243396a9a8bfa77dcb4bf58328f7029772c5 -SIZE (samba-4.0.4.tar.gz) = 22055293 +SHA256 (samba-4.0.7.tar.gz) = e9ad36ff65a1d6b6a57f272aa08f844139ac2b5b1cb2257f1236aa2a8c864245 +SIZE (samba-4.0.7.tar.gz) = 22078244 Modified: head/net/samba4/files/patch-nsswitch__winbind_nss_freebsd.c ============================================================================== --- head/net/samba4/files/patch-nsswitch__winbind_nss_freebsd.c Tue Jul 9 15:29:23 2013 (r322564) +++ head/net/samba4/files/patch-nsswitch__winbind_nss_freebsd.c Tue Jul 9 15:30:00 2013 (r322565) @@ -1,5 +1,5 @@ --- ./nsswitch/winbind_nss_freebsd.c.orig 2012-10-02 08:24:41.000000000 +0000 -+++ ./nsswitch/winbind_nss_freebsd.c 2013-03-13 09:40:37.285778609 +0000 ++++ ./nsswitch/winbind_nss_freebsd.c 2013-07-03 01:27:00.339935089 +0000 @@ -5,6 +5,7 @@ routines against Samba winbind/Windows NT Domain @@ -8,7 +8,32 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public -@@ -53,6 +54,9 @@ +@@ -23,7 +24,6 @@ + #include "winbind_client.h" + + /* Make sure that the module gets registered needed by freebsd 5.1 */ +- + extern enum nss_status _nss_winbind_getgrent_r(struct group *, char *, size_t, + int *); + extern enum nss_status _nss_winbind_getgrnam_r(const char *, struct group *, +@@ -32,6 +32,8 @@ + size_t, int *); + extern enum nss_status _nss_winbind_setgrent(void); + extern enum nss_status _nss_winbind_endgrent(void); ++extern enum nss_status _nss_winbind_initgroups_dyn(char *, gid_t, long int *, ++ long int *, gid_t **, long int , int *); + + extern enum nss_status _nss_winbind_getpwent_r(struct passwd *, char *, size_t, + int *); +@@ -41,6 +43,7 @@ + size_t, int *); + extern enum nss_status _nss_winbind_setpwent(void); + extern enum nss_status _nss_winbind_endpwent(void); ++ns_mtab *nss_module_register(const char *, unsigned int *, nss_module_unregister_fn *); + + NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r); + NSS_METHOD_PROTOTYPE(__nss_compat_getgrgid_r); +@@ -53,6 +56,9 @@ NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r); NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); @@ -18,7 +43,7 @@ static ns_mtab methods[] = { { NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r }, -@@ -60,6 +64,7 @@ +@@ -60,6 +66,7 @@ { NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r }, { NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_winbind_setgrent }, { NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_winbind_endgrent }, @@ -26,7 +51,7 @@ { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r }, { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r }, -@@ -69,6 +74,71 @@ +@@ -69,6 +76,71 @@ }; Modified: head/net/samba4/files/patch-nsswitch__wins_freebsd.c ============================================================================== --- head/net/samba4/files/patch-nsswitch__wins_freebsd.c Tue Jul 9 15:29:23 2013 (r322564) +++ head/net/samba4/files/patch-nsswitch__wins_freebsd.c Tue Jul 9 15:30:00 2013 (r322565) @@ -1,6 +1,6 @@ ---- ./nsswitch/wins_freebsd.c.orig 2010-04-23 01:08:35.000000000 +0200 -+++ ./nsswitch/wins_freebsd.c 2010-04-23 01:08:35.000000000 +0200 -@@ -0,0 +1,79 @@ +--- ./nsswitch/wins_freebsd.c.orig 2013-07-03 01:06:20.689871582 +0000 ++++ ./nsswitch/wins_freebsd.c 2013-07-03 01:33:02.779873084 +0000 +@@ -0,0 +1,81 @@ +/* + Unix SMB/CIFS implementation. + @@ -24,9 +24,11 @@ + +#include "winbind_client.h" + -+NSS_STATUS _nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he, ++extern enum nss_status _nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he, + char *buffer, size_t buflen, int *h_errnop); + ++ns_mtab *nss_module_register(const char *source, unsigned int *, nss_module_unregister_fn *); ++ +NSS_METHOD_PROTOTYPE(__nss_wins_freebsd_gethostbyname2_r); + +static ns_mtab methods[] = Modified: head/net/samba4/files/samba4.in ============================================================================== --- head/net/samba4/files/samba4.in Tue Jul 9 15:29:23 2013 (r322564) +++ head/net/samba4/files/samba4.in Tue Jul 9 15:30:00 2013 (r322565) @@ -39,9 +39,10 @@ samba4_piddir=$(${testparm_command} --pa # Runtime options start_precmd="samba4_prestart" restart_precmd="samba4_checkconfig" -command="%%PREFIX%%/sbin/${name}" +command_name="samba" +command="%%PREFIX%%/sbin/${command_name}" command_args=${samba4_configfile_arg} -pidfile="%%SAMBA4_RUNDIR%%/samba.pid" +pidfile="%%SAMBA4_RUNDIR%%/${command_name}.pid" # Requirements required_files="${samba4_config}" required_dirs="${samba4_lockdir}" @@ -58,12 +59,12 @@ samba4_checkconfig() { samba4_prestart() { # Make sure we have our RUNDIR, even if it's on a tmpfs - if [ ! -d "%%SAMBA4_RUNDIR%%" -a ! -e "%%SAMBA4_RUNDIR%%" ]; then - install -m 0755 -d "%%SAMBA4_RUNDIR%%" + if [ ! -d "${samba4_piddir}" -a ! -e "${samba4_piddir}" ]; then + install -m 0755 -d "${samba4_piddir}" fi # Remove smbd.pid before starting up samba(needed for s3fs) - if [ -e "%%SAMBA4_RUNDIR%%/smbd.pid" ] ; then - rm -f "%%SAMBA4_RUNDIR%%/smbd.pid" + if [ -e "${samba4_piddir}/smbd.pid" ] ; then + rm -f "${samba4_piddir}/smbd.pid" fi } Modified: head/net/samba4/pkg-plist ============================================================================== --- head/net/samba4/pkg-plist Tue Jul 9 15:29:23 2013 (r322564) +++ head/net/samba4/pkg-plist Tue Jul 9 15:30:00 2013 (r322565) @@ -30,16 +30,16 @@ bin/smbspool bin/smbstatus bin/smbta-util bin/smbtorture +bin/smbtar bin/smbtree bin/testparm bin/wbinfo sbin/nmbd -sbin/samba4 +sbin/samba sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate sbin/samba_upgradedns -sbin/samba_upgradeprovision sbin/smbd %%SWAT%%sbin/swat %%WINBIND%%sbin/winbindd @@ -403,6 +403,7 @@ lib/shared-modules/vfs/full_audit.so lib/shared-modules/vfs/linux_xfs_sgid.so lib/shared-modules/vfs/media_harmony.so lib/shared-modules/vfs/netatalk.so +@comment vfs_notify_fam lib/shared-modules/vfs/notify_fam.so lib/shared-modules/vfs/posix_eadb.so lib/shared-modules/vfs/preopen.so lib/shared-modules/vfs/readahead.so @@ -478,6 +479,7 @@ libdata/pkgconfig/smbclient-raw.pc libdata/pkgconfig/smbsharemodes.pc libdata/pkgconfig/torture.pc libdata/pkgconfig/wbclient.pc +%%DEVELOPER%%%%PYTHON_SITELIBDIR%%/samba/socket_wrapper.so %%PYTHON_SITELIBDIR%%/samba/__init__.py %%PYTHON_SITELIBDIR%%/samba/_glue.so %%PYTHON_SITELIBDIR%%/samba/_ldb.so @@ -519,6 +521,7 @@ libdata/pkgconfig/wbclient.pc %%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so %%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so %%PYTHON_SITELIBDIR%%/samba/dckeytab.so +%%PYTHON_SITELIBDIR%%/samba/descriptor.py %%PYTHON_SITELIBDIR%%/samba/drs_utils.py %%PYTHON_SITELIBDIR%%/samba/dsdb.so %%PYTHON_SITELIBDIR%%/samba/external/__init__.py @@ -702,7 +705,6 @@ libdata/pkgconfig/wbclient.pc %%PYTHON_SITELIBDIR%%/samba/provision/__init__.py %%PYTHON_SITELIBDIR%%/samba/provision/backend.py %%PYTHON_SITELIBDIR%%/samba/provision/common.py -%%PYTHON_SITELIBDIR%%/samba/provision/descriptor.py %%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py %%PYTHON_SITELIBDIR%%/samba/registry.so %%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py @@ -716,7 +718,7 @@ libdata/pkgconfig/wbclient.pc %%PYTHON_SITELIBDIR%%/samba/security.so %%PYTHON_SITELIBDIR%%/samba/sites.py %%PYTHON_SITELIBDIR%%/samba/smb.so -%%DEVELOPER%%%%PYTHON_SITELIBDIR%%/samba/socket_wrapper.so +%%PYTHON_SITELIBDIR%%/samba/tdb_util.py %%PYTHON_SITELIBDIR%%/samba/tests/__init__.py %%PYTHON_SITELIBDIR%%/samba/tests/auth.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307091530.r69FU0GR039152>