diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-08-16 17:43:51 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-08-17 03:50:40 +0000 |
| commit | 2b7224ab7c555fdaacd0a84649b533e4edb377da (patch) | |
| tree | 31eb4468eb5ac2f7b338c58907e6b2652ec56f62 /buildtools | |
| parent | 4be5ffdca620c38e65ca955039acbdcf72829c67 (diff) | |
| download | samba-2b7224ab7c555fdaacd0a84649b533e4edb377da.tar.gz | |
third_party: Remove zlib from third_party
We require zlib 1.2.3.
We stopped requring a patched zlib with 5631a1b9bc03d6cf31af66b13872255f18979fe8
As discussed on samba-technical here:
https://lists.samba.org/archive/samba-technical/2019-May/133476.html
In short, zlib contains some (old, now broken) crypto code that while not compiled
in Samba is best left out of our tarball to ease crypto audits. It is also very
very out of date and is a slightly modified copy of something otherwise very
likely available on our supported host OSs. It would be strange to say that
GnuTLS and dependencies are an acceptable burden to install but say zlib is
a step to far.
So it is removed from Samba's third_party with this commit.
The diff between zlib in Samba and official zlib 1.2.3 is included
in third_party/zlib/last-samba-from-1.2.3.diff
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_third_party.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py index 4793b4355fe..d2c798b94f0 100644 --- a/buildtools/wafsamba/samba_third_party.py +++ b/buildtools/wafsamba/samba_third_party.py @@ -11,24 +11,6 @@ def CHECK_FOR_THIRD_PARTY(conf): Build.BuildContext.CHECK_FOR_THIRD_PARTY = CHECK_FOR_THIRD_PARTY @conf -def CHECK_ZLIB(conf): - version_check=''' - #if (ZLIB_VERNUM >= 0x1230) - #else - #error "ZLIB_VERNUM < 0x1230" - #endif - z_stream *z; - inflateInit2(z, -15); - ''' - return conf.CHECK_BUNDLED_SYSTEM('z', minversion='1.2.3', pkg='zlib', - checkfunctions='zlibVersion', - headers='zlib.h', - checkcode=version_check, - implied_deps='replace') - -Build.BuildContext.CHECK_ZLIB = CHECK_ZLIB - -@conf def CHECK_POPT(conf): return conf.CHECK_BUNDLED_SYSTEM('popt', checkfunctions='poptGetContext', headers='popt.h') |