diff options
| author | Timur I. Bakeyev <timur@FreeBSD.org> | 2014-06-23 18:47:48 +0000 |
|---|---|---|
| committer | Timur I. Bakeyev <timur@FreeBSD.org> | 2014-06-23 18:47:48 +0000 |
| commit | e4d54f8cb7e7d30b15126754d6c738fd22a7cb80 (patch) | |
| tree | 63fba5a4b326259551e8e69b56ef90bc4ca0a425 /net/samba4 | |
| parent | 9b2b8a9c9158005a0fe1bb76465bac9cb6b7dcf4 (diff) | |
| download | ports-e4d54f8cb7e7d30b15126754d6c738fd22a7cb80.tar.gz ports-e4d54f8cb7e7d30b15126754d6c738fd22a7cb80.zip | |
Notes
Diffstat (limited to 'net/samba4')
| -rw-r--r-- | net/samba4/Makefile | 4 | ||||
| -rw-r--r-- | net/samba4/distinfo | 4 | ||||
| -rw-r--r-- | net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py | 22 | ||||
| -rw-r--r-- | net/samba4/files/samba_server.in | 2 |
4 files changed, 5 insertions, 27 deletions
diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 2b014ee4a880..5f31db5c8018 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}4 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba/stable samba/rc @@ -18,7 +18,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba41-4.1.* SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.0.17 +SAMBA4_VERSION= 4.0.19 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} diff --git a/net/samba4/distinfo b/net/samba4/distinfo index 0dbf2d9af096..e9fa1a90f7bf 100644 --- a/net/samba4/distinfo +++ b/net/samba4/distinfo @@ -1,2 +1,2 @@ -SHA256 (samba-4.0.17.tar.gz) = 6775cc093dc1f5b4feec3b47b458b78ad44f14de11f4bc8838b69e86d1ddf6ed -SIZE (samba-4.0.17.tar.gz) = 22126553 +SHA256 (samba-4.0.19.tar.gz) = 966ba09c99ba5ff679e444e56b1282c974630bade4a289a71f3327865bbedf85 +SIZE (samba-4.0.19.tar.gz) = 22131987 diff --git a/net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py b/net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py deleted file mode 100644 index 3015402eace6..000000000000 --- a/net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py +++ /dev/null @@ -1,22 +0,0 @@ ---- buildtools/wafadmin/Tools/config_c.py.orig 2013-06-13 09:21:02.000000000 +0000 -+++ buildtools/wafadmin/Tools/config_c.py 2014-03-27 11:46:02.381178536 +0000 -@@ -73,6 +73,19 @@ - app('CCFLAGS_' + uselib, x) - app('CXXFLAGS_' + uselib, x) - app('LINKFLAGS_' + uselib, x) -+ # -+ # NOTE on special treatment of -Wl,-R and -Wl,-rpath: -+ # -+ # It is important to not put a library provided RPATH -+ # into the LINKFLAGS but in the RPATH instead, since -+ # the provided LINKFLAGS get prepended to our own internal -+ # RPATH later, and hence can potentially lead to linking -+ # in too old versions of our internal libs. -+ # -+ elif x.startswith('-Wl,-R'): -+ app('RPATH_' + uselib, x[6:]) -+ elif x.startswith('-Wl,-rpath,'): -+ app('RPATH_' + uselib, x[11:]) - elif x.startswith('-Wl'): - app('LINKFLAGS_' + uselib, x) - elif x.startswith('-m') or x.startswith('-f'): diff --git a/net/samba4/files/samba_server.in b/net/samba4/files/samba_server.in index b1556370bef6..3993ceeb6406 100644 --- a/net/samba4/files/samba_server.in +++ b/net/samba4/files/samba_server.in @@ -33,7 +33,7 @@ samba_server_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%" samba_server_config=${samba_server_config=${samba_server_config_default}} samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" #testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" -testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" +testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" smbcontrol_command="%%PREFIX%%/bin/smbcontrol" # Custom commands |