Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Release notes: https://www.samba.org/samba/history/samba-4.10.2.html Notably, Samba 4.10.0 is the first with Python 3 support, and the 4.10 line will be the last supporting Python 2, so switch to Python 3. Add myself as a maintainer.
- Loading branch information
Showing
5 changed files
with
50 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/buildtools/wafsamba/samba_utils.py 2019-04-08 01:13:47.525306574 +0000 | ||
+++ b/buildtools/wafsamba/samba_utils.py 2019-04-08 01:14:34.805245676 +0000 | ||
@@ -495,7 +495,7 @@ | ||
Logs.zones = ['runner'] | ||
if Logs.verbose > 2: | ||
Logs.zones = ['*'] | ||
- elif opt[0].isupper() and opt.find('=') != -1: | ||
+ elif opt[0] and opt.find('=') != -1: | ||
# this allows us to set waf options on the make command line | ||
# for example, if you do "make FOO=blah", then we set the | ||
# option 'FOO' in Options.options, to blah. If you look in wafsamba/wscript |
17 changes: 10 additions & 7 deletions
17
pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,18 @@ | ||
diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript | ||
--- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300 | ||
+++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300 | ||
@@ -416,11 +416,3 @@ | ||
--- a/dynconfig/wscript 2018-12-23 20:28:42.908832206 -0800 | ||
+++ b/dynconfig/wscript 2018-12-23 20:31:55.568835627 -0800 | ||
@@ -419,15 +419,3 @@ | ||
public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir), | ||
header_path='samba', | ||
cflags=cflags) | ||
- | ||
- # install some extra empty directories | ||
- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}"); | ||
- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}") | ||
- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}"); | ||
- bld.INSTALL_DIR("${CONFIGDIR}") | ||
- bld.INSTALL_DIR("${LOGFILEBASE}") | ||
- bld.INSTALL_DIR("${PRIVILEGED_SOCKET_DIR}") | ||
- bld.INSTALL_DIR("${PRIVATE_DIR}", 0o700) | ||
- bld.INSTALL_DIR("${BINDDNS_DIR}", 0o770) | ||
- bld.INSTALL_DIR("${STATEDIR}") | ||
- bld.INSTALL_DIR("${CACHEDIR}") | ||
- | ||
- # these might be on non persistent storage | ||
- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters